File tree Expand file tree Collapse file tree 2 files changed +1
-9
lines changed
app/src/main/java/com/osfans/trime/data/theme Expand file tree Collapse file tree 2 files changed +1
-9
lines changed Original file line number Diff line number Diff line change @@ -85,7 +85,6 @@ class Theme private constructor(isDarkMode: Boolean) {
85
85
86
86
init {
87
87
self = this
88
- ThemeManager .init ()
89
88
init (isDarkMode)
90
89
Timber .d(" Setting sound from color ..." )
91
90
SoundThemeManager .switchSound(colors.getString(" sound" ))
Original file line number Diff line number Diff line change @@ -19,16 +19,13 @@ object ThemeManager : DataDirectoryChangeListener.Listener {
19
19
20
20
@JvmStatic
21
21
fun switchTheme (theme : String ) {
22
- currentThemeName = theme
23
22
AppPrefs .defaultInstance().themeAndColor.selectedTheme = theme
24
23
}
25
24
26
25
var sharedThemes: MutableList <String > = listThemes(DataManager .sharedDataDir)
27
26
28
27
var userThemes: MutableList <String > = listThemes(DataManager .userDataDir)
29
28
30
- private lateinit var currentThemeName: String
31
-
32
29
/* *
33
30
* Update sharedThemes and userThemes.
34
31
*/
@@ -37,10 +34,6 @@ object ThemeManager : DataDirectoryChangeListener.Listener {
37
34
userThemes = listThemes(DataManager .userDataDir)
38
35
}
39
36
40
- fun init () {
41
- currentThemeName = AppPrefs .defaultInstance().themeAndColor.selectedTheme
42
- }
43
-
44
37
@JvmStatic
45
38
fun getAllThemes (): List <String > {
46
39
if (DataManager .sharedDataDir.absolutePath == DataManager .userDataDir.absolutePath) {
@@ -50,5 +43,5 @@ object ThemeManager : DataDirectoryChangeListener.Listener {
50
43
}
51
44
52
45
@JvmStatic
53
- fun getActiveTheme () = currentThemeName
46
+ fun getActiveTheme () = AppPrefs .defaultInstance().themeAndColor.selectedTheme
54
47
}
You can’t perform that action at this time.
0 commit comments