Skip to content

Commit af709fe

Browse files
committed
refactor: directly read theme name instead of caching using local variable
fix #1168
1 parent 1914c30 commit af709fe

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

app/src/main/java/com/osfans/trime/data/theme/Theme.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ class Theme private constructor(isDarkMode: Boolean) {
8585

8686
init {
8787
self = this
88-
ThemeManager.init()
8988
init(isDarkMode)
9089
Timber.d("Setting sound from color ...")
9190
SoundThemeManager.switchSound(colors.getString("sound"))

app/src/main/java/com/osfans/trime/data/theme/ThemeManager.kt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,13 @@ object ThemeManager : DataDirectoryChangeListener.Listener {
1919

2020
@JvmStatic
2121
fun switchTheme(theme: String) {
22-
currentThemeName = theme
2322
AppPrefs.defaultInstance().themeAndColor.selectedTheme = theme
2423
}
2524

2625
var sharedThemes: MutableList<String> = listThemes(DataManager.sharedDataDir)
2726

2827
var userThemes: MutableList<String> = listThemes(DataManager.userDataDir)
2928

30-
private lateinit var currentThemeName: String
31-
3229
/**
3330
* Update sharedThemes and userThemes.
3431
*/
@@ -37,10 +34,6 @@ object ThemeManager : DataDirectoryChangeListener.Listener {
3734
userThemes = listThemes(DataManager.userDataDir)
3835
}
3936

40-
fun init() {
41-
currentThemeName = AppPrefs.defaultInstance().themeAndColor.selectedTheme
42-
}
43-
4437
@JvmStatic
4538
fun getAllThemes(): List<String> {
4639
if (DataManager.sharedDataDir.absolutePath == DataManager.userDataDir.absolutePath) {
@@ -50,5 +43,5 @@ object ThemeManager : DataDirectoryChangeListener.Listener {
5043
}
5144

5245
@JvmStatic
53-
fun getActiveTheme() = currentThemeName
46+
fun getActiveTheme() = AppPrefs.defaultInstance().themeAndColor.selectedTheme
5447
}

0 commit comments

Comments
 (0)