From e8a65c581082e9a4347dd7b595bdda8a8d4c0646 Mon Sep 17 00:00:00 2001 From: CappielloAntonio Date: Sat, 14 Aug 2021 17:52:46 +0200 Subject: [PATCH] Fix a big bunch of lint warning --- .../ConnectivityStatusBroadcastReceiver.java | 2 +- .../receiver/MediaButtonIntentReceiver.java | 2 +- .../helper/MusicProgressViewUpdateHelper.java | 6 +++--- .../play/helper/ThemeHelper.java | 3 ++- .../recyclerview/GridItemDecoration.java | 6 +++--- .../play/repository/AlbumRepository.java | 2 +- .../ui/fragment/AlbumCatalogueFragment.java | 2 +- .../ui/fragment/AlbumListPageFragment.java | 3 ++- .../play/ui/fragment/AlbumPageFragment.java | 6 +++--- .../ui/fragment/ArtistCatalogueFragment.java | 2 +- .../ui/fragment/ArtistListPageFragment.java | 3 ++- .../play/ui/fragment/ArtistPageFragment.java | 5 +++-- .../ui/fragment/GenreCatalogueFragment.java | 3 +-- .../play/ui/fragment/HomeFragment.java | 2 +- .../play/ui/fragment/LoginFragment.java | 2 +- .../fragment/PlayerBottomSheetFragment.java | 18 +++++----------- .../fragment/PlaylistCatalogueFragment.java | 3 +-- .../ui/fragment/PlaylistPageFragment.java | 6 +++--- .../play/ui/fragment/SearchFragment.java | 6 ++---- .../play/ui/fragment/SettingsFragment.java | 3 ++- .../ui/fragment/SongListPageFragment.java | 9 ++++---- .../AlbumBottomSheetDialog.java | 12 ++++------- .../ArtistBottomSheetDialog.java | 10 +++------ .../SongBottomSheetDialog.java | 4 +--- .../dialog/PlaylistChooserDialog.java | 2 ++ .../fragment/dialog/PlaylistEditorDialog.java | 4 +--- .../play/ui/fragment/dialog/RatingDialog.java | 2 ++ .../fragment/dialog/ServerSignupDialog.java | 2 ++ .../cappielloantonio/play/util/MusicUtil.java | 21 ++++++++++--------- 29 files changed, 69 insertions(+), 82 deletions(-) diff --git a/app/src/main/java/com/cappielloantonio/play/broadcast/receiver/ConnectivityStatusBroadcastReceiver.java b/app/src/main/java/com/cappielloantonio/play/broadcast/receiver/ConnectivityStatusBroadcastReceiver.java index 6e74ff0c..7ca4b5f7 100644 --- a/app/src/main/java/com/cappielloantonio/play/broadcast/receiver/ConnectivityStatusBroadcastReceiver.java +++ b/app/src/main/java/com/cappielloantonio/play/broadcast/receiver/ConnectivityStatusBroadcastReceiver.java @@ -9,7 +9,7 @@ import android.view.View; import com.cappielloantonio.play.ui.activity.MainActivity; public class ConnectivityStatusBroadcastReceiver extends BroadcastReceiver { - private MainActivity activity; + private final MainActivity activity; public ConnectivityStatusBroadcastReceiver(MainActivity activity) { this.activity = activity; diff --git a/app/src/main/java/com/cappielloantonio/play/broadcast/receiver/MediaButtonIntentReceiver.java b/app/src/main/java/com/cappielloantonio/play/broadcast/receiver/MediaButtonIntentReceiver.java index b6e1352b..cece60d5 100644 --- a/app/src/main/java/com/cappielloantonio/play/broadcast/receiver/MediaButtonIntentReceiver.java +++ b/app/src/main/java/com/cappielloantonio/play/broadcast/receiver/MediaButtonIntentReceiver.java @@ -47,7 +47,7 @@ public class MediaButtonIntentReceiver extends BroadcastReceiver { private static long mLastClickTime = 0; @SuppressLint("HandlerLeak") - private static Handler mHandler = new Handler() { + private static final Handler mHandler = new Handler() { @Override public void handleMessage(final Message msg) { diff --git a/app/src/main/java/com/cappielloantonio/play/helper/MusicProgressViewUpdateHelper.java b/app/src/main/java/com/cappielloantonio/play/helper/MusicProgressViewUpdateHelper.java index b738c7d3..3585601e 100644 --- a/app/src/main/java/com/cappielloantonio/play/helper/MusicProgressViewUpdateHelper.java +++ b/app/src/main/java/com/cappielloantonio/play/helper/MusicProgressViewUpdateHelper.java @@ -14,9 +14,9 @@ public class MusicProgressViewUpdateHelper extends Handler { private static final int UPDATE_INTERVAL_PLAYING = 1000; private static final int UPDATE_INTERVAL_PAUSED = 500; - private Callback callback; - private int intervalPlaying; - private int intervalPaused; + private final Callback callback; + private final int intervalPlaying; + private final int intervalPaused; public MusicProgressViewUpdateHelper(Callback callback) { this.callback = callback; diff --git a/app/src/main/java/com/cappielloantonio/play/helper/ThemeHelper.java b/app/src/main/java/com/cappielloantonio/play/helper/ThemeHelper.java index b9c4c985..25e60f9b 100644 --- a/app/src/main/java/com/cappielloantonio/play/helper/ThemeHelper.java +++ b/app/src/main/java/com/cappielloantonio/play/helper/ThemeHelper.java @@ -6,10 +6,11 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatDelegate; public class ThemeHelper { + private static final String TAG = "ThemeHelper"; + public static final String LIGHT_MODE = "light"; public static final String DARK_MODE = "dark"; public static final String DEFAULT_MODE = "default"; - private static final String TAG = "ThemeHelper"; public static void applyTheme(@NonNull String themePref) { switch (themePref) { diff --git a/app/src/main/java/com/cappielloantonio/play/helper/recyclerview/GridItemDecoration.java b/app/src/main/java/com/cappielloantonio/play/helper/recyclerview/GridItemDecoration.java index 2a462416..d7568366 100644 --- a/app/src/main/java/com/cappielloantonio/play/helper/recyclerview/GridItemDecoration.java +++ b/app/src/main/java/com/cappielloantonio/play/helper/recyclerview/GridItemDecoration.java @@ -6,9 +6,9 @@ import android.view.View; import androidx.recyclerview.widget.RecyclerView; public class GridItemDecoration extends RecyclerView.ItemDecoration { - private int spanCount; - private int spacing; - private boolean includeEdge; + private final int spanCount; + private final int spacing; + private final boolean includeEdge; public GridItemDecoration(int spanCount, int spacing, boolean includeEdge) { this.spanCount = spanCount; diff --git a/app/src/main/java/com/cappielloantonio/play/repository/AlbumRepository.java b/app/src/main/java/com/cappielloantonio/play/repository/AlbumRepository.java index a01d9336..c8f2fb68 100644 --- a/app/src/main/java/com/cappielloantonio/play/repository/AlbumRepository.java +++ b/app/src/main/java/com/cappielloantonio/play/repository/AlbumRepository.java @@ -27,7 +27,7 @@ import retrofit2.Response; public class AlbumRepository { private static final String TAG = "AlbumRepository"; - private Application application; + private final Application application; public AlbumRepository(Application application) { this.application = application; diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumCatalogueFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumCatalogueFragment.java index e11ab2fb..f1a20ada 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumCatalogueFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumCatalogueFragment.java @@ -46,7 +46,7 @@ public class AlbumCatalogueFragment extends Fragment { } @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { activity = (MainActivity) getActivity(); bind = FragmentAlbumCatalogueBinding.inflate(inflater, container, false); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumListPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumListPageFragment.java index 08b2be66..22109a95 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumListPageFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/AlbumListPageFragment.java @@ -5,6 +5,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; import androidx.core.view.ViewCompat; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; @@ -25,7 +26,7 @@ public class AlbumListPageFragment extends Fragment { private AlbumHorizontalAdapter albumHorizontalAdapter; @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { activity = (MainActivity) getActivity(); bind = FragmentAlbumListPageBinding.inflate(inflater, container, false); 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 e9f2a2d5..0d3a1515 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 @@ -52,13 +52,13 @@ public class AlbumPageFragment extends Fragment { } @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); inflater.inflate(R.menu.album_page_menu, menu); } @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { activity = (MainActivity) getActivity(); bind = FragmentAlbumPageBinding.inflate(inflater, container, false); @@ -182,7 +182,7 @@ public class AlbumPageFragment extends Fragment { bind.songRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext())); bind.songRecyclerView.setHasFixedSize(true); - songHorizontalAdapter = new SongHorizontalAdapter(activity, requireContext(), getChildFragmentManager()); + songHorizontalAdapter = new SongHorizontalAdapter(activity, requireContext()); bind.songRecyclerView.setAdapter(songHorizontalAdapter); albumPageViewModel.getAlbumSongLiveList().observe(requireActivity(), songs -> { diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistCatalogueFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistCatalogueFragment.java index cab7fc2d..8401c8bf 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistCatalogueFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistCatalogueFragment.java @@ -46,7 +46,7 @@ public class ArtistCatalogueFragment extends Fragment { } @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { activity = (MainActivity) getActivity(); bind = FragmentArtistCatalogueBinding.inflate(inflater, container, false); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistListPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistListPageFragment.java index 4fe0128e..18b19b2f 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistListPageFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/ArtistListPageFragment.java @@ -5,6 +5,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; import androidx.core.view.ViewCompat; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; @@ -25,7 +26,7 @@ public class ArtistListPageFragment extends Fragment { private ArtistHorizontalAdapter artistHorizontalAdapter; @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { activity = (MainActivity) getActivity(); bind = FragmentArtistListPageBinding.inflate(inflater, container, false); 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 39b6c731..d3d07a06 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 @@ -12,6 +12,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Toast; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.view.ViewCompat; import androidx.fragment.app.Fragment; @@ -50,7 +51,7 @@ public class ArtistPageFragment extends Fragment { private ArtistSimilarAdapter artistSimilarAdapter; @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { activity = (MainActivity) getActivity(); bind = FragmentArtistPageBinding.inflate(inflater, container, false); @@ -175,7 +176,7 @@ public class ArtistPageFragment extends Fragment { private void initTopSongsView() { bind.mostStreamedSongRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext())); - songHorizontalAdapter = new SongHorizontalAdapter(activity, requireContext(), getChildFragmentManager()); + songHorizontalAdapter = new SongHorizontalAdapter(activity, requireContext()); bind.mostStreamedSongRecyclerView.setAdapter(songHorizontalAdapter); artistPageViewModel.getArtistTopSongList(10).observe(requireActivity(), songs -> { if (bind != null) bind.artistPageTopSongsSector.setVisibility(!songs.isEmpty() ? View.VISIBLE : View.GONE); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/GenreCatalogueFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/GenreCatalogueFragment.java index 5f418b33..571bf0cf 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/GenreCatalogueFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/GenreCatalogueFragment.java @@ -31,7 +31,6 @@ import com.cappielloantonio.play.viewmodel.GenreCatalogueViewModel; public class GenreCatalogueFragment extends Fragment { private static final String TAG = "GenreCatalogueFragment"; - ; private FragmentGenreCatalogueBinding bind; private MainActivity activity; @@ -46,7 +45,7 @@ public class GenreCatalogueFragment extends Fragment { } @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { activity = (MainActivity) getActivity(); bind = FragmentGenreCatalogueBinding.inflate(inflater, container, false); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java index 1961bc0e..d79d6798 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java @@ -248,7 +248,7 @@ public class HomeFragment extends Fragment { private void initStarredTracksView() { bind.starredTracksRecyclerView.setHasFixedSize(true); - starredSongAdapter = new SongHorizontalAdapter(activity, requireContext(), getChildFragmentManager()); + starredSongAdapter = new SongHorizontalAdapter(activity, requireContext()); bind.starredTracksRecyclerView.setAdapter(starredSongAdapter); homeViewModel.getStarredTracks().observe(requireActivity(), songs -> { if (bind != null) { diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/LoginFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/LoginFragment.java index fd7ee983..9dcfb1f0 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/LoginFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/LoginFragment.java @@ -43,7 +43,7 @@ public class LoginFragment extends Fragment { } @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); inflater.inflate(R.menu.login_page_menu, menu); } diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java index c365a3f1..b33b3c48 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java @@ -113,9 +113,7 @@ public class PlayerBottomSheetFragment extends Fragment implements MusicServiceE playerNowPlayingSongAdapter = new PlayerNowPlayingSongAdapter(requireContext()); bind.playerBodyLayout.playerSongCoverViewPager.setAdapter(playerNowPlayingSongAdapter); - playerBottomSheetViewModel.getQueueSong().observe(requireActivity(), queue -> { - playerNowPlayingSongAdapter.setItems(MappingUtil.mapQueue(queue)); - }); + playerBottomSheetViewModel.getQueueSong().observe(requireActivity(), queue -> playerNowPlayingSongAdapter.setItems(MappingUtil.mapQueue(queue))); bind.playerBodyLayout.playerSongCoverViewPager.setOffscreenPageLimit(3); bind.playerBodyLayout.playerSongCoverViewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() { @@ -151,9 +149,7 @@ public class PlayerBottomSheetFragment extends Fragment implements MusicServiceE playerSongQueueAdapter = new PlayerSongQueueAdapter(requireContext(), this); bind.playerBodyLayout.playerQueueRecyclerView.setAdapter(playerSongQueueAdapter); - playerBottomSheetViewModel.getQueueSong().observe(requireActivity(), queue -> { - playerSongQueueAdapter.setItems(MappingUtil.mapQueue(queue)); - }); + playerBottomSheetViewModel.getQueueSong().observe(requireActivity(), queue -> playerSongQueueAdapter.setItems(MappingUtil.mapQueue(queue))); new ItemTouchHelper(new ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP | ItemTouchHelper.DOWN, ItemTouchHelper.LEFT) { int originalPosition = -1; @@ -161,7 +157,7 @@ public class PlayerBottomSheetFragment extends Fragment implements MusicServiceE int toPosition = -1; @Override - public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) { + public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) { if (originalPosition == -1) originalPosition = viewHolder.getBindingAdapterPosition(); @@ -203,7 +199,7 @@ public class PlayerBottomSheetFragment extends Fragment implements MusicServiceE } @Override - public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) { + public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) { if (!(viewHolder.getBindingAdapterPosition() == MusicPlayerRemote.getPosition()) && !(MusicPlayerRemote.getPlayingQueue().size() <= 1)) { MusicPlayerRemote.removeFromQueue(viewHolder.getBindingAdapterPosition()); playerBottomSheetViewModel.removeSong(viewHolder.getBindingAdapterPosition()); @@ -295,11 +291,7 @@ public class PlayerBottomSheetFragment extends Fragment implements MusicServiceE } protected void updatePlayPauseState() { - if (MusicPlayerRemote.isPlaying()) { - bind.playerHeaderLayout.playerHeaderButton.setChecked(false); - } else { - bind.playerHeaderLayout.playerHeaderButton.setChecked(true); - } + bind.playerHeaderLayout.playerHeaderButton.setChecked(!MusicPlayerRemote.isPlaying()); } private void setUpMusicControllers() { diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java index 9ad1901d..8ca537f2 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlaylistCatalogueFragment.java @@ -28,7 +28,6 @@ import com.cappielloantonio.play.viewmodel.PlaylistCatalogueViewModel; public class PlaylistCatalogueFragment extends Fragment { private static final String TAG = "GenreCatalogueFragment"; - ; private FragmentPlaylistCatalogueBinding bind; private MainActivity activity; @@ -45,7 +44,7 @@ public class PlaylistCatalogueFragment extends Fragment { } @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { activity = (MainActivity) getActivity(); bind = FragmentPlaylistCatalogueBinding.inflate(inflater, container, false); 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 fb2b5f2a..431fca5d 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 @@ -46,13 +46,13 @@ public class PlaylistPageFragment extends Fragment { } @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) { super.onCreateOptionsMenu(menu, inflater); inflater.inflate(R.menu.playlist_page_menu, menu); } @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { activity = (MainActivity) getActivity(); bind = FragmentPlaylistPageBinding.inflate(inflater, container, false); @@ -154,7 +154,7 @@ public class PlaylistPageFragment extends Fragment { bind.songRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext())); bind.songRecyclerView.setHasFixedSize(true); - songHorizontalAdapter = new SongHorizontalAdapter(activity, requireContext(), getChildFragmentManager()); + songHorizontalAdapter = new SongHorizontalAdapter(activity, requireContext()); bind.songRecyclerView.setAdapter(songHorizontalAdapter); playlistPageViewModel.getPlaylistSongLiveList().observe(requireActivity(), songs -> { diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java index 744820ab..cecb2e77 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SearchFragment.java @@ -73,7 +73,7 @@ public class SearchFragment extends Fragment { bind.searchResultTracksRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext())); bind.searchResultTracksRecyclerView.setHasFixedSize(true); - songHorizontalAdapter = new SongHorizontalAdapter(activity, requireContext(), getChildFragmentManager()); + songHorizontalAdapter = new SongHorizontalAdapter(activity, requireContext()); bind.searchResultTracksRecyclerView.setAdapter(songHorizontalAdapter); // Albums @@ -107,9 +107,7 @@ public class SearchFragment extends Fragment { bind.persistentSearchView.setOnSearchQueryChangeListener((searchView, oldQuery, newQuery) -> { if (!newQuery.trim().equals("") && newQuery.trim().length() > 1) { - searchViewModel.getSearchSuggestion(newQuery).observe(requireActivity(), suggestions -> { - searchView.setSuggestions(SuggestionCreationUtil.asRegularSearchSuggestions(MusicUtil.getReadableStrings(suggestions)), false); - }); + searchViewModel.getSearchSuggestion(newQuery).observe(requireActivity(), suggestions -> searchView.setSuggestions(SuggestionCreationUtil.asRegularSearchSuggestions(MusicUtil.getReadableStrings(suggestions)), false)); } else { setSuggestions(); } diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java index 88d238a1..f8c911d0 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SettingsFragment.java @@ -5,6 +5,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; import androidx.lifecycle.ViewModelProvider; import androidx.preference.ListPreference; import androidx.preference.PreferenceFragmentCompat; @@ -23,7 +24,7 @@ public class SettingsFragment extends PreferenceFragmentCompat { private SettingViewModel settingViewModel; @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { activity = (MainActivity) getActivity(); View view = super.onCreateView(inflater, container, savedInstanceState); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SongListPageFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SongListPageFragment.java index 6b2e4561..7bc72eb6 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/SongListPageFragment.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/SongListPageFragment.java @@ -6,6 +6,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; import androidx.core.view.ViewCompat; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; @@ -32,7 +33,7 @@ public class SongListPageFragment extends Fragment { private SongHorizontalAdapter songHorizontalAdapter; @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { activity = (MainActivity) getActivity(); bind = FragmentSongListPageBinding.inflate(inflater, container, false); @@ -103,9 +104,7 @@ public class SongListPageFragment extends Fragment { activity.getSupportActionBar().setDisplayShowHomeEnabled(true); } - bind.toolbar.setNavigationOnClickListener(v -> { - activity.navController.navigateUp(); - }); + bind.toolbar.setNavigationOnClickListener(v -> activity.navController.navigateUp()); bind.appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> { if ((bind.albumInfoSector.getHeight() + verticalOffset) < (2 * ViewCompat.getMinimumHeight(bind.toolbar))) { @@ -138,7 +137,7 @@ public class SongListPageFragment extends Fragment { bind.songListRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext())); bind.songListRecyclerView.setHasFixedSize(true); - songHorizontalAdapter = new SongHorizontalAdapter(activity, requireContext(), getChildFragmentManager()); + songHorizontalAdapter = new SongHorizontalAdapter(activity, requireContext()); bind.songListRecyclerView.setAdapter(songHorizontalAdapter); songListPageViewModel.getSongList().observe(requireActivity(), songs -> songHorizontalAdapter.setItems(songs)); } diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java index 33a36180..25327fc5 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/AlbumBottomSheetDialog.java @@ -39,8 +39,6 @@ import java.util.List; public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements View.OnClickListener { private static final String TAG = "AlbumBottomSheetDialog"; - private MainActivity activity; - private AlbumBottomSheetViewModel albumBottomSheetViewModel; private Album album; @@ -60,8 +58,6 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements } private void init(View view) { - activity = (MainActivity) requireActivity(); - ImageView coverAlbum = view.findViewById(R.id.album_cover_image_view); CustomGlideRequest.Builder .from(requireContext(), albumBottomSheetViewModel.getAlbum().getPrimary(), CustomGlideRequest.ALBUM_PIC, null) @@ -100,8 +96,8 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements QueueRepository queueRepository = new QueueRepository(App.getInstance()); queueRepository.insertAllAndStartNew((ArrayList) media); - activity.isBottomSheetInPeek(true); - activity.setBottomSheetMusicInfo((Song) media.get(0)); + ((MainActivity) requireActivity()).isBottomSheetInPeek(true); + ((MainActivity) requireActivity()).setBottomSheetMusicInfo((Song) media.get(0)); MusicPlayerRemote.openQueue((List) media, 0, true); } else { @@ -123,7 +119,7 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements queueRepository.insertAllAndStartNew(songs); MusicPlayerRemote.openQueue(songs, 0, true); - activity.isBottomSheetInPeek(true); + ((MainActivity) requireActivity()).isBottomSheetInPeek(true); dismissBottomSheet(); }); @@ -133,7 +129,7 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements playNext.setOnClickListener(v -> { albumBottomSheetViewModel.getAlbumTracks().observe(requireActivity(), songs -> { MusicPlayerRemote.playNext(songs); - activity.isBottomSheetInPeek(true); + ((MainActivity) requireActivity()).isBottomSheetInPeek(true); dismissBottomSheet(); }); }); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java index cf63d495..92207f9e 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/ArtistBottomSheetDialog.java @@ -36,8 +36,6 @@ import java.util.List; public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implements View.OnClickListener { private static final String TAG = "AlbumBottomSheetDialog"; - private MainActivity activity; - private ArtistBottomSheetViewModel artistBottomSheetViewModel; private Artist artist; @@ -57,8 +55,6 @@ public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implement } private void init(View view) { - activity = (MainActivity) requireActivity(); - ImageView coverArtist = view.findViewById(R.id.artist_cover_image_view); CustomGlideRequest.Builder .from(requireContext(), artistBottomSheetViewModel.getArtist().getPrimary(), CustomGlideRequest.ARTIST_PIC, null) @@ -94,8 +90,8 @@ public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implement QueueRepository queueRepository = new QueueRepository(App.getInstance()); queueRepository.insertAllAndStartNew((ArrayList) media); - activity.isBottomSheetInPeek(true); - activity.setBottomSheetMusicInfo((Song) media.get(0)); + ((MainActivity) requireActivity()).isBottomSheetInPeek(true); + ((MainActivity) requireActivity()).setBottomSheetMusicInfo((Song) media.get(0)); MusicPlayerRemote.openQueue((List) media, 0, true); } else { @@ -116,7 +112,7 @@ public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implement queueRepository.insertAllAndStartNew(songs); MusicPlayerRemote.openQueue(songs, 0, true); - activity.isBottomSheetInPeek(true); + ((MainActivity) requireActivity()).isBottomSheetInPeek(true); } else { Toast.makeText(requireContext(), "Error retrieving artist's songs", Toast.LENGTH_SHORT).show(); } diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java index c87a1922..96341e6b 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/bottomsheetdialog/SongBottomSheetDialog.java @@ -43,8 +43,6 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements private SongBottomSheetViewModel songBottomSheetViewModel; private Song song; - private TextView download; - @Nullable @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { @@ -149,7 +147,7 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements dismissBottomSheet(); }); - download = view.findViewById(R.id.download_text_view); + TextView download = view.findViewById(R.id.download_text_view); download.setOnClickListener(v -> { DownloadUtil.getDownloadTracker(requireContext()).toggleDownload(Arrays.asList(song)); dismissBottomSheet(); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/PlaylistChooserDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/PlaylistChooserDialog.java index 0088ca21..b1cb5338 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/PlaylistChooserDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/PlaylistChooserDialog.java @@ -6,6 +6,7 @@ import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; +import androidx.annotation.NonNull; import androidx.fragment.app.DialogFragment; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; @@ -25,6 +26,7 @@ public class PlaylistChooserDialog extends DialogFragment { private PlaylistHorizontalAdapter playlistHorizontalAdapter; + @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { bind = DialogPlaylistChooserBinding.inflate(LayoutInflater.from(requireContext())); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/PlaylistEditorDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/PlaylistEditorDialog.java index a38390f7..1444e8cc 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/PlaylistEditorDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/PlaylistEditorDialog.java @@ -28,16 +28,14 @@ public class PlaylistEditorDialog extends DialogFragment { private static final String TAG = "ServerSignupDialog"; private DialogPlaylistEditorBinding bind; - private MainActivity activity; private PlaylistEditorViewModel playlistEditorViewModel; private String playlistName; private PlaylistDialogSongHorizontalAdapter playlistDialogSongHorizontalAdapter; + @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - activity = (MainActivity) getActivity(); - bind = DialogPlaylistEditorBinding.inflate(LayoutInflater.from(requireContext())); playlistEditorViewModel = new ViewModelProvider(requireActivity()).get(PlaylistEditorViewModel.class); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/RatingDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/RatingDialog.java index 7d04c1c4..b82905ec 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/RatingDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/RatingDialog.java @@ -6,6 +6,7 @@ import android.content.Context; import android.os.Bundle; import android.view.LayoutInflater; +import androidx.annotation.NonNull; import androidx.fragment.app.DialogFragment; import androidx.lifecycle.ViewModelProvider; @@ -22,6 +23,7 @@ public class RatingDialog extends DialogFragment { private DialogRatingBinding bind; private RatingViewModel ratingViewModel; + @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { bind = DialogRatingBinding.inflate(LayoutInflater.from(requireContext())); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/ServerSignupDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/ServerSignupDialog.java index 0aa200d2..08217676 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/ServerSignupDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/dialog/ServerSignupDialog.java @@ -9,6 +9,7 @@ import android.util.Log; import android.view.LayoutInflater; import android.widget.Toast; +import androidx.annotation.NonNull; import androidx.fragment.app.DialogFragment; import androidx.lifecycle.ViewModelProvider; @@ -41,6 +42,7 @@ public class ServerSignupDialog extends DialogFragment { private String server; private boolean directAccess = false; + @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { activity = (MainActivity) getActivity(); diff --git a/app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java b/app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java index 2c234385..a8fb3596 100644 --- a/app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java +++ b/app/src/main/java/com/cappielloantonio/play/util/MusicUtil.java @@ -89,16 +89,17 @@ public class MusicUtil { } public static int getDefaultPicPerCategory(String category) { - if (category.equals(CustomGlideRequest.SONG_PIC)) { - return R.drawable.default_album_art; - } else if (category.equals(CustomGlideRequest.ALBUM_PIC)) { - return R.drawable.default_album_art; - } else if (category.equals(CustomGlideRequest.ARTIST_PIC)) { - return R.drawable.default_album_art; - } else if (category.equals(CustomGlideRequest.PLAYLIST_PIC)) { - return R.drawable.default_album_art; - } else { - return R.drawable.default_album_art; + switch (category) { + case CustomGlideRequest.SONG_PIC: + return R.drawable.default_album_art; + case CustomGlideRequest.ALBUM_PIC: + return R.drawable.default_album_art; + case CustomGlideRequest.ARTIST_PIC: + return R.drawable.default_album_art; + case CustomGlideRequest.PLAYLIST_PIC: + return R.drawable.default_album_art; + default: + return R.drawable.default_album_art; } }