Merge pull request #463 from vector-im/feature/fix_theme

Fix theme not well defined at runtime after configurationChange
This commit is contained in:
Benoit Marty
2019-08-07 10:40:33 +02:00
committed by GitHub

View File

@@ -119,6 +119,8 @@ abstract class VectorBaseActivity : BaseMvRxActivity(), HasScreenInjector {
injectWith(screenComponent)
}
Timber.v("Injecting dependencies into ${javaClass.simpleName} took $timeForInjection ms")
ThemeUtils.setActivityTheme(this, getOtherThemes())
super.onCreate(savedInstanceState)
viewModelFactory = screenComponent.viewModelFactory()
configurationViewModel = ViewModelProviders.of(this, viewModelFactory).get(ConfigurationViewModel::class.java)
@@ -135,8 +137,6 @@ abstract class VectorBaseActivity : BaseMvRxActivity(), HasScreenInjector {
// Shake detector
ThemeUtils.setActivityTheme(this, getOtherThemes())
doBeforeSetContentView()
if (getLayoutRes() != -1) {