From 07caaf98d7d40f2cd03685d1ac8e1fe735aec23c Mon Sep 17 00:00:00 2001
From: deniscerri <64997243+deniscerri@users.noreply.github.com>
Date: Sun, 14 May 2023 09:51:27 +0200
Subject: [PATCH] fixed searchbar not closing on back gesture

---
 .../java/com/deniscerri/ytdlnis/ui/HomeFragment.kt  | 13 +++++++++++++
 .../res/layout/download_multiple_bottom_sheet.xml   |  2 +-
 app/src/main/res/values/strings.xml                 |  1 +
 app/src/main/res/xml/root_preferences.xml           |  2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/HomeFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/HomeFragment.kt
index ea76490a..63205efb 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/HomeFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/HomeFragment.kt
@@ -15,6 +15,8 @@ import android.util.Log
 import android.view.*
 import android.view.View.*
 import android.widget.*
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.addCallback
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
 import androidx.constraintlayout.widget.ConstraintLayout
@@ -25,6 +27,7 @@ import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.findNavController
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -208,6 +211,14 @@ class HomeFragment : Fragment(), HomeAdapter.OnItemClickListener, OnClickListene
             }
         }
 
+        mainActivity?.onBackPressedDispatcher?.addCallback(this) {
+            if (searchView?.isShowing == true) {
+                searchView?.hide()
+            }else{
+                mainActivity?.finishAndRemoveTask()
+            }
+        }
+
     }
 
     override fun onResume() {
@@ -657,6 +668,8 @@ class HomeFragment : Fragment(), HomeAdapter.OnItemClickListener, OnClickListene
         }
         selectedObjects?.clear()
     }
+
+
     override fun onStop() {
         actionMode?.finish()
         super.onStop()
diff --git a/app/src/main/res/layout/download_multiple_bottom_sheet.xml b/app/src/main/res/layout/download_multiple_bottom_sheet.xml
index 302e2320..2bde2b2f 100644
--- a/app/src/main/res/layout/download_multiple_bottom_sheet.xml
+++ b/app/src/main/res/layout/download_multiple_bottom_sheet.xml
@@ -70,7 +70,7 @@
 
             <Button
                 android:id="@+id/bottomsheet_schedule_button"
-                style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
+                style="@style/Widget.Material3.Button.IconButton.Filled"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="10dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 59435fe0..52a28341 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -264,4 +264,5 @@
     <string name="search_history">Search History</string>
     <string name="backup_created_successfully">Backup file saved in the downloads folder</string>
     <string name="appearance">Appearance</string>
+    <string name="backup_restore"><![CDATA[Backup & Restore]]></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index 58680c8e..44efe9a3 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -26,7 +26,7 @@
         app:icon="@drawable/ic_update"
         android:title="@string/updating"/>
 
-    <PreferenceCategory android:title="@string/backup">
+    <PreferenceCategory android:title="@string/backup_restore">
         <Preference
             app:icon="@drawable/baseline_save_alt_24"
             app:key="backup"