diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/listener/OnItemClickedListener.kt b/app/src/main/java/com/github/droidworksstudio/launcher/listener/OnItemClickedListener.kt index b7a9b84..5e11bf5 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/listener/OnItemClickedListener.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/listener/OnItemClickedListener.kt @@ -12,6 +12,10 @@ class OnItemClickedListener { fun onAppLongClicked(appInfo: AppInfo) {} } + interface BottomSheetDismissListener { + fun onBottomSheetDismissed() {} + } + interface OnAppStateClickListener { fun onAppStateClicked(appInfo: AppInfo) {} } diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/bottomsheetdialog/AppInfoBottomSheetFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/bottomsheetdialog/AppInfoBottomSheetFragment.kt index 45c913b..cd9bee8 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/bottomsheetdialog/AppInfoBottomSheetFragment.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/bottomsheetdialog/AppInfoBottomSheetFragment.kt @@ -47,10 +47,16 @@ class AppInfoBottomSheetFragment(private val appInfo: AppInfo) : BottomSheetDial private var appStateClickListener: OnItemClickedListener.OnAppStateClickListener? = null + private var dismissListener: OnItemClickedListener.BottomSheetDismissListener? = null + fun setOnAppStateClickListener(listener: OnItemClickedListener.OnAppStateClickListener) { appStateClickListener = listener } + fun setOnBottomSheetDismissedListener(listener: OnItemClickedListener.BottomSheetDismissListener) { + dismissListener = listener + } + override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?, diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawFragment.kt index d78cb5f..6c0eef1 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawFragment.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawFragment.kt @@ -55,6 +55,7 @@ import javax.inject.Inject class DrawFragment : Fragment(), OnItemClickedListener.OnAppsClickedListener, OnItemClickedListener.OnAppLongClickedListener, + OnItemClickedListener.BottomSheetDismissListener, OnItemClickedListener.OnAppStateClickListener, BiometricHelper.Callback, ScrollEventListener { private var _binding: FragmentDrawBinding? = null @@ -377,7 +378,10 @@ class DrawFragment : Fragment(), } private fun showSelectedApp(appInfo: AppInfo) { + binding.searchViewText.setQuery("", false) + val bottomSheetFragment = AppInfoBottomSheetFragment(appInfo) + bottomSheetFragment.setOnBottomSheetDismissedListener(this) bottomSheetFragment.setOnAppStateClickListener(this) bottomSheetFragment.show(parentFragmentManager, "BottomSheetDialog") } diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/favorite/FavoriteFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/favorite/FavoriteFragment.kt index 5665684..e093aea 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/favorite/FavoriteFragment.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/favorite/FavoriteFragment.kt @@ -39,6 +39,7 @@ import javax.inject.Inject class FavoriteFragment : Fragment(), OnItemClickedListener.OnAppsClickedListener, OnItemClickedListener.OnAppStateClickListener, + OnItemClickedListener.BottomSheetDismissListener, OnItemMoveListener.OnItemActionListener, BiometricHelper.Callback { private var _binding: FragmentFavoriteBinding? = null diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenFragment.kt index a3757d0..edbed67 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenFragment.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenFragment.kt @@ -33,6 +33,7 @@ import javax.inject.Inject class HiddenFragment : Fragment(), OnItemClickedListener.OnAppsClickedListener, OnItemClickedListener.OnAppLongClickedListener, + OnItemClickedListener.BottomSheetDismissListener, OnItemClickedListener.OnAppStateClickListener, BiometricHelper.Callback { private var _binding: FragmentHiddenBinding? = null @@ -139,6 +140,7 @@ class HiddenFragment : Fragment(), private fun showSelectedApp(appInfo: AppInfo) { val bottomSheetFragment = AppInfoBottomSheetFragment(appInfo) + bottomSheetFragment.setOnBottomSheetDismissedListener(this) bottomSheetFragment.setOnAppStateClickListener(this) bottomSheetFragment.show(parentFragmentManager, "BottomSheetDialog") diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/home/HomeFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/home/HomeFragment.kt index 1bc77b3..6626b33 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/home/HomeFragment.kt @@ -64,6 +64,7 @@ import javax.inject.Inject class HomeFragment : Fragment(), OnItemClickedListener.OnAppsClickedListener, OnItemClickedListener.OnAppLongClickedListener, + OnItemClickedListener.BottomSheetDismissListener, OnItemClickedListener.OnAppStateClickListener, BiometricHelper.Callback, ScrollEventListener { @@ -329,6 +330,7 @@ class HomeFragment : Fragment(), private fun showSelectedApp(appInfo: AppInfo) { val bottomSheetFragment = AppInfoBottomSheetFragment(appInfo) + bottomSheetFragment.setOnBottomSheetDismissedListener(this) bottomSheetFragment.setOnAppStateClickListener(this) bottomSheetFragment.show(parentFragmentManager, "BottomSheetDialog")