From 5109900203ae36de59b4b19bbc08e58d25fbe826 Mon Sep 17 00:00:00 2001 From: CappielloAntonio Date: Tue, 3 Aug 2021 08:34:16 +0200 Subject: [PATCH] Fix artist/album title visualization in toolbar --- .../play/ui/fragment/AlbumPageFragment.java | 9 +-------- .../play/ui/fragment/ArtistPageFragment.java | 3 ++- 2 files changed, 3 insertions(+), 9 deletions(-) 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 0187d308..fc1d98bc 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 @@ -118,7 +118,7 @@ public class AlbumPageFragment extends Fragment { activity.getSupportActionBar().setDisplayShowHomeEnabled(true); } - bind.animToolbar.setTitle(albumPageViewModel.getAlbum().getTitle()); + bind.animToolbar.setTitle(MusicUtil.getReadableInfo(albumPageViewModel.getAlbum().getTitle())); bind.albumNameLabel.setText(MusicUtil.getReadableInfo(albumPageViewModel.getAlbum().getTitle())); bind.albumArtistLabel.setText(MusicUtil.getReadableInfo(albumPageViewModel.getAlbum().getArtistName())); @@ -139,13 +139,6 @@ public class AlbumPageFragment extends Fragment { }); }); - bind.albumReleaseYearLabel.setOnClickListener(v -> { - /*Bundle bundle = new Bundle(); - bundle.putString(Song.BY_YEAR, Song.BY_YEAR); - bundle.putInt("year_object", albumPageViewModel.getAlbum().getYear()); - activity.navController.navigate(R.id.action_albumPageFragment_to_songListPageFragment, bundle);*/ - }); - /*albumPageViewModel.getAlbumInfo().observe(requireActivity(), album -> { if (bind != null) bind.albumBioLabel.setVisibility(album.getNotes() != null ? View.VISIBLE : View.GONE); bind.albumBioLabel.setText(album.getNotes()); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java index 513fd073..62f948a9 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistPageFragment.java @@ -29,6 +29,7 @@ import com.cappielloantonio.play.repository.ArtistRepository; import com.cappielloantonio.play.repository.QueueRepository; import com.cappielloantonio.play.service.MusicPlayerRemote; import com.cappielloantonio.play.ui.activity.MainActivity; +import com.cappielloantonio.play.util.MusicUtil; import com.cappielloantonio.play.viewmodel.ArtistPageViewModel; import java.util.ArrayList; @@ -100,7 +101,7 @@ public class ArtistPageFragment extends Fragment { if (activity.getSupportActionBar() != null) activity.getSupportActionBar().setDisplayHomeAsUpEnabled(true); - bind.collapsingToolbar.setTitle(artistPageViewModel.getArtist().getName()); + bind.collapsingToolbar.setTitle(MusicUtil.getReadableInfo(artistPageViewModel.getArtist().getName())); bind.animToolbar.setNavigationOnClickListener(v -> activity.navController.navigateUp()); bind.collapsingToolbar.setCollapsedTitleTextColor(getResources().getColor(R.color.titleTextColor, null));