mirror of
				https://github.com/mihonapp/mihon.git
				synced 2025-10-30 22:07:57 +01:00 
			
		
		
		
	MangaController overhaul (#7244)
This commit is contained in:
		| @@ -1,84 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <animated-vector xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:aapt="http://schemas.android.com/aapt"> | ||||
|     <aapt:attr name="android:drawable"> | ||||
|         <vector | ||||
|             android:name="caret_up" | ||||
|             android:height="24.0dip" | ||||
|             android:width="24.0dip" | ||||
|             android:viewportWidth="24.0" | ||||
|             android:viewportHeight="24.0"> | ||||
|             <group | ||||
|                 android:name="caret02" | ||||
|                 android:rotation="90.0" | ||||
|                 android:translateX="12.0" | ||||
|                 android:translateY="9.0"> | ||||
|                 <group | ||||
|                     android:name="caret02_l" | ||||
|                     android:rotation="-45.0"> | ||||
|                     <group | ||||
|                         android:name="caret02_l_pivot" | ||||
|                         android:translateY="4.0"> | ||||
|                         <group | ||||
|                             android:name="caret02_l_rect_position" | ||||
|                             android:translateY="-1.0"> | ||||
|                             <path | ||||
|                                 android:name="caret02_l_rect" | ||||
|                                 android:fillColor="@android:color/black" | ||||
|                                 android:pathData="M -1.0,-4.0 l 2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,8.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-8.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" /> | ||||
|                         </group> | ||||
|                     </group> | ||||
|                 </group> | ||||
|                 <group | ||||
|                     android:name="caret02_r" | ||||
|                     android:rotation="45.0"> | ||||
|                     <group | ||||
|                         android:name="caret02_r_pivot" | ||||
|                         android:translateY="-4.0"> | ||||
|                         <group | ||||
|                             android:name="caret02_r_rect_position" | ||||
|                             android:translateY="1.0"> | ||||
|                             <path | ||||
|                                 android:name="caret02_r_rect" | ||||
|                                 android:fillColor="@android:color/black" | ||||
|                                 android:pathData="M -1.0,-4.0 l 2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,8.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,-8.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" /> | ||||
|                         </group> | ||||
|                     </group> | ||||
|                 </group> | ||||
|             </group> | ||||
|         </vector> | ||||
|     </aapt:attr> | ||||
|  | ||||
|     <target android:name="caret02"> | ||||
|         <aapt:attr name="android:animation"> | ||||
|             <objectAnimator | ||||
|                 android:interpolator="@android:interpolator/fast_out_slow_in" | ||||
|                 android:duration="300" | ||||
|                 android:pathData="M 12.0,15.0 c 0.0,-1.0 0.0,-5.33333 0.0,-6.0" | ||||
|                 android:propertyXName="translateX" | ||||
|                 android:propertyYName="translateY" /> | ||||
|         </aapt:attr> | ||||
|     </target> | ||||
|     <target android:name="caret02_l"> | ||||
|         <aapt:attr name="android:animation"> | ||||
|             <objectAnimator | ||||
|                 android:interpolator="@android:interpolator/fast_out_slow_in" | ||||
|                 android:duration="300" | ||||
|                 android:valueFrom="45.0" | ||||
|                 android:valueTo="-45.0" | ||||
|                 android:valueType="floatType" | ||||
|                 android:propertyName="rotation" /> | ||||
|         </aapt:attr> | ||||
|     </target> | ||||
|     <target android:name="caret02_r"> | ||||
|         <aapt:attr name="android:animation"> | ||||
|             <objectAnimator | ||||
|                 android:interpolator="@android:interpolator/fast_out_slow_in" | ||||
|                 android:duration="300" | ||||
|                 android:valueFrom="-45.0" | ||||
|                 android:valueTo="45.0" | ||||
|                 android:valueType="floatType" | ||||
|                 android:propertyName="rotation" /> | ||||
|         </aapt:attr> | ||||
|     </target> | ||||
| </animated-vector> | ||||
| @@ -1,59 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="match_parent" | ||||
|     android:orientation="vertical"> | ||||
|  | ||||
|     <eu.kanade.tachiyomi.widget.ThemedSwipeRefreshLayout | ||||
|         android:id="@+id/swipe_refresh" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="match_parent"> | ||||
|  | ||||
|         <androidx.constraintlayout.widget.ConstraintLayout | ||||
|             android:id="@+id/linear_recycler_layout" | ||||
|             android:layout_width="match_parent" | ||||
|             android:layout_height="match_parent" | ||||
|             android:orientation="horizontal"> | ||||
|  | ||||
|             <androidx.recyclerview.widget.RecyclerView | ||||
|                 android:id="@+id/info_recycler" | ||||
|                 android:layout_width="0dp" | ||||
|                 android:layout_height="match_parent" | ||||
|                 android:clipToPadding="false" | ||||
|                 app:layout_constraintBottom_toBottomOf="parent" | ||||
|                 app:layout_constraintEnd_toStartOf="@id/chapters_recycler" | ||||
|                 app:layout_constraintStart_toStartOf="parent" | ||||
|                 app:layout_constraintTop_toTopOf="parent" | ||||
|                 app:layout_constraintWidth_max="@dimen/tablet_sidebar_max_width" | ||||
|                 app:layout_constraintWidth_percent="0.5" | ||||
|                 tools:itemCount="1" | ||||
|                 tools:listitem="@layout/manga_info_header" /> | ||||
|  | ||||
|             <androidx.recyclerview.widget.RecyclerView | ||||
|                 android:id="@+id/chapters_recycler" | ||||
|                 android:layout_width="0dp" | ||||
|                 android:layout_height="match_parent" | ||||
|                 android:clipToPadding="false" | ||||
|                 android:paddingBottom="@dimen/fab_list_padding" | ||||
|                 app:layout_constraintBottom_toBottomOf="parent" | ||||
|                 app:layout_constraintEnd_toEndOf="parent" | ||||
|                 app:layout_constraintStart_toEndOf="@id/info_recycler" | ||||
|                 app:layout_constraintTop_toTopOf="parent" | ||||
|                 tools:listitem="@layout/chapters_item" /> | ||||
|  | ||||
|         </androidx.constraintlayout.widget.ConstraintLayout> | ||||
|  | ||||
|     </eu.kanade.tachiyomi.widget.ThemedSwipeRefreshLayout> | ||||
|  | ||||
|     <eu.kanade.tachiyomi.widget.MaterialFastScroll | ||||
|         android:id="@+id/fast_scroller" | ||||
|         android:layout_width="wrap_content" | ||||
|         android:layout_height="match_parent" | ||||
|         android:layout_centerHorizontal="true" | ||||
|         android:layout_gravity="end" | ||||
|         app:fastScrollerBubbleEnabled="false" | ||||
|         tools:visibility="visible" /> | ||||
|  | ||||
| </androidx.coordinatorlayout.widget.CoordinatorLayout> | ||||
| @@ -1,208 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="wrap_content" | ||||
|     android:orientation="vertical" | ||||
|     tools:context=".ui.browse.source.browse.BrowseSourceController"> | ||||
|  | ||||
|     <ImageView | ||||
|         android:id="@+id/backdrop" | ||||
|         android:layout_width="0dp" | ||||
|         android:layout_height="0dp" | ||||
|         android:layout_marginBottom="-32dp" | ||||
|         android:alpha="0.2" | ||||
|         android:scaleType="centerCrop" | ||||
|         app:layout_constraintBottom_toBottomOf="@+id/manga_cover" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:layout_constraintTop_toTopOf="parent" | ||||
|         tools:background="@mipmap/ic_launcher" | ||||
|         tools:ignore="ContentDescription" /> | ||||
|  | ||||
|     <View | ||||
|         android:id="@+id/backdrop_overlay" | ||||
|         android:layout_width="0dp" | ||||
|         android:layout_height="0dp" | ||||
|         android:alpha="1" | ||||
|         android:background="@drawable/manga_backdrop_gradient" | ||||
|         android:backgroundTint="?android:attr/colorBackground" | ||||
|         app:layout_constraintBottom_toBottomOf="@+id/backdrop" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:layout_constraintTop_toTopOf="parent" /> | ||||
|  | ||||
|     <ImageView | ||||
|         android:id="@+id/manga_cover" | ||||
|         android:layout_width="0dp" | ||||
|         android:layout_height="0dp" | ||||
|         android:layout_marginStart="@dimen/tablet_horizontal_cover_margin" | ||||
|         android:layout_marginTop="32dp" | ||||
|         android:layout_marginEnd="@dimen/tablet_horizontal_cover_margin" | ||||
|         android:background="@drawable/rounded_rectangle" | ||||
|         android:contentDescription="@string/description_cover" | ||||
|         android:scaleType="centerCrop" | ||||
|         app:layout_constraintDimensionRatio="w,3:2" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:layout_constraintTop_toTopOf="parent" | ||||
|         tools:src="@mipmap/ic_launcher" /> | ||||
|  | ||||
|     <LinearLayout | ||||
|         android:id="@+id/manga_detail" | ||||
|         android:layout_width="0dp" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:layout_marginStart="16dp" | ||||
|         android:layout_marginTop="-8dp" | ||||
|         android:layout_marginEnd="16dp" | ||||
|         android:gravity="center_horizontal" | ||||
|         android:orientation="vertical" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:layout_constraintTop_toBottomOf="@+id/backdrop"> | ||||
|  | ||||
|         <TextView | ||||
|             android:id="@+id/manga_full_title" | ||||
|             android:layout_width="match_parent" | ||||
|             android:layout_height="wrap_content" | ||||
|             android:layout_marginBottom="4dp" | ||||
|             android:gravity="center" | ||||
|             android:text="@string/manga_info_full_title_label" | ||||
|             android:textAppearance="?attr/textAppearanceTitleLarge" | ||||
|             android:textIsSelectable="false" /> | ||||
|  | ||||
|         <TextView | ||||
|             android:id="@+id/manga_author" | ||||
|             android:layout_width="wrap_content" | ||||
|             android:layout_height="wrap_content" | ||||
|             android:textAppearance="?attr/textAppearanceTitleSmall" | ||||
|             android:textColor="?android:attr/textColorSecondary" | ||||
|             android:textAlignment="center" | ||||
|             android:textIsSelectable="false" | ||||
|             tools:text="Author" /> | ||||
|  | ||||
|         <TextView | ||||
|             android:id="@+id/manga_artist" | ||||
|             android:layout_width="wrap_content" | ||||
|             android:layout_height="wrap_content" | ||||
|             android:layout_marginBottom="4dp" | ||||
|             android:textAppearance="?attr/textAppearanceTitleSmall" | ||||
|             android:textColor="?android:attr/textColorSecondary" | ||||
|             android:textIsSelectable="false" | ||||
|             tools:text="Artist" /> | ||||
|  | ||||
|         <LinearLayout | ||||
|             android:id="@+id/manga_status_row" | ||||
|             android:layout_width="wrap_content" | ||||
|             android:layout_height="wrap_content"> | ||||
|  | ||||
|             <ImageView | ||||
|                 android:id="@+id/manga_status_icon" | ||||
|                 android:layout_width="16dp" | ||||
|                 android:layout_height="match_parent" | ||||
|                 android:layout_marginEnd="4dp" | ||||
|                 app:srcCompat="@drawable/ic_status_unknown_24dp" | ||||
|                 app:tint="?android:attr/textColorSecondary" | ||||
|                 tools:ignore="ContentDescription" /> | ||||
|  | ||||
|             <TextView | ||||
|                 android:id="@+id/manga_status" | ||||
|                 android:layout_width="wrap_content" | ||||
|                 android:layout_height="match_parent" | ||||
|                 android:ellipsize="end" | ||||
|                 android:maxLines="1" | ||||
|                 android:textAppearance="?attr/textAppearanceBodyMedium" | ||||
|                 android:textColor="?android:attr/textColorSecondary" | ||||
|                 android:textIsSelectable="false" | ||||
|                 tools:text="Status" /> | ||||
|  | ||||
|             <ImageView | ||||
|                 android:id="@+id/manga_missing_source_icon" | ||||
|                 android:layout_width="16dp" | ||||
|                 android:layout_height="match_parent" | ||||
|                 android:layout_marginEnd="4dp" | ||||
|                 app:srcCompat="@drawable/ic_warning_white_24dp" | ||||
|                 app:tint="@color/error" | ||||
|                 tools:ignore="ContentDescription" /> | ||||
|  | ||||
|             <TextView | ||||
|                 android:layout_width="wrap_content" | ||||
|                 android:layout_height="wrap_content" | ||||
|                 android:layout_marginStart="4dp" | ||||
|                 android:layout_marginEnd="4dp" | ||||
|                 android:text="•" | ||||
|                 android:textAppearance="?attr/textAppearanceBodyMedium" | ||||
|                 android:textColor="?android:attr/textColorSecondary" | ||||
|                 android:textIsSelectable="false" | ||||
|                 tools:ignore="HardcodedText" /> | ||||
|  | ||||
|             <TextView | ||||
|                 android:id="@+id/manga_source" | ||||
|                 android:layout_width="wrap_content" | ||||
|                 android:layout_height="wrap_content" | ||||
|                 android:ellipsize="end" | ||||
|                 android:maxLines="1" | ||||
|                 android:textAppearance="?attr/textAppearanceBodyMedium" | ||||
|                 android:textColor="?android:attr/textColorSecondary" | ||||
|                 android:textIsSelectable="false" | ||||
|                 tools:text="Source" /> | ||||
|  | ||||
|         </LinearLayout> | ||||
|  | ||||
|     </LinearLayout> | ||||
|  | ||||
|     <LinearLayout | ||||
|         android:id="@+id/manga_actions" | ||||
|         android:layout_width="0dp" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:layout_marginStart="16dp" | ||||
|         android:layout_marginTop="8dp" | ||||
|         android:layout_marginEnd="16dp" | ||||
|         android:orientation="horizontal" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:layout_constraintTop_toBottomOf="@+id/manga_detail"> | ||||
|  | ||||
|         <com.google.android.material.button.MaterialButton | ||||
|             android:id="@+id/btn_favorite" | ||||
|             style="@style/Widget.Tachiyomi.Button.ActionButton" | ||||
|             android:layout_width="0dp" | ||||
|             android:layout_height="wrap_content" | ||||
|             android:layout_weight="1" | ||||
|             android:text="@string/add_to_library" | ||||
|             app:icon="@drawable/ic_favorite_border_24dp" /> | ||||
|  | ||||
|         <com.google.android.material.button.MaterialButton | ||||
|             android:id="@+id/btn_tracking" | ||||
|             style="@style/Widget.Tachiyomi.Button.ActionButton" | ||||
|             android:layout_width="0dp" | ||||
|             android:layout_height="wrap_content" | ||||
|             android:layout_weight="1" | ||||
|             android:text="@string/manga_tracking_tab" | ||||
|             android:visibility="gone" | ||||
|             app:icon="@drawable/ic_sync_24dp" | ||||
|             tools:visibility="visible" /> | ||||
|  | ||||
|         <com.google.android.material.button.MaterialButton | ||||
|             android:id="@+id/btn_webview" | ||||
|             style="@style/Widget.Tachiyomi.Button.ActionButton" | ||||
|             android:layout_width="0dp" | ||||
|             android:layout_height="wrap_content" | ||||
|             android:layout_weight="1" | ||||
|             android:text="@string/action_web_view" | ||||
|             android:visibility="gone" | ||||
|             app:icon="@drawable/ic_public_24dp" | ||||
|             tools:visibility="visible" /> | ||||
|  | ||||
|     </LinearLayout> | ||||
|  | ||||
|     <eu.kanade.tachiyomi.widget.MangaSummaryView | ||||
|         android:id="@+id/manga_summary_section" | ||||
|         android:layout_width="0dp" | ||||
|         android:layout_height="wrap_content" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:layout_constraintTop_toBottomOf="@id/manga_actions" /> | ||||
|  | ||||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||||
| @@ -1,38 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="wrap_content" | ||||
|     android:background="?attr/selectableItemBackground" | ||||
|     android:paddingStart="16dp" | ||||
|     android:paddingTop="4dp" | ||||
|     android:paddingEnd="12dp" | ||||
|     android:paddingBottom="4dp" | ||||
|     tools:context=".ui.browse.source.browse.BrowseSourceController"> | ||||
|  | ||||
|     <TextView | ||||
|         android:id="@+id/chapters_label" | ||||
|         android:layout_width="0dp" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:text="@string/chapters" | ||||
|         android:textAppearance="?attr/textAppearanceTitleMedium" | ||||
|         android:textIsSelectable="false" | ||||
|         app:layout_constraintBottom_toBottomOf="parent" | ||||
|         app:layout_constraintEnd_toStartOf="@+id/btn_chapters_filter" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:layout_constraintTop_toTopOf="parent" /> | ||||
|  | ||||
|     <ImageButton | ||||
|         android:id="@+id/btn_chapters_filter" | ||||
|         android:layout_width="28dp" | ||||
|         android:layout_height="28dp" | ||||
|         android:background="?attr/selectableItemBackgroundBorderless" | ||||
|         android:contentDescription="@string/action_filter" | ||||
|         app:layout_constraintBottom_toBottomOf="parent" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintTop_toTopOf="parent" | ||||
|         app:srcCompat="@drawable/ic_filter_list_24dp" | ||||
|         app:tint="?attr/colorOnBackground" /> | ||||
|  | ||||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||||
| @@ -1,36 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="match_parent" | ||||
|     android:orientation="vertical"> | ||||
|  | ||||
|     <eu.kanade.tachiyomi.widget.ThemedSwipeRefreshLayout | ||||
|         android:id="@+id/swipe_refresh" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="match_parent" | ||||
|         android:orientation="vertical"> | ||||
|  | ||||
|         <androidx.recyclerview.widget.RecyclerView | ||||
|             android:id="@+id/full_recycler" | ||||
|             android:layout_width="match_parent" | ||||
|             android:layout_height="match_parent" | ||||
|             android:layout_marginStart="16dp" | ||||
|             android:layout_marginEnd="16dp" | ||||
|             android:clipToPadding="false" | ||||
|             android:paddingBottom="@dimen/fab_list_padding" | ||||
|             tools:listitem="@layout/chapters_item" /> | ||||
|  | ||||
|     </eu.kanade.tachiyomi.widget.ThemedSwipeRefreshLayout> | ||||
|  | ||||
|     <eu.kanade.tachiyomi.widget.MaterialFastScroll | ||||
|         android:id="@+id/fast_scroller" | ||||
|         android:layout_width="wrap_content" | ||||
|         android:layout_height="match_parent" | ||||
|         android:layout_centerHorizontal="true" | ||||
|         android:layout_gravity="end" | ||||
|         app:fastScrollerBubbleEnabled="false" | ||||
|         tools:visibility="visible" /> | ||||
|  | ||||
| </androidx.coordinatorlayout.widget.CoordinatorLayout> | ||||
| @@ -1,37 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="match_parent"> | ||||
|  | ||||
|     <com.google.android.material.appbar.AppBarLayout | ||||
|         android:id="@+id/appbar" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="wrap_content" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:layout_constraintTop_toTopOf="parent"> | ||||
|  | ||||
|         <com.google.android.material.appbar.MaterialToolbar | ||||
|             android:id="@+id/toolbar" | ||||
|             android:layout_width="match_parent" | ||||
|             android:layout_height="?attr/actionBarSize" | ||||
|             android:theme="?attr/actionBarTheme" | ||||
|             app:contentInsetStartWithNavigation="0dp" | ||||
|             app:menu="@menu/full_cover" | ||||
|             app:navigationIcon="@drawable/ic_close_24dp" /> | ||||
|  | ||||
|     </com.google.android.material.appbar.AppBarLayout> | ||||
|  | ||||
|     <eu.kanade.tachiyomi.ui.reader.viewer.ReaderPageImageView | ||||
|         android:id="@+id/container" | ||||
|         android:layout_width="0dp" | ||||
|         android:layout_height="0dp" | ||||
|         android:clipToPadding="false" | ||||
|         android:clipChildren="false" | ||||
|         app:layout_constraintBottom_toBottomOf="parent" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:layout_constraintTop_toBottomOf="@+id/appbar" /> | ||||
|  | ||||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||||
| @@ -1,220 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="wrap_content" | ||||
|     android:orientation="vertical" | ||||
|     tools:context=".ui.browse.source.browse.BrowseSourceController"> | ||||
|  | ||||
|     <ImageView | ||||
|         android:id="@+id/backdrop" | ||||
|         android:layout_width="0dp" | ||||
|         android:layout_height="0dp" | ||||
|         android:layout_marginBottom="-32dp" | ||||
|         android:alpha="0.2" | ||||
|         android:scaleType="centerCrop" | ||||
|         app:layout_constraintBottom_toBottomOf="@+id/manga_cover" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:layout_constraintTop_toTopOf="parent" | ||||
|         tools:background="@mipmap/ic_launcher" | ||||
|         tools:ignore="ContentDescription" /> | ||||
|  | ||||
|     <View | ||||
|         android:id="@+id/backdrop_overlay" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="0dp" | ||||
|         android:background="@drawable/manga_backdrop_gradient" | ||||
|         android:backgroundTint="?android:attr/colorBackground" | ||||
|         app:layout_constraintBottom_toBottomOf="@+id/backdrop" | ||||
|         app:layout_constraintTop_toTopOf="parent" /> | ||||
|  | ||||
|     <androidx.constraintlayout.widget.Barrier | ||||
|         android:id="@+id/manga_cover_barrier" | ||||
|         android:layout_width="wrap_content" | ||||
|         android:layout_height="wrap_content" | ||||
|         app:barrierDirection="top" | ||||
|         app:barrierMargin="16dp" | ||||
|         app:constraint_referenced_ids="manga_cover" | ||||
|         app:layout_constraintTop_toTopOf="@id/manga_cover" /> | ||||
|  | ||||
|     <ImageView | ||||
|         android:id="@+id/manga_cover" | ||||
|         android:layout_width="100dp" | ||||
|         android:layout_height="0dp" | ||||
|         android:layout_marginStart="16dp" | ||||
|         android:layout_marginTop="16dp" | ||||
|         android:background="@drawable/rounded_rectangle" | ||||
|         android:contentDescription="@string/description_cover" | ||||
|         android:maxWidth="100dp" | ||||
|         android:scaleType="centerCrop" | ||||
|         app:layout_constraintDimensionRatio="w,3:2" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:layout_constraintTop_toTopOf="parent" | ||||
|         tools:layout_height="133dp" | ||||
|         tools:src="@mipmap/ic_launcher" /> | ||||
|  | ||||
|     <LinearLayout | ||||
|         android:id="@+id/manga_detail" | ||||
|         android:layout_width="0dp" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:layout_marginStart="16dp" | ||||
|         android:layout_marginEnd="16dp" | ||||
|         android:gravity="center_vertical" | ||||
|         android:orientation="vertical" | ||||
|         app:layout_constraintBottom_toBottomOf="@id/manga_info_barrier" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toEndOf="@+id/manga_cover" | ||||
|         app:layout_constraintTop_toTopOf="@id/manga_cover_barrier"> | ||||
|  | ||||
|         <TextView | ||||
|             android:id="@+id/manga_full_title" | ||||
|             android:layout_width="match_parent" | ||||
|             android:layout_height="wrap_content" | ||||
|             android:text="@string/manga_info_full_title_label" | ||||
|             android:textAppearance="?attr/textAppearanceTitleLarge" | ||||
|             android:textIsSelectable="false" /> | ||||
|  | ||||
|         <TextView | ||||
|             android:id="@+id/manga_author" | ||||
|             android:layout_width="wrap_content" | ||||
|             android:layout_height="wrap_content" | ||||
|             android:layout_marginTop="4dp" | ||||
|             android:textAppearance="?attr/textAppearanceTitleSmall" | ||||
|             android:textColor="?android:attr/textColorSecondary" | ||||
|             android:textIsSelectable="false" | ||||
|             tools:text="Author" /> | ||||
|  | ||||
|         <TextView | ||||
|             android:id="@+id/manga_artist" | ||||
|             android:layout_width="wrap_content" | ||||
|             android:layout_height="wrap_content" | ||||
|             android:layout_marginTop="2dp" | ||||
|             android:textAppearance="?attr/textAppearanceTitleSmall" | ||||
|             android:textColor="?android:attr/textColorSecondary" | ||||
|             android:textIsSelectable="false" | ||||
|             tools:text="Artist" /> | ||||
|  | ||||
|         <LinearLayout | ||||
|             android:id="@+id/manga_status_row" | ||||
|             android:layout_width="wrap_content" | ||||
|             android:layout_height="wrap_content" | ||||
|             android:layout_marginTop="4dp"> | ||||
|  | ||||
|             <ImageView | ||||
|                 android:id="@+id/manga_status_icon" | ||||
|                 android:layout_width="16dp" | ||||
|                 android:layout_height="match_parent" | ||||
|                 android:layout_marginEnd="4dp" | ||||
|                 app:srcCompat="@drawable/ic_status_unknown_24dp" | ||||
|                 app:tint="?android:attr/textColorSecondary" | ||||
|                 tools:ignore="ContentDescription" /> | ||||
|  | ||||
|             <TextView | ||||
|                 android:id="@+id/manga_status" | ||||
|                 android:layout_width="wrap_content" | ||||
|                 android:layout_height="match_parent" | ||||
|                 android:ellipsize="end" | ||||
|                 android:maxLines="1" | ||||
|                 android:textAppearance="?attr/textAppearanceBodyMedium" | ||||
|                 android:textColor="?android:attr/textColorSecondary" | ||||
|                 android:textIsSelectable="false" | ||||
|                 tools:text="Status" /> | ||||
|  | ||||
|             <TextView | ||||
|                 android:layout_width="wrap_content" | ||||
|                 android:layout_height="wrap_content" | ||||
|                 android:layout_marginStart="4dp" | ||||
|                 android:layout_marginEnd="4dp" | ||||
|                 android:text="•" | ||||
|                 android:textAppearance="?attr/textAppearanceBodyMedium" | ||||
|                 android:textColor="?android:attr/textColorSecondary" | ||||
|                 android:textIsSelectable="false" | ||||
|                 tools:ignore="HardcodedText" /> | ||||
|  | ||||
|             <ImageView | ||||
|                 android:id="@+id/manga_missing_source_icon" | ||||
|                 android:layout_width="16dp" | ||||
|                 android:layout_height="match_parent" | ||||
|                 android:layout_marginEnd="4dp" | ||||
|                 app:srcCompat="@drawable/ic_warning_white_24dp" | ||||
|                 app:tint="@color/error" | ||||
|                 tools:ignore="ContentDescription" /> | ||||
|  | ||||
|             <TextView | ||||
|                 android:id="@+id/manga_source" | ||||
|                 android:layout_width="wrap_content" | ||||
|                 android:layout_height="wrap_content" | ||||
|                 android:ellipsize="end" | ||||
|                 android:maxLines="1" | ||||
|                 android:textAppearance="?attr/textAppearanceBodyMedium" | ||||
|                 android:textColor="?android:attr/textColorSecondary" | ||||
|                 android:textIsSelectable="false" | ||||
|                 tools:text="Source" /> | ||||
|  | ||||
|         </LinearLayout> | ||||
|  | ||||
|     </LinearLayout> | ||||
|  | ||||
|     <androidx.constraintlayout.widget.Barrier | ||||
|         android:id="@+id/manga_info_barrier" | ||||
|         android:layout_width="wrap_content" | ||||
|         android:layout_height="wrap_content" | ||||
|         app:barrierDirection="bottom" | ||||
|         app:constraint_referenced_ids="manga_cover,manga_detail" /> | ||||
|  | ||||
|     <LinearLayout | ||||
|         android:id="@+id/manga_actions" | ||||
|         android:layout_width="0dp" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:layout_marginStart="16dp" | ||||
|         android:layout_marginTop="4dp" | ||||
|         android:layout_marginEnd="16dp" | ||||
|         android:orientation="horizontal" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:layout_constraintTop_toBottomOf="@id/manga_info_barrier"> | ||||
|  | ||||
|         <com.google.android.material.button.MaterialButton | ||||
|             android:id="@+id/btn_favorite" | ||||
|             style="@style/Widget.Tachiyomi.Button.ActionButton" | ||||
|             android:layout_width="0dp" | ||||
|             android:layout_height="wrap_content" | ||||
|             android:layout_weight="1" | ||||
|             android:text="@string/add_to_library" | ||||
|             app:icon="@drawable/ic_favorite_border_24dp" /> | ||||
|  | ||||
|         <com.google.android.material.button.MaterialButton | ||||
|             android:id="@+id/btn_tracking" | ||||
|             style="@style/Widget.Tachiyomi.Button.ActionButton" | ||||
|             android:layout_width="0dp" | ||||
|             android:layout_height="wrap_content" | ||||
|             android:layout_weight="1" | ||||
|             android:text="@string/manga_tracking_tab" | ||||
|             android:visibility="gone" | ||||
|             app:icon="@drawable/ic_sync_24dp" | ||||
|             tools:visibility="visible" /> | ||||
|  | ||||
|         <com.google.android.material.button.MaterialButton | ||||
|             android:id="@+id/btn_webview" | ||||
|             style="@style/Widget.Tachiyomi.Button.ActionButton" | ||||
|             android:layout_width="0dp" | ||||
|             android:layout_height="wrap_content" | ||||
|             android:layout_weight="1" | ||||
|             android:text="@string/action_web_view" | ||||
|             android:visibility="gone" | ||||
|             app:icon="@drawable/ic_public_24dp" | ||||
|             tools:visibility="visible" /> | ||||
|  | ||||
|     </LinearLayout> | ||||
|  | ||||
|     <eu.kanade.tachiyomi.widget.MangaSummaryView | ||||
|         android:id="@+id/manga_summary_section" | ||||
|         android:layout_width="0dp" | ||||
|         android:layout_height="wrap_content" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:layout_constraintTop_toBottomOf="@id/manga_actions" /> | ||||
|  | ||||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||||
| @@ -1,94 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
|     xmlns:tools="http://schemas.android.com/tools" | ||||
|     android:layout_width="match_parent" | ||||
|     android:layout_height="wrap_content"> | ||||
|  | ||||
|     <TextView | ||||
|         android:id="@+id/description_text" | ||||
|         android:layout_width="0dp" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:layout_marginHorizontal="16dp" | ||||
|         android:ellipsize="end" | ||||
|         android:textAppearance="?attr/textAppearanceBodyMedium" | ||||
|         android:textColor="?android:attr/textColorSecondary" | ||||
|         android:textIsSelectable="false" | ||||
|         app:firstBaselineToTopHeight="0dp" | ||||
|         app:lastBaselineToBottomHeight="0dp" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:layout_constraintTop_toTopOf="parent" | ||||
|         tools:text="Collapsed summary content Collapsed summary content Collapsed summary content Collapsed summary content Collapsed summary content Collapsed summary content" /> | ||||
|  | ||||
|     <View | ||||
|         android:id="@+id/description_scrim" | ||||
|         android:layout_width="0dp" | ||||
|         android:layout_height="24sp" | ||||
|         android:background="@drawable/manga_info_gradient" | ||||
|         android:backgroundTint="?android:attr/colorBackground" | ||||
|         app:layout_constraintBottom_toBottomOf="@+id/description_text" | ||||
|         app:layout_constraintEnd_toEndOf="@+id/description_text" | ||||
|         app:layout_constraintStart_toStartOf="@+id/description_text" /> | ||||
|  | ||||
|     <View | ||||
|         android:id="@+id/toggle_more_scrim" | ||||
|         android:layout_width="36sp" | ||||
|         android:layout_height="18sp" | ||||
|         android:background="@drawable/manga_info_more_gradient" | ||||
|         android:backgroundTint="?android:attr/colorBackground" | ||||
|         app:layout_constraintBottom_toBottomOf="@+id/toggle_more" | ||||
|         app:layout_constraintEnd_toEndOf="@+id/toggle_more" | ||||
|         app:layout_constraintStart_toStartOf="@+id/toggle_more" | ||||
|         app:layout_constraintTop_toTopOf="@+id/toggle_more" /> | ||||
|  | ||||
|     <ImageButton | ||||
|         android:id="@+id/toggle_more" | ||||
|         style="@style/Widget.Tachiyomi.Button.InlineButton" | ||||
|         android:layout_width="wrap_content" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:layout_marginBottom="-6dp" | ||||
|         android:background="@android:color/transparent" | ||||
|         android:contentDescription="@string/manga_info_expand" | ||||
|         android:padding="0dp" | ||||
|         android:src="@drawable/anim_caret_down" | ||||
|         app:layout_constraintBottom_toBottomOf="@id/description_text" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:tint="?android:attr/textColorPrimary" /> | ||||
|  | ||||
|     <HorizontalScrollView | ||||
|         android:id="@+id/tag_chips_shrunk_container" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:requiresFadingEdge="horizontal" | ||||
|         android:scrollbars="none" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:layout_constraintTop_toBottomOf="@+id/toggle_more"> | ||||
|  | ||||
|         <com.google.android.material.chip.ChipGroup | ||||
|             android:id="@+id/tag_chips_shrunk" | ||||
|             android:layout_width="wrap_content" | ||||
|             android:layout_height="wrap_content" | ||||
|             android:paddingHorizontal="16dp" | ||||
|             android:paddingVertical="8dp" | ||||
|             app:chipSpacingHorizontal="4dp" | ||||
|             app:singleLine="true" /> | ||||
|  | ||||
|     </HorizontalScrollView> | ||||
|  | ||||
|     <com.google.android.material.chip.ChipGroup | ||||
|         android:id="@+id/tag_chips_expanded" | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="wrap_content" | ||||
|         android:paddingHorizontal="16dp" | ||||
|         android:paddingVertical="8dp" | ||||
|         android:visibility="gone" | ||||
|         app:chipSpacingHorizontal="4dp" | ||||
|         app:layout_constraintEnd_toEndOf="parent" | ||||
|         app:layout_constraintStart_toStartOf="parent" | ||||
|         app:layout_constraintTop_toBottomOf="@+id/toggle_more" | ||||
|         tools:visibility="visible" /> | ||||
|  | ||||
| </androidx.constraintlayout.widget.ConstraintLayout> | ||||
| @@ -1,24 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <menu xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
|     xmlns:android="http://schemas.android.com/apk/res/android"> | ||||
|  | ||||
|     <item | ||||
|         android:id="@+id/action_share_cover" | ||||
|         android:icon="@drawable/ic_share_24dp" | ||||
|         android:title="@string/action_share" | ||||
|         app:iconTint="?attr/colorOnSurface" | ||||
|         app:showAsAction="ifRoom" /> | ||||
|     <item | ||||
|         android:id="@+id/action_save_cover" | ||||
|         android:icon="@drawable/ic_save_24dp" | ||||
|         android:title="@string/action_save" | ||||
|         app:iconTint="?attr/colorOnSurface" | ||||
|         app:showAsAction="ifRoom" /> | ||||
|     <item | ||||
|         android:id="@+id/action_edit_cover" | ||||
|         android:icon="@drawable/ic_edit_24dp" | ||||
|         android:title="@string/action_edit" | ||||
|         app:iconTint="?attr/colorOnSurface" | ||||
|         app:showAsAction="ifRoom" /> | ||||
|  | ||||
| </menu> | ||||
| @@ -1,49 +0,0 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <menu xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|     xmlns:app="http://schemas.android.com/apk/res-auto"> | ||||
|  | ||||
|     <item | ||||
|         android:id="@+id/action_share" | ||||
|         android:icon="@drawable/ic_share_24dp" | ||||
|         android:title="@string/action_share" | ||||
|         app:iconTint="?attr/colorOnSurface" | ||||
|         app:showAsAction="ifRoom" /> | ||||
|  | ||||
|     <item | ||||
|         android:id="@+id/download_group" | ||||
|         android:icon="@drawable/ic_get_app_24dp" | ||||
|         android:title="@string/manga_download" | ||||
|         app:iconTint="?attr/colorOnSurface" | ||||
|         app:showAsAction="ifRoom"> | ||||
|         <menu> | ||||
|             <item | ||||
|                 android:id="@+id/download_next" | ||||
|                 android:title="@string/download_1" /> | ||||
|             <item | ||||
|                 android:id="@+id/download_next_5" | ||||
|                 android:title="@string/download_5" /> | ||||
|             <item | ||||
|                 android:id="@+id/download_next_10" | ||||
|                 android:title="@string/download_10" /> | ||||
|             <item | ||||
|                 android:id="@+id/download_custom" | ||||
|                 android:title="@string/download_custom" /> | ||||
|             <item | ||||
|                 android:id="@+id/download_unread" | ||||
|                 android:title="@string/download_unread" /> | ||||
|             <item | ||||
|                 android:id="@+id/download_all" | ||||
|                 android:title="@string/download_all" /> | ||||
|         </menu> | ||||
|     </item> | ||||
|  | ||||
|     <item | ||||
|         android:id="@+id/action_edit_categories" | ||||
|         android:title="@string/action_edit_categories" | ||||
|         app:showAsAction="never" /> | ||||
|  | ||||
|     <item | ||||
|         android:id="@+id/action_migrate" | ||||
|         android:title="@string/action_migrate" | ||||
|         app:showAsAction="never" /> | ||||
| </menu> | ||||
		Reference in New Issue
	
	Block a user