Funkwhale/ultrasonic-app-subsonic-android
1
0
Fork 0
mirror of https://github.com/ultrasonic/ultrasonic synced 2025-02-18 04:30:48 +01:00
Code Issues Releases Wiki Activity

Add better offline Support

Browse Source
This commit is contained in:
Maxence G (Hello-Fluffy) 2021-08-20 18:54:34 +02:00 committed by tzugen
parent 6aa3124ee9
commit a23e5ff794
No known key found for this signature in database
GPG Key ID: 61E9C34BC10EC930
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ultrasonic/src/main/java/org/moire/ultrasonic/fragment/MainFragment.java
View File

@ -117,24 +117,32 @@ public class MainFragment extends Fragment {
final MergeAdapter adapter = new MergeAdapter(); final MergeAdapter adapter = new MergeAdapter();
adapter.addViews(Collections.singletonList(serverButton), true); adapter.addViews(Collections.singletonList(serverButton), true);
shouldUseId3 = Util.getShouldUseId3Tags();
if (!ActiveServerProvider.Companion.isOffline()) if (!ActiveServerProvider.Companion.isOffline())
{ {
adapter.addView(musicTitle, false); adapter.addView(musicTitle, false);
adapter.addViews(asList(artistsButton, albumsButton, genresButton), true); adapter.addViews(asList(artistsButton, albumsButton, genresButton), true);
adapter.addView(songsTitle, false); adapter.addView(songsTitle, false);
adapter.addViews(asList(randomSongsButton, songsStarredButton), true); adapter.addViews(asList(randomSongsButton, songsStarredButton), true);
adapter.addView(albumsTitle, false);
if (Util.getShouldUseId3Tags()) adapter.addView(albumsTitle, false);
{ adapter.addViews(asList(albumsNewestButton, albumsRecentButton, albumsFrequentButton), true);
shouldUseId3 = true; if (!shouldUseId3)
adapter.addViews(asList(albumsNewestButton, albumsRecentButton, albumsFrequentButton, albumsRandomButton, albumsStarredButton, albumsAlphaByNameButton, albumsAlphaByArtistButton), true); adapter.addView(albumsHighestButton, true);
} adapter.addViews(asList(albumsRandomButton, albumsStarredButton, albumsAlphaByNameButton, albumsAlphaByArtistButton), true);
else
{ adapter.addView(videosTitle, false);
shouldUseId3 = false; adapter.addViews(Collections.singletonList(videosButton), true);
adapter.addViews(asList(albumsNewestButton, albumsRecentButton, albumsFrequentButton, albumsHighestButton, albumsRandomButton, albumsStarredButton, albumsAlphaByNameButton, albumsAlphaByArtistButton), true); }
} else // Offline supported calls
{
adapter.addView(musicTitle, false);
adapter.addViews(asList(artistsButton, genresButton), true);
adapter.addView(songsTitle, false);
adapter.addView(randomSongsButton, true);
adapter.addView(videosTitle, false); adapter.addView(videosTitle, false);
adapter.addViews(Collections.singletonList(videosButton), true); adapter.addViews(Collections.singletonList(videosButton), true);
@ -261,5 +269,4 @@ public class MainFragment extends Fragment {
{ {
Navigation.findNavController(getView()).navigate(R.id.mainToServerSelector); Navigation.findNavController(getView()).navigate(R.id.mainToServerSelector);
} }
} }

5
ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/OfflineMusicService.kt
View File

@ -18,7 +18,6 @@ import java.util.ArrayList
import java.util.HashSet import java.util.HashSet
import java.util.LinkedList import java.util.LinkedList
import java.util.Locale import java.util.Locale
import java.util.Random
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import java.util.regex.Pattern import java.util.regex.Pattern
import org.koin.core.component.KoinComponent import org.koin.core.component.KoinComponent
@ -257,9 +256,9 @@ class OfflineMusicService : MusicService, KoinComponent {
if (children.isEmpty()) { if (children.isEmpty()) {
return result return result
} }
val random = Random() children.shuffle()
for (i in 0 until size) { for (i in 0 until size) {
val file = children[random.nextInt(children.size)] val file = children[i % children.size]
result.addChild(createEntry(file, getName(file))) result.addChild(createEntry(file, getName(file)))
} }
return result return result