diff --git a/app/src/main/java/com/cappielloantonio/tempo/model/SessionMediaItem.kt b/app/src/main/java/com/cappielloantonio/tempo/model/SessionMediaItem.kt index 96e7ac6b..90d01f90 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/model/SessionMediaItem.kt +++ b/app/src/main/java/com/cappielloantonio/tempo/model/SessionMediaItem.kt @@ -236,12 +236,12 @@ class SessionMediaItem() { .setMediaId(id!!) .setMediaMetadata( MediaMetadata.Builder() - .setTitle(MusicUtil.getReadableString(title)) + .setTitle(title) .setTrackNumber(track ?: 0) .setDiscNumber(discNumber ?: 0) .setReleaseYear(year ?: 0) - .setAlbumTitle(MusicUtil.getReadableString(album)) - .setArtist(MusicUtil.getReadableString(artist)) + .setAlbumTitle(album) + .setArtist(artist) .setArtworkUri(artworkUri) .setExtras(bundle) .setIsBrowsable(false) diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/AlbumAdapter.java b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/AlbumAdapter.java index 7be8475b..498bf237 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/AlbumAdapter.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/AlbumAdapter.java @@ -38,8 +38,8 @@ public class AlbumAdapter extends RecyclerView.Adapter public void onBindViewHolder(ViewHolder holder, int position) { AlbumID3 album = albums.get(position); - holder.item.albumNameLabel.setText(MusicUtil.getReadableString(album.getName())); - holder.item.artistNameLabel.setText(MusicUtil.getReadableString(album.getArtist())); + holder.item.albumNameLabel.setText(album.getName()); + holder.item.artistNameLabel.setText(album.getArtist()); CustomGlideRequest.Builder .from(holder.itemView.getContext(), album.getCoverArtId(), CustomGlideRequest.ResourceType.Album) diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/AlbumArtistPageOrSimilarAdapter.java b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/AlbumArtistPageOrSimilarAdapter.java index cc10d792..42303404 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/AlbumArtistPageOrSimilarAdapter.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/AlbumArtistPageOrSimilarAdapter.java @@ -38,8 +38,8 @@ public class AlbumArtistPageOrSimilarAdapter extends RecyclerView.Adapter 0) { holder.item.artistInfoTextView.setText("Album count: " + artist.getAlbumCount()); diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/ArtistSimilarAdapter.java b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/ArtistSimilarAdapter.java index 8d43ac75..4e8dffe5 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/ArtistSimilarAdapter.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/ArtistSimilarAdapter.java @@ -38,7 +38,7 @@ public class ArtistSimilarAdapter extends RecyclerView.Adapter public void onBindViewHolder(ViewHolder holder, int position) { Genre genre = genres.get(position); - holder.item.genreLabel.setText(MusicUtil.getReadableString(genre.getGenre())); + holder.item.genreLabel.setText(genre.getGenre()); } @Override diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/GenreCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/GenreCatalogueAdapter.java index 72a73363..80ee3b2b 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/GenreCatalogueAdapter.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/GenreCatalogueAdapter.java @@ -73,7 +73,7 @@ public class GenreCatalogueAdapter extends RecyclerView.Adapter activity.navController.navigateUp()); bind.collapsingToolbar.setExpandedTitleColor(getResources().getColor(R.color.white, null)); } diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/FilterFragment.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/FilterFragment.java index f5041fbe..54fd2beb 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/FilterFragment.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/FilterFragment.java @@ -91,7 +91,7 @@ public class FilterFragment extends Fragment { bind.filterContainer.setVisibility(View.VISIBLE); for (Genre genre : genres) { Chip chip = (Chip) requireActivity().getLayoutInflater().inflate(R.layout.chip_search_filter_genre, null, false); - chip.setText(MusicUtil.getReadableString(genre.getGenre())); + chip.setText(genre.getGenre()); chip.setChecked(filterViewModel.getFilters().contains(genre.getGenre())); chip.setOnCheckedChangeListener((buttonView, isChecked) -> { if (isChecked) diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerBottomSheetFragment.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerBottomSheetFragment.java index e618ec12..8e40b3e8 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerBottomSheetFragment.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerBottomSheetFragment.java @@ -159,8 +159,8 @@ public class PlayerBottomSheetFragment extends Fragment { playerBottomSheetViewModel.setLiveArtist(getViewLifecycleOwner(), mediaMetadata.extras.getString("type"), mediaMetadata.extras.getString("artistId")); playerBottomSheetViewModel.setLiveDescription(mediaMetadata.extras.getString("description", null)); - bind.playerHeaderLayout.playerHeaderMediaTitleLabel.setText(MusicUtil.getReadableString(mediaMetadata.extras.getString("title"))); - bind.playerHeaderLayout.playerHeaderMediaArtistLabel.setText(MusicUtil.getReadableString(mediaMetadata.extras.getString("artist"))); + bind.playerHeaderLayout.playerHeaderMediaTitleLabel.setText(mediaMetadata.extras.getString("title")); + bind.playerHeaderLayout.playerHeaderMediaArtistLabel.setText(mediaMetadata.extras.getString("artist")); CustomGlideRequest.Builder .from(requireContext(), mediaMetadata.extras.getString("coverArtId"), CustomGlideRequest.ResourceType.Song) diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerControllerFragment.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerControllerFragment.java index 2b48c1ad..a3260917 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerControllerFragment.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerControllerFragment.java @@ -163,8 +163,8 @@ public class PlayerControllerFragment extends Fragment { } private void setMetadata(MediaMetadata mediaMetadata) { - playerMediaTitleLabel.setText(MusicUtil.getReadableString(String.valueOf(mediaMetadata.title))); - playerArtistNameLabel.setText(MusicUtil.getReadableString(String.valueOf(mediaMetadata.artist))); + playerMediaTitleLabel.setText(String.valueOf(mediaMetadata.title)); + playerArtistNameLabel.setText(String.valueOf(mediaMetadata.artist)); playerMediaTitleLabel.setSelected(true); playerArtistNameLabel.setSelected(true); diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlaylistPageFragment.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlaylistPageFragment.java index 05571a30..b0438de3 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlaylistPageFragment.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlaylistPageFragment.java @@ -132,9 +132,9 @@ public class PlaylistPageFragment extends Fragment implements ClickCallback { activity.getSupportActionBar().setDisplayShowHomeEnabled(true); } - bind.animToolbar.setTitle(MusicUtil.getReadableString(playlistPageViewModel.getPlaylist().getName())); + bind.animToolbar.setTitle(playlistPageViewModel.getPlaylist().getName()); - bind.playlistNameLabel.setText(MusicUtil.getReadableString(playlistPageViewModel.getPlaylist().getName())); + bind.playlistNameLabel.setText(playlistPageViewModel.getPlaylist().getName()); bind.playlistSongCountLabel.setText(getString(R.string.playlist_song_count, playlistPageViewModel.getPlaylist().getSongCount())); bind.playlistDurationLabel.setText(getString(R.string.playlist_duration, MusicUtil.getReadableDurationString(playlistPageViewModel.getPlaylist().getDuration(), false))); diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PodcastChannelPageFragment.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PodcastChannelPageFragment.java index 7653a154..4e35e3c9 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PodcastChannelPageFragment.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PodcastChannelPageFragment.java @@ -90,9 +90,9 @@ public class PodcastChannelPageFragment extends Fragment implements ClickCallbac activity.getSupportActionBar().setDisplayShowHomeEnabled(true); } - bind.toolbar.setTitle(MusicUtil.getReadableString(podcastChannelPageViewModel.getPodcastChannel().getTitle())); + bind.toolbar.setTitle(podcastChannelPageViewModel.getPodcastChannel().getTitle()); bind.toolbar.setNavigationOnClickListener(v -> activity.navController.navigateUp()); - bind.toolbar.setTitle(MusicUtil.getReadableString(podcastChannelPageViewModel.getPodcastChannel().getTitle())); + bind.toolbar.setTitle(podcastChannelPageViewModel.getPodcastChannel().getTitle()); } private void initPodcastChannelInfo() { diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/SongListPageFragment.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/SongListPageFragment.java index 97c49086..7262705e 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/SongListPageFragment.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/SongListPageFragment.java @@ -95,13 +95,13 @@ public class SongListPageFragment extends Fragment implements ClickCallback { } else if (requireArguments().getString(Constants.MEDIA_BY_GENRE) != null) { songListPageViewModel.title = Constants.MEDIA_BY_GENRE; songListPageViewModel.genre = requireArguments().getParcelable(Constants.GENRE_OBJECT); - songListPageViewModel.toolbarTitle = MusicUtil.getReadableString(songListPageViewModel.genre.getGenre()); - bind.pageTitleLabel.setText(MusicUtil.getReadableString(songListPageViewModel.genre.getGenre())); + songListPageViewModel.toolbarTitle = songListPageViewModel.genre.getGenre(); + bind.pageTitleLabel.setText(songListPageViewModel.genre.getGenre()); } else if (requireArguments().getString(Constants.MEDIA_BY_ARTIST) != null) { songListPageViewModel.title = Constants.MEDIA_BY_ARTIST; songListPageViewModel.artist = requireArguments().getParcelable(Constants.ARTIST_OBJECT); - songListPageViewModel.toolbarTitle = getString(R.string.song_list_page_top, MusicUtil.getReadableString(songListPageViewModel.artist.getName())); - bind.pageTitleLabel.setText(getString(R.string.song_list_page_top, MusicUtil.getReadableString(songListPageViewModel.artist.getName()))); + songListPageViewModel.toolbarTitle = getString(R.string.song_list_page_top, songListPageViewModel.artist.getName()); + bind.pageTitleLabel.setText(getString(R.string.song_list_page_top, songListPageViewModel.artist.getName())); } else if (requireArguments().getString(Constants.MEDIA_BY_GENRES) != null) { songListPageViewModel.title = Constants.MEDIA_BY_GENRES; songListPageViewModel.filters = requireArguments().getStringArrayList("filters_list"); @@ -124,8 +124,8 @@ public class SongListPageFragment extends Fragment implements ClickCallback { } else if (requireArguments().getParcelable(Constants.ALBUM_OBJECT) != null) { songListPageViewModel.album = requireArguments().getParcelable(Constants.ALBUM_OBJECT); songListPageViewModel.title = Constants.MEDIA_FROM_ALBUM; - songListPageViewModel.toolbarTitle = MusicUtil.getReadableString(songListPageViewModel.album.getName()); - bind.pageTitleLabel.setText(MusicUtil.getReadableString(songListPageViewModel.album.getName())); + songListPageViewModel.toolbarTitle = songListPageViewModel.album.getName(); + bind.pageTitleLabel.setText(songListPageViewModel.album.getName()); } } diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java index 5ce0b87f..a498f473 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java @@ -92,11 +92,11 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements .into(coverAlbum); TextView titleAlbum = view.findViewById(R.id.album_title_text_view); - titleAlbum.setText(MusicUtil.getReadableString(albumBottomSheetViewModel.getAlbum().getName())); + titleAlbum.setText(albumBottomSheetViewModel.getAlbum().getName()); titleAlbum.setSelected(true); TextView artistAlbum = view.findViewById(R.id.album_artist_text_view); - artistAlbum.setText(MusicUtil.getReadableString(albumBottomSheetViewModel.getAlbum().getArtist())); + artistAlbum.setText(albumBottomSheetViewModel.getAlbum().getArtist()); ToggleButton favoriteToggle = view.findViewById(R.id.button_favorite); favoriteToggle.setChecked(albumBottomSheetViewModel.getAlbum().getStarred() != null); diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java index b55d8494..f3c9d490 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java @@ -75,7 +75,7 @@ public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implement .into(coverArtist); TextView nameArtist = view.findViewById(R.id.song_title_text_view); - nameArtist.setText(MusicUtil.getReadableString(artistBottomSheetViewModel.getArtist().getName())); + nameArtist.setText(artistBottomSheetViewModel.getArtist().getName()); nameArtist.setSelected(true); ToggleButton favoriteToggle = view.findViewById(R.id.button_favorite); diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/DownloadedBottomSheetDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/DownloadedBottomSheetDialog.java index fba0d3ee..ee339342 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/DownloadedBottomSheetDialog.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/DownloadedBottomSheetDialog.java @@ -82,11 +82,11 @@ public class DownloadedBottomSheetDialog extends BottomSheetDialogFragment imple CustomGlideRequest.Builder.from(requireContext(), songs.get(new Random().nextInt(songs.size())).getCoverArtId(), CustomGlideRequest.ResourceType.Unknown).build().into(coverAlbum); TextView groupTitleView = view.findViewById(R.id.group_title_text_view); - groupTitleView.setText(MusicUtil.getReadableString(this.groupTitle)); + groupTitleView.setText(this.groupTitle); groupTitleView.setSelected(true); TextView groupSubtitleView = view.findViewById(R.id.group_subtitle_text_view); - groupSubtitleView.setText(MusicUtil.getReadableString(this.groupSubtitle)); + groupSubtitleView.setText(this.groupSubtitle); groupSubtitleView.setSelected(true); TextView playRandom = view.findViewById(R.id.play_random_text_view); diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/PodcastChannelBottomSheetDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/PodcastChannelBottomSheetDialog.java index 87dc45cc..e69cbca5 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/PodcastChannelBottomSheetDialog.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/PodcastChannelBottomSheetDialog.java @@ -68,7 +68,7 @@ public class PodcastChannelBottomSheetDialog extends BottomSheetDialogFragment i .into(coverPodcast); TextView titlePodcast = view.findViewById(R.id.podcast_title_text_view); - titlePodcast.setText(MusicUtil.getReadableString(podcastChannelBottomSheetViewModel.getPodcastChannel().getTitle())); + titlePodcast.setText(podcastChannelBottomSheetViewModel.getPodcastChannel().getTitle()); TextView delete = view.findViewById(R.id.delete_text_view); delete.setOnClickListener(v -> { diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/PodcastEpisodeBottomSheetDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/PodcastEpisodeBottomSheetDialog.java index 18f81668..5d2a463b 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/PodcastEpisodeBottomSheetDialog.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/PodcastEpisodeBottomSheetDialog.java @@ -70,7 +70,7 @@ public class PodcastEpisodeBottomSheetDialog extends BottomSheetDialogFragment i .into(coverPodcast); TextView titlePodcast = view.findViewById(R.id.podcast_title_text_view); - titlePodcast.setText(MusicUtil.getReadableString(podcastEpisodeBottomSheetViewModel.getPodcastEpisode().getTitle())); + titlePodcast.setText(podcastEpisodeBottomSheetViewModel.getPodcastEpisode().getTitle()); titlePodcast.setSelected(true); diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java index 970c4e9c..b22830eb 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java @@ -84,12 +84,12 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements .into(coverSong); TextView titleSong = view.findViewById(R.id.song_title_text_view); - titleSong.setText(MusicUtil.getReadableString(songBottomSheetViewModel.getSong().getTitle())); + titleSong.setText(songBottomSheetViewModel.getSong().getTitle()); titleSong.setSelected(true); TextView artistSong = view.findViewById(R.id.song_artist_text_view); - artistSong.setText(MusicUtil.getReadableString(songBottomSheetViewModel.getSong().getArtist())); + artistSong.setText(songBottomSheetViewModel.getSong().getArtist()); ToggleButton favoriteToggle = view.findViewById(R.id.button_favorite); favoriteToggle.setChecked(songBottomSheetViewModel.getSong().getStarred() != null); diff --git a/app/src/main/java/com/cappielloantonio/tempo/util/MappingUtil.java b/app/src/main/java/com/cappielloantonio/tempo/util/MappingUtil.java index 3b43d30d..da57b1c6 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/util/MappingUtil.java +++ b/app/src/main/java/com/cappielloantonio/tempo/util/MappingUtil.java @@ -74,12 +74,12 @@ public class MappingUtil { .setMediaId(media.getId()) .setMediaMetadata( new MediaMetadata.Builder() - .setTitle(MusicUtil.getReadableString(media.getTitle())) + .setTitle(media.getTitle()) .setTrackNumber(media.getTrack() != null ? media.getTrack() : 0) .setDiscNumber(media.getDiscNumber() != null ? media.getDiscNumber() : 0) .setReleaseYear(media.getYear() != null ? media.getYear() : 0) - .setAlbumTitle(MusicUtil.getReadableString(media.getAlbum())) - .setArtist(MusicUtil.getReadableString(media.getArtist())) + .setAlbumTitle(media.getAlbum()) + .setArtist(media.getArtist()) .setArtworkUri(artworkUri) .setExtras(bundle) .setIsBrowsable(false) @@ -112,12 +112,12 @@ public class MappingUtil { .setMediaId(media.getId()) .setMediaMetadata( new MediaMetadata.Builder() - .setTitle(MusicUtil.getReadableString(media.getTitle())) + .setTitle(media.getTitle()) .setTrackNumber(media.getTrack() != null ? media.getTrack() : 0) .setDiscNumber(media.getDiscNumber() != null ? media.getDiscNumber() : 0) .setReleaseYear(media.getYear() != null ? media.getYear() : 0) - .setAlbumTitle(MusicUtil.getReadableString(media.getAlbum())) - .setArtist(MusicUtil.getReadableString(media.getArtist())) + .setAlbumTitle(media.getAlbum()) + .setArtist(media.getArtist()) .setIsBrowsable(false) .setIsPlayable(true) .build() @@ -193,10 +193,10 @@ public class MappingUtil { .setMediaId(podcastEpisode.getId()) .setMediaMetadata( new MediaMetadata.Builder() - .setTitle(MusicUtil.getReadableString(podcastEpisode.getTitle())) + .setTitle(podcastEpisode.getTitle()) .setReleaseYear(podcastEpisode.getYear() != null ? podcastEpisode.getYear() : 0) - .setAlbumTitle(MusicUtil.getReadableString(podcastEpisode.getAlbum())) - .setArtist(MusicUtil.getReadableString(podcastEpisode.getArtist())) + .setAlbumTitle(podcastEpisode.getAlbum()) + .setArtist(podcastEpisode.getArtist()) .setArtworkUri(artworkUri) .setExtras(bundle) .setIsBrowsable(false)