mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-22 01:15:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix bad theme change for the MainActivity

Browse source
This commit is contained in:
Benoit Marty 2021-03-19 13:36:24 +01:00
parent 80db39a934
commit 3b16351308
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES.md
View file

@ -8,7 +8,7 @@ Improvements 🙌:
- Display the room shield in all room setting screens - Display the room shield in all room setting screens
Bugfix 🐛: Bugfix 🐛:
- - Fix bad theme change for the MainActivity
Translations 🗣: Translations 🗣:
- -

3
vector/src/main/java/im/vector/app/features/MainActivity.kt
View file

@ -43,6 +43,7 @@ import im.vector.app.features.popup.PopupAlertManager
import im.vector.app.features.settings.VectorPreferences import im.vector.app.features.settings.VectorPreferences
import im.vector.app.features.signout.hard.SignedOutActivity import im.vector.app.features.signout.hard.SignedOutActivity
import im.vector.app.features.signout.soft.SoftLogoutActivity import im.vector.app.features.signout.soft.SoftLogoutActivity
import im.vector.app.features.themes.ActivityOtherThemes
import im.vector.app.features.ui.UiStateRepository import im.vector.app.features.ui.UiStateRepository
import kotlinx.parcelize.Parcelize import kotlinx.parcelize.Parcelize
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
@ -83,6 +84,8 @@ class MainActivity : VectorBaseActivity<ActivityMainBinding>(), UnlockedActivity
override fun getBinding() = ActivityMainBinding.inflate(layoutInflater) override fun getBinding() = ActivityMainBinding.inflate(layoutInflater)
override fun getOtherThemes() = ActivityOtherThemes.Launcher
private lateinit var args: MainActivityArgs private lateinit var args: MainActivityArgs
@Inject lateinit var notificationDrawerManager: NotificationDrawerManager @Inject lateinit var notificationDrawerManager: NotificationDrawerManager

5
vector/src/main/java/im/vector/app/features/themes/ActivityOtherThemes.kt
View file

@ -31,6 +31,11 @@ sealed class ActivityOtherThemes(@StyleRes val dark: Int,
R.style.AppTheme_Black R.style.AppTheme_Black
) )
object Launcher : ActivityOtherThemes(
R.style.AppTheme_Launcher,
R.style.AppTheme_Launcher
)
object AttachmentsPreview : ActivityOtherThemes( object AttachmentsPreview : ActivityOtherThemes(
R.style.AppTheme_AttachmentsPreview, R.style.AppTheme_AttachmentsPreview,
R.style.AppTheme_AttachmentsPreview R.style.AppTheme_AttachmentsPreview