From 3c4822329e1fdfad2f14db4ad031a1cc4467ac1c Mon Sep 17 00:00:00 2001 From: dkanada Date: Sun, 25 Apr 2021 10:29:00 +0900 Subject: [PATCH] use view binding elements to set toolbar title --- .../gramophone/activities/details/AlbumDetailActivity.java | 4 ++-- .../gramophone/activities/details/ArtistDetailActivity.java | 4 ++-- .../gramophone/activities/details/GenreDetailActivity.java | 2 +- .../gramophone/activities/details/PlaylistDetailActivity.java | 2 +- .../fragments/mainactivity/library/LibraryFragment.java | 2 +- .../gramophone/fragments/player/card/CardPlayerFragment.java | 1 + .../gramophone/fragments/player/flat/FlatPlayerFragment.java | 1 + 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java index 5e3a926e..b4854c4a 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/details/AlbumDetailActivity.java @@ -150,7 +150,7 @@ public class AlbumDetailActivity extends AbsMusicPanelActivity implements Palett private void setUpToolbar() { setSupportActionBar(binding.toolbar); // noinspection ConstantConditions - getSupportActionBar().setTitle(null); + binding.toolbar.setTitle(null); getSupportActionBar().setDisplayHomeAsUpEnabled(true); } @@ -250,7 +250,7 @@ public class AlbumDetailActivity extends AbsMusicPanelActivity implements Palett private void setAlbum(Album album) { this.album = album; - getSupportActionBar().setTitle(album.title); + binding.toolbar.setTitle(album.title); binding.artistText.setText(album.artistName); binding.songCountText.setText(MusicUtil.getSongCountString(this, album.songs.size())); binding.durationText.setText(MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(this, album.songs))); diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java index af2eaea4..cb31bdee 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/details/ArtistDetailActivity.java @@ -184,7 +184,7 @@ public class ArtistDetailActivity extends AbsMusicPanelActivity implements Palet private void setUpToolbar() { setSupportActionBar(binding.toolbar); // noinspection ConstantConditions - getSupportActionBar().setTitle(null); + binding.toolbar.setTitle(null); getSupportActionBar().setDisplayHomeAsUpEnabled(true); } @@ -273,7 +273,7 @@ public class ArtistDetailActivity extends AbsMusicPanelActivity implements Palet private void setArtist(Artist artist) { this.artist = artist; - getSupportActionBar().setTitle(artist.name); + binding.toolbar.setTitle(artist.name); binding.songCountText.setText(MusicUtil.getSongCountString(this, artist.songs.size())); binding.albumCountText.setText(MusicUtil.getAlbumCountString(this, artist.albums.size())); binding.durationText.setText(MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(this, artist.songs))); diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java index 48a22e11..df21e93b 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/details/GenreDetailActivity.java @@ -87,7 +87,7 @@ public class GenreDetailActivity extends AbsMusicPanelActivity implements CabHol binding.toolbar.setBackgroundColor(ThemeStore.primaryColor(this)); setSupportActionBar(binding.toolbar); // noinspection ConstantConditions - getSupportActionBar().setTitle(genre.name); + binding.toolbar.setTitle(genre.name); getSupportActionBar().setDisplayHomeAsUpEnabled(true); } diff --git a/app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java b/app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java index ce2e037f..7c5b1ada 100644 --- a/app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/activities/details/PlaylistDetailActivity.java @@ -117,7 +117,7 @@ public class PlaylistDetailActivity extends AbsMusicPanelActivity implements Cab private void setToolbarTitle(String title) { // noinspection ConstantConditions - getSupportActionBar().setTitle(title); + binding.toolbar.setTitle(title); } @Override diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/LibraryFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/LibraryFragment.java index 67a5ad9b..75735cad 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/LibraryFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/mainactivity/library/LibraryFragment.java @@ -101,7 +101,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde binding.appbar.setBackgroundColor(primaryColor); binding.toolbar.setBackgroundColor(primaryColor); binding.toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp); - requireActivity().setTitle(R.string.app_name); + binding.toolbar.setTitle(R.string.app_name); getMainActivity().setSupportActionBar(binding.toolbar); } diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java index 0d1a85df..0da7094e 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/card/CardPlayerFragment.java @@ -223,6 +223,7 @@ public class CardPlayerFragment extends AbsPlayerFragment implements PlayerAlbum int res = favorite ? R.drawable.ic_favorite_white_24dp : R.drawable.ic_favorite_border_white_24dp; int color = ToolbarContentTintHelper.toolbarContentColor(getActivity(), Color.TRANSPARENT); Drawable drawable = ImageUtil.getTintedVectorDrawable(getActivity(), res, color); + binding.playerToolbar.getMenu().findItem(R.id.action_toggle_favorite) .setIcon(drawable) .setTitle(favorite ? getString(R.string.action_remove_from_favorites) : getString(R.string.action_add_to_favorites)); diff --git a/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerFragment.java b/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerFragment.java index 48d4ebb7..ab06ac39 100644 --- a/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerFragment.java +++ b/app/src/main/java/com/dkanada/gramophone/fragments/player/flat/FlatPlayerFragment.java @@ -223,6 +223,7 @@ public class FlatPlayerFragment extends AbsPlayerFragment implements PlayerAlbum int res = favorite ? R.drawable.ic_favorite_white_24dp : R.drawable.ic_favorite_border_white_24dp; int color = ToolbarContentTintHelper.toolbarContentColor(requireActivity(), Color.TRANSPARENT); Drawable drawable = ImageUtil.getTintedVectorDrawable(requireActivity(), res, color); + binding.playerToolbar.getMenu().findItem(R.id.action_toggle_favorite) .setIcon(drawable) .setTitle(favorite ? getString(R.string.action_remove_from_favorites) : getString(R.string.action_add_to_favorites));