[feat]: search apps in ChooseAppFragment

app/src/main/java/com/f0x1d/logfox/ui/fragment/LogsFragment.kt

@@ -42,7 +42,7 @@ class LogsFragment: BaseViewModelFragment<LogsViewModel, FragmentLogsBinding>(),
     }
     private var changingState = false
 
-    private val clearSelectionBackPressedCallback = object : OnBackPressedCallback(false) {
+    private val clearSelectionOnBackPressedCallback = object : OnBackPressedCallback(false) {
         override fun handleOnBackPressed() {
             viewModel.selectedItems.update {
                 emptyList()
@@ -70,7 +70,6 @@ class LogsFragment: BaseViewModelFragment<LogsViewModel, FragmentLogsBinding>(),
             }
         }
 
-        binding.toolbar.inflateMenu(R.menu.logs_menu)
         binding.toolbar.menu.apply {
             setClickListenerOn(R.id.pause_item) {
                 viewModel.switchState()
@@ -136,7 +135,7 @@ class LogsFragment: BaseViewModelFragment<LogsViewModel, FragmentLogsBinding>(),
         viewModel.selectedItems.asLiveData().observe(viewLifecycleOwner) {
             val selecting = it.isNotEmpty()
 
-            clearSelectionBackPressedCallback.isEnabled = selecting
+            clearSelectionOnBackPressedCallback.isEnabled = selecting
 
             adapter.selectedItems = it
             setupToolbarForSelection(selecting, it.size)
@@ -171,7 +170,7 @@ class LogsFragment: BaseViewModelFragment<LogsViewModel, FragmentLogsBinding>(),
         }
 
         requireActivity().onBackPressedDispatcher.apply {
-            addCallback(viewLifecycleOwner, clearSelectionBackPressedCallback)
+            addCallback(viewLifecycleOwner, clearSelectionOnBackPressedCallback)
         }
     }
 

app/src/main/java/com/f0x1d/logfox/ui/fragment/RecordingsFragment.kt

@@ -65,7 +65,6 @@ class RecordingsFragment: BaseViewModelFragment<RecordingsViewModel, FragmentRec
             }
         }
 
-        binding.toolbar.inflateMenu(R.menu.recordings_menu)
         binding.toolbar.menu.setClickListenerOn(R.id.clear_item) {
             showAreYouSureClearDialog {
                 viewModel.clearRecordings()

app/src/main/java/com/f0x1d/logfox/ui/fragment/crashes/CrashDetailsFragment.kt

@@ -52,7 +52,6 @@ class CrashDetailsFragment: BaseViewModelFragment<CrashDetailsViewModel, Activit
             }
         }
 
-        binding.toolbar.inflateMenu(R.menu.crash_details_menu)
         binding.toolbar.setupBackButtonForNavController()
 
         binding.copyLayout.replaceAccessibilityDelegateClassNameWithButton()

app/src/main/java/com/f0x1d/logfox/ui/fragment/crashes/list/CrashesFragment.kt

@@ -53,7 +53,6 @@ class CrashesFragment: BaseViewModelFragment<CrashesViewModel, FragmentCrashesBi
             }
         }
 
-        binding.toolbar.inflateMenu(R.menu.crashes_menu)
         binding.toolbar.menu.setClickListenerOn(R.id.clear_item) {
             showAreYouSureClearDialog {
                 viewModel.clearCrashes()

app/src/main/java/com/f0x1d/logfox/ui/fragment/filters/ChooseAppFragment.kt

@@ -4,6 +4,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.activity.OnBackPressedCallback
+import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.viewModels
 import androidx.hilt.navigation.fragment.hiltNavGraphViewModels
 import androidx.lifecycle.asLiveData
@@ -13,13 +15,17 @@ import com.f0x1d.logfox.R
 import com.f0x1d.logfox.adapter.AppsAdapter
 import com.f0x1d.logfox.databinding.FragmentChooseAppBinding
 import com.f0x1d.logfox.extensions.dpToPx
+import com.f0x1d.logfox.extensions.views.widgets.setClickListenerOn
 import com.f0x1d.logfox.extensions.views.widgets.setupBackButtonForNavController
+import com.f0x1d.logfox.model.InstalledApp
 import com.f0x1d.logfox.ui.fragment.base.BaseViewModelFragment
 import com.f0x1d.logfox.viewmodel.filters.ChooseAppViewModel
 import com.f0x1d.logfox.viewmodel.filters.EditFilterViewModel
 import com.google.android.material.divider.MaterialDividerItemDecoration
+import com.google.android.material.search.SearchView
 import dagger.hilt.android.AndroidEntryPoint
 import dev.chrisbanes.insetter.applyInsetter
+import kotlinx.coroutines.flow.update
 
 @AndroidEntryPoint
 class ChooseAppFragment: BaseViewModelFragment<ChooseAppViewModel, FragmentChooseAppBinding>() {
@@ -28,10 +34,18 @@ class ChooseAppFragment: BaseViewModelFragment<ChooseAppViewModel, FragmentChoos
 
     private val editFilterViewModel by hiltNavGraphViewModels<EditFilterViewModel>(R.id.editFilterFragment)
 
-    private val adapter = AppsAdapter {
+    private val onAppClicked: (InstalledApp) -> Unit = {
         editFilterViewModel.selectApp(it)
         findNavController().popBackStack()
     }
+    private val appsAdapter = AppsAdapter(onAppClicked)
+    private val searchedAppsAdapter = AppsAdapter(onAppClicked)
+
+    private val closeSearchOnBackPressedCallback = object : OnBackPressedCallback(false) {
+        override fun handleOnBackPressed() {
+            binding.searchView.hide()
+        }
+    }
 
     override fun inflateBinding(
         inflater: LayoutInflater,
@@ -47,18 +61,47 @@ class ChooseAppFragment: BaseViewModelFragment<ChooseAppViewModel, FragmentChoos
             }
         }
 
-        binding.toolbar.setupBackButtonForNavController()
+        binding.searchBar.apply {
+            setupBackButtonForNavController()
+            menu.setClickListenerOn(R.id.search_item) {
+                binding.searchView.show()
+            }
+        }
+        binding.searchView.editText.doAfterTextChanged { editable ->
+            viewModel.query.update {
+                editable.toString()
+            }
+        }
+        binding.searchView.addTransitionListener { searchView, previousState, newState ->
+            closeSearchOnBackPressedCallback.isEnabled = newState == SearchView.TransitionState.SHOWN
+        }
+
+        listOf(
+            binding.appsRecycler,
+            binding.searchedAppsRecycler
+        ).forEach {
+            it.apply {
+                layoutManager = LinearLayoutManager(requireContext())
+                addItemDecoration(MaterialDividerItemDecoration(requireContext(), LinearLayoutManager.VERTICAL).apply {
+                    dividerInsetStart = 80.dpToPx.toInt()
+                    dividerInsetEnd = 10.dpToPx.toInt()
+                    isLastItemDecorated = false
+                })
+            }
+        }
 
-        binding.appsRecycler.layoutManager = LinearLayoutManager(requireContext())
-        binding.appsRecycler.addItemDecoration(MaterialDividerItemDecoration(requireContext(), LinearLayoutManager.VERTICAL).apply {
-            dividerInsetStart = 80.dpToPx.toInt()
-            dividerInsetEnd = 10.dpToPx.toInt()
-            isLastItemDecorated = false
-        })
-        binding.appsRecycler.adapter = adapter
+        binding.appsRecycler.adapter = appsAdapter
+        binding.searchedAppsRecycler.adapter = searchedAppsAdapter
 
         viewModel.apps.asLiveData().observe(viewLifecycleOwner) {
-            adapter.submitList(it)
+            appsAdapter.submitList(it)
+        }
+        viewModel.searchedApps.observe(viewLifecycleOwner) {
+            searchedAppsAdapter.submitList(it)
+        }
+
+        requireActivity().onBackPressedDispatcher.apply {
+            addCallback(viewLifecycleOwner, closeSearchOnBackPressedCallback)
         }
     }
 }

app/src/main/java/com/f0x1d/logfox/ui/fragment/filters/EditFilterFragment.kt

@@ -95,9 +95,11 @@ class EditFilterFragment: BaseViewModelFragment<EditFilterViewModel, FragmentEdi
 
             if (it == null) return@observe
 
-            binding.toolbar.inflateMenu(R.menu.edit_filter_menu)
-            binding.toolbar.menu.setClickListenerOn(R.id.export_item) {
-                exportFilterLauncher.launch("filter.json")
+            binding.toolbar.menu.apply {
+                findItem(R.id.export_item).isVisible = true
+                setClickListenerOn(R.id.export_item) {
+                    exportFilterLauncher.launch("filter.json")
+                }
             }
 
             binding.saveFab.setOnClickListener { view ->

app/src/main/java/com/f0x1d/logfox/ui/fragment/filters/FiltersFragment.kt

@@ -62,7 +62,6 @@ class FiltersFragment: BaseViewModelFragment<FiltersViewModel, FragmentFiltersBi
         }
 
         binding.toolbar.setupBackButtonForNavController()
-        binding.toolbar.inflateMenu(R.menu.filters_menu)
         binding.toolbar.menu.apply {
             setClickListenerOn(R.id.clear_item) {
                 showAreYouSureClearDialog {

app/src/main/java/com/f0x1d/logfox/viewmodel/filters/ChooseAppViewModel.kt

@@ -1,19 +1,36 @@
 package com.f0x1d.logfox.viewmodel.filters
 
 import android.app.Application
+import androidx.lifecycle.asLiveData
 import com.f0x1d.logfox.model.InstalledApp
 import com.f0x1d.logfox.viewmodel.base.BaseViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import javax.inject.Inject
 
 @HiltViewModel
 class ChooseAppViewModel @Inject constructor(
     application: Application
 ): BaseViewModel(application) {
+
     val apps = MutableStateFlow(emptyList<InstalledApp>())
+    val query = MutableStateFlow("")
+
+    val searchedApps = combine(apps, query) { apps, query ->
+        apps to query
+    }.map {
+        it.first.filter { app ->
+            app.title.toString().contains(it.second) || app.packageName.contains(it.second)
+        }
+    }.flowOn(
+        Dispatchers.IO
+    ).distinctUntilChanged().asLiveData()
 
     init {
         load()

app/src/main/res/layout/activity_crash_details.xml

@@ -16,6 +16,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:titleCentered="true"
+            app:menu="@menu/crash_details_menu"
             app:navigationIcon="@drawable/ic_arrow_back"
             app:navigationIconTint="?colorOnSurface" />
     </com.google.android.material.appbar.AppBarLayout>

app/src/main/res/layout/fragment_choose_app.xml

@@ -11,16 +11,30 @@
         android:fitsSystemWindows="true"
         app:liftOnScroll="true">
 
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
+        <com.google.android.material.search.SearchBar
+            android:id="@+id/search_bar"
             android:layout_width="match_parent"
-            android:layout_height="?actionBarSize"
-            app:title="@string/apps"
-            app:titleCentered="true"
+            android:layout_height="wrap_content"
+            app:menu="@menu/choose_app_menu"
             app:navigationIcon="@drawable/ic_arrow_back"
-            app:navigationIconTint="?colorOnSurface"/>
+            app:navigationIconTint="?colorOnSurface"
+            android:hint="@string/apps" />
     </com.google.android.material.appbar.AppBarLayout>
 
+    <com.google.android.material.search.SearchView
+        android:id="@+id/search_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:hint="@string/apps"
+        app:layout_anchor="@id/search_bar">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/searched_apps_recycler"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipToPadding="false" />
+    </com.google.android.material.search.SearchView>
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/apps_recycler"
         android:layout_width="match_parent"

app/src/main/res/layout/fragment_crashes.xml

@@ -15,6 +15,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?actionBarSize"
+            app:menu="@menu/crashes_menu"
             app:title="@string/crashes"
             app:titleCentered="true" />
     </com.google.android.material.appbar.AppBarLayout>

app/src/main/res/layout/fragment_edit_filter.xml

@@ -18,6 +18,7 @@
             android:layout_height="?actionBarSize"
             app:title="@string/filter"
             app:titleCentered="true"
+            app:menu="@menu/edit_filter_menu"
             app:navigationIcon="@drawable/ic_arrow_back"
             app:navigationIconTint="?colorOnSurface" />
     </com.google.android.material.appbar.AppBarLayout>

app/src/main/res/layout/fragment_filters.xml

@@ -18,6 +18,7 @@
             android:layout_height="?actionBarSize"
             app:title="@string/filters"
             app:titleCentered="true"
+            app:menu="@menu/filters_menu"
             app:navigationIcon="@drawable/ic_arrow_back"
             app:navigationIconTint="?colorOnSurface" />
     </com.google.android.material.appbar.AppBarLayout>

app/src/main/res/layout/fragment_logs.xml

@@ -18,6 +18,7 @@
             android:layout_height="?actionBarSize"
             app:title="@string/app_name"
             app:titleCentered="true"
+            app:menu="@menu/logs_menu"
             app:navigationIconTint="?colorOnSurface"/>
     </com.google.android.material.appbar.AppBarLayout>
 

app/src/main/res/layout/fragment_recordings.xml

@@ -17,7 +17,8 @@
             android:layout_width="match_parent"
             android:layout_height="?actionBarSize"
             app:title="@string/recordings"
-            app:titleCentered="true" />
+            app:titleCentered="true"
+            app:menu="@menu/recordings_menu" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.recyclerview.widget.RecyclerView

app/src/main/res/menu/choose_app_menu.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/search_item"
+        android:title="@string/search"
+        android:icon="@drawable/ic_search"
+        app:showAsAction="always" />
+</menu>

app/src/main/res/menu/edit_filter_menu.xml

@@ -6,6 +6,7 @@
         android:id="@+id/export_item"
         android:title="@string/export"
         android:icon="@drawable/ic_export"
+        android:visible="false"
         app:showAsAction="always" />
 
 </menu>