From c8a4ec37e0097c165da904fe416e7a505a5fdb80 Mon Sep 17 00:00:00 2001 From: AbdullahM0hamed <25087116+AbdullahM0hamed@users.noreply.github.com> Date: Thu, 10 Sep 2020 22:06:49 +0100 Subject: [PATCH] Add Black-Red theme (#95) * Appveyor * stuff * resolve conflict * Let's try this again * try again * More fixing * remove appveyor * revert build.gradle * Revert "revert build.gradle" This reverts commit feaaa78157ffe8d6d6af7d6d63a74bc14b92f584. * Undo line change * Update build.gradle * Update MainActivity.kt Co-authored-by: AbdullahM0hamed --- app/build.gradle | 2 +- .../data/preference/PreferenceValues.kt | 1 + .../tachiyomi/ui/base/activity/BaseActivity.kt | 1 + .../ui/setting/SettingsGeneralController.kt | 6 ++++-- .../res/layout/source_comfortable_grid_item.xml | 1 + .../main/res/layout/source_compact_grid_item.xml | 2 +- app/src/main/res/values/colors.xml | 3 +++ app/src/main/res/values/strings.xml | 1 + app/src/main/res/values/styles.xml | 4 ++++ app/src/main/res/values/themes.xml | 16 ++++++++++++++++ 10 files changed, 33 insertions(+), 4 deletions(-) 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 : 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" /> @color/colorDarkPrimaryDark @color/colorDarkPrimary @color/md_blue_A200_50 + + #FF0000 + #880000 @color/colorDarkPrimary 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 @@ Default Dark blue AMOLED black + Black-Red Start screen Language Default 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 @@ + 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 @@ @color/selectorColorDark + +