mirror of
https://github.com/antebudimir/tempus.git
synced 2026-04-16 00:37:25 +00:00
Merge branch 'development' into main
This commit is contained in:
sebaFlame
GitHub
commit
442fe1ea01
66 changed files with 1856 additions and 327 deletions
|
|
@ -37,6 +37,8 @@ import com.cappielloantonio.tempo.ui.dialog.ConnectionAlertDialog;
|
|||
import com.cappielloantonio.tempo.ui.dialog.GithubTempoUpdateDialog;
|
||||
import com.cappielloantonio.tempo.ui.dialog.ServerUnreachableDialog;
|
||||
import com.cappielloantonio.tempo.ui.fragment.PlayerBottomSheetFragment;
|
||||
import com.cappielloantonio.tempo.util.AssetLinkNavigator;
|
||||
import com.cappielloantonio.tempo.util.AssetLinkUtil;
|
||||
import com.cappielloantonio.tempo.util.Constants;
|
||||
import com.cappielloantonio.tempo.util.Preferences;
|
||||
import com.cappielloantonio.tempo.viewmodel.MainViewModel;
|
||||
|
|
@ -60,6 +62,8 @@ public class MainActivity extends BaseActivity {
|
|||
private BottomNavigationView bottomNavigationView;
|
||||
public NavController navController;
|
||||
private BottomSheetBehavior bottomSheetBehavior;
|
||||
private AssetLinkNavigator assetLinkNavigator;
|
||||
private AssetLinkUtil.AssetLink pendingAssetLink;
|
||||
|
||||
ConnectivityStatusBroadcastReceiver connectivityStatusBroadcastReceiver;
|
||||
private Intent pendingDownloadPlaybackIntent;
|
||||
|
|
@ -76,6 +80,7 @@ public class MainActivity extends BaseActivity {
|
|||
setContentView(view);
|
||||
|
||||
mainViewModel = new ViewModelProvider(this).get(MainViewModel.class);
|
||||
assetLinkNavigator = new AssetLinkNavigator(this);
|
||||
|
||||
connectivityStatusBroadcastReceiver = new ConnectivityStatusBroadcastReceiver(this);
|
||||
connectivityStatusReceiverManager(true);
|
||||
|
|
@ -311,6 +316,24 @@ public class MainActivity extends BaseActivity {
|
|||
public void goFromLogin() {
|
||||
setBottomSheetInPeek(mainViewModel.isQueueLoaded());
|
||||
goToHome();
|
||||
consumePendingAssetLink();
|
||||
}
|
||||
|
||||
public void openAssetLink(@NonNull AssetLinkUtil.AssetLink assetLink) {
|
||||
openAssetLink(assetLink, true);
|
||||
}
|
||||
|
||||
public void openAssetLink(@NonNull AssetLinkUtil.AssetLink assetLink, boolean collapsePlayer) {
|
||||
if (!isUserAuthenticated()) {
|
||||
pendingAssetLink = assetLink;
|
||||
return;
|
||||
}
|
||||
if (collapsePlayer) {
|
||||
setBottomSheetInPeek(true);
|
||||
}
|
||||
if (assetLinkNavigator != null) {
|
||||
assetLinkNavigator.open(assetLink);
|
||||
}
|
||||
}
|
||||
|
||||
public void quit() {
|
||||
|
|
@ -443,6 +466,7 @@ public class MainActivity extends BaseActivity {
|
|||
|| intent.hasExtra(Constants.EXTRA_DOWNLOAD_URI)) {
|
||||
pendingDownloadPlaybackIntent = new Intent(intent);
|
||||
}
|
||||
handleAssetLinkIntent(intent);
|
||||
}
|
||||
|
||||
private void consumePendingPlaybackIntent() {
|
||||
|
|
@ -452,6 +476,35 @@ public class MainActivity extends BaseActivity {
|
|||
playDownloadedMedia(intent);
|
||||
}
|
||||
|
||||
private void handleAssetLinkIntent(Intent intent) {
|
||||
AssetLinkUtil.AssetLink assetLink = AssetLinkUtil.parse(intent);
|
||||
if (assetLink == null) {
|
||||
return;
|
||||
}
|
||||
if (!isUserAuthenticated()) {
|
||||
pendingAssetLink = assetLink;
|
||||
intent.setData(null);
|
||||
return;
|
||||
}
|
||||
if (assetLinkNavigator != null) {
|
||||
assetLinkNavigator.open(assetLink);
|
||||
}
|
||||
intent.setData(null);
|
||||
}
|
||||
|
||||
private boolean isUserAuthenticated() {
|
||||
return Preferences.getPassword() != null
|
||||
|| (Preferences.getToken() != null && Preferences.getSalt() != null);
|
||||
}
|
||||
|
||||
private void consumePendingAssetLink() {
|
||||
if (pendingAssetLink == null || assetLinkNavigator == null) {
|
||||
return;
|
||||
}
|
||||
assetLinkNavigator.open(pendingAssetLink);
|
||||
pendingAssetLink = null;
|
||||
}
|
||||
|
||||
private void playDownloadedMedia(Intent intent) {
|
||||
String uriString = intent.getStringExtra(Constants.EXTRA_DOWNLOAD_URI);
|
||||
if (TextUtils.isEmpty(uriString)) {
|
||||
|
|
@ -500,4 +553,4 @@ public class MainActivity extends BaseActivity {
|
|||
|
||||
MediaManager.playDownloadedMediaItem(getMediaBrowserListenableFuture(), mediaItem);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ import com.cappielloantonio.tempo.util.MusicUtil;
|
|||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAdapter.ViewHolder> implements Filterable {
|
||||
|
|
@ -152,12 +153,20 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
|
|||
}
|
||||
|
||||
public void sort(String order) {
|
||||
if (albums == null) return;
|
||||
|
||||
switch (order) {
|
||||
case Constants.ALBUM_ORDER_BY_NAME:
|
||||
albums.sort(Comparator.comparing(AlbumID3::getName));
|
||||
albums.sort(Comparator.comparing(
|
||||
album -> album.getName() != null ? album.getName() : "",
|
||||
String.CASE_INSENSITIVE_ORDER
|
||||
));
|
||||
break;
|
||||
case Constants.ALBUM_ORDER_BY_ARTIST:
|
||||
albums.sort(Comparator.comparing(AlbumID3::getArtist, Comparator.nullsLast(Comparator.naturalOrder())));
|
||||
albums.sort(Comparator.comparing(
|
||||
album -> album.getArtist() != null ? album.getArtist() : "",
|
||||
String.CASE_INSENSITIVE_ORDER
|
||||
));
|
||||
break;
|
||||
case Constants.ALBUM_ORDER_BY_YEAR:
|
||||
albums.sort(Comparator.comparing(AlbumID3::getYear));
|
||||
|
|
@ -166,15 +175,23 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
|
|||
Collections.shuffle(albums);
|
||||
break;
|
||||
case Constants.ALBUM_ORDER_BY_RECENTLY_ADDED:
|
||||
albums.sort(Comparator.comparing(AlbumID3::getCreated));
|
||||
albums.sort(Comparator.comparing(
|
||||
album -> album.getCreated() != null ? album.getCreated() : new Date(0),
|
||||
Comparator.nullsLast(Date::compareTo)
|
||||
));
|
||||
Collections.reverse(albums);
|
||||
break;
|
||||
case Constants.ALBUM_ORDER_BY_RECENTLY_PLAYED:
|
||||
albums.sort(Comparator.comparing(AlbumID3::getPlayed));
|
||||
albums.sort(Comparator.comparing(
|
||||
album -> album.getPlayed() != null ? album.getPlayed() : new Date(0),
|
||||
Comparator.nullsLast(Date::compareTo)
|
||||
));
|
||||
Collections.reverse(albums);
|
||||
break;
|
||||
case Constants.ALBUM_ORDER_BY_MOST_PLAYED:
|
||||
albums.sort(Comparator.comparing(AlbumID3::getPlayCount));
|
||||
albums.sort(Comparator.comparing(
|
||||
album -> album.getPlayCount() != null ? album.getPlayCount() : 0L
|
||||
));
|
||||
Collections.reverse(albums);
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package com.cappielloantonio.tempo.ui.dialog;
|
|||
|
||||
import android.app.Dialog;
|
||||
import android.os.Bundle;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.fragment.app.DialogFragment;
|
||||
|
|
@ -10,6 +11,7 @@ import androidx.media3.common.MediaMetadata;
|
|||
import com.cappielloantonio.tempo.R;
|
||||
import com.cappielloantonio.tempo.databinding.DialogTrackInfoBinding;
|
||||
import com.cappielloantonio.tempo.glide.CustomGlideRequest;
|
||||
import com.cappielloantonio.tempo.util.AssetLinkUtil;
|
||||
import com.cappielloantonio.tempo.util.Constants;
|
||||
import com.cappielloantonio.tempo.util.MusicUtil;
|
||||
import com.cappielloantonio.tempo.util.Preferences;
|
||||
|
|
@ -21,6 +23,11 @@ public class TrackInfoDialog extends DialogFragment {
|
|||
private DialogTrackInfoBinding bind;
|
||||
|
||||
private final MediaMetadata mediaMetadata;
|
||||
private AssetLinkUtil.AssetLink songLink;
|
||||
private AssetLinkUtil.AssetLink albumLink;
|
||||
private AssetLinkUtil.AssetLink artistLink;
|
||||
private AssetLinkUtil.AssetLink genreLink;
|
||||
private AssetLinkUtil.AssetLink yearLink;
|
||||
|
||||
public TrackInfoDialog(MediaMetadata mediaMetadata) {
|
||||
this.mediaMetadata = mediaMetadata;
|
||||
|
|
@ -52,6 +59,8 @@ public class TrackInfoDialog extends DialogFragment {
|
|||
}
|
||||
|
||||
private void setTrackInfo() {
|
||||
genreLink = null;
|
||||
yearLink = null;
|
||||
bind.trakTitleInfoTextView.setText(mediaMetadata.title);
|
||||
bind.trakArtistInfoTextView.setText(
|
||||
mediaMetadata.artist != null
|
||||
|
|
@ -61,17 +70,41 @@ public class TrackInfoDialog extends DialogFragment {
|
|||
: "");
|
||||
|
||||
if (mediaMetadata.extras != null) {
|
||||
songLink = AssetLinkUtil.buildAssetLink(AssetLinkUtil.TYPE_SONG, mediaMetadata.extras.getString("id"));
|
||||
albumLink = AssetLinkUtil.buildAssetLink(AssetLinkUtil.TYPE_ALBUM, mediaMetadata.extras.getString("albumId"));
|
||||
artistLink = AssetLinkUtil.buildAssetLink(AssetLinkUtil.TYPE_ARTIST, mediaMetadata.extras.getString("artistId"));
|
||||
genreLink = AssetLinkUtil.parseLinkString(mediaMetadata.extras.getString("assetLinkGenre"));
|
||||
yearLink = AssetLinkUtil.parseLinkString(mediaMetadata.extras.getString("assetLinkYear"));
|
||||
|
||||
CustomGlideRequest.Builder
|
||||
.from(requireContext(), mediaMetadata.extras.getString("coverArtId", ""), CustomGlideRequest.ResourceType.Song)
|
||||
.build()
|
||||
.into(bind.trackCoverInfoImageView);
|
||||
|
||||
bind.titleValueSector.setText(mediaMetadata.extras.getString("title", getString(R.string.label_placeholder)));
|
||||
bind.albumValueSector.setText(mediaMetadata.extras.getString("album", getString(R.string.label_placeholder)));
|
||||
bind.artistValueSector.setText(mediaMetadata.extras.getString("artist", getString(R.string.label_placeholder)));
|
||||
bindAssetLink(bind.trackCoverInfoImageView, albumLink != null ? albumLink : songLink);
|
||||
bindAssetLink(bind.trakTitleInfoTextView, songLink);
|
||||
bindAssetLink(bind.trakArtistInfoTextView, artistLink != null ? artistLink : songLink);
|
||||
|
||||
String titleValue = mediaMetadata.extras.getString("title", getString(R.string.label_placeholder));
|
||||
String albumValue = mediaMetadata.extras.getString("album", getString(R.string.label_placeholder));
|
||||
String artistValue = mediaMetadata.extras.getString("artist", getString(R.string.label_placeholder));
|
||||
String genreValue = mediaMetadata.extras.getString("genre", getString(R.string.label_placeholder));
|
||||
int yearValue = mediaMetadata.extras.getInt("year", 0);
|
||||
|
||||
if (genreLink == null && genreValue != null && !genreValue.isEmpty() && !getString(R.string.label_placeholder).contentEquals(genreValue)) {
|
||||
genreLink = AssetLinkUtil.buildAssetLink(AssetLinkUtil.TYPE_GENRE, genreValue);
|
||||
}
|
||||
|
||||
if (yearLink == null && yearValue != 0) {
|
||||
yearLink = AssetLinkUtil.buildAssetLink(AssetLinkUtil.TYPE_YEAR, String.valueOf(yearValue));
|
||||
}
|
||||
|
||||
bind.titleValueSector.setText(titleValue);
|
||||
bind.albumValueSector.setText(albumValue);
|
||||
bind.artistValueSector.setText(artistValue);
|
||||
bind.trackNumberValueSector.setText(mediaMetadata.extras.getInt("track", 0) != 0 ? String.valueOf(mediaMetadata.extras.getInt("track", 0)) : getString(R.string.label_placeholder));
|
||||
bind.yearValueSector.setText(mediaMetadata.extras.getInt("year", 0) != 0 ? String.valueOf(mediaMetadata.extras.getInt("year", 0)) : getString(R.string.label_placeholder));
|
||||
bind.genreValueSector.setText(mediaMetadata.extras.getString("genre", getString(R.string.label_placeholder)));
|
||||
bind.yearValueSector.setText(yearValue != 0 ? String.valueOf(yearValue) : getString(R.string.label_placeholder));
|
||||
bind.genreValueSector.setText(genreValue);
|
||||
bind.sizeValueSector.setText(mediaMetadata.extras.getLong("size", 0) != 0 ? MusicUtil.getReadableByteCount(mediaMetadata.extras.getLong("size", 0)) : getString(R.string.label_placeholder));
|
||||
bind.contentTypeValueSector.setText(mediaMetadata.extras.getString("contentType", getString(R.string.label_placeholder)));
|
||||
bind.suffixValueSector.setText(mediaMetadata.extras.getString("suffix", getString(R.string.label_placeholder)));
|
||||
|
|
@ -83,6 +116,12 @@ public class TrackInfoDialog extends DialogFragment {
|
|||
bind.bitDepthValueSector.setText(mediaMetadata.extras.getInt("bitDepth", 0) != 0 ? mediaMetadata.extras.getInt("bitDepth", 0) + " bits" : getString(R.string.label_placeholder));
|
||||
bind.pathValueSector.setText(mediaMetadata.extras.getString("path", getString(R.string.label_placeholder)));
|
||||
bind.discNumberValueSector.setText(mediaMetadata.extras.getInt("discNumber", 0) != 0 ? String.valueOf(mediaMetadata.extras.getInt("discNumber", 0)) : getString(R.string.label_placeholder));
|
||||
|
||||
bindAssetLink(bind.titleValueSector, songLink);
|
||||
bindAssetLink(bind.albumValueSector, albumLink);
|
||||
bindAssetLink(bind.artistValueSector, artistLink);
|
||||
bindAssetLink(bind.genreValueSector, genreLink);
|
||||
bindAssetLink(bind.yearValueSector, yearLink);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -135,4 +174,31 @@ public class TrackInfoDialog extends DialogFragment {
|
|||
bind.trakTranscodingInfoTextView.setText(info);
|
||||
}
|
||||
}
|
||||
|
||||
private void bindAssetLink(android.view.View view, AssetLinkUtil.AssetLink assetLink) {
|
||||
if (view == null) return;
|
||||
if (assetLink == null) {
|
||||
AssetLinkUtil.clearLinkAppearance(view);
|
||||
view.setOnClickListener(null);
|
||||
view.setOnLongClickListener(null);
|
||||
view.setClickable(false);
|
||||
view.setLongClickable(false);
|
||||
return;
|
||||
}
|
||||
|
||||
view.setClickable(true);
|
||||
view.setLongClickable(true);
|
||||
AssetLinkUtil.applyLinkAppearance(view);
|
||||
view.setOnClickListener(v -> {
|
||||
dismissAllowingStateLoss();
|
||||
boolean collapse = !AssetLinkUtil.TYPE_SONG.equals(assetLink.type);
|
||||
((com.cappielloantonio.tempo.ui.activity.MainActivity) requireActivity()).openAssetLink(assetLink, collapse);
|
||||
});
|
||||
view.setOnLongClickListener(v -> {
|
||||
AssetLinkUtil.copyToClipboard(requireContext(), assetLink);
|
||||
Toast.makeText(requireContext(), getString(R.string.asset_link_copied_toast, assetLink.id), Toast.LENGTH_SHORT).show();
|
||||
return true;
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,17 +32,19 @@ import com.cappielloantonio.tempo.interfaces.ClickCallback;
|
|||
import com.cappielloantonio.tempo.ui.activity.MainActivity;
|
||||
import com.cappielloantonio.tempo.ui.adapter.AlbumCatalogueAdapter;
|
||||
import com.cappielloantonio.tempo.util.Constants;
|
||||
import com.cappielloantonio.tempo.util.Preferences;
|
||||
import com.cappielloantonio.tempo.viewmodel.AlbumCatalogueViewModel;
|
||||
|
||||
@OptIn(markerClass = UnstableApi.class)
|
||||
public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
|
||||
private static final String TAG = "ArtistCatalogueFragment";
|
||||
private static final String TAG = "AlbumCatalogueFragment";
|
||||
|
||||
private FragmentAlbumCatalogueBinding bind;
|
||||
private MainActivity activity;
|
||||
private AlbumCatalogueViewModel albumCatalogueViewModel;
|
||||
|
||||
private AlbumCatalogueAdapter albumAdapter;
|
||||
private String currentSortOrder;
|
||||
|
||||
@Override
|
||||
public void onCreate(@Nullable Bundle savedInstanceState) {
|
||||
|
|
@ -115,7 +117,10 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
|
|||
albumAdapter = new AlbumCatalogueAdapter(this, true);
|
||||
albumAdapter.setStateRestorationPolicy(RecyclerView.Adapter.StateRestorationPolicy.PREVENT_WHEN_EMPTY);
|
||||
bind.albumCatalogueRecyclerView.setAdapter(albumAdapter);
|
||||
albumCatalogueViewModel.getAlbumList().observe(getViewLifecycleOwner(), albums -> albumAdapter.setItems(albums));
|
||||
albumCatalogueViewModel.getAlbumList().observe(getViewLifecycleOwner(), albums -> {
|
||||
albumAdapter.setItems(albums);
|
||||
applySavedSortOrder();
|
||||
});
|
||||
|
||||
bind.albumCatalogueRecyclerView.setOnTouchListener((v, event) -> {
|
||||
hideKeyboard(v);
|
||||
|
|
@ -137,6 +142,44 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
|
|||
});
|
||||
}
|
||||
|
||||
private void applySavedSortOrder() {
|
||||
String savedSortOrder = Preferences.getAlbumSortOrder();
|
||||
currentSortOrder = savedSortOrder;
|
||||
albumAdapter.sort(savedSortOrder);
|
||||
updateSortIndicator();
|
||||
}
|
||||
|
||||
private void updateSortIndicator() {
|
||||
if (bind == null) return;
|
||||
|
||||
String sortText = getSortDisplayText(currentSortOrder);
|
||||
bind.albumListSortTextView.setText(sortText);
|
||||
bind.albumListSortTextView.setVisibility(View.VISIBLE);
|
||||
}
|
||||
|
||||
private String getSortDisplayText(String sortOrder) {
|
||||
if (sortOrder == null) return "";
|
||||
|
||||
switch (sortOrder) {
|
||||
case Constants.ALBUM_ORDER_BY_NAME:
|
||||
return getString(R.string.menu_sort_name);
|
||||
case Constants.ALBUM_ORDER_BY_ARTIST:
|
||||
return getString(R.string.menu_group_by_artist);
|
||||
case Constants.ALBUM_ORDER_BY_YEAR:
|
||||
return getString(R.string.menu_sort_year);
|
||||
case Constants.ALBUM_ORDER_BY_RANDOM:
|
||||
return getString(R.string.menu_sort_random);
|
||||
case Constants.ALBUM_ORDER_BY_RECENTLY_ADDED:
|
||||
return getString(R.string.menu_sort_recently_added);
|
||||
case Constants.ALBUM_ORDER_BY_RECENTLY_PLAYED:
|
||||
return getString(R.string.menu_sort_recently_played);
|
||||
case Constants.ALBUM_ORDER_BY_MOST_PLAYED:
|
||||
return getString(R.string.menu_sort_most_played);
|
||||
default:
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
|
||||
inflater.inflate(R.menu.toolbar_menu, menu);
|
||||
|
|
@ -172,26 +215,29 @@ public class AlbumCatalogueFragment extends Fragment implements ClickCallback {
|
|||
popup.getMenuInflater().inflate(menuResource, popup.getMenu());
|
||||
|
||||
popup.setOnMenuItemClickListener(menuItem -> {
|
||||
String newSortOrder = null;
|
||||
|
||||
if (menuItem.getItemId() == R.id.menu_album_sort_name) {
|
||||
albumAdapter.sort(Constants.ALBUM_ORDER_BY_NAME);
|
||||
return true;
|
||||
newSortOrder = Constants.ALBUM_ORDER_BY_NAME;
|
||||
} else if (menuItem.getItemId() == R.id.menu_album_sort_artist) {
|
||||
albumAdapter.sort(Constants.ALBUM_ORDER_BY_ARTIST);
|
||||
return true;
|
||||
newSortOrder = Constants.ALBUM_ORDER_BY_ARTIST;
|
||||
} else if (menuItem.getItemId() == R.id.menu_album_sort_year) {
|
||||
albumAdapter.sort(Constants.ALBUM_ORDER_BY_YEAR);
|
||||
return true;
|
||||
newSortOrder = Constants.ALBUM_ORDER_BY_YEAR;
|
||||
} else if (menuItem.getItemId() == R.id.menu_album_sort_random) {
|
||||
albumAdapter.sort(Constants.ALBUM_ORDER_BY_RANDOM);
|
||||
return true;
|
||||
newSortOrder = Constants.ALBUM_ORDER_BY_RANDOM;
|
||||
} else if (menuItem.getItemId() == R.id.menu_album_sort_recently_added) {
|
||||
albumAdapter.sort(Constants.ALBUM_ORDER_BY_RECENTLY_ADDED);
|
||||
return true;
|
||||
newSortOrder = Constants.ALBUM_ORDER_BY_RECENTLY_ADDED;
|
||||
} else if (menuItem.getItemId() == R.id.menu_album_sort_recently_played) {
|
||||
albumAdapter.sort(Constants.ALBUM_ORDER_BY_RECENTLY_PLAYED);
|
||||
return true;
|
||||
newSortOrder = Constants.ALBUM_ORDER_BY_RECENTLY_PLAYED;
|
||||
} else if (menuItem.getItemId() == R.id.menu_album_sort_most_played) {
|
||||
albumAdapter.sort(Constants.ALBUM_ORDER_BY_MOST_PLAYED);
|
||||
newSortOrder = Constants.ALBUM_ORDER_BY_MOST_PLAYED;
|
||||
}
|
||||
|
||||
if (newSortOrder != null) {
|
||||
currentSortOrder = newSortOrder;
|
||||
albumAdapter.sort(newSortOrder);
|
||||
Preferences.setAlbumSortOrder(newSortOrder);
|
||||
updateSortIndicator();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ import com.cappielloantonio.tempo.ui.activity.MainActivity;
|
|||
import com.cappielloantonio.tempo.ui.adapter.SongHorizontalAdapter;
|
||||
import com.cappielloantonio.tempo.ui.dialog.PlaylistChooserDialog;
|
||||
import com.cappielloantonio.tempo.ui.dialog.RatingDialog;
|
||||
import com.cappielloantonio.tempo.util.AssetLinkUtil;
|
||||
import com.cappielloantonio.tempo.util.Constants;
|
||||
import com.cappielloantonio.tempo.util.DownloadUtil;
|
||||
import com.cappielloantonio.tempo.util.MappingUtil;
|
||||
|
|
@ -177,8 +178,35 @@ public class AlbumPageFragment extends Fragment implements ClickCallback {
|
|||
|
||||
bind.albumNameLabel.setText(album.getName());
|
||||
bind.albumArtistLabel.setText(album.getArtist());
|
||||
AssetLinkUtil.applyLinkAppearance(bind.albumArtistLabel);
|
||||
AssetLinkUtil.AssetLink artistLink = buildArtistLink(album);
|
||||
bind.albumArtistLabel.setOnLongClickListener(v -> {
|
||||
if (artistLink != null) {
|
||||
AssetLinkUtil.copyToClipboard(requireContext(), artistLink);
|
||||
Toast.makeText(requireContext(), getString(R.string.asset_link_copied_toast, artistLink.id), Toast.LENGTH_SHORT).show();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
});
|
||||
bind.albumReleaseYearLabel.setText(album.getYear() != 0 ? String.valueOf(album.getYear()) : "");
|
||||
bind.albumReleaseYearLabel.setVisibility(album.getYear() != 0 ? View.VISIBLE : View.GONE);
|
||||
if (album.getYear() != 0) {
|
||||
bind.albumReleaseYearLabel.setVisibility(View.VISIBLE);
|
||||
AssetLinkUtil.applyLinkAppearance(bind.albumReleaseYearLabel);
|
||||
bind.albumReleaseYearLabel.setOnClickListener(v -> openYearLink(album.getYear()));
|
||||
bind.albumReleaseYearLabel.setOnLongClickListener(v -> {
|
||||
AssetLinkUtil.AssetLink yearLink = buildYearLink(album.getYear());
|
||||
if (yearLink != null) {
|
||||
AssetLinkUtil.copyToClipboard(requireContext(), yearLink);
|
||||
Toast.makeText(requireContext(), getString(R.string.asset_link_copied_toast, yearLink.id), Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
return true;
|
||||
});
|
||||
} else {
|
||||
bind.albumReleaseYearLabel.setVisibility(View.GONE);
|
||||
bind.albumReleaseYearLabel.setOnClickListener(null);
|
||||
bind.albumReleaseYearLabel.setOnLongClickListener(null);
|
||||
AssetLinkUtil.clearLinkAppearance(bind.albumReleaseYearLabel);
|
||||
}
|
||||
bind.albumSongCountDurationTextview.setText(getString(R.string.album_page_tracks_count_and_duration, album.getSongCount(), album.getDuration() != null ? album.getDuration() / 60 : 0));
|
||||
if (album.getGenre() != null && !album.getGenre().isEmpty()) {
|
||||
bind.albumGenresTextview.setText(album.getGenre());
|
||||
|
|
@ -351,4 +379,23 @@ public class AlbumPageFragment extends Fragment implements ClickCallback {
|
|||
private void setMediaBrowserListenableFuture() {
|
||||
songHorizontalAdapter.setMediaBrowserListenableFuture(mediaBrowserListenableFuture);
|
||||
}
|
||||
}
|
||||
|
||||
private void openYearLink(int year) {
|
||||
AssetLinkUtil.AssetLink link = buildYearLink(year);
|
||||
if (link != null) {
|
||||
activity.openAssetLink(link);
|
||||
}
|
||||
}
|
||||
|
||||
private AssetLinkUtil.AssetLink buildYearLink(int year) {
|
||||
if (year <= 0) return null;
|
||||
return AssetLinkUtil.buildAssetLink(AssetLinkUtil.TYPE_YEAR, String.valueOf(year));
|
||||
}
|
||||
|
||||
private AssetLinkUtil.AssetLink buildArtistLink(AlbumID3 album) {
|
||||
if (album == null || album.getArtistId() == null || album.getArtistId().isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
return AssetLinkUtil.buildAssetLink(AssetLinkUtil.TYPE_ARTIST, album.getArtistId());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -195,6 +195,7 @@ public class PlayerBottomSheetFragment extends Fragment {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
private void setMediaControllerUI(MediaBrowser mediaBrowser) {
|
||||
if (mediaBrowser.getMediaMetadata().extras != null) {
|
||||
switch (mediaBrowser.getMediaMetadata().extras.getString("type", Constants.MEDIA_TYPE_MUSIC)) {
|
||||
|
|
|
|||
|
|
@ -13,9 +13,10 @@ import android.view.ViewGroup;
|
|||
import android.widget.Button;
|
||||
import android.widget.ImageButton;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.RatingBar;
|
||||
import android.widget.TextView;
|
||||
import android.widget.ToggleButton;
|
||||
import android.widget.RatingBar;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.constraintlayout.widget.ConstraintLayout;
|
||||
|
|
@ -41,12 +42,14 @@ import com.cappielloantonio.tempo.ui.activity.MainActivity;
|
|||
import com.cappielloantonio.tempo.ui.dialog.RatingDialog;
|
||||
import com.cappielloantonio.tempo.ui.dialog.TrackInfoDialog;
|
||||
import com.cappielloantonio.tempo.ui.fragment.pager.PlayerControllerHorizontalPager;
|
||||
import com.cappielloantonio.tempo.util.AssetLinkUtil;
|
||||
import com.cappielloantonio.tempo.util.Constants;
|
||||
import com.cappielloantonio.tempo.util.MusicUtil;
|
||||
import com.cappielloantonio.tempo.util.Preferences;
|
||||
import com.cappielloantonio.tempo.viewmodel.PlayerBottomSheetViewModel;
|
||||
import com.cappielloantonio.tempo.viewmodel.RatingViewModel;
|
||||
import com.google.android.material.chip.Chip;
|
||||
import com.google.android.material.chip.ChipGroup;
|
||||
import com.google.android.material.elevation.SurfaceColors;
|
||||
import com.google.common.util.concurrent.ListenableFuture;
|
||||
import com.google.common.util.concurrent.MoreExecutors;
|
||||
|
|
@ -76,6 +79,10 @@ public class PlayerControllerFragment extends Fragment {
|
|||
private ImageButton playerTrackInfo;
|
||||
private LinearLayout ratingContainer;
|
||||
private ImageButton equalizerButton;
|
||||
private ChipGroup assetLinkChipGroup;
|
||||
private Chip playerSongLinkChip;
|
||||
private Chip playerAlbumLinkChip;
|
||||
private Chip playerArtistLinkChip;
|
||||
|
||||
private MainActivity activity;
|
||||
private PlayerBottomSheetViewModel playerBottomSheetViewModel;
|
||||
|
|
@ -139,6 +146,10 @@ public class PlayerControllerFragment extends Fragment {
|
|||
songRatingBar = bind.getRoot().findViewById(R.id.song_rating_bar);
|
||||
ratingContainer = bind.getRoot().findViewById(R.id.rating_container);
|
||||
equalizerButton = bind.getRoot().findViewById(R.id.player_open_equalizer_button);
|
||||
assetLinkChipGroup = bind.getRoot().findViewById(R.id.asset_link_chip_group);
|
||||
playerSongLinkChip = bind.getRoot().findViewById(R.id.asset_link_song_chip);
|
||||
playerAlbumLinkChip = bind.getRoot().findViewById(R.id.asset_link_album_chip);
|
||||
playerArtistLinkChip = bind.getRoot().findViewById(R.id.asset_link_artist_chip);
|
||||
checkAndSetRatingContainerVisibility();
|
||||
}
|
||||
|
||||
|
|
@ -219,6 +230,8 @@ public class PlayerControllerFragment extends Fragment {
|
|||
|| mediaMetadata.extras != null && Objects.equals(mediaMetadata.extras.getString("type"), Constants.MEDIA_TYPE_RADIO) && mediaMetadata.extras.getString("uri") != null
|
||||
? View.VISIBLE
|
||||
: View.GONE);
|
||||
|
||||
updateAssetLinkChips(mediaMetadata);
|
||||
}
|
||||
|
||||
private void setMediaInfo(MediaMetadata mediaMetadata) {
|
||||
|
|
@ -259,6 +272,110 @@ public class PlayerControllerFragment extends Fragment {
|
|||
});
|
||||
}
|
||||
|
||||
private void updateAssetLinkChips(MediaMetadata mediaMetadata) {
|
||||
if (assetLinkChipGroup == null) return;
|
||||
String mediaType = mediaMetadata.extras != null ? mediaMetadata.extras.getString("type", Constants.MEDIA_TYPE_MUSIC) : Constants.MEDIA_TYPE_MUSIC;
|
||||
if (!Constants.MEDIA_TYPE_MUSIC.equals(mediaType)) {
|
||||
clearAssetLinkChip(playerSongLinkChip);
|
||||
clearAssetLinkChip(playerAlbumLinkChip);
|
||||
clearAssetLinkChip(playerArtistLinkChip);
|
||||
syncAssetLinkGroupVisibility();
|
||||
return;
|
||||
}
|
||||
|
||||
String songId = mediaMetadata.extras != null ? mediaMetadata.extras.getString("id") : null;
|
||||
String albumId = mediaMetadata.extras != null ? mediaMetadata.extras.getString("albumId") : null;
|
||||
String artistId = mediaMetadata.extras != null ? mediaMetadata.extras.getString("artistId") : null;
|
||||
|
||||
AssetLinkUtil.AssetLink songLink = bindAssetLinkChip(playerSongLinkChip, AssetLinkUtil.TYPE_SONG, songId);
|
||||
AssetLinkUtil.AssetLink albumLink = bindAssetLinkChip(playerAlbumLinkChip, AssetLinkUtil.TYPE_ALBUM, albumId);
|
||||
AssetLinkUtil.AssetLink artistLink = bindAssetLinkChip(playerArtistLinkChip, AssetLinkUtil.TYPE_ARTIST, artistId);
|
||||
bindAssetLinkView(playerMediaTitleLabel, songLink);
|
||||
bindAssetLinkView(playerArtistNameLabel, artistLink != null ? artistLink : songLink);
|
||||
bindAssetLinkView(playerMediaCoverViewPager, songLink);
|
||||
syncAssetLinkGroupVisibility();
|
||||
}
|
||||
|
||||
private AssetLinkUtil.AssetLink bindAssetLinkChip(Chip chip, String type, String id) {
|
||||
if (chip == null) return null;
|
||||
if (TextUtils.isEmpty(id)) {
|
||||
clearAssetLinkChip(chip);
|
||||
return null;
|
||||
}
|
||||
|
||||
String label = getString(AssetLinkUtil.getLabelRes(type));
|
||||
AssetLinkUtil.AssetLink assetLink = AssetLinkUtil.buildAssetLink(type, id);
|
||||
if (assetLink == null) {
|
||||
clearAssetLinkChip(chip);
|
||||
return null;
|
||||
}
|
||||
|
||||
chip.setText(getString(R.string.asset_link_chip_text, label, assetLink.id));
|
||||
chip.setVisibility(View.VISIBLE);
|
||||
|
||||
chip.setOnClickListener(v -> {
|
||||
if (assetLink != null) {
|
||||
activity.openAssetLink(assetLink);
|
||||
}
|
||||
});
|
||||
|
||||
chip.setOnLongClickListener(v -> {
|
||||
if (assetLink != null) {
|
||||
AssetLinkUtil.copyToClipboard(requireContext(), assetLink);
|
||||
Toast.makeText(requireContext(), getString(R.string.asset_link_copied_toast, id), Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
return true;
|
||||
});
|
||||
|
||||
return assetLink;
|
||||
}
|
||||
|
||||
private void clearAssetLinkChip(Chip chip) {
|
||||
if (chip == null) return;
|
||||
chip.setVisibility(View.GONE);
|
||||
chip.setText("");
|
||||
chip.setOnClickListener(null);
|
||||
chip.setOnLongClickListener(null);
|
||||
}
|
||||
|
||||
private void bindAssetLinkView(View view, AssetLinkUtil.AssetLink assetLink) {
|
||||
if (view == null) return;
|
||||
if (assetLink == null) {
|
||||
AssetLinkUtil.clearLinkAppearance(view);
|
||||
view.setOnClickListener(null);
|
||||
view.setOnLongClickListener(null);
|
||||
view.setClickable(false);
|
||||
view.setLongClickable(false);
|
||||
return;
|
||||
}
|
||||
|
||||
view.setClickable(true);
|
||||
view.setLongClickable(true);
|
||||
AssetLinkUtil.applyLinkAppearance(view);
|
||||
view.setOnClickListener(v -> {
|
||||
boolean collapse = !AssetLinkUtil.TYPE_SONG.equals(assetLink.type);
|
||||
activity.openAssetLink(assetLink, collapse);
|
||||
});
|
||||
view.setOnLongClickListener(v -> {
|
||||
AssetLinkUtil.copyToClipboard(requireContext(), assetLink);
|
||||
Toast.makeText(requireContext(), getString(R.string.asset_link_copied_toast, assetLink.id), Toast.LENGTH_SHORT).show();
|
||||
return true;
|
||||
});
|
||||
}
|
||||
|
||||
private void syncAssetLinkGroupVisibility() {
|
||||
if (assetLinkChipGroup == null) return;
|
||||
boolean hasVisible = false;
|
||||
for (int i = 0; i < assetLinkChipGroup.getChildCount(); i++) {
|
||||
View child = assetLinkChipGroup.getChildAt(i);
|
||||
if (child.getVisibility() == View.VISIBLE) {
|
||||
hasVisible = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
assetLinkChipGroup.setVisibility(hasVisible ? View.VISIBLE : View.GONE);
|
||||
}
|
||||
|
||||
private void setMediaControllerUI(MediaBrowser mediaBrowser) {
|
||||
initPlaybackSpeedButton(mediaBrowser);
|
||||
|
||||
|
|
@ -548,4 +665,4 @@ public class PlayerControllerFragment extends Fragment {
|
|||
isServiceBound = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ import com.cappielloantonio.tempo.subsonic.models.Child;
|
|||
import com.cappielloantonio.tempo.ui.activity.MainActivity;
|
||||
import com.cappielloantonio.tempo.ui.dialog.PlaylistChooserDialog;
|
||||
import com.cappielloantonio.tempo.ui.dialog.RatingDialog;
|
||||
import com.cappielloantonio.tempo.util.AssetLinkUtil;
|
||||
import com.cappielloantonio.tempo.util.Constants;
|
||||
import com.cappielloantonio.tempo.util.DownloadUtil;
|
||||
import com.cappielloantonio.tempo.util.ExternalAudioReader;
|
||||
|
|
@ -39,6 +40,8 @@ import com.cappielloantonio.tempo.util.Preferences;
|
|||
import com.cappielloantonio.tempo.viewmodel.HomeViewModel;
|
||||
import com.cappielloantonio.tempo.viewmodel.SongBottomSheetViewModel;
|
||||
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
|
||||
import com.google.android.material.chip.Chip;
|
||||
import com.google.android.material.chip.ChipGroup;
|
||||
import com.google.common.util.concurrent.ListenableFuture;
|
||||
|
||||
import android.content.Intent;
|
||||
|
|
@ -56,6 +59,13 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
|
|||
|
||||
private TextView downloadButton;
|
||||
private TextView removeButton;
|
||||
private ChipGroup assetLinkChipGroup;
|
||||
private Chip songLinkChip;
|
||||
private Chip albumLinkChip;
|
||||
private Chip artistLinkChip;
|
||||
private AssetLinkUtil.AssetLink currentSongLink;
|
||||
private AssetLinkUtil.AssetLink currentAlbumLink;
|
||||
private AssetLinkUtil.AssetLink currentArtistLink;
|
||||
|
||||
private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
|
||||
|
||||
|
|
@ -109,6 +119,11 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
|
|||
TextView artistSong = view.findViewById(R.id.song_artist_text_view);
|
||||
artistSong.setText(songBottomSheetViewModel.getSong().getArtist());
|
||||
|
||||
initAssetLinkChips(view);
|
||||
bindAssetLinkView(coverSong, currentSongLink);
|
||||
bindAssetLinkView(titleSong, currentSongLink);
|
||||
bindAssetLinkView(artistSong, currentArtistLink != null ? currentArtistLink : currentSongLink);
|
||||
|
||||
ToggleButton favoriteToggle = view.findViewById(R.id.button_favorite);
|
||||
favoriteToggle.setChecked(songBottomSheetViewModel.getSong().getStarred() != null);
|
||||
favoriteToggle.setOnClickListener(v -> {
|
||||
|
|
@ -282,6 +297,95 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
|
|||
}
|
||||
}
|
||||
|
||||
private void initAssetLinkChips(View root) {
|
||||
assetLinkChipGroup = root.findViewById(R.id.asset_link_chip_group);
|
||||
songLinkChip = root.findViewById(R.id.asset_link_song_chip);
|
||||
albumLinkChip = root.findViewById(R.id.asset_link_album_chip);
|
||||
artistLinkChip = root.findViewById(R.id.asset_link_artist_chip);
|
||||
|
||||
currentSongLink = bindAssetLinkChip(songLinkChip, AssetLinkUtil.TYPE_SONG, song.getId());
|
||||
currentAlbumLink = bindAssetLinkChip(albumLinkChip, AssetLinkUtil.TYPE_ALBUM, song.getAlbumId());
|
||||
currentArtistLink = bindAssetLinkChip(artistLinkChip, AssetLinkUtil.TYPE_ARTIST, song.getArtistId());
|
||||
syncAssetLinkGroupVisibility();
|
||||
}
|
||||
|
||||
private AssetLinkUtil.AssetLink bindAssetLinkChip(@Nullable Chip chip, String type, @Nullable String id) {
|
||||
if (chip == null) return null;
|
||||
if (id == null || id.isEmpty()) {
|
||||
clearAssetLinkChip(chip);
|
||||
return null;
|
||||
}
|
||||
|
||||
String label = getString(AssetLinkUtil.getLabelRes(type));
|
||||
AssetLinkUtil.AssetLink assetLink = AssetLinkUtil.buildAssetLink(type, id);
|
||||
if (assetLink == null) {
|
||||
clearAssetLinkChip(chip);
|
||||
return null;
|
||||
}
|
||||
|
||||
chip.setText(getString(R.string.asset_link_chip_text, label, assetLink.id));
|
||||
chip.setVisibility(View.VISIBLE);
|
||||
|
||||
chip.setOnClickListener(v -> {
|
||||
if (assetLink != null) {
|
||||
((MainActivity) requireActivity()).openAssetLink(assetLink);
|
||||
}
|
||||
});
|
||||
|
||||
chip.setOnLongClickListener(v -> {
|
||||
if (assetLink != null) {
|
||||
AssetLinkUtil.copyToClipboard(requireContext(), assetLink);
|
||||
Toast.makeText(requireContext(), getString(R.string.asset_link_copied_toast, id), Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
return true;
|
||||
});
|
||||
|
||||
return assetLink;
|
||||
}
|
||||
|
||||
private void clearAssetLinkChip(@Nullable Chip chip) {
|
||||
if (chip == null) return;
|
||||
chip.setVisibility(View.GONE);
|
||||
chip.setText("");
|
||||
chip.setOnClickListener(null);
|
||||
chip.setOnLongClickListener(null);
|
||||
}
|
||||
|
||||
private void syncAssetLinkGroupVisibility() {
|
||||
if (assetLinkChipGroup == null) return;
|
||||
boolean hasVisible = false;
|
||||
for (int i = 0; i < assetLinkChipGroup.getChildCount(); i++) {
|
||||
View child = assetLinkChipGroup.getChildAt(i);
|
||||
if (child.getVisibility() == View.VISIBLE) {
|
||||
hasVisible = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
assetLinkChipGroup.setVisibility(hasVisible ? View.VISIBLE : View.GONE);
|
||||
}
|
||||
|
||||
private void bindAssetLinkView(@Nullable View view, @Nullable AssetLinkUtil.AssetLink assetLink) {
|
||||
if (view == null) return;
|
||||
if (assetLink == null) {
|
||||
AssetLinkUtil.clearLinkAppearance(view);
|
||||
view.setOnClickListener(null);
|
||||
view.setOnLongClickListener(null);
|
||||
view.setClickable(false);
|
||||
view.setLongClickable(false);
|
||||
return;
|
||||
}
|
||||
|
||||
view.setClickable(true);
|
||||
view.setLongClickable(true);
|
||||
AssetLinkUtil.applyLinkAppearance(view);
|
||||
view.setOnClickListener(v -> ((MainActivity) requireActivity()).openAssetLink(assetLink, !AssetLinkUtil.TYPE_SONG.equals(assetLink.type)));
|
||||
view.setOnLongClickListener(v -> {
|
||||
AssetLinkUtil.copyToClipboard(requireContext(), assetLink);
|
||||
Toast.makeText(requireContext(), getString(R.string.asset_link_copied_toast, assetLink.id), Toast.LENGTH_SHORT).show();
|
||||
return true;
|
||||
});
|
||||
}
|
||||
|
||||
private void initializeMediaBrowser() {
|
||||
mediaBrowserListenableFuture = new MediaBrowser.Builder(requireContext(), new SessionToken(requireContext(), new ComponentName(requireContext(), MediaService.class))).buildAsync();
|
||||
}
|
||||
|
|
@ -293,4 +397,4 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
|
|||
private void refreshShares() {
|
||||
homeViewModel.refreshShares(requireActivity());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue