teier/tempo
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Code decontextualization

Browse Source
This commit is contained in:
antonio
2023-03-10 15:21:02 +01:00
parent f16650a74b
commit a4b31a9c02
108 changed files with 569 additions and 952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/cappielloantonio/play/service/DownloaderManager.java
View File

@@ -19,7 +19,6 @@ import androidx.media3.exoplayer.offline.DownloadManager;
import androidx.media3.exoplayer.offline.DownloadRequest;
import androidx.media3.exoplayer.offline.DownloadService;
import com.cappielloantonio.play.App;
import com.cappielloantonio.play.repository.DownloadRepository;
import com.cappielloantonio.play.util.DownloadUtil;
@@ -110,7 +109,7 @@ public class DownloaderManager {
}
private static DownloadRepository getDownloadRepository() {
return new DownloadRepository(App.getInstance());
return new DownloadRepository();
}
private static void downloadDatabase(com.cappielloantonio.play.model.Download download) {

21
app/src/main/java/com/cappielloantonio/play/service/MediaManager.java
View File

@@ -5,7 +5,6 @@ import android.content.Context;
import androidx.media3.common.MediaItem;
import androidx.media3.session.MediaBrowser;
import com.cappielloantonio.play.App;
import com.cappielloantonio.play.interfaces.MediaIndexCallback;
import com.cappielloantonio.play.model.Chronology;
import com.cappielloantonio.play.repository.ChronologyRepository;
@@ -83,7 +82,7 @@ public class MediaManager {
try {
if (mediaBrowserListenableFuture.isDone()) {
mediaBrowserListenableFuture.get().clearMediaItems();
mediaBrowserListenableFuture.get().setMediaItems(MappingUtil.mapMediaItems(context, media, true));
mediaBrowserListenableFuture.get().setMediaItems(MappingUtil.mapMediaItems(media, true));
mediaBrowserListenableFuture.get().seekTo(getQueueRepository().getLastPlayedMediaIndex(), getQueueRepository().getLastPlayedMediaTimestamp());
mediaBrowserListenableFuture.get().prepare();
}
@@ -170,7 +169,7 @@ public class MediaManager {
try {
if (mediaBrowserListenableFuture.isDone()) {
mediaBrowserListenableFuture.get().clearMediaItems();
mediaBrowserListenableFuture.get().setMediaItems(MappingUtil.mapMediaItems(context, media, true));
mediaBrowserListenableFuture.get().setMediaItems(MappingUtil.mapMediaItems(media, true));
mediaBrowserListenableFuture.get().prepare();
mediaBrowserListenableFuture.get().seekTo(startIndex, 0);
mediaBrowserListenableFuture.get().play();
@@ -189,7 +188,7 @@ public class MediaManager {
try {
if (mediaBrowserListenableFuture.isDone()) {
mediaBrowserListenableFuture.get().clearMediaItems();
mediaBrowserListenableFuture.get().setMediaItem(MappingUtil.mapMediaItem(context, media, true));
mediaBrowserListenableFuture.get().setMediaItem(MappingUtil.mapMediaItem(media, true));
mediaBrowserListenableFuture.get().prepare();
mediaBrowserListenableFuture.get().play();
enqueueDatabase(media, true, 0);
@@ -208,10 +207,10 @@ public class MediaManager {
if (mediaBrowserListenableFuture.isDone()) {
if (playImmediatelyAfter && mediaBrowserListenableFuture.get().getNextMediaItemIndex() != -1) {
enqueueDatabase(media, false, mediaBrowserListenableFuture.get().getNextMediaItemIndex());
mediaBrowserListenableFuture.get().addMediaItems(mediaBrowserListenableFuture.get().getNextMediaItemIndex(), MappingUtil.mapMediaItems(context, media, true));
mediaBrowserListenableFuture.get().addMediaItems(mediaBrowserListenableFuture.get().getNextMediaItemIndex(), MappingUtil.mapMediaItems(media, true));
} else {
enqueueDatabase(media, false, mediaBrowserListenableFuture.get().getMediaItemCount());
mediaBrowserListenableFuture.get().addMediaItems(MappingUtil.mapMediaItems(context, media, true));
mediaBrowserListenableFuture.get().addMediaItems(MappingUtil.mapMediaItems(media, true));
}
}
} catch (ExecutionException | InterruptedException e) {
@@ -228,10 +227,10 @@ public class MediaManager {
if (mediaBrowserListenableFuture.isDone()) {
if (playImmediatelyAfter && mediaBrowserListenableFuture.get().getNextMediaItemIndex() != -1) {
enqueueDatabase(media, false, mediaBrowserListenableFuture.get().getNextMediaItemIndex());
mediaBrowserListenableFuture.get().addMediaItem(mediaBrowserListenableFuture.get().getNextMediaItemIndex(), MappingUtil.mapMediaItem(context, media, true));
mediaBrowserListenableFuture.get().addMediaItem(mediaBrowserListenableFuture.get().getNextMediaItemIndex(), MappingUtil.mapMediaItem(media, true));
} else {
enqueueDatabase(media, false, mediaBrowserListenableFuture.get().getMediaItemCount());
mediaBrowserListenableFuture.get().addMediaItem(MappingUtil.mapMediaItem(context, media, true));
mediaBrowserListenableFuture.get().addMediaItem(MappingUtil.mapMediaItem(media, true));
}
}
} catch (ExecutionException | InterruptedException e) {
@@ -311,15 +310,15 @@ public class MediaManager {
}
private static QueueRepository getQueueRepository() {
return new QueueRepository(App.getInstance());
return new QueueRepository();
}
private static SongRepository getSongRepository() {
return new SongRepository(App.getInstance());
return new SongRepository();
}
private static ChronologyRepository getChronologyRepository() {
return new ChronologyRepository(App.getInstance());
return new ChronologyRepository();
}
private static void enqueueDatabase(List<Child> media, boolean reset, int afterIndex) {