Clean up code

Author: SimonSchubert

.gitignore

@@ -30,4 +30,5 @@ commands.txt
 commands_ignore.txt
 commands_improved.txt
 commands_processed.txt
-find_missing_commands.sh
+find_missing_commands.sh
+scripts

cli/src/commonMain/kotlin/com/linuxcommandlibrary/nativecli/TuiApp.kt

@@ -14,7 +14,7 @@ class TuiApp(private val terminal: Terminal) {
     private var running = true
     private var rawModeSupported = true
 
-    fun run(initialScreen: Screen = MainMenuScreen(terminal)) {
+    fun run(initialScreen: Screen = MainMenuScreen()) {
         screenStack.add(initialScreen)
 
         // Try to detect raw mode support

cli/src/commonMain/kotlin/com/linuxcommandlibrary/nativecli/components/SelectableList.kt

@@ -1,6 +1,5 @@
 package com.linuxcommandlibrary.nativecli.components
 
-import com.github.ajalt.mordant.terminal.Terminal
 import com.linuxcommandlibrary.nativecli.Theme
 
 data class ListItem<T>(
@@ -9,7 +8,6 @@ data class ListItem<T>(
 )
 
 class SelectableList<T>(
-    private val terminal: Terminal,
     private val items: List<ListItem<T>>,
     private val pageSize: Int = 15,
     private var selectedIndex: Int = 0,
@@ -107,9 +105,3 @@ class SelectableList<T>(
         adjustScroll()
     }
 }
-
-fun <T> Terminal.selectableList(
-    items: List<ListItem<T>>,
-    pageSize: Int = 15,
-    selectedIndex: Int = 0,
-): SelectableList<T> = SelectableList(this, items, pageSize, selectedIndex)

cli/src/commonMain/kotlin/com/linuxcommandlibrary/nativecli/data/DataRepository.kt

@@ -35,8 +35,6 @@ object DataRepository {
             .map { CommandInfo(it) }
     }
 
-    fun getCommandContent(name: String): String? = allCommands[name]
-
     fun getCommandSections(name: String): List<CommandSection> {
         val content = allCommands[name] ?: return emptyList()
         return MarkdownParser.splitByHeaders(content, "# ").map { (title, sectionContent) ->
@@ -55,14 +53,10 @@ object DataRepository {
         }
     }.sortedBy { it.title }
 
-    fun getBasicContent(categoryId: String): String? = basicsData[categoryId]
-
     fun getBasicInfo(categoryId: String): BasicInfo? {
         val content = basicsData[categoryId] ?: return null
         return MarkdownParser.parseBasic(content)
     }
 
-    fun getTipsContent(): String = tipsData
-
     fun getTips(): List<TipInfo> = MarkdownParser.parseTips(tipsData)
 }

cli/src/commonMain/kotlin/com/linuxcommandlibrary/nativecli/screens/BasicCategoriesScreen.kt

@@ -1,7 +1,6 @@
 package com.linuxcommandlibrary.nativecli.screens
 
 import com.github.ajalt.mordant.input.KeyboardEvent
-import com.github.ajalt.mordant.terminal.Terminal
 import com.linuxcommandlibrary.nativecli.Theme
 import com.linuxcommandlibrary.nativecli.components.ListItem
 import com.linuxcommandlibrary.nativecli.components.SelectableList
@@ -12,7 +11,7 @@ class BasicCategoriesScreen : Screen {
 
     private val categories = DataRepository.getBasicCategories()
     private val items = categories.map { ListItem(it, it.title) }
-    private val list = SelectableList(Terminal(), items, pageSize = 15)
+    private val list = SelectableList(items, pageSize = 15)
 
     override fun render(): String {
         val sb = StringBuilder()

cli/src/commonMain/kotlin/com/linuxcommandlibrary/nativecli/screens/MainMenuScreen.kt

@@ -1,7 +1,6 @@
 package com.linuxcommandlibrary.nativecli.screens
 
 import com.github.ajalt.mordant.input.KeyboardEvent
-import com.github.ajalt.mordant.terminal.Terminal
 import com.linuxcommandlibrary.nativecli.Theme
 import com.linuxcommandlibrary.nativecli.components.ListItem
 import com.linuxcommandlibrary.nativecli.components.SelectableList
@@ -14,7 +13,7 @@ enum class MainMenuItem {
     EXIT,
 }
 
-class MainMenuScreen(terminal: Terminal) : Screen {
+class MainMenuScreen : Screen {
 
     private val items = listOf(
         ListItem(MainMenuItem.COMMANDS, "Commands"),
@@ -23,7 +22,7 @@ class MainMenuScreen(terminal: Terminal) : Screen {
         ListItem(MainMenuItem.EXIT, "Exit"),
     )
 
-    private val list = SelectableList(terminal, items, pageSize = 10)
+    private val list = SelectableList(items, pageSize = 10)
 
     override fun render(): String {
         val logoLines = listOf(

cli/src/commonMain/kotlin/com/linuxcommandlibrary/nativecli/screens/SearchScreen.kt

@@ -28,7 +28,6 @@ class SearchScreen : Screen {
 
         items = commands.map { ListItem(it, it.name) }
         list = SelectableList(
-            terminal = com.github.ajalt.mordant.terminal.Terminal(),
             items = items,
             pageSize = 15,
         )

cli/src/commonMain/kotlin/com/linuxcommandlibrary/nativecli/screens/TipsScreen.kt

@@ -1,7 +1,6 @@
 package com.linuxcommandlibrary.nativecli.screens
 
 import com.github.ajalt.mordant.input.KeyboardEvent
-import com.github.ajalt.mordant.terminal.Terminal
 import com.linuxcommandlibrary.nativecli.Theme
 import com.linuxcommandlibrary.nativecli.components.ListItem
 import com.linuxcommandlibrary.nativecli.components.SelectableList
@@ -12,7 +11,7 @@ class TipsScreen : Screen {
 
     private val tips = DataRepository.getTips()
     private val items = tips.map { ListItem(it, it.title) }
-    private val list = SelectableList(Terminal(), items, pageSize = 15)
+    private val list = SelectableList(items, pageSize = 15)
 
     override fun render(): String {
         val sb = StringBuilder()