refactor: directly read theme name instead of caching using local var…

…iable fix #1168
osfans · Jan 17, 2024 · af709fe · af709fe
1 parent 1914c30
commit af709fe
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/app/src/main/java/com/osfans/trime/data/theme/Theme.kt b/app/src/main/java/com/osfans/trime/data/theme/Theme.kt
@@ -85,7 +85,6 @@ class Theme private constructor(isDarkMode: Boolean) {
 
     init {
         self = this
-        ThemeManager.init()
         init(isDarkMode)
         Timber.d("Setting sound from color ...")
         SoundThemeManager.switchSound(colors.getString("sound"))

diff --git a/app/src/main/java/com/osfans/trime/data/theme/ThemeManager.kt b/app/src/main/java/com/osfans/trime/data/theme/ThemeManager.kt
@@ -19,16 +19,13 @@ object ThemeManager : DataDirectoryChangeListener.Listener {
 
     @JvmStatic
     fun switchTheme(theme: String) {
-        currentThemeName = theme
         AppPrefs.defaultInstance().themeAndColor.selectedTheme = theme
     }
 
     var sharedThemes: MutableList<String> = listThemes(DataManager.sharedDataDir)
 
     var userThemes: MutableList<String> = listThemes(DataManager.userDataDir)
 
-    private lateinit var currentThemeName: String
-
     /**
      * Update sharedThemes and userThemes.
      */
@@ -37,10 +34,6 @@ object ThemeManager : DataDirectoryChangeListener.Listener {
         userThemes = listThemes(DataManager.userDataDir)
     }
 
-    fun init() {
-        currentThemeName = AppPrefs.defaultInstance().themeAndColor.selectedTheme
-    }
-
     @JvmStatic
     fun getAllThemes(): List<String> {
         if (DataManager.sharedDataDir.absolutePath == DataManager.userDataDir.absolutePath) {
@@ -50,5 +43,5 @@ object ThemeManager : DataDirectoryChangeListener.Listener {
     }
 
     @JvmStatic
-    fun getActiveTheme() = currentThemeName
+    fun getActiveTheme() = AppPrefs.defaultInstance().themeAndColor.selectedTheme
 }