admin/TachiyomiSY
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add "Midnight Dusk" and "Hot Pink" themes (#5161)

Browse Source 
* Organize and clarify themes file

Increases clarification with better commenting, should make it easier to add or modify current themes.

* Make AMOLED its own theme category

* Tweak ripples for AMOLED

* Add "Midnight Dusk" theme

Ports it from jobobby04/TachiyomiSY.

Co-Authored-By: CrepeTF <70870719+CrepeTF@users.noreply.github.com>

* Add "Hot Pink" theme

Ports it from jobobby04/TachiyomiSY.

Co-Authored-By: OncePunchedMan <64155117+OncePunchedMan@users.noreply.github.com>

* Make AMOLED a base theme

* Final tweaks

Rename "Toolbar.Light" to "Custom.PopupTheme"
Changes placing of backgroundDusk

Removes HotPink and MidnightDusk custom Toolbars, I believe they are unnecessary.

* Rename a Midnight Dusk color

* Make AMOLED independent from Dark as a theme

Co-authored-by: CrepeTF <70870719+CrepeTF@users.noreply.github.com>
Co-authored-by: OncePunchedMan <64155117+OncePunchedMan@users.noreply.github.com>
(cherry picked from commit 176e984b56)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
#	app/src/main/res/values/styles.xml
#	app/src/main/res/values/themes.xml
This commit is contained in:
Soitora
2021-05-24 17:16:32 +02:00
committed by Jobobby04
parent 97eda86ac4
commit 606101dc8b
11 changed files with 269 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
+3 -3
View File
@@ -24,11 +24,11 @@ object PreferenceValues {
enum class DarkThemeVariant {
default,
blue,
amoledblue,
amoled,
red,
midnightdusk,
amoled,
hotpink,
amoledblue,
red,
}
/* ktlint-enable experimental:enum-entry-name-case */
app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
+4 -4
View File
@@ -25,11 +25,11 @@ abstract class BaseThemedActivity : AppCompatActivity() {
when (preferences.themeDark().get()) {
DarkThemeVariant.default -> R.style.Theme_Tachiyomi_Dark
DarkThemeVariant.blue -> R.style.Theme_Tachiyomi_Dark_Blue
DarkThemeVariant.amoledblue -> R.style.Theme_Tachiyomi_Dark_AmoledBlue
DarkThemeVariant.amoled -> R.style.Theme_Tachiyomi_Dark_Amoled
DarkThemeVariant.red -> R.style.Theme_Tachiyomi_Dark_Red
DarkThemeVariant.midnightdusk -> R.style.Theme_Tachiyomi_Dark_MidnightDusk
DarkThemeVariant.hotpink -> R.style.Theme_Tachiyomi_Dark_HotPink
DarkThemeVariant.amoled -> R.style.Theme_Tachiyomi_Amoled
DarkThemeVariant.hotpink -> R.style.Theme_Tachiyomi_Amoled_HotPink
DarkThemeVariant.amoledblue -> R.style.Theme_Tachiyomi_Amoled_Blue
DarkThemeVariant.red -> R.style.Theme_Tachiyomi_Dark_Red
}
} else {
when (preferences.themeLight().get()) {
app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
+7 -7
View File
@@ -156,20 +156,20 @@ class SettingsGeneralController : SettingsController() {
entriesRes = arrayOf(
R.string.theme_dark_default,
R.string.theme_dark_blue,
R.string.theme_dark_amoledblue,
R.string.theme_dark_amoled,
R.string.theme_dark_red,
R.string.theme_dark_midnightdusk,
R.string.theme_dark_hotpink,
R.string.theme_dark_amoled,
R.string.theme_dark_amoled_hotpink,
R.string.theme_dark_amoledblue,
R.string.theme_dark_red
)
entryValues = arrayOf(
Values.DarkThemeVariant.default.name,
Values.DarkThemeVariant.blue.name,
Values.DarkThemeVariant.amoledblue.name,
Values.DarkThemeVariant.amoled.name,
Values.DarkThemeVariant.red.name,
Values.DarkThemeVariant.midnightdusk.name,
Values.DarkThemeVariant.amoled.name,
Values.DarkThemeVariant.hotpink.name,
Values.DarkThemeVariant.amoledblue.name,
Values.DarkThemeVariant.red.name
)
defaultValue = Values.DarkThemeVariant.default.name
summary = "%s"