Merge pull request #368 from vbh/theme-change

Fix: Theme change
Chooloo · Apr 6, 2022 · 66c981b · 66c981b
2 parents 5c28de0 + ab8387b
commit 66c981b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseActivity.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/base/BaseActivity.kt
@@ -6,6 +6,7 @@ import android.view.View
 import android.view.WindowManager
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatDelegate
 import com.chooloo.www.chooloolib.interactor.preferences.PreferencesInteractor
 import com.chooloo.www.chooloolib.interactor.string.StringsInteractor
 import io.reactivex.disposables.CompositeDisposable
@@ -27,6 +28,7 @@ abstract class BaseActivity<VM : BaseViewState> : AppCompatActivity(), BaseView<
         }
         applicationContext.setTheme(preferences.accentTheme.theme)
         setTheme(preferences.accentTheme.theme)
+        AppCompatDelegate.setDefaultNightMode(preferences.themeMode.mode)
         contentView?.let { setContentView(it) }
         onSetup()
         viewState.apply {

diff --git a/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/settings/SettingsViewState.kt b/chooloolib/src/main/java/com/chooloo/www/chooloolib/ui/settings/SettingsViewState.kt
@@ -64,5 +64,6 @@ open class SettingsViewState @Inject constructor(
 
     fun onThemeModeResponse(response: ThemeMode) {
         preferencesInteractor.themeMode = response
+        navigationsInteractor.goToLauncherActivity()
     }
 }