Branch on viewmodel...

app/src/main/java/io/element/android/x/MainActivity.kt

@@ -28,6 +28,8 @@ import androidx.compose.ui.unit.dp
 import androidx.core.view.WindowCompat
 import androidx.navigation.NavHostController
 import com.airbnb.android.showkase.models.Showkase
+import com.airbnb.mvrx.compose.mavericksActivityViewModel
+import com.airbnb.mvrx.compose.mavericksViewModel
 import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi
 import com.ramcosta.composedestinations.DestinationsNavHost
 import com.ramcosta.composedestinations.animations.defaults.RootNavGraphDefaultAnimations
@@ -46,14 +48,12 @@ private const val transitionAnimationDuration = 500
 
 class MainActivity : ComponentActivity() {
 
-    private val viewModel: MainViewModel by viewModels()
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         WindowCompat.setDecorFitsSystemWindows(window, false)
         setContent {
             ElementXTheme {
-                MainScreen(viewModel = viewModel)
+                MainScreen(viewModel = mavericksActivityViewModel())
             }
         }
     }

app/src/main/java/io/element/android/x/MainViewModel.kt

@@ -1,26 +1,41 @@
 package io.element.android.x
 
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import io.element.android.x.matrix.MatrixInstance
+import com.airbnb.mvrx.MavericksState
+import com.airbnb.mvrx.MavericksViewModel
+import com.airbnb.mvrx.MavericksViewModelFactory
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import io.element.android.x.anvilannotations.ContributesViewModel
+import io.element.android.x.core.di.daggerMavericksViewModelFactory
+import io.element.android.x.di.AppScope
+import io.element.android.x.features.messages.MessagesViewModel
+import io.element.android.x.features.messages.model.MessagesViewState
+import io.element.android.x.matrix.Matrix
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 
-class MainViewModel : ViewModel() {
-    private val matrix = MatrixInstance.getInstance()
+data class MainState(val fake: Boolean = false) : MavericksState
+
+@ContributesViewModel(AppScope::class)
+class MainViewModel @AssistedInject constructor(
+    private val matrix: Matrix,
+    @Assisted initialState: MainState
+) : MavericksViewModel<MainState>(initialState) {
+
+    companion object : MavericksViewModelFactory<MainViewModel, MainState> by daggerMavericksViewModelFactory()
 
     suspend fun isLoggedIn(): Boolean {
         return matrix.isLoggedIn().first()
     }
 
-    fun startSyncIfLogged(){
+    fun startSyncIfLogged() {
         viewModelScope.launch {
-            if(!isLoggedIn()) return@launch
+            if (!isLoggedIn()) return@launch
             matrix.activeClient().startSync()
         }
     }
 
-    fun stopSyncIfLogged(){
+    fun stopSyncIfLogged() {
         viewModelScope.launch {
             if (!isLoggedIn()) return@launch
             matrix.activeClient().stopSync()

app/src/main/java/io/element/android/x/di/AppComponent.kt

@@ -4,10 +4,11 @@ import android.content.Context
 import com.squareup.anvil.annotations.MergeComponent
 import dagger.BindsInstance
 import dagger.Component
+import io.element.android.x.core.di.DaggerMavericksBindings
 
 @SingleIn(AppScope::class)
 @MergeComponent(AppScope::class)
-interface AppComponent {
+interface AppComponent: DaggerMavericksBindings {
 
     @Component.Factory
     interface Factory {