diff --git a/app/build.gradle b/app/build.gradle index a44a98d0c..909fc6cab 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -368,7 +368,7 @@ task copyResources(type: Copy) { preBuild.dependsOn(ktlintFormat, copyResources) -if (!getGradle().getStartParameter().getTaskRequests().toString().contains("Dev")) { +if (!getGradle().getStartParameter().getTaskRequests().toString().contains("Debug")) { apply plugin: 'com.google.gms.google-services' // Firebase Crashlytics apply plugin: 'com.google.firebase.crashlytics' diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt index 3ca47e9c1..28e48707f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt @@ -23,6 +23,7 @@ object PreferenceValues { default, blue, amoled, + red, } enum class DisplayMode { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt index 0ecde8b1d..786e2e2da 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseActivity.kt @@ -49,6 +49,7 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() { when (preferences.themeDark().get()) { Values.DarkThemeVariant.blue -> R.style.Theme_Tachiyomi_DarkBlue Values.DarkThemeVariant.amoled -> R.style.Theme_Tachiyomi_Amoled + Values.DarkThemeVariant.red -> R.style.Theme_Tachiyomi_Red else -> R.style.Theme_Tachiyomi_Dark } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt index 0454a3fac..e9525edd3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt @@ -126,12 +126,14 @@ class SettingsGeneralController : SettingsController() { entriesRes = arrayOf( R.string.theme_dark_default, R.string.theme_dark_blue, - R.string.theme_dark_amoled + R.string.theme_dark_amoled, + R.string.theme_dark_red ) entryValues = arrayOf( Values.DarkThemeVariant.default.name, Values.DarkThemeVariant.blue.name, - Values.DarkThemeVariant.amoled.name + Values.DarkThemeVariant.amoled.name, + Values.DarkThemeVariant.red.name ) defaultValue = Values.DarkThemeVariant.default.name summary = "%s" diff --git a/app/src/main/res/layout/source_comfortable_grid_item.xml b/app/src/main/res/layout/source_comfortable_grid_item.xml index f594734d0..b84f683d7 100644 --- a/app/src/main/res/layout/source_comfortable_grid_item.xml +++ b/app/src/main/res/layout/source_comfortable_grid_item.xml @@ -130,6 +130,7 @@ android:maxLines="2" android:padding="4dp" android:shadowColor="@color/textColorPrimaryLight" + android:textColor="?md_color_title" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/card" tools:text="Sample name" /> diff --git a/app/src/main/res/layout/source_compact_grid_item.xml b/app/src/main/res/layout/source_compact_grid_item.xml index 90968d8d0..29435b05b 100644 --- a/app/src/main/res/layout/source_compact_grid_item.xml +++ b/app/src/main/res/layout/source_compact_grid_item.xml @@ -124,7 +124,7 @@ android:shadowDx="0" android:shadowDy="0" android:shadowRadius="4" - android:textColor="@color/md_white_1000" + android:textColor="?md_color_title" tools:text="Sample name" /> <ProgressBar diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 2d7511f5c..3486b6a33 100755 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -32,6 +32,9 @@ <color name="backgroundDark">@color/colorDarkPrimaryDark</color> <color name="dialogDark">@color/colorDarkPrimary</color> <color name="selectorColorDark">@color/md_blue_A200_50</color> + + <color name="red">#FF0000</color> + <color name="dark_red">#880000</color> <!-- Reader Theme --> <color name="readerColorDarkPrimary">@color/colorDarkPrimary</color> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3013b7459..e74d0246e 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -150,6 +150,7 @@ <string name="theme_dark_default">Default</string> <string name="theme_dark_blue">Dark blue</string> <string name="theme_dark_amoled">AMOLED black</string> + <string name="theme_dark_red">Black-Red</string> <string name="pref_start_screen">Start screen</string> <string name="pref_language">Language</string> <string name="system_default">Default</string> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index b7e2ef1a9..14738c01d 100755 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -6,6 +6,10 @@ <!--========--> <style name="Theme.Toolbar" parent="@style/ThemeOverlay.MaterialComponents.ActionBar" /> + <style name="Theme.Toolbar.Red" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"> + <item name="android:textColorPrimary">@color/red</item> + </style> + <style name="Theme.Toolbar.Light" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"> <item name="popupTheme">@style/ThemeOverlay.MaterialComponents.Light</item> </style> diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index cb961f95b..f858636a6 100755 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -194,6 +194,22 @@ <item name="colorLibrarySelectionActive">@color/selectorColorDark</item> </style> + <style name="Theme.Tachiyomi.Red" parent="Theme.Tachiyomi.Amoled"> + <item name="actionBarTheme">@style/Theme.Toolbar.Red</item> + <item name="colorPrimary">@color/md_black_1000</item> + <item name="colorPrimaryVariant">@color/red</item> + <item name="colorSecondary">@color/dark_red</item> + <item name="colorOnSurface">@color/red</item> + <item name="colorAccent">@color/dark_red</item> + <item name="colorOnPrimary">@color/red</item> + <item name="android:navigationBarColor">@color/red</item> + <item name="android:textColor">@color/red</item> + <item name="android:textColorPrimary">@color/red</item> + <item name="android:textColorSecondary">@color/dark_red</item> + <item name="android:textColorHint">@color/dark_red</item> + <item name="md_color_title">@color/red</item> + </style> + <!--==============--> <!-- Reader Theme --> <!--==============-->