From 48e2f0fb3b75da1ba620aaa9ec14cec51bc0ca73 Mon Sep 17 00:00:00 2001 From: dkanada Date: Sun, 23 May 2021 19:49:12 +0900 Subject: [PATCH] minor changes to material dialog builders --- .../dialogs/RemoveFromPlaylistDialog.java | 5 +--- .../dialogs/RenamePlaylistDialog.java | 24 +++++++++---------- .../gramophone/dialogs/SleepTimerDialog.java | 2 +- .../preferences/CategoryPreferenceDialog.java | 4 ++-- .../DirectPlayPreferenceDialog.java | 9 ++----- .../NowPlayingPreferenceDialog.java | 22 +++-------------- 6 files changed, 21 insertions(+), 45 deletions(-) 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 91253db1..d2df5290 100644 --- a/app/src/main/java/com/dkanada/gramophone/dialogs/RemoveFromPlaylistDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/RemoveFromPlaylistDialog.java @@ -57,10 +57,7 @@ public class RemoveFromPlaylistDialog extends DialogFragment { .content(content) .positiveText(R.string.remove_action) .negativeText(android.R.string.cancel) - .onPositive((dialog, which) -> { - PlaylistSong song = songs.get(0); - PlaylistUtil.deleteItems(songs, song.playlistId); - }) + .onPositive((dialog, which) -> PlaylistUtil.deleteItems(songs, songs.get(0).playlistId)) .build(); } } 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 252c2dda..7ab69ee1 100644 --- a/app/src/main/java/com/dkanada/gramophone/dialogs/RenamePlaylistDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/RenamePlaylistDialog.java @@ -30,18 +30,18 @@ public class RenamePlaylistDialog extends DialogFragment { @Override public Dialog onCreateDialog(Bundle savedInstanceState) { return new MaterialDialog.Builder(requireContext()) - .title(R.string.rename_playlist_title) - .positiveText(R.string.rename_action) - .negativeText(android.R.string.cancel) - .inputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PERSON_NAME | InputType.TYPE_TEXT_FLAG_CAP_WORDS) - .input(getString(R.string.name), "", false, (materialDialog, charSequence) -> { - final String name = charSequence.toString().trim(); + .title(R.string.rename_playlist_title) + .positiveText(R.string.rename_action) + .negativeText(android.R.string.cancel) + .inputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PERSON_NAME | InputType.TYPE_TEXT_FLAG_CAP_WORDS) + .input(getString(R.string.name), "", false, (materialDialog, charSequence) -> { + final String name = charSequence.toString().trim(); - if (!name.isEmpty()) { - String id = getArguments().getString(PLAYLIST); - PlaylistUtil.renamePlaylist(id, name); - } - }) - .build(); + if (!name.isEmpty()) { + String id = getArguments().getString(PLAYLIST); + PlaylistUtil.renamePlaylist(id, name); + } + }) + .build(); } } \ No newline at end of file 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 6bec4c4d..16824565 100644 --- a/app/src/main/java/com/dkanada/gramophone/dialogs/SleepTimerDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/SleepTimerDialog.java @@ -48,6 +48,7 @@ public class SleepTimerDialog extends DialogFragment { timerUpdater = new TimerUpdater(); materialDialog = new MaterialDialog.Builder(requireActivity()) + .customView(binding.getRoot(), false) .title(R.string.action_sleep_timer) .positiveText(R.string.action_set) .onPositive((dialog, which) -> { @@ -84,7 +85,6 @@ public class SleepTimerDialog extends DialogFragment { timerUpdater.start(); } }) - .customView(binding.getRoot(), false) .build(); if (materialDialog.getCustomView() == null) { diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/CategoryPreferenceDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/CategoryPreferenceDialog.java index 94fb39b3..379a853e 100644 --- a/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/CategoryPreferenceDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/CategoryPreferenceDialog.java @@ -48,11 +48,11 @@ public class CategoryPreferenceDialog extends DialogFragment { adapter.attachToRecyclerView(recyclerView); return new MaterialDialog.Builder(requireActivity()) - .title(R.string.pref_title_categories) .customView(view, false) + .title(R.string.pref_title_categories) .positiveText(android.R.string.ok) - .negativeText(android.R.string.cancel) .neutralText(R.string.reset_action) + .negativeText(android.R.string.cancel) .autoDismiss(false) .onNeutral((dialog, action) -> adapter.setCategories(PreferenceUtil.getInstance(getContext()).getDefaultCategories())) .onNegative((dialog, action) -> dismiss()) diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/DirectPlayPreferenceDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/DirectPlayPreferenceDialog.java index 8d5c3578..8633fd5b 100644 --- a/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/DirectPlayPreferenceDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/DirectPlayPreferenceDialog.java @@ -35,16 +35,11 @@ public class DirectPlayPreferenceDialog extends DialogFragment { recyclerView.setAdapter(adapter); return new MaterialDialog.Builder(requireActivity()) - .title(R.string.pref_title_direct_play_codecs) .customView(view, false) + .title(R.string.pref_title_direct_play_codecs) .positiveText(android.R.string.ok) .negativeText(android.R.string.cancel) - .autoDismiss(false) - .onNegative((dialog, action) -> dismiss()) - .onPositive((dialog, action) -> { - PreferenceUtil.getInstance(getContext()).setDirectPlayCodecs(adapter.getCodecs()); - dismiss(); - }) + .onPositive((dialog, action) -> PreferenceUtil.getInstance(getContext()).setDirectPlayCodecs(adapter.getCodecs())) .build(); } } diff --git a/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/NowPlayingPreferenceDialog.java b/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/NowPlayingPreferenceDialog.java index ecb3a0ee..a1f8f463 100644 --- a/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/NowPlayingPreferenceDialog.java +++ b/app/src/main/java/com/dkanada/gramophone/dialogs/preferences/NowPlayingPreferenceDialog.java @@ -2,7 +2,6 @@ package com.dkanada.gramophone.dialogs.preferences; import android.app.Dialog; import android.content.Context; -import android.content.DialogInterface; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -15,17 +14,15 @@ import androidx.fragment.app.DialogFragment; import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; -import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; import com.dkanada.gramophone.R; import com.dkanada.gramophone.fragments.player.NowPlayingScreen; import com.dkanada.gramophone.util.PreferenceUtil; import com.pixelcan.inkpageindicator.InkPageIndicator; -public class NowPlayingPreferenceDialog extends DialogFragment implements MaterialDialog.SingleButtonCallback, ViewPager.OnPageChangeListener { +public class NowPlayingPreferenceDialog extends DialogFragment implements ViewPager.OnPageChangeListener { public static final String TAG = NowPlayingPreferenceDialog.class.getSimpleName(); - private DialogAction whichButtonClicked; private int viewPagerPosition; public static NowPlayingPreferenceDialog newInstance() { @@ -46,27 +43,14 @@ public class NowPlayingPreferenceDialog extends DialogFragment implements Materi pageIndicator.onPageSelected(viewPager.getCurrentItem()); return new MaterialDialog.Builder(requireActivity()) + .customView(view, false) .title(R.string.pref_title_now_playing_appearance) .positiveText(android.R.string.ok) .negativeText(android.R.string.cancel) - .onAny(this) - .customView(view, false) + .onPositive((dialog, action) -> PreferenceUtil.getInstance(getContext()).setNowPlayingScreen(NowPlayingScreen.values()[viewPagerPosition])) .build(); } - @Override - public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { - whichButtonClicked = which; - } - - @Override - public void onDismiss(@NonNull DialogInterface dialog) { - super.onDismiss(dialog); - if (whichButtonClicked == DialogAction.POSITIVE) { - PreferenceUtil.getInstance(getContext()).setNowPlayingScreen(NowPlayingScreen.values()[viewPagerPosition]); - } - } - @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { }