style: PR code cleanup

This commit is contained in:
antonio 2023-11-05 17:10:13 +01:00
parent 17f05cb3d8
commit 9cabfb0e2c
16 changed files with 81 additions and 190 deletions

View file

@ -1,6 +1,5 @@
package com.cappielloantonio.tempo.ui.dialog; package com.cappielloantonio.tempo.ui.dialog;
import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@ -18,9 +17,6 @@ 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 {
private static final String TAG = "BatteryOptimizationDialog";
private DialogBatteryOptimizationBinding bind;
@NonNull @NonNull
@Override @Override
@ -28,20 +24,14 @@ public class BatteryOptimizationDialog extends DialogFragment {
DialogBatteryOptimizationBinding bind = DialogBatteryOptimizationBinding.inflate(getLayoutInflater()); DialogBatteryOptimizationBinding bind = DialogBatteryOptimizationBinding.inflate(getLayoutInflater());
return new MaterialAlertDialogBuilder(requireContext()) return new MaterialAlertDialogBuilder(requireContext())
.setTitle(R.string.activity_battery_optimizations_title)
.setView(bind.getRoot()) .setView(bind.getRoot())
.setPositiveButton(R.string.battery_optimization_positive_button, (dialog, which) -> openPowerSettings()) .setTitle(R.string.activity_battery_optimizations_title)
.setNeutralButton(R.string.battery_optimization_neutral_button, (dialog, which) -> Preferences.dontAskForOptimization()) .setPositiveButton(R.string.battery_optimization_positive_button, (dialog, listener) -> openPowerSettings())
.setNeutralButton(R.string.battery_optimization_neutral_button, (dialog, listener) -> Preferences.dontAskForOptimization())
.setNegativeButton(R.string.battery_optimization_negative_button, null) .setNegativeButton(R.string.battery_optimization_negative_button, null)
.create(); .create();
} }
@Override
public void onDestroyView() {
super.onDestroyView();
bind = null;
}
private void openPowerSettings() { private void openPowerSettings() {
Intent intent = new Intent(); Intent intent = new Intent();
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

View file

@ -1,6 +1,5 @@
package com.cappielloantonio.tempo.ui.dialog; package com.cappielloantonio.tempo.ui.dialog;
import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
@ -15,18 +14,13 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.util.Objects; import java.util.Objects;
public class ConnectionAlertDialog extends DialogFragment { public class ConnectionAlertDialog extends DialogFragment {
private static final String TAG = "ServerUnreachableDialog";
private DialogConnectionAlertBinding bind;
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
bind = DialogConnectionAlertBinding.inflate(getLayoutInflater()); DialogConnectionAlertBinding bind = DialogConnectionAlertBinding.inflate(getLayoutInflater());
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity()); MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity())
.setView(bind.getRoot())
builder.setView(bind.getRoot())
.setTitle(R.string.connection_alert_dialog_title) .setTitle(R.string.connection_alert_dialog_title)
.setPositiveButton(R.string.connection_alert_dialog_positive_button, (dialog, id) -> dialog.cancel()) .setPositiveButton(R.string.connection_alert_dialog_positive_button, (dialog, id) -> dialog.cancel())
.setNegativeButton(R.string.connection_alert_dialog_negative_button, (dialog, id) -> dialog.cancel()); .setNegativeButton(R.string.connection_alert_dialog_negative_button, (dialog, id) -> dialog.cancel());
@ -46,12 +40,6 @@ public class ConnectionAlertDialog extends DialogFragment {
setButtonAction(); setButtonAction();
} }
@Override
public void onDestroyView() {
super.onDestroyView();
bind = null;
}
private void setButtonAction() { private void setButtonAction() {
androidx.appcompat.app.AlertDialog alertDialog = (androidx.appcompat.app.AlertDialog) Objects.requireNonNull(getDialog()); androidx.appcompat.app.AlertDialog alertDialog = (androidx.appcompat.app.AlertDialog) Objects.requireNonNull(getDialog());

View file

@ -1,6 +1,5 @@
package com.cappielloantonio.tempo.ui.dialog; package com.cappielloantonio.tempo.ui.dialog;
import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
import android.widget.Button; import android.widget.Button;
@ -12,27 +11,23 @@ import androidx.media3.common.util.UnstableApi;
import com.cappielloantonio.tempo.R; 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.util.DownloadUtil; import com.cappielloantonio.tempo.util.DownloadUtil;
import com.google.android.material.dialog.MaterialAlertDialogBuilder; 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 {
private DialogDeleteDownloadStorageBinding bind;
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
bind = DialogDeleteDownloadStorageBinding.inflate(getLayoutInflater()); DialogDeleteDownloadStorageBinding bind = DialogDeleteDownloadStorageBinding.inflate(getLayoutInflater());
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext()); return new MaterialAlertDialogBuilder(requireContext())
.setView(bind.getRoot())
builder.setView(bind.getRoot())
.setTitle(R.string.delete_download_storage_dialog_title) .setTitle(R.string.delete_download_storage_dialog_title)
.setPositiveButton(R.string.delete_download_storage_dialog_positive_button, null) .setPositiveButton(R.string.delete_download_storage_dialog_positive_button, null)
.setNegativeButton(R.string.delete_download_storage_dialog_negative_button, null); .setNegativeButton(R.string.delete_download_storage_dialog_negative_button, null)
.create();
return builder.create();
} }
@Override @Override
@ -41,12 +36,6 @@ public class DeleteDownloadStorageDialog extends DialogFragment {
setButtonAction(); setButtonAction();
} }
@Override
public void onDestroyView() {
super.onDestroyView();
bind = null;
}
private void setButtonAction() { private void setButtonAction() {
androidx.appcompat.app.AlertDialog dialog = (androidx.appcompat.app.AlertDialog) getDialog(); androidx.appcompat.app.AlertDialog dialog = (androidx.appcompat.app.AlertDialog) getDialog();

View file

@ -1,6 +1,5 @@
package com.cappielloantonio.tempo.ui.dialog; package com.cappielloantonio.tempo.ui.dialog;
import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
import android.widget.Button; import android.widget.Button;
@ -17,8 +16,6 @@ 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 {
private DialogDownloadDirectoryBinding bind;
private final DialogClickCallback dialogClickCallback; private final DialogClickCallback dialogClickCallback;
public DownloadDirectoryDialog(DialogClickCallback dialogClickCallback) { public DownloadDirectoryDialog(DialogClickCallback dialogClickCallback) {
@ -28,16 +25,14 @@ public class DownloadDirectoryDialog extends DialogFragment {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
bind = DialogDownloadDirectoryBinding.inflate(getLayoutInflater()); DialogDownloadDirectoryBinding bind = DialogDownloadDirectoryBinding.inflate(getLayoutInflater());
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext()); return new MaterialAlertDialogBuilder(requireContext())
.setView(bind.getRoot())
builder.setView(bind.getRoot())
.setTitle(R.string.download_directory_dialog_title) .setTitle(R.string.download_directory_dialog_title)
.setPositiveButton(R.string.download_directory_dialog_positive_button, null) .setPositiveButton(R.string.download_directory_dialog_positive_button, null)
.setNegativeButton(R.string.download_directory_dialog_negative_button, null); .setNegativeButton(R.string.download_directory_dialog_negative_button, null)
.create();
return builder.create();
} }
@Override @Override
@ -46,12 +41,6 @@ public class DownloadDirectoryDialog extends DialogFragment {
setButtonAction(); setButtonAction();
} }
@Override
public void onDestroyView() {
super.onDestroyView();
bind = null;
}
private void setButtonAction() { private void setButtonAction() {
androidx.appcompat.app.AlertDialog dialog = (androidx.appcompat.app.AlertDialog) getDialog(); androidx.appcompat.app.AlertDialog dialog = (androidx.appcompat.app.AlertDialog) getDialog();

View file

@ -1,6 +1,5 @@
package com.cappielloantonio.tempo.ui.dialog; package com.cappielloantonio.tempo.ui.dialog;
import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
import android.widget.Button; import android.widget.Button;
@ -19,8 +18,6 @@ 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 {
private DialogDownloadStorageBinding bind;
private final DialogClickCallback dialogClickCallback; private final DialogClickCallback dialogClickCallback;
public DownloadStorageDialog(DialogClickCallback dialogClickCallback) { public DownloadStorageDialog(DialogClickCallback dialogClickCallback) {
@ -30,16 +27,14 @@ public class DownloadStorageDialog extends DialogFragment {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
bind = DialogDownloadStorageBinding.inflate(getLayoutInflater()); DialogDownloadStorageBinding bind = DialogDownloadStorageBinding.inflate(getLayoutInflater());
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity()); return new MaterialAlertDialogBuilder(getActivity())
.setView(bind.getRoot())
builder.setView(bind.getRoot())
.setTitle(R.string.download_storage_dialog_title) .setTitle(R.string.download_storage_dialog_title)
.setPositiveButton(R.string.download_storage_external_dialog_positive_button, null) .setPositiveButton(R.string.download_storage_external_dialog_positive_button, null)
.setNegativeButton(R.string.download_storage_internal_dialog_negative_button, null); .setNegativeButton(R.string.download_storage_internal_dialog_negative_button, null)
.create();
return builder.create();
} }
@Override @Override
@ -48,12 +43,6 @@ public class DownloadStorageDialog extends DialogFragment {
setButtonAction(); setButtonAction();
} }
@Override
public void onDestroyView() {
super.onDestroyView();
bind = null;
}
private void setButtonAction() { private void setButtonAction() {
androidx.appcompat.app.AlertDialog dialog = (androidx.appcompat.app.AlertDialog) getDialog(); androidx.appcompat.app.AlertDialog dialog = (androidx.appcompat.app.AlertDialog) getDialog();

View file

@ -1,6 +1,5 @@
package com.cappielloantonio.tempo.ui.dialog; package com.cappielloantonio.tempo.ui.dialog;
import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
@ -31,17 +30,15 @@ public class PlaylistChooserDialog extends DialogFragment implements ClickCallba
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
bind = DialogPlaylistChooserBinding.inflate(getLayoutInflater()); bind = DialogPlaylistChooserBinding.inflate(getLayoutInflater());
playlistChooserViewModel = new ViewModelProvider(requireActivity()).get(PlaylistChooserViewModel.class); playlistChooserViewModel = new ViewModelProvider(requireActivity()).get(PlaylistChooserViewModel.class);
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity()); return new MaterialAlertDialogBuilder(getActivity())
.setView(bind.getRoot())
builder.setView(bind.getRoot())
.setTitle(R.string.playlist_chooser_dialog_title) .setTitle(R.string.playlist_chooser_dialog_title)
.setNeutralButton(R.string.playlist_chooser_dialog_neutral_button, (dialog, id) -> { .setNeutralButton(R.string.playlist_chooser_dialog_neutral_button, (dialog, id) -> { })
}) .setNegativeButton(R.string.playlist_chooser_dialog_negative_button, (dialog, id) -> dialog.cancel())
.setNegativeButton(R.string.playlist_chooser_dialog_negative_button, (dialog, id) -> dialog.cancel()); .create();
return builder.create();
} }
@Override @Override

View file

@ -1,6 +1,5 @@
package com.cappielloantonio.tempo.ui.dialog; package com.cappielloantonio.tempo.ui.dialog;
import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.content.ClipData; import android.content.ClipData;
import android.content.ClipboardManager; import android.content.ClipboardManager;
@ -45,18 +44,16 @@ public class PlaylistEditorDialog extends DialogFragment {
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
bind = DialogPlaylistEditorBinding.inflate(getLayoutInflater()); bind = DialogPlaylistEditorBinding.inflate(getLayoutInflater());
playlistEditorViewModel = new ViewModelProvider(requireActivity()).get(PlaylistEditorViewModel.class); playlistEditorViewModel = new ViewModelProvider(requireActivity()).get(PlaylistEditorViewModel.class);
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity()); return new MaterialAlertDialogBuilder(getActivity())
.setView(bind.getRoot())
builder.setView(bind.getRoot())
.setTitle(R.string.playlist_editor_dialog_title) .setTitle(R.string.playlist_editor_dialog_title)
.setPositiveButton(R.string.playlist_editor_dialog_positive_button, (dialog, id) -> { .setPositiveButton(R.string.playlist_editor_dialog_positive_button, (dialog, id) -> { })
})
.setNeutralButton(R.string.playlist_editor_dialog_neutral_button, (dialog, id) -> dialog.cancel()) .setNeutralButton(R.string.playlist_editor_dialog_neutral_button, (dialog, id) -> dialog.cancel())
.setNegativeButton(R.string.playlist_editor_dialog_negative_button, (dialog, id) -> dialog.cancel()); .setNegativeButton(R.string.playlist_editor_dialog_negative_button, (dialog, id) -> dialog.cancel())
.create();
return builder.create();
} }
@Override @Override

View file

@ -1,6 +1,5 @@
package com.cappielloantonio.tempo.ui.dialog; package com.cappielloantonio.tempo.ui.dialog;
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;
@ -13,14 +12,10 @@ 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 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;
@ -37,17 +32,15 @@ public class PodcastChannelEditorDialog extends DialogFragment {
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
bind = DialogPodcastChannelEditorBinding.inflate(getLayoutInflater()); bind = DialogPodcastChannelEditorBinding.inflate(getLayoutInflater());
podcastChannelEditorViewModel = new ViewModelProvider(requireActivity()).get(PodcastChannelEditorViewModel.class); podcastChannelEditorViewModel = new ViewModelProvider(requireActivity()).get(PodcastChannelEditorViewModel.class);
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity()); return new MaterialAlertDialogBuilder(getActivity())
.setView(bind.getRoot())
builder.setView(bind.getRoot())
.setTitle(R.string.podcast_channel_editor_dialog_title) .setTitle(R.string.podcast_channel_editor_dialog_title)
.setPositiveButton(R.string.radio_editor_dialog_positive_button, (dialog, id) -> { .setPositiveButton(R.string.radio_editor_dialog_positive_button, (dialog, id) -> { })
}) .setNegativeButton(R.string.radio_editor_dialog_negative_button, (dialog, id) -> dialog.cancel())
.setNegativeButton(R.string.radio_editor_dialog_negative_button, (dialog, id) -> dialog.cancel()); .create();
return builder.create();
} }
@Override @Override

View file

@ -1,6 +1,5 @@
package com.cappielloantonio.tempo.ui.dialog; package com.cappielloantonio.tempo.ui.dialog;
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;
@ -36,11 +35,11 @@ public class RadioEditorDialog extends DialogFragment {
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
bind = DialogRadioEditorBinding.inflate(getLayoutInflater()); bind = DialogRadioEditorBinding.inflate(getLayoutInflater());
radioEditorViewModel = new ViewModelProvider(requireActivity()).get(RadioEditorViewModel.class); radioEditorViewModel = new ViewModelProvider(requireActivity()).get(RadioEditorViewModel.class);
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext()); return new MaterialAlertDialogBuilder(requireContext())
.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 (validateInput()) {
@ -58,9 +57,8 @@ public class RadioEditorDialog extends DialogFragment {
}) })
.setNegativeButton(R.string.radio_editor_dialog_negative_button, (dialog, id) -> { .setNegativeButton(R.string.radio_editor_dialog_negative_button, (dialog, id) -> {
dialog.cancel(); dialog.cancel();
}); })
.create();
return builder.create();
} }
@Override @Override

View file

@ -1,6 +1,5 @@
package com.cappielloantonio.tempo.ui.dialog; package com.cappielloantonio.tempo.ui.dialog;
import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
@ -26,14 +25,12 @@ 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);
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity()); return new MaterialAlertDialogBuilder(getActivity())
.setView(bind.getRoot())
builder.setView(bind.getRoot())
.setTitle(R.string.rating_dialog_title) .setTitle(R.string.rating_dialog_title)
.setNegativeButton(R.string.rating_dialog_negative_button, (dialog, id) -> dialog.cancel()) .setNegativeButton(R.string.rating_dialog_negative_button, (dialog, id) -> dialog.cancel())
.setPositiveButton(R.string.rating_dialog_positive_button, (dialog, id) -> ratingViewModel.rate((int) bind.ratingBar.getRating())); .setPositiveButton(R.string.rating_dialog_positive_button, (dialog, id) -> ratingViewModel.rate((int) bind.ratingBar.getRating()))
.create();
return builder.create();
} }
@Override @Override

View file

@ -1,6 +1,5 @@
package com.cappielloantonio.tempo.ui.dialog; package com.cappielloantonio.tempo.ui.dialog;
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;
@ -34,22 +33,19 @@ public class ServerSignupDialog extends DialogFragment {
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
loginViewModel = new ViewModelProvider(requireActivity()).get(LoginViewModel.class);
bind = DialogServerSignupBinding.inflate(getLayoutInflater()); bind = DialogServerSignupBinding.inflate(getLayoutInflater());
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity()); loginViewModel = new ViewModelProvider(requireActivity()).get(LoginViewModel.class);
builder.setView(bind.getRoot()) return new MaterialAlertDialogBuilder(getActivity())
.setView(bind.getRoot())
.setTitle(R.string.server_signup_dialog_title) .setTitle(R.string.server_signup_dialog_title)
.setNeutralButton(R.string.server_signup_dialog_neutral_button, (dialog, id) -> { .setNeutralButton(R.string.server_signup_dialog_neutral_button, (dialog, id) -> { })
}) .setPositiveButton(R.string.server_signup_dialog_positive_button, (dialog, id) -> { })
.setPositiveButton(R.string.server_signup_dialog_positive_button, (dialog, id) -> { .setNegativeButton(R.string.server_signup_dialog_negative_button, (dialog, id) -> dialog.cancel())
}) .create();
.setNegativeButton(R.string.server_signup_dialog_negative_button, (dialog, id) -> dialog.cancel());
return builder.create();
} }
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();

View file

@ -1,11 +1,11 @@
package com.cappielloantonio.tempo.ui.dialog; package com.cappielloantonio.tempo.ui.dialog;
import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.OptIn; import androidx.annotation.OptIn;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment; import androidx.fragment.app.DialogFragment;
import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.UnstableApi;
@ -19,27 +19,21 @@ import java.util.Objects;
@OptIn(markerClass = UnstableApi.class) @OptIn(markerClass = UnstableApi.class)
public class ServerUnreachableDialog extends DialogFragment { public class ServerUnreachableDialog extends DialogFragment {
private static final String TAG = "ServerUnreachableDialog";
private DialogServerUnreachableBinding bind;
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
bind = DialogServerUnreachableBinding.inflate(getLayoutInflater()); DialogServerUnreachableBinding bind = DialogServerUnreachableBinding.inflate(getLayoutInflater());
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity()); AlertDialog popup = new MaterialAlertDialogBuilder(getActivity()).setView(bind.getRoot())
builder.setView(bind.getRoot())
.setTitle(R.string.server_unreachable_dialog_title) .setTitle(R.string.server_unreachable_dialog_title)
.setPositiveButton(R.string.server_unreachable_dialog_positive_button, null) .setPositiveButton(R.string.server_unreachable_dialog_positive_button, null)
.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())
.create();
androidx.appcompat.app.AlertDialog popup = builder.create();
popup.setCancelable(false);
popup.setCanceledOnTouchOutside(false); popup.setCanceledOnTouchOutside(false);
popup.setCancelable(false);
return popup; return popup;
} }
@ -52,12 +46,6 @@ public class ServerUnreachableDialog extends DialogFragment {
setButtonAction(); setButtonAction();
} }
@Override
public void onDestroyView() {
super.onDestroyView();
bind = null;
}
private void setButtonAction() { private void setButtonAction() {
androidx.appcompat.app.AlertDialog alertDialog = (androidx.appcompat.app.AlertDialog) Objects.requireNonNull(getDialog()); androidx.appcompat.app.AlertDialog alertDialog = (androidx.appcompat.app.AlertDialog) Objects.requireNonNull(getDialog());

View file

@ -17,16 +17,12 @@ import com.cappielloantonio.tempo.viewmodel.ShareBottomSheetViewModel;
import com.google.android.material.datepicker.CalendarConstraints; 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.dialog.MaterialAlertDialogBuilder; import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.Objects; import java.util.Objects;
public class ShareUpdateDialog extends DialogFragment { public class ShareUpdateDialog extends DialogFragment {
private static final String TAG = "ShareUpdateDialog";
private DialogShareUpdateBinding bind; private DialogShareUpdateBinding bind;
private HomeViewModel homeViewModel; private HomeViewModel homeViewModel;
private ShareBottomSheetViewModel shareBottomSheetViewModel; private ShareBottomSheetViewModel shareBottomSheetViewModel;
@ -41,19 +37,18 @@ public class ShareUpdateDialog extends DialogFragment {
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
homeViewModel = new ViewModelProvider(requireActivity()).get(HomeViewModel.class); homeViewModel = new ViewModelProvider(requireActivity()).get(HomeViewModel.class);
shareBottomSheetViewModel = new ViewModelProvider(requireActivity()).get(ShareBottomSheetViewModel.class); shareBottomSheetViewModel = new ViewModelProvider(requireActivity()).get(ShareBottomSheetViewModel.class);
bind = DialogShareUpdateBinding.inflate(getLayoutInflater()); bind = DialogShareUpdateBinding.inflate(getLayoutInflater());
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext()); return new MaterialAlertDialogBuilder(requireContext())
.setView(bind.getRoot())
builder.setView(bind.getRoot())
.setTitle(R.string.share_update_dialog_title) .setTitle(R.string.share_update_dialog_title)
.setPositiveButton(R.string.share_update_dialog_positive_button, (dialog, id) -> { .setPositiveButton(R.string.share_update_dialog_positive_button, (dialog, id) -> {
}) })
.setNegativeButton(R.string.share_update_dialog_negative_button, (dialog, id) -> dialog.cancel()); .setNegativeButton(R.string.share_update_dialog_negative_button, (dialog, id) -> dialog.cancel())
.create();
return builder.create();
} }
@Override @Override

View file

@ -1,6 +1,5 @@
package com.cappielloantonio.tempo.ui.dialog; package com.cappielloantonio.tempo.ui.dialog;
import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
@ -25,39 +24,30 @@ import java.util.stream.Collectors;
@OptIn(markerClass = UnstableApi.class) @OptIn(markerClass = UnstableApi.class)
public class StarredSyncDialog extends DialogFragment { public class StarredSyncDialog extends DialogFragment {
private static final String TAG = "ServerUnreachableDialog";
private DialogStarredSyncBinding bind;
private StarredSyncViewModel starredSyncViewModel; private StarredSyncViewModel starredSyncViewModel;
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
bind = DialogStarredSyncBinding.inflate(getLayoutInflater()); DialogStarredSyncBinding bind = DialogStarredSyncBinding.inflate(getLayoutInflater());
starredSyncViewModel = new ViewModelProvider(requireActivity()).get(StarredSyncViewModel.class); starredSyncViewModel = new ViewModelProvider(requireActivity()).get(StarredSyncViewModel.class);
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity()); return new MaterialAlertDialogBuilder(getActivity())
.setView(bind.getRoot())
builder.setView(bind.getRoot())
.setTitle(R.string.starred_sync_dialog_title) .setTitle(R.string.starred_sync_dialog_title)
.setPositiveButton(R.string.starred_sync_dialog_positive_button, null) .setPositiveButton(R.string.starred_sync_dialog_positive_button, null)
.setNeutralButton(R.string.starred_sync_dialog_neutral_button, null) .setNeutralButton(R.string.starred_sync_dialog_neutral_button, null)
.setNegativeButton(R.string.starred_sync_dialog_negative_button, null); .setNegativeButton(R.string.starred_sync_dialog_negative_button, null)
.create();
return builder.create();
} }
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
setButtonAction(requireContext()); setButtonAction(requireContext());
} }
@Override
public void onDestroyView() {
super.onDestroyView();
bind = null;
}
private void setButtonAction(Context context) { private void setButtonAction(Context context) {
androidx.appcompat.app.AlertDialog dialog = (androidx.appcompat.app.AlertDialog) getDialog(); androidx.appcompat.app.AlertDialog dialog = (androidx.appcompat.app.AlertDialog) getDialog();

View file

@ -1,6 +1,5 @@
package com.cappielloantonio.tempo.ui.dialog; package com.cappielloantonio.tempo.ui.dialog;
import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.os.Bundle; import android.os.Bundle;
@ -17,8 +16,6 @@ import com.cappielloantonio.tempo.util.Preferences;
import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.dialog.MaterialAlertDialogBuilder;
public class TrackInfoDialog extends DialogFragment { public class TrackInfoDialog extends DialogFragment {
private static final String TAG = "TrackInfoDialog";
private DialogTrackInfoBinding bind; private DialogTrackInfoBinding bind;
private MediaMetadata mediaMetadata; private MediaMetadata mediaMetadata;
@ -31,12 +28,10 @@ public class TrackInfoDialog extends DialogFragment {
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
bind = DialogTrackInfoBinding.inflate(getLayoutInflater()); bind = DialogTrackInfoBinding.inflate(getLayoutInflater());
MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity()); return new MaterialAlertDialogBuilder(getActivity())
.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()); .create();
return builder.create();
} }
@Override @Override

View file

@ -3,8 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:background="?attr/colorSurface"
android:background="?attr/colorSurface"> android:orientation="vertical">
<androidx.coordinatorlayout.widget.CoordinatorLayout <androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/drawer_layout" android:id="@+id/drawer_layout"
@ -32,9 +32,9 @@
android:id="@+id/bottom_navigation" android:id="@+id/bottom_navigation"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="80dp" android:layout_height="80dp"
android:layout_gravity="bottom"
android:paddingStart="24dp" android:paddingStart="24dp"
android:paddingEnd="24dp" android:paddingEnd="24dp"
android:layout_gravity="bottom"
android:visibility="gone" android:visibility="gone"
app:menu="@menu/bottom_nav_menu" /> app:menu="@menu/bottom_nav_menu" />