Funkwhale
/
Audinaut-subsonic-app-android
mirror of https://github.com/nvllsvm/Audinaut
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #73 from simao/sort-artists-offline-ci 

Sort artists using case insensitive comparison when offline
This commit is contained in:
Andrew Rabert 2020-04-13 21:58:00 -04:00 committed by GitHub
parent ecdae8c6e3 cfae0d30b5
commit ec083cd79d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/net/nullsum/audinaut/fragments/SelectArtistFragment.java
View File

@ -169,7 +169,7 @@ public class SelectArtistFragment extends SelectRecyclerFragment<Serializable> i
String musicFolderId = Util.getSelectedMusicFolderId(context); String musicFolderId = Util.getSelectedMusicFolderId(context);
Indexes indexes = musicService.getIndexes(musicFolderId, refresh, context, listener); Indexes indexes = musicService.getIndexes(musicFolderId, refresh, context, listener);
indexes.sortChildren(context); indexes.sortChildren();
items = new ArrayList<>(indexes.getShortcuts().size() + indexes.getArtists().size()); items = new ArrayList<>(indexes.getShortcuts().size() + indexes.getArtists().size());
items.addAll(indexes.getShortcuts()); items.addAll(indexes.getShortcuts());
items.addAll(indexes.getArtists()); items.addAll(indexes.getArtists());
@ -184,8 +184,7 @@ public class SelectArtistFragment extends SelectRecyclerFragment<Serializable> i
} }
Indexes indexes = new Indexes(); Indexes indexes = new Indexes();
//indexes.setArtists = artists; indexes.sortChildren();
indexes.sortChildren(context);
items = new ArrayList<>(indexes.getArtists()); items = new ArrayList<>(indexes.getArtists());
entries = dir.getChildren(false, true); entries = dir.getChildren(false, true);

1
app/src/main/java/net/nullsum/audinaut/service/OfflineMusicService.java
View File

@ -71,6 +71,7 @@ public class OfflineMusicService implements MusicService {
public Indexes getIndexes(String musicFolderId, boolean refresh, Context context, ProgressListener progressListener) { public Indexes getIndexes(String musicFolderId, boolean refresh, Context context, ProgressListener progressListener) {
List<Artist> artists = new ArrayList<>(); List<Artist> artists = new ArrayList<>();
List<Entry> entries = new ArrayList<>(); List<Entry> entries = new ArrayList<>();
File root = FileUtil.getMusicDirectory(context); File root = FileUtil.getMusicDirectory(context);
for (File file : FileUtil.listFiles(root)) { for (File file : FileUtil.listFiles(root)) {
if (file.isDirectory()) { if (file.isDirectory()) {

8
app/src/main/kotlin/net/nullsum/audinaut/domain/Indexes.kt
View File

@ -1,11 +1,15 @@
package net.nullsum.audinaut.domain package net.nullsum.audinaut.domain
import android.content.Context
import java.io.Serializable import java.io.Serializable
import java.util.*
class Indexes(var shortcuts: MutableList<Artist> = mutableListOf(), class Indexes(var shortcuts: MutableList<Artist> = mutableListOf(),
var artists: MutableList<Artist> = mutableListOf(), var artists: MutableList<Artist> = mutableListOf(),
var entries: MutableList<MusicDirectory.Entry> = mutableListOf()) : Serializable { var entries: MutableList<MusicDirectory.Entry> = mutableListOf()) : Serializable {
fun sortChildren(context: Context) {
fun sortChildren() {
shortcuts.sortBy { s -> s.id.toLowerCase(Locale.ROOT) }
artists.sortBy { a -> a.name.toLowerCase(Locale.ROOT) }
entries.sortBy { e -> e.artist.toLowerCase(Locale.ROOT) }
} }
} }