Move screen contents into separate content composable

SimonSchubert · SimonSchubert · commit 339c5c0fad94 · 2026-03-23T18:55:52.000+01:00
diff --git a/common/src/commonMain/kotlin/com/linuxcommandlibrary/shared/MarkdownModels.kt b/common/src/commonMain/kotlin/com/linuxcommandlibrary/shared/MarkdownModels.kt
@@ -1,20 +1,22 @@
 package com.linuxcommandlibrary.shared
 
+import kotlinx.collections.immutable.ImmutableList
+
 /**
  * Data class for parsed tip from markdown.
  */
 data class TipInfo(
     val id: Long,
     val title: String,
-    val sections: List<TipSectionElement>,
+    val sections: ImmutableList<TipSectionElement>,
 )
 
 /**
  * Data class for parsed basic category from markdown.
  */
 data class BasicInfo(
     val title: String,
-    val groups: List<BasicGroup>,
+    val groups: ImmutableList<BasicGroup>,
 )
 
 /**
@@ -23,7 +25,7 @@ data class BasicInfo(
 data class BasicGroup(
     val id: Long,
     val description: String,
-    val sections: List<TipSectionElement>,
+    val sections: ImmutableList<TipSectionElement>,
 )
 
 /**
@@ -32,7 +34,7 @@ data class BasicGroup(
 data class CommandInfo(
     val name: String,
     val description: String?,
-    val sections: List<CommandSectionInfo>,
+    val sections: ImmutableList<CommandSectionInfo>,
 )
 
 /**
@@ -41,7 +43,7 @@ data class CommandInfo(
 data class CommandSectionInfo(
     val title: String,
     val content: String,
-    val elements: List<TipSectionElement>,
+    val elements: ImmutableList<TipSectionElement>,
 )
 
 /**
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,6 @@
 package com.linuxcommandlibrary.shared
 
+import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
 
 /**
@@ -10,7 +11,7 @@ object MarkdownParser {
     /**
      * Parse text with **bold** and _italic_ formatting into TextElement list.
      */
-    fun parseTextWithBold(text: String): List<TextElement> {
+    fun parseTextWithBold(text: String): ImmutableList<TextElement> {
         val elements = mutableListOf<TextElement>()
         val boldRegex = Regex("""\*\*([^*]+)\*\*""")
         val italicRegex = Regex("""_([^_]+)_""")
@@ -55,7 +56,7 @@ object MarkdownParser {
             }
         }
 
-        return elements
+        return elements.toImmutableList()
     }
 
     /**
@@ -106,7 +107,7 @@ object MarkdownParser {
      * Parse markdown content into sections suitable for display.
      * Handles bold text, code blocks (triple backticks), and blockquotes.
      */
-    fun parseMarkdownContent(content: String): List<TipSectionElement> {
+    fun parseMarkdownContent(content: String): ImmutableList<TipSectionElement> {
         val sections = mutableListOf<TipSectionElement>()
         val lines = content.lines()
         var i = 0
@@ -184,7 +185,7 @@ object MarkdownParser {
             }
         }
 
-        return sections
+        return sections.toImmutableList()
     }
 
     /**
@@ -195,16 +196,16 @@ object MarkdownParser {
 
         // Parse header row (first row)
         val headerLine = lines[0]
-        val headers = splitTableRow(headerLine).map { parseTableCellContent(it) }
+        val headers = splitTableRow(headerLine).map { parseTableCellContent(it) }.toImmutableList()
 
         // Skip separator row (second row with dashes) and parse data rows
         val dataRows = lines.drop(2).mapNotNull { line ->
             // Skip separator rows (contain only |, -, and spaces)
             if (line.trim().replace(Regex("[|\\-\\s]"), "").isEmpty()) {
                 return@mapNotNull null
             }
-            splitTableRow(line).map { parseTableCellContent(it) }
-        }
+            splitTableRow(line).map { parseTableCellContent(it) }.toImmutableList()
+        }.toImmutableList()
 
         if (headers.isEmpty()) return null
 
@@ -214,7 +215,7 @@ object MarkdownParser {
     /**
      * Parse content within a table cell, handling bold, italic, inline code, and man links.
      */
-    fun parseTableCellContent(cell: String): List<TextElement> {
+    fun parseTableCellContent(cell: String): ImmutableList<TextElement> {
         val elements = mutableListOf<TextElement>()
         var remaining = cell
 
@@ -273,7 +274,7 @@ object MarkdownParser {
             }
         }
 
-        return elements
+        return elements.toImmutableList()
     }
 
     /**
@@ -375,13 +376,13 @@ object MarkdownParser {
     /**
      * Parse a tips markdown file into list of TipInfo.
      */
-    fun parseTips(content: String): List<TipInfo> = splitByHeaders(content, "## ").map { (title, sectionContent) ->
+    fun parseTips(content: String): ImmutableList<TipInfo> = splitByHeaders(content, "## ").map { (title, sectionContent) ->
         TipInfo(
             id = title.hashCode().toLong(),
             title = title,
             sections = parseMarkdownContent(sectionContent),
         )
-    }
+    }.toImmutableList()
 
     /**
      * Parse a basics markdown file into BasicInfo.
@@ -405,7 +406,7 @@ object MarkdownParser {
                 description = groupTitle,
                 sections = parseMarkdownContent(groupContent),
             )
-        }
+        }.toImmutableList()
 
         return BasicInfo(title = title, groups = groups)
     }
@@ -420,7 +421,7 @@ object MarkdownParser {
                 content = sectionContent,
                 elements = parseMarkdownContent(sectionContent),
             )
-        }
+        }.toImmutableList()
 
         if (sections.isEmpty()) return null
 
diff --git a/common/src/commonMain/kotlin/com/linuxcommandlibrary/shared/TipSectionElement.kt b/common/src/commonMain/kotlin/com/linuxcommandlibrary/shared/TipSectionElement.kt
@@ -17,11 +17,11 @@ sealed class TextElement {
  * Represents different types of content sections in tips and basics.
  */
 sealed class TipSectionElement {
-    data class Text(val elements: List<TextElement>) : TipSectionElement()
-    data class Blockquote(val elements: List<TextElement>) : TipSectionElement()
+    data class Text(val elements: ImmutableList<TextElement>) : TipSectionElement()
+    data class Blockquote(val elements: ImmutableList<TextElement>) : 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>>>,
+        val headers: ImmutableList<ImmutableList<TextElement>>,
+        val rows: ImmutableList<ImmutableList<ImmutableList<TextElement>>>,
     ) : TipSectionElement()
 }
diff --git a/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/basiccategories/BasicCategoriesScreen.kt b/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/basiccategories/BasicCategoriesScreen.kt
@@ -18,11 +18,11 @@ import androidx.compose.ui.input.pointer.PointerIcon
 import androidx.compose.ui.input.pointer.pointerHoverIcon
 import androidx.compose.ui.unit.dp
 import com.linuxcommandlibrary.app.NavEvent
-import com.linuxcommandlibrary.app.ui.composables.AppIcon
+import com.linuxcommandlibrary.app.data.BasicCategory
 import com.linuxcommandlibrary.app.ui.composables.debouncedClickable
 import com.linuxcommandlibrary.app.ui.composables.getIconId
 import com.linuxcommandlibrary.app.ui.composables.rememberIconPainter
-import com.linuxcommandlibrary.app.ui.theme.LocalCustomColors
+import kotlinx.collections.immutable.ImmutableList
 
 @Composable
 fun BasicCategoriesScreen(
@@ -31,6 +31,17 @@ fun BasicCategoriesScreen(
 ) {
     val basicCategories by viewModel.basicCategories.collectAsState()
 
+    BasicCategoriesContent(
+        basicCategories = basicCategories,
+        onNavigate = onNavigate,
+    )
+}
+
+@Composable
+private fun BasicCategoriesContent(
+    basicCategories: ImmutableList<BasicCategory>,
+    onNavigate: (NavEvent) -> Unit,
+) {
     LazyVerticalGrid(
         modifier = Modifier
             .background(MaterialTheme.colorScheme.background)
diff --git a/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/basicgroups/BasicEditorScreen.kt b/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/basicgroups/BasicEditorScreen.kt
@@ -21,15 +21,29 @@ import com.linuxcommandlibrary.app.NavEvent
 import com.linuxcommandlibrary.app.ui.composables.SectionTitle
 import com.linuxcommandlibrary.app.ui.composables.TipSectionContent
 import com.linuxcommandlibrary.shared.BasicGroup
+import kotlinx.collections.immutable.ImmutableList
 
 @Composable
 fun BasicEditorScreen(
     viewModel: BasicEditorViewModel,
-    onNavigate: (NavEvent) -> Unit = {},
+    onNavigate: (NavEvent) -> Unit,
 ) {
     val groups by viewModel.groups.collectAsState()
     val showTitles = viewModel.showTitles
 
+    BasicEditorContent(
+        groups = groups,
+        showTitles = showTitles,
+        onNavigate = onNavigate,
+    )
+}
+
+@Composable
+fun BasicEditorContent(
+    groups: ImmutableList<BasicGroup>,
+    showTitles: Boolean,
+    onNavigate: (NavEvent) -> Unit,
+) {
     LazyVerticalStaggeredGrid(
         modifier = Modifier
             .background(MaterialTheme.colorScheme.background)
@@ -48,7 +62,11 @@ fun BasicEditorScreen(
 }
 
 @Composable
-private fun EditorGroupCard(group: BasicGroup, onNavigate: (NavEvent) -> Unit, showTitle: Boolean = true) {
+private fun EditorGroupCard(
+    group: BasicGroup,
+    onNavigate: (NavEvent) -> Unit,
+    showTitle: Boolean = true,
+) {
     Card(
         elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
         modifier = Modifier
diff --git a/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/basicgroups/BasicGroupsScreen.kt b/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/basicgroups/BasicGroupsScreen.kt
@@ -24,7 +24,6 @@ import com.linuxcommandlibrary.app.ui.composables.CommandView
 import com.linuxcommandlibrary.app.ui.composables.HighlightedText
 import com.linuxcommandlibrary.app.ui.composables.getIconId
 import com.linuxcommandlibrary.app.ui.composables.rememberIconPainter
-import com.linuxcommandlibrary.app.ui.theme.LocalCustomColors
 import com.linuxcommandlibrary.shared.getCommandList
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableSet
@@ -39,6 +38,19 @@ fun BasicGroupsScreen(
 ) {
     val uiState by viewModel.uiState.collectAsState()
 
+    BasicGroupsContent(
+        uiState = uiState,
+        toggleCollapse = { viewModel.toggleCollapse(it) },
+        onNavigate = onNavigate,
+    )
+}
+
+@Composable
+fun BasicGroupsContent(
+    uiState: BasicGroupsUiState,
+    toggleCollapse: (Long) -> Unit,
+    onNavigate: (NavEvent) -> Unit,
+) {
     LazyColumn(
         Modifier
             .fillMaxSize()
@@ -53,7 +65,7 @@ fun BasicGroupsScreen(
                 basicGroup = basicGroup,
                 commands = uiState.commandsByGroupId[basicGroup.id] ?: persistentListOf(),
                 isExpanded = !(uiState.collapsedMap[basicGroup.id] ?: true),
-                onToggleCollapse = { viewModel.toggleCollapse(basicGroup.id) },
+                onToggleCollapse = { toggleCollapse(basicGroup.id) },
                 onNavigate = onNavigate,
             )
         }
diff --git a/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/commanddetail/CommandDetailScreen.kt b/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/commanddetail/CommandDetailScreen.kt
@@ -31,7 +31,6 @@ import com.linuxcommandlibrary.app.NavEvent
 import com.linuxcommandlibrary.app.data.CommandSectionInfo
 import com.linuxcommandlibrary.app.ui.composables.TipSectionContent
 import com.linuxcommandlibrary.app.ui.composables.rememberDebouncedClick
-import com.linuxcommandlibrary.app.ui.theme.LocalCustomColors
 import com.linuxcommandlibrary.shared.MarkdownParser
 import kotlinx.collections.immutable.ImmutableList
 
@@ -42,6 +41,19 @@ fun CommandDetailScreen(
 ) {
     val uiState by viewModel.state.collectAsState()
 
+    CommandDetailContent(
+        uiState = uiState,
+        onNavigate = onNavigate,
+        onToggleExpanded = { id -> viewModel.onToggleExpanded(id) },
+    )
+}
+
+@Composable
+private fun CommandDetailContent(
+    uiState: CommandDetailUiState,
+    onNavigate: (NavEvent) -> Unit,
+    onToggleExpanded: (Long) -> Unit,
+) {
     LazyColumn(
         Modifier
             .background(MaterialTheme.colorScheme.background)
@@ -56,7 +68,7 @@ fun CommandDetailScreen(
                 section = section,
                 isExpanded = uiState.expandedSectionsMap[section.id] ?: false,
                 seeAlsoCommands = uiState.seeAlsoCommands,
-                onToggleExpanded = { id -> viewModel.onToggleExpanded(id) },
+                onToggleExpanded = onToggleExpanded,
                 onNavigate = onNavigate,
             )
         }
@@ -131,7 +143,7 @@ private fun SeeAlsoSectionContent(
 }
 
 @Composable
-private fun DefaultSectionContent(content: String, onNavigate: (NavEvent) -> Unit = {}) {
+private fun DefaultSectionContent(content: String, onNavigate: (NavEvent) -> Unit) {
     val parsedSections = remember(content) {
         MarkdownParser.parseMarkdownContent(content)
     }
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
@@ -23,7 +23,8 @@ import com.linuxcommandlibrary.app.ui.composables.FastScrollBar
 import com.linuxcommandlibrary.app.ui.composables.HighlightedText
 import com.linuxcommandlibrary.app.ui.composables.debouncedClickable
 import com.linuxcommandlibrary.app.ui.composables.rememberIconPainter
-import com.linuxcommandlibrary.app.ui.theme.LocalCustomColors
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.ImmutableSet
 
 @Composable
 fun CommandListScreen(
@@ -32,8 +33,21 @@ fun CommandListScreen(
 ) {
     val commands by viewModel.commands.collectAsState()
     val bookmarkedNames by viewModel.bookmarkedNames.collectAsState()
-    val listState = rememberLazyListState()
 
+    ComposeListContent(
+        commands = commands,
+        bookmarkedNames = bookmarkedNames,
+        onNavigate = onNavigate,
+    )
+}
+
+@Composable
+private fun ComposeListContent(
+    commands: ImmutableList<CommandInfo>,
+    bookmarkedNames: ImmutableSet<String>,
+    onNavigate: (NavEvent) -> Unit,
+) {
+    val listState = rememberLazyListState()
     Box(
         modifier = Modifier
             .background(MaterialTheme.colorScheme.background)
diff --git a/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/search/SearchScreen.kt b/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/search/SearchScreen.kt
diff --git a/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/tips/TipsScreen.kt b/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/tips/TipsScreen.kt
diff --git a/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/tips/TipsViewModel.kt b/composeApp/src/commonMain/kotlin/com/linuxcommandlibrary/app/ui/screens/tips/TipsViewModel.kt
