From aee791b0c3c297f61c5187a4d66c02c045db802e Mon Sep 17 00:00:00 2001 From: antonio Date: Wed, 21 Jun 2023 10:51:20 +0200 Subject: [PATCH] style: lambda to explicit --- .../tempo/repository/AlbumRepository.java | 30 ++++++++++++------- .../ui/adapter/PlayerSongQueueAdapter.java | 18 ++++++----- .../ui/fragment/HomeTabRadioFragment.java | 7 ++++- 3 files changed, 36 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/cappielloantonio/tempo/repository/AlbumRepository.java b/app/src/main/java/com/cappielloantonio/tempo/repository/AlbumRepository.java index c93962e5..fe1bc168 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/repository/AlbumRepository.java +++ b/app/src/main/java/com/cappielloantonio/tempo/repository/AlbumRepository.java @@ -230,21 +230,29 @@ public class AlbumRepository { public MutableLiveData> getDecades() { MutableLiveData> decades = new MutableLiveData<>(); - getFirstAlbum(first -> getLastAlbum(last -> { - if (first != -1 && last != -1) { - List decadeList = new ArrayList(); + getFirstAlbum(new DecadesCallback() { + @Override + public void onLoadYear(int first) { + getLastAlbum(new DecadesCallback() { + @Override + public void onLoadYear(int last) { + if (first != -1 && last != -1) { + List decadeList = new ArrayList(); - int startDecade = first - (first % 10); - int lastDecade = last - (last % 10); + int startDecade = first - (first % 10); + int lastDecade = last - (last % 10); - while (startDecade <= lastDecade) { - decadeList.add(startDecade); - startDecade = startDecade + 10; - } + while (startDecade <= lastDecade) { + decadeList.add(startDecade); + startDecade = startDecade + 10; + } - decades.setValue(decadeList); + decades.setValue(decadeList); + } + } + }); } - })); + }); return decades; } diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/PlayerSongQueueAdapter.java b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/PlayerSongQueueAdapter.java index 647d80f8..61dd48ee 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/PlayerSongQueueAdapter.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/PlayerSongQueueAdapter.java @@ -12,6 +12,7 @@ import com.cappielloantonio.tempo.R; import com.cappielloantonio.tempo.databinding.ItemPlayerQueueSongBinding; import com.cappielloantonio.tempo.glide.CustomGlideRequest; import com.cappielloantonio.tempo.interfaces.ClickCallback; +import com.cappielloantonio.tempo.interfaces.MediaIndexCallback; import com.cappielloantonio.tempo.service.MediaManager; import com.cappielloantonio.tempo.subsonic.models.Child; import com.cappielloantonio.tempo.util.Constants; @@ -52,13 +53,16 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter { - if (position < index) { - holder.item.queueSongTitleTextView.setAlpha(0.2f); - holder.item.queueSongSubtitleTextView.setAlpha(0.2f); - } else { - holder.item.queueSongTitleTextView.setAlpha(1.0f); - holder.item.queueSongSubtitleTextView.setAlpha(1.0f); + MediaManager.getCurrentIndex(mediaBrowserListenableFuture, new MediaIndexCallback() { + @Override + public void onRecovery(int index) { + if (position < index) { + holder.item.queueSongTitleTextView.setAlpha(0.2f); + holder.item.queueSongSubtitleTextView.setAlpha(0.2f); + } else { + holder.item.queueSongTitleTextView.setAlpha(1.0f); + holder.item.queueSongSubtitleTextView.setAlpha(1.0f); + } } }); } diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/HomeTabRadioFragment.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/HomeTabRadioFragment.java index ba6063c9..f9174c3e 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/HomeTabRadioFragment.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/HomeTabRadioFragment.java @@ -131,7 +131,12 @@ public class HomeTabRadioFragment extends Fragment implements ClickCallback, Rad @Override public void onInternetRadioStationLongClick(Bundle bundle) { - RadioEditorDialog dialog = new RadioEditorDialog(() -> radioViewModel.getInternetRadioStations(getViewLifecycleOwner())); + RadioEditorDialog dialog = new RadioEditorDialog(new RadioCallback() { + @Override + public void onDismiss() { + radioViewModel.getInternetRadioStations(getViewLifecycleOwner()); + } + }); dialog.setArguments(bundle); dialog.show(activity.getSupportFragmentManager(), null); }