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

Themes cleanup (#4894)

Browse Source 
(cherry picked from commit ad57fde1c55984f3235ce86a7505e3675039b1dc)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/base/activity/BaseThemedActivity.kt
#	app/src/main/res/values/themes.xml
This commit is contained in:
Ivan Iskandar 2021-04-18 22:29:56 +07:00 committed by Jobobby04
parent 0b3209284a
commit e43777bba7
7 changed files with 65 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View File

@ -200,7 +200,7 @@
<activity <activity
android:name="exh.ui.intercept.InterceptActivity" android:name="exh.ui.intercept.InterceptActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/Theme.EHActivity"> android:theme="@style/Theme.Tachiyomi.Light">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
@ -374,7 +374,7 @@
</activity> </activity>
<activity <activity
android:name="exh.ui.captcha.BrowserActionActivity" android:name="exh.ui.captcha.BrowserActionActivity"
android:theme="@style/Theme.EHActivity" /> android:theme="@style/Theme.Tachiyomi.Light" />
</application> </application>
</manifest> </manifest>

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

@ -1,68 +1,42 @@
package eu.kanade.tachiyomi.ui.base.activity package eu.kanade.tachiyomi.ui.base.activity
import android.content.res.Configuration import android.content.res.Configuration.UI_MODE_NIGHT_MASK
import android.os.Build import android.content.res.Configuration.UI_MODE_NIGHT_YES
import android.os.Bundle import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.preference.PreferenceValues.DarkThemeVariant
import eu.kanade.tachiyomi.data.preference.PreferenceValues.LightThemeVariant
import eu.kanade.tachiyomi.data.preference.PreferenceValues.ThemeMode
import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
import eu.kanade.tachiyomi.data.preference.PreferenceValues as Values
abstract class BaseThemedActivity : AppCompatActivity() { abstract class BaseThemedActivity : AppCompatActivity() {
val preferences: PreferencesHelper by injectLazy() val preferences: PreferencesHelper by injectLazy()
private val isDarkMode: Boolean by lazy {
val themeMode = preferences.themeMode().get()
(themeMode == Values.ThemeMode.dark) ||
(
themeMode == Values.ThemeMode.system &&
(resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES)
)
}
private val lightTheme: Int by lazy {
when (preferences.themeLight().get()) {
Values.LightThemeVariant.blue -> R.style.Theme_Tachiyomi_LightBlue
else -> {
when {
// Light status + navigation bar
Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1 -> {
R.style.Theme_Tachiyomi_Light_Api27
}
// Light status bar + fallback gray navigation bar
Build.VERSION.SDK_INT >= Build.VERSION_CODES.M -> {
R.style.Theme_Tachiyomi_Light_Api23
}
// Fallback gray status + navigation bar
else -> {
R.style.Theme_Tachiyomi_Light
}
}
}
}
}
private val darkTheme: Int by lazy {
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
Values.DarkThemeVariant.midnightdusk -> R.style.Theme_Tachiyomi_MidnightDusk
Values.DarkThemeVariant.hotpink -> R.style.Theme_Tachiyomi_HotPink
else -> R.style.Theme_Tachiyomi_Dark
}
}
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
setTheme( val isDarkMode = when (preferences.themeMode().get()) {
when { ThemeMode.light -> false
isDarkMode -> darkTheme ThemeMode.dark -> true
else -> lightTheme ThemeMode.system -> resources.configuration.uiMode and UI_MODE_NIGHT_MASK == UI_MODE_NIGHT_YES
}
val themeId = if (isDarkMode) {
when (preferences.themeDark().get()) {
DarkThemeVariant.default -> R.style.Theme_Tachiyomi_Dark
DarkThemeVariant.blue -> R.style.Theme_Tachiyomi_Dark_Blue
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
} }
) } else {
when (preferences.themeLight().get()) {
LightThemeVariant.default -> R.style.Theme_Tachiyomi_Light
LightThemeVariant.blue -> R.style.Theme_Tachiyomi_Light_Blue
}
}
setTheme(themeId)
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
} }
} }

1
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
View File

@ -35,7 +35,6 @@ import eu.kanade.tachiyomi.ui.base.controller.SearchableNucleusController
import eu.kanade.tachiyomi.ui.base.controller.TabbedController import eu.kanade.tachiyomi.ui.base.controller.TabbedController
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.browse.migration.advanced.design.PreMigrationController import eu.kanade.tachiyomi.ui.browse.migration.advanced.design.PreMigrationController
import eu.kanade.tachiyomi.ui.browse.migration.sources.MigrationSourcesController
import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController
import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.main.MainActivity
import eu.kanade.tachiyomi.ui.manga.MangaController import eu.kanade.tachiyomi.ui.manga.MangaController

6
app/src/main/res/values-v23/themes.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="Base.V23.Theme.Tachiyomi.Light" parent="Base.Theme.Tachiyomi.Light">
<style name="Theme.Tachiyomi.Light.Api23"> <item name="android:statusBarColor">?attr/colorPrimary</item>
<item name="android:statusBarColor">@color/md_white_1000</item>
<item name="android:windowLightStatusBar">true</item> <item name="android:windowLightStatusBar">true</item>
</style> </style>
<style name="Theme.Tachiyomi.Light" parent="Base.V23.Theme.Tachiyomi.Light" />
</resources> </resources>

9
app/src/main/res/values-v27/themes.xml
View File

@ -1,12 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="Base.V27.Theme.Tachiyomi.Light" parent="Base.V23.Theme.Tachiyomi.Light">
<style name="Theme.Tachiyomi.Light.Api27"> <item name="android:navigationBarColor">?attr/colorPrimary</item>
<item name="android:statusBarColor">@color/md_white_1000</item>
<item name="android:windowLightStatusBar">true</item>
<item name="android:navigationBarColor">@color/md_white_1000</item>
<item name="android:windowLightNavigationBar">true</item> <item name="android:windowLightNavigationBar">true</item>
</style> </style>
<style name="Theme.Tachiyomi.Light" parent="Base.V27.Theme.Tachiyomi.Light" />
</resources> </resources>

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

@ -47,8 +47,9 @@
<item name="android:textDirection">locale</item> <item name="android:textDirection">locale</item>
<!-- Themes --> <!-- Themes -->
<item name="android:statusBarColor">?attr/colorPrimary</item> <item name="android:statusBarColor">@color/md_black_1000</item>
<item name="android:navigationBarColor">?attr/colorPrimary</item> <item name="android:navigationBarColor">@color/md_black_1000</item>
<item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@null</item>
<item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item> <item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
<item name="windowActionModeOverlay">true</item> <item name="windowActionModeOverlay">true</item>
<item name="elevationOverlayEnabled">false</item> <item name="elevationOverlayEnabled">false</item>
@ -84,34 +85,24 @@
<!-- Custom Attributes--> <!-- Custom Attributes-->
<item name="colorLibrarySelection">?attr/colorAccent</item> <item name="colorLibrarySelection">?attr/colorAccent</item>
<item name="colorLibrarySelectionActive">@color/selectorColorLight</item> <item name="colorLibrarySelectionActive">@color/selectorColorLight</item>
<item name="colorFilterActive">@color/filterColorDark</item> <item name="colorFilterActive">@color/filterColorLight</item>
</style> </style>
<!--===========--> <!--===========-->
<!-- Main Theme--> <!-- Main Theme-->
<!--===========--> <!--===========-->
<style name="Theme.Tachiyomi.Light" parent="Theme.Base"> <style name="Base.Theme.Tachiyomi.Light" parent="Theme.Base" />
<item name="android:statusBarColor">@color/md_black_1000</item> <style name="Theme.Tachiyomi.Light" parent="Base.Theme.Tachiyomi.Light" />
<item name="android:navigationBarColor">@color/md_black_1000_54</item>
<item name="background">@color/dialogLight</item>
<item name="colorFilterActive">@color/filterColorLight</item> <style name="Theme.Tachiyomi.Light.Blue">
</style>
<style name="Theme.Tachiyomi.LightBlue" parent="Theme.Base">
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorOnPrimary">@color/textColorPrimaryDark</item> <item name="colorOnPrimary">@color/textColorPrimaryDark</item>
<item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item> <item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item>
<item name="colorPrimaryVariant">@color/colorPrimaryDark</item> <item name="colorPrimaryVariant">@color/colorPrimaryDark</item>
<item name="background">@color/colorPrimary</item> <item name="colorFilterActive">@color/filterColorDark</item>
<item name="actionBarTheme">@style/Theme.Toolbar.Light</item> <item name="actionBarTheme">@style/Theme.Toolbar.Light</item>
<item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
<item name="android:navigationBarColor">@color/colorPrimary_70</item> <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
</style>
<style name="Theme.EHActivity" parent="Theme.Tachiyomi.Light">
<!-- Attributes specific for SDK 16 to SDK 20 -->
</style> </style>
<!--=============--> <!--=============-->
@ -152,6 +143,7 @@
<!-- Themes --> <!-- Themes -->
<item name="android:statusBarColor">?attr/colorPrimary</item> <item name="android:statusBarColor">?attr/colorPrimary</item>
<item name="android:navigationBarColor">?attr/colorPrimary</item> <item name="android:navigationBarColor">?attr/colorPrimary</item>
<item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@null</item>
<item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item> <item name="android:enforceNavigationBarContrast" tools:targetApi="Q">false</item>
<item name="windowActionModeOverlay">true</item> <item name="windowActionModeOverlay">true</item>
<item name="elevationOverlayEnabled">false</item> <item name="elevationOverlayEnabled">false</item>
@ -191,17 +183,16 @@
<item name="colorFilterActive">@color/filterColorDark</item> <item name="colorFilterActive">@color/filterColorDark</item>
</style> </style>
<style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark"> <style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark" />
</style>
<style name="Theme.Tachiyomi.DarkBlue" parent="Theme.Base.Dark"> <style name="Theme.Tachiyomi.Dark.Blue">
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item> <item name="colorAccentOnPrimary">@color/textColorPrimaryDark</item>
<item name="colorPrimaryVariant">@color/colorPrimary</item> <item name="colorPrimaryVariant">@color/colorPrimary</item>
<item name="background">@color/colorPrimary</item> <item name="background">@color/colorPrimary</item>
</style> </style>
<style name="Theme.Tachiyomi.Amoled" parent="Theme.Base.Dark"> <style name="Theme.Tachiyomi.Dark.Amoled">
<item name="colorPrimary">@color/colorAmoledPrimary</item> <item name="colorPrimary">@color/colorAmoledPrimary</item>
<item name="colorPrimaryVariant">@color/colorAmoledPrimary</item> <item name="colorPrimaryVariant">@color/colorAmoledPrimary</item>
<item name="colorSurface">@color/colorAmoledPrimary</item> <item name="colorSurface">@color/colorAmoledPrimary</item>
@ -217,21 +208,6 @@
<item name="colorLibrarySelectionActive">@color/selectorColorDark</item> <item name="colorLibrarySelectionActive">@color/selectorColorDark</item>
</style> </style>
<style name="Theme.Tachiyomi.Red" parent="Theme.Tachiyomi.Amoled">
<item name="actionBarTheme">@style/Theme.Toolbar.Red</item>
<item name="colorPrimary">@color/md_black_1000</item>
<item name="colorPrimaryVariant">@color/red</item>
<item name="colorSecondary">@color/dark_red</item>
<item name="colorOnSurface">@color/red</item>
<item name="colorAccent">@color/dark_red</item>
<item name="colorOnPrimary">@color/red</item>
<item name="android:textColor">@color/red</item>
<item name="android:textColorPrimary">@color/red</item>
<item name="android:textColorSecondary">@color/dark_red</item>
<item name="android:textColorHint">@color/dark_red</item>
<item name="md_color_title">@color/red</item>
</style>
<!--==============--> <!--==============-->
<!-- Reader Theme --> <!-- Reader Theme -->
<!--==============--> <!--==============-->
@ -279,7 +255,7 @@
<!--===============--> <!--===============-->
<!-- Launch Screen --> <!-- Launch Screen -->
<!--===============--> <!--===============-->
<style name="Theme.Splash" parent="Theme.Tachiyomi.LightBlue"> <style name="Theme.Splash" parent="Theme.Tachiyomi.Light.Blue">
<item name="colorBackgroundSplash">@color/colorPrimary</item> <item name="colorBackgroundSplash">@color/colorPrimary</item>
<item name="android:windowBackground">@drawable/splash_background</item> <item name="android:windowBackground">@drawable/splash_background</item>

20
app/src/main/res/values/themes_sy.xml
View File

@ -4,7 +4,22 @@
<!--=============--> <!--=============-->
<!-- Dark Themes --> <!-- Dark Themes -->
<!--=============--> <!--=============-->
<style name="Theme.Tachiyomi.MidnightDusk" parent="Theme.Base.Dark"> <style name="Theme.Tachiyomi.Dark.Red" parent="Theme.Tachiyomi.Dark.Amoled">
<item name="actionBarTheme">@style/Theme.Toolbar.Red</item>
<item name="colorPrimary">@color/md_black_1000</item>
<item name="colorPrimaryVariant">@color/red</item>
<item name="colorSecondary">@color/dark_red</item>
<item name="colorOnSurface">@color/red</item>
<item name="colorAccent">@color/dark_red</item>
<item name="colorOnPrimary">@color/red</item>
<item name="android:textColor">@color/red</item>
<item name="android:textColorPrimary">@color/red</item>
<item name="android:textColorSecondary">@color/dark_red</item>
<item name="android:textColorHint">@color/dark_red</item>
<item name="md_color_title">@color/red</item>
</style>
<style name="Theme.Tachiyomi.Dark.MidnightDusk" parent="Theme.Base.Dark">
<item name="colorPrimary">@color/dialogDusk</item> <item name="colorPrimary">@color/dialogDusk</item>
<item name="colorOnPrimary">@color/textColorPrimaryDusk</item> <item name="colorOnPrimary">@color/textColorPrimaryDusk</item>
<item name="colorAccentOnPrimary">@color/colorAccentDusk</item> <item name="colorAccentOnPrimary">@color/colorAccentDusk</item>
@ -27,8 +42,7 @@
<item name="colorLibrarySelectionActive">@color/selectorColorDark</item> <item name="colorLibrarySelectionActive">@color/selectorColorDark</item>
</style> </style>
<style name="Theme.Tachiyomi.Dark.HotPink" parent="Theme.Base.Dark">
<style name="Theme.Tachiyomi.HotPink" parent="Theme.Base.Dark">
<item name="colorPrimary">@color/dialogPink</item> <item name="colorPrimary">@color/dialogPink</item>
<item name="colorPrimaryDark">@color/dialogPink</item> <item name="colorPrimaryDark">@color/dialogPink</item>
<item name="colorOnPrimary">@color/textColorPrimaryPink</item> <item name="colorOnPrimary">@color/textColorPrimaryPink</item>