Clean up

NeoApplications · Dec 11, 2024 · 137dbdb · 137dbdb
1 parent df3ac3e
commit 137dbdb
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/src/main/java/com/machiav3lli/backup/OABX.kt b/src/main/java/com/machiav3lli/backup/OABX.kt
@@ -459,7 +459,6 @@ class OABX : Application() {
                 mainRef = WeakReference(mainActivity)
             }
         var mainSaved: MainActivityX? = null    // just to see if activity changed
-        var viewModelSaved: ViewModel? = null
 
         var appsSuspendedChecked = false
 

diff --git a/src/main/java/com/machiav3lli/backup/activities/MainActivityX.kt b/src/main/java/com/machiav3lli/backup/activities/MainActivityX.kt
@@ -150,14 +150,6 @@ class MainActivityX : BaseActivity() {
 
         super.onCreate(savedInstanceState)
 
-        Timber.d(
-            "viewModel: ${
-                classAndId(viewModel)
-            }, was ${
-                classAndId(OABX.viewModelSaved)
-            }"
-        )
-
         //TODO wech begin ??? or is this necessary with resume or similar?
 
         //TODO here or in MainPage? MainPage seems to be weird at least for each recomposition
@@ -318,7 +310,6 @@ class MainActivityX : BaseActivity() {
     }
 
     override fun onDestroy() {
-        OABX.viewModelSaved = viewModel
         OABX.mainSaved = OABX.main
         OABX.main = null
         super.onDestroy()

diff --git a/src/main/java/com/machiav3lli/backup/ui/compose/item/MainPackageItem.kt b/src/main/java/com/machiav3lli/backup/ui/compose/item/MainPackageItem.kt
@@ -88,6 +88,7 @@ import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.yield
+import org.koin.androidx.compose.koinViewModel
 import org.koin.compose.koinInject
 import java.util.concurrent.Executors
 import kotlin.math.roundToInt
@@ -235,12 +236,12 @@ fun TextInputMenuItem(
 @Composable
 fun Selections(
     action: MenuAction,
+    viewModel: MainVM = koinViewModel(),
     selection: Set<String> = emptySet(),
     onAction: (Set<String>) -> Unit = {},
 ) {
     val backupRoot = koinInject<Context>().getBackupRoot()
     val scope = rememberCoroutineScope()
-    val viewModel = koinInject<MainVM>()
     val selectionsDir = backupRoot.findFile(SELECTIONS_FOLDER_NAME)
         ?: backupRoot.createDirectory(SELECTIONS_FOLDER_NAME)
     val files = selectionsDir.listFiles()