Create a screen to view information about available apps (#439)

Author: boswelja

app/src/test/kotlin/com/nasdroid/DITest.kt

@@ -3,9 +3,12 @@ package com.nasdroid
 import android.app.Application
 import android.content.Context
 import androidx.lifecycle.SavedStateHandle
+import io.mockk.every
+import io.mockk.mockk
 import io.mockk.mockkClass
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.setMain
 import org.koin.core.context.startKoin
@@ -16,9 +19,16 @@ import kotlin.test.Test
 
 class DITest {
 
+    private lateinit var mockSavedStateHandle: SavedStateHandle
+
     @OptIn(ExperimentalCoroutinesApi::class)
     @BeforeTest
     fun setUp() {
+        mockSavedStateHandle = mockk()
+        every { mockSavedStateHandle.get<String>(any()) } returns "1"
+        every { mockSavedStateHandle.getStateFlow<String?>(any(), any()) } answers {
+            MutableStateFlow(args[1] as String?)
+        }
         Dispatchers.setMain(StandardTestDispatcher())
         MockProvider.register { clazz -> mockkClass(clazz, relaxed = true) }
     }
@@ -30,7 +40,7 @@ class DITest {
             checkModules {
                 withInstance<Context>()
                 withInstance<Application>()
-                withInstance<SavedStateHandle>()
+                withInstance(mockSavedStateHandle)
             }
         }
     }

config/detekt.yml

@@ -100,6 +100,12 @@ complexity:
   StringLiteralDuplication:
     active: true
     threshold: 3
+    ignoreAnnotated:
+      - 'Preview'
+      - 'PreviewScreenSize'
+      - 'PreviewFontScale'
+      - 'PreviewLightDark'
+      - 'PreviewDynamicColors'
   TooManyFunctions:
     active: true
     ignoreOverridden: true

core/api/src/commonMain/kotlin/com/nasdroid/api/v2/catalog/CatalogV2Api.kt

@@ -4,6 +4,7 @@ import com.nasdroid.api.TimestampUnwrapper
 import com.nasdroid.api.exception.HttpNotOkException
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonObject
 
 /**
  * Describes the TrueNAS API V2 "Catalog" group. The Catalogs API is responsible for managing
@@ -132,6 +133,7 @@ value class CatalogItems(
  * @property screenshotUrls A list of URLs for available screenshots of the app this item runs.
  * @property sourceUrls A list of URLs for available source code this catalog item uses.
  * @property iconUrl The URL of the catalog item icon.
+ * @property versions Contains all metadata for available versions.
  */
 @Serializable
 data class CatalogItem(
@@ -174,6 +176,8 @@ data class CatalogItem(
     val sourceUrls: List<String>,
     @SerialName("icon_url")
     val iconUrl: String?,
+    @SerialName("versions")
+    val versions: JsonObject
 ) {
 
     /**

core/design/src/main/kotlin/com/nasdroid/design/Paddings.kt

@@ -1,6 +1,12 @@
 package com.nasdroid.design
 
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.calculateEndPadding
+import androidx.compose.foundation.layout.calculateStartPadding
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 
@@ -38,3 +44,19 @@ fun defaultPaddings(): Paddings = Paddings(
  * value of this CompositionLocal, use [MaterialThemeExt.paddings].
  */
 val LocalPaddings = staticCompositionLocalOf { defaultPaddings() }
+
+/**
+ * Adds [this] PaddingValues to [other] PaddingValues.
+ */
+@Composable
+operator fun PaddingValues.plus(other: PaddingValues): PaddingValues {
+    val layoutDirection = LocalLayoutDirection.current
+    return remember(this, other) {
+        PaddingValues(
+            start = this.calculateStartPadding(layoutDirection) + other.calculateStartPadding(layoutDirection),
+            top = this.calculateTopPadding() + other.calculateTopPadding(),
+            end = this.calculateEndPadding(layoutDirection) + other.calculateEndPadding(layoutDirection),
+            bottom = this.calculateBottomPadding() + other.calculateBottomPadding()
+        )
+    }
+}

features/apps/logic/src/main/kotlin/com/nasdroid/apps/logic/DI.kt

@@ -6,6 +6,7 @@ import com.nasdroid.apps.logic.discover.GetAvailableApps
 import com.nasdroid.apps.logic.discover.GetAvailableCatalogs
 import com.nasdroid.apps.logic.discover.GetAvailableCategories
 import com.nasdroid.apps.logic.discover.GetSimilarApps
+import com.nasdroid.apps.logic.discover.StripHtmlTags
 import com.nasdroid.apps.logic.installed.DeleteApp
 import com.nasdroid.apps.logic.installed.GetAppLogs
 import com.nasdroid.apps.logic.installed.GetInstalledApp
@@ -33,6 +34,7 @@ val AppsLogicModule = module {
     factoryOf(::GetAvailableCatalogs)
     factoryOf(::GetAvailableCategories)
     factoryOf(::GetSimilarApps)
+    factoryOf(::StripHtmlTags)
 
     factoryOf(::DeleteApp)
     factoryOf(::GetAppLogs)

features/apps/logic/src/main/kotlin/com/nasdroid/apps/logic/discover/GetAvailableAppDetails.kt

@@ -10,7 +10,8 @@ import kotlinx.datetime.Instant
  * [invoke] for details.
  */
 class GetAvailableAppDetails(
-    private val catalogV2Api: CatalogV2Api
+    private val catalogV2Api: CatalogV2Api,
+    private val stripHtmlTags: StripHtmlTags
 ) {
 
     /**
@@ -35,11 +36,12 @@ class GetAvailableAppDetails(
         }
         val details = AvailableAppDetails(
             id = catalogDetails.name,
+            iconUrl = catalogDetails.iconUrl.orEmpty(),
             name = catalogDetails.title,
             version = catalogDetails.latestAppVersion,
             tags = catalogDetails.tags,
             homepage = catalogDetails.homeUrl,
-            description = catalogDetails.description.orEmpty(),
+            description = stripHtmlTags(catalogDetails.appReadme),
             screenshots = catalogDetails.screenshotUrls,
             sources = catalogDetails.sourceUrls,
             lastUpdatedAt = Instant.fromEpochMilliseconds(catalogDetails.lastUpdate),
@@ -66,6 +68,7 @@ class GetAvailableAppDetails(
  *
  * @property id A unique identifier for this app within its catalog and train. This is usually
  * similar to the app name.
+ * @property iconUrl The URL for the app icon.
  * @property name The name of the app.
  * @property version The version of the app that these details are for. This is usually also the
  * latest version of the app.
@@ -80,6 +83,7 @@ class GetAvailableAppDetails(
  */
 data class AvailableAppDetails(
     val id: String,
+    val iconUrl: String,
     val name: String,
     val version: String,
     val tags: List<String>,

features/apps/logic/src/main/kotlin/com/nasdroid/apps/logic/discover/StripHtmlTags.kt

@@ -0,0 +1,18 @@
+package com.nasdroid.apps.logic.discover
+
+/**
+ * Strips all header text, and other HTML tags from a String. See [invoke] for details.
+ */
+class StripHtmlTags {
+
+    /**
+     * Processes [text] such that all HTML headers (h1-h6) are removed, and general HTML tags are
+     * stripped.
+     */
+    operator fun invoke(text: String): String {
+        return text
+            .replace(Regex("<h[1-6]>.*</h[16]>"), "") // Remove headers
+            .replace(Regex("<[^>]*>"), "") // Remove HTML tags
+            .trim() // Remove any leading/trailing whitespace
+    }
+}

features/apps/ui/build.gradle.kts

@@ -39,6 +39,7 @@ dependencies {
     implementation(projects.core.composeLogviewer)
     implementation(projects.core.design)
     implementation(projects.core.navigation)
+    implementation(projects.core.skeleton)
 
     implementation(projects.features.apps.logic)
 

features/apps/ui/src/main/kotlin/com/nasdroid/apps/ui/DI.kt

@@ -2,6 +2,7 @@ package com.nasdroid.apps.ui
 
 import com.nasdroid.apps.logic.AppsLogicModule
 import com.nasdroid.apps.ui.discover.DiscoverAppsViewModel
+import com.nasdroid.apps.ui.discover.details.AvailableAppDetailsViewModel
 import com.nasdroid.apps.ui.installed.details.InstalledAppDetailsViewModel
 import com.nasdroid.apps.ui.installed.overview.InstalledAppsOverviewViewModel
 import com.nasdroid.apps.ui.installed.overview.logs.LogsViewModel
@@ -14,6 +15,7 @@ import org.koin.dsl.module
 val AppsModule = module {
     includes(AppsLogicModule)
 
+    viewModelOf(::AvailableAppDetailsViewModel)
     viewModelOf(::DiscoverAppsViewModel)
 
     viewModelOf(::InstalledAppDetailsViewModel)

features/apps/ui/src/main/kotlin/com/nasdroid/apps/ui/Navigation.kt

@@ -8,8 +8,8 @@ import androidx.navigation.compose.composable
 import androidx.navigation.navArgument
 import androidx.navigation.navigation
 import com.nasdroid.apps.ui.discover.DiscoverAppsScreen
+import com.nasdroid.apps.ui.discover.details.AvailableAppDetailsScreen
 import com.nasdroid.apps.ui.installed.InstalledAppsScreen
-import com.nasdroid.apps.ui.installed.details.InstalledAppDetailsScreen
 import com.nasdroid.apps.ui.installed.overview.logs.LogsScreen
 
 /**
@@ -34,10 +34,38 @@ fun NavGraphBuilder.appsGraph(
         }
         composable("discover") {
             DiscoverAppsScreen(
+                onAppClick = { appId, appCatalog, appTrain ->
+                    navController.navigate("discover/$appCatalog/$appTrain/$appId")
+                },
                 navigateBack = { navController.popBackStack() },
                 modifier = modifier,
             )
         }
+        composable(
+            route = "discover/{catalog}/{train}/{id}",
+            arguments = listOf(
+                navArgument("catalog") {
+                    type = NavType.StringType
+                    nullable = false
+                },
+                navArgument("train") {
+                    type = NavType.StringType
+                    nullable = false
+                },
+                navArgument("id") {
+                    type = NavType.StringType
+                    nullable = false
+                }
+            )
+        ) {
+            AvailableAppDetailsScreen(
+                onNavigateBack = navController::popBackStack,
+                onNavigateToAppDetails = { id, catalog, train ->
+                    navController.navigate("discover/${catalog}/${train}/${id}")
+                },
+                modifier = modifier
+            )
+        }
         composable(
             route = "logs/{appName}",
             arguments = listOf(