Change Dialogs

Update the dialogs to use material you theme.
This commit is contained in:
kingbluezback 2023-10-22 20:42:40 -07:00 committed by GitHub
parent 0c3086d68b
commit d3d76dd435
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 104 additions and 91 deletions

View file

@ -14,6 +14,7 @@ import androidx.media3.common.util.UnstableApi;
import com.cappielloantonio.tempo.R; import com.cappielloantonio.tempo.R;
import com.cappielloantonio.tempo.databinding.DialogBatteryOptimizationBinding; import com.cappielloantonio.tempo.databinding.DialogBatteryOptimizationBinding;
import com.cappielloantonio.tempo.util.Preferences; import com.cappielloantonio.tempo.util.Preferences;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@OptIn(markerClass = UnstableApi.class) @OptIn(markerClass = UnstableApi.class)
public class BatteryOptimizationDialog extends DialogFragment { public class BatteryOptimizationDialog extends DialogFragment {
@ -24,22 +25,15 @@ public class BatteryOptimizationDialog extends DialogFragment {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
bind = DialogBatteryOptimizationBinding.inflate(getLayoutInflater()); DialogBatteryOptimizationBinding bind = DialogBatteryOptimizationBinding.inflate(getLayoutInflater());
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); return new MaterialAlertDialogBuilder(requireContext())
builder.setView(bind.getRoot())
.setTitle(R.string.activity_battery_optimizations_title) .setTitle(R.string.activity_battery_optimizations_title)
.setNeutralButton(R.string.battery_optimization_neutral_button, (dialog, id) -> Preferences.dontAskForOptimization()) .setView(bind.getRoot())
.setPositiveButton(R.string.battery_optimization_positive_button, (dialog, which) -> openPowerSettings())
.setNeutralButton(R.string.battery_optimization_neutral_button, (dialog, which) -> Preferences.dontAskForOptimization())
.setNegativeButton(R.string.battery_optimization_negative_button, null) .setNegativeButton(R.string.battery_optimization_negative_button, null)
.setPositiveButton(R.string.battery_optimization_positive_button, (dialog, id) -> openPowerSettings()); .create();
AlertDialog popup = builder.create();
popup.setCancelable(false);
popup.setCanceledOnTouchOutside(false);
return popup;
} }
@Override @Override

View file

@ -10,6 +10,7 @@ import androidx.fragment.app.DialogFragment;
import com.cappielloantonio.tempo.R; import com.cappielloantonio.tempo.R;
import com.cappielloantonio.tempo.databinding.DialogConnectionAlertBinding; import com.cappielloantonio.tempo.databinding.DialogConnectionAlertBinding;
import com.cappielloantonio.tempo.util.Preferences; import com.cappielloantonio.tempo.util.Preferences;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.util.Objects; import java.util.Objects;
@ -23,7 +24,7 @@ public class ConnectionAlertDialog extends DialogFragment {
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
bind = DialogConnectionAlertBinding.inflate(getLayoutInflater()); bind = DialogConnectionAlertBinding.inflate(getLayoutInflater());
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
builder.setView(bind.getRoot()) builder.setView(bind.getRoot())
.setTitle(R.string.connection_alert_dialog_title) .setTitle(R.string.connection_alert_dialog_title)
@ -52,7 +53,9 @@ public class ConnectionAlertDialog extends DialogFragment {
} }
private void setButtonAction() { private void setButtonAction() {
((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener(v -> { androidx.appcompat.app.AlertDialog alertDialog = (androidx.appcompat.app.AlertDialog) Objects.requireNonNull(getDialog());
alertDialog.getButton(androidx.appcompat.app.AlertDialog.BUTTON_NEUTRAL).setOnClickListener(v -> {
Preferences.setDataSavingMode(true); Preferences.setDataSavingMode(true);
Objects.requireNonNull(getDialog()).dismiss(); Objects.requireNonNull(getDialog()).dismiss();
}); });

View file

@ -14,6 +14,7 @@ import com.cappielloantonio.tempo.R;
import com.cappielloantonio.tempo.databinding.DialogDeleteDownloadStorageBinding; import com.cappielloantonio.tempo.databinding.DialogDeleteDownloadStorageBinding;
import com.cappielloantonio.tempo.interfaces.DialogClickCallback; import com.cappielloantonio.tempo.interfaces.DialogClickCallback;
import com.cappielloantonio.tempo.util.DownloadUtil; import com.cappielloantonio.tempo.util.DownloadUtil;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@OptIn(markerClass = UnstableApi.class) @OptIn(markerClass = UnstableApi.class)
public class DeleteDownloadStorageDialog extends DialogFragment { public class DeleteDownloadStorageDialog extends DialogFragment {
@ -24,7 +25,7 @@ public class DeleteDownloadStorageDialog extends DialogFragment {
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
bind = DialogDeleteDownloadStorageBinding.inflate(getLayoutInflater()); bind = DialogDeleteDownloadStorageBinding.inflate(getLayoutInflater());
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
builder.setView(bind.getRoot()) builder.setView(bind.getRoot())
.setTitle(R.string.delete_download_storage_dialog_title) .setTitle(R.string.delete_download_storage_dialog_title)
@ -47,7 +48,7 @@ public class DeleteDownloadStorageDialog extends DialogFragment {
} }
private void setButtonAction() { private void setButtonAction() {
AlertDialog dialog = ((AlertDialog) getDialog()); androidx.appcompat.app.AlertDialog dialog = (androidx.appcompat.app.AlertDialog) getDialog();
if (dialog != null) { if (dialog != null) {
Button positiveButton = dialog.getButton(Dialog.BUTTON_POSITIVE); Button positiveButton = dialog.getButton(Dialog.BUTTON_POSITIVE);

View file

@ -13,6 +13,7 @@ import androidx.media3.common.util.UnstableApi;
import com.cappielloantonio.tempo.R; import com.cappielloantonio.tempo.R;
import com.cappielloantonio.tempo.databinding.DialogDownloadDirectoryBinding; import com.cappielloantonio.tempo.databinding.DialogDownloadDirectoryBinding;
import com.cappielloantonio.tempo.interfaces.DialogClickCallback; import com.cappielloantonio.tempo.interfaces.DialogClickCallback;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@OptIn(markerClass = UnstableApi.class) @OptIn(markerClass = UnstableApi.class)
public class DownloadDirectoryDialog extends DialogFragment { public class DownloadDirectoryDialog extends DialogFragment {
@ -29,7 +30,7 @@ public class DownloadDirectoryDialog extends DialogFragment {
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
bind = DialogDownloadDirectoryBinding.inflate(getLayoutInflater()); bind = DialogDownloadDirectoryBinding.inflate(getLayoutInflater());
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
builder.setView(bind.getRoot()) builder.setView(bind.getRoot())
.setTitle(R.string.download_directory_dialog_title) .setTitle(R.string.download_directory_dialog_title)
@ -52,7 +53,7 @@ public class DownloadDirectoryDialog extends DialogFragment {
} }
private void setButtonAction() { private void setButtonAction() {
AlertDialog dialog = ((AlertDialog) getDialog()); androidx.appcompat.app.AlertDialog dialog = (androidx.appcompat.app.AlertDialog) getDialog();
if (dialog != null) { if (dialog != null) {
Button positiveButton = dialog.getButton(Dialog.BUTTON_POSITIVE); Button positiveButton = dialog.getButton(Dialog.BUTTON_POSITIVE);

View file

@ -15,6 +15,7 @@ import com.cappielloantonio.tempo.databinding.DialogDownloadStorageBinding;
import com.cappielloantonio.tempo.interfaces.DialogClickCallback; import com.cappielloantonio.tempo.interfaces.DialogClickCallback;
import com.cappielloantonio.tempo.util.DownloadUtil; import com.cappielloantonio.tempo.util.DownloadUtil;
import com.cappielloantonio.tempo.util.Preferences; import com.cappielloantonio.tempo.util.Preferences;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@OptIn(markerClass = UnstableApi.class) @OptIn(markerClass = UnstableApi.class)
public class DownloadStorageDialog extends DialogFragment { public class DownloadStorageDialog extends DialogFragment {
@ -31,7 +32,7 @@ public class DownloadStorageDialog extends DialogFragment {
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
bind = DialogDownloadStorageBinding.inflate(getLayoutInflater()); bind = DialogDownloadStorageBinding.inflate(getLayoutInflater());
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
builder.setView(bind.getRoot()) builder.setView(bind.getRoot())
.setTitle(R.string.download_storage_dialog_title) .setTitle(R.string.download_storage_dialog_title)
@ -54,7 +55,7 @@ public class DownloadStorageDialog extends DialogFragment {
} }
private void setButtonAction() { private void setButtonAction() {
AlertDialog dialog = ((AlertDialog) getDialog()); androidx.appcompat.app.AlertDialog dialog = (androidx.appcompat.app.AlertDialog) getDialog();
if (dialog != null) { if (dialog != null) {
Button positiveButton = dialog.getButton(Dialog.BUTTON_POSITIVE); Button positiveButton = dialog.getButton(Dialog.BUTTON_POSITIVE);

View file

@ -17,6 +17,7 @@ import com.cappielloantonio.tempo.subsonic.models.Playlist;
import com.cappielloantonio.tempo.ui.adapter.PlaylistDialogHorizontalAdapter; import com.cappielloantonio.tempo.ui.adapter.PlaylistDialogHorizontalAdapter;
import com.cappielloantonio.tempo.util.Constants; import com.cappielloantonio.tempo.util.Constants;
import com.cappielloantonio.tempo.viewmodel.PlaylistChooserViewModel; import com.cappielloantonio.tempo.viewmodel.PlaylistChooserViewModel;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.util.Objects; import java.util.Objects;
@ -32,7 +33,7 @@ public class PlaylistChooserDialog extends DialogFragment implements ClickCallba
bind = DialogPlaylistChooserBinding.inflate(getLayoutInflater()); bind = DialogPlaylistChooserBinding.inflate(getLayoutInflater());
playlistChooserViewModel = new ViewModelProvider(requireActivity()).get(PlaylistChooserViewModel.class); playlistChooserViewModel = new ViewModelProvider(requireActivity()).get(PlaylistChooserViewModel.class);
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
builder.setView(bind.getRoot()) builder.setView(bind.getRoot())
.setTitle(R.string.playlist_chooser_dialog_title) .setTitle(R.string.playlist_chooser_dialog_title)
@ -63,7 +64,8 @@ public class PlaylistChooserDialog extends DialogFragment implements ClickCallba
} }
private void setButtonAction() { private void setButtonAction() {
((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener(v -> { androidx.appcompat.app.AlertDialog alertDialog = (androidx.appcompat.app.AlertDialog) Objects.requireNonNull(getDialog());
alertDialog.getButton(androidx.appcompat.app.AlertDialog.BUTTON_NEUTRAL).setOnClickListener(v -> {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
bundle.putParcelable(Constants.TRACK_OBJECT, playlistChooserViewModel.getSongToAdd()); bundle.putParcelable(Constants.TRACK_OBJECT, playlistChooserViewModel.getSongToAdd());

View file

@ -8,7 +8,6 @@ import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.View; import android.view.View;
import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.fragment.app.DialogFragment; import androidx.fragment.app.DialogFragment;
@ -25,6 +24,7 @@ import com.cappielloantonio.tempo.util.Constants;
import com.cappielloantonio.tempo.util.MusicUtil; import com.cappielloantonio.tempo.util.MusicUtil;
import com.cappielloantonio.tempo.util.Preferences; import com.cappielloantonio.tempo.util.Preferences;
import com.cappielloantonio.tempo.viewmodel.PlaylistEditorViewModel; import com.cappielloantonio.tempo.viewmodel.PlaylistEditorViewModel;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.util.Collections; import java.util.Collections;
import java.util.Objects; import java.util.Objects;
@ -47,7 +47,7 @@ public class PlaylistEditorDialog extends DialogFragment {
bind = DialogPlaylistEditorBinding.inflate(getLayoutInflater()); bind = DialogPlaylistEditorBinding.inflate(getLayoutInflater());
playlistEditorViewModel = new ViewModelProvider(requireActivity()).get(PlaylistEditorViewModel.class); playlistEditorViewModel = new ViewModelProvider(requireActivity()).get(PlaylistEditorViewModel.class);
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
builder.setView(bind.getRoot()) builder.setView(bind.getRoot())
.setTitle(R.string.playlist_editor_dialog_title) .setTitle(R.string.playlist_editor_dialog_title)
@ -89,7 +89,9 @@ public class PlaylistEditorDialog extends DialogFragment {
} }
private void setButtonAction() { private void setButtonAction() {
((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> { androidx.appcompat.app.AlertDialog alertDialog = (androidx.appcompat.app.AlertDialog) Objects.requireNonNull(getDialog());
alertDialog.getButton(androidx.appcompat.app.AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> {
if (validateInput()) { if (validateInput()) {
if (playlistEditorViewModel.getSongToAdd() != null) { if (playlistEditorViewModel.getSongToAdd() != null) {
playlistEditorViewModel.createPlaylist(playlistName); playlistEditorViewModel.createPlaylist(playlistName);
@ -101,20 +103,16 @@ public class PlaylistEditorDialog extends DialogFragment {
} }
}); });
((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener(v -> { alertDialog.getButton(androidx.appcompat.app.AlertDialog.BUTTON_NEUTRAL).setOnClickListener(v -> {
playlistEditorViewModel.deletePlaylist(); playlistEditorViewModel.deletePlaylist();
dialogDismiss(); dialogDismiss();
}); });
bind.playlistShareButton.setOnClickListener(view -> { bind.playlistShareButton.setOnClickListener(view -> {
playlistEditorViewModel.sharePlaylist().observe(requireActivity(), sharedPlaylist -> { playlistEditorViewModel.sharePlaylist().observe(requireActivity(), sharedPlaylist -> {
if (sharedPlaylist != null) { ClipboardManager clipboardManager = (ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE);
ClipboardManager clipboardManager = (ClipboardManager) requireActivity().getSystemService(Context.CLIPBOARD_SERVICE); ClipData clipData = ClipData.newPlainText(getString(R.string.app_name), sharedPlaylist.getUrl());
ClipData clipData = ClipData.newPlainText(getString(R.string.app_name), sharedPlaylist.getUrl()); clipboardManager.setPrimaryClip(clipData);
clipboardManager.setPrimaryClip(clipData);
} else {
Toast.makeText(requireContext(), getString(R.string.share_unsupported_error), Toast.LENGTH_SHORT).show();
}
}); });
}); });
@ -188,6 +186,8 @@ public class PlaylistEditorDialog extends DialogFragment {
private void dialogDismiss() { private void dialogDismiss() {
Objects.requireNonNull(getDialog()).dismiss(); Objects.requireNonNull(getDialog()).dismiss();
playlistCallback.onDismiss(); if (playlistCallback != null) {
playlistCallback.onDismiss();
}
} }
} }

View file

@ -4,6 +4,7 @@ import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.widget.Button;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.fragment.app.DialogFragment; import androidx.fragment.app.DialogFragment;
@ -12,9 +13,14 @@ import androidx.lifecycle.ViewModelProvider;
import com.cappielloantonio.tempo.R; import com.cappielloantonio.tempo.R;
import com.cappielloantonio.tempo.databinding.DialogPodcastChannelEditorBinding; import com.cappielloantonio.tempo.databinding.DialogPodcastChannelEditorBinding;
import com.cappielloantonio.tempo.interfaces.PodcastCallback; import com.cappielloantonio.tempo.interfaces.PodcastCallback;
import com.cappielloantonio.tempo.model.Download;
import com.cappielloantonio.tempo.util.DownloadUtil;
import com.cappielloantonio.tempo.util.MappingUtil;
import com.cappielloantonio.tempo.viewmodel.PodcastChannelEditorViewModel; import com.cappielloantonio.tempo.viewmodel.PodcastChannelEditorViewModel;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors;
public class PodcastChannelEditorDialog extends DialogFragment { public class PodcastChannelEditorDialog extends DialogFragment {
private DialogPodcastChannelEditorBinding bind; private DialogPodcastChannelEditorBinding bind;
@ -33,7 +39,7 @@ public class PodcastChannelEditorDialog extends DialogFragment {
bind = DialogPodcastChannelEditorBinding.inflate(getLayoutInflater()); bind = DialogPodcastChannelEditorBinding.inflate(getLayoutInflater());
podcastChannelEditorViewModel = new ViewModelProvider(requireActivity()).get(PodcastChannelEditorViewModel.class); podcastChannelEditorViewModel = new ViewModelProvider(requireActivity()).get(PodcastChannelEditorViewModel.class);
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
builder.setView(bind.getRoot()) builder.setView(bind.getRoot())
.setTitle(R.string.podcast_channel_editor_dialog_title) .setTitle(R.string.podcast_channel_editor_dialog_title)
@ -58,14 +64,19 @@ public class PodcastChannelEditorDialog extends DialogFragment {
} }
private void setButtonAction() { private void setButtonAction() {
((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> { androidx.appcompat.app.AlertDialog dialog = (androidx.appcompat.app.AlertDialog) getDialog();
if (validateInput()) { if (dialog != null) {
podcastChannelEditorViewModel.createChannel(channelUrl); Button positiveButton = dialog.getButton(Dialog.BUTTON_POSITIVE);
dismissDialog(); positiveButton.setOnClickListener(v -> {
} if (validateInput()) {
}); podcastChannelEditorViewModel.createChannel(channelUrl);
dismissDialog();
}
});
}
} }
private boolean validateInput() { private boolean validateInput() {
channelUrl = Objects.requireNonNull(bind.podcastChannelRssUrlNameTextView.getText()).toString().trim(); channelUrl = Objects.requireNonNull(bind.podcastChannelRssUrlNameTextView.getText()).toString().trim();

View file

@ -15,6 +15,7 @@ import com.cappielloantonio.tempo.interfaces.RadioCallback;
import com.cappielloantonio.tempo.subsonic.models.InternetRadioStation; import com.cappielloantonio.tempo.subsonic.models.InternetRadioStation;
import com.cappielloantonio.tempo.util.Constants; import com.cappielloantonio.tempo.util.Constants;
import com.cappielloantonio.tempo.viewmodel.RadioEditorViewModel; import com.cappielloantonio.tempo.viewmodel.RadioEditorViewModel;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.util.Objects; import java.util.Objects;
@ -37,14 +38,27 @@ public class RadioEditorDialog extends DialogFragment {
bind = DialogRadioEditorBinding.inflate(getLayoutInflater()); bind = DialogRadioEditorBinding.inflate(getLayoutInflater());
radioEditorViewModel = new ViewModelProvider(requireActivity()).get(RadioEditorViewModel.class); radioEditorViewModel = new ViewModelProvider(requireActivity()).get(RadioEditorViewModel.class);
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
builder.setView(bind.getRoot()) builder.setView(bind.getRoot())
.setTitle(R.string.radio_editor_dialog_title) .setTitle(R.string.radio_editor_dialog_title)
.setPositiveButton(R.string.radio_editor_dialog_positive_button, (dialog, id) -> { .setPositiveButton(R.string.radio_editor_dialog_positive_button, (dialog, id) -> {
if (validateInput()) {
if (radioEditorViewModel.getRadioToEdit() == null) {
radioEditorViewModel.createRadio(radioName, radioStreamURL, radioHomepageURL.isEmpty() ? null : radioHomepageURL);
} else {
radioEditorViewModel.updateRadio(radioName, radioStreamURL, radioHomepageURL.isEmpty() ? null : radioHomepageURL);
}
dismissDialog();
}
}) })
.setNeutralButton(R.string.radio_editor_dialog_neutral_button, (dialog, id) -> dialog.cancel()) .setNeutralButton(R.string.radio_editor_dialog_neutral_button, (dialog, id) -> {
.setNegativeButton(R.string.radio_editor_dialog_negative_button, (dialog, id) -> dialog.cancel()); radioEditorViewModel.deleteRadio();
dismissDialog();
})
.setNegativeButton(R.string.radio_editor_dialog_negative_button, (dialog, id) -> {
dialog.cancel();
});
return builder.create(); return builder.create();
} }
@ -52,9 +66,7 @@ public class RadioEditorDialog extends DialogFragment {
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
setParameterInfo(); setParameterInfo();
setButtonAction();
} }
@Override @Override
@ -75,25 +87,6 @@ public class RadioEditorDialog extends DialogFragment {
} }
} }
private void setButtonAction() {
((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> {
if (validateInput()) {
if (radioEditorViewModel.getRadioToEdit() == null) {
radioEditorViewModel.createRadio(radioName, radioStreamURL, radioHomepageURL.isEmpty() ? null : radioHomepageURL);
} else {
radioEditorViewModel.updateRadio(radioName, radioStreamURL, radioHomepageURL.isEmpty() ? null : radioHomepageURL);
}
dismissDialog();
}
});
((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener(v -> {
radioEditorViewModel.deleteRadio();
dismissDialog();
});
}
private boolean validateInput() { private boolean validateInput() {
radioName = Objects.requireNonNull(bind.internetRadioStationNameTextView.getText()).toString().trim(); radioName = Objects.requireNonNull(bind.internetRadioStationNameTextView.getText()).toString().trim();
radioStreamURL = Objects.requireNonNull(bind.internetRadioStationStreamUrlTextView.getText()).toString().trim(); radioStreamURL = Objects.requireNonNull(bind.internetRadioStationStreamUrlTextView.getText()).toString().trim();

View file

@ -12,6 +12,7 @@ import com.cappielloantonio.tempo.R;
import com.cappielloantonio.tempo.databinding.DialogRatingBinding; import com.cappielloantonio.tempo.databinding.DialogRatingBinding;
import com.cappielloantonio.tempo.util.Constants; import com.cappielloantonio.tempo.util.Constants;
import com.cappielloantonio.tempo.viewmodel.RatingViewModel; import com.cappielloantonio.tempo.viewmodel.RatingViewModel;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
public class RatingDialog extends DialogFragment { public class RatingDialog extends DialogFragment {
private static final String TAG = "ServerSignupDialog"; private static final String TAG = "ServerSignupDialog";
@ -25,7 +26,7 @@ public class RatingDialog extends DialogFragment {
bind = DialogRatingBinding.inflate(getLayoutInflater()); bind = DialogRatingBinding.inflate(getLayoutInflater());
ratingViewModel = new ViewModelProvider(requireActivity()).get(RatingViewModel.class); ratingViewModel = new ViewModelProvider(requireActivity()).get(RatingViewModel.class);
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
builder.setView(bind.getRoot()) builder.setView(bind.getRoot())
.setTitle(R.string.rating_dialog_title) .setTitle(R.string.rating_dialog_title)

View file

@ -14,6 +14,7 @@ import com.cappielloantonio.tempo.databinding.DialogServerSignupBinding;
import com.cappielloantonio.tempo.model.Server; import com.cappielloantonio.tempo.model.Server;
import com.cappielloantonio.tempo.util.MusicUtil; import com.cappielloantonio.tempo.util.MusicUtil;
import com.cappielloantonio.tempo.viewmodel.LoginViewModel; import com.cappielloantonio.tempo.viewmodel.LoginViewModel;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.util.Objects; import java.util.Objects;
import java.util.UUID; import java.util.UUID;
@ -37,7 +38,7 @@ public class ServerSignupDialog extends DialogFragment {
bind = DialogServerSignupBinding.inflate(getLayoutInflater()); bind = DialogServerSignupBinding.inflate(getLayoutInflater());
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
builder.setView(bind.getRoot()) builder.setView(bind.getRoot())
.setTitle(R.string.server_signup_dialog_title) .setTitle(R.string.server_signup_dialog_title)
@ -49,7 +50,6 @@ public class ServerSignupDialog extends DialogFragment {
return builder.create(); return builder.create();
} }
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
@ -81,14 +81,16 @@ public class ServerSignupDialog extends DialogFragment {
} }
private void setButtonAction() { private void setButtonAction() {
((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> { androidx.appcompat.app.AlertDialog alertDialog = (androidx.appcompat.app.AlertDialog) Objects.requireNonNull(getDialog());
alertDialog.getButton(androidx.appcompat.app.AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> {
if (validateInput()) { if (validateInput()) {
saveServerPreference(); saveServerPreference();
Objects.requireNonNull(getDialog()).dismiss(); Objects.requireNonNull(getDialog()).dismiss();
} }
}); });
((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener(v -> { alertDialog.getButton(androidx.appcompat.app.AlertDialog.BUTTON_NEUTRAL).setOnClickListener(v -> {
loginViewModel.deleteServer(null); loginViewModel.deleteServer(null);
Objects.requireNonNull(getDialog()).dismiss(); Objects.requireNonNull(getDialog()).dismiss();
}); });

View file

@ -13,6 +13,9 @@ import com.cappielloantonio.tempo.R;
import com.cappielloantonio.tempo.databinding.DialogServerUnreachableBinding; import com.cappielloantonio.tempo.databinding.DialogServerUnreachableBinding;
import com.cappielloantonio.tempo.ui.activity.MainActivity; import com.cappielloantonio.tempo.ui.activity.MainActivity;
import com.cappielloantonio.tempo.util.Preferences; import com.cappielloantonio.tempo.util.Preferences;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.util.Objects;
@OptIn(markerClass = UnstableApi.class) @OptIn(markerClass = UnstableApi.class)
public class ServerUnreachableDialog extends DialogFragment { public class ServerUnreachableDialog extends DialogFragment {
@ -25,7 +28,7 @@ public class ServerUnreachableDialog extends DialogFragment {
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
bind = DialogServerUnreachableBinding.inflate(getLayoutInflater()); bind = DialogServerUnreachableBinding.inflate(getLayoutInflater());
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
builder.setView(bind.getRoot()) builder.setView(bind.getRoot())
.setTitle(R.string.server_unreachable_dialog_title) .setTitle(R.string.server_unreachable_dialog_title)
@ -33,7 +36,7 @@ public class ServerUnreachableDialog extends DialogFragment {
.setNeutralButton(R.string.server_unreachable_dialog_neutral_button, null) .setNeutralButton(R.string.server_unreachable_dialog_neutral_button, null)
.setNegativeButton(R.string.server_unreachable_dialog_negative_button, (dialog, id) -> dialog.cancel()); .setNegativeButton(R.string.server_unreachable_dialog_negative_button, (dialog, id) -> dialog.cancel());
AlertDialog popup = builder.create(); androidx.appcompat.app.AlertDialog popup = builder.create();
popup.setCancelable(false); popup.setCancelable(false);
popup.setCanceledOnTouchOutside(false); popup.setCanceledOnTouchOutside(false);
@ -41,6 +44,7 @@ public class ServerUnreachableDialog extends DialogFragment {
return popup; return popup;
} }
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
@ -55,19 +59,17 @@ public class ServerUnreachableDialog extends DialogFragment {
} }
private void setButtonAction() { private void setButtonAction() {
AlertDialog dialog = (AlertDialog) getDialog(); androidx.appcompat.app.AlertDialog alertDialog = (androidx.appcompat.app.AlertDialog) Objects.requireNonNull(getDialog());
if(dialog != null) { alertDialog.getButton(androidx.appcompat.app.AlertDialog.BUTTON_NEUTRAL).setOnClickListener(v -> {
(dialog).getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener(v -> { MainActivity activity = (MainActivity) getActivity();
MainActivity activity = (MainActivity) getActivity(); if (activity != null) activity.quit();
if (activity != null) activity.quit(); alertDialog.dismiss();
dialog.dismiss(); });
});
(dialog).getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> { alertDialog.getButton(androidx.appcompat.app.AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> {
Preferences.setServerUnreachableDatetime(System.currentTimeMillis()); Preferences.setServerUnreachableDatetime(System.currentTimeMillis());
dialog.dismiss(); alertDialog.dismiss();
}); });
}
} }
} }

View file

@ -18,6 +18,7 @@ import com.google.android.material.datepicker.CalendarConstraints;
import com.google.android.material.datepicker.DateValidatorPointForward; import com.google.android.material.datepicker.DateValidatorPointForward;
import com.google.android.material.datepicker.MaterialDatePicker; import com.google.android.material.datepicker.MaterialDatePicker;
import com.google.android.material.datepicker.MaterialPickerOnPositiveButtonClickListener; import com.google.android.material.datepicker.MaterialPickerOnPositiveButtonClickListener;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
@ -44,7 +45,7 @@ public class ShareUpdateDialog extends DialogFragment {
bind = DialogShareUpdateBinding.inflate(getLayoutInflater()); bind = DialogShareUpdateBinding.inflate(getLayoutInflater());
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext());
builder.setView(bind.getRoot()) builder.setView(bind.getRoot())
.setTitle(R.string.share_update_dialog_title) .setTitle(R.string.share_update_dialog_title)

View file

@ -19,6 +19,7 @@ import com.cappielloantonio.tempo.util.DownloadUtil;
import com.cappielloantonio.tempo.util.MappingUtil; import com.cappielloantonio.tempo.util.MappingUtil;
import com.cappielloantonio.tempo.util.Preferences; import com.cappielloantonio.tempo.util.Preferences;
import com.cappielloantonio.tempo.viewmodel.StarredSyncViewModel; import com.cappielloantonio.tempo.viewmodel.StarredSyncViewModel;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -35,7 +36,7 @@ public class StarredSyncDialog extends DialogFragment {
bind = DialogStarredSyncBinding.inflate(getLayoutInflater()); bind = DialogStarredSyncBinding.inflate(getLayoutInflater());
starredSyncViewModel = new ViewModelProvider(requireActivity()).get(StarredSyncViewModel.class); starredSyncViewModel = new ViewModelProvider(requireActivity()).get(StarredSyncViewModel.class);
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
builder.setView(bind.getRoot()) builder.setView(bind.getRoot())
.setTitle(R.string.starred_sync_dialog_title) .setTitle(R.string.starred_sync_dialog_title)
@ -45,7 +46,6 @@ public class StarredSyncDialog extends DialogFragment {
return builder.create(); return builder.create();
} }
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
@ -59,7 +59,7 @@ public class StarredSyncDialog extends DialogFragment {
} }
private void setButtonAction(Context context) { private void setButtonAction(Context context) {
AlertDialog dialog = ((AlertDialog) getDialog()); androidx.appcompat.app.AlertDialog dialog = (androidx.appcompat.app.AlertDialog) getDialog();
if (dialog != null) { if (dialog != null) {
Button positiveButton = dialog.getButton(Dialog.BUTTON_POSITIVE); Button positiveButton = dialog.getButton(Dialog.BUTTON_POSITIVE);

View file

@ -14,6 +14,7 @@ import com.cappielloantonio.tempo.glide.CustomGlideRequest;
import com.cappielloantonio.tempo.util.Constants; import com.cappielloantonio.tempo.util.Constants;
import com.cappielloantonio.tempo.util.MusicUtil; import com.cappielloantonio.tempo.util.MusicUtil;
import com.cappielloantonio.tempo.util.Preferences; import com.cappielloantonio.tempo.util.Preferences;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
public class TrackInfoDialog extends DialogFragment { public class TrackInfoDialog extends DialogFragment {
private static final String TAG = "TrackInfoDialog"; private static final String TAG = "TrackInfoDialog";
@ -30,7 +31,7 @@ public class TrackInfoDialog extends DialogFragment {
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
bind = DialogTrackInfoBinding.inflate(getLayoutInflater()); bind = DialogTrackInfoBinding.inflate(getLayoutInflater());
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
builder.setView(bind.getRoot()) builder.setView(bind.getRoot())
.setPositiveButton(R.string.track_info_dialog_positive_button, (dialog, id) -> dialog.cancel()); .setPositiveButton(R.string.track_info_dialog_positive_button, (dialog, id) -> dialog.cancel());