From 1ac6ab3e3cf2d8b6fee5228bf9a34af862da973a Mon Sep 17 00:00:00 2001 From: antonio Date: Thu, 16 Mar 2023 19:47:39 +0100 Subject: [PATCH] Centralization in CustomGlideRequest of the corner rounding setting for images --- .../play/glide/CustomGlideRequest.java | 12 ++- .../play/ui/adapter/AlbumAdapter.java | 2 - .../AlbumArtistPageOrSimilarAdapter.java | 2 - .../ui/adapter/AlbumCatalogueAdapter.java | 2 - .../ui/adapter/AlbumHorizontalAdapter.java | 2 - .../play/ui/adapter/ArtistAdapter.java | 2 - .../ui/adapter/ArtistCatalogueAdapter.java | 2 - .../ui/adapter/ArtistHorizontalAdapter.java | 2 - .../play/ui/adapter/ArtistSimilarAdapter.java | 2 - .../play/ui/adapter/DiscoverSongAdapter.java | 3 +- .../play/ui/adapter/GridTrackAdapter.java | 2 - .../ui/adapter/PlayerSongQueueAdapter.java | 2 - .../PlaylistDialogSongHorizontalAdapter.java | 2 - .../ui/adapter/PlaylistHorizontalAdapter.java | 2 - .../ui/adapter/PodcastEpisodeAdapter.java | 2 - .../play/ui/adapter/SimilarTrackAdapter.java | 2 - .../ui/adapter/SongHorizontalAdapter.java | 2 - .../play/ui/fragment/AlbumPageFragment.java | 2 - .../play/ui/fragment/ArtistPageFragment.java | 1 - .../fragment/PlayerBottomSheetFragment.java | 2 - .../play/ui/fragment/PlayerCoverFragment.java | 1 - .../ui/fragment/PlaylistPageFragment.java | 1 - .../AlbumBottomSheetDialog.java | 2 - .../ArtistBottomSheetDialog.java | 2 - .../PodcastBottomSheetDialog.java | 2 - .../SongBottomSheetDialog.java | 2 - .../cappielloantonio/play/util/Preferences.kt | 12 +++ app/src/main/res/layout/fragment_home.xml | 3 +- .../res/layout/item_home_discover_song.xml | 77 ++++++++----------- app/src/main/res/values/arrays.xml | 11 +++ app/src/main/res/values/strings.xml | 7 +- app/src/main/res/xml/global_preferences.xml | 35 ++++++--- 32 files changed, 99 insertions(+), 106 deletions(-) diff --git a/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java b/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java index 68b099a2..17e06911 100644 --- a/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java +++ b/app/src/main/java/com/cappielloantonio/play/glide/CustomGlideRequest.java @@ -9,6 +9,9 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.RequestBuilder; import com.bumptech.glide.RequestManager; import com.bumptech.glide.load.engine.DiskCacheStrategy; +import com.bumptech.glide.load.resource.bitmap.CenterCrop; +import com.bumptech.glide.load.resource.bitmap.RoundedCorners; +import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions; import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.signature.ObjectKey; import com.cappielloantonio.play.App; @@ -20,7 +23,8 @@ import java.util.Map; public class CustomGlideRequest { private static final String TAG = "CustomGlideRequest"; - public static final int CORNER_RADIUS = 12; + public static final int CORNER_RADIUS = Preferences.isCornerRoundingEnabled() ? Preferences.getRoundedCornerSize() : 1; + //public static final int CORNER_RADIUS = 12; public static final DiskCacheStrategy DEFAULT_DISK_CACHE_STRATEGY = DiskCacheStrategy.ALL; @@ -31,7 +35,7 @@ public class CustomGlideRequest { .error(new ColorDrawable(SurfaceColors.SURFACE_5.getColor(context))) .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) .signature(new ObjectKey(item != null ? item : 0)) - .centerCrop(); + .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS)); } public static String createUrl(String item, int size) { @@ -83,7 +87,9 @@ public class CustomGlideRequest { } public RequestBuilder build() { - return requestManager.load(item); + return requestManager + .load(item) + .transition(DrawableTransitionOptions.withCrossFade()); } } } diff --git a/app/src/main/java/com/cappielloantonio/play/ui/adapter/AlbumAdapter.java b/app/src/main/java/com/cappielloantonio/play/ui/adapter/AlbumAdapter.java index 88862fec..331c5a89 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/adapter/AlbumAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/adapter/AlbumAdapter.java @@ -47,8 +47,6 @@ public class AlbumAdapter extends RecyclerView.Adapter CustomGlideRequest.Builder .from(holder.itemView.getContext(), album.getCoverArtId()) .build() - .transition(DrawableTransitionOptions.withCrossFade()) - .transform(new CenterCrop(), new RoundedCorners(CustomGlideRequest.CORNER_RADIUS)) .into(holder.item.albumCoverImageView); } diff --git a/app/src/main/java/com/cappielloantonio/play/ui/adapter/AlbumArtistPageOrSimilarAdapter.java b/app/src/main/java/com/cappielloantonio/play/ui/adapter/AlbumArtistPageOrSimilarAdapter.java index 6eb56112..e243f738 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/adapter/AlbumArtistPageOrSimilarAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/adapter/AlbumArtistPageOrSimilarAdapter.java @@ -47,8 +47,6 @@ public class AlbumArtistPageOrSimilarAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/com/cappielloantonio/play/ui/adapter/PlaylistDialogSongHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/ui/adapter/PlaylistDialogSongHorizontalAdapter.java index f3802cc1..7b296d47 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/adapter/PlaylistDialogSongHorizontalAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/adapter/PlaylistDialogSongHorizontalAdapter.java @@ -42,8 +42,6 @@ public class PlaylistDialogSongHorizontalAdapter extends RecyclerView.Adapter + android:paddingTop="8dp" + android:paddingBottom="16dp" /> - + android:paddingHorizontal="16dp"> - - + android:foreground="@drawable/gradient_discover_background_image" /> - + - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index d2a3ae41..1f40abac 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -130,4 +130,15 @@ 5 2 + + + High + Medium + Low + + + 18 + 12 + 6 + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 71391548..8ec17dc9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -159,6 +159,10 @@ Sync play queue for this user Sync timer If enabled, the user will have the ability to save their play queue and will have the ability to load state when opening the application. + Rounded corners + If enabled, sets a curvature angle for all rendered covers. The changes will take effect on restart. + Corners size + Sets the magnitude of the curvature angle. Scan library Returns the state of the play queue for this user. This includes the tracks in the play queue, the currently playing track, and the position within this track. The server must support this feature. Priority given to the transcoding mode. If set to \"Direct play\" the bitrate of the file will not be changed. @@ -169,10 +173,11 @@ General Syncing Transcoding + UI 3.1.0 Version Stream via Wi-Fi only alert - Ask for user confirmation before streaming over mobile network + Ask for user confirmation before streaming over mobile network. Add to playlist Add to queue Download diff --git a/app/src/main/res/xml/global_preferences.xml b/app/src/main/res/xml/global_preferences.xml index ef94e8ef..96f83ac3 100644 --- a/app/src/main/res/xml/global_preferences.xml +++ b/app/src/main/res/xml/global_preferences.xml @@ -1,15 +1,6 @@ - - + + + + + + + +