Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix sorting modes

Browse source 
Change the NUMERIC_DOWN sorting mode to actually sort by decending order, not ascending order.
This commit is contained in:
OxygenCobalt 2020-09-24 06:59:53 -06:00
parent 414e85153f
commit ac3b3e7903
19 changed files with 77 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
View file

@ -9,11 +9,11 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels import androidx.fragment.app.activityViewModels
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs import androidx.navigation.fragment.navArgs
import org.oxycblt.auxio.reycler.ClickListener
import org.oxycblt.auxio.R import org.oxycblt.auxio.R
import org.oxycblt.auxio.databinding.FragmentAlbumDetailBinding import org.oxycblt.auxio.databinding.FragmentAlbumDetailBinding
import org.oxycblt.auxio.detail.adapters.DetailSongAdapter import org.oxycblt.auxio.detail.adapters.DetailSongAdapter
import org.oxycblt.auxio.music.MusicViewModel import org.oxycblt.auxio.music.MusicViewModel
import org.oxycblt.auxio.recycler.ClickListener
import org.oxycblt.auxio.theme.applyDivider import org.oxycblt.auxio.theme.applyDivider
class AlbumDetailFragment : Fragment() { class AlbumDetailFragment : Fragment() {

5
app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt
View file

@ -9,14 +9,13 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels import androidx.fragment.app.activityViewModels
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import androidx.navigation.fragment.navArgs import androidx.navigation.fragment.navArgs
import org.oxycblt.auxio.reycler.ClickListener
import org.oxycblt.auxio.databinding.FragmentArtistDetailBinding import org.oxycblt.auxio.databinding.FragmentArtistDetailBinding
import org.oxycblt.auxio.detail.adapters.DetailAlbumAdapter import org.oxycblt.auxio.detail.adapters.DetailAlbumAdapter
import org.oxycblt.auxio.music.MusicViewModel import org.oxycblt.auxio.music.MusicViewModel
import org.oxycblt.auxio.music.models.Album import org.oxycblt.auxio.music.models.Album
import org.oxycblt.auxio.reycler.SortMode import org.oxycblt.auxio.recycler.ClickListener
import org.oxycblt.auxio.recycler.SortMode
import org.oxycblt.auxio.theme.applyDivider import org.oxycblt.auxio.theme.applyDivider
import java.util.Comparator
class ArtistDetailFragment : Fragment() { class ArtistDetailFragment : Fragment() {

3
app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt
View file

@ -1,12 +1,11 @@
package org.oxycblt.auxio.detail package org.oxycblt.auxio.detail
import android.util.Log
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import org.oxycblt.auxio.music.models.Album import org.oxycblt.auxio.music.models.Album
import org.oxycblt.auxio.music.models.Artist import org.oxycblt.auxio.music.models.Artist
import org.oxycblt.auxio.reycler.SortMode import org.oxycblt.auxio.recycler.SortMode
class DetailViewModel : ViewModel() { class DetailViewModel : ViewModel() {
var isAlreadyNavigating = false var isAlreadyNavigating = false

4
app/src/main/java/org/oxycblt/auxio/detail/adapters/DetailAlbumAdapter.kt
View file

@ -4,10 +4,10 @@ import android.view.LayoutInflater
import android.view.ViewGroup import android.view.ViewGroup
import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import org.oxycblt.auxio.reycler.ClickListener
import org.oxycblt.auxio.databinding.ItemAlbumBinding import org.oxycblt.auxio.databinding.ItemAlbumBinding
import org.oxycblt.auxio.music.models.Album import org.oxycblt.auxio.music.models.Album
import org.oxycblt.auxio.reycler.DiffCallback import org.oxycblt.auxio.recycler.ClickListener
import org.oxycblt.auxio.recycler.DiffCallback
class DetailAlbumAdapter( class DetailAlbumAdapter(
private val listener: ClickListener<Album> private val listener: ClickListener<Album>

2
app/src/main/java/org/oxycblt/auxio/detail/adapters/DetailSongAdapter.kt
View file

@ -3,9 +3,9 @@ package org.oxycblt.auxio.detail.adapters
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.ViewGroup import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import org.oxycblt.auxio.reycler.ClickListener
import org.oxycblt.auxio.databinding.ItemAlbumSongBinding import org.oxycblt.auxio.databinding.ItemAlbumSongBinding
import org.oxycblt.auxio.music.models.Song import org.oxycblt.auxio.music.models.Song
import org.oxycblt.auxio.recycler.ClickListener
class DetailSongAdapter( class DetailSongAdapter(
private val data: List<Song>, private val data: List<Song>,

2
app/src/main/java/org/oxycblt/auxio/library/LibraryFragment.kt
View file

@ -8,12 +8,12 @@ import android.view.ViewGroup
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels import androidx.fragment.app.activityViewModels
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import org.oxycblt.auxio.reycler.ClickListener
import org.oxycblt.auxio.MainFragmentDirections import org.oxycblt.auxio.MainFragmentDirections
import org.oxycblt.auxio.databinding.FragmentLibraryBinding import org.oxycblt.auxio.databinding.FragmentLibraryBinding
import org.oxycblt.auxio.library.adapters.ArtistAdapter import org.oxycblt.auxio.library.adapters.ArtistAdapter
import org.oxycblt.auxio.music.MusicViewModel import org.oxycblt.auxio.music.MusicViewModel
import org.oxycblt.auxio.music.models.Artist import org.oxycblt.auxio.music.models.Artist
import org.oxycblt.auxio.recycler.ClickListener
import org.oxycblt.auxio.theme.applyDivider import org.oxycblt.auxio.theme.applyDivider
class LibraryFragment : Fragment() { class LibraryFragment : Fragment() {

2
app/src/main/java/org/oxycblt/auxio/library/adapters/AlbumAdapter.kt
View file

@ -3,9 +3,9 @@ package org.oxycblt.auxio.library.adapters
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.ViewGroup import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import org.oxycblt.auxio.reycler.ClickListener
import org.oxycblt.auxio.databinding.ItemAlbumBinding import org.oxycblt.auxio.databinding.ItemAlbumBinding
import org.oxycblt.auxio.music.models.Album import org.oxycblt.auxio.music.models.Album
import org.oxycblt.auxio.recycler.ClickListener
class AlbumAdapter( class AlbumAdapter(
private val data: List<Album>, private val data: List<Album>,

2
app/src/main/java/org/oxycblt/auxio/library/adapters/ArtistAdapter.kt
View file

@ -3,9 +3,9 @@ package org.oxycblt.auxio.library.adapters
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.ViewGroup import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import org.oxycblt.auxio.reycler.ClickListener
import org.oxycblt.auxio.databinding.ItemArtistBinding import org.oxycblt.auxio.databinding.ItemArtistBinding
import org.oxycblt.auxio.music.models.Artist import org.oxycblt.auxio.music.models.Artist
import org.oxycblt.auxio.recycler.ClickListener
class ArtistAdapter( class ArtistAdapter(
private val data: List<Artist>, private val data: List<Artist>,

1
app/src/main/java/org/oxycblt/auxio/music/MusicUtils.kt
View file

@ -86,7 +86,6 @@ fun TextView.bindArtistCounts(artist: Artist) {
text = context.getString(R.string.format_double_counts, albums, songs) text = context.getString(R.string.format_double_counts, albums, songs)
} }
// Get the artist genre. // Get the artist genre.
// TODO: Stub, add option to list all genres instead of just the most prominent // TODO: Stub, add option to list all genres instead of just the most prominent
@BindingAdapter("artistGenre") @BindingAdapter("artistGenre")

3
app/src/main/java/org/oxycblt/auxio/music/models/Artist.kt
View file

@ -10,7 +10,8 @@ data class Artist(
var genre = "" var genre = ""
val numAlbums: Int get() = albums.size val numAlbums: Int get() = albums.size
val numSongs: Int get() { val numSongs: Int
get() {
var num = 0 var num = 0
albums.forEach { albums.forEach {
num += it.numSongs num += it.numSongs

7
app/src/main/java/org/oxycblt/auxio/reycler/RecyclerUtils.kt → app/src/main/java/org/oxycblt/auxio/recycler/RecyclerUtils.kt
View file

@ -1,9 +1,8 @@
package org.oxycblt.auxio.reycler package org.oxycblt.auxio.recycler
import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.DiffUtil
import org.oxycblt.auxio.R import org.oxycblt.auxio.R
import org.oxycblt.auxio.music.models.Album import org.oxycblt.auxio.music.models.Album
import org.oxycblt.auxio.music.models.Artist
// RecyclerView click listener // RecyclerView click listener
class ClickListener<T>(val onClick: (T) -> Unit) class ClickListener<T>(val onClick: (T) -> Unit)
@ -32,8 +31,8 @@ enum class SortMode(val iconRes: Int) {
// Sort comparators are different for each music model, so they are // Sort comparators are different for each music model, so they are
// static maps instead. // static maps instead.
val albumSortComparators = mapOf<SortMode, Comparator<Album>>( val albumSortComparators = mapOf<SortMode, Comparator<Album>>(
NUMERIC_DOWN to compareBy { it.year }, NUMERIC_DOWN to compareByDescending { it.year },
NUMERIC_UP to compareByDescending { it.year }, NUMERIC_UP to compareBy { it.year },
// Alphabetic sorting needs to be case-insensitive // Alphabetic sorting needs to be case-insensitive
ALPHA_DOWN to compareByDescending( ALPHA_DOWN to compareByDescending(

2
app/src/main/java/org/oxycblt/auxio/songs/SongAdapter.kt
View file

@ -3,9 +3,9 @@ package org.oxycblt.auxio.songs
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.ViewGroup import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import org.oxycblt.auxio.reycler.ClickListener
import org.oxycblt.auxio.databinding.ItemSongBinding import org.oxycblt.auxio.databinding.ItemSongBinding
import org.oxycblt.auxio.music.models.Song import org.oxycblt.auxio.music.models.Song
import org.oxycblt.auxio.recycler.ClickListener
class SongAdapter( class SongAdapter(
private val data: List<Song>, private val data: List<Song>,

2
app/src/main/java/org/oxycblt/auxio/songs/SongsFragment.kt
View file

@ -7,9 +7,9 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.activityViewModels import androidx.fragment.app.activityViewModels
import org.oxycblt.auxio.reycler.ClickListener
import org.oxycblt.auxio.databinding.FragmentSongsBinding import org.oxycblt.auxio.databinding.FragmentSongsBinding
import org.oxycblt.auxio.music.MusicViewModel import org.oxycblt.auxio.music.MusicViewModel
import org.oxycblt.auxio.recycler.ClickListener
import org.oxycblt.auxio.theme.applyDivider import org.oxycblt.auxio.theme.applyDivider
class SongsFragment : Fragment() { class SongsFragment : Fragment() {

6
app/src/main/res/drawable/header_dividers.xml
View file

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?><!--
<!--
Divider used by recyclerview header items Divider used by recyclerview header items
https://stackoverflow.com/a/61157571/14143986 https://stackoverflow.com/a/61157571/14143986
--> -->
@ -17,7 +16,6 @@ https://stackoverflow.com/a/61157571/14143986
<item> <item>
<ripple <ripple
android:color="@color/selection_color" android:color="@color/selection_color"
android:radius="@dimen/divider_ripple_size"> android:radius="@dimen/divider_ripple_size"></ripple>
</ripple>
</item> </item>
</layer-list> </layer-list>

1
app/src/main/res/layout/fragment_artist_detail.xml
View file

@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<data> <data>
<variable <variable
name="artist" name="artist"
type="org.oxycblt.auxio.music.models.Artist" /> type="org.oxycblt.auxio.music.models.Artist" />