diff --git a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java index 187e40b6a..04ea87fb5 100644 --- a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java +++ b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java @@ -446,7 +446,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity default -> throw new AssertionError("Unexpected result code = " + result); }; - mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog) + mAlertDialog = new MaterialAlertDialogBuilder(this) .setTitle(titleId) .setMessage(messageId) .setCancelable(true) diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java index 57a243c61..41d0c102c 100644 --- a/android/app/src/main/java/app/organicmaps/MwmActivity.java +++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java @@ -432,7 +432,7 @@ public class MwmActivity extends BaseMwmFragmentActivity } dismissLocationErrorDialog(); - mLocationErrorDialog = new MaterialAlertDialogBuilder(MwmActivity.this, R.style.MwmTheme_AlertDialog) + mLocationErrorDialog = new MaterialAlertDialogBuilder(MwmActivity.this) .setMessage(R.string.unknown_current_position) .setCancelable(true) .setPositiveButton(R.string.ok, null) @@ -655,7 +655,7 @@ public class MwmActivity extends BaseMwmFragmentActivity else { dismissAlertDialog(); - mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog) + mAlertDialog = new MaterialAlertDialogBuilder(this) .setTitle(R.string.message_invalid_feature_position) .setPositiveButton(R.string.ok, null) .setOnDismissListener(dialog -> mAlertDialog = null) @@ -1155,7 +1155,7 @@ public class MwmActivity extends BaseMwmFragmentActivity if (type == IsolinesState.EXPIREDDATA) { - mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog) + mAlertDialog = new MaterialAlertDialogBuilder(this) .setTitle(R.string.downloader_update_maps) .setMessage(R.string.isolines_activation_error_dialog) .setPositiveButton( @@ -1774,7 +1774,7 @@ public class MwmActivity extends BaseMwmFragmentActivity { dismissAlertDialog(); mAlertDialog = - new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog) + new MaterialAlertDialogBuilder(this) .setTitle(R.string.unable_to_calc_alert_title) .setMessage(R.string.unable_to_calc_alert_subtitle) .setPositiveButton(R.string.settings, @@ -1797,7 +1797,7 @@ public class MwmActivity extends BaseMwmFragmentActivity builder.append(getString(resId)).append("\n\n"); dismissAlertDialog(); - mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog) + mAlertDialog = new MaterialAlertDialogBuilder(this) .setTitle(R.string.dialog_routing_disclaimer_title) .setMessage(builder.toString()) .setCancelable(false) @@ -1846,7 +1846,7 @@ public class MwmActivity extends BaseMwmFragmentActivity return true; final MapObject endPoint = Objects.requireNonNull(controller.getEndPoint()); - final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog) + final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) .setTitle(R.string.p2p_only_from_current) .setMessage(R.string.p2p_reroute_from_current) .setCancelable(false) @@ -2040,7 +2040,7 @@ public class MwmActivity extends BaseMwmFragmentActivity { mPreciseLocationDialogShown = true; final MaterialAlertDialogBuilder builder = - new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog) + new MaterialAlertDialogBuilder(this) .setTitle("⚠ " + getString(R.string.limited_accuracy)) .setMessage(R.string.precise_location_is_disabled_long_text) .setNegativeButton(R.string.close, (dialog, which) -> dialog.dismiss()) @@ -2074,7 +2074,7 @@ public class MwmActivity extends BaseMwmFragmentActivity return; } - mLocationErrorDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog) + mLocationErrorDialog = new MaterialAlertDialogBuilder(this) .setTitle(R.string.enable_location_services) .setMessage(R.string.location_is_disabled_long_text) .setOnDismissListener(dialog -> mLocationErrorDialog = null) @@ -2167,7 +2167,7 @@ public class MwmActivity extends BaseMwmFragmentActivity return; } - final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog) + final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) .setTitle(R.string.enable_location_services) .setMessage(R.string.location_is_disabled_long_text) .setOnDismissListener(dialog -> mLocationErrorDialog = null) @@ -2253,7 +2253,7 @@ public class MwmActivity extends BaseMwmFragmentActivity dismissAlertDialog(); final MaterialAlertDialogBuilder builder = - new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog) + new MaterialAlertDialogBuilder(this) .setTitle(R.string.current_location_unknown_error_title) .setCancelable(true) .setMessage(R.string.power_save_dialog_summary) @@ -2278,7 +2278,7 @@ public class MwmActivity extends BaseMwmFragmentActivity { dismissAlertDialog(); mAlertDialog = - new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog) + new MaterialAlertDialogBuilder(this) .setTitle(R.string.load_kmz_title) .setMessage(getString(R.string.unknown_file_type, uri)) .setPositiveButton(R.string.ok, null) @@ -2295,7 +2295,7 @@ public class MwmActivity extends BaseMwmFragmentActivity { dismissAlertDialog(); mAlertDialog = - new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog) + new MaterialAlertDialogBuilder(this) .setTitle(R.string.load_kmz_title) .setMessage(getString(R.string.failed_to_open_file, uri, error)) .setPositiveButton(R.string.ok, null) @@ -2317,7 +2317,7 @@ public class MwmActivity extends BaseMwmFragmentActivity public void onBookmarksFileImportFailed() { dismissAlertDialog(); - mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog) + mAlertDialog = new MaterialAlertDialogBuilder(this) .setTitle(R.string.load_kmz_title) .setMessage(R.string.load_kmz_failed) .setPositiveButton(R.string.ok, null) @@ -2578,7 +2578,7 @@ public class MwmActivity extends BaseMwmFragmentActivity private void reportUnsupported() { - new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog) + new MaterialAlertDialogBuilder(this) .setMessage(R.string.unsupported_phone) .setCancelable(false) .setPositiveButton(R.string.close, (dlg, which) -> this.moveTaskToBack(true)) diff --git a/android/app/src/main/java/app/organicmaps/SplashActivity.java b/android/app/src/main/java/app/organicmaps/SplashActivity.java index 9c417efda..ec43f6aa7 100644 --- a/android/app/src/main/java/app/organicmaps/SplashActivity.java +++ b/android/app/src/main/java/app/organicmaps/SplashActivity.java @@ -120,7 +120,7 @@ public class SplashActivity extends AppCompatActivity private void showFatalErrorDialog(@StringRes int titleId, @StringRes int messageId, Exception error) { mCanceled = true; - new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog) + new MaterialAlertDialogBuilder(this) .setTitle(titleId) .setMessage(messageId) .setPositiveButton( diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksSharingHelper.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksSharingHelper.java index 423ad9f40..ba6237e39 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksSharingHelper.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksSharingHelper.java @@ -60,14 +60,14 @@ public enum BookmarksSharingHelper case BookmarkSharingResult.SUCCESS -> SharingUtils.shareBookmarkFile(context, launcher, result.getSharingPath(), result.getMimeType()); case BookmarkSharingResult.EMPTY_CATEGORY -> - new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog) + new MaterialAlertDialogBuilder(context) .setTitle(R.string.bookmarks_error_title_share_empty) .setMessage(R.string.bookmarks_error_message_share_empty) .setPositiveButton(R.string.ok, null) .show(); case BookmarkSharingResult.ARCHIVE_ERROR, BookmarkSharingResult.FILE_ERROR -> { - new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog) + new MaterialAlertDialogBuilder(context) .setTitle(R.string.dialog_routing_system_error) .setMessage(R.string.bookmarks_error_message_share_general) .setPositiveButton(R.string.ok, null) diff --git a/android/app/src/main/java/app/organicmaps/dialog/CustomMapServerDialog.java b/android/app/src/main/java/app/organicmaps/dialog/CustomMapServerDialog.java index 5aa0d4751..c507b36a3 100644 --- a/android/app/src/main/java/app/organicmaps/dialog/CustomMapServerDialog.java +++ b/android/app/src/main/java/app/organicmaps/dialog/CustomMapServerDialog.java @@ -42,7 +42,7 @@ public final class CustomMapServerDialog edit.setText(current); MaterialAlertDialogBuilder builder = - new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog) + new MaterialAlertDialogBuilder(context) .setTitle(R.string.download_resources_custom_url_title) .setMessage(R.string.download_resources_custom_url_message) .setView(dialogView) diff --git a/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java b/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java index 998c633f0..319b41d45 100644 --- a/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java +++ b/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java @@ -113,7 +113,7 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment negativeButtonText = args.getString(ARG_NEGATIVE_BUTTON); } - AlertDialog editTextDialog = new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog) + AlertDialog editTextDialog = new MaterialAlertDialogBuilder(requireActivity()) .setView(buildView()) .setNegativeButton(negativeButtonText, null) .setPositiveButton(positiveButtonText, null) diff --git a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java index 344be4734..1f48b56bb 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java +++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java @@ -119,7 +119,7 @@ class DownloaderAdapter extends RecyclerView.Adapter { @@ -1020,7 +1020,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe private void placeDisused() { - new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog) + new MaterialAlertDialogBuilder(requireActivity()) .setTitle(R.string.editor_mark_business_vacant_title) .setMessage(R.string.editor_mark_business_vacant_description) .setPositiveButton(R.string.editor_submit, (dlg, which) -> { diff --git a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java index 89b0cd961..67bfba2b2 100644 --- a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java @@ -352,7 +352,7 @@ public class EditorHostFragment private void processNoFeatures() { - new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog) + new MaterialAlertDialogBuilder(requireActivity()) .setTitle(R.string.downloader_no_space_title) .setPositiveButton(R.string.ok, null) .show(); @@ -386,7 +386,7 @@ public class EditorHostFragment private void showNoobDialog() { - new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog) + new MaterialAlertDialogBuilder(requireActivity()) .setTitle(R.string.editor_share_to_all_dialog_title) .setMessage(getString(R.string.editor_share_to_all_dialog_message_1) + " " + getString(R.string.editor_share_to_all_dialog_message_2)) diff --git a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java index d30ac500a..fd8be07aa 100644 --- a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java @@ -155,7 +155,7 @@ public class FeatureCategoryFragment // Duplicate of showNoobDialog() private void showNoteConfirmationDialog(double lat, double lon, String noteText) { - new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog) + new MaterialAlertDialogBuilder(requireActivity()) .setTitle(R.string.editor_share_to_all_dialog_title) .setMessage(getString(R.string.editor_share_to_all_dialog_message_1) + " " + getString(R.string.editor_share_to_all_dialog_message_2)) diff --git a/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java b/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java index e15289b01..652975efa 100644 --- a/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java @@ -79,7 +79,7 @@ public class OsmLoginFragment extends BaseMwmToolbarFragment private void onAuthFail() { - new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog) + new MaterialAlertDialogBuilder(requireActivity()) .setTitle(R.string.editor_login_error_dialog) .setPositiveButton(R.string.ok, null) .show(); diff --git a/android/app/src/main/java/app/organicmaps/help/FaqFragment.java b/android/app/src/main/java/app/organicmaps/help/FaqFragment.java index 5532020a1..5a30ebba1 100644 --- a/android/app/src/main/java/app/organicmaps/help/FaqFragment.java +++ b/android/app/src/main/java/app/organicmaps/help/FaqFragment.java @@ -66,7 +66,7 @@ public class FaqFragment extends BaseMwmFragment FloatingActionButton feedbackFab = root.findViewById(R.id.feedback_fab); feedbackFab.setOnClickListener( v - -> new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog) + -> new MaterialAlertDialogBuilder(requireActivity()) .setTitle(R.string.feedback) .setNegativeButton(R.string.cancel, null) .setItems(new CharSequence[] {getString(R.string.feedback_general), getString(R.string.report_a_bug)}, diff --git a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java index d03f1a2d5..f3f854575 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java @@ -107,7 +107,7 @@ public class TrafficButtonController implements TrafficManager.TrafficCallback if (mDialog != null && mDialog.isShowing()) return; - mDialog = new MaterialAlertDialogBuilder(mActivity, R.style.MwmTheme_AlertDialog) + mDialog = new MaterialAlertDialogBuilder(mActivity) .setMessage(R.string.common_check_internet_connection_dialog) .setPositiveButton(R.string.ok, (dialog, which) -> TrafficManager.INSTANCE.setEnabled(false)) .setCancelable(true) diff --git a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java index 2dce832a6..3f5814e1d 100644 --- a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java +++ b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java @@ -56,7 +56,7 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment public Dialog onCreateDialog(Bundle savedInstanceState) { parseArguments(); - MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity()) .setCancelable(true) .setNegativeButton(android.R.string.cancel, null); beforeDialogCreated(builder); diff --git a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java index 0f5ba4ae7..424716580 100644 --- a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java +++ b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java @@ -494,7 +494,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La pref.setOnPreferenceClickListener(preference -> { if (MapManager.nativeIsDownloading()) { - new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog) + new MaterialAlertDialogBuilder(requireActivity()) .setTitle(R.string.downloading_is_active) .setMessage(R.string.cant_change_this_setting) .setPositiveButton(R.string.ok, null) diff --git a/android/app/src/main/java/app/organicmaps/settings/StoragePathFragment.java b/android/app/src/main/java/app/organicmaps/settings/StoragePathFragment.java index e435632c9..1a4650a87 100644 --- a/android/app/src/main/java/app/organicmaps/settings/StoragePathFragment.java +++ b/android/app/src/main/java/app/organicmaps/settings/StoragePathFragment.java @@ -97,7 +97,7 @@ public class StoragePathFragment extends BaseSettingsFragment final String oldPath = storages.get(currentIndex).mPath; final String newPath = storages.get(newIndex).mPath; - new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog) + new MaterialAlertDialogBuilder(requireActivity()) .setCancelable(false) .setTitle(R.string.move_maps) .setPositiveButton(R.string.ok, (dlg, which) -> moveStorage(newPath, oldPath)) @@ -133,7 +133,7 @@ public class StoragePathFragment extends BaseSettingsFragment if (!result) { - new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog) + new MaterialAlertDialogBuilder(requireActivity()) .setTitle(R.string.move_maps_error) .setPositiveButton( R.string.report_a_bug, diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java index 2994a98ad..f131ed14a 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java @@ -47,7 +47,7 @@ public class BookmarkColorDialogFragment extends BaseMwmDialogFragment mIconResId = getArguments().getInt(ICON_RES); } - return new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog) + return new MaterialAlertDialogBuilder(requireActivity()) .setView(buildView()) .setTitle(R.string.choose_color) .setNegativeButton(R.string.cancel, null) diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java index 788445aa3..7fd1954c6 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java @@ -464,7 +464,7 @@ public class PlacePageController mAlertDialog.show(); return; } - mAlertDialog = new MaterialAlertDialogBuilder(requireContext(), R.style.MwmTheme_AlertDialog) + mAlertDialog = new MaterialAlertDialogBuilder(requireContext()) .setTitle(requireContext().getString(R.string.delete_track_dialog_title, mMapObject.getTitle())) .setCancelable(true) .setNegativeButton(R.string.cancel, null) diff --git a/android/app/src/main/res/values-night/themes.xml b/android/app/src/main/res/values-night/themes.xml index 4082b98aa..822c6feba 100644 --- a/android/app/src/main/res/values-night/themes.xml +++ b/android/app/src/main/res/values-night/themes.xml @@ -21,7 +21,7 @@ ?colorPrimary false - @style/MwmTheme.AlertDialog + @style/MaterialAlertDialog.Material3 @color/bg_window @color/bg_cards @color/white_primary diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml index c46c15e74..28952e091 100644 --- a/android/app/src/main/res/values/themes.xml +++ b/android/app/src/main/res/values/themes.xml @@ -20,7 +20,7 @@ true ?selectableItemBackground ?colorPrimary - @style/MwmTheme.AlertDialog + @style/MaterialAlertDialog.Material3 @color/bg_window @color/bg_cards @color/black_primary