6543
/
BayernMessenger
forked from GitHub-Mirror/riotX-android
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

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
parent d9f448c9aa b79fdf6a85
commit 23466fb5a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt
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) {