Performance improvements and preload commands

SimonSchubert · SimonSchubert · commit 5a2e030e96b3 · 2026-02-06T12:12:17.000+01:00
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -40,6 +40,7 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
+                implementation(libs.kotlinx.collections.immutable)
             }
         }
         commonTest {
diff --git a/common/src/commonMain/kotlin/com/linuxcommandlibrary/shared/MarkdownParser.kt b/common/src/commonMain/kotlin/com/linuxcommandlibrary/shared/MarkdownParser.kt
@@ -1,5 +1,7 @@
 package com.linuxcommandlibrary.shared
 
+import kotlinx.collections.immutable.toImmutableList
+
 /**
  * Shared markdown parsing utilities for text formatting, code blocks, and man page links.
  */
@@ -120,7 +122,7 @@ object MarkdownParser {
                     sections.add(
                         TipSectionElement.Code(
                             command = cleanMarkdownCommand(codeContent),
-                            elements = elements,
+                            elements = elements.toImmutableList(),
                         ),
                     )
                     i++
@@ -140,7 +142,7 @@ object MarkdownParser {
                     sections.add(
                         TipSectionElement.Code(
                             command = cleanMarkdownCommand(codeContent),
-                            elements = elements,
+                            elements = elements.toImmutableList(),
                         ),
                     )
                 }
diff --git a/common/src/commonMain/kotlin/com/linuxcommandlibrary/shared/TipSectionElement.kt b/common/src/commonMain/kotlin/com/linuxcommandlibrary/shared/TipSectionElement.kt
@@ -1,5 +1,7 @@
 package com.linuxcommandlibrary.shared
 
+import kotlinx.collections.immutable.ImmutableList
+
 /**
  * Represents text formatting elements within tip sections.
  */
@@ -16,7 +18,7 @@ sealed class TextElement {
 sealed class TipSectionElement {
     data class Text(val elements: List<TextElement>) : TipSectionElement()
     data class Blockquote(val elements: List<TextElement>) : TipSectionElement()
-    data class Code(val command: String, val elements: List<CommandElement>) : TipSectionElement()
+    data class Code(val command: String, val elements: ImmutableList<CommandElement>) : TipSectionElement()
     data class Table(
         val headers: List<List<TextElement>>,
         val rows: List<List<List<TextElement>>>,
diff --git a/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/App.kt b/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/App.kt
@@ -61,6 +61,7 @@ import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
 import com.linuxcommandlibrary.app.data.BasicsRepository
+import com.linuxcommandlibrary.app.data.CommandsRepository
 import com.linuxcommandlibrary.app.platform.backIcon
 import com.linuxcommandlibrary.app.ui.composables.AppIcon
 import com.linuxcommandlibrary.app.ui.composables.rememberIconPainter
@@ -81,15 +82,21 @@ import com.linuxcommandlibrary.app.ui.screens.tips.TipsViewModel
 import com.linuxcommandlibrary.app.ui.theme.LinuxTheme
 import com.linuxcommandlibrary.app.ui.theme.LocalCustomColors
 import com.linuxcommandlibrary.shared.platform.ReviewHandler
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import org.koin.compose.koinInject
 import org.koin.core.parameter.parametersOf
 
 @Composable
 fun App(initialDeeplink: String? = null) {
     val reviewHandler: ReviewHandler = koinInject()
+    val commandsRepository: CommandsRepository = koinInject()
     LaunchedEffect(Unit) {
         reviewHandler.incrementAppStartCount()
         reviewHandler.requestReviewIfNeeded()
+        withContext(Dispatchers.Default) {
+            commandsRepository.getCommands()
+        }
     }
 
     LinuxTheme {
@@ -260,18 +267,14 @@ fun LinuxApp(initialDeeplink: String? = null) {
                     BasicGroupsScreen(viewModel = viewModel, onNavigate = onNavigate)
                 }
 
-                composable<Route.CommandDetail> { backStackEntry ->
-                    val route = backStackEntry.toRoute<Route.CommandDetail>()
-                    val viewModel: CommandDetailViewModel = koinInject { parametersOf(route.commandName) }
-                    CommandDetailScreen(viewModel = viewModel, onNavigate = onNavigate)
+                composable<Route.CommandDetail> {
+                    commandDetailViewModel?.let { viewModel ->
+                        CommandDetailScreen(viewModel = viewModel, onNavigate = onNavigate)
+                    }
                 }
             }
 
-            val isSearchVisible by remember(searchTextValue) {
-                derivedStateOf {
-                    searchTextValue.value.text.isNotEmpty() && !isOnCommandDetail
-                }
-            }
+            val isSearchVisible = searchTextValue.value.text.isNotEmpty() && !isOnCommandDetail
             AnimatedVisibility(
                 visible = isSearchVisible,
                 enter = fadeIn(animationSpec = tween(300)),
diff --git a/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/data/CommandsRepository.kt b/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/data/CommandsRepository.kt
@@ -6,6 +6,7 @@ import com.linuxcommandlibrary.shared.platform.AssetReader
 class CommandsRepository(private val assetReader: AssetReader) {
 
     private var cachedCommands: List<CommandInfo>? = null
+    private var cachedCommandNames: Set<String>? = null
 
     fun getCommands(): List<CommandInfo> {
         cachedCommands?.let { return it }
@@ -24,25 +25,27 @@ class CommandsRepository(private val assetReader: AssetReader) {
             }
 
         cachedCommands = commands
+        cachedCommandNames = commands.mapTo(HashSet()) { it.name }
         return commands
     }
 
     fun getCommandsByQuery(query: String): List<CommandInfo> {
-        val commands = getCommands()
         val lowerQuery = query.lowercase()
 
-        return commands
-            .filter { it.name.lowercase().contains(lowerQuery) }
+        return getCommands()
+            .map { cmd -> cmd to cmd.name.lowercase() }
+            .filter { (_, lowerName) -> lowerName.contains(lowerQuery) }
             .sortedWith(
                 compareBy(
-                    { it.name.lowercase() != lowerQuery },
-                    { !it.name.lowercase().startsWith(lowerQuery) },
-                    { it.name },
+                    { (_, lowerName) -> lowerName != lowerQuery },
+                    { (_, lowerName) -> !lowerName.startsWith(lowerQuery) },
+                    { (cmd, _) -> cmd.name },
                 ),
             )
+            .map { (cmd, _) -> cmd }
     }
 
-    fun hasCommand(name: String): Boolean = getCommands().any { it.name == name }
+    fun hasCommand(name: String): Boolean = name in (cachedCommandNames ?: getCommands().let { cachedCommandNames!! })
 
     fun getSections(commandName: String): List<CommandSectionInfo> = try {
         val content = assetReader.readFile("commands/$commandName.md") ?: return emptyList()
diff --git a/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/data/TipsRepository.kt b/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/data/TipsRepository.kt
@@ -77,7 +77,7 @@ class TipsRepository(private val assetReader: AssetReader) {
                     sections.add(
                         TipSectionElement.Code(
                             command = MarkdownParser.cleanMarkdownCommand(codeContent),
-                            elements = elements,
+                            elements = elements.toImmutableList(),
                         ),
                     )
                     i++
diff --git a/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/composables/TipSectionContent.kt b/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/composables/TipSectionContent.kt
@@ -3,6 +3,7 @@ package com.linuxcommandlibrary.app.ui.composables
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.AnnotatedString
@@ -15,7 +16,6 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.linuxcommandlibrary.shared.TextElement
 import com.linuxcommandlibrary.shared.TipSectionElement
-import kotlinx.collections.immutable.toImmutableList
 
 fun buildTextElementString(
     elements: List<TextElement>,
@@ -52,15 +52,21 @@ fun TipSectionContent(
     sections.forEach { section ->
         when (section) {
             is TipSectionElement.Text -> {
+                val annotatedString = remember(section.elements, textColor) {
+                    buildTextElementString(section.elements, textColor)
+                }
                 Text(
-                    text = buildTextElementString(section.elements, textColor),
+                    text = annotatedString,
                     color = textColor,
                 )
             }
 
             is TipSectionElement.Blockquote -> {
+                val annotatedString = remember(section.elements, textColor) {
+                    buildTextElementString(section.elements, textColor)
+                }
                 Text(
-                    text = buildTextElementString(section.elements, textColor),
+                    text = annotatedString,
                     color = textColor,
                     modifier = Modifier.padding(start = 8.dp, bottom = 8.dp),
                 )
@@ -69,7 +75,7 @@ fun TipSectionContent(
             is TipSectionElement.Code -> {
                 CommandView(
                     command = section.command,
-                    elements = section.elements.toImmutableList(),
+                    elements = section.elements,
                     onNavigate = onNavigate,
                     verticalPadding = commandVerticalPadding,
                 )
diff --git a/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/commandlist/CommandListScreen.kt b/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/commandlist/CommandListScreen.kt
@@ -30,6 +30,7 @@ fun CommandListScreen(
     onNavigate: (String) -> Unit,
 ) {
     val commands by viewModel.commands.collectAsState()
+    val bookmarkedNames by viewModel.bookmarkedNames.collectAsState()
 
     LazyColumn(
         modifier = Modifier
@@ -44,7 +45,7 @@ fun CommandListScreen(
             CommandListItem(
                 command = command,
                 onNavigate = onNavigate,
-                isBookmarked = viewModel.hasBookmark(command.name),
+                isBookmarked = command.name in bookmarkedNames,
             )
         }
     }
diff --git a/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/commandlist/CommandListViewModel.kt b/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/commandlist/CommandListViewModel.kt
@@ -4,13 +4,15 @@ import com.linuxcommandlibrary.app.data.CommandInfo
 import com.linuxcommandlibrary.app.data.CommandsRepository
 import com.linuxcommandlibrary.app.data.DataManager
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.collections.immutable.toImmutableList
+import kotlinx.collections.immutable.toImmutableSet
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 
 class CommandListViewModel(
@@ -21,17 +23,24 @@ class CommandListViewModel(
     private val _commands = MutableStateFlow<ImmutableList<CommandInfo>>(persistentListOf())
     val commands = _commands.asStateFlow()
 
+    private val _bookmarkedNames = MutableStateFlow<ImmutableSet<String>>(persistentSetOf())
+    val bookmarkedNames = _bookmarkedNames.asStateFlow()
+
     init {
         updateCommands()
     }
 
     fun updateCommands() {
         scope.launch(Dispatchers.Default) {
-            _commands.update {
-                commandsRepository.getCommands().sortedBy { !hasBookmark(it.name) }.toImmutableList()
-            }
+            val allCommands = commandsRepository.getCommands()
+            val bookmarks = allCommands
+                .filter { dataManager.hasBookmark(it.name) }
+                .map { it.name }
+                .toImmutableSet()
+            _bookmarkedNames.value = bookmarks
+            _commands.value = allCommands
+                .sortedBy { it.name !in bookmarks }
+                .toImmutableList()
         }
     }
-
-    fun hasBookmark(name: String): Boolean = dataManager.hasBookmark(name)
 }
diff --git a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/simon.xcuserdatad/UserInterfaceState.xcuserstate b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/simon.xcuserdatad/UserInterfaceState.xcuserstate

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ kotlin {`
`40`	`40`	`sourceSets {`
`41`	`41`	`commonMain {`
`42`	`42`	`dependencies {`
	`43`	`+ implementation(libs.kotlinx.collections.immutable)`
`43`	`44`	`}`
`44`	`45`	`}`
`45`	`46`	`commonTest {`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ class TipsRepository(private val assetReader: AssetReader) {`
`77`	`77`	`sections.add(`
`78`	`78`	`TipSectionElement.Code(`
`79`	`79`	`command = MarkdownParser.cleanMarkdownCommand(codeContent),`
`80`		`- elements = elements,`
	`80`	`+ elements = elements.toImmutableList(),`
`81`	`81`	`),`
`82`	`82`	`)`
`83`	`83`	`i++`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ fun CommandListScreen(`
`30`	`30`	`onNavigate: (String) -> Unit,`
`31`	`31`	`) {`
`32`	`32`	`val commands by viewModel.commands.collectAsState()`
	`33`	`+ val bookmarkedNames by viewModel.bookmarkedNames.collectAsState()`
`33`	`34`
`34`	`35`	`LazyColumn(`
`35`	`36`	`modifier = Modifier`
`@@ -44,7 +45,7 @@ fun CommandListScreen(`
`44`	`45`	`CommandListItem(`
`45`	`46`	`command = command,`
`46`	`47`	`onNavigate = onNavigate,`
`47`		`- isBookmarked = viewModel.hasBookmark(command.name),`
	`48`	`+ isBookmarked = command.name in bookmarkedNames,`
`48`	`49`	`)`
`49`	`50`	`}`
`50`	`51`	`}`