Add search to LibraryFragment

Add searching to LibraryFragment.
2020-10-03 09:14:49 -06:00 · 2020-10-03 09:14:49 -06:00 · 69c508caec
commit 69c508caec
parent 3a44ce7e43
19 changed files with 184 additions and 59 deletions
--- a/19
+++ b/19
@ -1,19 +1,19 @@
 TODO:

-? - Could do with some more research.
-! - Tried to do, but is completely broken.
+TODOs surrounded with ?s are things I want to do, but need to do more research on and may be a nightmare to implement.
+TODOs surrounded with !s are things I tried to do, but failed for reasons included in the TODO. I still want to add these, but theres no way for me to do them at the moment.

 /detail/

 - ? Implement Toolbar update functionality ?
- ! Implement shared element transitions !
+- ! Implement shared element transitions [Return transitions are broken] !

 /music/

 - Add option to show all genres
- ! Move genres to songs !
- ! Remove lists from music models !
- ! Dont determine track/album/artist counts on the fly !
+- ! Move genres to songs [Wont find songs w/o genres]!
+- ! Remove lists from music models [Current genre loading system makes it impossible] !
+- ! Dont determine track/album/artist counts on the fly [Audio columns for those values are broken] !

 /songs/

@ -23,12 +23,13 @@ TODO:

 /library/

- Search
 - Exit functionality
+- ? Remove gap from where I removed the overflow menu ?
+- ? Add icons to overflow menu items ?
 - ? Show Artists, Albums, and Songs in search ?
+- ? Implement filtering for above ^^^ [Will resolve gap issue] ?
 - ? Move into ViewPager ?
- ! Move Adapter functionality to ListAdapter!
-
+- ! Move Adapter functionality to ListAdapter [RecyclerView scrolls to middle/bottom when data is re-sorted] !

 To be added:
 /prefs/
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -11,7 +11,9 @@
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
        android:theme="@style/Theme.Base">
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:windowSoftInputMode="adjustPan">
+
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

--- a/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt
@ -13,7 +13,6 @@ import androidx.navigation.fragment.navArgs
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.FragmentArtistDetailBinding
 import org.oxycblt.auxio.detail.adapters.DetailAlbumAdapter
-import org.oxycblt.auxio.music.Album
 import org.oxycblt.auxio.music.MusicViewModel
 import org.oxycblt.auxio.recycler.ClickListener
 import org.oxycblt.auxio.theme.applyDivider
--- a/app/src/main/java/org/oxycblt/auxio/detail/GenreDetailFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/GenreDetailFragment.kt
@ -13,7 +13,6 @@ import androidx.navigation.fragment.navArgs
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.FragmentGenreDetailBinding
 import org.oxycblt.auxio.detail.adapters.DetailArtistAdapter
-import org.oxycblt.auxio.music.Artist
 import org.oxycblt.auxio.music.MusicViewModel
 import org.oxycblt.auxio.recycler.ClickListener
 import org.oxycblt.auxio.theme.applyDivider
--- a/app/src/main/java/org/oxycblt/auxio/library/LibraryAdapter.kt
+++ b/app/src/main/java/org/oxycblt/auxio/library/LibraryAdapter.kt
@ -22,7 +22,7 @@ class LibraryAdapter(
    private val listener: ClickListener<BaseModel>
 ) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {

-    private var data: List<BaseModel>
+    var data: List<BaseModel>

    init {
        // Assign the data on startup depending on the type
--- a/app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt
@ -5,11 +5,14 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.widget.SearchView
 import androidx.core.content.ContextCompat
 import androidx.core.view.forEach
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
+import androidx.transition.Fade
+import androidx.transition.TransitionManager
 import org.oxycblt.auxio.MainFragmentDirections
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.FragmentLibraryBinding
@ -26,7 +29,7 @@ import org.oxycblt.auxio.theme.applyColor
 import org.oxycblt.auxio.theme.applyDivider
 import org.oxycblt.auxio.theme.resolveAttr

-class LibraryFragment : Fragment() {
+class LibraryFragment : Fragment(), SearchView.OnQueryTextListener {

    private val musicModel: MusicViewModel by activityViewModels()
    private val libraryModel: LibraryViewModel by activityViewModels()
@ -38,12 +41,52 @@ class LibraryFragment : Fragment() {
    ): View? {
        val binding = FragmentLibraryBinding.inflate(inflater)

-        val artistAdapter = LibraryAdapter(
+        // Toolbar setup
+        binding.libraryToolbar.overflowIcon = ContextCompat.getDrawable(
+            requireContext(), R.drawable.ic_sort_none
+        )
+
+        binding.libraryToolbar.menu.apply {
+            val item = findItem(R.id.action_search)
+            val searchView = item.actionView as SearchView
+
+            searchView.queryHint = getString(R.string.hint_search_library)
+            searchView.setOnQueryTextListener(this@LibraryFragment)
+            searchView.setOnQueryTextFocusChangeListener { _, hasFocus ->
+                this.setGroupVisible(R.id.group_sorting, !hasFocus)
+
+                // Make sure the search item will still be visible, and then do an animation
+                item.isVisible = !hasFocus
+                TransitionManager.beginDelayedTransition(
+                    binding.libraryToolbar, Fade()
+                )
+                item.collapseActionView()
+            }
+        }
+
+        binding.libraryToolbar.setOnMenuItemClickListener {
+            if (it.itemId != R.id.action_search) {
+                libraryModel.updateSortMode(it)
+            } else {
+                // Do whatever this is in order to make the SearchView focusable.
+                (it.actionView as SearchView).isIconified = false
+
+                // Then also do a basic animation
+                TransitionManager.beginDelayedTransition(
+                    binding.libraryToolbar, Fade()
+                )
+                it.expandActionView()
+            }
+            true
+        }
+
+        val libraryAdapter = LibraryAdapter(
            libraryModel.showMode.value!!,
            ClickListener { navToItem(it) }
        )

-        binding.libraryRecycler.adapter = artistAdapter
+        // RecyclerView setup
+        binding.libraryRecycler.adapter = libraryAdapter
        binding.libraryRecycler.applyDivider()
        binding.libraryRecycler.setHasFixedSize(true)

@ -51,7 +94,7 @@ class LibraryFragment : Fragment() {
            Log.d(this::class.simpleName, "Updating sort mode to $mode")

            // Update the adapter with the new data
-            artistAdapter.updateData(
+            libraryAdapter.updateData(
                when (libraryModel.showMode.value) {
                    SHOW_GENRES -> mode.getSortedGenreList(musicModel.genres.value!!)
                    SHOW_ARTISTS -> mode.getSortedArtistList(musicModel.artists.value!!)
@ -61,12 +104,7 @@ class LibraryFragment : Fragment() {
                }
            )

-            // Then update the shown icon & the currently highlighted sort icon to reflect
-            // the new sorting mode.
-            binding.libraryToolbar.overflowIcon = ContextCompat.getDrawable(
-                requireContext(), mode.iconRes
-            )
-
+            // Then update the menu item in the toolbar to reflect the new mode
            binding.libraryToolbar.menu.forEach {
                if (it.itemId == libraryModel.sortMode.value!!.toMenuId()) {
                    it.applyColor(resolveAttr(requireContext(), R.attr.colorPrimary))
@ -76,10 +114,17 @@ class LibraryFragment : Fragment() {
            }
        }

-        binding.libraryToolbar.setOnMenuItemClickListener {
-            libraryModel.updateSortMode(it)
+        libraryModel.searchQuery.observe(viewLifecycleOwner) { query ->
+            // Update the adapter with the new data
+            libraryAdapter.updateData(
+                when (libraryModel.showMode.value) {
+                    SHOW_GENRES -> musicModel.genres.value!!
+                    SHOW_ARTISTS -> musicModel.artists.value!!
+                    SHOW_ALBUMS -> musicModel.albums.value!!

-            true
+                    else -> musicModel.artists.value!!
+                }.filter { it.name.contains(query, true) }
+            )
        }

        Log.d(this::class.simpleName, "Fragment created.")
@ -87,6 +132,14 @@ class LibraryFragment : Fragment() {
        return binding.root
    }

+    override fun onQueryTextSubmit(query: String): Boolean = false
+
+    override fun onQueryTextChange(query: String): Boolean {
+        libraryModel.updateSearchQuery(query)
+
+        return false
+    }
+
    private fun navToItem(baseModel: BaseModel) {
        Log.d(this::class.simpleName, "Navigating to the detail fragment for ${baseModel.name}")

--- a/app/src/main/java/org/oxycblt/auxio/library/LibraryViewModel.kt
+++ b/app/src/main/java/org/oxycblt/auxio/library/LibraryViewModel.kt
@ -8,7 +8,7 @@ import org.oxycblt.auxio.R
 import org.oxycblt.auxio.recycler.SortMode
 import org.oxycblt.auxio.theme.SHOW_ARTISTS

-class LibraryViewModel : ViewModel() {
+class LibraryViewModel() : ViewModel() {
    // TODO: Move these to prefs when they're added
    private val mShowMode = MutableLiveData(SHOW_ARTISTS)
    val showMode: LiveData<Int> get() = mShowMode
@ -16,11 +16,14 @@ class LibraryViewModel : ViewModel() {
    private val mSortMode = MutableLiveData(SortMode.ALPHA_DOWN)
    val sortMode: LiveData<SortMode> get() = mSortMode

+    private val mSearchQuery = MutableLiveData("")
+    val searchQuery: LiveData<String> get() = mSearchQuery
+
    fun updateSortMode(item: MenuItem) {
        val mode = when (item.itemId) {
-            R.id.sort_none -> SortMode.NONE
-            R.id.sort_alpha_down -> SortMode.ALPHA_DOWN
-            R.id.sort_alpha_up -> SortMode.ALPHA_UP
+            R.id.option_sort_none -> SortMode.NONE
+            R.id.option_sort_alpha_down -> SortMode.ALPHA_DOWN
+            R.id.option_sort_alpha_up -> SortMode.ALPHA_UP

            else -> SortMode.NONE
        }
@ -29,4 +32,8 @@ class LibraryViewModel : ViewModel() {
            mSortMode.value = mode
        }
    }
+
+    fun updateSearchQuery(query: String) {
+        mSearchQuery.value = query
+    }
 }
--- a/app/src/main/java/org/oxycblt/auxio/recycler/SortMode.kt
+++ b/app/src/main/java/org/oxycblt/auxio/recycler/SortMode.kt
@ -3,6 +3,7 @@ package org.oxycblt.auxio.recycler
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.music.Album
 import org.oxycblt.auxio.music.Artist
+import org.oxycblt.auxio.music.BaseModel
 import org.oxycblt.auxio.music.Genre
 import org.oxycblt.auxio.music.Song

@ -77,13 +78,30 @@ enum class SortMode(val iconRes: Int) {
        }
    }

+    fun getSortedBaseModelList(list: List<BaseModel>): List<BaseModel> {
+        return when (this) {
+            ALPHA_UP -> list.sortedWith(
+                compareByDescending(String.CASE_INSENSITIVE_ORDER) { it.name }
+            )
+
+            ALPHA_DOWN -> list.sortedWith(
+                compareBy(String.CASE_INSENSITIVE_ORDER) { it.name }
+            )
+
+            NUMERIC_UP -> list.sortedWith(compareByDescending { it.id })
+            NUMERIC_DOWN -> list.sortedWith(compareBy { it.id })
+
+            else -> list
+        }
+    }
+
    fun toMenuId(): Int {
        return when (this) {
-            NONE -> R.id.sort_none
-            ALPHA_UP -> R.id.sort_alpha_up
-            ALPHA_DOWN -> R.id.sort_alpha_down
+            NONE -> R.id.option_sort_none
+            ALPHA_UP -> R.id.option_sort_alpha_up
+            ALPHA_DOWN -> R.id.option_sort_alpha_down

-            else -> R.id.sort_none
+            else -> R.id.option_sort_none
        }
    }
 }
--- a/app/src/main/res/drawable/cursor.xml
+++ b/app/src/main/res/drawable/cursor.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Custom cursor shape that reflects the current accent color.
+https://stackoverflow.com/a/28311351/14143986
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+    <solid android:color="?android:attr/colorPrimary" />
+    <size android:width="2dp" />
+</shape>
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
--- a/app/src/main/res/drawable/ic_sort_none.xml
+++ b/app/src/main/res/drawable/ic_sort_none.xml
@ -4,7 +4,7 @@
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24"
-    android:tint="?attr/colorPrimary">
+    android:tint="?android:attr/colorControlNormal">
    <path
        android:fillColor="@android:color/white"
        android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z" />
--- a/app/src/main/res/layout/fragment_album_detail.xml
+++ b/app/src/main/res/layout/fragment_album_detail.xml
@ -25,7 +25,7 @@
            android:layout_height="?android:attr/actionBarSize"
            android:background="?android:attr/windowBackground"
            android:elevation="@dimen/elevation_normal"
-            app:titleTextAppearance="@style/TextAppearance.Toolbar.Bold"
+            app:titleTextAppearance="@style/TextAppearance.Toolbar.Header"
            app:navigationIcon="@drawable/ic_back"
            app:title="@string/title_library_fragment" />

--- a/app/src/main/res/layout/fragment_artist_detail.xml
+++ b/app/src/main/res/layout/fragment_artist_detail.xml
@ -25,7 +25,7 @@
            android:layout_height="?android:attr/actionBarSize"
            android:background="?android:attr/windowBackground"
            android:elevation="@dimen/elevation_normal"
-            app:titleTextAppearance="@style/TextAppearance.Toolbar.Bold"
+            app:titleTextAppearance="@style/TextAppearance.Toolbar.Header"
            app:navigationIcon="@drawable/ic_back"
            app:title="@string/title_library_fragment" />

--- a/app/src/main/res/layout/fragment_genre_detail.xml
+++ b/app/src/main/res/layout/fragment_genre_detail.xml
@ -25,7 +25,7 @@
            android:layout_height="?android:attr/actionBarSize"
            android:background="?android:attr/windowBackground"
            android:elevation="@dimen/elevation_normal"
-            app:titleTextAppearance="@style/TextAppearance.Toolbar.Bold"
+            app:titleTextAppearance="@style/TextAppearance.Toolbar.Header"
            app:navigationIcon="@drawable/ic_back"
            app:title="@string/title_library_fragment" />

--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@ -7,8 +7,7 @@
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:orientation="vertical"
-        android:animateLayoutChanges="true"
-        android:descendantFocusability="blocksDescendants">
+        android:animateLayoutChanges="true">

        <androidx.appcompat.widget.Toolbar
            android:id="@+id/library_toolbar"
@ -16,10 +15,11 @@
            android:layout_height="?android:attr/actionBarSize"
            android:background="?android:attr/windowBackground"
            android:elevation="@dimen/elevation_normal"
+            android:theme="@style/Toolbar.Style"
            app:popupTheme="@style/AppThemeOverlay.Popup"
            app:menu="@menu/menu_library"
-            app:titleTextAppearance="@style/TextAppearance.Toolbar.Bold"
-            app:title="@string/title_library_fragment" />
+            app:titleTextAppearance="@style/TextAppearance.Toolbar.Header"
+            app:title="@string/title_library_fragment"/>

        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/library_recycler"
--- a/app/src/main/res/layout/fragment_songs.xml
+++ b/app/src/main/res/layout/fragment_songs.xml
@ -15,7 +15,7 @@
            android:layout_height="?android:attr/actionBarSize"
            android:background="?android:attr/windowBackground"
            android:elevation="@dimen/elevation_normal"
-            app:titleTextAppearance="@style/TextAppearance.Toolbar.Bold"
+            app:titleTextAppearance="@style/TextAppearance.Toolbar.Header"
            app:title="@string/title_all_songs" />

        <androidx.recyclerview.widget.RecyclerView
--- a/app/src/main/res/menu/menu_library.xml
+++ b/app/src/main/res/menu/menu_library.xml
@ -1,18 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
    <item
-        android:id="@+id/sort_none"
-        android:icon="@drawable/ic_sort_none"
-        android:title="@string/label_sort_none"
-        android:contentDescription="@string/description_sort_none" />
-    <item
-        android:id="@+id/sort_alpha_down"
-        android:icon="@drawable/ic_sort_alpha_down"
-        android:title="@string/label_sort_alpha_down"
-        android:contentDescription="@string/description_sort_alpha_down" />
-    <item
-        android:id="@+id/sort_alpha_up"
-        android:icon="@drawable/ic_sort_alpha_up"
-        android:title="@string/label_sort_alpha_up"
-        android:contentDescription="@string/description_sort_alpha_up" />
+        android:id="@+id/action_search"
+        android:icon="@drawable/ic_search"
+        android:title="@string/label_search"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        app:showAsAction="collapseActionView|always" />
+
+    <group android:id="@+id/group_sorting">
+        <item
+            android:id="@+id/option_sort_none"
+            android:icon="@drawable/ic_sort_none"
+            android:title="@string/label_sort_none"
+            android:contentDescription="@string/description_sort_none" />
+        <item
+            android:id="@+id/option_sort_alpha_down"
+            android:icon="@drawable/ic_sort_alpha_down"
+            android:title="@string/label_sort_alpha_down"
+            android:contentDescription="@string/description_sort_alpha_down" />
+        <item
+            android:id="@+id/option_sort_alpha_up"
+            android:icon="@drawable/ic_sort_alpha_up"
+            android:title="@string/label_sort_alpha_up"
+            android:contentDescription="@string/description_sort_alpha_up" />
+    </group>
 </menu>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -17,10 +17,14 @@
    <string name="label_artists">Artists</string>
    <string name="label_albums">Albums</string>
    <string name="label_songs">Songs</string>
+    <string name="label_search">Search</string>
    <string name="label_sort_none">Default</string>
    <string name="label_sort_alpha_down">A-Z</string>
    <string name="label_sort_alpha_up">Z-A</string>

+    <!-- Hint Namespace | EditText Hints -->
+    <string name="hint_search_library">Search Library…</string>
+
    <!-- Description Namespace | Accessibility Strings -->
    <string name="description_album_cover">Album Cover for %s</string>
    <string name="description_artist_image">Artist Image for %s</string>
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@ -5,14 +5,24 @@
        <item name="android:windowBackground">@color/background</item>
        <item name="android:statusBarColor">@android:color/black</item>
        <item name="android:fontFamily">@font/inter</item>
+        <item name="android:textCursorDrawable">@drawable/cursor</item>
        <item name="actionBarPopupTheme">@style/AppThemeOverlay.Popup</item>
    </style>

-    <style name="TextAppearance.Toolbar.Bold" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
+    <style name="Toolbar.Style" parent="ThemeOverlay.MaterialComponents.ActionBar">
+        <item name="android:searchViewStyle">@style/Toolbar.SearchViewStyle</item>
+    </style>
+
+    <style name="TextAppearance.Toolbar.Header" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
        <item name="android:fontFamily">@font/inter_black</item>
        <item name="android:textColor">?android:attr/colorPrimary</item>
    </style>

+    <style name="Toolbar.SearchViewStyle" parent="Widget.AppCompat.SearchView">
+        <item name="android:searchIcon">@drawable/ic_search</item>
+        <item name="android:closeIcon">@drawable/ic_back</item>
+    </style>
+
    <style name="DetailHeader">
        <item name="android:textAppearance">?android:attr/textAppearanceLarge</item>
        <item name="android:textColor">?android:attr/colorPrimary</item>