Run formatter on drawables and layouts

(cherry picked from commit dbe8931cf0a3839b10ec3deed9c0a262a493d891)

# Conflicts:
#	app/src/main/res/drawable/ic_launcher_foreground.xml
#	app/src/main/res/layout/main_activity.xml
#	app/src/main/res/layout/manga_info_header.xml
#	app/src/main/res/layout/reader_activity.xml
#	app/src/main/res/layout/reader_general_settings.xml
This commit is contained in:
arkon 2021-05-22 12:02:49 -04:00 committed by Jobobby04
parent 623b64aa79
commit 1518c2aa25
32 changed files with 107 additions and 108 deletions

View File

@ -1,7 +1,6 @@
<shape <shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<solid android:color="@android:color/transparent"/> <solid android:color="@android:color/transparent" />
<size <size
android:width="32dp" android:width="32dp"
android:height="32dp" /> android:height="32dp" />

View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" > android:shape="rectangle">
<gradient <gradient
android:angle="90" android:angle="90"
android:startColor="#aa000000"
android:centerColor="#00000000" android:centerColor="#00000000"
android:endColor="#00ffffff"/> android:endColor="#00ffffff"
android:startColor="#aa000000" />
<corners android:radius="0dp" /> <corners android:radius="0dp" />
</shape> </shape>

View File

@ -5,5 +5,5 @@
android:viewportHeight="24"> android:viewportHeight="24">
<path <path
android:fillColor="@android:color/black" android:fillColor="@android:color/black"
android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM17,13H7v-2h10V13z"/> android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM17,13H7v-2h10V13z" />
</vector> </vector>

View File

@ -1,9 +1,8 @@
<vector <vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp" android:width="108dp"
android:height="108dp" android:height="108dp"
android:viewportWidth="108" android:viewportWidth="108.0"
android:viewportHeight="108"> android:viewportHeight="108.0">
<group android:scaleX="0.07776" <group android:scaleX="0.07776"
android:scaleY="0.07776" android:scaleY="0.07776"
android:translateX="15.12" android:translateX="15.12"

View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" > android:shape="rectangle">
<gradient <gradient
android:angle="90" android:angle="90"
android:startColor="#ffffffff" android:endColor="#00ffffff"
android:endColor="#00ffffff"/> android:startColor="#ffffffff" />
<corners android:radius="0dp" /> <corners android:radius="0dp" />
</shape> </shape>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple android:color="?attr/rippleColor" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" > android:color="?attr/rippleColor">
<item android:drawable="@color/backgroundDark" /> <item android:drawable="@color/backgroundDark" />
</ripple> </ripple>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple android:color="?attr/rippleColor" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" > android:color="?attr/rippleColor">
<item android:drawable="@color/backgroundLight" /> <item android:drawable="@color/backgroundLight" />
</ripple> </ripple>

View File

@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ripple android:color="?attr/rippleColor" <ripple xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android" /> android:color="?attr/rippleColor" />

View File

@ -2,8 +2,8 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp" android:width="48dp"
android:height="48dp" android:height="48dp"
android:viewportHeight="48" android:viewportWidth="48"
android:viewportWidth="48"> android:viewportHeight="48">
<path <path
android:fillColor="@color/colorPrimary" android:fillColor="@color/colorPrimary"
@ -14,9 +14,9 @@
android:translateY="12"> android:translateY="12">
<path <path
android:fillColor="@color/textColorPrimaryDark" android:fillColor="@color/textColorPrimaryDark"
android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6z"/> android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6z" />
<path <path
android:fillColor="@color/textColorPrimaryDark" android:fillColor="@color/textColorPrimaryDark"
android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,12l-2.5,-1.5L15,12L15,4h5v8z"/> android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,12l-2.5,-1.5L15,12L15,4h5v8z" />
</group> </group>
</vector> </vector>

View File

@ -2,8 +2,8 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp" android:width="48dp"
android:height="48dp" android:height="48dp"
android:viewportHeight="48" android:viewportWidth="48"
android:viewportWidth="48"> android:viewportHeight="48">
<path <path
android:fillColor="@color/colorPrimary" android:fillColor="@color/colorPrimary"

View File

@ -2,8 +2,8 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp" android:width="48dp"
android:height="48dp" android:height="48dp"
android:viewportHeight="48" android:viewportWidth="48"
android:viewportWidth="48"> android:viewportHeight="48">
<path <path
android:fillColor="@color/colorPrimary" android:fillColor="@color/colorPrimary"

View File

@ -2,8 +2,8 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="48dp" android:width="48dp"
android:height="48dp" android:height="48dp"
android:viewportHeight="48" android:viewportWidth="48"
android:viewportWidth="48"> android:viewportHeight="48">
<path <path
android:fillColor="@color/colorPrimary" android:fillColor="@color/colorPrimary"

View File

@ -4,8 +4,8 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="42dp" android:layout_width="42dp"
android:layout_height="42dp" android:layout_height="42dp"
android:padding="8dp" android:background="@drawable/ripple_regular"
android:background="@drawable/ripple_regular"> android:padding="8dp">
<ImageView <ImageView
android:id="@+id/download_icon" android:id="@+id/download_icon"

View File

@ -54,8 +54,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="4dp" android:paddingStart="4dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

View File

@ -21,11 +21,11 @@
app:layout_constraintEnd_toStartOf="@+id/menu" app:layout_constraintEnd_toStartOf="@+id/menu"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:tabRippleColor="?attr/rippleColor"
app:tabTextColor="@color/tabs_selector_background"
app:tabIndicatorColor="?attr/colorAccent"
app:tabGravity="fill" app:tabGravity="fill"
app:tabMode="fixed" /> app:tabIndicatorColor="?attr/colorAccent"
app:tabMode="fixed"
app:tabRippleColor="?attr/rippleColor"
app:tabTextColor="@color/tabs_selector_background" />
<ImageButton <ImageButton
android:id="@+id/menu" android:id="@+id/menu"

View File

@ -38,8 +38,8 @@
android:id="@+id/chapter_title" android:id="@+id/chapter_title"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginEnd="8dp"
android:layout_toEndOf="@id/reorder" android:layout_toEndOf="@id/reorder"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
@ -91,8 +91,8 @@
android:layout_toEndOf="@id/download_progress_text" android:layout_toEndOf="@id/download_progress_text"
android:background="@drawable/ripple_regular" android:background="@drawable/ripple_regular"
android:contentDescription="@string/action_menu" android:contentDescription="@string/action_menu"
android:paddingVertical="16dp"
android:paddingHorizontal="10dp" android:paddingHorizontal="10dp"
android:paddingVertical="16dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"

View File

@ -82,8 +82,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
app:itemIconTint="@color/nav_selector" app:itemIconTint="@color/nav_selector"
app:itemTextColor="@color/nav_selector"
app:itemRippleColor="?attr/rippleNavColor" app:itemRippleColor="?attr/rippleNavColor"
app:itemTextColor="@color/nav_selector"
app:labelVisibilityMode="labeled"
app:layout_insetEdge="bottom" app:layout_insetEdge="bottom"
app:menu="@menu/main_nav" /> app:menu="@menu/main_nav" />

View File

@ -142,10 +142,10 @@
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:text="@string/add_to_library" android:text="@string/add_to_library"
app:icon="@drawable/ic_favorite_border_24dp" app:icon="@drawable/ic_favorite_border_24dp"
app:rippleColor="?attr/rippleColor"
app:layout_constraintEnd_toStartOf="@+id/btn_tracking" app:layout_constraintEnd_toStartOf="@+id/btn_tracking"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/manga_info" /> app:layout_constraintTop_toBottomOf="@+id/manga_info"
app:rippleColor="?attr/rippleColor" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/btn_tracking" android:id="@+id/btn_tracking"
@ -155,10 +155,10 @@
android:text="@string/manga_tracking_tab" android:text="@string/manga_tracking_tab"
android:visibility="gone" android:visibility="gone"
app:icon="@drawable/ic_sync_24dp" app:icon="@drawable/ic_sync_24dp"
app:rippleColor="?attr/rippleColor"
app:layout_constraintEnd_toStartOf="@+id/btn_webview" app:layout_constraintEnd_toStartOf="@+id/btn_webview"
app:layout_constraintStart_toEndOf="@+id/btn_favorite" app:layout_constraintStart_toEndOf="@+id/btn_favorite"
app:layout_constraintTop_toBottomOf="@+id/manga_info" app:layout_constraintTop_toBottomOf="@+id/manga_info"
app:rippleColor="?attr/rippleColor"
tools:visibility="visible" /> tools:visibility="visible" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
@ -169,10 +169,10 @@
android:text="@string/action_web_view" android:text="@string/action_web_view"
android:visibility="gone" android:visibility="gone"
app:icon="@drawable/ic_public_24dp" app:icon="@drawable/ic_public_24dp"
app:rippleColor="?attr/rippleColor"
app:layout_constraintEnd_toStartOf="@+id/btn_merge" app:layout_constraintEnd_toStartOf="@+id/btn_merge"
app:layout_constraintStart_toEndOf="@+id/btn_tracking" app:layout_constraintStart_toEndOf="@+id/btn_tracking"
app:layout_constraintTop_toBottomOf="@+id/manga_info" app:layout_constraintTop_toBottomOf="@+id/manga_info"
app:rippleColor="?attr/rippleColor"
tools:visibility="visible" /> tools:visibility="visible" />
@ -185,10 +185,10 @@
android:text="@string/merge" android:text="@string/merge"
android:visibility="gone" android:visibility="gone"
app:icon="@drawable/ic_merge_type_24dp" app:icon="@drawable/ic_merge_type_24dp"
app:rippleColor="?attr/rippleColor"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/btn_webview" app:layout_constraintStart_toEndOf="@+id/btn_webview"
app:layout_constraintTop_toBottomOf="@+id/manga_info" app:layout_constraintTop_toBottomOf="@+id/manga_info"
app:rippleColor="?attr/rippleColor"
tools:visibility="visible" /> tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

View File

@ -4,8 +4,8 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/listPreferredItemHeightSmall" android:layout_height="?attr/listPreferredItemHeightSmall"
android:gravity="center_vertical"
android:background="?android:attr/colorBackground" android:background="?android:attr/colorBackground"
android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="?attr/listPreferredItemPaddingStart" android:paddingStart="?attr/listPreferredItemPaddingStart"
android:paddingEnd="?attr/listPreferredItemPaddingEnd"> android:paddingEnd="?attr/listPreferredItemPaddingEnd">

View File

@ -12,10 +12,10 @@
android:id="@+id/nav_view_item_text" android:id="@+id/nav_view_item_text"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1" android:layout_weight="1"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:layout_gravity="center"
android:paddingEnd="8dp" android:paddingEnd="8dp"
tools:text="Filter:" /> tools:text="Filter:" />

View File

@ -15,9 +15,9 @@
android:id="@+id/switch_color_filter" android:id="@+id/switch_color_filter"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/pref_custom_color_filter"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:text="@string/pref_custom_color_filter"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -102,8 +102,8 @@
android:id="@+id/txt_color_filter_blue_symbol" android:id="@+id/txt_color_filter_blue_symbol"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/color_filter_b_value"
android:paddingStart="16dp" android:paddingStart="16dp"
android:text="@string/color_filter_b_value"
android:textAppearance="@style/TextAppearance.Medium.SubHeading" android:textAppearance="@style/TextAppearance.Medium.SubHeading"
app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_blue" app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_blue"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -162,8 +162,8 @@
android:id="@+id/txt_color_filter_alpha_value" android:id="@+id/txt_color_filter_alpha_value"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginEnd="16dp"
android:textAppearance="@style/TextAppearance.Medium.SubHeading" android:textAppearance="@style/TextAppearance.Medium.SubHeading"
app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_alpha" app:layout_constraintBottom_toBottomOf="@id/seekbar_color_filter_alpha"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -187,8 +187,8 @@
android:id="@+id/grayscale" android:id="@+id/grayscale"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingEnd="16dp"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp"
android:text="@string/pref_grayscale" android:text="@string/pref_grayscale"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
app:layout_constraintTop_toBottomOf="@id/color_filter_mode" /> app:layout_constraintTop_toBottomOf="@id/color_filter_mode" />
@ -200,8 +200,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:paddingEnd="16dp"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp"
android:text="@string/pref_custom_brightness" android:text="@string/pref_custom_brightness"
app:layout_constraintTop_toBottomOf="@id/grayscale" /> app:layout_constraintTop_toBottomOf="@id/grayscale" />

View File

@ -23,8 +23,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:textColor="?android:attr/textColorSecondary" android:text="@string/pref_show_page_number"
android:text="@string/pref_show_page_number" /> android:textColor="?android:attr/textColorSecondary" />
<com.google.android.material.switchmaterial.SwitchMaterial <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/force_horz_seekbar" android:id="@+id/force_horz_seekbar"
@ -32,8 +32,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:textColor="?android:attr/textColorSecondary" android:text="@string/pref_force_horz_seekbar"
android:text="@string/pref_force_horz_seekbar" /> android:textColor="?android:attr/textColorSecondary" />
<com.google.android.material.switchmaterial.SwitchMaterial <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/landscape_vertical_seekbar" android:id="@+id/landscape_vertical_seekbar"
@ -41,8 +41,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:textColor="?android:attr/textColorSecondary" android:text="@string/pref_show_vert_seekbar_landscape"
android:text="@string/pref_show_vert_seekbar_landscape" /> android:textColor="?android:attr/textColorSecondary" />
<com.google.android.material.switchmaterial.SwitchMaterial <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/left_vertical_seekbar" android:id="@+id/left_vertical_seekbar"
@ -50,8 +50,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:textColor="?android:attr/textColorSecondary" android:text="@string/pref_left_handed_vertical_seekbar"
android:text="@string/pref_left_handed_vertical_seekbar" /> android:textColor="?android:attr/textColorSecondary" />
<com.google.android.material.switchmaterial.SwitchMaterial <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/fullscreen" android:id="@+id/fullscreen"
@ -59,8 +59,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:textColor="?android:attr/textColorSecondary" android:text="@string/pref_fullscreen"
android:text="@string/pref_fullscreen" /> android:textColor="?android:attr/textColorSecondary" />
<com.google.android.material.switchmaterial.SwitchMaterial <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/cutout_short" android:id="@+id/cutout_short"
@ -68,8 +68,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/pref_cutout_short" android:text="@string/pref_cutout_short"
android:textColor="?android:attr/textColorSecondary"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" /> tools:visibility="visible" />
@ -79,8 +79,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:textColor="?android:attr/textColorSecondary" android:text="@string/pref_keep_screen_on"
android:text="@string/pref_keep_screen_on" /> android:textColor="?android:attr/textColorSecondary" />
<com.google.android.material.switchmaterial.SwitchMaterial <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/long_tap" android:id="@+id/long_tap"
@ -88,8 +88,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:textColor="?android:attr/textColorSecondary" android:text="@string/pref_read_with_long_tap"
android:text="@string/pref_read_with_long_tap" /> android:textColor="?android:attr/textColorSecondary" />
<com.google.android.material.switchmaterial.SwitchMaterial <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/always_show_chapter_transition" android:id="@+id/always_show_chapter_transition"
@ -97,8 +97,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:textColor="?android:attr/textColorSecondary" android:text="@string/pref_always_show_chapter_transition"
android:text="@string/pref_always_show_chapter_transition" /> android:textColor="?android:attr/textColorSecondary" />
<com.google.android.material.switchmaterial.SwitchMaterial <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/auto_webtoon_mode" android:id="@+id/auto_webtoon_mode"
@ -106,8 +106,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:textColor="?android:attr/textColorSecondary" android:text="@string/auto_webtoon_mode"
android:text="@string/auto_webtoon_mode" /> android:textColor="?android:attr/textColorSecondary" />
</LinearLayout> </LinearLayout>

View File

@ -10,9 +10,9 @@
android:id="@+id/pager_prefs" android:id="@+id/pager_prefs"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/pager_viewer"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:text="@string/pager_viewer"
android:textAppearance="@style/TextAppearance.Medium.SubHeading" /> android:textAppearance="@style/TextAppearance.Medium.SubHeading" />
<eu.kanade.tachiyomi.widget.MaterialSpinnerView <eu.kanade.tachiyomi.widget.MaterialSpinnerView
@ -49,8 +49,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:textColor="?android:attr/textColorSecondary" android:text="@string/pref_crop_borders"
android:text="@string/pref_crop_borders" /> android:textColor="?android:attr/textColorSecondary" />
<com.google.android.material.switchmaterial.SwitchMaterial <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/dual_page_split" android:id="@+id/dual_page_split"
@ -58,8 +58,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:textColor="?android:attr/textColorSecondary" android:text="@string/pref_dual_page_split"
android:text="@string/pref_dual_page_split" /> android:textColor="?android:attr/textColorSecondary" />
<com.google.android.material.switchmaterial.SwitchMaterial <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/dual_page_invert" android:id="@+id/dual_page_invert"
@ -67,8 +67,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/pref_dual_page_invert" android:text="@string/pref_dual_page_invert"
android:textColor="?android:attr/textColorSecondary"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" /> tools:visibility="visible" />

View File

@ -14,10 +14,10 @@
android:id="@+id/for_this_series_prefs" android:id="@+id/for_this_series_prefs"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/pref_category_for_this_series" android:layout_marginTop="16dp"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:layout_marginTop="16dp" android:text="@string/pref_category_for_this_series"
android:textAppearance="@style/TextAppearance.Medium.SubHeading" /> android:textAppearance="@style/TextAppearance.Medium.SubHeading" />
<eu.kanade.tachiyomi.widget.MaterialSpinnerView <eu.kanade.tachiyomi.widget.MaterialSpinnerView

View File

@ -10,9 +10,9 @@
android:id="@+id/webtoon_prefs" android:id="@+id/webtoon_prefs"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/webtoon_viewer"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:text="@string/webtoon_viewer"
android:textAppearance="@style/TextAppearance.Medium.SubHeading" /> android:textAppearance="@style/TextAppearance.Medium.SubHeading" />
<eu.kanade.tachiyomi.widget.MaterialSpinnerView <eu.kanade.tachiyomi.widget.MaterialSpinnerView
@ -42,8 +42,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:textColor="?android:attr/textColorSecondary" android:text="@string/pref_crop_borders"
android:text="@string/pref_crop_borders" /> android:textColor="?android:attr/textColorSecondary" />
<com.google.android.material.switchmaterial.SwitchMaterial <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/page_transitions_webtoon" android:id="@+id/page_transitions_webtoon"
@ -69,17 +69,17 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:textColor="?android:attr/textColorSecondary" android:text="@string/pref_dual_page_split"
android:text="@string/pref_dual_page_split" /> android:textColor="?android:attr/textColorSecondary" />
<com.google.android.material.switchmaterial.SwitchMaterial <com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/dual_page_invert" android:id="@+id/dual_page_invert"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp" android:paddingEnd="16dp"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondary"
android:text="@string/pref_dual_page_invert" android:text="@string/pref_dual_page_invert"
android:textColor="?android:attr/textColorSecondary"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" /> tools:visibility="visible" />

View File

@ -57,8 +57,8 @@
android:layout_height="0dp" android:layout_height="0dp"
android:layout_gravity="top" android:layout_gravity="top"
android:layout_weight="1" android:layout_weight="1"
android:paddingBottom="8dp"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false" /> android:clipToPadding="false"
android:paddingBottom="8dp" />
</LinearLayout> </LinearLayout>

View File

@ -48,7 +48,7 @@
app:layout_constraintStart_toEndOf="@id/image" app:layout_constraintStart_toEndOf="@id/image"
app:layout_constraintTop_toBottomOf="@+id/title" app:layout_constraintTop_toBottomOf="@+id/title"
tools:text="English" tools:text="English"
tools:visibility="visible"/> tools:visibility="visible" />
<Button <Button
android:id="@+id/source_latest" android:id="@+id/source_latest"

View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout 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" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:padding="8dp"> android:padding="8dp">
<com.google.android.material.progressindicator.CircularProgressIndicator <com.google.android.material.progressindicator.CircularProgressIndicator

View File

@ -15,13 +15,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:textColor="?android:attr/textColorSecondary"
android:paddingEnd="8dp" android:paddingEnd="8dp"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@+id/center_guideline" app:layout_constraintEnd_toStartOf="@+id/center_guideline"
app:layout_constraintHorizontal_bias="0.0" app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Title" /> tools:text="Title" />
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView

View File

@ -4,7 +4,7 @@
android:id="@+id/track_recycler" android:id="@+id/track_recycler"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:clipToPadding="false"
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:clipToPadding="false"
tools:listitem="@layout/track_item" /> tools:listitem="@layout/track_item" />

View File

@ -148,8 +148,8 @@
android:gravity="center" android:gravity="center"
android:maxLines="1" android:maxLines="1"
android:padding="16dp" android:padding="16dp"
app:layout_constraintStart_toEndOf="@+id/vert_divider_2"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/vert_divider_2"
app:layout_constraintTop_toBottomOf="@+id/top_divider" app:layout_constraintTop_toBottomOf="@+id/top_divider"
tools:text="10" /> tools:text="10" />
@ -159,8 +159,8 @@
android:layout_height="1dp" android:layout_height="1dp"
android:alpha="0.25" android:alpha="0.25"
android:background="?android:attr/textColorHint" android:background="?android:attr/textColorHint"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/track_score" /> app:layout_constraintTop_toBottomOf="@+id/track_score" />
<TextView <TextView
@ -173,8 +173,8 @@
android:gravity="center" android:gravity="center"
android:maxLines="1" android:maxLines="1"
android:padding="16dp" android:padding="16dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/vert_divider_3" app:layout_constraintEnd_toStartOf="@+id/vert_divider_3"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/bottom_divider" app:layout_constraintTop_toBottomOf="@+id/bottom_divider"
tools:text="4/16/2020" /> tools:text="4/16/2020" />
@ -187,8 +187,8 @@
android:alpha="0.25" android:alpha="0.25"
android:background="?android:attr/textColorHint" android:background="?android:attr/textColorHint"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/track_start_date"
app:layout_constraintEnd_toStartOf="@+id/track_finish_date" app:layout_constraintEnd_toStartOf="@+id/track_finish_date"
app:layout_constraintStart_toEndOf="@+id/track_start_date"
app:layout_constraintTop_toTopOf="@+id/bottom_divider" /> app:layout_constraintTop_toTopOf="@+id/bottom_divider" />
<TextView <TextView
@ -201,8 +201,8 @@
android:gravity="center" android:gravity="center"
android:maxLines="1" android:maxLines="1"
android:padding="16dp" android:padding="16dp"
app:layout_constraintStart_toEndOf="@+id/vert_divider_3"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/vert_divider_3"
app:layout_constraintTop_toBottomOf="@+id/bottom_divider" app:layout_constraintTop_toBottomOf="@+id/bottom_divider"
tools:text="4/16/2020" /> tools:text="4/16/2020" />

View File

@ -55,8 +55,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="4dp" android:paddingStart="4dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>