Move LazyListState to ViewModels for list screens

DerGoogler · DerGoogler · commit 798478149d8d · 2025-10-10T11:34:27.000+02:00
Refactored Modules, Repositories, Repository, and SuperUser screens to use a LazyListState instance managed by their respective ViewModels instead of local state. This centralizes scroll state management, improves state persistence, and simplifies screen composables.
diff --git a/app/src/main/kotlin/com/dergoogler/mmrl/ui/screens/modules/ModulesScreen.kt b/app/src/main/kotlin/com/dergoogler/mmrl/ui/screens/modules/ModulesScreen.kt
@@ -11,7 +11,6 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.PressInteraction
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -72,11 +71,10 @@ fun ModulesScreen(
     val isLoading by viewModel.isLoading.collectAsStateWithLifecycle()
 
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
-    val listState = rememberLazyListState()
 
     val pullToRefreshState = rememberPullToRefreshState()
 
-    val isScrollingUp by listState.isScrollingUp()
+    val isScrollingUp by viewModel.listState.isScrollingUp()
     val showFab by remember {
         derivedStateOf {
             isScrollingUp && !viewModel.isSearch && viewModel.isProviderAlive
@@ -159,7 +157,7 @@ fun ModulesScreen(
             this@Scaffold.ModulesList(
                 innerPadding = innerPadding,
                 list = list,
-                state = listState,
+                state = viewModel.listState,
                 viewModel = viewModel,
                 onDownload = download,
                 isProviderAlive = viewModel.isProviderAlive,
diff --git a/app/src/main/kotlin/com/dergoogler/mmrl/ui/screens/repositories/RepositoriesScreen.kt b/app/src/main/kotlin/com/dergoogler/mmrl/ui/screens/repositories/RepositoriesScreen.kt
@@ -7,7 +7,6 @@ import androidx.compose.animation.scaleOut
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
@@ -87,8 +86,7 @@ fun RepositoriesScreen() = LocalScreenProvider {
 
     val pullToRefreshState = rememberPullToRefreshState()
 
-    val listSate = rememberLazyListState()
-    val showFab by listSate.isScrollingUp()
+    val showFab by viewModel.listState.isScrollingUp()
 
     var repoUrl by remember { mutableStateOf("") }
     var message: String by remember { mutableStateOf("") }
@@ -207,7 +205,7 @@ fun RepositoriesScreen() = LocalScreenProvider {
             this@Scaffold.RepositoriesList(
                 innerPadding = innerPadding,
                 list = list,
-                state = listSate,
+                state = viewModel.listState,
                 delete = viewModel::delete,
                 getUpdate = viewModel::getUpdate
             )
diff --git a/app/src/main/kotlin/com/dergoogler/mmrl/ui/screens/repository/RepositoryScreen.kt b/app/src/main/kotlin/com/dergoogler/mmrl/ui/screens/repository/RepositoryScreen.kt
@@ -16,7 +16,6 @@ import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -93,7 +92,6 @@ fun RepositoryScreen(repo: Repo) = LocalScreenProvider {
     val hazeState = LocalHazeState.current
 
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
-    val listState = rememberLazyListState()
 
     BackHandler(
         enabled = viewModel.isSearch,
@@ -151,7 +149,7 @@ fun RepositoryScreen(repo: Repo) = LocalScreenProvider {
                 }
 
                 LazyColumn(
-                    state = listState,
+                    state = viewModel.listState,
                     modifier = Modifier
                         .fillMaxSize()
                         .hazeSource(state = hazeState),
diff --git a/app/src/main/kotlin/com/dergoogler/mmrl/ui/screens/superuser/SuperUserScreen.kt b/app/src/main/kotlin/com/dergoogler/mmrl/ui/screens/superuser/SuperUserScreen.kt
@@ -3,7 +3,6 @@ package com.dergoogler.mmrl.ui.screens.superuser
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.TopAppBarDefaults
@@ -49,7 +48,6 @@ fun SuperUserScreen() = LocalScreenProvider {
     val isLoading by viewModel.isLoading.collectAsStateWithLifecycle()
 
     val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
-    val listState = rememberLazyListState()
 
     val pullToRefreshState = rememberPullToRefreshState()
 
@@ -103,7 +101,7 @@ fun SuperUserScreen() = LocalScreenProvider {
             this@Scaffold.SuperUserList(
                 innerPadding = innerPadding,
                 list = list,
-                state = listState,
+                state = viewModel.listState,
             )
         }
     }
diff --git a/app/src/main/kotlin/com/dergoogler/mmrl/viewmodel/ModulesViewModel.kt b/app/src/main/kotlin/com/dergoogler/mmrl/viewmodel/ModulesViewModel.kt
@@ -3,6 +3,7 @@ package com.dergoogler.mmrl.viewmodel
 import android.app.Application
 import android.content.Context
 import android.widget.Toast
+import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.derivedStateOf
@@ -26,12 +27,12 @@ import com.dergoogler.mmrl.platform.PlatformManager
 import com.dergoogler.mmrl.platform.content.LocalModule.Companion.hasAction
 import com.dergoogler.mmrl.platform.content.LocalModule.Companion.hasWebUI
 import com.dergoogler.mmrl.platform.content.ModuleCompatibility
+import com.dergoogler.mmrl.platform.model.ModId
 import com.dergoogler.mmrl.platform.stub.IModuleOpsCallback
 import com.dergoogler.mmrl.repository.LocalRepository
 import com.dergoogler.mmrl.repository.ModulesRepository
 import com.dergoogler.mmrl.service.DownloadService
 import com.dergoogler.mmrl.utils.Utils
-import com.dergoogler.mmrl.platform.model.ModId
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
@@ -90,6 +91,8 @@ class ModulesViewModel @Inject constructor(
     private val keyFlow = MutableStateFlow("")
     val query get() = keyFlow.asStateFlow()
 
+    val listState: LazyListState = LazyListState()
+
     private val cacheFlow = MutableStateFlow(listOf<LocalModule>())
     private val localFlow = MutableStateFlow(listOf<LocalModule>())
     val local get() = localFlow.asStateFlow()
diff --git a/app/src/main/kotlin/com/dergoogler/mmrl/viewmodel/RepositoriesViewModel.kt b/app/src/main/kotlin/com/dergoogler/mmrl/viewmodel/RepositoriesViewModel.kt
@@ -1,6 +1,7 @@
 package com.dergoogler.mmrl.viewmodel
 
 import android.app.Application
+import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
@@ -46,6 +47,8 @@ class RepositoriesViewModel @Inject constructor(
     private val reposFlow = MutableStateFlow(listOf<RepoState>())
     val repos get() = reposFlow.asStateFlow()
 
+    val listState: LazyListState = LazyListState()
+
     private val repositoriesMenu
         get() = userPreferencesRepository.data
             .map { it.repositoriesMenu }
diff --git a/app/src/main/kotlin/com/dergoogler/mmrl/viewmodel/RepositoryViewModel.kt b/app/src/main/kotlin/com/dergoogler/mmrl/viewmodel/RepositoryViewModel.kt
@@ -1,15 +1,14 @@
 package com.dergoogler.mmrl.viewmodel
 
 import android.app.Application
-import android.os.Bundle
+import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.viewModelScope
 import com.dergoogler.mmrl.database.entity.Repo
-import com.dergoogler.mmrl.database.entity.Repo.Companion.toRepo
 import com.dergoogler.mmrl.datastore.UserPreferencesRepository
 import com.dergoogler.mmrl.datastore.model.Option
 import com.dergoogler.mmrl.datastore.model.RepositoryMenu
@@ -18,9 +17,6 @@ import com.dergoogler.mmrl.model.state.OnlineState
 import com.dergoogler.mmrl.model.state.OnlineState.Companion.createState
 import com.dergoogler.mmrl.repository.LocalRepository
 import com.dergoogler.mmrl.repository.ModulesRepository
-import com.dergoogler.mmrl.ext.panicString
-import com.dergoogler.mmrl.model.json.UpdateJson
-import com.dergoogler.mmrl.model.state.RepoState
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
@@ -50,6 +46,8 @@ class RepositoryViewModel @AssistedInject constructor(
     private val keyFlow = MutableStateFlow("")
     val query get() = keyFlow.asStateFlow()
 
+    val listState: LazyListState = LazyListState()
+
     private val cacheFlow = MutableStateFlow(listOf<Pair<OnlineState, OnlineModule>>())
     private val onlineFlow = MutableStateFlow(listOf<Pair<OnlineState, OnlineModule>>())
     val online get() = onlineFlow.asStateFlow()
diff --git a/app/src/main/kotlin/com/dergoogler/mmrl/viewmodel/SuperUserViewModel.kt b/app/src/main/kotlin/com/dergoogler/mmrl/viewmodel/SuperUserViewModel.kt
@@ -7,6 +7,7 @@ import android.content.pm.PackageInfo
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
 import android.os.Parcelable
+import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateMapOf
 import androidx.compose.runtime.mutableStateOf
@@ -58,6 +59,8 @@ class SuperUserViewModel @Inject constructor(
     private val keyFlow = MutableStateFlow("")
     val query get() = keyFlow.asStateFlow()
 
+    val listState: LazyListState = LazyListState()
+
     private val cacheFlow = MutableStateFlow(listOf<AppInfo>())
     private val localFlow = MutableStateFlow(listOf<AppInfo>())
     val local get() = localFlow.asStateFlow()
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 --add-opens=java.base/java.io=ALL-UNNAMED
 org.gradle.caching=true
 org.gradle.configuration-cache=true
 android.enableJetifier=true

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8`
	`1`	`+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 --add-opens=java.base/java.io=ALL-UNNAMED`
`2`	`2`	`org.gradle.caching=true`
`3`	`3`	`org.gradle.configuration-cache=true`
`4`	`4`	`android.enableJetifier=true`