ADFA-2247 | Add search, sorting, and filtering UI for saved projects

app/src/main/java/com/itsaky/androidide/fragments/RecentProjectsFragment.kt

@@ -4,9 +4,14 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
+import androidx.core.widget.addTextChangedListener
 import androidx.fragment.app.activityViewModels
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.button.MaterialButton
+import com.google.android.material.textfield.MaterialAutoCompleteTextView
 import com.itsaky.androidide.R
 import com.itsaky.androidide.activities.MainActivity
 import com.itsaky.androidide.adapters.RecentProjectsAdapter
@@ -23,8 +28,11 @@ import com.itsaky.androidide.utils.viewLifecycleScope
 import com.itsaky.androidide.viewmodel.MainViewModel
 import com.itsaky.androidide.viewmodel.RecentProjectsViewModel
 import com.itsaky.androidide.preferences.internal.GeneralPreferences
+import com.itsaky.androidide.viewmodel.SortCriteria
 import io.sentry.Sentry
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.joinAll
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -38,6 +46,14 @@ class RecentProjectsFragment : BaseFragment() {
 	private val viewModel: RecentProjectsViewModel by activityViewModels()
 	private val mainViewModel: MainViewModel by activityViewModels()
 	private lateinit var adapter: RecentProjectsAdapter
+	private var selectedCriteria: SortCriteria? = null
+	private var selectedAsc = true
+	private val searchQuery = MutableStateFlow("")
+
+	data class SortToggleStyle(
+ val iconRes: Int,
+ val colorRes: Int
+	)
 
 	override fun onCreateView(
  inflater: LayoutInflater,
@@ -54,6 +70,7 @@ class RecentProjectsFragment : BaseFragment() {
 	) {
  super.onViewCreated(view, savedInstanceState)
  setupRecyclerView()
+ setupSearchBar()
  setupObservers()
  setupClickListeners()
  bootstrapFromFixedFolderIfNeeded()
@@ -66,6 +83,137 @@ class RecentProjectsFragment : BaseFragment() {
  )
 	}
 
+	private fun openFiltersSheet() {
+ val dialog = BottomSheetDialog(requireContext())
+ val sheet = layoutInflater.inflate(R.layout.layout_project_filters_sheet, null)
+
+ dialog.setContentView(sheet)
+ setupFilters(sheet)
+
+ viewLifecycleScope.launch {
+ viewModel.filterEvents.collect { dialog.dismiss() }
+ }
+
+ dialog.show()
+	}
+
+	@OptIn(kotlinx.coroutines.FlowPreview::class)
+	private fun setupSearchBar() {
+ viewLifecycleScope.launch {
+ searchQuery
+ .debounce(300)
+ .collect { query -> viewModel.onSearchQuery(query) }
+ }
+
+ binding.layoutFilters.searchProjectEditText.addTextChangedListener { text ->
+ searchQuery.value = text?.toString().orEmpty()
+ }
+	}
+
+	private fun setupFilters(sheet: View) {
+ val sortDropdown = sheet.requireViewById<MaterialAutoCompleteTextView>(R.id.sort_dropdown)
+ val sortToggleBtn = sheet.requireViewById<MaterialButton>(R.id.sort_toggle_btn)
+ val applyBtn = sheet.requireViewById<MaterialButton>(R.id.apply_filters_btn)
+ val clearBtn = sheet.requireViewById<MaterialButton>(R.id.clear_filters_btn)
+
+ selectedCriteria = viewModel.currentSortCriteria
+ selectedAsc = viewModel.currentSortAscending
+
+ setupSortUI(sortDropdown, sortToggleBtn)
+ clearBtn.isVisible = viewModel.hasActiveFilters
+
+ sortDropdown.setOnItemClickListener { _, _, position, _ ->
+ selectedCriteria = when (position) {
+ 0 -> SortCriteria.NAME
+ 1 -> SortCriteria.DATE_CREATED
+ 2 -> SortCriteria.DATE_MODIFIED
+ else -> SortCriteria.NAME
+ }
+
+ clearBtn.isVisible = true
+ }
+
+ sortToggleBtn.setOnClickListener {
+ toggleSortDirection(sortToggleBtn)
+ clearBtn.isVisible = true
+ }
+
+ applyBtn.setOnClickListener {
+ viewLifecycleScope.launch {
+ selectedCriteria?.let { viewModel.onSortSelected(it) }
+ viewModel.onSortDirectionChanged(selectedAsc)
+ }
+ viewModel.notifyFiltersSaved()
+ }
+
+ clearBtn.setOnClickListener {
+ selectedCriteria = null
+ selectedAsc = true
+
+ sortDropdown.text = null
+ setupSortToggle(sortToggleBtn, true)
+ binding.layoutFilters.searchProjectEditText.text?.clear()
+
+ clearBtn.isVisible = false
+ viewLifecycleScope.launch {
+ viewModel.clearFilters()
+ }
+
+ viewModel.notifyFiltersSaved()
+ }
+	}
+
+	/**
+ * Initializes UI according to current VM state.
+ */
+	private fun setupSortUI(
+ sortDropdown: MaterialAutoCompleteTextView,
+ sortToggleBtn: MaterialButton
+	) {
+ val labelRes = when (selectedCriteria) {
+ SortCriteria.NAME -> R.string.sort_by_name
+ SortCriteria.DATE_CREATED -> R.string.sort_by_created
+ SortCriteria.DATE_MODIFIED -> R.string.sort_by_modified
+ null -> null
+ }
+
+ if (labelRes != null) {
+ sortDropdown.setText(getString(labelRes), false)
+ } else {
+ sortDropdown.text = null
+ }
+
+ setupSortToggle(sortToggleBtn, selectedAsc)
+	}
+
+	/**
+ * Updates the arrow icon, the background color and the text based on ascending state.
+ */
+	private fun setupSortToggle(button: MaterialButton, asc: Boolean) {
+ val style = if (asc) {
+ SortToggleStyle(
+ R.drawable.ic_arrow_up, R.color._blue_wave_light_colorPrimaryDark
+ )
+ } else {
+ SortToggleStyle(
+ R.drawable.ic_arrow_down, R.color._blue_wave_dark_colorOnSecondary
+ )
+ }
+ button.apply {
+ setIconResource(style.iconRes)
+ backgroundTintList = ContextCompat.getColorStateList(context, style.colorRes)
+ }
+	}
+
+	/**
+ * Toggles the ascending/descending state and updates the UI.
+ */
+	private fun toggleSortDirection(button: MaterialButton) {
+ selectedAsc = !selectedAsc
+ setupSortToggle(button, selectedAsc)
+	}
+
+
  private fun File.isProjectCandidateDir(): Boolean = isDirectory && canRead() && !name.startsWith(".") && !isHidden
 
  private fun bootstrapFromFixedFolderIfNeeded() {
@@ -289,6 +437,9 @@ class RecentProjectsFragment : BaseFragment() {
  showToolTip(PROJECT_RECENT_TOP)
  true
  }
+ binding.layoutFilters.openFiltersBtn.setOnClickListener {
+ openFiltersSheet()
+ }
  }
 
  private fun openProject(root: File) {

app/src/main/java/com/itsaky/androidide/viewmodel/RecentProjectsViewModel.kt

@@ -14,13 +14,32 @@ import com.itsaky.androidide.utils.getLastModifiedTime
 import org.appdevforall.codeonthego.layouteditor.ProjectFile
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+enum class SortCriteria {
+ NAME,
+ DATE_CREATED,
+ DATE_MODIFIED
+}
 
 class RecentProjectsViewModel(application: Application) : AndroidViewModel(application) {
 
  private val _projects = MutableLiveData<List<ProjectFile>>()
+ private var allProjects: List<ProjectFile> = emptyList()
  val projects: LiveData<List<ProjectFile>> = _projects
+ private val _filterEvents = MutableSharedFlow<Unit>()
+ val filterEvents = _filterEvents
  var didBootstrap = false
+ private var currentQuery: String = ""
+ private var currentSort: SortCriteria? = null
+ private var isAscending: Boolean = true
+
+ val currentSortCriteria: SortCriteria? get() = currentSort
+ val currentSortAscending: Boolean get() = isAscending
+ val hasActiveFilters: Boolean
+ get() = currentSort != null || !isAscending || currentQuery.isNotEmpty()
 
 
  // Get the database and DAO instance
@@ -31,12 +50,63 @@ class RecentProjectsViewModel(application: Application) : AndroidViewModel(appli
  return viewModelScope.launch(Dispatchers.IO) {
  val projectsFromDb = recentProjectDao.dumpAll() ?: emptyList()
  val context = getApplication<Application>().applicationContext
- val projectFiles =
- projectsFromDb.map { ProjectFile(it.location, it.createdAt, it.lastModified, context) }
- _projects.postValue(projectFiles)
+
+ allProjects = projectsFromDb.map { ProjectFile(it.location, it.createdAt, it.lastModified, context) }
+ applyFilters()
+ }
+ }
+
+ fun notifyFiltersSaved() {
+ viewModelScope.launch {
+ _filterEvents.emit(Unit)
+ }
+ }
+
+ private suspend fun applyFilters() {
+ withContext(Dispatchers.Default) {
+ var result = allProjects
+
+ if (currentQuery.isNotEmpty()) {
+ result = result.filter { it.name.contains(currentQuery, ignoreCase = true) }
+ }
+
+ currentSort.let { criteria ->
+ result = when (criteria) {
+ SortCriteria.NAME -> result.sortedBy { it.name.lowercase() }
+ SortCriteria.DATE_CREATED -> result.sortedBy { it.createdAt }
+ SortCriteria.DATE_MODIFIED -> result.sortedBy { it.lastModified }
+ else -> result
+ }
+ if (!isAscending) {
+ result = result.reversed()
+ }
+ }
+ _projects.postValue(result)
  }
  }
 
+ suspend fun onSearchQuery(query: String) {
+ currentQuery = query.trim()
+ applyFilters()
+ }
+
+ suspend fun onSortSelected(criteria: SortCriteria?) {
+ currentSort = criteria
+ applyFilters()
+ }
+
+ suspend fun onSortDirectionChanged(ascending: Boolean) {
+ isAscending = ascending
+ applyFilters()
+ }
+
+ suspend fun clearFilters() {
+ currentSort = null
+ isAscending = true
+ currentQuery = ""
+ applyFilters()
+ }
+
  fun insertProject(project: RecentProject) = viewModelScope.launch(Dispatchers.IO) {
  recentProjectDao.insert(project)
  }

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

@@ -26,6 +26,10 @@
  android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
  android:transitionName="title" />
 
+ <include
+ android:id="@+id/layout_filters"
+ layout="@layout/layout_project_filters_bar" />
+
  <androidx.recyclerview.widget.RecyclerView
  android:id="@+id/list_projects"
  android:layout_width="match_parent"

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

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:gravity="center_vertical"
+ android:paddingHorizontal="16dp"
+ android:layout_marginTop="12dp">
+
+ <com.google.android.material.textfield.TextInputLayout
+ android:id="@+id/search_project_input_layout"
+ style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:hint="@string/search_projects_hint">
+
+ <com.google.android.material.textfield.TextInputEditText
+ android:id="@+id/search_project_edit_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:imeOptions="actionSearch"
+ android:singleLine="true" />
+ </com.google.android.material.textfield.TextInputLayout>
+
+ <com.google.android.material.button.MaterialButton
+ android:id="@+id/open_filters_btn"
+ android:contentDescription="@string/sort_projects_label"
+ style="@style/Widget.Material3.Button.IconButton.Filled"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="6dp"
+ app:icon="@drawable/ic_sort" />
+</LinearLayout>