From 489a5f656d7c9b36b4e61e6dfdc2b5c5048c482f Mon Sep 17 00:00:00 2001 From: CappielloAntonio Date: Fri, 7 Jan 2022 09:30:09 +0100 Subject: [PATCH] Removed custom style from dialogs --- .../play/ui/dialog/ConnectionAlertDialog.java | 6 +----- .../play/ui/dialog/PlaylistChooserDialog.java | 5 +---- .../play/ui/dialog/PlaylistEditorDialog.java | 6 +----- .../com/cappielloantonio/play/ui/dialog/RatingDialog.java | 8 +------- .../play/ui/dialog/ServerSignupDialog.java | 6 +----- .../play/ui/dialog/ServerUnreachableDialog.java | 6 +----- .../play/ui/dialog/StarredSyncDialog.java | 5 +---- 7 files changed, 7 insertions(+), 35 deletions(-) diff --git a/app/src/main/java/com/cappielloantonio/play/ui/dialog/ConnectionAlertDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/dialog/ConnectionAlertDialog.java index edb43654..ad50f102 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/dialog/ConnectionAlertDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/dialog/ConnectionAlertDialog.java @@ -24,7 +24,7 @@ public class ConnectionAlertDialog extends DialogFragment { public Dialog onCreateDialog(Bundle savedInstanceState) { bind = DialogConnectionAlertBinding.inflate(LayoutInflater.from(requireContext())); - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AppTheme_AlertDialog); + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); builder.setView(bind.getRoot()) .setTitle(R.string.connection_alert_dialog_title) @@ -52,10 +52,6 @@ public class ConnectionAlertDialog extends DialogFragment { } private void setButtonAction() { - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEUTRAL).setTextColor(getResources().getColor(R.color.colorAccent, null)); - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.colorAccent, null)); - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.colorAccent, null)); - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener(v -> { PreferenceUtil.getInstance(requireContext()).setDataSavingMode(true); Objects.requireNonNull(getDialog()).dismiss(); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/dialog/PlaylistChooserDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/dialog/PlaylistChooserDialog.java index 74f38e66..f2ae5176 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/dialog/PlaylistChooserDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/dialog/PlaylistChooserDialog.java @@ -32,7 +32,7 @@ public class PlaylistChooserDialog extends DialogFragment { bind = DialogPlaylistChooserBinding.inflate(LayoutInflater.from(requireContext())); playlistChooserViewModel = new ViewModelProvider(requireActivity()).get(PlaylistChooserViewModel.class); - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AppTheme_AlertDialog); + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); builder.setView(bind.getRoot()) .setTitle(R.string.playlist_chooser_dialog_title) @@ -63,9 +63,6 @@ public class PlaylistChooserDialog extends DialogFragment { } private void setButtonAction() { - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEUTRAL).setTextColor(getResources().getColor(R.color.colorAccent, null)); - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.colorAccent, null)); - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener(v -> { Bundle bundle = new Bundle(); bundle.putParcelable("song_object", playlistChooserViewModel.getSongToAdd()); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/dialog/PlaylistEditorDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/dialog/PlaylistEditorDialog.java index 7c559178..76b83326 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/dialog/PlaylistEditorDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/dialog/PlaylistEditorDialog.java @@ -37,7 +37,7 @@ public class PlaylistEditorDialog extends DialogFragment { bind = DialogPlaylistEditorBinding.inflate(LayoutInflater.from(requireContext())); playlistEditorViewModel = new ViewModelProvider(requireActivity()).get(PlaylistEditorViewModel.class); - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AppTheme_AlertDialog); + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); builder.setView(bind.getRoot()) .setTitle(R.string.playlist_editor_dialog_title) @@ -79,10 +79,6 @@ public class PlaylistEditorDialog extends DialogFragment { } private void setButtonAction() { - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEUTRAL).setTextColor(getResources().getColor(R.color.colorAccent, null)); - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.colorAccent, null)); - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.colorAccent, null)); - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> { if (validateInput()) { if (playlistEditorViewModel.getSongToAdd() != null) { diff --git a/app/src/main/java/com/cappielloantonio/play/ui/dialog/RatingDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/dialog/RatingDialog.java index 073f3f18..26d63a26 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/dialog/RatingDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/dialog/RatingDialog.java @@ -27,7 +27,7 @@ public class RatingDialog extends DialogFragment { bind = DialogRatingBinding.inflate(LayoutInflater.from(requireContext())); ratingViewModel = new ViewModelProvider(requireActivity()).get(RatingViewModel.class); - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AppTheme_AlertDialog); + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); builder.setView(bind.getRoot()) .setTitle(R.string.rating_dialog_title) @@ -42,7 +42,6 @@ public class RatingDialog extends DialogFragment { super.onStart(); setElementInfo(); - setButtonColor(); setRating(); } @@ -62,11 +61,6 @@ public class RatingDialog extends DialogFragment { } } - private void setButtonColor() { - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.colorAccent, null)); - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.colorAccent, null)); - } - private void setRating() { if (ratingViewModel.getSong() != null) { ratingViewModel.getLiveSong().observe(requireActivity(), song -> bind.ratingBar.setRating(song.getRating())); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/dialog/ServerSignupDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/dialog/ServerSignupDialog.java index 729694c9..a6793367 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/dialog/ServerSignupDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/dialog/ServerSignupDialog.java @@ -53,7 +53,7 @@ public class ServerSignupDialog extends DialogFragment { bind = DialogServerSignupBinding.inflate(LayoutInflater.from(requireContext())); - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AppTheme_AlertDialog); + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); builder.setView(bind.getRoot()) .setTitle(R.string.server_signup_dialog_title) @@ -95,10 +95,6 @@ public class ServerSignupDialog extends DialogFragment { } private void setButtonAction() { - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEUTRAL).setTextColor(getResources().getColor(R.color.colorAccent, null)); - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.colorAccent, null)); - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.colorAccent, null)); - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> { if (validateInput()) { saveServerPreference(server, username, password, null, null); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/dialog/ServerUnreachableDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/dialog/ServerUnreachableDialog.java index c146fd5f..e08b5efc 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/dialog/ServerUnreachableDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/dialog/ServerUnreachableDialog.java @@ -24,7 +24,7 @@ public class ServerUnreachableDialog extends DialogFragment { public Dialog onCreateDialog(Bundle savedInstanceState) { bind = DialogServerUnreachableBinding.inflate(LayoutInflater.from(requireContext())); - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AppTheme_AlertDialog); + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); builder.setView(bind.getRoot()) .setTitle(R.string.server_unreachable_dialog_title) @@ -49,10 +49,6 @@ public class ServerUnreachableDialog extends DialogFragment { } private void setButtonAction() { - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEUTRAL).setTextColor(getResources().getColor(R.color.colorAccent, null)); - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.colorAccent, null)); - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.colorAccent, null)); - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener(v -> { MainActivity activity = (MainActivity) getActivity(); diff --git a/app/src/main/java/com/cappielloantonio/play/ui/dialog/StarredSyncDialog.java b/app/src/main/java/com/cappielloantonio/play/ui/dialog/StarredSyncDialog.java index bfa1fa45..82c0c8e8 100644 --- a/app/src/main/java/com/cappielloantonio/play/ui/dialog/StarredSyncDialog.java +++ b/app/src/main/java/com/cappielloantonio/play/ui/dialog/StarredSyncDialog.java @@ -31,7 +31,7 @@ public class StarredSyncDialog extends DialogFragment { bind = DialogConnectionAlertBinding.inflate(LayoutInflater.from(requireContext())); starredSyncViewModel = new ViewModelProvider(requireActivity()).get(StarredSyncViewModel.class); - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.AppTheme_AlertDialog); + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); builder.setView(bind.getRoot()) .setTitle(R.string.starred_sync_dialog_title) @@ -57,9 +57,6 @@ public class StarredSyncDialog extends DialogFragment { } private void setButtonAction(Context context) { - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getResources().getColor(R.color.colorAccent, null)); - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(getResources().getColor(R.color.colorAccent, null)); - ((AlertDialog) Objects.requireNonNull(getDialog())).getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> { starredSyncViewModel.getStarredTracks(requireActivity()).observe(requireActivity(), songs -> { if (songs != null) {