Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added "Midnight Dusk" theme (#183)

Browse Source 
* Added Midnight Dusk theme + tweaks

* Added Midnight Dusk theme + tweaks

* Colouring mistakes

* Space error
This commit is contained in:
CrepeTF 2020-12-27 00:25:34 +00:00 committed by GitHub
parent a907c93147
commit 4b3d92a050
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 57 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
View File

@ -24,6 +24,7 @@ object PreferenceValues {
blue,
amoled,
red,
midnightdusk,
}
enum class DisplayMode {

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

@ -49,6 +49,7 @@ abstract class BaseThemedActivity : AppCompatActivity() {
Values.DarkThemeVariant.blue -> R.style.Theme_Tachiyomi_DarkBlue
Values.DarkThemeVariant.amoled -> R.style.Theme_Tachiyomi_Amoled
Values.DarkThemeVariant.red -> R.style.Theme_Tachiyomi_Red
Values.DarkThemeVariant.midnightdusk -> R.style.Theme_Tachiyomi_MidnightDusk
else -> R.style.Theme_Tachiyomi_Dark
}
}

6
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
View File

@ -133,13 +133,15 @@ class SettingsGeneralController : SettingsController() {
R.string.theme_dark_default,
R.string.theme_dark_blue,
R.string.theme_dark_amoled,
R.string.theme_dark_red
R.string.theme_dark_red,
R.string.theme_dark_midnightdusk,
)
entryValues = arrayOf(
Values.DarkThemeVariant.default.name,
Values.DarkThemeVariant.blue.name,
Values.DarkThemeVariant.amoled.name,
Values.DarkThemeVariant.red.name
Values.DarkThemeVariant.red.name,
Values.DarkThemeVariant.midnightdusk.name,
)
defaultValue = Values.DarkThemeVariant.default.name
summary = "%s"

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

@ -36,6 +36,17 @@
<color name="red">#FF0000</color>
<color name="dark_red">#880000</color>
<!-- Midnight Dusk Theme -->
<color name="colorAccentDusk">#E21063</color>
<color name="textColorPrimaryDusk">@color/md_white_1000</color>
<color name="textColorSecondaryDusk">@color/md_white_1000_70</color>
<color name="textColorHintDusk">@color/md_white_1000_50</color>
<color name="dividerDusk">#12ffffff</color>
<color name="rippleColorDusk">@color/md_white_1000_20</color>
<color name="backgroundDusk">#16151D</color>
<color name="dialogDusk">#201F27</color>
<color name="selectorColorDusk">#80FEF936</color>
<!-- Reader Theme -->
<color name="readerColorDarkPrimary">@color/colorDarkPrimary</color>
<color name="pageNumberBackgroundLight">@color/md_grey_50_75</color>

1
app/src/main/res/values/strings.xml
View File

@ -152,6 +152,7 @@
<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="theme_dark_midnightdusk">Midnight Dusk</string>
<string name="pref_start_screen">Start screen</string>
<string name="pref_language">Language</string>
<string name="system_default">Default</string>

4
app/src/main/res/values/styles.xml
View File

@ -10,6 +10,10 @@
<item name="android:textColorPrimary">@color/red</item>
</style>
<style name="Theme.Toolbar.MidnightDusk" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
<item name="android:textColorPrimary">@color/md_white_1000</item>
</style>
<style name="Theme.Toolbar.Light" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
<item name="popupTheme">@style/ThemeOverlay.MaterialComponents.Light</item>
</style>

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

@ -90,6 +90,7 @@
<style name="Theme.Tachiyomi.Light" parent="Theme.Base">
<item name="android:statusBarColor">@color/md_black_1000_54</item>
<item name="android:navigationBarColor">@color/md_black_1000_54</item>
<item name="background">@color/dialogLight</item>
<item name="colorFilterActive">@color/filterColorLight</item>
</style>
@ -99,6 +100,7 @@
<item name="colorOnPrimary">@color/textColorPrimaryDark</item>
<item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item>
<item name="colorPrimaryVariant">@color/colorPrimaryDark</item>
<item name="background">@color/colorPrimary</item>
<item name="actionBarTheme">@style/Theme.Toolbar.Light</item>
</style>
@ -122,6 +124,7 @@
<item name="colorOnSurface">@color/textColorPrimaryDark</item>
<item name="colorOnBackground">@color/textColorPrimaryDark</item>
<item name="colorAccent">@color/colorAccentDark</item>
<item name="background">@color/colorDarkPrimaryDark</item>
<!-- Handles RTL text -->
<item name="android:textAlignment">gravity</item>
@ -189,12 +192,14 @@
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item>
<item name="colorPrimaryVariant">@color/colorPrimary</item>
<item name="background">@color/colorPrimary</item>
</style>
<style name="Theme.Tachiyomi.Amoled" parent="Theme.Base.Dark">
<item name="colorPrimary">@color/colorAmoledPrimary</item>
<item name="colorPrimaryVariant">@color/colorAmoledPrimary</item>
<item name="colorSurface">@color/colorAmoledPrimary</item>
<item name="background">@color/colorAmoledPrimary</item>
<item name="android:colorBackground">@color/colorAmoledPrimary</item>

30
app/src/main/res/values/themes_sy.xml Normal file
View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<!--=============-->
<!-- Dark Themes -->
<!--=============-->
<style name="Theme.Tachiyomi.MidnightDusk" parent="Theme.Base.Dark">
<item name="colorPrimary">@color/dialogDusk</item>
<item name="colorOnPrimary">@color/textColorPrimaryDusk</item>
<item name="colorAccentOnPrimary">@color/colorAccentDusk</item>
<item name="colorPrimaryVariant">@color/dialogDusk</item>
<item name="colorSecondary">@color/colorAccentDusk</item>
<item name="colorOnSecondary">@color/textColorPrimaryDusk</item>
<item name="colorSurface">@color/dialogDusk</item>
<item name="colorOnSurface">@color/textColorPrimaryDusk</item>
<item name="colorOnBackground">@color/textColorPrimaryDusk</item>
<item name="colorAccent">@color/colorAccentDusk</item>
<item name="background">@color/backgroundDusk</item>
<item name="android:colorBackground">@color/backgroundDusk</item>
<!-- Some ROMs make black navbars white (e.g. OxygenOS) -->
<item name="android:navigationBarColor">@android:color/transparent</item>
<!-- Custom Attributes -->
<item name="colorLibrarySelection">@color/selectorColorDark</item>
<item name="colorLibrarySelectionActive">@color/selectorColorDark</item>
</style>
</resources>