Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-22 19:41:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resource cleanup post-theme removal

Browse Source
This commit is contained in:
arkon 2021-07-04 17:51:15 -04:00
parent 9df721d158
commit 040bac3da2
13 changed files with 24 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
View File

@ -35,7 +35,7 @@ abstract class BaseThemedActivity : AppCompatActivity() {
val resIds = mutableListOf<Int>() val resIds = mutableListOf<Int>()
when (preferences.appTheme().get()) { when (preferences.appTheme().get()) {
PreferenceValues.AppTheme.BLUE -> { PreferenceValues.AppTheme.BLUE -> {
resIds += R.style.Theme_Tachiyomi_DarkBlue resIds += R.style.Theme_Tachiyomi_Blue
resIds += R.style.ThemeOverlay_Tachiyomi_ColoredBars resIds += R.style.ThemeOverlay_Tachiyomi_ColoredBars
} }
PreferenceValues.AppTheme.GREEN_APPLE -> { PreferenceValues.AppTheme.GREEN_APPLE -> {

2
app/src/main/java/eu/kanade/tachiyomi/util/system/ContextExtensions.kt
View File

@ -94,7 +94,7 @@ fun Context.copyToClipboard(label: String, content: String) {
*/ */
fun Context.notificationBuilder(channelId: String, block: (NotificationCompat.Builder.() -> Unit)? = null): NotificationCompat.Builder { fun Context.notificationBuilder(channelId: String, block: (NotificationCompat.Builder.() -> Unit)? = null): NotificationCompat.Builder {
val builder = NotificationCompat.Builder(this, channelId) val builder = NotificationCompat.Builder(this, channelId)
.setColor(ContextCompat.getColor(this, R.color.accent_lightblue)) .setColor(ContextCompat.getColor(this, R.color.accent_blue))
if (block != null) { if (block != null) {
builder.block() builder.block()
} }

2
app/src/main/res/drawable-v26/sc_collections_bookmark_48dp.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/accent_lightblue"/> <background android:drawable="@color/accent_blue"/>
<foreground> <foreground>
<vector <vector
android:width="120dp" android:width="120dp"

2
app/src/main/res/drawable-v26/sc_explore_48dp.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/accent_lightblue"/> <background android:drawable="@color/accent_blue"/>
<foreground> <foreground>
<vector <vector
android:width="120dp" android:width="120dp"

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/accent_lightblue"/> <background android:drawable="@color/accent_blue"/>
<foreground> <foreground>
<vector <vector
android:width="120dp" android:width="120dp"

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/accent_lightblue"/> <background android:drawable="@color/accent_blue"/>
<foreground> <foreground>
<vector <vector
android:width="120dp" android:width="120dp"

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

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

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

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

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

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

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

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

2
app/src/main/res/values-night/themes.xml
View File

@ -6,7 +6,7 @@
<item name="colorSurface">@color/surface_amoled</item> <item name="colorSurface">@color/surface_amoled</item>
<item name="android:colorBackground">@color/background_amoled</item> <item name="android:colorBackground">@color/background_amoled</item>
<item name="android:divider">@color/divider_amoled</item> <item name="android:divider">@color/divider_amoled</item>
<item name="colorFilterActive">@color/filterColorAmoled</item> <item name="colorFilterActive">@color/filter_dark</item>
</style> </style>
<!--== Midnight Dusk theme ==--> <!--== Midnight Dusk theme ==-->

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

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="splash">@color/accent_lightblue</color> <color name="splash">@color/accent_blue</color>
<!-- Light Theme --> <!-- Default Theme -->
<color name="accent_default">@color/md_blue_A400</color> <color name="accent_default">@color/md_blue_A400</color>
<color name="divider_default">@color/md_black_1000_12</color> <color name="divider_default">@color/md_black_1000_12</color>
<color name="surface_default">@color/md_white_1000</color> <color name="surface_default">@color/md_white_1000</color>
<color name="background_default">@color/md_grey_50</color> <color name="background_default">@color/md_grey_50</color>
<color name="ripple_colored_default">@color/md_blue_A400_12</color> <color name="ripple_colored_default">@color/md_blue_A400_12</color>
<!-- Light Blue Theme --> <!-- Blue Theme -->
<color name="accent_lightblue">#54759E</color> <color name="accent_blue">#54759E</color>
<color name="ripple_colored_lightblue">#1F54759E</color> <color name="ripple_colored_blue">#1F54759E</color>
<!-- Strawberry Daiquiri Theme --> <!-- Strawberry Daiquiri Theme -->
<color name="accent_strawberry">#ED4A65</color> <color name="accent_strawberry">#ED4A65</color>
@ -21,10 +21,6 @@
<color name="accent_yotsuba">#FC8C5C</color> <color name="accent_yotsuba">#FC8C5C</color>
<color name="ripple_colored_yotsuba">#1FFC8C5C</color> <color name="ripple_colored_yotsuba">#1FFC8C5C</color>
<!-- Dark Blue Theme -->
<color name="accent_darkblue">#54759E</color>
<color name="ripple_colored_darkblue">#1F54759E</color>
<!-- Green Apple Theme --> <!-- Green Apple Theme -->
<color name="accent_greenapple">#48E484</color> <color name="accent_greenapple">#48E484</color>
<color name="ripple_colored_greenapple">#1F48E484</color> <color name="ripple_colored_greenapple">#1F48E484</color>
@ -40,13 +36,8 @@
<color name="surface_amoled">#000001</color> <color name="surface_amoled">#000001</color>
<color name="background_amoled">#000000</color> <color name="background_amoled">#000000</color>
<!-- Hot Pink Theme --> <color name="filter_light">#FFC107</color>
<color name="accent_hotpink">#FF3399</color> <color name="filter_dark">#FFEB3B</color>
<color name="ripple_colored_hotpink">#1FFF3399</color>
<color name="filterColorLight">#FFC107</color>
<color name="filterColorDark">#FFEB3B</color>
<color name="filterColorAmoled">#FFEB3B</color>
<color name="reader_background_dark">#202125</color> <color name="reader_background_dark">#202125</color>

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

@ -7,7 +7,7 @@
<!--== Theme base ==--> <!--== Theme base ==-->
<style name="Base.Theme.Tachiyomi" parent="Theme.MaterialComponents.DayNight.NoActionBar"> <style name="Base.Theme.Tachiyomi" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Disallow 'Force dark theme' --> <!-- Disallow "Force dark theme" -->
<item name="android:forceDarkAllowed" tools:targetApi="Q">false</item> <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
<!-- Theme colors --> <!-- Theme colors -->
@ -42,6 +42,7 @@
<item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item> <item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
<item name="android:enforceStatusBarContrast" tools:targetApi="Q">false</item> <item name="android:enforceStatusBarContrast" tools:targetApi="Q">false</item>
<item name="android:itemTextAppearance">@style/TextAppearance.Widget.Menu</item> <item name="android:itemTextAppearance">@style/TextAppearance.Widget.Menu</item>
<item name="textAppearanceButton">@style/TextAppearance.Widget.Button</item>
<item name="android:backgroundDimAmount">0.32</item> <item name="android:backgroundDimAmount">0.32</item>
<item name="windowActionModeOverlay">true</item> <item name="windowActionModeOverlay">true</item>
<item name="actionModeStyle">@style/Widget.Tachiyomi.ActionMode</item> <item name="actionModeStyle">@style/Widget.Tachiyomi.ActionMode</item>
@ -64,9 +65,6 @@
<item name="elevationOverlayEnabled">false</item> <item name="elevationOverlayEnabled">false</item>
<item name="lightSystemBarsOnPrimary">false</item> <item name="lightSystemBarsOnPrimary">false</item>
<!-- Text Appearances -->
<item name="textAppearanceButton">@style/TextAppearance.Widget.Button</item>
<!-- Material Dialogs --> <!-- Material Dialogs -->
<item name="md_background_color">?attr/colorSurface</item> <item name="md_background_color">?attr/colorSurface</item>
<item name="md_color_title">?attr/colorOnSurface</item> <item name="md_color_title">?attr/colorOnSurface</item>
@ -76,15 +74,15 @@
<item name="md_corner_radius">@dimen/dialog_radius</item> <item name="md_corner_radius">@dimen/dialog_radius</item>
<!-- Custom Attributes--> <!-- Custom Attributes-->
<item name="colorFilterActive">@color/filterColorLight</item> <item name="colorFilterActive">@color/filter_light</item>
</style> </style>
<style name="Theme.Tachiyomi" parent="Base.Theme.Tachiyomi" /> <style name="Theme.Tachiyomi" parent="Base.Theme.Tachiyomi" />
<style name="Theme.Tachiyomi.DarkBlue"> <style name="Theme.Tachiyomi.Blue">
<!-- Theme colors --> <!-- Theme colors -->
<item name="colorPrimary">@color/accent_lightblue</item> <item name="colorPrimary">@color/accent_blue</item>
<item name="colorControlHighlight">@color/ripple_colored_lightblue</item> <item name="colorControlHighlight">@color/ripple_colored_blue</item>
</style> </style>
<!--== Strawberry Daiquiri theme ==--> <!--== Strawberry Daiquiri theme ==-->
@ -121,14 +119,6 @@
<item name="colorControlHighlight">@color/ripple_colored_midnightdusk</item> <item name="colorControlHighlight">@color/ripple_colored_midnightdusk</item>
</style> </style>
<!--== Hot Pink theme ==-->
<style name="Theme.Tachiyomi.HotPink">
<!-- Theme colors -->
<item name="colorPrimary">@color/accent_hotpink</item>
<item name="colorTertiary">@color/md_blue_A400</item>
<item name="colorControlHighlight">@color/ripple_colored_hotpink</item>
</style>
<!--== AMOLED theme overlay ==--> <!--== AMOLED theme overlay ==-->
<style name="ThemeOverlay.Tachiyomi.Amoled" parent="" /> <style name="ThemeOverlay.Tachiyomi.Amoled" parent="" />