diff --git a/CHANGES.md b/CHANGES.md index a69e1f866b..2bf6249423 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -18,6 +18,7 @@ Bugfix 🐛: - Try to fix crash about UrlPreview (#2640) - Be robust if Event.type is missing (#2946) - Snappier message send status + - Fix MainActivity display (#2927) Translations 🗣: - All string resources and translations have been moved to the application module. Weblate project for the SDK will be removed. diff --git a/vector/src/main/java/im/vector/app/features/MainActivity.kt b/vector/src/main/java/im/vector/app/features/MainActivity.kt index 351163b026..143506d4df 100644 --- a/vector/src/main/java/im/vector/app/features/MainActivity.kt +++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt @@ -31,7 +31,7 @@ import im.vector.app.core.error.ErrorFormatter import im.vector.app.core.extensions.startSyncing import im.vector.app.core.platform.VectorBaseActivity import im.vector.app.core.utils.deleteAllFiles -import im.vector.app.databinding.FragmentLoadingBinding +import im.vector.app.databinding.ActivityMainBinding import im.vector.app.features.home.HomeActivity import im.vector.app.features.home.ShortcutsHandler import im.vector.app.features.login.LoginActivity @@ -66,7 +66,7 @@ data class MainActivityArgs( * This Activity, when started with argument, is also doing some cleanup when user signs out, * clears cache, is logged out, or is soft logged out */ -class MainActivity : VectorBaseActivity(), UnlockedActivity { +class MainActivity : VectorBaseActivity(), UnlockedActivity { companion object { private const val EXTRA_ARGS = "EXTRA_ARGS" @@ -81,7 +81,7 @@ class MainActivity : VectorBaseActivity(), UnlockedActiv } } - override fun getBinding() = FragmentLoadingBinding.inflate(layoutInflater) + override fun getBinding() = ActivityMainBinding.inflate(layoutInflater) private lateinit var args: MainActivityArgs diff --git a/vector/src/main/res/layout/activity_main.xml b/vector/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000000..2ca8afcccf --- /dev/null +++ b/vector/src/main/res/layout/activity_main.xml @@ -0,0 +1,26 @@ + + + + + + + +