diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/AddToPlaylistDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/AddToPlaylistDialog.java index 4a94b0ba..628dc583 100644 --- a/app/src/main/java/com/dkanada/gramophone/dialogs/AddToPlaylistDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/AddToPlaylistDialog.java @@ -18,7 +18,6 @@ import java.util.ArrayList; import java.util.List; public class AddToPlaylistDialog extends DialogFragment { - @NonNull public static AddToPlaylistDialog create(Song song) { List list = new ArrayList<>(); @@ -41,16 +40,16 @@ public class AddToPlaylistDialog extends DialogFragment { @Override public Dialog onCreateDialog(Bundle savedInstanceState) { List playlists = new ArrayList<>(); - MaterialDialog dialog = new MaterialDialog.Builder(getActivity()) + MaterialDialog dialog = new MaterialDialog.Builder(requireActivity()) .title(R.string.action_add_to_playlist) - .items(getActivity().getResources().getString(R.string.action_new_playlist)) + .items(requireActivity().getResources().getString(R.string.action_new_playlist)) .itemsCallback((materialDialog, view, i, charSequence) -> { final List songs = getArguments().getParcelableArrayList("songs"); if (songs == null) return; if (i == 0) { materialDialog.dismiss(); - CreatePlaylistDialog.create(songs).show(getActivity().getSupportFragmentManager(), "ADD_TO_PLAYLIST"); + CreatePlaylistDialog.create(songs).show(requireActivity().getSupportFragmentManager(), "ADD_TO_PLAYLIST"); } else { materialDialog.dismiss(); PlaylistUtil.addItems(songs, playlists.get(i - 1).id); @@ -64,7 +63,7 @@ public class AddToPlaylistDialog extends DialogFragment { playlists.addAll((List) media); CharSequence[] names = new CharSequence[playlists.size() + 1]; - names[0] = getActivity().getResources().getString(R.string.action_new_playlist); + names[0] = requireActivity().getResources().getString(R.string.action_new_playlist); for (int i = 0; i < playlists.size(); i++) { names[i + 1] = playlists.get(i).name; } diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/ConfirmLogoutDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/ConfirmLogoutDialog.java index 086787f3..ecd39ed9 100644 --- a/app/src/main/java/com/dkanada/gramophone/dialogs/ConfirmLogoutDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/ConfirmLogoutDialog.java @@ -23,13 +23,12 @@ public class ConfirmLogoutDialog extends DialogFragment { @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - return new MaterialDialog.Builder(getActivity()) + return new MaterialDialog.Builder(requireActivity()) .title(R.string.logout) .content(R.string.confirm_logout) .positiveText(R.string.logout) .negativeText(android.R.string.cancel) .onPositive((dialog, which) -> { - if (getActivity() == null) return; App.getApiClient().Logout(new EmptyResponse()); Intent intent = new Intent(getActivity(), LoginActivity.class); diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/CreatePlaylistDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/CreatePlaylistDialog.java index e5414f3d..d812df99 100644 --- a/app/src/main/java/com/dkanada/gramophone/dialogs/CreatePlaylistDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/CreatePlaylistDialog.java @@ -17,7 +17,6 @@ import java.util.ArrayList; import java.util.List; public class CreatePlaylistDialog extends DialogFragment { - private static final String SONGS = "songs"; @NonNull @@ -44,7 +43,7 @@ public class CreatePlaylistDialog extends DialogFragment { @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - return new MaterialDialog.Builder(getActivity()) + return new MaterialDialog.Builder(requireActivity()) .title(R.string.action_new_playlist) .positiveText(R.string.create_action) .negativeText(android.R.string.cancel) diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/DeletePlaylistDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/DeletePlaylistDialog.java index dcf31f2f..5c827de1 100644 --- a/app/src/main/java/com/dkanada/gramophone/dialogs/DeletePlaylistDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/DeletePlaylistDialog.java @@ -16,7 +16,6 @@ import java.util.ArrayList; import java.util.List; public class DeletePlaylistDialog extends DialogFragment { - @NonNull public static DeletePlaylistDialog create(Playlist playlist) { List list = new ArrayList<>(); @@ -48,7 +47,7 @@ public class DeletePlaylistDialog extends DialogFragment { content = Html.fromHtml(getString(R.string.delete_playlist_x, playlists.get(0).name)); } - return new MaterialDialog.Builder(getActivity()) + return new MaterialDialog.Builder(requireActivity()) .title(title) .content(content) .positiveText(R.string.delete_action) diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/RemoveFromPlaylistDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/RemoveFromPlaylistDialog.java index 155ff203..b236f17c 100644 --- a/app/src/main/java/com/dkanada/gramophone/dialogs/RemoveFromPlaylistDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/RemoveFromPlaylistDialog.java @@ -17,7 +17,6 @@ import java.util.ArrayList; import java.util.List; public class RemoveFromPlaylistDialog extends DialogFragment { - @NonNull public static RemoveFromPlaylistDialog create(Song song) { List list = new ArrayList<>(); @@ -51,7 +50,7 @@ public class RemoveFromPlaylistDialog extends DialogFragment { content = Html.fromHtml(getString(R.string.remove_song_x_from_playlist, songs.get(0).title)); } - return new MaterialDialog.Builder(getActivity()) + return new MaterialDialog.Builder(requireActivity()) .title(title) .content(content) .positiveText(R.string.remove_action) diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/RenamePlaylistDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/RenamePlaylistDialog.java index 5ea065ac..f7146062 100644 --- a/app/src/main/java/com/dkanada/gramophone/dialogs/RenamePlaylistDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/RenamePlaylistDialog.java @@ -13,7 +13,6 @@ import com.dkanada.gramophone.model.Playlist; import com.dkanada.gramophone.util.PlaylistUtil; public class RenamePlaylistDialog extends DialogFragment { - private static final String PLAYLIST_ID = "playlist_id"; @NonNull @@ -31,7 +30,7 @@ public class RenamePlaylistDialog extends DialogFragment { @Override public Dialog onCreateDialog(Bundle savedInstanceState) { String playlistId = getArguments().getString(PLAYLIST_ID); - return new MaterialDialog.Builder(getActivity()) + return new MaterialDialog.Builder(requireContext()) .title(R.string.rename_playlist_title) .positiveText(R.string.rename_action) .negativeText(android.R.string.cancel) diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/SleepTimerDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/SleepTimerDialog.java index 88a1a7b0..6bec4c4d 100644 --- a/app/src/main/java/com/dkanada/gramophone/dialogs/SleepTimerDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/SleepTimerDialog.java @@ -35,7 +35,7 @@ public class SleepTimerDialog extends DialogFragment { private int seekArcProgress; @Override - public void onDismiss(DialogInterface dialog) { + public void onDismiss(@NonNull DialogInterface dialog) { super.onDismiss(dialog); timerUpdater.cancel(); @@ -47,14 +47,10 @@ public class SleepTimerDialog extends DialogFragment { binding = DialogSleepTimerBinding.inflate(getLayoutInflater()); timerUpdater = new TimerUpdater(); - materialDialog = new MaterialDialog.Builder(getActivity()) - .title(getActivity().getResources().getString(R.string.action_sleep_timer)) + materialDialog = new MaterialDialog.Builder(requireActivity()) + .title(R.string.action_sleep_timer) .positiveText(R.string.action_set) .onPositive((dialog, which) -> { - if (getActivity() == null) { - return; - } - PreferenceUtil.getInstance(getActivity()).setSleepTimerFinishMusic(binding.shouldFinishLastSong.isChecked()); final int minutes = seekArcProgress; @@ -63,28 +59,24 @@ public class SleepTimerDialog extends DialogFragment { final long nextSleepTimerElapsedTime = SystemClock.elapsedRealtime() + minutes * 60 * 1000; PreferenceUtil.getInstance(getActivity()).setNextSleepTimerElapsedRealtime(nextSleepTimerElapsedTime); - AlarmManager am = (AlarmManager) getActivity().getSystemService(Context.ALARM_SERVICE); + AlarmManager am = (AlarmManager) requireActivity().getSystemService(Context.ALARM_SERVICE); am.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, nextSleepTimerElapsedTime, pi); - Toast.makeText(getActivity(), getActivity().getResources().getString(R.string.sleep_timer_set, minutes), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), requireActivity().getResources().getString(R.string.sleep_timer_set, minutes), Toast.LENGTH_SHORT).show(); }) .onNeutral((dialog, which) -> { - if (getActivity() == null) { - return; - } - final PendingIntent previous = makeTimerPendingIntent(PendingIntent.FLAG_NO_CREATE); if (previous != null) { - AlarmManager am = (AlarmManager) getActivity().getSystemService(Context.ALARM_SERVICE); + AlarmManager am = (AlarmManager) requireActivity().getSystemService(Context.ALARM_SERVICE); am.cancel(previous); previous.cancel(); - Toast.makeText(getActivity(), getActivity().getResources().getString(R.string.sleep_timer_canceled), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), requireActivity().getResources().getString(R.string.sleep_timer_canceled), Toast.LENGTH_SHORT).show(); } MusicService musicService = MusicPlayerRemote.musicService; if (musicService != null && musicService.pendingQuit) { musicService.pendingQuit = false; - Toast.makeText(getActivity(), getActivity().getResources().getString(R.string.sleep_timer_canceled), Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), requireActivity().getResources().getString(R.string.sleep_timer_canceled), Toast.LENGTH_SHORT).show(); } }) .showListener(dialog -> { @@ -95,7 +87,7 @@ public class SleepTimerDialog extends DialogFragment { .customView(binding.getRoot(), false) .build(); - if (getActivity() == null || materialDialog.getCustomView() == null) { + if (materialDialog.getCustomView() == null) { return materialDialog; } diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/SongDetailDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/SongDetailDialog.java index bd4f4d49..0ac8a8bb 100644 --- a/app/src/main/java/com/dkanada/gramophone/dialogs/SongDetailDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/SongDetailDialog.java @@ -53,7 +53,7 @@ public class SongDetailDialog extends DialogFragment { @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - final Activity context = getActivity(); + final Activity context = requireActivity(); final Song song = getArguments().getParcelable("song"); MaterialDialog dialog = new MaterialDialog.Builder(context) diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/SongShareDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/SongShareDialog.java index a5661cdf..574c0faf 100644 --- a/app/src/main/java/com/dkanada/gramophone/dialogs/SongShareDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/SongShareDialog.java @@ -27,7 +27,7 @@ public class SongShareDialog extends DialogFragment { public Dialog onCreateDialog(Bundle savedInstanceState) { final Song song = getArguments().getParcelable("song"); final String currentlyListening = getString(R.string.currently_listening_to_x_by_x, song.title, song.artistName); - return new MaterialDialog.Builder(getActivity()) + return new MaterialDialog.Builder(requireActivity()) .title(R.string.what_do_you_want_to_share) .items(getString(R.string.the_audio_file), "\u201C" + currentlyListening + "\u201D") .itemsCallback((materialDialog, view, i, charSequence) -> { @@ -36,7 +36,7 @@ public class SongShareDialog extends DialogFragment { startActivity(Intent.createChooser(MusicUtil.createShareSongFileIntent(song, getContext()), null)); break; case 1: - getActivity().startActivity( + startActivity( Intent.createChooser( new Intent() .setAction(Intent.ACTION_SEND) diff --git a/app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreferenceDialog.java b/app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreferenceDialog.java index 879671f3..297235e6 100644 --- a/app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreferenceDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/preferences/CategoryPreferenceDialog.java @@ -28,7 +28,7 @@ public class CategoryPreferenceDialog extends DialogFragment { @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - View view = getActivity().getLayoutInflater().inflate(R.layout.preference_dialog_category, null); + View view = requireActivity().getLayoutInflater().inflate(R.layout.preference_dialog_category, null); List categories; if (savedInstanceState != null) { @@ -45,7 +45,7 @@ public class CategoryPreferenceDialog extends DialogFragment { adapter.attachToRecyclerView(recyclerView); - return new MaterialDialog.Builder(getContext()) + return new MaterialDialog.Builder(requireActivity()) .title(R.string.library_categories) .customView(view, false) .positiveText(android.R.string.ok) diff --git a/app/src/main/java/com/dkanada/gramophone/preferences/DirectPlayPreferenceDialog.java b/app/src/main/java/com/dkanada/gramophone/preferences/DirectPlayPreferenceDialog.java index 1ea1e92e..ac7f27de 100644 --- a/app/src/main/java/com/dkanada/gramophone/preferences/DirectPlayPreferenceDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/preferences/DirectPlayPreferenceDialog.java @@ -24,7 +24,7 @@ public class DirectPlayPreferenceDialog extends DialogFragment { @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - View view = getActivity().getLayoutInflater().inflate(R.layout.preference_dialog_direct_play_codecs, null); + View view = requireActivity().getLayoutInflater().inflate(R.layout.preference_dialog_direct_play_codecs, null); adapter = new DirectPlayCodecAdapter(PreferenceUtil.getInstance(getContext()).getDirectPlayCodecs()); @@ -32,7 +32,7 @@ public class DirectPlayPreferenceDialog extends DialogFragment { recyclerView.setLayoutManager(new LinearLayoutManager(getActivity())); recyclerView.setAdapter(adapter); - return new MaterialDialog.Builder(getContext()) + return new MaterialDialog.Builder(requireActivity()) .title(R.string.direct_play_codecs) .customView(view, false) .positiveText(android.R.string.ok) diff --git a/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java b/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java index 01d8c862..e9ba453e 100644 --- a/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/preferences/NowPlayingScreenPreferenceDialog.java @@ -36,7 +36,7 @@ public class NowPlayingScreenPreferenceDialog extends DialogFragment implements @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - @SuppressLint("InflateParams") View view = LayoutInflater.from(getContext()).inflate(R.layout.preference_dialog_now_playing, null); + View view = LayoutInflater.from(getContext()).inflate(R.layout.preference_dialog_now_playing, null); ViewPager viewPager = view.findViewById(R.id.now_playing_screen_view_pager); viewPager.setAdapter(new NowPlayingScreenAdapter(getContext())); viewPager.addOnPageChangeListener(this); @@ -47,7 +47,7 @@ public class NowPlayingScreenPreferenceDialog extends DialogFragment implements pageIndicator.setViewPager(viewPager); pageIndicator.onPageSelected(viewPager.getCurrentItem()); - return new MaterialDialog.Builder(getContext()) + return new MaterialDialog.Builder(requireActivity()) .title(R.string.pref_title_now_playing_screen_appearance) .positiveText(android.R.string.ok) .negativeText(android.R.string.cancel) @@ -62,7 +62,7 @@ public class NowPlayingScreenPreferenceDialog extends DialogFragment implements } @Override - public void onDismiss(DialogInterface dialog) { + public void onDismiss(@NonNull DialogInterface dialog) { super.onDismiss(dialog); if (whichButtonClicked == DialogAction.POSITIVE) { PreferenceUtil.getInstance(getContext()).setNowPlayingScreen(NowPlayingScreen.values()[viewPagerPosition]); @@ -89,8 +89,8 @@ public class NowPlayingScreenPreferenceDialog extends DialogFragment implements this.context = context; } - @Override @NonNull + @Override public Object instantiateItem(@NonNull ViewGroup collection, int position) { NowPlayingScreen nowPlayingScreen = NowPlayingScreen.values()[position]; diff --git a/app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java b/app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java index 0d6ed79c..19ca0bf2 100644 --- a/app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java +++ b/app/src/main/java/com/dkanada/gramophone/ui/activities/SettingsActivity.java @@ -139,7 +139,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia } @Override - public void onViewCreated(View view, Bundle savedInstanceState) { + public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); getListView().setPadding(0, 0, 0, 0); invalidateSettings(); @@ -159,40 +159,40 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia String themeName = (String) o; setSummary(generalTheme, o); - ThemeStore.markChanged(getActivity()); + ThemeStore.markChanged(requireActivity()); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { // set the new theme so that updateAppShortcuts can pull it - getActivity().setTheme(PreferenceUtil.getThemeResFromPrefValue(themeName)); + requireActivity().setTheme(PreferenceUtil.getThemeResFromPrefValue(themeName)); new DynamicShortcutManager(getActivity()).updateDynamicShortcuts(); } - getActivity().recreate(); + requireActivity().recreate(); return true; }); final ATEColorPreference primaryColorPref = findPreference(PreferenceUtil.PRIMARY_COLOR); - final int primaryColor = ThemeStore.primaryColor(getActivity()); + final int primaryColor = ThemeStore.primaryColor(requireActivity()); primaryColorPref.setColor(primaryColor, ColorUtil.darkenColor(primaryColor)); primaryColorPref.setOnPreferenceClickListener(preference -> { - new ColorChooserDialog.Builder(getActivity(), R.string.primary_color) + new ColorChooserDialog.Builder(requireActivity(), R.string.primary_color) .accentMode(false) .allowUserColorInput(true) .allowUserColorInputAlpha(false) .preselect(primaryColor) - .show(getActivity()); + .show(requireActivity()); return true; }); final ATEColorPreference accentColorPref = findPreference(PreferenceUtil.ACCENT_COLOR); - final int accentColor = ThemeStore.accentColor(getActivity()); + final int accentColor = ThemeStore.accentColor(requireActivity()); accentColorPref.setColor(accentColor, ColorUtil.darkenColor(accentColor)); accentColorPref.setOnPreferenceClickListener(preference -> { - new ColorChooserDialog.Builder(getActivity(), R.string.accent_color) + new ColorChooserDialog.Builder(requireActivity(), R.string.accent_color) .accentMode(true) .allowUserColorInput(true) .allowUserColorInputAlpha(false) .preselect(accentColor) - .show(getActivity()); + .show(requireActivity()); return true; });