null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

M3 Switches

Browse source 
With bonus logic to keep material cards the same radius
And new colors to support them because mixing and matching colors suck
This commit is contained in:
Jays2Kings 2022-07-03 13:01:33 -04:00
parent dc404af31a
commit a79a3fb777
16 changed files with 125 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle.kts
View file

@ -137,7 +137,7 @@ dependencies {
// Android X libraries
implementation("androidx.appcompat:appcompat:1.6.0-alpha03")
implementation("androidx.cardview:cardview:1.0.0")
implementation("com.google.android.material:material:1.6.0")
implementation("com.google.android.material:material:1.7.0-alpha02")
implementation("androidx.webkit:webkit:1.4.0")
implementation("androidx.recyclerview:recyclerview:1.2.1")
implementation("androidx.preference:preference:1.2.0")

4
app/src/main/res/color-night/primary_container.xml Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorOnPrimary" />
</selector>

4
app/src/main/res/color/primary_container.xml Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?colorPrimaryVariant" />
</selector>

4
app/src/main/res/layout/migration_bottom_sheet.xml
View file

@ -101,7 +101,7 @@
android:text="@string/use_most_chapters" />
</RadioGroup>
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/extra_search_param"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -126,7 +126,7 @@
app:layout_constraintStart_toStartOf="@+id/extra_search_param"
app:layout_constraintTop_toBottomOf="@+id/extra_search_param" />
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/skip_step"
android:layout_width="0dp"
android:layout_height="wrap_content"

8
app/src/main/res/layout/preference_widget_material_switch.xml Normal file
View file

@ -0,0 +1,8 @@
<com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/switchWidget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="false"
android:clickable="false"
android:background="@null" />

15
app/src/main/res/layout/reader_color_filter.xml
View file

@ -37,11 +37,11 @@
<!-- Color filter -->
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/switch_color_filter"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginTop="8dp"
android:text="@string/use_custom_color_filter"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/swipe_down"
@ -217,11 +217,11 @@
<!-- Brightness -->
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/custom_brightness"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="16dp"
android:text="@string/use_custom_brightness"
app:layout_constraintTop_toBottomOf="@id/color_filter_mode" />
@ -265,18 +265,19 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/brightness_slider" />
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/grayscale"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/grayscale"
app:layout_constraintTop_toBottomOf="@id/brightness_slider" />
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/inverted_colors"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="16dp"
app:layout_constraintBottom_toBottomOf="parent"
android:text="@string/pref_inverted_colors"
app:layout_constraintTop_toBottomOf="@id/grayscale" />

16
app/src/main/res/layout/reader_general_layout.xml
View file

@ -63,35 +63,35 @@
app:title="@string/background_color"
android:entries="@array/reader_themes" />
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/show_page_number"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginTop="16dp"
android:text="@string/show_page_number"
android:textColor="?attr/colorOnBackground" />
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/fullscreen"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginTop="16dp"
android:text="@string/fullscreen"
android:textColor="?attr/colorOnBackground" />
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/keepscreen"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginTop="16dp"
android:text="@string/keep_screen_on"
android:textColor="?attr/colorOnBackground" />
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/always_show_chapter_transition"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginTop="16dp"
android:text="@string/always_show_chapter_transition"
android:textColor="?attr/colorOnBackground" />
</LinearLayout>

35
app/src/main/res/layout/reader_paged_layout.xml
View file

@ -40,20 +40,19 @@
app:title="@string/scale_type"
android:entries="@array/image_scale_type" />
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/landscape_zoom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginTop="16dp"
android:text="@string/zoom_double_page_spreads"
android:textColor="?attr/colorOnBackground" />
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/navigate_pan"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginTop="16dp"
android:text="@string/navigate_pan"
android:textColor="?attr/colorOnBackground" />
@ -81,27 +80,27 @@
app:title="@string/zoom_start_position"
android:entries="@array/zoom_start" />
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/invert_double_pages"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginTop="16dp"
android:text="@string/invert_double_pages"
android:textColor="?attr/colorOnBackground" />
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/crop_borders"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginTop="16dp"
android:text="@string/crop_borders"
android:textColor="?attr/colorOnBackground" />
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/page_transitions"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="0dp"
android:layout_marginTop="16dp"
android:text="@string/animate_page_transitions"
android:textColor="?attr/colorOnBackground" />
@ -130,20 +129,20 @@
app:title="@string/pref_webtoon_side_padding"
android:entries="@array/webtoon_side_padding" />
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/crop_borders_webtoon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginTop="16dp"
android:text="@string/crop_borders"
android:textColor="?attr/colorOnBackground"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/webtoon_enable_zoom_out"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginTop="16dp"
android:text="@string/enable_zoom_out"
android:textColor="?attr/colorOnBackground"
app:layout_constraintTop_toBottomOf="@id/webtoon_side_padding" />
@ -152,15 +151,15 @@
android:id="@+id/webtoon_page_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginTop="16dp"
app:title="@string/page_layout"
android:entries="@array/webtoon_page_layouts" />
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/webtoon_invert_double_pages"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginTop="16dp"
android:text="@string/invert_double_pages"
android:textColor="?attr/colorOnBackground" />
</LinearLayout>

22
app/src/main/res/layout/recents_general_view.xml
View file

@ -19,49 +19,49 @@
android:id="@+id/show_recents_download"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="12dp"
android:entries="@array/show_recent_download"
app:title="@string/show_download_button" />
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/show_remove_history"
android:layout_width="match_parent"
android:layout_marginTop="8dp"
android:layout_marginTop="12dp"
android:layout_height="wrap_content"
android:text="@string/show_reset_history_button"
android:textColor="?attr/colorOnBackground"
app:layout_constraintBottom_toTopOf="@+id/show_read_in_all" />
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/show_read_in_all"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="16dp"
android:text="@string/show_read_chapters_all"
android:textColor="?attr/colorOnBackground" />
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/show_title_first"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/show_title_first"
android:textColor="?attr/colorOnBackground"
android:layout_marginTop="8dp" />
android:layout_marginTop="16dp" />
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/uniform_covers"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/uniform_covers"
android:textColor="?android:attr/textColorPrimary"
android:layout_marginTop="8dp" />
android:layout_marginTop="16dp" />
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/outline_on_covers"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/show_outline_around_covers"
android:textColor="?android:attr/textColorPrimary"
android:layout_marginTop="8dp" />
android:layout_marginTop="16dp" />
</LinearLayout>
</eu.kanade.tachiyomi.ui.recents.options.RecentsGeneralView>

4
app/src/main/res/layout/recents_history_view.xml
View file

@ -13,11 +13,11 @@
android:orientation="vertical"
android:background="@android:color/transparent">
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/group_chapters"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="16dp"
android:text="@string/group_chapters_together"
android:textColor="?attr/colorOnBackground" />

15
app/src/main/res/layout/recents_updates_view.xml
View file

@ -2,7 +2,8 @@
<eu.kanade.tachiyomi.ui.recents.options.RecentsUpdatesView 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">
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
<LinearLayout
android:id="@+id/sort_layout"
@ -14,29 +15,29 @@
android:orientation="vertical"
android:background="@android:color/transparent">
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/show_updated_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="16dp"
android:text="@string/show_updated_time"
android:textColor="?attr/colorOnBackground"
app:layout_constraintBottom_toTopOf="@+id/sort_fetched_time" />
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/sort_fetched_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="16dp"
android:text="@string/sort_fetched_time"
android:textColor="?attr/colorOnBackground"
app:layout_constraintBottom_toTopOf="@+id/show_read_in_all" />
<com.google.android.material.switchmaterial.SwitchMaterial
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/group_chapters"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginTop="16dp"
android:text="@string/group_chapters_together"
android:textColor="?attr/colorOnBackground" />
</LinearLayout>

1
app/src/main/res/values-night-v31/themes.xml
View file

@ -7,6 +7,7 @@
<item name="colorSecondaryVariant">@android:color/system_accent2_100</item>
<item name="colorTertiary">@android:color/system_accent3_800</item>
<item name="colorOnTertiary">@color/md_white_1000</item>
<item name="colorOnPrimary">@android:color/system_accent1_900</item>
<item name="colorPrimaryVariant">@android:color/system_neutral2_800</item>
<item name="colorSurface">@android:color/system_neutral1_900</item>
<item name="colorControlHighlight">@color/secondary_highlight</item>

7
app/src/main/res/values-night/colors.xml
View file

@ -3,6 +3,7 @@
<!-- Application Colors -->
<color name="primaryVariantTachiyomi">#272829</color>
<color name="colorPrimaryInactive">@color/md_white_1000_76</color>
<color name="onPrimaryTachiyomi">#071D39</color>
<color name="primaryTachiyomi">#78bcff</color>
<color name="primaryInverseTachiyomi">#2c517f</color>
<color name="legacyRippleColor">@color/md_white_1000_20</color>
@ -32,6 +33,7 @@
<!-- Chocolate Strawberries Theme -->
<color name="primaryStrawberry">#e14e4e</color>
<color name="primaryInverseStrawberry">#9f1414</color>
<color name="onPrimaryStrawberry">#330303</color>
<color name="secondaryStrawberry">@color/holo_red</color>
<color name="rippleColorStrawberry">#1FAA2200</color>
<color name="secondaryVariantStrawberry">#f9bab2</color>
@ -42,6 +44,7 @@
<color name="primaryLime">#7CF7A5</color>
<color name="secondaryLime">#4AF88A</color>
<color name="primaryVariantLime">@color/primaryVariantTachiyomi</color>
<color name="onPrimaryLime">#043314</color>
<color name="primaryInverseLime">#09933c</color>
<color name="backgroundLime">#202125</color>
<color name="secondaryVariantLime">#cbffe0</color>
@ -51,6 +54,7 @@
<color name="primaryTako">#fccd9f</color>
<color name="primaryVariantTako">#342F40</color>
<color name="primaryInverseTako">#a85d14</color>
<color name="onPrimaryTako">#3C2004</color>
<color name="secondaryTako">#F3B375</color>
<color name="onSecondaryTako">#242431</color>
<color name="secondaryVariantTako">#f4d1af</color>
@ -65,6 +69,7 @@
<color name="secondaryDuskDawn">#F02475</color>
<color name="rippleColorDuskDawn">#1FF02475</color>
<color name="primaryInverseDuskDawn">#8d0c3f</color>
<color name="onPrimaryDuskDawn">#370318</color>
<color name="secondaryVariantDuskDawn">#ffc1da</color>
<color name="backgroundDuskDawn">#16151D</color>
<color name="primaryVariantDuskDawn">#272026</color>
@ -79,6 +84,7 @@
<color name="primaryTealSapphire">#80b8d1</color>
<color name="primaryInverseTealSapphire">#1d698b</color>
<color name="primaryVariantTealSapphire">#1d2528</color>
<color name="onPrimaryTealSapphire">#02212C</color>
<color name="backgroundTealSapphire">#14191b</color>
<color name="colorOnBackgroundTealSapphire">@color/md_white_1000</color>
<color name="tabBarIconColorTealSapphire">#589ab8</color>
@ -87,6 +93,7 @@
<!-- Yin Yang Theme -->
<color name="primaryYinYang">#dcdcdc</color>
<color name="primaryInverseYinYang">#000000</color>
<color name="onPrimaryYinYang">#191919</color>
<color name="secondaryYinYang">#FFFFFF</color>
<color name="rippleColorYinYang">#1FFFFFFF</color>
<color name="secondaryVariantYinYang">#FFFFFF</color>

8
app/src/main/res/values/colors.xml
View file

@ -4,6 +4,7 @@
<color name="primaryVariantTachiyomi">#E5ECF4</color>
<color name="colorPrimaryInactive">#C2424242</color>
<color name="primaryTachiyomi">#54759E</color>
<color name="onPrimaryTachiyomi">@color/md_white_1000</color>
<color name="primaryInverseTachiyomi">#78bcff</color>
<color name="legacyBlue">#54759E</color>
<color name="splashBackground">@color/primaryTachiyomi</color>
@ -82,6 +83,7 @@
<color name="secondaryVariantDuskDawn">#4c163a</color>
<color name="backgroundDuskDawn">#f7f4f8</color>
<color name="primaryVariantDuskDawn">#efe3f3</color>
<color name="onPrimaryDuskDawn">@color/onPrimaryTachiyomi</color>
<color name="colorOnBackgroundDuskDawn">#DE240728</color>
<color name="appBarTextDuskDawn">#DE4c0d4b</color>
@ -92,6 +94,7 @@
<color name="primaryTealSapphire">#5f9c96</color>
<color name="primaryInverseTealSapphire">#a1e1db</color>
<color name="primaryVariantTealSapphire">#d4f1e6</color>
<color name="onPrimaryTealSapphire">@color/onPrimaryTachiyomi</color>
<color name="backgroundTealSapphire">#f0f7f7</color>
<color name="colorOnBackgroundTealSapphire">#DE072926</color>
<color name="tabBarIconColorTealSapphire">#DE072927</color>
@ -101,6 +104,7 @@
<color name="primaryLime">#57BD79</color>
<color name="primaryVariantLime">#D9ECE0</color>
<color name="primaryInverseLime">#AEDFC0</color>
<color name="onPrimaryLime">@color/onPrimaryTachiyomi</color>
<color name="secondaryLime">#1DA750</color>
<color name="secondaryVariantLime">#065124</color>
<color name="rippleColorLime">#1F4AF88A</color>
@ -110,6 +114,7 @@
<!-- Strawberry Daiquiri Theme -->
<color name="primaryStrawberry">#d31d3b</color>
<color name="primaryVariantStrawberry">#F3E7E7</color>
<color name="onPrimaryStrawberry">@color/onPrimaryTachiyomi</color>
<color name="primaryInverseStrawberry">#ef8e9e</color>
<color name="secondaryStrawberry">#ED4A65</color>
<color name="rippleColorStrawberry">#1FED4A65</color>
@ -120,6 +125,7 @@
<color name="primaryTako">#463561</color>
<color name="primaryVariantTako">#E5DCF4</color>
<color name="primaryInverseTako">#ac8fd9</color>
<color name="onPrimaryTako">@color/onPrimaryTachiyomi</color>
<color name="secondaryTako">#66577E</color>
<color name="onSecondaryTako">#F3B375</color>
<color name="secondaryVariantTako">#3f2b49</color>
@ -133,6 +139,7 @@
<!-- Yotsuba Theme -->
<color name="primaryYotsuba">#ba5427</color>
<color name="primaryVariantYotsuba">#F6EBE7</color>
<color name="onPrimaryYotsuba">@color/onPrimaryTachiyomi</color>
<color name="primaryInverseYotsuba">#efaa8d</color>
<color name="secondaryYotsuba">#dc6d3d</color>
<color name="rippleColorYotsuba">#1Fdc6d3d</color>
@ -142,6 +149,7 @@
<color name="primaryVariantYinYang">#FFFFFF</color>
<color name="primaryYinYang">#333333</color>
<color name="primaryInverseYinYang">#FFFFFF</color>
<color name="onPrimaryYinYang">@color/onPrimaryTachiyomi</color>
<color name="secondaryYinYang">#000000</color>
<color name="rippleColorYinYang">#1F000000</color>
<color name="secondaryVariantYinYang">#000000</color>

20
app/src/main/res/values/styles.xml
View file

@ -76,6 +76,26 @@
<item name="android:minHeight">?attr/mainActionBarSize</item>
</style>
<style name="Tachiyomi.PreferenceTheme" parent="@style/PreferenceThemeOverlay">
<item name="switchPreferenceCompatStyle">@style/Widget.Tachiyomi.SwitchPreferenceCompat</item>
</style>
<style name="Widget.Tachiyomi.SwitchPreferenceCompat" parent="Preference.SwitchPreferenceCompat.Material">
<item name="widgetLayout">@layout/preference_widget_material_switch</item>
</style>
<style name="Widget.Tachiyomi.CardView.Elevated" parent="Widget.Material3.CardView.Elevated">
<item name="shapeAppearance">?attr/shapeAppearanceCornerSmall</item>
</style>
<style name="Widget.Tachiyomi.CardView.Outlined" parent="Widget.Material3.CardView.Outlined">
<item name="shapeAppearance">?attr/shapeAppearanceCornerSmall</item>
</style>
<style name="Widget.Tachiyomi.CardView.Filled" parent="Widget.Material3.CardView.Filled">
<item name="shapeAppearance">?attr/shapeAppearanceCornerSmall</item>
</style>
<style name="Widget.Tachiyomi.CardView.Tracker" parent="Widget.Material3.CardView.Outlined">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>

17
app/src/main/res/values/themes.xml
View file

@ -18,10 +18,13 @@
<item name="colorPrimaryInverse">@color/primaryInverseTachiyomi</item>
<item name="colorPrimaryVariant">@color/primaryVariantTachiyomi</item>
<item name="colorSurface">@color/background</item> //old colorSecondary
<item name="colorSurfaceVariant">?colorPrimaryVariant</item> //old colorSecondary
<item name="colorOnSurface">@color/colorOnSurface</item> //old colorOnSecondary
<item name="colorSecondary">@color/secondaryTachiyomi</item> //colorAccent
<item name="colorOnSecondary">@color/md_white_1000</item>
<item name="colorOnPrimary">@color/onPrimaryTachiyomi</item>
<item name="colorSecondaryVariant">@color/secondaryVariantTachiyomi</item> // much darker / lighter version of colorSecondary
<item name="colorPrimaryContainer">@color/primary_container</item>
<item name="colorSecondaryContainer">@color/secondary_container</item>
<item name="background">@color/background</item>
<item name="colorOnBackground">@color/colorOnBackground</item>
@ -36,6 +39,11 @@
<item name="android:listDivider">@drawable/line_divider</item>
<item name="colorControlHighlight">@color/rippleColorTachiyomi</item>
<item name="actionModeStyle">@style/Widget.Tachiyomi.ActionMode</item>
<item name="materialSwitchStyle">@style/Widget.Material3.CompoundButton.MaterialSwitch</item>
<item name="materialCardViewOutlinedStyle">@style/Widget.Tachiyomi.CardView.Outlined</item>
<item name="materialCardViewFilledStyle">@style/Widget.Tachiyomi.CardView.Filled</item>
<item name="materialCardViewElevatedStyle">@style/Widget.Tachiyomi.CardView.Elevated</item>
<item name="switchPreferenceCompatStyle">@style/Widget.Tachiyomi.SwitchPreferenceCompat</item>
<item name="android:colorBackground">?background</item>
<item name="android:textColorSecondary">@color/text_color_secondary</item>
<item name="android:textColorHint">@color/text_color_hint</item>
@ -58,7 +66,7 @@
<item name="windowActionModeOverlay">true</item>
<item name="bottomSheetDialogTheme">@style/BottomSheetDialogTheme</item>
<item name="actionBarTheme">@style/Theme.ActionBar.DayNight</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
<item name="preferenceTheme">@style/Tachiyomi.PreferenceTheme</item>
<!-- Custom Attributes-->
<item name="actionBarTintColor">?attr/colorOnBackground</item>
@ -107,6 +115,7 @@
<style name="Theme.Tachiyomi.FlatLime">
<item name="colorPrimary">@color/primaryLime</item>
<item name="colorPrimaryVariant">@color/primaryVariantLime</item>
<item name="colorOnPrimary">@color/onPrimaryLime</item>
<item name="colorPrimaryInverse">@color/primaryInverseLime</item>
<item name="colorSecondary">@color/secondaryLime</item>
<item name="colorOnSecondary">@color/textColorPrimaryInverse</item>
@ -122,6 +131,7 @@
<item name="colorPrimary">@color/primaryDuskDawn</item>
<item name="colorPrimaryInverse">@color/primaryInverseDuskDawn</item>
<item name="colorPrimaryVariant">@color/primaryVariantDuskDawn</item>
<item name="colorOnPrimary">@color/onPrimaryDuskDawn</item>
<item name="colorSecondary">@color/secondaryDuskDawn</item>
<item name="colorControlHighlight">@color/rippleColorDuskDawn</item>
<item name="colorSecondaryVariant">@color/secondaryVariantDuskDawn</item>
@ -135,6 +145,7 @@
<item name="colorPrimary">@color/primaryTealSapphire</item>
<item name="colorPrimaryInverse">@color/primaryInverseTealSapphire</item>
<item name="colorPrimaryVariant">@color/primaryVariantTealSapphire</item>
<item name="colorOnPrimary">@color/onPrimaryTealSapphire</item>
<item name="colorSecondary">@color/secondaryTealSapphire</item>
<item name="colorControlHighlight">@color/rippleColorTealSapphire</item>
<item name="tabBarIconColor">@color/tabBarIconColorTealSapphire</item>
@ -152,6 +163,7 @@
<item name="colorPrimary">@color/primaryStrawberry</item>
<item name="colorPrimaryVariant">@color/primaryVariantStrawberry</item>
<item name="colorPrimaryInverse">@color/primaryInverseStrawberry</item>
<item name="colorOnPrimary">@color/onPrimaryStrawberry</item>
<item name="colorSecondary">@color/secondaryStrawberry</item>
<item name="colorControlHighlight">@color/rippleColorStrawberry</item>
<item name="colorSecondaryVariant">@color/secondaryVariantStrawberry</item>
@ -162,6 +174,7 @@
<style name="Theme.Tachiyomi.Tako">
<item name="colorPrimary">@color/primaryTako</item>
<item name="colorPrimaryInverse">@color/primaryInverseTako</item>
<item name="colorOnPrimary">@color/onPrimaryTako</item>
<item name="colorSecondary">@color/secondaryTako</item>
<item name="colorOnSecondary">@color/onSecondaryTako</item>
<item name="colorSecondaryVariant">@color/secondaryVariantTako</item>
@ -180,6 +193,7 @@
<item name="colorPrimary">@color/primaryYotsuba</item>
<item name="colorPrimaryVariant">@color/primaryVariantYotsuba</item>
<item name="colorPrimaryInverse">@color/primaryInverseYotsuba</item>
<item name="colorOnPrimary">@color/onPrimaryYotsuba</item>
<item name="colorSecondary">@color/secondaryYotsuba</item>
<item name="colorControlHighlight">@color/rippleColorYotsuba</item>
<item name="colorSecondaryVariant">@color/secondaryVariantYotsuba</item>
@ -190,6 +204,7 @@
<!-- Theme colors -->
<item name="colorPrimary">@color/primaryYinYang</item>
<item name="colorPrimaryVariant">@color/primaryVariantYinYang</item>
<item name="colorOnPrimary">@color/onPrimaryYinYang</item>
<item name="colorPrimaryInverse">@color/primaryInverseYinYang</item>
<item name="colorSecondary">@color/secondaryYinYang</item>
<item name="colorControlHighlight">@color/rippleColorYinYang</item>