From 9cabfb0e2c6adb165ddf4b1a5a316d0e01947135 Mon Sep 17 00:00:00 2001 From: antonio Date: Sun, 5 Nov 2023 17:10:13 +0100 Subject: [PATCH] style: PR code cleanup --- .../ui/dialog/BatteryOptimizationDialog.java | 16 +++---------- .../ui/dialog/ConnectionAlertDialog.java | 18 +++----------- .../dialog/DeleteDownloadStorageDialog.java | 21 ++++------------ .../ui/dialog/DownloadDirectoryDialog.java | 21 ++++------------ .../ui/dialog/DownloadStorageDialog.java | 21 ++++------------ .../ui/dialog/PlaylistChooserDialog.java | 15 +++++------- .../tempo/ui/dialog/PlaylistEditorDialog.java | 15 +++++------- .../ui/dialog/PodcastChannelEditorDialog.java | 19 +++++---------- .../tempo/ui/dialog/RadioEditorDialog.java | 12 ++++------ .../tempo/ui/dialog/RatingDialog.java | 11 ++++----- .../tempo/ui/dialog/ServerSignupDialog.java | 20 +++++++--------- .../ui/dialog/ServerUnreachableDialog.java | 24 +++++-------------- .../tempo/ui/dialog/ShareUpdateDialog.java | 15 ++++-------- .../tempo/ui/dialog/StarredSyncDialog.java | 24 ++++++------------- .../tempo/ui/dialog/TrackInfoDialog.java | 13 ++++------ app/src/main/res/layout/activity_main.xml | 6 ++--- 16 files changed, 81 insertions(+), 190 deletions(-) diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/BatteryOptimizationDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/BatteryOptimizationDialog.java index 4bef7fc3..110beac3 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/BatteryOptimizationDialog.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/BatteryOptimizationDialog.java @@ -1,6 +1,5 @@ package com.cappielloantonio.tempo.ui.dialog; -import android.app.AlertDialog; import android.app.Dialog; import android.content.Intent; import android.os.Bundle; @@ -18,9 +17,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder; @OptIn(markerClass = UnstableApi.class) public class BatteryOptimizationDialog extends DialogFragment { - private static final String TAG = "BatteryOptimizationDialog"; - - private DialogBatteryOptimizationBinding bind; @NonNull @Override @@ -28,20 +24,14 @@ public class BatteryOptimizationDialog extends DialogFragment { DialogBatteryOptimizationBinding bind = DialogBatteryOptimizationBinding.inflate(getLayoutInflater()); return new MaterialAlertDialogBuilder(requireContext()) - .setTitle(R.string.activity_battery_optimizations_title) .setView(bind.getRoot()) - .setPositiveButton(R.string.battery_optimization_positive_button, (dialog, which) -> openPowerSettings()) - .setNeutralButton(R.string.battery_optimization_neutral_button, (dialog, which) -> Preferences.dontAskForOptimization()) + .setTitle(R.string.activity_battery_optimizations_title) + .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) .create(); } - @Override - public void onDestroyView() { - super.onDestroyView(); - bind = null; - } - private void openPowerSettings() { Intent intent = new Intent(); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ConnectionAlertDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ConnectionAlertDialog.java index db439800..36500159 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ConnectionAlertDialog.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ConnectionAlertDialog.java @@ -1,6 +1,5 @@ package com.cappielloantonio.tempo.ui.dialog; -import android.app.AlertDialog; import android.app.Dialog; import android.os.Bundle; @@ -15,18 +14,13 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder; import java.util.Objects; public class ConnectionAlertDialog extends DialogFragment { - private static final String TAG = "ServerUnreachableDialog"; - - private DialogConnectionAlertBinding bind; - @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - bind = DialogConnectionAlertBinding.inflate(getLayoutInflater()); + DialogConnectionAlertBinding bind = DialogConnectionAlertBinding.inflate(getLayoutInflater()); - MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity()); - - builder.setView(bind.getRoot()) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity()) + .setView(bind.getRoot()) .setTitle(R.string.connection_alert_dialog_title) .setPositiveButton(R.string.connection_alert_dialog_positive_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(); } - @Override - public void onDestroyView() { - super.onDestroyView(); - bind = null; - } - private void setButtonAction() { androidx.appcompat.app.AlertDialog alertDialog = (androidx.appcompat.app.AlertDialog) Objects.requireNonNull(getDialog()); diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/DeleteDownloadStorageDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/DeleteDownloadStorageDialog.java index 04f9ce64..a8d84d0d 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/DeleteDownloadStorageDialog.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/DeleteDownloadStorageDialog.java @@ -1,6 +1,5 @@ package com.cappielloantonio.tempo.ui.dialog; -import android.app.AlertDialog; import android.app.Dialog; import android.os.Bundle; import android.widget.Button; @@ -12,27 +11,23 @@ import androidx.media3.common.util.UnstableApi; import com.cappielloantonio.tempo.R; import com.cappielloantonio.tempo.databinding.DialogDeleteDownloadStorageBinding; -import com.cappielloantonio.tempo.interfaces.DialogClickCallback; import com.cappielloantonio.tempo.util.DownloadUtil; import com.google.android.material.dialog.MaterialAlertDialogBuilder; @OptIn(markerClass = UnstableApi.class) public class DeleteDownloadStorageDialog extends DialogFragment { - private DialogDeleteDownloadStorageBinding bind; @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - bind = DialogDeleteDownloadStorageBinding.inflate(getLayoutInflater()); + DialogDeleteDownloadStorageBinding bind = DialogDeleteDownloadStorageBinding.inflate(getLayoutInflater()); - MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext()); - - builder.setView(bind.getRoot()) + return new MaterialAlertDialogBuilder(requireContext()) + .setView(bind.getRoot()) .setTitle(R.string.delete_download_storage_dialog_title) .setPositiveButton(R.string.delete_download_storage_dialog_positive_button, null) - .setNegativeButton(R.string.delete_download_storage_dialog_negative_button, null); - - return builder.create(); + .setNegativeButton(R.string.delete_download_storage_dialog_negative_button, null) + .create(); } @Override @@ -41,12 +36,6 @@ public class DeleteDownloadStorageDialog extends DialogFragment { setButtonAction(); } - @Override - public void onDestroyView() { - super.onDestroyView(); - bind = null; - } - private void setButtonAction() { androidx.appcompat.app.AlertDialog dialog = (androidx.appcompat.app.AlertDialog) getDialog(); diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/DownloadDirectoryDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/DownloadDirectoryDialog.java index 87aa9a56..e781f447 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/DownloadDirectoryDialog.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/DownloadDirectoryDialog.java @@ -1,6 +1,5 @@ package com.cappielloantonio.tempo.ui.dialog; -import android.app.AlertDialog; import android.app.Dialog; import android.os.Bundle; import android.widget.Button; @@ -17,8 +16,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder; @OptIn(markerClass = UnstableApi.class) public class DownloadDirectoryDialog extends DialogFragment { - private DialogDownloadDirectoryBinding bind; - private final DialogClickCallback dialogClickCallback; public DownloadDirectoryDialog(DialogClickCallback dialogClickCallback) { @@ -28,16 +25,14 @@ public class DownloadDirectoryDialog extends DialogFragment { @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - bind = DialogDownloadDirectoryBinding.inflate(getLayoutInflater()); + DialogDownloadDirectoryBinding bind = DialogDownloadDirectoryBinding.inflate(getLayoutInflater()); - MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext()); - - builder.setView(bind.getRoot()) + return new MaterialAlertDialogBuilder(requireContext()) + .setView(bind.getRoot()) .setTitle(R.string.download_directory_dialog_title) .setPositiveButton(R.string.download_directory_dialog_positive_button, null) - .setNegativeButton(R.string.download_directory_dialog_negative_button, null); - - return builder.create(); + .setNegativeButton(R.string.download_directory_dialog_negative_button, null) + .create(); } @Override @@ -46,12 +41,6 @@ public class DownloadDirectoryDialog extends DialogFragment { setButtonAction(); } - @Override - public void onDestroyView() { - super.onDestroyView(); - bind = null; - } - private void setButtonAction() { androidx.appcompat.app.AlertDialog dialog = (androidx.appcompat.app.AlertDialog) getDialog(); diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/DownloadStorageDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/DownloadStorageDialog.java index 8e9d8ddb..f5ff1577 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/DownloadStorageDialog.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/DownloadStorageDialog.java @@ -1,6 +1,5 @@ package com.cappielloantonio.tempo.ui.dialog; -import android.app.AlertDialog; import android.app.Dialog; import android.os.Bundle; import android.widget.Button; @@ -19,8 +18,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder; @OptIn(markerClass = UnstableApi.class) public class DownloadStorageDialog extends DialogFragment { - private DialogDownloadStorageBinding bind; - private final DialogClickCallback dialogClickCallback; public DownloadStorageDialog(DialogClickCallback dialogClickCallback) { @@ -30,16 +27,14 @@ public class DownloadStorageDialog extends DialogFragment { @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - bind = DialogDownloadStorageBinding.inflate(getLayoutInflater()); + DialogDownloadStorageBinding bind = DialogDownloadStorageBinding.inflate(getLayoutInflater()); - MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity()); - - builder.setView(bind.getRoot()) + return new MaterialAlertDialogBuilder(getActivity()) + .setView(bind.getRoot()) .setTitle(R.string.download_storage_dialog_title) .setPositiveButton(R.string.download_storage_external_dialog_positive_button, null) - .setNegativeButton(R.string.download_storage_internal_dialog_negative_button, null); - - return builder.create(); + .setNegativeButton(R.string.download_storage_internal_dialog_negative_button, null) + .create(); } @Override @@ -48,12 +43,6 @@ public class DownloadStorageDialog extends DialogFragment { setButtonAction(); } - @Override - public void onDestroyView() { - super.onDestroyView(); - bind = null; - } - private void setButtonAction() { androidx.appcompat.app.AlertDialog dialog = (androidx.appcompat.app.AlertDialog) getDialog(); diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PlaylistChooserDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PlaylistChooserDialog.java index de66fc0f..8ce5c48e 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PlaylistChooserDialog.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PlaylistChooserDialog.java @@ -1,6 +1,5 @@ package com.cappielloantonio.tempo.ui.dialog; -import android.app.AlertDialog; import android.app.Dialog; import android.os.Bundle; import android.view.View; @@ -31,17 +30,15 @@ public class PlaylistChooserDialog extends DialogFragment implements ClickCallba @Override public Dialog onCreateDialog(Bundle savedInstanceState) { bind = DialogPlaylistChooserBinding.inflate(getLayoutInflater()); + playlistChooserViewModel = new ViewModelProvider(requireActivity()).get(PlaylistChooserViewModel.class); - MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity()); - - builder.setView(bind.getRoot()) + return new MaterialAlertDialogBuilder(getActivity()) + .setView(bind.getRoot()) .setTitle(R.string.playlist_chooser_dialog_title) - .setNeutralButton(R.string.playlist_chooser_dialog_neutral_button, (dialog, id) -> { - }) - .setNegativeButton(R.string.playlist_chooser_dialog_negative_button, (dialog, id) -> dialog.cancel()); - - return builder.create(); + .setNeutralButton(R.string.playlist_chooser_dialog_neutral_button, (dialog, id) -> { }) + .setNegativeButton(R.string.playlist_chooser_dialog_negative_button, (dialog, id) -> dialog.cancel()) + .create(); } @Override diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PlaylistEditorDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PlaylistEditorDialog.java index 26d1fbca..9a5c759f 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PlaylistEditorDialog.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PlaylistEditorDialog.java @@ -1,6 +1,5 @@ package com.cappielloantonio.tempo.ui.dialog; -import android.app.AlertDialog; import android.app.Dialog; import android.content.ClipData; import android.content.ClipboardManager; @@ -45,18 +44,16 @@ public class PlaylistEditorDialog extends DialogFragment { @Override public Dialog onCreateDialog(Bundle savedInstanceState) { bind = DialogPlaylistEditorBinding.inflate(getLayoutInflater()); + playlistEditorViewModel = new ViewModelProvider(requireActivity()).get(PlaylistEditorViewModel.class); - MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity()); - - builder.setView(bind.getRoot()) + return new MaterialAlertDialogBuilder(getActivity()) + .setView(bind.getRoot()) .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()) - .setNegativeButton(R.string.playlist_editor_dialog_negative_button, (dialog, id) -> dialog.cancel()); - - return builder.create(); + .setNegativeButton(R.string.playlist_editor_dialog_negative_button, (dialog, id) -> dialog.cancel()) + .create(); } @Override diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PodcastChannelEditorDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PodcastChannelEditorDialog.java index e73d7672..09d92b3c 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PodcastChannelEditorDialog.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/PodcastChannelEditorDialog.java @@ -1,6 +1,5 @@ package com.cappielloantonio.tempo.ui.dialog; -import android.app.AlertDialog; import android.app.Dialog; import android.os.Bundle; import android.text.TextUtils; @@ -13,14 +12,10 @@ import androidx.lifecycle.ViewModelProvider; import com.cappielloantonio.tempo.R; import com.cappielloantonio.tempo.databinding.DialogPodcastChannelEditorBinding; 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.google.android.material.dialog.MaterialAlertDialogBuilder; import java.util.Objects; -import java.util.stream.Collectors; public class PodcastChannelEditorDialog extends DialogFragment { private DialogPodcastChannelEditorBinding bind; @@ -37,17 +32,15 @@ public class PodcastChannelEditorDialog extends DialogFragment { @Override public Dialog onCreateDialog(Bundle savedInstanceState) { bind = DialogPodcastChannelEditorBinding.inflate(getLayoutInflater()); + podcastChannelEditorViewModel = new ViewModelProvider(requireActivity()).get(PodcastChannelEditorViewModel.class); - MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity()); - - builder.setView(bind.getRoot()) + return new MaterialAlertDialogBuilder(getActivity()) + .setView(bind.getRoot()) .setTitle(R.string.podcast_channel_editor_dialog_title) - .setPositiveButton(R.string.radio_editor_dialog_positive_button, (dialog, id) -> { - }) - .setNegativeButton(R.string.radio_editor_dialog_negative_button, (dialog, id) -> dialog.cancel()); - - return builder.create(); + .setPositiveButton(R.string.radio_editor_dialog_positive_button, (dialog, id) -> { }) + .setNegativeButton(R.string.radio_editor_dialog_negative_button, (dialog, id) -> dialog.cancel()) + .create(); } @Override diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/RadioEditorDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/RadioEditorDialog.java index 86609e5f..38cb7a82 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/RadioEditorDialog.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/RadioEditorDialog.java @@ -1,6 +1,5 @@ package com.cappielloantonio.tempo.ui.dialog; -import android.app.AlertDialog; import android.app.Dialog; import android.os.Bundle; import android.text.TextUtils; @@ -36,11 +35,11 @@ public class RadioEditorDialog extends DialogFragment { @Override public Dialog onCreateDialog(Bundle savedInstanceState) { bind = DialogRadioEditorBinding.inflate(getLayoutInflater()); + radioEditorViewModel = new ViewModelProvider(requireActivity()).get(RadioEditorViewModel.class); - MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext()); - - builder.setView(bind.getRoot()) + return new MaterialAlertDialogBuilder(requireContext()) + .setView(bind.getRoot()) .setTitle(R.string.radio_editor_dialog_title) .setPositiveButton(R.string.radio_editor_dialog_positive_button, (dialog, id) -> { if (validateInput()) { @@ -58,9 +57,8 @@ public class RadioEditorDialog extends DialogFragment { }) .setNegativeButton(R.string.radio_editor_dialog_negative_button, (dialog, id) -> { dialog.cancel(); - }); - - return builder.create(); + }) + .create(); } @Override diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/RatingDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/RatingDialog.java index 947751b1..fc829152 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/RatingDialog.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/RatingDialog.java @@ -1,6 +1,5 @@ package com.cappielloantonio.tempo.ui.dialog; -import android.app.AlertDialog; import android.app.Dialog; import android.os.Bundle; @@ -26,14 +25,12 @@ public class RatingDialog extends DialogFragment { bind = DialogRatingBinding.inflate(getLayoutInflater()); ratingViewModel = new ViewModelProvider(requireActivity()).get(RatingViewModel.class); - MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity()); - - builder.setView(bind.getRoot()) + return new MaterialAlertDialogBuilder(getActivity()) + .setView(bind.getRoot()) .setTitle(R.string.rating_dialog_title) .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())); - - return builder.create(); + .setPositiveButton(R.string.rating_dialog_positive_button, (dialog, id) -> ratingViewModel.rate((int) bind.ratingBar.getRating())) + .create(); } @Override diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ServerSignupDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ServerSignupDialog.java index 59f6d469..c12f8a8e 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ServerSignupDialog.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ServerSignupDialog.java @@ -1,6 +1,5 @@ package com.cappielloantonio.tempo.ui.dialog; -import android.app.AlertDialog; import android.app.Dialog; import android.os.Bundle; import android.text.TextUtils; @@ -34,22 +33,19 @@ public class ServerSignupDialog extends DialogFragment { @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - loginViewModel = new ViewModelProvider(requireActivity()).get(LoginViewModel.class); - 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) - .setNeutralButton(R.string.server_signup_dialog_neutral_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()); - - return builder.create(); + .setNeutralButton(R.string.server_signup_dialog_neutral_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(); } + @Override public void onStart() { super.onStart(); diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ServerUnreachableDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ServerUnreachableDialog.java index a274ebce..c746fec7 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ServerUnreachableDialog.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ServerUnreachableDialog.java @@ -1,11 +1,11 @@ package com.cappielloantonio.tempo.ui.dialog; -import android.app.AlertDialog; import android.app.Dialog; import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.OptIn; +import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; import androidx.media3.common.util.UnstableApi; @@ -19,27 +19,21 @@ import java.util.Objects; @OptIn(markerClass = UnstableApi.class) public class ServerUnreachableDialog extends DialogFragment { - private static final String TAG = "ServerUnreachableDialog"; - - private DialogServerUnreachableBinding bind; @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - bind = DialogServerUnreachableBinding.inflate(getLayoutInflater()); + DialogServerUnreachableBinding bind = DialogServerUnreachableBinding.inflate(getLayoutInflater()); - MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity()); - - builder.setView(bind.getRoot()) + AlertDialog popup = new MaterialAlertDialogBuilder(getActivity()).setView(bind.getRoot()) .setTitle(R.string.server_unreachable_dialog_title) .setPositiveButton(R.string.server_unreachable_dialog_positive_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.setCancelable(false); return popup; } @@ -52,12 +46,6 @@ public class ServerUnreachableDialog extends DialogFragment { setButtonAction(); } - @Override - public void onDestroyView() { - super.onDestroyView(); - bind = null; - } - private void setButtonAction() { androidx.appcompat.app.AlertDialog alertDialog = (androidx.appcompat.app.AlertDialog) Objects.requireNonNull(getDialog()); diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ShareUpdateDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ShareUpdateDialog.java index 5583ac6b..86634d9e 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ShareUpdateDialog.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/ShareUpdateDialog.java @@ -17,16 +17,12 @@ import com.cappielloantonio.tempo.viewmodel.ShareBottomSheetViewModel; import com.google.android.material.datepicker.CalendarConstraints; import com.google.android.material.datepicker.DateValidatorPointForward; import com.google.android.material.datepicker.MaterialDatePicker; -import com.google.android.material.datepicker.MaterialPickerOnPositiveButtonClickListener; import com.google.android.material.dialog.MaterialAlertDialogBuilder; -import java.util.Calendar; import java.util.Date; import java.util.Objects; public class ShareUpdateDialog extends DialogFragment { - private static final String TAG = "ShareUpdateDialog"; - private DialogShareUpdateBinding bind; private HomeViewModel homeViewModel; private ShareBottomSheetViewModel shareBottomSheetViewModel; @@ -41,19 +37,18 @@ public class ShareUpdateDialog extends DialogFragment { @Override public Dialog onCreateDialog(Bundle savedInstanceState) { homeViewModel = new ViewModelProvider(requireActivity()).get(HomeViewModel.class); + shareBottomSheetViewModel = new ViewModelProvider(requireActivity()).get(ShareBottomSheetViewModel.class); bind = DialogShareUpdateBinding.inflate(getLayoutInflater()); - MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireContext()); - - builder.setView(bind.getRoot()) + return new MaterialAlertDialogBuilder(requireContext()) + .setView(bind.getRoot()) .setTitle(R.string.share_update_dialog_title) .setPositiveButton(R.string.share_update_dialog_positive_button, (dialog, id) -> { }) - .setNegativeButton(R.string.share_update_dialog_negative_button, (dialog, id) -> dialog.cancel()); - - return builder.create(); + .setNegativeButton(R.string.share_update_dialog_negative_button, (dialog, id) -> dialog.cancel()) + .create(); } @Override diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/StarredSyncDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/StarredSyncDialog.java index f13a89e7..9f1cc3a1 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/StarredSyncDialog.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/StarredSyncDialog.java @@ -1,6 +1,5 @@ package com.cappielloantonio.tempo.ui.dialog; -import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; import android.os.Bundle; @@ -25,39 +24,30 @@ import java.util.stream.Collectors; @OptIn(markerClass = UnstableApi.class) public class StarredSyncDialog extends DialogFragment { - private static final String TAG = "ServerUnreachableDialog"; - - private DialogStarredSyncBinding bind; private StarredSyncViewModel starredSyncViewModel; @NonNull @Override public Dialog onCreateDialog(Bundle savedInstanceState) { - bind = DialogStarredSyncBinding.inflate(getLayoutInflater()); + DialogStarredSyncBinding bind = DialogStarredSyncBinding.inflate(getLayoutInflater()); + starredSyncViewModel = new ViewModelProvider(requireActivity()).get(StarredSyncViewModel.class); - MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity()); - - builder.setView(bind.getRoot()) + return new MaterialAlertDialogBuilder(getActivity()) + .setView(bind.getRoot()) .setTitle(R.string.starred_sync_dialog_title) .setPositiveButton(R.string.starred_sync_dialog_positive_button, null) .setNeutralButton(R.string.starred_sync_dialog_neutral_button, null) - .setNegativeButton(R.string.starred_sync_dialog_negative_button, null); - - return builder.create(); + .setNegativeButton(R.string.starred_sync_dialog_negative_button, null) + .create(); } + @Override public void onResume() { super.onResume(); setButtonAction(requireContext()); } - @Override - public void onDestroyView() { - super.onDestroyView(); - bind = null; - } - private void setButtonAction(Context context) { androidx.appcompat.app.AlertDialog dialog = (androidx.appcompat.app.AlertDialog) getDialog(); diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/TrackInfoDialog.java b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/TrackInfoDialog.java index c1279a54..aad842c3 100644 --- a/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/TrackInfoDialog.java +++ b/app/src/main/java/com/cappielloantonio/tempo/ui/dialog/TrackInfoDialog.java @@ -1,6 +1,5 @@ package com.cappielloantonio.tempo.ui.dialog; -import android.app.AlertDialog; import android.app.Dialog; import android.os.Bundle; @@ -17,8 +16,6 @@ import com.cappielloantonio.tempo.util.Preferences; import com.google.android.material.dialog.MaterialAlertDialogBuilder; public class TrackInfoDialog extends DialogFragment { - private static final String TAG = "TrackInfoDialog"; - private DialogTrackInfoBinding bind; private MediaMetadata mediaMetadata; @@ -31,12 +28,10 @@ public class TrackInfoDialog extends DialogFragment { public Dialog onCreateDialog(Bundle savedInstanceState) { bind = DialogTrackInfoBinding.inflate(getLayoutInflater()); - MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity()); - - builder.setView(bind.getRoot()) - .setPositiveButton(R.string.track_info_dialog_positive_button, (dialog, id) -> dialog.cancel()); - - return builder.create(); + return new MaterialAlertDialogBuilder(getActivity()) + .setView(bind.getRoot()) + .setPositiveButton(R.string.track_info_dialog_positive_button, (dialog, id) -> dialog.cancel()) + .create(); } @Override diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 47f6e7ef..106500a5 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -3,8 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" - android:background="?attr/colorSurface"> + android:background="?attr/colorSurface" + android:orientation="vertical">