From fafa1b4e8b915de4ff9b122b9fe41011d41ebd12 Mon Sep 17 00:00:00 2001 From: konggdev Date: Tue, 7 Jul 2026 01:52:21 +0200 Subject: [PATCH] Reload styles in askUserOverwriteFile --- .../strikemaps/ui/factory/AlertDialogFactory.java | 9 +++++---- .../ui/fragment/dialog/NewStyleBottomSheet.java | 2 +- .../ui/fragment/dialog/StyleDetailsBottomSheet.java | 1 - 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/konggdev/strikemaps/ui/factory/AlertDialogFactory.java b/app/src/main/java/eu/konggdev/strikemaps/ui/factory/AlertDialogFactory.java index 5ec5849..0409ef5 100644 --- a/app/src/main/java/eu/konggdev/strikemaps/ui/factory/AlertDialogFactory.java +++ b/app/src/main/java/eu/konggdev/strikemaps/ui/factory/AlertDialogFactory.java @@ -195,7 +195,7 @@ public final class AlertDialogFactory { } if (FileHelper.userFileExists("style", fileName, app)) { - app.getUi().alert(askUserOverwriteFile(app, fileName, "style", mapper.writeValueAsString(root), dialog)); + app.getUi().alert(askUserOverwriteFile(app, fileName, "style", mapper.writeValueAsString(root), dialog, mapChangePopup)); } else { FileHelper.writeUserFile("style", fileName, mapper.writeValueAsString(root), app); } @@ -212,7 +212,7 @@ public final class AlertDialogFactory { return dialog; } - public static AlertDialog askUserOverwriteFile(AppController app, String fileName, String path, String content) { + public static AlertDialog askUserOverwriteFile(AppController app, String fileName, String path, String content, FragmentMapChangePopup mapChangePopup) { return new AlertDialog.Builder(app.getActivity()) .setMessage("Style of filename " + fileName + " already exists, do you wish to overwrite it?") .setPositiveButton("Yes", (dialog, which) -> { @@ -221,13 +221,13 @@ public final class AlertDialogFactory { } catch (Exception e) { e.printStackTrace(); } + mapChangePopup.reloadStyles(); }) .setNegativeButton("No", null) .create(); } - public static AlertDialog askUserOverwriteFile(AppController app, String fileName, String path, String content, AlertDialog originDialog) { - + public static AlertDialog askUserOverwriteFile(AppController app, String fileName, String path, String content, AlertDialog originDialog, FragmentMapChangePopup mapChangePopup) { return new AlertDialog.Builder(app.getActivity()) .setMessage("Style of filename: " + fileName + " already exists, do you wish to overwrite it?") .setPositiveButton("Yes", (dialog, which) -> { @@ -240,6 +240,7 @@ public final class AlertDialogFactory { if (originDialog != null) { originDialog.dismiss(); } + mapChangePopup.reloadStyles(); dialog.dismiss(); }) .setNegativeButton("No", (dialog, which) -> { diff --git a/app/src/main/java/eu/konggdev/strikemaps/ui/fragment/dialog/NewStyleBottomSheet.java b/app/src/main/java/eu/konggdev/strikemaps/ui/fragment/dialog/NewStyleBottomSheet.java index a0b9d27..5512902 100644 --- a/app/src/main/java/eu/konggdev/strikemaps/ui/fragment/dialog/NewStyleBottomSheet.java +++ b/app/src/main/java/eu/konggdev/strikemaps/ui/fragment/dialog/NewStyleBottomSheet.java @@ -87,7 +87,7 @@ public class NewStyleBottomSheet extends BottomSheetDialogFragment { if (!FileHelper.userFileExists("style", fileName, app)) { FileHelper.writeUserFile("style", fileName, content, app); } else { - app.getUi().alert(AlertDialogFactory.askUserOverwriteFile(app, fileName, "style", content)); + app.getUi().alert(AlertDialogFactory.askUserOverwriteFile(app, fileName, "style", content, mapChangePopup)); } mapChangePopup.reloadStyles(); diff --git a/app/src/main/java/eu/konggdev/strikemaps/ui/fragment/dialog/StyleDetailsBottomSheet.java b/app/src/main/java/eu/konggdev/strikemaps/ui/fragment/dialog/StyleDetailsBottomSheet.java index 4f52d04..2be17a8 100644 --- a/app/src/main/java/eu/konggdev/strikemaps/ui/fragment/dialog/StyleDetailsBottomSheet.java +++ b/app/src/main/java/eu/konggdev/strikemaps/ui/fragment/dialog/StyleDetailsBottomSheet.java @@ -139,7 +139,6 @@ public class StyleDetailsBottomSheet extends BottomSheetDialogFragment { styleTypeView.setText("User Style"); } - editButtonLayout.setOnClickListener(v -> Toast.makeText(requireContext(), "Editor not implemented yet\nWait for release", Toast.LENGTH_SHORT).show()); copyButtonLayout.setOnClickListener(v -> ui.alert(AlertDialogFactory.createStyle(app, getContents(), mapChangePopup))); exportButtonLayout.setOnClickListener(v -> showExportDialog(fileName));