antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2025-12-31 17:43:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed placeholder in every adapter

Browse source
This commit is contained in:
CappielloAntonio 2021-08-05 14:04:34 +02:00
parent 562d437da7
commit f5b767157d
25 changed files with 30 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java
View file

@ -48,7 +48,7 @@ public class AlbumAdapter extends RecyclerView.Adapter<AlbumAdapter.ViewHolder>
holder.textArtistName.setText(MusicUtil.getReadableInfo(album.getArtistName()));
CustomGlideRequest.Builder
.from(context, album.getPrimary(), album.getBlurHash(), CustomGlideRequest.ALBUM_PIC)
.from(context, album.getPrimary(), CustomGlideRequest.ALBUM_PIC)
.build()
.into(holder.cover);
}

2
app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java
View file

@ -47,7 +47,7 @@ public class AlbumArtistPageOrSimilarAdapter extends RecyclerView.Adapter<AlbumA
holder.textArtistName.setText(MusicUtil.getReadableInfo(album.getArtistName()));
CustomGlideRequest.Builder
.from(context, album.getPrimary(), album.getBlurHash(), CustomGlideRequest.ALBUM_PIC)
.from(context, album.getPrimary(), CustomGlideRequest.ALBUM_PIC)
.build()
.into(holder.cover);
}

2
app/src/main/java/com/cappielloantonio/play/adapter/AlbumCatalogueAdapter.java
View file

@ -85,7 +85,7 @@ public class AlbumCatalogueAdapter extends RecyclerView.Adapter<AlbumCatalogueAd
holder.textArtistName.setText(MusicUtil.getReadableInfo(album.getArtistName()));
CustomGlideRequest.Builder
.from(context, album.getPrimary(), album.getBlurHash(), CustomGlideRequest.ALBUM_PIC)
.from(context, album.getPrimary(), CustomGlideRequest.ALBUM_PIC)
.build()
.override(300)
.into(holder.cover);

2
app/src/main/java/com/cappielloantonio/play/adapter/AlbumHorizontalAdapter.java
View file

@ -54,7 +54,7 @@ public class AlbumHorizontalAdapter extends RecyclerView.Adapter<AlbumHorizontal
holder.albumArtist.setText(MusicUtil.getReadableInfo(album.getArtistName()));
CustomGlideRequest.Builder
.from(context, album.getPrimary(), album.getBlurHash(), CustomGlideRequest.ALBUM_PIC)
.from(context, album.getPrimary(), CustomGlideRequest.ALBUM_PIC)
.build()
.into(holder.cover);
}

2
app/src/main/java/com/cappielloantonio/play/adapter/ArtistAdapter.java
View file

@ -47,7 +47,7 @@ public class ArtistAdapter extends RecyclerView.Adapter<ArtistAdapter.ViewHolder
holder.textArtistName.setText(MusicUtil.getReadableInfo(artist.getName()));
CustomGlideRequest.Builder
.from(context, artist.getId(), artist.getPrimaryBlurHash(), CustomGlideRequest.ARTIST_PIC)
.from(context, artist.getId(), CustomGlideRequest.ARTIST_PIC)
.build()
.into(holder.cover);
}

2
app/src/main/java/com/cappielloantonio/play/adapter/ArtistCatalogueAdapter.java
View file

@ -84,7 +84,7 @@ public class ArtistCatalogueAdapter extends RecyclerView.Adapter<ArtistCatalogue
holder.textArtistName.setText(MusicUtil.getReadableInfo(artist.getName()));
CustomGlideRequest.Builder
.from(context, artist.getId(), artist.getPrimaryBlurHash(), CustomGlideRequest.ARTIST_PIC)
.from(context, artist.getId(), CustomGlideRequest.ARTIST_PIC)
.build()
.into(holder.cover);
}

2
app/src/main/java/com/cappielloantonio/play/adapter/ArtistHorizontalAdapter.java
View file

@ -54,7 +54,7 @@ public class ArtistHorizontalAdapter extends RecyclerView.Adapter<ArtistHorizont
holder.artistInfo.setText("Album count: " + String.valueOf(artist.getAlbumCount()));
CustomGlideRequest.Builder
.from(context, artist.getId(), artist.getPrimaryBlurHash(), CustomGlideRequest.ARTIST_PIC)
.from(context, artist.getId(), CustomGlideRequest.ARTIST_PIC)
.build()
.into(holder.cover);
}

2
app/src/main/java/com/cappielloantonio/play/adapter/ArtistSimilarAdapter.java
View file

@ -46,7 +46,7 @@ public class ArtistSimilarAdapter extends RecyclerView.Adapter<ArtistSimilarAdap
holder.textArtistName.setText(MusicUtil.getReadableInfo(artist.getName()));
CustomGlideRequest.Builder
.from(context, artist.getId(), artist.getPrimaryBlurHash(), CustomGlideRequest.ALBUM_PIC)
.from(context, artist.getId(), CustomGlideRequest.ALBUM_PIC)
.build()
.into(holder.cover);
}

2
app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java
View file

@ -54,7 +54,7 @@ public class DiscoverSongAdapter extends RecyclerView.Adapter<DiscoverSongAdapte
holder.textAlbum.setText(MusicUtil.getReadableInfo(song.getAlbumName()));
CustomGlideRequest.Builder
.from(context, song.getPrimary(), song.getBlurHash(), CustomGlideRequest.SONG_PIC)
.from(context, song.getPrimary(), CustomGlideRequest.SONG_PIC)
.build()
.into(holder.cover);
}

2
app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java
View file

@ -42,7 +42,7 @@ public class PlayerNowPlayingSongAdapter extends RecyclerView.Adapter<PlayerNowP
Song song = songs.get(position);
CustomGlideRequest.Builder
.from(context, song.getId(), song.getBlurHash(), CustomGlideRequest.SONG_PIC)
.from(context, song.getId(), CustomGlideRequest.SONG_PIC)
.build()
.into(holder.cover);
}

2
app/src/main/java/com/cappielloantonio/play/adapter/PlayerSongQueueAdapter.java
View file

@ -52,7 +52,7 @@ public class PlayerSongQueueAdapter extends RecyclerView.Adapter<PlayerSongQueue
holder.songArtist.setText(MusicUtil.getReadableInfo(song.getArtistName()));
CustomGlideRequest.Builder
.from(context, song.getPrimary(), song.getBlurHash(), CustomGlideRequest.SONG_PIC)
.from(context, song.getPrimary(), CustomGlideRequest.SONG_PIC)
.build()
.into(holder.cover);

2
app/src/main/java/com/cappielloantonio/play/adapter/PlaylistAdapter.java
View file

@ -50,7 +50,7 @@ public class PlaylistAdapter extends RecyclerView.Adapter<PlaylistAdapter.ViewHo
holder.textPlaylistSongCount.setText("Song count: " + String.valueOf(playlist.getSongCount()));
CustomGlideRequest.Builder
.from(context, playlist.getPrimary(), playlist.getBlurHash(), CustomGlideRequest.PLAYLIST_PIC)
.from(context, playlist.getPrimary(), CustomGlideRequest.PLAYLIST_PIC)
.build()
.into(holder.cover);
}

2
app/src/main/java/com/cappielloantonio/play/adapter/PlaylistCatalogueAdapter.java
View file

@ -82,7 +82,7 @@ public class PlaylistCatalogueAdapter extends RecyclerView.Adapter<PlaylistCatal
holder.textPlaylistName.setText(MusicUtil.getReadableInfo(playlist.getName()));
CustomGlideRequest.Builder
.from(context, playlist.getPrimary(), playlist.getBlurHash(), CustomGlideRequest.PLAYLIST_PIC)
.from(context, playlist.getPrimary(), CustomGlideRequest.PLAYLIST_PIC)
.build()
.into(holder.cover);
}

2
app/src/main/java/com/cappielloantonio/play/adapter/RecentMusicAdapter.java
View file

@ -59,7 +59,7 @@ public class RecentMusicAdapter extends RecyclerView.Adapter<RecentMusicAdapter.
holder.textAlbum.setText(MusicUtil.getReadableInfo(song.getAlbumName()));
CustomGlideRequest.Builder
.from(context, song.getPrimary(), song.getBlurHash(), CustomGlideRequest.SONG_PIC)
.from(context, song.getPrimary(), CustomGlideRequest.SONG_PIC)
.build()
.into(holder.cover);
}

2
app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java
View file

@ -63,7 +63,7 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
}
CustomGlideRequest.Builder
.from(context, song.getPrimary(), song.getBlurHash(), CustomGlideRequest.SONG_PIC)
.from(context, song.getPrimary(), CustomGlideRequest.SONG_PIC)
.build()
.into(holder.cover);
}

19
app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java
View file

@ -23,21 +23,16 @@ import java.util.Map;
public class CustomGlideRequest {
private static final String TAG = "CustomGlideRequest";
public static final String PRIMARY = "PRIMARY";
public static final String BACKDROP = "BACKDROP";
public static final String SONG_PIC = "SONG";
public static final String ALBUM_PIC = "ALBUM";
public static final String ARTIST_PIC = "ARTIST";
public static final String PLAYLIST_PIC = "PLAYLIST";
public static final DiskCacheStrategy DEFAULT_DISK_CACHE_STRATEGY = DiskCacheStrategy.ALL;
public static final int DEFAULT_IMAGE = R.drawable.default_album_art;
public static RequestOptions createRequestOptions(String item, Drawable placeholder) {
RequestOptions options = new RequestOptions()
.placeholder(placeholder)
.error(DEFAULT_IMAGE)
.error(placeholder)
.diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
.signature(new ObjectKey(item != null ? item : 0))
.centerCrop();
@ -65,23 +60,17 @@ public class CustomGlideRequest {
private final Object item;
private final Context context;
private Builder(Context context, String item, String placeholder, String category) {
private Builder(Context context, String item, String category) {
this.requestManager = Glide.with(context);
this.item = item != null ? createUrl(item) : MusicUtil.getDefaultPicPerCategory(category);
this.context = context;
if (placeholder != null) {
Bitmap bitmap = BlurHashDecoder.INSTANCE.decode(placeholder, 40, 40, 1, true);
BitmapDrawable drawable = new BitmapDrawable(context.getResources(), bitmap);
requestManager.applyDefaultRequestOptions(createRequestOptions(item, drawable));
} else {
Drawable drawable = ResourcesCompat.getDrawable(context.getResources(), MusicUtil.getDefaultPicPerCategory(category), null);
requestManager.applyDefaultRequestOptions(createRequestOptions(item, drawable));
}
}
public static Builder from(Context context, String item, String placeholder, String category) {
return new Builder(context, item, placeholder, category);
public static Builder from(Context context, String item, String category) {
return new Builder(context, item, category);
}
public BitmapBuilder bitmap() {

2
app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java
View file

@ -169,7 +169,7 @@ public class AlbumPageFragment extends Fragment {
private void initBackCover() {
CustomGlideRequest.Builder
.from(requireContext(), albumPageViewModel.getAlbum().getPrimary(), albumPageViewModel.getAlbum().getBlurHash(), CustomGlideRequest.ALBUM_PIC)
.from(requireContext(), albumPageViewModel.getAlbum().getPrimary(), CustomGlideRequest.ALBUM_PIC)
.build()
.into(bind.albumCoverImageView);
}

2
app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java
View file

@ -110,7 +110,7 @@ public class ArtistPageFragment extends Fragment {
private void initBackdrop() {
CustomGlideRequest.Builder
.from(requireContext(), artistPageViewModel.getArtist().getId(), artistPageViewModel.getArtist().getPrimary(), CustomGlideRequest.ARTIST_PIC)
.from(requireContext(), artistPageViewModel.getArtist().getId(), CustomGlideRequest.ARTIST_PIC)
.build()
.into(bind.artistBackdropImageView);
}

2
app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
View file

@ -272,7 +272,7 @@ public class PlayerBottomSheetFragment extends Fragment implements MusicServiceE
bind.playerHeaderLayout.playerHeaderSongArtistLabel.setText(MusicUtil.getReadableInfo(song.getArtistName()));
CustomGlideRequest.Builder
.from(requireContext(), song.getPrimary(), song.getBlurHash(), CustomGlideRequest.SONG_PIC)
.from(requireContext(), song.getPrimary(), CustomGlideRequest.SONG_PIC)
.build()
.into(bind.playerHeaderLayout.playerHeaderSongCoverImage);

2
app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistPageFragment.java
View file

@ -143,7 +143,7 @@ public class PlaylistPageFragment extends Fragment {
private void initBackCover() {
CustomGlideRequest.Builder
.from(requireContext(), playlistPageViewModel.getPlaylist().getPrimary(), playlistPageViewModel.getPlaylist().getBlurHash(), CustomGlideRequest.ALBUM_PIC)
.from(requireContext(), playlistPageViewModel.getPlaylist().getPrimary(), CustomGlideRequest.ALBUM_PIC)
.build()
.into(bind.albumBackCoverImageView);
}

2
app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java
View file

@ -74,7 +74,7 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements
coverAlbum = view.findViewById(R.id.album_cover_image_view);
CustomGlideRequest.Builder
.from(requireContext(), albumBottomSheetViewModel.getAlbum().getPrimary(), albumBottomSheetViewModel.getAlbum().getBlurHash(), CustomGlideRequest.ALBUM_PIC)
.from(requireContext(), albumBottomSheetViewModel.getAlbum().getPrimary(), CustomGlideRequest.ALBUM_PIC)
.build()
.into(coverAlbum);

2
app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java
View file

@ -66,7 +66,7 @@ public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implement
coverArtist = view.findViewById(R.id.artist_cover_image_view);
CustomGlideRequest.Builder
.from(requireContext(), artistBottomSheetViewModel.getArtist().getPrimary(), artistBottomSheetViewModel.getArtist().getPrimaryBlurHash(), CustomGlideRequest.ARTIST_PIC)
.from(requireContext(), artistBottomSheetViewModel.getArtist().getPrimary(), CustomGlideRequest.ARTIST_PIC)
.build()
.into(coverArtist);

2
app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java
View file

@ -70,7 +70,7 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements
private void init(View view) {
coverSong = view.findViewById(R.id.song_cover_image_view);
CustomGlideRequest.Builder
.from(requireContext(), songBottomSheetViewModel.getSong().getPrimary(), songBottomSheetViewModel.getSong().getBlurHash(), CustomGlideRequest.SONG_PIC)
.from(requireContext(), songBottomSheetViewModel.getSong().getPrimary(), CustomGlideRequest.SONG_PIC)
.build()
.into(coverSong);

2
app/src/main/java/com/cappielloantonio/play/ui/notification/PlayingNotification.java
View file

@ -66,7 +66,7 @@ public class PlayingNotification {
final int bigNotificationImageSize = service.getResources().getDimensionPixelSize(R.dimen.notification_big_image_size);
service.runOnUiThread(() -> CustomGlideRequest.Builder
.from(service, song.getPrimary(), song.getBlurHash(), CustomGlideRequest.SONG_PIC)
.from(service, song.getPrimary(), CustomGlideRequest.SONG_PIC)
.bitmap()
.build()
.into(new CustomTarget<Bitmap>(bigNotificationImageSize, bigNotificationImageSize) {

3
app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java
View file

@ -73,7 +73,6 @@ public class MusicUtil {
public static MediaItem getMediaItemFromSong(Song song) {
String uri = MusicUtil.getSongFileUri(song);
MediaItem mediaItem = MediaItem.fromUri(uri);
return mediaItem;
return MediaItem.fromUri(uri);
}
}