tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor changes to material dialog builders

Browse source
This commit is contained in:
dkanada 2021-05-23 19:49:12 +09:00
commit 48e2f0fb3b
6 changed files with 22 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/dkanada/gramophone/dialogs/RemoveFromPlaylistDialog.java
View file

@ -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();
}
}

24
app/src/main/java/com/dkanada/gramophone/dialogs/RenamePlaylistDialog.java
View file

@ -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();
}
}

2
app/src/main/java/com/dkanada/gramophone/dialogs/SleepTimerDialog.java
View file

@ -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) {

4
app/src/main/java/com/dkanada/gramophone/dialogs/preferences/CategoryPreferenceDialog.java
View file

@ -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())

9
app/src/main/java/com/dkanada/gramophone/dialogs/preferences/DirectPlayPreferenceDialog.java
View file

@ -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();
}
}

22
app/src/main/java/com/dkanada/gramophone/dialogs/preferences/NowPlayingPreferenceDialog.java
View file

@ -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) {
}