From a3d01e1425690dff75680e56696a92768d02f4cc Mon Sep 17 00:00:00 2001 From: CappielloAntonio Date: Mon, 9 Aug 2021 10:48:52 +0200 Subject: [PATCH] Implemented a corner radius for almost all images managed by Glide --- .../cappielloantonio/play/adapter/AlbumAdapter.java | 3 +++ .../adapter/AlbumArtistPageOrSimilarAdapter.java | 2 ++ .../play/adapter/AlbumCatalogueAdapter.java | 3 ++- .../play/adapter/AlbumHorizontalAdapter.java | 2 ++ .../cappielloantonio/play/adapter/ArtistAdapter.java | 2 ++ .../play/adapter/ArtistCatalogueAdapter.java | 2 ++ .../play/adapter/ArtistHorizontalAdapter.java | 2 ++ .../play/adapter/ArtistSimilarAdapter.java | 2 ++ .../play/adapter/DiscoverSongAdapter.java | 1 + .../play/adapter/PlayerNowPlayingSongAdapter.java | 2 ++ .../play/adapter/PlayerSongQueueAdapter.java | 2 ++ .../play/adapter/PlaylistAdapter.java | 2 ++ .../play/adapter/PlaylistCatalogueAdapter.java | 2 ++ .../play/adapter/RecentMusicAdapter.java | 2 ++ .../play/adapter/SongHorizontalAdapter.java | 2 ++ .../play/glide/CustomGlideRequest.java | 12 ++++-------- .../play/ui/fragment/AlbumPageFragment.java | 2 ++ .../play/ui/fragment/PlayerBottomSheetFragment.java | 2 ++ .../bottomsheetdialog/AlbumBottomSheetDialog.java | 2 ++ .../bottomsheetdialog/ArtistBottomSheetDialog.java | 2 ++ .../bottomsheetdialog/SongBottomSheetDialog.java | 2 ++ 21 files changed, 44 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java index 38ee530a..e1dcd15f 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java @@ -4,6 +4,7 @@ import android.content.Context; import android.os.Bundle; import android.text.Html; import android.view.LayoutInflater; +import android.view.RoundedCorner; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; @@ -12,6 +13,7 @@ import android.widget.TextView; import androidx.navigation.Navigation; import androidx.recyclerview.widget.RecyclerView; +import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.cappielloantonio.play.R; import com.cappielloantonio.play.glide.CustomGlideRequest; import com.cappielloantonio.play.model.Album; @@ -50,6 +52,7 @@ public class AlbumAdapter extends RecyclerView.Adapter CustomGlideRequest.Builder .from(context, album.getPrimary(), CustomGlideRequest.ALBUM_PIC) .build() + .transform(new RoundedCorners(CustomGlideRequest.CORNER_RADIUS)) .into(holder.cover); } diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java index 540e1715..f2cdfa59 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java @@ -12,6 +12,7 @@ import android.widget.TextView; import androidx.navigation.Navigation; import androidx.recyclerview.widget.RecyclerView; +import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.cappielloantonio.play.R; import com.cappielloantonio.play.glide.CustomGlideRequest; import com.cappielloantonio.play.model.Album; @@ -49,6 +50,7 @@ public class AlbumArtistPageOrSimilarAdapter extends RecyclerView.Adapter params = App.getSubsonicClientInstance(App.getInstance(), false).getParams(); - String sb = url + "getCoverArt" + + return url + "getCoverArt" + "?u=" + params.get("u") + "&s=" + params.get("s") + "&t=" + params.get("t") + "&v=" + params.get("v") + "&c=" + params.get("c") + "&id=" + item; - - return sb; } public static class Builder { private final RequestManager requestManager; private final Object item; - private final Context context; 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; Drawable drawable = ResourcesCompat.getDrawable(context.getResources(), MusicUtil.getDefaultPicPerCategory(category), null); requestManager.applyDefaultRequestOptions(createRequestOptions(item, drawable)); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java index d0ccdbca..c4ed4539 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumPageFragment.java @@ -19,6 +19,7 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; +import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.cappielloantonio.play.App; import com.cappielloantonio.play.R; import com.cappielloantonio.play.adapter.AlbumArtistPageOrSimilarAdapter; @@ -171,6 +172,7 @@ public class AlbumPageFragment extends Fragment { CustomGlideRequest.Builder .from(requireContext(), albumPageViewModel.getAlbum().getPrimary(), CustomGlideRequest.ALBUM_PIC) .build() + .transform(new RoundedCorners(CustomGlideRequest.CORNER_RADIUS)) .into(bind.albumCoverImageView); } diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java index 0879c72c..f112cf5b 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java @@ -18,6 +18,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager2.widget.ViewPager2; +import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.cappielloantonio.play.R; import com.cappielloantonio.play.adapter.PlayerNowPlayingSongAdapter; import com.cappielloantonio.play.adapter.PlayerSongQueueAdapter; @@ -274,6 +275,7 @@ public class PlayerBottomSheetFragment extends Fragment implements MusicServiceE CustomGlideRequest.Builder .from(requireContext(), song.getPrimary(), CustomGlideRequest.SONG_PIC) .build() + .transform(new RoundedCorners(CustomGlideRequest.CORNER_RADIUS)) .into(bind.playerHeaderLayout.playerHeaderSongCoverImage); bind.playerBodyLayout.buttonFavorite.setChecked(song.isFavorite()); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java index 8c8ec75f..c4576142 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java @@ -15,6 +15,7 @@ import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; import androidx.navigation.fragment.NavHostFragment; +import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.cappielloantonio.play.App; import com.cappielloantonio.play.R; import com.cappielloantonio.play.glide.CustomGlideRequest; @@ -76,6 +77,7 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements CustomGlideRequest.Builder .from(requireContext(), albumBottomSheetViewModel.getAlbum().getPrimary(), CustomGlideRequest.ALBUM_PIC) .build() + .transform(new RoundedCorners(CustomGlideRequest.CORNER_RADIUS)) .into(coverAlbum); titleAlbum = view.findViewById(R.id.album_title_text_view); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java index e7e0c655..68c37fe0 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java @@ -14,6 +14,7 @@ import android.widget.ToggleButton; import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; +import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.cappielloantonio.play.App; import com.cappielloantonio.play.R; import com.cappielloantonio.play.glide.CustomGlideRequest; @@ -68,6 +69,7 @@ public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implement CustomGlideRequest.Builder .from(requireContext(), artistBottomSheetViewModel.getArtist().getPrimary(), CustomGlideRequest.ARTIST_PIC) .build() + .transform(new RoundedCorners(CustomGlideRequest.CORNER_RADIUS)) .into(coverArtist); nameArtist = view.findViewById(R.id.song_title_text_view); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java index 5096865f..be70ecee 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java @@ -15,6 +15,7 @@ import androidx.annotation.Nullable; import androidx.lifecycle.ViewModelProvider; import androidx.navigation.fragment.NavHostFragment; +import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.cappielloantonio.play.App; import com.cappielloantonio.play.R; import com.cappielloantonio.play.glide.CustomGlideRequest; @@ -72,6 +73,7 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements CustomGlideRequest.Builder .from(requireContext(), songBottomSheetViewModel.getSong().getPrimary(), CustomGlideRequest.SONG_PIC) .build() + .transform(new RoundedCorners(CustomGlideRequest.CORNER_RADIUS)) .into(coverSong); titleSong = view.findViewById(R.id.song_title_text_view);