fixed searchbar not closing on back gesture
This commit is contained in:
parent
ddaa3e26a7
commit
07caaf98d7
4 changed files with 16 additions and 2 deletions
|
|
@ -15,6 +15,8 @@ import android.util.Log
|
||||||
import android.view.*
|
import android.view.*
|
||||||
import android.view.View.*
|
import android.view.View.*
|
||||||
import android.widget.*
|
import android.widget.*
|
||||||
|
import androidx.activity.OnBackPressedCallback
|
||||||
|
import androidx.activity.addCallback
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.appcompat.view.ActionMode
|
import androidx.appcompat.view.ActionMode
|
||||||
import androidx.constraintlayout.widget.ConstraintLayout
|
import androidx.constraintlayout.widget.ConstraintLayout
|
||||||
|
|
@ -25,6 +27,7 @@ import androidx.core.widget.doAfterTextChanged
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
import androidx.lifecycle.ViewModelProvider
|
import androidx.lifecycle.ViewModelProvider
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
|
import androidx.navigation.fragment.findNavController
|
||||||
import androidx.preference.PreferenceManager
|
import androidx.preference.PreferenceManager
|
||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
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() {
|
override fun onResume() {
|
||||||
|
|
@ -657,6 +668,8 @@ class HomeFragment : Fragment(), HomeAdapter.OnItemClickListener, OnClickListene
|
||||||
}
|
}
|
||||||
selectedObjects?.clear()
|
selectedObjects?.clear()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
override fun onStop() {
|
override fun onStop() {
|
||||||
actionMode?.finish()
|
actionMode?.finish()
|
||||||
super.onStop()
|
super.onStop()
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/bottomsheet_schedule_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_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="10dp"
|
||||||
|
|
|
||||||
|
|
@ -264,4 +264,5 @@
|
||||||
<string name="search_history">Search History</string>
|
<string name="search_history">Search History</string>
|
||||||
<string name="backup_created_successfully">Backup file saved in the downloads folder</string>
|
<string name="backup_created_successfully">Backup file saved in the downloads folder</string>
|
||||||
<string name="appearance">Appearance</string>
|
<string name="appearance">Appearance</string>
|
||||||
|
<string name="backup_restore"><![CDATA[Backup & Restore]]></string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
app:icon="@drawable/ic_update"
|
app:icon="@drawable/ic_update"
|
||||||
android:title="@string/updating"/>
|
android:title="@string/updating"/>
|
||||||
|
|
||||||
<PreferenceCategory android:title="@string/backup">
|
<PreferenceCategory android:title="@string/backup_restore">
|
||||||
<Preference
|
<Preference
|
||||||
app:icon="@drawable/baseline_save_alt_24"
|
app:icon="@drawable/baseline_save_alt_24"
|
||||||
app:key="backup"
|
app:key="backup"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue