Fix: Failing to parse ExtraInfo because of missing URL in ModInfo

Fix: Add padding to description in mod list
MineInAbyss · Mar 8, 2024 · c77c6fd · c77c6fd
1 parent 0339406
commit c77c6fd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
 group=com.mineinabyss
-version=2.0.0-alpha.7
+version=2.0.0-alpha.8
 idofrontVersion=0.22.3
diff --git a/src/main/kotlin/com/mineinabyss/launchy/data/modpacks/ModInfo.kt b/src/main/kotlin/com/mineinabyss/launchy/data/modpacks/ModInfo.kt
@@ -5,10 +5,10 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class ModInfo(
     val name: String,
-    val license: String = "Unknown",
+    val license: String = "",
     val homepage: String = "",
     val desc: String = "",
-    val url: String,
+    val url: String = "",
     val configUrl: String = "",
     val configDesc: String = "",
     val forceConfigDownload: Boolean = false,

diff --git a/src/main/kotlin/com/mineinabyss/launchy/data/modpacks/formats/ExtraInfoFormat.kt b/src/main/kotlin/com/mineinabyss/launchy/data/modpacks/formats/ExtraInfoFormat.kt
@@ -29,6 +29,7 @@ data class ExtraInfoFormat(
         val originalGroups = originalMods.modGroups.mapValues {
             it.value.filterTo(mutableSetOf()) { mod -> mod !in foundMods }
         }
-        return Mods(originalGroups + mods)
+        return Mods((originalGroups + mods)
+            .filter { (_, mods) -> mods.isNotEmpty() })
     }
 }
diff --git a/src/main/kotlin/com/mineinabyss/launchy/data/modpacks/formats/ModrinthPackFormat.kt b/src/main/kotlin/com/mineinabyss/launchy/data/modpacks/formats/ModrinthPackFormat.kt
@@ -1,7 +1,7 @@
 package com.mineinabyss.launchy.data.modpacks.formats
 
-import com.mineinabyss.launchy.data.modpacks.ModInfo
 import com.mineinabyss.launchy.data.modpacks.Mod
+import com.mineinabyss.launchy.data.modpacks.ModInfo
 import com.mineinabyss.launchy.data.modpacks.Mods
 import com.mineinabyss.launchy.data.modpacks.PackDependencies
 import kotlinx.serialization.Serializable
@@ -26,7 +26,7 @@ data class ModrinthPackFormat(
             packDir,
             ModInfo(
                 name = path.removePrefix("mods/").removeSuffix(".jar"),
-                desc = "Unknown",
+                desc = "",
                 url = downloads.single(),
                 downloadPath = path,
             )

diff --git a/src/main/kotlin/com/mineinabyss/launchy/ui/screens/modpack/settings/ModInfoDisplay.kt b/src/main/kotlin/com/mineinabyss/launchy/ui/screens/modpack/settings/ModInfoDisplay.kt
@@ -37,7 +37,7 @@ fun ModInfoDisplay(group: Group, mod: Mod) {
     val configTabState by animateFloatAsState(targetValue = if (configExpanded) 180f else 0f)
 
     Surface(
-        modifier = Modifier.fillMaxWidth(),
+        modifier = Modifier.fillMaxWidth().padding(end = 8.dp),
         color = when (mod) {
             in state.downloads.failed -> MaterialTheme.colorScheme.error
             in state.queued.deletions -> MaterialTheme.colorScheme.errorContainer.copy(alpha = 0.25f)