Merge pull request #5828 from Bnyro/master

feat: dismiss keyboard at back press on search page
libre-tube · Mar 28, 2024 · 9b74af9 · 9b74af9
2 parents c2aea42 + 868bcde
commit 9b74af9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/app/src/main/java/com/github/libretube/extensions/AnyChildFocused.kt b/app/src/main/java/com/github/libretube/extensions/AnyChildFocused.kt
@@ -0,0 +1,15 @@
+package com.github.libretube.extensions
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.children
+
+fun View.anyChildFocused(): Boolean {
+    if (isFocused) return true
+
+    if (this is ViewGroup) {
+        return children.any { it.anyChildFocused() }
+    }
+
+    return false
+}
diff --git a/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/MainActivity.kt
@@ -31,6 +31,7 @@ import com.github.libretube.compat.PictureInPictureCompat
 import com.github.libretube.constants.IntentData
 import com.github.libretube.constants.PreferenceKeys
 import com.github.libretube.databinding.ActivityMainBinding
+import com.github.libretube.extensions.anyChildFocused
 import com.github.libretube.extensions.toID
 import com.github.libretube.helpers.NavBarHelper
 import com.github.libretube.helpers.NavigationHelper
@@ -170,6 +171,11 @@ class MainActivity : BaseActivity() {
                     onUserLeaveHint()
                 }
 
+                R.id.searchFragment -> {
+                    if (searchView.anyChildFocused()) searchView.clearFocus()
+                    else navController.popBackStack()
+                }
+
                 R.id.searchResultFragment -> {
                     navController.popBackStack(R.id.searchFragment, true) ||
                             navController.popBackStack()