antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2026-04-15 16:27:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: updated order of buttons

Browse source
This commit is contained in:
eddyizm 2025-11-30 09:10:02 -08:00
parent 540aa9ba73
commit 3d70b51244
No known key found for this signature in database
GPG key ID: CF5F671829E8158A
2 changed files with 14 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerQueueFragment.java
View file

@ -23,7 +23,6 @@ import androidx.recyclerview.widget.RecyclerView;
import com.cappielloantonio.tempo.databinding.InnerFragmentPlayerQueueBinding; import com.cappielloantonio.tempo.databinding.InnerFragmentPlayerQueueBinding;
import com.cappielloantonio.tempo.interfaces.ClickCallback; import com.cappielloantonio.tempo.interfaces.ClickCallback;
import com.cappielloantonio.tempo.model.Download;
import com.cappielloantonio.tempo.service.DownloaderManager; import com.cappielloantonio.tempo.service.DownloaderManager;
import com.cappielloantonio.tempo.service.MediaManager; import com.cappielloantonio.tempo.service.MediaManager;
import com.cappielloantonio.tempo.service.MediaService; import com.cappielloantonio.tempo.service.MediaService;
@ -107,8 +106,6 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
initializeBrowser(); initializeBrowser();
bindMediaController();
MediaManager.registerPlaybackObserver(mediaBrowserListenableFuture, playbackViewModel); MediaManager.registerPlaybackObserver(mediaBrowserListenableFuture, playbackViewModel);
observePlayback(); observePlayback();
} }
@ -150,16 +147,6 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
MediaBrowser.releaseFuture(mediaBrowserListenableFuture); MediaBrowser.releaseFuture(mediaBrowserListenableFuture);
} }
private void bindMediaController() {
mediaBrowserListenableFuture.addListener(() -> {
try {
MediaBrowser mediaBrowser = mediaBrowserListenableFuture.get();
} catch (Exception exception) {
exception.printStackTrace();
}
}, MoreExecutors.directExecutor());
}
private void setMediaBrowserListenableFuture() { private void setMediaBrowserListenableFuture() {
playerSongQueueAdapter.setMediaBrowserListenableFuture(mediaBrowserListenableFuture); playerSongQueueAdapter.setMediaBrowserListenableFuture(mediaBrowserListenableFuture);
} }
@ -261,17 +248,16 @@ public class PlayerQueueFragment extends Fragment implements ClickCallback {
closeFab(fabLoadQueue, 4); closeFab(fabLoadQueue, 4);
} }
closeFab(fabSaveToPlaylist, 3); closeFab(fabSaveToPlaylist, 3);
closeFab(fabDownloadAll, 2); closeFab(fabClearQueue, 2);
closeFab(fabDownloadAll, 1);
closeFab(fabClearQueue, 1);
closeFab(fabShuffleQueue, 0); closeFab(fabShuffleQueue, 0);
fabMenuToggle.animate().rotation(0f).setDuration(ANIMATION_DURATION).start(); fabMenuToggle.animate().rotation(0f).setDuration(ANIMATION_DURATION).start();
} else { } else {
// OPEN MENU (lowest index at bottom) // OPEN MENU (lowest index at bottom)
openFab(fabShuffleQueue, 0); openFab(fabShuffleQueue, 0);
openFab(fabClearQueue, 1); openFab(fabDownloadAll, 1);
openFab(fabDownloadAll, 2); openFab(fabClearQueue, 2);
openFab(fabSaveToPlaylist, 3); openFab(fabSaveToPlaylist, 3);
if (Preferences.isSyncronizationEnabled()) { if (Preferences.isSyncronizationEnabled()) {
openFab(fabLoadQueue, 4); openFab(fabLoadQueue, 4);

19
app/src/main/res/layout/inner_fragment_player_queue.xml
View file

@ -38,6 +38,15 @@
android:text="@string/player_queue_save_to_playlist" android:text="@string/player_queue_save_to_playlist"
app:icon="@android:drawable/ic_menu_edit" /> app:icon="@android:drawable/ic_menu_edit" />
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/fab_clear_queue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:visibility="gone"
android:text="@string/player_queue_clean_all_button"
app:icon="@android:drawable/ic_menu_delete" />
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/fab_download_all" android:id="@+id/fab_download_all"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -47,7 +56,6 @@
android:text="@string/menu_download_all_button" android:text="@string/menu_download_all_button"
app:icon="@android:drawable/stat_sys_download_done" /> app:icon="@android:drawable/stat_sys_download_done" />
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/fab_load_queue" android:id="@+id/fab_load_queue"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -57,15 +65,6 @@
android:text="@string/player_queue_load_queue" android:text="@string/player_queue_load_queue"
app:icon="@android:drawable/ic_menu_revert" /> app:icon="@android:drawable/ic_menu_revert" />
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/fab_clear_queue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:visibility="gone"
android:text="@string/player_queue_clean_all_button"
app:icon="@android:drawable/ic_menu_delete" />
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/fab_shuffle_queue" android:id="@+id/fab_shuffle_queue"
android:layout_width="wrap_content" android:layout_width="wrap_content"