fix: do not react to shortcuts when fragment is opened

Joseph5610 · Feb 25, 2024 · 6e9538a · 6e9538a
1 parent 2e1e672
commit 6e9538a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/main/kotlin/online/hudacek/fxradio/ui/view/library/LibrarySearchView.kt b/src/main/kotlin/online/hudacek/fxradio/ui/view/library/LibrarySearchView.kt
@@ -25,6 +25,7 @@ import online.hudacek.fxradio.ui.util.keyCombination
 import online.hudacek.fxradio.ui.util.make
 import online.hudacek.fxradio.ui.util.requestFocusOnSceneAvailable
 import online.hudacek.fxradio.ui.util.searchField
+import online.hudacek.fxradio.util.Modal
 import online.hudacek.fxradio.viewmodel.LibraryState
 import online.hudacek.fxradio.viewmodel.LibraryViewModel
 import online.hudacek.fxradio.viewmodel.SearchViewModel
@@ -65,8 +66,10 @@ class LibrarySearchView : BaseView() {
         }
 
         shortcut(keyCombination(KeyCode.F)) {
-            requestFocusOnSceneAvailable()
-            setSearchState(text)
+            if (!Modal.isAnyFragmentOpen()) {
+                requestFocusOnSceneAvailable()
+                setSearchState(text)
+            }
         }
 
         validator {

diff --git a/src/main/kotlin/online/hudacek/fxradio/ui/view/player/PlayerView.kt b/src/main/kotlin/online/hudacek/fxradio/ui/view/player/PlayerView.kt
@@ -107,8 +107,10 @@ class PlayerView : BaseView() {
             }
 
             shortcut(keyCombination(KeyCode.I)) {
-                if (selectedStationViewModel.stationProperty.value.isValid()) {
-                    isSelected = !isSelected
+                if (!Modal.isAnyFragmentOpen()) {
+                    if (selectedStationViewModel.stationProperty.value.isValid()) {
+                        isSelected = !isSelected
+                    }
                 }
             }
 

diff --git a/src/main/kotlin/online/hudacek/fxradio/util/Modal.kt b/src/main/kotlin/online/hudacek/fxradio/util/Modal.kt
@@ -52,6 +52,13 @@ sealed class Modal<out T : Fragment>(
     data object Preferences : Modal<PreferencesFragment>()
     data object OpenStream : Modal<OpenStreamFragment>()
     data object Countries : Modal<CountriesSearchFragment>()
+
+    companion object {
+        /**
+         * Returns true if any [Fragment] is currently present in the scene
+         */
+        fun isAnyFragmentOpen() = FX.primaryStage.scene.findUIComponents().any { it is Fragment }
+    }
 }
 
 /**