Changed song page list title and toolbar title

.idea/misc.xml

@@ -99,8 +99,8 @@
         <entry key="app/src/main/res/layout/item_library_similar_artist.xml" value="0.3229166666666667" />
         <entry key="app/src/main/res/layout/item_login_server.xml" value="0.25" />
         <entry key="app/src/main/res/layout/item_placehoder_discovery.xml" value="0.3229166666666667" />
-        <entry key="app/src/main/res/layout/item_placeholder_album.xml" value="0.8" />
+        <entry key="app/src/main/res/layout/item_placeholder_album.xml" value="0.4855156431054461" />
-        <entry key="app/src/main/res/layout/item_placeholder_genre.xml" value="0.1" />
+        <entry key="app/src/main/res/layout/item_placeholder_genre.xml" value="0.38796296296296295" />
         <entry key="app/src/main/res/layout/item_placeholder_horizontal.xml" value="0.3229166666666667" />
         <entry key="app/src/main/res/layout/item_placeholder_year.xml" value="0.3229166666666667" />
         <entry key="app/src/main/res/layout/item_player_now_playing_song.xml" value="0.3229166666666667" />

app/src/main/java/com/cappielloantonio/play/ui/fragment/SongListPageFragment.java

@@ -63,39 +63,49 @@ public class SongListPageFragment extends Fragment {
     private void init() {
         if (requireArguments().getString(Song.RECENTLY_PLAYED) != null) {
             songListPageViewModel.title = Song.RECENTLY_PLAYED;
+            songListPageViewModel.toolbarTitle = getString(R.string.song_list_page_recently_played);
             bind.pageTitleLabel.setText(R.string.song_list_page_recently_played);
         } else if (requireArguments().getString(Song.MOST_PLAYED) != null) {
             songListPageViewModel.title = Song.MOST_PLAYED;
+            songListPageViewModel.toolbarTitle = getString(R.string.song_list_page_most_played);
             bind.pageTitleLabel.setText(R.string.song_list_page_most_played);
         } else if (requireArguments().getString(Song.RECENTLY_ADDED) != null) {
             songListPageViewModel.title = Song.RECENTLY_ADDED;
+            songListPageViewModel.toolbarTitle = getString(R.string.song_list_page_recently_added);
             bind.pageTitleLabel.setText(R.string.song_list_page_recently_added);
         } else if (requireArguments().getString(Song.BY_GENRE) != null) {
             songListPageViewModel.title = Song.BY_GENRE;
             songListPageViewModel.genre = requireArguments().getParcelable("genre_object");
-            bind.pageTitleLabel.setText(getString(R.string.song_list_page_all, MusicUtil.getReadableString(songListPageViewModel.genre.getName())));
+            songListPageViewModel.toolbarTitle = MusicUtil.getReadableString(songListPageViewModel.genre.getName());
+            bind.pageTitleLabel.setText(MusicUtil.getReadableString(songListPageViewModel.genre.getName()));
         } else if (requireArguments().getString(Song.BY_ARTIST) != null) {
             songListPageViewModel.title = Song.BY_ARTIST;
             songListPageViewModel.artist = requireArguments().getParcelable("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())));
         } else if (requireArguments().getString(Song.BY_GENRES) != null) {
             songListPageViewModel.title = Song.BY_GENRES;
             songListPageViewModel.filters = requireArguments().getStringArrayList("filters_list");
             songListPageViewModel.filterNames = requireArguments().getStringArrayList("filter_name_list");
+            songListPageViewModel.toolbarTitle = songListPageViewModel.getFiltersTitle();
             bind.pageTitleLabel.setText(songListPageViewModel.getFiltersTitle());
         } else if (requireArguments().getString(Song.BY_YEAR) != null) {
             songListPageViewModel.title = Song.BY_YEAR;
             songListPageViewModel.year = requireArguments().getInt("year_object");
+            songListPageViewModel.toolbarTitle = getString(R.string.song_list_page_year, songListPageViewModel.year);
             bind.pageTitleLabel.setText(getString(R.string.song_list_page_year, songListPageViewModel.year));
         } else if (requireArguments().getString(Song.STARRED) != null) {
             songListPageViewModel.title = Song.STARRED;
+            songListPageViewModel.toolbarTitle = getString(R.string.song_list_page_starred);
             bind.pageTitleLabel.setText(R.string.song_list_page_starred);
         } else if (requireArguments().getString(Song.DOWNLOADED) != null) {
             songListPageViewModel.title = Song.DOWNLOADED;
-            bind.pageTitleLabel.setText(R.string.song_list_page_downloaded);
+            songListPageViewModel.toolbarTitle = getString(R.string.song_list_page_downloaded);
+            bind.pageTitleLabel.setText(getString(R.string.song_list_page_downloaded));
         } else if (requireArguments().getParcelable("album_object") != null) {
             songListPageViewModel.album = requireArguments().getParcelable("album_object");
             songListPageViewModel.title = Song.FROM_ALBUM;
+            songListPageViewModel.toolbarTitle = MusicUtil.getReadableString(songListPageViewModel.album.getTitle());
             bind.pageTitleLabel.setText(MusicUtil.getReadableString(songListPageViewModel.album.getTitle()));
         }
     }
@@ -112,7 +122,7 @@ public class SongListPageFragment extends Fragment {
 
         bind.appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> {
             if ((bind.albumInfoSector.getHeight() + verticalOffset) < (2 * ViewCompat.getMinimumHeight(bind.toolbar))) {
-                bind.toolbar.setTitle(R.string.song_list_page_title);
+                bind.toolbar.setTitle(songListPageViewModel.toolbarTitle);
             } else {
                 bind.toolbar.setTitle(R.string.empty_string);
             }

app/src/main/java/com/cappielloantonio/play/viewmodel/SongListPageViewModel.java

@@ -27,6 +27,7 @@ public class SongListPageViewModel extends AndroidViewModel {
     private final DownloadRepository downloadRepository;
 
     public String title;
+    public String toolbarTitle;
     public Genre genre;
     public Artist artist;
     public Album album;
@@ -50,15 +51,6 @@ public class SongListPageViewModel extends AndroidViewModel {
         songList = new MutableLiveData<>(new ArrayList<>());
 
         switch (title) {
-            case Song.RECENTLY_PLAYED:
-                // songList = songRepository.getListLiveRecentlyPlayedSampleSong(100);
-                break;
-            case Song.MOST_PLAYED:
-                // songList = songRepository.getListLiveMostPlayedSampleSong(100);
-                break;
-            case Song.RECENTLY_ADDED:
-                // songList = songRepository.getListLiveRecentlyAddedSampleSong(100);
-                break;
             case Song.BY_GENRE:
                 songList = songRepository.getSongsByGenre(genre.getId());
                 break;

app/src/main/res/values/strings.xml

@@ -187,7 +187,6 @@
     <string name="song_bottom_sheet_play_next">Play next</string>
     <string name="song_bottom_sheet_rate">Rate</string>
     <string name="song_bottom_sheet_remove">Remove</string>
-    <string name="song_list_page_all">%1$s: all tracks</string>
     <string name="song_list_page_downloaded">Downloaded</string>
     <string name="song_list_page_most_played">Most played tracks</string>
     <string name="song_list_page_recently_added">Recently added tracks</string>