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 fdcaa36d..3336c6b1 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 @@ -54,23 +54,23 @@ public class AlbumListPageFragment extends Fragment { } private void init() { - if (getArguments().getString(Album.RECENTLY_PLAYED) != null) { + if (requireArguments().getString(Album.RECENTLY_PLAYED) != null) { albumListPageViewModel.title = Album.RECENTLY_PLAYED; bind.pageTitleLabel.setText("Recently played albums"); - } else if (getArguments().getString(Album.MOST_PLAYED) != null) { + } else if (requireArguments().getString(Album.MOST_PLAYED) != null) { albumListPageViewModel.title = Album.MOST_PLAYED; bind.pageTitleLabel.setText("Most played albums"); - } else if (getArguments().getString(Album.RECENTLY_ADDED) != null) { + } else if (requireArguments().getString(Album.RECENTLY_ADDED) != null) { albumListPageViewModel.title = Album.RECENTLY_ADDED; bind.pageTitleLabel.setText("Recently added albums"); - } else if (getArguments().getString(Album.STARRED) != null) { + } else if (requireArguments().getString(Album.STARRED) != null) { albumListPageViewModel.title = Album.STARRED; bind.pageTitleLabel.setText("Starred albums"); - } else if (getArguments().getString(Album.DOWNLOADED) != null) { + } else if (requireArguments().getString(Album.DOWNLOADED) != null) { albumListPageViewModel.title = Album.DOWNLOADED; bind.pageTitleLabel.setText("Downloaded albums"); - } else if (getArguments().getParcelable("artist_object") != null) { - albumListPageViewModel.artist = getArguments().getParcelable("artist_object"); + } else if (requireArguments().getParcelable("artist_object") != null) { + albumListPageViewModel.artist = requireArguments().getParcelable("artist_object"); albumListPageViewModel.title = Album.FROM_ARTIST; bind.pageTitleLabel.setText(MusicUtil.getReadableString(albumListPageViewModel.artist.getName())); } 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 c0ef1f18..ba2b20aa 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 @@ -1,9 +1,6 @@ package com.cappielloantonio.play.ui.fragment; -import android.graphics.BlendMode; -import android.graphics.BlendModeColorFilter; import android.os.Bundle; -import android.text.Html; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -14,7 +11,6 @@ import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.core.view.ViewCompat; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; @@ -22,7 +18,6 @@ import androidx.recyclerview.widget.LinearLayoutManager; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.cappielloantonio.play.App; import com.cappielloantonio.play.R; -import com.cappielloantonio.play.adapter.AlbumArtistPageOrSimilarAdapter; import com.cappielloantonio.play.adapter.SongHorizontalAdapter; import com.cappielloantonio.play.databinding.FragmentAlbumPageBinding; import com.cappielloantonio.play.glide.CustomGlideRequest; @@ -91,7 +86,7 @@ public class AlbumPageFragment extends Fragment { public boolean onOptionsItemSelected(@NonNull MenuItem item) { if (item.getItemId() == R.id.action_download_album) { albumPageViewModel.getAlbumSongLiveList(requireActivity()).observe(requireActivity(), songs -> { - if(isVisible() && getActivity() != null) { + if (isVisible() && getActivity() != null) { DownloadUtil.getDownloadTracker(requireContext()).download(songs, null, null); } }); @@ -102,8 +97,8 @@ public class AlbumPageFragment extends Fragment { } private void init() { - albumPageViewModel.setAlbum(getArguments().getParcelable("album_object")); - albumPageViewModel.setOffline(getArguments().getBoolean("is_offline")); + albumPageViewModel.setAlbum(requireArguments().getParcelable("album_object")); + albumPageViewModel.setOffline(requireArguments().getBoolean("is_offline")); } private void initAppBar() { @@ -164,7 +159,7 @@ public class AlbumPageFragment extends Fragment { }); } - if(bind != null && songs.isEmpty()) { + if (bind != null && songs.isEmpty()) { bind.albumPagePlayButton.setEnabled(false); bind.albumPageShuffleButton.setEnabled(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 1c879538..267dde8a 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 @@ -13,7 +13,6 @@ import androidx.recyclerview.widget.LinearLayoutManager; import com.cappielloantonio.play.adapter.ArtistHorizontalAdapter; import com.cappielloantonio.play.databinding.FragmentArtistListPageBinding; -import com.cappielloantonio.play.model.Album; import com.cappielloantonio.play.model.Artist; import com.cappielloantonio.play.ui.activity.MainActivity; import com.cappielloantonio.play.viewmodel.ArtistListPageViewModel; @@ -54,10 +53,10 @@ public class ArtistListPageFragment extends Fragment { } private void init() { - if (getArguments().getString(Artist.STARRED) != null) { + if (requireArguments().getString(Artist.STARRED) != null) { artistListPageViewModel.title = Artist.STARRED; bind.pageTitleLabel.setText("Starred artists"); - } else if (getArguments().getString(Artist.DOWNLOADED) != null) { + } else if (requireArguments().getString(Artist.DOWNLOADED) != null) { artistListPageViewModel.title = Artist.DOWNLOADED; bind.pageTitleLabel.setText("Downloaded artists"); } 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 90c44676..b4def616 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 @@ -13,7 +13,6 @@ 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; import androidx.lifecycle.ViewModelProvider; @@ -84,7 +83,7 @@ public class ArtistPageFragment extends Fragment { } private void init() { - artistPageViewModel.setArtist(getArguments().getParcelable("artist_object")); + artistPageViewModel.setArtist(requireArguments().getParcelable("artist_object")); bind.mostStreamedSongTextViewClickable.setOnClickListener(v -> { Bundle bundle = new Bundle(); 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 004b3277..cdde347d 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 @@ -23,7 +23,6 @@ import androidx.recyclerview.widget.LinearLayoutManager; import com.cappielloantonio.play.R; import com.cappielloantonio.play.adapter.PlaylistCatalogueAdapter; import com.cappielloantonio.play.databinding.FragmentPlaylistCatalogueBinding; -import com.cappielloantonio.play.model.Album; import com.cappielloantonio.play.model.Playlist; import com.cappielloantonio.play.ui.activity.MainActivity; import com.cappielloantonio.play.viewmodel.PlaylistCatalogueViewModel; @@ -71,9 +70,9 @@ public class PlaylistCatalogueFragment extends Fragment { } private void init() { - if (getArguments().getString(Playlist.ALL) != null) { + if (requireArguments().getString(Playlist.ALL) != null) { playlistCatalogueViewModel.setType(Playlist.ALL); - } else if (getArguments().getString(Playlist.DOWNLOADED) != null) { + } else if (requireArguments().getString(Playlist.DOWNLOADED) != null) { playlistCatalogueViewModel.setType(Playlist.DOWNLOADED); } } 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 f27eb2f2..b591c748 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 @@ -1,6 +1,5 @@ package com.cappielloantonio.play.ui.fragment; -import android.content.Context; import android.os.Bundle; import android.view.LayoutInflater; import android.view.Menu; @@ -95,8 +94,8 @@ public class PlaylistPageFragment extends Fragment { } private void init() { - playlistPageViewModel.setPlaylist(getArguments().getParcelable("playlist_object")); - playlistPageViewModel.setOffline(getArguments().getBoolean("is_offline")); + playlistPageViewModel.setPlaylist(requireArguments().getParcelable("playlist_object")); + playlistPageViewModel.setOffline(requireArguments().getBoolean("is_offline")); } private void initAppBar() { 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 8ee7aef7..f323d7d2 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 @@ -1,7 +1,6 @@ package com.cappielloantonio.play.ui.fragment; import android.os.Bundle; -import android.text.Html; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -61,40 +60,40 @@ public class SongListPageFragment extends Fragment { } private void init() { - if (getArguments().getString(Song.RECENTLY_PLAYED) != null) { + if (requireArguments().getString(Song.RECENTLY_PLAYED) != null) { songListPageViewModel.title = Song.RECENTLY_PLAYED; bind.pageTitleLabel.setText("Recently played tracks"); - } else if (getArguments().getString(Song.MOST_PLAYED) != null) { + } else if (requireArguments().getString(Song.MOST_PLAYED) != null) { songListPageViewModel.title = Song.MOST_PLAYED; bind.pageTitleLabel.setText("Most played tracks"); - } else if (getArguments().getString(Song.RECENTLY_ADDED) != null) { + } else if (requireArguments().getString(Song.RECENTLY_ADDED) != null) { songListPageViewModel.title = Song.RECENTLY_ADDED; bind.pageTitleLabel.setText("Recently added tracks"); - } else if (getArguments().getString(Song.BY_GENRE) != null) { + } else if (requireArguments().getString(Song.BY_GENRE) != null) { songListPageViewModel.title = Song.BY_GENRE; - songListPageViewModel.genre = getArguments().getParcelable("genre_object"); + songListPageViewModel.genre = requireArguments().getParcelable("genre_object"); bind.pageTitleLabel.setText(MusicUtil.getReadableString(songListPageViewModel.genre.getName()) + ": all tracks"); - } else if (getArguments().getString(Song.BY_ARTIST) != null) { + } else if (requireArguments().getString(Song.BY_ARTIST) != null) { songListPageViewModel.title = Song.BY_ARTIST; - songListPageViewModel.artist = getArguments().getParcelable("artist_object"); + songListPageViewModel.artist = requireArguments().getParcelable("artist_object"); bind.pageTitleLabel.setText(MusicUtil.getReadableString(songListPageViewModel.artist.getName()) + "'s top tracks"); - } else if (getArguments().getString(Song.BY_GENRES) != null) { + } else if (requireArguments().getString(Song.BY_GENRES) != null) { songListPageViewModel.title = Song.BY_GENRES; - songListPageViewModel.filters = getArguments().getStringArrayList("filters_list"); - songListPageViewModel.filterNames = getArguments().getStringArrayList("filter_name_list"); + songListPageViewModel.filters = requireArguments().getStringArrayList("filters_list"); + songListPageViewModel.filterNames = requireArguments().getStringArrayList("filter_name_list"); bind.pageTitleLabel.setText(songListPageViewModel.getFiltersTitle()); - } else if (getArguments().getString(Song.BY_YEAR) != null) { + } else if (requireArguments().getString(Song.BY_YEAR) != null) { songListPageViewModel.title = Song.BY_YEAR; - songListPageViewModel.year = getArguments().getInt("year_object"); + songListPageViewModel.year = requireArguments().getInt("year_object"); bind.pageTitleLabel.setText("Year " + songListPageViewModel.year); - } else if (getArguments().getString(Song.STARRED) != null) { + } else if (requireArguments().getString(Song.STARRED) != null) { songListPageViewModel.title = Song.STARRED; bind.pageTitleLabel.setText("Starred tracks"); - } else if (getArguments().getString(Song.DOWNLOADED) != null) { + } else if (requireArguments().getString(Song.DOWNLOADED) != null) { songListPageViewModel.title = Song.DOWNLOADED; bind.pageTitleLabel.setText("Downloaded"); - } else if (getArguments().getParcelable("album_object") != null) { - songListPageViewModel.album = getArguments().getParcelable("album_object"); + } else if (requireArguments().getParcelable("album_object") != null) { + songListPageViewModel.album = requireArguments().getParcelable("album_object"); songListPageViewModel.title = Song.FROM_ALBUM; bind.pageTitleLabel.setText(MusicUtil.getReadableString(songListPageViewModel.album.getTitle())); } 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 d3dc0aee..19155ebe 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 @@ -45,7 +45,7 @@ public class AlbumBottomSheetDialog extends BottomSheetDialogFragment implements public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { View view = inflater.inflate(R.layout.bottom_sheet_album_dialog, container, false); - album = this.getArguments().getParcelable("album_object"); + album = this.requireArguments().getParcelable("album_object"); albumBottomSheetViewModel = new ViewModelProvider(requireActivity()).get(AlbumBottomSheetViewModel.class); albumBottomSheetViewModel.setAlbum(album); 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 92207f9e..e1ed65a8 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 @@ -1,7 +1,6 @@ package com.cappielloantonio.play.ui.fragment.bottomsheetdialog; import android.os.Bundle; -import android.text.Html; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -25,7 +24,6 @@ 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.ui.fragment.dialog.RatingDialog; import com.cappielloantonio.play.util.MusicUtil; import com.cappielloantonio.play.viewmodel.ArtistBottomSheetViewModel; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; @@ -44,7 +42,7 @@ public class ArtistBottomSheetDialog extends BottomSheetDialogFragment implement public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { View view = inflater.inflate(R.layout.bottom_sheet_artist_dialog, container, false); - artist = this.getArguments().getParcelable("artist_object"); + artist = this.requireArguments().getParcelable("artist_object"); artistBottomSheetViewModel = new ViewModelProvider(requireActivity()).get(ArtistBottomSheetViewModel.class); artistBottomSheetViewModel.setArtist(artist); 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 9d62dc65..6a23fb65 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 @@ -1,7 +1,6 @@ package com.cappielloantonio.play.ui.fragment.bottomsheetdialog; import android.os.Bundle; -import android.text.Html; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -27,7 +26,6 @@ import com.cappielloantonio.play.service.MusicPlayerRemote; import com.cappielloantonio.play.ui.activity.MainActivity; import com.cappielloantonio.play.ui.fragment.dialog.PlaylistChooserDialog; import com.cappielloantonio.play.ui.fragment.dialog.RatingDialog; -import com.cappielloantonio.play.ui.fragment.dialog.ServerSignupDialog; import com.cappielloantonio.play.util.DownloadUtil; import com.cappielloantonio.play.util.MusicUtil; import com.cappielloantonio.play.viewmodel.SongBottomSheetViewModel; @@ -48,7 +46,7 @@ public class SongBottomSheetDialog extends BottomSheetDialogFragment implements public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { View view = inflater.inflate(R.layout.bottom_sheet_song_dialog, container, false); - song = this.getArguments().getParcelable("song_object"); + song = requireArguments().getParcelable("song_object"); songBottomSheetViewModel = new ViewModelProvider(requireActivity()).get(SongBottomSheetViewModel.class); songBottomSheetViewModel.setSong(song); 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 00fdf909..29c39af4 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 @@ -59,11 +59,7 @@ public class PlaylistChooserDialog extends DialogFragment { } private void setSongInfo() { - if (getArguments() != null) { - playlistChooserViewModel.setSongToAdd(getArguments().getParcelable("song_object")); - } else { - playlistChooserViewModel.setSongToAdd(null); - } + playlistChooserViewModel.setSongToAdd(requireArguments().getParcelable("song_object")); } private void setButtonAction() { @@ -90,7 +86,7 @@ public class PlaylistChooserDialog extends DialogFragment { bind.playlistDialogRecyclerView.setAdapter(playlistHorizontalAdapter); playlistChooserViewModel.getPlaylistList().observe(requireActivity(), playlists -> { - if(playlists != null) { + if (playlists != null) { if (playlists.size() > 0) { if (bind != null) bind.noPlaylistsCreatedTextView.setVisibility(View.GONE); if (bind != null) bind.playlistDialogRecyclerView.setVisibility(View.VISIBLE); 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 846ef963..3bd4f5b5 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 @@ -2,7 +2,6 @@ package com.cappielloantonio.play.ui.fragment.dialog; import android.app.AlertDialog; import android.app.Dialog; -import android.content.Context; import android.os.Bundle; import android.text.TextUtils; import android.view.LayoutInflater; @@ -17,7 +16,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.cappielloantonio.play.R; import com.cappielloantonio.play.adapter.PlaylistDialogSongHorizontalAdapter; import com.cappielloantonio.play.databinding.DialogPlaylistEditorBinding; -import com.cappielloantonio.play.ui.activity.MainActivity; import com.cappielloantonio.play.util.MusicUtil; import com.cappielloantonio.play.viewmodel.PlaylistEditorViewModel; @@ -67,22 +65,16 @@ public class PlaylistEditorDialog extends DialogFragment { } private void setParameterInfo() { - if (getArguments() != null) { - if (getArguments().getParcelable("song_object") != null) { - playlistEditorViewModel.setSongToAdd(getArguments().getParcelable("song_object")); - playlistEditorViewModel.setPlaylistToEdit(null); - } - else if (getArguments().getParcelable("playlist_object") != null) { - playlistEditorViewModel.setSongToAdd(null); - playlistEditorViewModel.setPlaylistToEdit(getArguments().getParcelable("playlist_object")); - - if (playlistEditorViewModel.getPlaylistToEdit() != null) { - bind.playlistNameTextView.setText(MusicUtil.getReadableString(playlistEditorViewModel.getPlaylistToEdit().getName())); - } - } - } else { - playlistEditorViewModel.setSongToAdd(null); + if (requireArguments().getParcelable("song_object") != null) { + playlistEditorViewModel.setSongToAdd(requireArguments().getParcelable("song_object")); playlistEditorViewModel.setPlaylistToEdit(null); + } else if (requireArguments().getParcelable("playlist_object") != null) { + playlistEditorViewModel.setSongToAdd(null); + playlistEditorViewModel.setPlaylistToEdit(requireArguments().getParcelable("playlist_object")); + + if (playlistEditorViewModel.getPlaylistToEdit() != null) { + bind.playlistNameTextView.setText(MusicUtil.getReadableString(playlistEditorViewModel.getPlaylistToEdit().getName())); + } } } 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 b82905ec..1dd65b02 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 @@ -2,7 +2,6 @@ package com.cappielloantonio.play.ui.fragment.dialog; import android.app.AlertDialog; import android.app.Dialog; -import android.content.Context; import android.os.Bundle; import android.view.LayoutInflater; @@ -12,7 +11,6 @@ import androidx.lifecycle.ViewModelProvider; import com.cappielloantonio.play.R; import com.cappielloantonio.play.databinding.DialogRatingBinding; -import com.cappielloantonio.play.ui.activity.MainActivity; import com.cappielloantonio.play.viewmodel.RatingViewModel; import java.util.Objects; @@ -57,14 +55,12 @@ public class RatingDialog extends DialogFragment { } private void setElementInfo() { - if (getArguments() != null) { - if (getArguments().getParcelable("song_object") != null) { - ratingViewModel.setSong(getArguments().getParcelable("song_object")); - } else if (getArguments().getParcelable("album_object") != null) { - ratingViewModel.setAlbum(getArguments().getParcelable("album_object")); - } else if (getArguments().getParcelable("artist_object") != null) { - ratingViewModel.setArtist(getArguments().getParcelable("artist_object")); - } + if (requireArguments().getParcelable("song_object") != null) { + ratingViewModel.setSong(requireArguments().getParcelable("song_object")); + } else if (requireArguments().getParcelable("album_object") != null) { + ratingViewModel.setAlbum(requireArguments().getParcelable("album_object")); + } else if (requireArguments().getParcelable("artist_object") != null) { + ratingViewModel.setArtist(requireArguments().getParcelable("artist_object")); } } 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 08217676..2646cedd 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 @@ -81,18 +81,14 @@ public class ServerSignupDialog extends DialogFragment { } private void setServerInfo() { - if (getArguments() != null) { - loginViewModel.setServerToEdit(getArguments().getParcelable("server_object")); + loginViewModel.setServerToEdit(requireArguments().getParcelable("server_object")); - if (loginViewModel.getServerToEdit() != null) { - bind.serverNameTextView.setText(loginViewModel.getServerToEdit().getServerName()); - bind.usernameTextView.setText(loginViewModel.getServerToEdit().getUsername()); - bind.passwordTextView.setText(""); - bind.serverTextView.setText(loginViewModel.getServerToEdit().getAddress()); - bind.directAccessCheckbox.setChecked(false); - } - } else { - loginViewModel.setServerToEdit(null); + if (loginViewModel.getServerToEdit() != null) { + bind.serverNameTextView.setText(loginViewModel.getServerToEdit().getServerName()); + bind.usernameTextView.setText(loginViewModel.getServerToEdit().getUsername()); + bind.passwordTextView.setText(""); + bind.serverTextView.setText(loginViewModel.getServerToEdit().getAddress()); + bind.directAccessCheckbox.setChecked(false); } }