Merge pull request #93 from jneidel/patch2

SimonSchubert · web-flow · commit c9bb0f9af3cd · 2026-02-11T17:46:54.000+01:00
Complete vim keys in CLI
diff --git a/cli/src/commonMain/kotlin/com/linuxcommandlibrary/nativecli/screens/BasicCategoriesScreen.kt b/cli/src/commonMain/kotlin/com/linuxcommandlibrary/nativecli/screens/BasicCategoriesScreen.kt
@@ -56,7 +56,7 @@ class BasicCategoriesScreen : Screen {
             ScreenResult.Stay
         }
 
-        "Enter" -> {
+        "Enter", "l" -> {
             val selected = list.selectedValue
             if (selected != null) {
                 ScreenResult.Navigate(BasicDetailScreen(selected.id, selected.title))
@@ -65,7 +65,7 @@ class BasicCategoriesScreen : Screen {
             }
         }
 
-        "q", "Escape" -> ScreenResult.Back
+        "q", "Escape", "h" -> ScreenResult.Back
 
         else -> {
             // Handle number keys for direct selection
diff --git a/cli/src/commonMain/kotlin/com/linuxcommandlibrary/nativecli/screens/BasicDetailScreen.kt b/cli/src/commonMain/kotlin/com/linuxcommandlibrary/nativecli/screens/BasicDetailScreen.kt
@@ -107,7 +107,7 @@ class BasicDetailScreen(
             ScreenResult.Stay
         }
 
-        "q", "Escape", "Enter" -> ScreenResult.Back
+        "q", "Escape", "Enter", "h" -> ScreenResult.Back
 
         else -> ScreenResult.Stay
     }
diff --git a/cli/src/commonMain/kotlin/com/linuxcommandlibrary/nativecli/screens/CommandDetailScreen.kt b/cli/src/commonMain/kotlin/com/linuxcommandlibrary/nativecli/screens/CommandDetailScreen.kt
@@ -82,7 +82,7 @@ class CommandDetailScreen(private val commandName: String) : Screen {
             ScreenResult.Stay
         }
 
-        "q", "Escape", "Enter" -> ScreenResult.Back
+        "q", "Escape", "Enter", "h" -> ScreenResult.Back
 
         else -> ScreenResult.Stay
     }
diff --git a/cli/src/commonMain/kotlin/com/linuxcommandlibrary/nativecli/screens/MainMenuScreen.kt b/cli/src/commonMain/kotlin/com/linuxcommandlibrary/nativecli/screens/MainMenuScreen.kt
@@ -62,7 +62,7 @@ class MainMenuScreen(terminal: Terminal) : Screen {
             ScreenResult.Stay
         }
 
-        "Enter" -> {
+        "Enter", "l" -> {
             when (list.selectedValue) {
                 MainMenuItem.COMMANDS -> ScreenResult.Navigate(SearchScreen())
                 MainMenuItem.BASICS -> ScreenResult.Navigate(BasicCategoriesScreen())
@@ -71,7 +71,7 @@ class MainMenuScreen(terminal: Terminal) : Screen {
             }
         }
 
-        "q", "Escape" -> ScreenResult.Exit
+        "q", "Escape", "h" -> ScreenResult.Exit
 
         "1" -> ScreenResult.Navigate(SearchScreen())
 
diff --git a/cli/src/commonMain/kotlin/com/linuxcommandlibrary/nativecli/screens/TipDetailScreen.kt b/cli/src/commonMain/kotlin/com/linuxcommandlibrary/nativecli/screens/TipDetailScreen.kt
@@ -95,7 +95,7 @@ class TipDetailScreen(private val tip: TipInfo) : Screen {
             ScreenResult.Stay
         }
 
-        "q", "Escape", "Enter" -> ScreenResult.Back
+        "q", "Escape", "Enter", "h" -> ScreenResult.Back
 
         else -> ScreenResult.Stay
     }
diff --git a/cli/src/commonMain/kotlin/com/linuxcommandlibrary/nativecli/screens/TipsScreen.kt b/cli/src/commonMain/kotlin/com/linuxcommandlibrary/nativecli/screens/TipsScreen.kt
@@ -56,7 +56,7 @@ class TipsScreen : Screen {
             ScreenResult.Stay
         }
 
-        "Enter" -> {
+        "Enter", "l" -> {
             val selected = list.selectedValue
             if (selected != null) {
                 ScreenResult.Navigate(TipDetailScreen(selected))
@@ -65,7 +65,7 @@ class TipsScreen : Screen {
             }
         }
 
-        "q", "Escape" -> ScreenResult.Back
+        "q", "Escape", "h" -> ScreenResult.Back
 
         else -> {
             // Handle number keys for direct selection

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ class BasicCategoriesScreen : Screen {`
`56`	`56`	`ScreenResult.Stay`
`57`	`57`	`}`
`58`	`58`
`59`		`- "Enter" -> {`
	`59`	`+ "Enter", "l" -> {`
`60`	`60`	`val selected = list.selectedValue`
`61`	`61`	`if (selected != null) {`
`62`	`62`	`ScreenResult.Navigate(BasicDetailScreen(selected.id, selected.title))`
`@@ -65,7 +65,7 @@ class BasicCategoriesScreen : Screen {`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
`68`		`- "q", "Escape" -> ScreenResult.Back`
	`68`	`+ "q", "Escape", "h" -> ScreenResult.Back`
`69`	`69`
`70`	`70`	`else -> {`
`71`	`71`	`// Handle number keys for direct selection`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ class BasicDetailScreen(`
`107`	`107`	`ScreenResult.Stay`
`108`	`108`	`}`
`109`	`109`
`110`		`- "q", "Escape", "Enter" -> ScreenResult.Back`
	`110`	`+ "q", "Escape", "Enter", "h" -> ScreenResult.Back`
`111`	`111`
`112`	`112`	`else -> ScreenResult.Stay`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ class CommandDetailScreen(private val commandName: String) : Screen {`
`82`	`82`	`ScreenResult.Stay`
`83`	`83`	`}`
`84`	`84`
`85`		`- "q", "Escape", "Enter" -> ScreenResult.Back`
	`85`	`+ "q", "Escape", "Enter", "h" -> ScreenResult.Back`
`86`	`86`
`87`	`87`	`else -> ScreenResult.Stay`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ class MainMenuScreen(terminal: Terminal) : Screen {`
`62`	`62`	`ScreenResult.Stay`
`63`	`63`	`}`
`64`	`64`
`65`		`- "Enter" -> {`
	`65`	`+ "Enter", "l" -> {`
`66`	`66`	`when (list.selectedValue) {`
`67`	`67`	`MainMenuItem.COMMANDS -> ScreenResult.Navigate(SearchScreen())`
`68`	`68`	`MainMenuItem.BASICS -> ScreenResult.Navigate(BasicCategoriesScreen())`
`@@ -71,7 +71,7 @@ class MainMenuScreen(terminal: Terminal) : Screen {`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`- "q", "Escape" -> ScreenResult.Exit`
	`74`	`+ "q", "Escape", "h" -> ScreenResult.Exit`
`75`	`75`
`76`	`76`	`"1" -> ScreenResult.Navigate(SearchScreen())`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ class TipDetailScreen(private val tip: TipInfo) : Screen {`
`95`	`95`	`ScreenResult.Stay`
`96`	`96`	`}`
`97`	`97`
`98`		`- "q", "Escape", "Enter" -> ScreenResult.Back`
	`98`	`+ "q", "Escape", "Enter", "h" -> ScreenResult.Back`
`99`	`99`
`100`	`100`	`else -> ScreenResult.Stay`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ class TipsScreen : Screen {`
`56`	`56`	`ScreenResult.Stay`
`57`	`57`	`}`
`58`	`58`
`59`		`- "Enter" -> {`
	`59`	`+ "Enter", "l" -> {`
`60`	`60`	`val selected = list.selectedValue`
`61`	`61`	`if (selected != null) {`
`62`	`62`	`ScreenResult.Navigate(TipDetailScreen(selected))`
`@@ -65,7 +65,7 @@ class TipsScreen : Screen {`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`
`68`		`- "q", "Escape" -> ScreenResult.Back`
	`68`	`+ "q", "Escape", "h" -> ScreenResult.Back`
`69`	`69`
`70`	`70`	`else -> {`
`71`	`71`	`// Handle number keys for direct selection`