From eeae6bbce57b6dc58ed44925c493914f6c512a15 Mon Sep 17 00:00:00 2001 From: CappielloAntonio Date: Wed, 1 Sep 2021 17:55:02 +0200 Subject: [PATCH] Replaced the download icons in the menus with the three dots --- .idea/misc.xml | 1 + .../cappielloantonio/play/ui/fragment/AlbumPageFragment.java | 3 +++ .../play/ui/fragment/PlaylistPageFragment.java | 3 +++ app/src/main/res/menu/album_page_menu.xml | 4 ++-- app/src/main/res/menu/playlist_page_menu.xml | 4 ++-- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 06f9c561..c2f4b8c4 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -84,6 +84,7 @@ + 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 d76e4869..b5687932 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 @@ -34,6 +34,7 @@ import com.cappielloantonio.play.util.MusicUtil; import com.cappielloantonio.play.viewmodel.AlbumPageViewModel; import java.util.Collections; +import java.util.Objects; public class AlbumPageFragment extends Fragment { private static final String TAG = "AlbumPageFragment"; @@ -122,6 +123,8 @@ public class AlbumPageFragment extends Fragment { bind.albumReleaseYearLabel.setText(albumPageViewModel.getAlbum().getYear() != 0 ? String.valueOf(albumPageViewModel.getAlbum().getYear()) : ""); bind.animToolbar.setNavigationOnClickListener(v -> activity.navController.navigateUp()); + + Objects.requireNonNull(bind.animToolbar.getOverflowIcon()).setTint(requireContext().getResources().getColor(R.color.titleTextColor, null)); } private void initAlbumInfoTextButton() { diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistPageFragment.java index 3457698d..7a904f2b 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistPageFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistPageFragment.java @@ -30,6 +30,7 @@ import com.cappielloantonio.play.util.MusicUtil; import com.cappielloantonio.play.viewmodel.PlaylistPageViewModel; import java.util.Collections; +import java.util.Objects; public class PlaylistPageFragment extends Fragment { @@ -112,6 +113,8 @@ public class PlaylistPageFragment extends Fragment { bind.playlistDurationLabel.setText("Playlist duration: " + MusicUtil.getReadableDurationString(playlistPageViewModel.getPlaylist().getDuration(), false)); bind.animToolbar.setNavigationOnClickListener(v -> activity.navController.navigateUp()); + + Objects.requireNonNull(bind.animToolbar.getOverflowIcon()).setTint(requireContext().getResources().getColor(R.color.titleTextColor, null)); } private void initMusicButton() { diff --git a/app/src/main/res/menu/album_page_menu.xml b/app/src/main/res/menu/album_page_menu.xml index 2b7d6f39..9372da82 100644 --- a/app/src/main/res/menu/album_page_menu.xml +++ b/app/src/main/res/menu/album_page_menu.xml @@ -5,6 +5,6 @@ android:id="@+id/action_download_album" android:icon="@drawable/ic_file_download" android:iconTint="@color/titleTextColor" - android:title="Download" - app:showAsAction="always" /> + android:title="Download all" + app:showAsAction="never" /> \ No newline at end of file diff --git a/app/src/main/res/menu/playlist_page_menu.xml b/app/src/main/res/menu/playlist_page_menu.xml index 5f987865..c442cd7b 100644 --- a/app/src/main/res/menu/playlist_page_menu.xml +++ b/app/src/main/res/menu/playlist_page_menu.xml @@ -5,6 +5,6 @@ android:id="@+id/action_download_playlist" android:icon="@drawable/ic_file_download" android:iconTint="@color/titleTextColor" - android:title="Download" - app:showAsAction="always" /> + android:title="Download all" + app:showAsAction="never" /> \ No newline at end of file