Remove CLI option to print keymap

NorseDreki · May 23, 2024 · 6395eae · 6395eae
1 parent e9c6c47
commit 6395eae
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/src/nativeMain/kotlin/com/norsedreki/dogcat/app/Main.kt b/src/nativeMain/kotlin/com/norsedreki/dogcat/app/Main.kt
@@ -44,9 +44,9 @@ fun main(args: Array<String>) {
     if (appModule.appArguments.version == true) {
         val m =
             """
-            Dogcat version ${BuildConfig.VERSION} by Alex Dmitriev ()
+            Dogcat version ${BuildConfig.VERSION} by Alex Dmitriev <mr.alex.dmitriev@icloud.com>
 
-            A terminal-based Android Logcat reader with sane colouring
+            Terminal-based Android Logcat reader with a sane colouring
             https://github.com/NorseDreki/dogcat
             """
                 .trimIndent()
@@ -55,12 +55,6 @@ fun main(args: Array<String>) {
         exit(0)
     }
 
-    if (appModule.appArguments.printKeymap == true) {
-        Keymap.bindings.entries.forEach { println("${it.value.name} -- '${Char(it.key)}'") }
-
-        exit(0)
-    }
-
     val handler = CoroutineExceptionHandler { _, e ->
         Logger.d("Exception in top-level handler: ${e.message}")
 

diff --git a/src/nativeMain/kotlin/com/norsedreki/dogcat/app/ui/HasLifecycle.kt b/src/nativeMain/kotlin/com/norsedreki/dogcat/app/ui/HasLifecycle.kt
@@ -6,6 +6,7 @@
 package com.norsedreki.dogcat.app.ui
 
 interface HasLifecycle {
+
     suspend fun start()
 
     suspend fun stop()

diff --git a/src/nativeMain/kotlin/com/norsedreki/dogcat/app/ui/Strings.kt b/src/nativeMain/kotlin/com/norsedreki/dogcat/app/ui/Strings.kt
@@ -20,4 +20,6 @@ object Strings {
     const val ALL_APPS = "All apps"
 
     const val HELP_WINDOW_TITLE = "Help: Shortcuts"
+
+    const val HELP_CAPTION = "| (?) Help"
 }
diff --git a/src/nativeMain/kotlin/com/norsedreki/dogcat/app/ui/status/StatusView.kt b/src/nativeMain/kotlin/com/norsedreki/dogcat/app/ui/status/StatusView.kt
@@ -15,6 +15,7 @@ import com.norsedreki.dogcat.app.ui.CommonColors.RED_ON_WHITE
 import com.norsedreki.dogcat.app.ui.HasLifecycle
 import com.norsedreki.dogcat.app.ui.Strings.ALL_APPS
 import com.norsedreki.dogcat.app.ui.Strings.AUTOSCROLL
+import com.norsedreki.dogcat.app.ui.Strings.HELP_CAPTION
 import com.norsedreki.dogcat.app.ui.Strings.INPUT_FILTER_PREFIX
 import com.norsedreki.dogcat.app.ui.Strings.LOG_LEVEL_PREFIX
 import com.norsedreki.dogcat.app.ui.Strings.NO_AUTOSCROLL
@@ -137,17 +138,12 @@ class StatusView : HasLifecycle {
     }
 
     private fun updateHelp() {
-        //wattron(window, COLOR_PAIR(GREEN_ON_WHITE.colorPairCode))
         wattron(window, COLOR_PAIR(BLACK_ON_WHITE.colorPairCode))
-        //wattron(window, A_BOLD.toInt())
 
-        val s = "| (?) Help"
         val offsetX = STATUS_VIEW_AUTOSCROLL_LEFT_MARGIN + NO_AUTOSCROLL.length + 2
-        mvwprintw(window, 0, offsetX, s)
+        mvwprintw(window, 0, offsetX, HELP_CAPTION)
 
-        //wattroff(window, A_BOLD.toInt())
         wattroff(window, COLOR_PAIR(BLACK_ON_WHITE.colorPairCode))
-        //wattroff(window, COLOR_PAIR(GREEN_ON_WHITE.colorPairCode))
     }
 
     private fun updateDevice(device: String, running: Boolean) {