Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-22 18:11:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove Hot Pink theme

Browse Source 
The old AMOLED Hot Pink theme is pretty close to what Midnight Dusk + AMOLED is now.
This commit is contained in:
arkon 2021-07-04 12:05:53 -04:00
parent 535cc0d81e
commit e9dce32a98
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,20 +21,22 @@ object PreferenceValues {
/* ktlint-enable experimental:enum-entry-name-case */ /* ktlint-enable experimental:enum-entry-name-case */
enum class AppTheme(val titleResId: Int) { enum class AppTheme(val titleResId: Int?) {
DEFAULT(R.string.theme_default), DEFAULT(R.string.theme_default),
BLUE(R.string.theme_blue), BLUE(R.string.theme_blue),
GREEN_APPLE(R.string.theme_greenapple), GREEN_APPLE(R.string.theme_greenapple),
HOT_PINK(R.string.theme_hotpink),
MIDNIGHT_DUSK(R.string.theme_midnightdusk), MIDNIGHT_DUSK(R.string.theme_midnightdusk),
STRAWBERRY_DAIQUIRI(R.string.theme_strawberrydaiquiri), STRAWBERRY_DAIQUIRI(R.string.theme_strawberrydaiquiri),
YOTSUBA(R.string.theme_yotsuba) YOTSUBA(R.string.theme_yotsuba),
// Deprecated
HOT_PINK(null),
} }
enum class TappingInvertMode(val shouldInvertHorizontal: Boolean = false, val shouldInvertVertical: Boolean = false) { enum class TappingInvertMode(val shouldInvertHorizontal: Boolean = false, val shouldInvertVertical: Boolean = false) {
NONE, NONE,
HORIZONTAL(shouldInvertHorizontal = true), HORIZONTAL(shouldInvertHorizontal = true),
VERTICAL(shouldInvertVertical = true), VERTICAL(shouldInvertVertical = true),
BOTH(shouldInvertHorizontal = true, shouldInvertVertical = true) BOTH(shouldInvertHorizontal = true, shouldInvertVertical = true),
} }
} }

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

@ -34,9 +34,6 @@ abstract class BaseThemedActivity : AppCompatActivity() {
fun AppCompatActivity.applyThemePreferences(preferences: PreferencesHelper) { fun AppCompatActivity.applyThemePreferences(preferences: PreferencesHelper) {
val resIds = mutableListOf<Int>() val resIds = mutableListOf<Int>()
when (preferences.appTheme().get()) { when (preferences.appTheme().get()) {
PreferenceValues.AppTheme.DEFAULT -> {
resIds += R.style.Theme_Tachiyomi
}
PreferenceValues.AppTheme.BLUE -> { PreferenceValues.AppTheme.BLUE -> {
resIds += R.style.Theme_Tachiyomi_DarkBlue resIds += R.style.Theme_Tachiyomi_DarkBlue
resIds += R.style.ThemeOverlay_Tachiyomi_ColoredBars resIds += R.style.ThemeOverlay_Tachiyomi_ColoredBars
@ -44,9 +41,6 @@ abstract class BaseThemedActivity : AppCompatActivity() {
PreferenceValues.AppTheme.GREEN_APPLE -> { PreferenceValues.AppTheme.GREEN_APPLE -> {
resIds += R.style.Theme_Tachiyomi_GreenApple resIds += R.style.Theme_Tachiyomi_GreenApple
} }
PreferenceValues.AppTheme.HOT_PINK -> {
resIds += R.style.Theme_Tachiyomi_HotPink
}
PreferenceValues.AppTheme.MIDNIGHT_DUSK -> { PreferenceValues.AppTheme.MIDNIGHT_DUSK -> {
resIds += R.style.Theme_Tachiyomi_MidnightDusk resIds += R.style.Theme_Tachiyomi_MidnightDusk
} }
@ -56,6 +50,9 @@ abstract class BaseThemedActivity : AppCompatActivity() {
PreferenceValues.AppTheme.YOTSUBA -> { PreferenceValues.AppTheme.YOTSUBA -> {
resIds += R.style.Theme_Tachiyomi_Yotsuba resIds += R.style.Theme_Tachiyomi_Yotsuba
} }
else -> {
resIds += R.style.Theme_Tachiyomi
}
} }
if (preferences.themeDarkAmoled().get()) { if (preferences.themeDarkAmoled().get()) {

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

@ -122,8 +122,8 @@ class SettingsGeneralController : SettingsController() {
key = Keys.appTheme key = Keys.appTheme
titleRes = R.string.pref_app_theme titleRes = R.string.pref_app_theme
val appThemes = Values.AppTheme.values() val appThemes = Values.AppTheme.values().filter { it.titleResId != null }
entriesRes = appThemes.map { it.titleResId }.toTypedArray() entriesRes = appThemes.map { it.titleResId!! }.toTypedArray()
entryValues = appThemes.map { it.name }.toTypedArray() entryValues = appThemes.map { it.name }.toTypedArray()
defaultValue = appThemes[0].name defaultValue = appThemes[0].name
summary = "%s" summary = "%s"

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

@ -153,7 +153,6 @@
<string name="theme_blue">Blue</string> <string name="theme_blue">Blue</string>
<string name="theme_greenapple">Green Apple</string> <string name="theme_greenapple">Green Apple</string>
<string name="theme_midnightdusk">Midnight Dusk</string> <string name="theme_midnightdusk">Midnight Dusk</string>
<string name="theme_hotpink">Hot Pink</string>
<string name="pref_dark_theme_pure_black">Pure black dark mode</string> <string name="pref_dark_theme_pure_black">Pure black dark mode</string>
<string name="pref_start_screen">Start screen</string> <string name="pref_start_screen">Start screen</string>
<string name="pref_language">Language</string> <string name="pref_language">Language</string>