diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/system/ThemeUtil.kt b/app/src/main/java/eu/kanade/tachiyomi/util/system/ThemeUtil.kt index f7083cf2fa..73fb0de225 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/system/ThemeUtil.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/system/ThemeUtil.kt @@ -81,6 +81,16 @@ object ThemeUtil { AppCompatDelegate.MODE_NIGHT_YES, R.string.black_and_red ), + HOT_PINK( + R.style.Theme_Tachiyomi_HotPink, + AppCompatDelegate.MODE_NIGHT_YES, + R.string.hot_pink + ), + LIME( + R.style.Theme_Tachiyomi_FlatLime, + AppCompatDelegate.MODE_NIGHT_YES, + R.string.flat_lime + ), LIGHT_BLUE( R.style.Theme_Tachiyomi_AllBlue, AppCompatDelegate.MODE_NIGHT_NO, @@ -160,8 +170,9 @@ object ThemeUtil { @ColorInt val darkBackground: Int = Color.parseColor( when (styleRes) { - R.style.Theme_Tachiyomi_Amoled, R.style.Theme_Tachiyomi_BlackAndRed -> "#000000" + R.style.Theme_Tachiyomi_Amoled, R.style.Theme_Tachiyomi_BlackAndRed, R.style.Theme_Tachiyomi_HotPink -> "#000000" R.style.Theme_Tachiyomi_MidnightDusk -> "#16151D" + R.style.Theme_Tachiyomi_FlatLime -> "#16151D" else -> "#1C1C1D" } ) @@ -179,6 +190,8 @@ object ThemeUtil { when (styleRes) { R.style.Theme_Tachiyomi_MidnightDusk -> "#F02475" R.style.Theme_Tachiyomi_BlackAndRed -> "#AA2200" + R.style.Theme_Tachiyomi_HotPink -> "#FF3399" + R.style.Theme_Tachiyomi_FlatLime -> "#4AF88A" else -> "#3399FF" } ) @@ -221,7 +234,7 @@ object ThemeUtil { val darkBottomBar: Int = Color.parseColor( when (styleRes) { R.style.Theme_Tachiyomi_AllBlue -> "#54759E" - R.style.Theme_Tachiyomi_Amoled, R.style.Theme_Tachiyomi_BlackAndRed -> "#000000" + R.style.Theme_Tachiyomi_Amoled, R.style.Theme_Tachiyomi_BlackAndRed, R.style.Theme_Tachiyomi_HotPink -> "#000000" R.style.Theme_Tachiyomi_MidnightDusk -> "#201F27" else -> "#212121" } diff --git a/app/src/main/res/color/primary_button_text_color_selector.xml b/app/src/main/res/color/primary_button_text_color_selector.xml index 0770047cb9..265dc2cd08 100644 --- a/app/src/main/res/color/primary_button_text_color_selector.xml +++ b/app/src/main/res/color/primary_button_text_color_selector.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/source_global_search_controller_card_item.xml b/app/src/main/res/layout/source_global_search_controller_card_item.xml index 64bedf620a..3f6fdb58d6 100644 --- a/app/src/main/res/layout/source_global_search_controller_card_item.xml +++ b/app/src/main/res/layout/source_global_search_controller_card_item.xml @@ -61,7 +61,7 @@ android:paddingStart="5dp" android:paddingEnd="5dp" android:textSize="13sp" - android:textColor="@color/unread_badge_text" + android:textColor="?attr/colorOnAccent" style="@style/TextAppearance.Regular.Caption.Light" android:layout_height="wrap_content" android:tint="@color/md_white_1000" diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index ac80944faa..b06409d448 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -31,4 +31,19 @@ #201F27 @color/md_white_1000 @color/md_white_1000 + + + #FF3399 + + + #4AF88A + @color/md_white_1000 + @color/md_white_1000_76 + @color/md_white_1000_50 + @color/md_white_1000_20 + #202125 + #2C2D32 + #282A2E + #2C2D32 + \ No newline at end of file diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index 563a5cd450..fa29f0d674 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -27,4 +27,11 @@ @color/md_red_500 + + + + \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index a26aafca53..5b7868f3a8 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -14,6 +14,7 @@ + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2f4d67f195..bd81aeff2f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -553,6 +553,8 @@ Midnight Dusk Spring Blossom Black \'n\' Red + Hot Pink + Flat Lime Pure White Locale Last used (Library or Recents) diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 9fb2f6085c..177d8ca5fc 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -111,13 +111,13 @@ @dimen/fab_margin fitCenter bottom|right|end - @color/md_white_1000 + ?attr/colorOnAccent @dimen/fab_size ?attr/colorAccent - @color/md_white_1000 - @android:color/white + ?attr/colorOnAccent + ?attr/colorOnAccent false - @android:color/white + ?attr/colorOnAccent + +