mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-10-30 22:07:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migrate to MaterialComponents themes

Browse Source
This commit is contained in:
arkon
2020-03-11 19:08:57 -04:00
parent 2615b067e2
commit 7d0ea614da
42 changed files with 174 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/CatalogueAdapter.kt
View File

@@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.util.system.getResourceColor
class CatalogueAdapter(val controller: CatalogueController) :
FlexibleAdapter<IFlexible<*>>(null, controller, true) {
val cardBackground = controller.activity!!.getResourceColor(R.attr.background_card)
val cardBackground = controller.activity!!.getResourceColor(R.attr.colorSurface)
init {
setDisplayHeadersAtStartUp(true)

2
app/src/main/java/eu/kanade/tachiyomi/ui/extension/ExtensionAdapter.kt
View File

@@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.util.system.getResourceColor
class ExtensionAdapter(val controller: ExtensionController) :
FlexibleAdapter<IFlexible<*>>(null, controller, true) {
val cardBackground = controller.activity!!.getResourceColor(R.attr.background_card)
val cardBackground = controller.activity!!.getResourceColor(R.attr.colorSurface)
init {
setDisplayHeadersAtStartUp(true)

2
app/src/main/java/eu/kanade/tachiyomi/ui/migration/SourceAdapter.kt
View File

@@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.util.system.getResourceColor
class SourceAdapter(val controller: MigrationController) :
FlexibleAdapter<IFlexible<*>>(null, controller, true) {
val cardBackground = controller.activity!!.getResourceColor(R.attr.background_card)
val cardBackground = controller.activity!!.getResourceColor(R.attr.colorSurface)
private var items: List<IFlexible<*>>? = null

2
app/src/main/java/eu/kanade/tachiyomi/widget/preference/LoginDialogPreference.kt
View File

@@ -50,7 +50,7 @@ abstract class LoginDialogPreference(private val usernameLabel: String? = null,
}
if (!usernameLabel.isNullOrEmpty()) {
username_label.text = usernameLabel
username_label.hint = usernameLabel
}
login.setMode(ActionProcessButton.Mode.ENDLESS)

3
app/src/main/java/eu/kanade/tachiyomi/widget/preference/SwitchPreferenceCategory.kt
View File

@@ -1,9 +1,7 @@
package eu.kanade.tachiyomi.widget.preference
import android.annotation.TargetApi
import android.content.Context
import android.content.res.TypedArray
import android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH
import android.util.AttributeSet
import android.view.View
import android.widget.Checkable
@@ -41,7 +39,6 @@ class SwitchPreferenceCategory @JvmOverloads constructor(
syncSwitchView(switchView)
}
@TargetApi(ICE_CREAM_SANDWICH)
private fun syncSwitchView(view: View) {
if (view is Checkable) {
val isChecked = view.isChecked

2
app/src/main/java/eu/kanade/tachiyomi/widget/preference/TrackLoginDialog.kt
View File

@@ -35,7 +35,7 @@ class TrackLoginDialog(usernameLabel: String? = null, bundle: Bundle? = null) :
requestSubscription?.unsubscribe()
v?.apply {
if (username.text.isEmpty() || password.text.isEmpty())
if (username.text.isNullOrEmpty() || password.text.isNullOrEmpty())
return
login.progress = 1

8
app/src/main/res/drawable/bottom_nav_item_selector.xml
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/tabBarIconColor" android:state_checked="true" />
<item android:color="?attr/tabBarIconColor" android:state_enabled="true" android:state_pressed="true" />
<item android:color="?attr/tabBarIconColor" android:state_focused="true" />
<item android:color="?attr/tabBarIconInactive" android:state_focused="false" />
<item android:color="?attr/tabBarIconColor" />
</selector>

10
app/src/main/res/drawable/button_bg_transparent.xml
View File

@@ -3,7 +3,7 @@
<item android:state_activated="true" android:color="@color/md_white_1000">
<shape android:shape="rectangle">
<corners android:radius="2dp" />
<solid android:color="@color/colorAccentLight" />
<solid android:color="?attr/colorAccent" />
<padding android:left="8dp" android:right="8dp" />
</shape>
</item>
@@ -15,12 +15,12 @@
<padding android:left="8dp" android:right="8dp" />
</shape>
</item>
<item android:color="@color/colorAccentLight">
<shape android:shape="rectangle" android:color="@color/colorAccentLight">
<item android:color="?attr/colorAccent">
<shape android:shape="rectangle" android:color="?attr/colorAccent">
<corners android:radius="2dp" />
<solid android:color="@android:color/transparent" />
<stroke android:color="@color/colorAccentLight" android:width="1dp"/>
<stroke android:color="?attr/colorAccent" android:width="1dp"/>
<padding android:left="8dp" android:right="8dp" />
</shape>
</item>
</selector>
</selector>

4
app/src/main/res/drawable/line_divider_dark.xml → app/src/main/res/drawable/line_divider.xml
View File

@@ -6,6 +6,6 @@
android:width="1dp"
android:height="1dp" />
<solid android:color="@color/dividerDark" />
<solid android:color="?android:attr/divider" />
</shape>
</shape>

11
app/src/main/res/drawable/line_divider_light.xml
View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size
android:width="1dp"
android:height="1dp" />
<solid android:color="@color/dividerLight" />
</shape>

8
app/src/main/res/drawable/list_item_selector_dark.xml → app/src/main/res/drawable/list_item_selector.xml
View File

@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/rippleColorDark">
android:color="?attr/rippleColor">
<item>
<selector>
<item android:state_selected="true">
<color android:color="@color/rippleColorDark" />
<color android:color="?attr/rippleColor" />
</item>
<item android:state_activated="true">
<color android:color="@color/rippleColorDark" />
<color android:color="?attr/rippleColor" />
</item>
<item>
<color android:color="@color/dialogDark" />
<color android:color="?attr/colorSurface" />
</item>
</selector>
</item>

19
app/src/main/res/drawable/list_item_selector_amoled.xml
View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/rippleColorDark">
<item>
<selector>
<item android:state_selected="true">
<color android:color="@color/rippleColorDark" />
</item>
<item android:state_activated="true">
<color android:color="@color/rippleColorDark" />
</item>
<item>
<color android:color="@color/md_black_1000" />
</item>
</selector>
</item>
</ripple>

19
app/src/main/res/drawable/list_item_selector_light.xml
View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/rippleColorLight">
<item>
<selector>
<item android:state_selected="true">
<color android:color="@color/rippleColorLight" />
</item>
<item android:state_activated="true">
<color android:color="@color/rippleColorLight" />
</item>
<item>
<color android:color="@color/dialogLight" />
</item>
</selector>
</item>
</ripple>

4
app/src/main/res/drawable/sc_book_48dp.xml
View File

@@ -6,7 +6,7 @@
android:viewportWidth="48">
<path
android:fillColor="@color/backgroundLight"
android:fillColor="@color/textColorPrimaryDark"
android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
<group
@@ -16,4 +16,4 @@
android:fillColor="@color/colorPrimary"
android:pathData="M18,2H6c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zM6,4h5v8l-2.5,-1.5L6,12V4z" />
</group>
</vector>
</vector>

4
app/src/main/res/drawable/sc_explore_48dp.xml
View File

@@ -6,7 +6,7 @@
android:viewportWidth="48">
<path
android:fillColor="@color/backgroundLight"
android:fillColor="@color/textColorPrimaryDark"
android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
<group
@@ -16,4 +16,4 @@
android:fillColor="@color/colorPrimary"
android:pathData="M12,10.9c-0.61,0 -1.1,0.49 -1.1,1.1s0.49,1.1 1.1,1.1c0.61,0 1.1,-0.49 1.1,-1.1s-0.49,-1.1 -1.1,-1.1zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM14.19,14.19L6,18l3.81,-8.19L18,6l-3.81,8.19z" />
</group>
</vector>
</vector>

2
app/src/main/res/drawable/sc_history_48dp.xml
View File

@@ -6,7 +6,7 @@
android:viewportWidth="48">
<path
android:fillColor="@color/backgroundLight"
android:fillColor="@color/textColorPrimaryDark"
android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
<group

2
app/src/main/res/drawable/sc_new_releases_48dp.xml
View File

@@ -6,7 +6,7 @@
android:viewportWidth="48">
<path
android:fillColor="@color/backgroundLight"
android:fillColor="@color/textColorPrimaryDark"
android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0" />
<group

2
app/src/main/res/layout-land/reader_color_filter_sheet.xml
View File

@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
android:background="?attr/colorSurface"
android:baselineAligned="false"
android:orientation="horizontal">

2
app/src/main/res/layout/catalogue_global_search_controller_card_item.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectable_list_drawable"
android:background="@drawable/list_item_selector"
android:orientation="vertical"
android:paddingStart="4dp"
android:paddingTop="8dp"

4
app/src/main/res/layout/catalogue_grid_item.xml
View File

@@ -16,8 +16,8 @@
android:id="@+id/thumbnail"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:attr/colorBackground"
tools:background="?android:attr/colorBackground"
android:background="?attr/colorSurface"
tools:background="?attr/colorSurface"
tools:ignore="ContentDescription"
tools:src="@mipmap/ic_launcher" />

2
app/src/main/res/layout/catalogue_list_item.xml
View File

@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/material_component_lists_single_line_with_avatar_height"
android:layout_gravity="center_vertical"
android:background="?attr/selectable_list_drawable"
android:background="@drawable/list_item_selector"
tools:layout_editor_absoluteX="0dp"
tools:layout_editor_absoluteY="25dp">

2
app/src/main/res/layout/catalogue_main_controller_card_item.xml
View File

@@ -9,7 +9,7 @@
android:id="@+id/card"
android:layout_width="match_parent"
android:layout_height="@dimen/material_component_lists_two_line_height"
android:background="?attr/selectable_list_drawable">
android:background="@drawable/list_item_selector">
<ImageView
android:id="@+id/image"

2
app/src/main/res/layout/categories_item.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/material_component_lists_single_line_with_avatar_height"
android:background="?attr/selectable_list_drawable">
android:background="@drawable/list_item_selector">
<ImageView
android:id="@+id/image"

2
app/src/main/res/layout/chapters_item.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:background="?attr/selectable_list_drawable"
android:background="@drawable/list_item_selector"
android:paddingEnd="16dp"
android:paddingStart="16dp">

8
app/src/main/res/layout/download_custom_amount.xml
View File

@@ -10,7 +10,7 @@
android:id="@+id/btn_decrease_10"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?selectable_list_drawable"
android:background="@drawable/list_item_selector"
android:padding="8dp"
android:tint="?colorAccent"
app:srcCompat="@drawable/ic_chevron_left_double_black_24dp" />
@@ -19,7 +19,7 @@
android:id="@+id/btn_decrease"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?selectable_list_drawable"
android:background="@drawable/list_item_selector"
android:padding="8dp"
android:tint="?colorAccent"
app:srcCompat="@drawable/ic_chevron_left_black_24dp" />
@@ -37,7 +37,7 @@
android:id="@+id/btn_increase"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?selectable_list_drawable"
android:background="@drawable/list_item_selector"
android:padding="8dp"
android:tint="?colorAccent"
app:srcCompat="@drawable/ic_chevron_right_black_24dp" />
@@ -46,7 +46,7 @@
android:id="@+id/btn_increase_10"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?selectable_list_drawable"
android:background="@drawable/list_item_selector"
android:padding="8dp"
android:tint="?colorAccent"
app:srcCompat="@drawable/ic_chevron_right_double_black_24dp" />

2
app/src/main/res/layout/extension_card_item.xml
View File

@@ -9,7 +9,7 @@
android:id="@+id/card"
android:layout_width="match_parent"
android:layout_height="64dp"
android:background="?attr/selectable_list_drawable">
android:background="@drawable/list_item_selector">
<ImageView
android:id="@+id/image"

1
app/src/main/res/layout/history_item.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/cv_manga"
style="@style/Theme.Widget.CardView.Item"
android:padding="0dp">

8
app/src/main/res/layout/main_activity.xml
View File

@@ -25,11 +25,10 @@
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabs"
style="@style/Widget.MaterialComponents.TabLayout.Colored"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/Theme.ActionBar.Tab"
app:tabGravity="center"
app:tabIndicatorColor="@android:color/white"
app:tabInlineLabel="true"
app:tabMinWidth="75dp"
app:tabMode="scrollable" />
@@ -44,12 +43,11 @@
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_nav"
style="@style/Widget.MaterialComponents.BottomNavigationView.Colored"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="?attr/colorPrimary"
app:itemIconTint="@drawable/bottom_nav_item_selector"
app:itemTextColor="@drawable/bottom_nav_item_selector"
app:itemBackground="?attr/colorPrimary"
app:labelVisibilityMode="labeled"
app:menu="@menu/bottom_nav" />

7
app/src/main/res/layout/navigation_view_text.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="?attr/listPreferredItemHeightSmall"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:focusable="true"
android:paddingStart="?attr/listPreferredItemPaddingStart"
@@ -9,15 +9,16 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/nav_view_item_wrapper"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical|start">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/nav_view_item"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:imeOptions="actionDone"
android:inputType="text"
android:maxLines="1"

37
app/src/main/res/layout/pref_account_login.xml
View File

@@ -20,31 +20,36 @@
android:layout_height="1dp"
android:layout_marginTop="6dp"
android:layout_marginBottom="24dp"
android:background="@color/dividerLight" />
android:background="?android:attr/divider" />
<TextView
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/username_label"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/username" />
android:hint="@string/username">
<EditText
android:id="@+id/username"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/username"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/password" />
android:hint="@string/password">
<EditText
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textPassword" />
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textPassword" />
</com.google.android.material.textfield.TextInputLayout>
<CheckBox
android:id="@+id/show_password"

6
app/src/main/res/layout/reader_color_filter.xml
View File

@@ -5,7 +5,7 @@
android:layout_height="match_parent"
android:padding="16dp">
<androidx.legacy.widget.Space
<android.widget.Space
android:id="@+id/spinner_end"
android:layout_width="16dp"
android:layout_height="0dp"
@@ -13,7 +13,7 @@
<!-- Color filter -->
<androidx.appcompat.widget.SwitchCompat
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/switch_color_filter"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -181,7 +181,7 @@
<!-- Brightness -->
<androidx.appcompat.widget.SwitchCompat
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/custom_brightness"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
app/src/main/res/layout/reader_color_filter_sheet.xml
View File

@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:colorBackground"
android:background="?attr/colorSurface"
android:orientation="vertical">
<FrameLayout

2
app/src/main/res/layout/reader_page_sheet.xml
View File

@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
android:background="?attr/colorSurface"
android:orientation="vertical">
<LinearLayout

54
app/src/main/res/layout/reader_settings_sheet.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:colorBackground"
android:background="?attr/colorSurface"
android:clipToPadding="false"
android:orientation="vertical"
android:padding="@dimen/material_component_dialogs_padding_around_content_area">
@@ -31,7 +31,7 @@
app:layout_constraintStart_toEndOf="@id/general_prefs"
app:layout_constraintTop_toTopOf="@id/general_prefs" />
<androidx.legacy.widget.Space
<android.widget.Space
android:id="@+id/spinner_end"
android:layout_width="16dp"
android:layout_height="0dp"
@@ -50,7 +50,7 @@
android:id="@+id/viewer"
android:layout_width="0dp"
android:layout_height="24dp"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:entries="@array/viewers_selector"
app:layout_constraintEnd_toEndOf="@id/spinner_end"
app:layout_constraintStart_toEndOf="@id/verticalcenter"
@@ -60,7 +60,7 @@
android:id="@+id/rotation_mode_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:text="@string/pref_rotation_type"
app:layout_constraintBaseline_toBaselineOf="@id/rotation_mode"
app:layout_constraintEnd_toStartOf="@id/verticalcenter"
@@ -70,7 +70,7 @@
android:id="@+id/rotation_mode"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:entries="@array/rotation_type"
app:layout_constraintEnd_toEndOf="@id/spinner_end"
app:layout_constraintStart_toEndOf="@id/verticalcenter"
@@ -89,79 +89,73 @@
android:id="@+id/background_color"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:entries="@array/reader_themes"
app:layout_constraintEnd_toEndOf="@id/spinner_end"
app:layout_constraintStart_toEndOf="@id/verticalcenter"
app:layout_constraintTop_toBottomOf="@id/rotation_mode" />
<androidx.appcompat.widget.SwitchCompat
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/show_page_number"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="10dp"
android:text="@string/pref_show_page_number"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintTop_toBottomOf="@id/background_color" />
<androidx.appcompat.widget.SwitchCompat
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/true_color"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/pref_true_color"
android:textColor="?android:attr/textColorSecondary"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/show_page_number"
tools:visibility="visible" />
<androidx.appcompat.widget.SwitchCompat
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/fullscreen"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/pref_fullscreen"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintTop_toBottomOf="@id/true_color" />
<androidx.appcompat.widget.SwitchCompat
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/cutout_short"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/pref_cutout_short"
android:textColor="?android:attr/textColorSecondary"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/fullscreen" />
<androidx.appcompat.widget.SwitchCompat
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/keepscreen"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/pref_keep_screen_on"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintTop_toBottomOf="@id/cutout_short" />
<androidx.appcompat.widget.SwitchCompat
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/long_tap"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/pref_read_with_long_tap"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintTop_toBottomOf="@id/keepscreen" />
<androidx.appcompat.widget.SwitchCompat
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/always_show_chapter_transition"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/pref_always_show_chapter_transition"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintTop_toBottomOf="@id/long_tap" />
<androidx.legacy.widget.Space
<android.widget.Space
android:id="@+id/end_general_preferences"
android:layout_width="0dp"
android:layout_height="0dp"
@@ -193,7 +187,7 @@
android:id="@+id/scale_type"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:entries="@array/image_scale_type"
app:layout_constraintEnd_toEndOf="@id/spinner_end"
app:layout_constraintStart_toEndOf="@id/verticalcenter"
@@ -212,26 +206,25 @@
android:id="@+id/zoom_start"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:entries="@array/zoom_start"
app:layout_constraintEnd_toEndOf="@id/spinner_end"
app:layout_constraintStart_toEndOf="@id/verticalcenter"
app:layout_constraintTop_toBottomOf="@id/scale_type" />
<androidx.appcompat.widget.SwitchCompat
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/crop_borders"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="10dp"
android:text="@string/pref_crop_borders"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintTop_toBottomOf="@id/zoom_start" />
<androidx.appcompat.widget.SwitchCompat
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/page_transitions"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/pref_page_transitions"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintTop_toBottomOf="@id/crop_borders" />
@@ -249,20 +242,19 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/end_general_preferences" />
<androidx.appcompat.widget.SwitchCompat
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/crop_borders_webtoon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="8dp"
android:text="@string/pref_crop_borders"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintTop_toBottomOf="@id/webtoon_prefs" />
<androidx.appcompat.widget.SwitchCompat
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/pad_pages_vert_webtoon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/pref_webtoon_padding_vert"
android:textColor="?android:attr/textColorSecondary"
app:layout_constraintTop_toBottomOf="@id/crop_borders_webtoon" />

6
app/src/main/res/layout/track_item.xml
View File

@@ -51,7 +51,7 @@
android:id="@+id/status_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectable_list_drawable"
android:background="@drawable/list_item_selector"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal"
@@ -104,7 +104,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="?attr/selectable_list_drawable"
android:background="@drawable/list_item_selector"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal"
@@ -132,7 +132,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="?attr/selectable_list_drawable"
android:background="@drawable/list_item_selector"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal"

2
app/src/main/res/layout/track_search_dialog.xml
View File

@@ -42,7 +42,7 @@
android:dividerHeight="10dp"
android:footerDividersEnabled="true"
android:headerDividersEnabled="true"
android:listSelector="?attr/selectable_list_drawable"
android:listSelector="@drawable/list_item_selector"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:scrollbars="none"

3
app/src/main/res/layout/track_search_item.xml
View File

@@ -2,7 +2,6 @@
<androidx.cardview.widget.CardView 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:id="@+id/cv_manga"
style="@style/Theme.Widget.CardView.Item"
android:padding="0dp">
@@ -10,7 +9,7 @@
android:id="@+id/linearLayout"
android:layout_width="match_parent"
android:layout_height="216dp"
android:background="?attr/selectable_list_drawable"
android:background="@drawable/list_item_selector"
android:orientation="horizontal">
<ImageView

2
app/src/main/res/layout/updates_item.xml
View File

@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="@dimen/material_component_lists_two_line_height"
android:paddingEnd="16dp"
android:background="?attr/selectable_list_drawable">
android:background="@drawable/list_item_selector">
<ImageView
android:id="@+id/manga_cover"

5
app/src/main/res/values/attrs.xml
View File

@@ -20,12 +20,7 @@
<attr name="max_seek" format="integer"/>
</declare-styleable>
<attr name="selectable_list_drawable" format="reference|integer" />
<attr name="selectable_library_drawable" format="reference|integer"/>
<attr name="text_color_primary" format="reference|integer"/>
<attr name="background_card" format="reference|integer"/>
<attr name="colorBackgroundSplash" format="reference|integer"/>
<attr name="tabBarIconColor" format="reference|integer"/>
<attr name="tabBarIconInactive" format="reference|integer"/>
</resources>

9
app/src/main/res/values/colors.xml
View File

@@ -3,6 +3,7 @@
<!-- Application Colors -->
<color name="colorPrimary">#54759E</color>
<color name="colorPrimaryDark">#435E7E</color>
<!-- Dark Application Colors -->
<color name="colorDarkPrimary">#212121</color>
<color name="colorDarkPrimaryDark">#1C1C1D</color>
@@ -17,12 +18,9 @@
<color name="textColorHintLight">@color/md_black_1000_38</color>
<color name="dividerLight">@color/md_black_1000_12</color>
<color name="rippleColorLight">@color/md_black_1000_12</color>
<color name="backgroundLight">@color/md_grey_50</color>
<color name="dialogLight">@color/md_white_1000</color>
<color name="selectorColorLight">@color/md_blue_A400_38</color>
<color name="iconColorLight">@color/md_black_1000_54</color>
<!-- Dark Theme -->
<color name="colorAccentDark">#3399FF</color>
@@ -31,14 +29,9 @@
<color name="textColorHintDark">@color/md_white_1000_50</color>
<color name="dividerDark">@android:color/transparent</color>
<color name="rippleColorDark">@color/md_white_1000_20</color>-
<color name="statusBarDark">@color/md_black_1000</color>
<color name="appBarDark">@color/md_grey_900</color>
<color name="backgroundDark">@color/colorDarkPrimaryDark</color>
<color name="dialogDark">@color/colorDarkPrimary</color>
<color name="selectorColorDark">@color/md_blue_A200_50</color>
<color name="iconColorDark">@color/md_white_1000_54</color>
<!-- Reader Theme -->
<color name="readerColorDarkPrimary">@color/colorDarkPrimary</color>

62
app/src/main/res/values/styles.xml
View File

@@ -4,38 +4,36 @@
<!--========-->
<!--Toolbars-->
<!--========-->
<style name="Theme.ActionBar" parent="@style/ThemeOverlay.AppCompat.ActionBar" />
<style name="Theme.ActionBar" parent="@style/ThemeOverlay.MaterialComponents.ActionBar" />
<style name="Theme.ActionBar.Light" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
<style name="Theme.ActionBar.Light" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
<item name="popupTheme">@style/ThemeOverlay.MaterialComponents.Light</item>
</style>
<!--====-->
<!--Tabs-->
<!--====-->
<style name="Theme.ActionBar.Tab" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<!--===========-->
<!--AlertDialog-->
<!--===========-->
<style name="Theme.AlertDialog" />
<style name="Theme.AlertDialog.Light" parent="Theme.AppCompat.Light.Dialog.Alert">
<style name="Theme.AlertDialog" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
<item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
<item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
<item name="android:background">?attr/colorSurface</item>
<item name="android:textColorPrimary">?attr/colorOnSurface</item>
<item name="android:textColor">?attr/colorOnSurface</item>
<item name="buttonBarPositiveButtonStyle">@style/Theme.Widget.Button</item>
<item name="buttonBarNegativeButtonStyle">@style/Theme.Widget.Button.Borderless</item>
<item name="buttonBarNeutralButtonStyle">@style/Theme.Widget.Button.Borderless</item>
</style>
<style name="Theme.AlertDialog.Light" parent="Theme.AlertDialog">
<item name="colorAccent">@color/colorAccentLight</item>
</style>
<style name="Theme.AlertDialog.Dark" parent="Theme.AppCompat.Dialog.Alert">
<item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
<item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
<style name="Theme.AlertDialog.Dark" parent="Theme.AlertDialog">
<item name="colorAccent">@color/colorAccentDark</item>
</style>
<style name="Theme.AlertDialog.Amoled" parent="Theme.AlertDialog.Dark">
<item name="android:background">@color/colorAmoledPrimary</item>
</style>
<!--===============-->
<!--Text Appearance-->
@@ -125,7 +123,7 @@
<!--=======-->
<style name="Theme.Widget" />
<style name="Theme.Widget.FAB">
<style name="Theme.Widget.FAB" parent="@style/Widget.MaterialComponents.FloatingActionButton">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
<item name="fabCustomSize">@dimen/fab_size</item>
@@ -133,7 +131,6 @@
<item name="android:layout_margin">@dimen/fab_margin</item>
<item name="android:scaleType">fitCenter</item>
<item name="layout_anchorGravity">bottom|right|end</item>
<item name="android:tint">@color/md_white_1000</item>
</style>
<style name="Theme.Widget.CardView" parent="CardView">
@@ -150,7 +147,7 @@
</item>
<item name="android:layout_marginEnd">@dimen/material_component_cards_space_between_cards
</item>
<item name="cardBackgroundColor">?attr/background_card</item>
<item name="cardBackgroundColor">?attr/colorSurface</item>
<item name="cardElevation">2dp</item>
</style>
@@ -185,26 +182,30 @@
<style name="Theme.Widget.SpinnerItem" parent="Widget.AppCompat.DropDownItem.Spinner">
<item name="android:textColor">?attr/text_color_primary</item>
<item name="android:background">?attr/selectable_list_drawable</item>
<item name="android:textColor">?attr/colorOnSurface</item>
<item name="android:background">@drawable/list_item_selector</item>
</style>
<!--==============-->
<!--Widgets.Button-->
<!--==============-->
<style name="Theme.Widget.Button" parent="Widget.AppCompat.Button"/>
<style name="Theme.Widget.Button" parent="Widget.MaterialComponents.Button.TextButton">
<item name="android:textColor">?attr/colorOnSurface</item>
</style>
<style name="Theme.Widget.Button.Colored" parent="Widget.AppCompat.Button.Colored"/>
<style name="Theme.Widget.Button.Colored" parent="Widget.MaterialComponents.Button">
<item name="backgroundTint">?attr/colorAccent</item>
</style>
<style name="Theme.Widget.Button.Borderless" parent="Widget.AppCompat.Button.Borderless">
<style name="Theme.Widget.Button.Borderless" parent="Theme.Widget.Button">
<item name="android:textColor">?attr/colorAccent</item>
</style>
<style name="Theme.Widget.Button.Borderless.Negative">
<style name="Theme.Widget.Button.Borderless.Negative" parent="Theme.Widget.Button.Borderless">
<item name="android:textColor">@color/md_red_500</item>
</style>
<style name="Theme.Widget.Button.Borderless.Small">
<style name="Theme.Widget.Button.Borderless.Small" parent="Theme.Widget.Button.Borderless">
<item name="android:minHeight">48dip</item>
<item name="android:minWidth">48dip</item>
</style>
@@ -212,7 +213,7 @@
<!--===-->
<!--OLD-->
<!--===-->
<style name="AlertDialogStyle" parent="Theme.AppCompat.Light.Dialog.Alert">
<style name="AlertDialogStyle" parent="Theme.MaterialComponents.Light.Dialog.Alert">
<item name="android:windowTitleStyle">@style/DialogTitleText</item>
<item name="colorAccent">?attr/colorPrimary</item>
</style>
@@ -234,7 +235,7 @@
<item name="nnf_toolbarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
</style>
<style name="FilePickerAlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert"></style>
<style name="FilePickerAlertDialogTheme" parent="Theme.MaterialComponents.Light.Dialog.Alert" />
<style name="reader_settings_popup_animation">
<item name="android:windowEnterAnimation">@anim/enter_from_right</item>
@@ -246,5 +247,4 @@
<item name="android:windowExitAnimation">@anim/exit_to_left</item>
</style>
</resources>

78
app/src/main/res/values/themes.xml
View File

@@ -9,38 +9,48 @@
<!--==============-->
<!-- Light Themes -->
<!--=======-======-->
<style name="Theme.Base" parent="Theme.AppCompat.Light.NoActionBar">
<style name="Theme.Base" parent="Theme.MaterialComponents.Light.NoActionBar">
<!-- AppBar -->
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<!-- Theme colors -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorOnPrimary">@color/textColorPrimaryDark</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorSecondary">@color/colorAccentLight</item>
<item name="colorOnSecondary">@color/textColorPrimaryDark</item>
<item name="colorSurface">@color/dialogLight</item>
<item name="colorOnSurface">@color/textColorPrimaryLight</item>
<item name="colorAccent">@color/colorAccentLight</item>
<!-- Base background/text colors -->
<item name="android:colorBackground">@color/backgroundLight</item>
<item name="android:textColorPrimary">@color/textColorPrimaryLight</item>
<item name="android:textColorSecondary">@color/textColorSecondaryLight</item>
<item name="android:textColorHint">@color/textColorHintLight</item>
<item name="android:textColorPrimaryInverse">@color/textColorPrimaryDark</item>
<item name="android:textColorSecondaryInverse">@color/textColorSecondaryDark</item>
<item name="android:textColorHintInverse">@color/textColorHintDark</item>
<item name="android:colorBackground">@color/backgroundLight</item>
<item name="android:listSelector">?colorAccent</item>
<item name="rippleColor">@color/rippleColorLight</item>
<item name="android:divider">@color/dividerLight</item>
<item name="android:listDivider">@drawable/line_divider_light</item>
<item name="android:listDivider">@drawable/line_divider</item>
<!-- Handles RTL text -->
<item name="android:textAlignment">gravity</item>
<item name="android:textDirection">locale</item>
<!-- Themes -->
<item name="android:forceDarkAllowed">false</item>
<item name="windowActionModeOverlay">true</item>
<item name="actionBarTheme">@style/Theme.ActionBar.Light</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
<item name="alertDialogTheme">@style/Theme.AlertDialog.Light</item>
<item name="dialogTheme">@style/Theme.AlertDialog.Light</item>
<item name="alertDialogTheme">@style/Theme.AlertDialog.Dark</item>
<!-- Custom Attributes-->
<item name="selectable_list_drawable">@drawable/list_item_selector_light</item>
<item name="selectable_library_drawable">@drawable/library_item_selector_light</item>
<item name="text_color_primary">@color/textColorPrimaryLight</item>
<item name="background_card">@color/dialogLight</item>
<item name="tabBarIconColor">@android:color/white</item>
<item name="tabBarIconInactive">@color/textColorHintDark</item>
</style>
<!--===========-->
@@ -55,20 +65,28 @@
<!--=============-->
<!-- Dark Themes -->
<!--=============-->
<style name="Theme.Base.Dark" parent="Theme.AppCompat.NoActionBar">
<style name="Theme.Base.Dark" parent="Theme.MaterialComponents.NoActionBar">
<!-- Theme colors -->
<item name="colorPrimary">@color/colorDarkPrimary</item>
<item name="colorOnPrimary">@color/textColorPrimaryDark</item>
<item name="colorPrimaryDark">@color/colorDarkPrimaryDark</item>
<item name="colorSecondary">@color/colorAccentDark</item>
<item name="colorOnSecondary">@color/textColorPrimaryDark</item>
<item name="colorSurface">@color/dialogDark</item>
<item name="colorOnSurface">@color/textColorPrimaryDark</item>
<item name="colorAccent">@color/colorAccentDark</item>
<!-- Base background/text colors -->
<item name="android:colorBackground">@color/backgroundDark</item>
<item name="android:textColorPrimary">@color/textColorPrimaryDark</item>
<item name="android:textColorSecondary">@color/textColorSecondaryDark</item>
<item name="android:textColorHint">@color/textColorHintDark</item>
<item name="android:textColorPrimaryInverse">@color/textColorPrimaryLight</item>
<item name="android:textColorSecondaryInverse">@color/textColorSecondaryLight</item>
<item name="android:textColorHintInverse">@color/textColorHintLight</item>
<item name="android:colorBackground">@color/backgroundDark</item>
<item name="android:listSelector">?colorAccent</item>
<item name="rippleColor">@color/rippleColorDark</item>
<item name="android:divider">@color/dividerDark</item>
<item name="android:listDivider">@drawable/line_divider_dark</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
@@ -76,19 +94,15 @@
<!-- Themes -->
<item name="windowActionModeOverlay">true</item>
<item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat</item>
<item name="actionBarTheme">@style/ThemeOverlay.MaterialComponents.Dark.ActionBar</item>
<item name="actionBarPopupTheme">@style/ThemeOverlay.MaterialComponents</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
<item name="md_background_color">@color/dialogDark</item>
<item name="dialogTheme">@style/Theme.AlertDialog.Dark</item>
<item name="alertDialogTheme">@style/Theme.AlertDialog.Dark</item>
<item name="md_background_color">?attr/colorSurface</item>
<!-- Custom Attributes-->
<item name="selectable_list_drawable">@drawable/list_item_selector_dark</item>
<item name="selectable_library_drawable">@drawable/library_item_selector_dark</item>
<item name="text_color_primary">@color/textColorPrimaryDark</item>
<item name="background_card">@color/dialogDark</item>
<item name="tabBarIconColor">@android:color/white</item>
<item name="tabBarIconInactive">@color/textColorHintDark</item>
</style>
<style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark">
@@ -110,7 +124,9 @@
<style name="Theme.Base.Amoled" parent="Theme.Base.Dark">
<item name="colorPrimary">@color/colorAmoledPrimary</item>
<item name="colorPrimaryDark">@color/colorAmoledPrimary</item>
<item name="android:colorBackground">@color/md_black_1000</item>
<item name="colorSurface">@color/colorAmoledPrimary</item>
<item name="android:colorBackground">@color/colorAmoledPrimary</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
@@ -118,12 +134,9 @@
<!-- Themes -->
<item name="md_background_color">@color/colorAmoledPrimary</item>
<item name="alertDialogTheme">@style/Theme.AlertDialog.Amoled</item>
<!-- Custom Attributes-->
<item name="selectable_list_drawable">@drawable/list_item_selector_amoled</item>
<item name="selectable_library_drawable">@drawable/library_item_selector_amoled</item>
<item name="background_card">@color/colorAmoledPrimary</item>
</style>
<style name="Theme.Tachiyomi.Amoled" parent="Theme.Base.Amoled">
@@ -136,19 +149,19 @@
<style name="Theme.Base.Reader.Dark" parent="Theme.Base.Dark">
<item name="colorPrimary">@color/readerColorDarkPrimary</item>
<item name="colorPrimaryDark">@color/readerColorDarkPrimary</item>
<item name="android:colorBackground">@android:color/black</item>
<item name="colorSurface">@android:color/black</item>
<item name="android:statusBarColor">?colorPrimaryDark</item>
<item name="android:navigationBarColor">?colorPrimaryDark</item>
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
<item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
</style>
<style name="Theme.Base.Reader.Light" parent="Theme.Base">
<item name="colorPrimary">@color/readerColorDarkPrimary</item>
<item name="colorPrimaryDark">@color/readerColorDarkPrimary</item>
<item name="android:colorBackground">@android:color/white</item>
<item name="colorSurface">@android:color/white</item>
<item name="android:statusBarColor">?colorPrimaryDark</item>
<item name="android:navigationBarColor">?colorPrimaryDark</item>
<item name="android:statusBarColor">?attr/colorPrimaryDark</item>
<item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
</style>
<style name="Theme.Reader" parent="Theme.Base.Reader.Dark">
@@ -171,5 +184,4 @@
<item name="android:navigationBarColor">?attr/colorBackgroundSplash</item>
</style>
</resources>