From 8243173e29ef297a87dace9e6f98b5bacd274d0b Mon Sep 17 00:00:00 2001 From: CappielloAntonio Date: Wed, 11 Aug 2021 13:05:10 +0200 Subject: [PATCH] Custom glide builder now also accepts a custom url --- .../play/adapter/AlbumAdapter.java | 2 +- .../AlbumArtistPageOrSimilarAdapter.java | 2 +- .../play/adapter/AlbumCatalogueAdapter.java | 2 +- .../play/adapter/AlbumHorizontalAdapter.java | 2 +- .../play/adapter/ArtistAdapter.java | 2 +- .../play/adapter/ArtistCatalogueAdapter.java | 2 +- .../play/adapter/ArtistHorizontalAdapter.java | 2 +- .../play/adapter/ArtistSimilarAdapter.java | 2 +- .../play/adapter/DiscoverSongAdapter.java | 2 +- .../adapter/PlayerNowPlayingSongAdapter.java | 2 +- .../play/adapter/PlayerSongQueueAdapter.java | 2 +- .../play/adapter/PlaylistAdapter.java | 2 +- .../adapter/PlaylistCatalogueAdapter.java | 2 +- .../play/adapter/RecentMusicAdapter.java | 2 +- .../play/adapter/SongHorizontalAdapter.java | 2 +- .../play/glide/CustomGlideRequest.java | 17 +++++++++++++---- .../play/ui/fragment/AlbumPageFragment.java | 2 +- .../fragment/PlayerBottomSheetFragment.java | 2 +- .../ui/fragment/PlaylistPageFragment.java | 2 +- .../AlbumBottomSheetDialog.java | 2 +- .../ArtistBottomSheetDialog.java | 2 +- .../SongBottomSheetDialog.java | 2 +- .../ui/notification/PlayingNotification.java | 2 +- .../cappielloantonio/play/util/MusicUtil.java | 19 +++++++++++++++++++ 24 files changed, 54 insertions(+), 26 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 e1dcd15f..893bd10e 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumAdapter.java @@ -50,7 +50,7 @@ public class AlbumAdapter extends RecyclerView.Adapter holder.textArtistName.setText(MusicUtil.getReadableString(album.getArtistName())); CustomGlideRequest.Builder - .from(context, album.getPrimary(), CustomGlideRequest.ALBUM_PIC) + .from(context, album.getPrimary(), CustomGlideRequest.ALBUM_PIC, null) .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 f2cdfa59..0eaeccda 100644 --- a/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java +++ b/app/src/main/java/com/cappielloantonio/play/adapter/AlbumArtistPageOrSimilarAdapter.java @@ -48,7 +48,7 @@ public class AlbumArtistPageOrSimilarAdapter extends RecyclerView.Adapter CustomGlideRequest.Builder - .from(service, song.getPrimary(), CustomGlideRequest.SONG_PIC) + .from(service, song.getPrimary(), CustomGlideRequest.SONG_PIC, null) .bitmap() .build() .into(new CustomTarget(bigNotificationImageSize, bigNotificationImageSize) { diff --git a/app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java b/app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java index 7b7a2412..9c2b0be5 100644 --- a/app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java +++ b/app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java @@ -12,6 +12,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; public class MusicUtil { private static final String TAG = "MusicUtil"; @@ -91,4 +93,21 @@ public class MusicUtil { String uri = MusicUtil.getSongFileUri(song); return MediaItem.fromUri(uri); } + + public static CharSequence HTMLParser(String toParse) { + if (toParse != null && containsHTML(toParse)) { + return Html.fromHtml(toParse, Html.FROM_HTML_MODE_LEGACY); + } + else { + return toParse; + } + } + + private static boolean containsHTML(String toParse) { + String HTML_PATTERN = "<(\"[^\"]*\"|'[^']*'|[^'\">])*>"; + Pattern pattern = Pattern.compile(HTML_PATTERN); + + Matcher matcher = pattern.matcher(toParse); + return matcher.find(); + } }