Fix LocalItem

MRepoApp · Feb 24, 2024 · 6b93ab4 · 6b93ab4
1 parent 5952f77
commit 6b93ab4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/app/src/main/kotlin/com/sanmer/mrepo/ui/screens/repository/view/pages/OverviewPage.kt b/app/src/main/kotlin/com/sanmer/mrepo/ui/screens/repository/view/pages/OverviewPage.kt
@@ -37,7 +37,7 @@ import com.sanmer.mrepo.utils.extensions.toDateTime
 fun OverviewPage(
     online: OnlineModule,
     item: VersionItem?,
-    local: LocalModule,
+    local: LocalModule?,
     isProviderAlive: Boolean,
     notifyUpdates: Boolean,
     setUpdatesTag: (Boolean) -> Unit,
@@ -78,13 +78,15 @@ fun OverviewPage(
         HorizontalDivider(thickness = 0.9.dp)
     }
 
-    LocalItem(
-        local = local,
-        notifyUpdates = notifyUpdates,
-        setUpdatesTag = setUpdatesTag
-    )
+    if (local != null) {
+        LocalItem(
+            local = local,
+            notifyUpdates = notifyUpdates,
+            setUpdatesTag = setUpdatesTag
+        )
 
-    HorizontalDivider(thickness = 0.9.dp)
+        HorizontalDivider(thickness = 0.9.dp)
+    }
 }
 
 @Composable

diff --git a/app/src/main/kotlin/com/sanmer/mrepo/viewmodel/ModuleViewModel.kt b/app/src/main/kotlin/com/sanmer/mrepo/viewmodel/ModuleViewModel.kt
@@ -15,7 +15,6 @@ import com.sanmer.mrepo.database.entity.Repo
 import com.sanmer.mrepo.database.entity.toRepo
 import com.sanmer.mrepo.model.json.UpdateJson
 import com.sanmer.mrepo.model.local.LocalModule
-import com.sanmer.mrepo.model.local.example
 import com.sanmer.mrepo.model.online.OnlineModule
 import com.sanmer.mrepo.model.online.TrackJson
 import com.sanmer.mrepo.model.online.VersionItem
@@ -51,15 +50,15 @@ class ModuleViewModel @Inject constructor(
             && online.track.source.isBlank()
             && online.track.support.isBlank()
 
-    var local by mutableStateOf(LocalModule.example())
+    var local: LocalModule? by mutableStateOf(null)
         private set
 
-    private val installed get() = local.id == online.id
-            && local.author == online.author
+    private val installed get() = local?.let { it.author == online.author } ?: false
     var notifyUpdates by mutableStateOf(false)
         private set
 
-    val localVersionCode get() = if (notifyUpdates) local.versionCode else Int.MAX_VALUE
+    val localVersionCode get() =
+        if (notifyUpdates && installed) local!!.versionCode else Int.MAX_VALUE
     val updatableSize by derivedStateOf {
         versions.count { it.second.versionCode > localVersionCode }
     }
@@ -96,7 +95,7 @@ class ModuleViewModel @Inject constructor(
         }
 
         if (installed) {
-            UpdateJson.loadToVersionItem(local.updateJson)?.let {
+            UpdateJson.loadToVersionItem(local!!.updateJson)?.let {
                 versions.add(0, "Update Json".toRepo() to it)
             }
         }