diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesFragment.java index 03245eaee..da1cd2433 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesFragment.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesFragment.java @@ -197,10 +197,8 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment onShareActionSelected(mSelectedCategory, KmlFileType.Text))); items.add(new MenuBottomSheetItem(R.string.export_file_gpx, R.drawable.ic_file_gpx, () -> onShareActionSelected(mSelectedCategory, KmlFileType.Gpx))); - // Disallow deleting the last category - if (getAdapter().getBookmarkCategories().size() > 1) - items.add(new MenuBottomSheetItem(R.string.delete, R.drawable.ic_delete, - () -> onDeleteActionSelected(mSelectedCategory))); + items.add(new MenuBottomSheetItem(R.string.delete, R.drawable.ic_delete, + () -> onDeleteActionSelected(mSelectedCategory))); } return items; } @@ -297,8 +295,24 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment 1)) + { + BookmarkManager.INSTANCE.deleteCategory(category.getId()); + getAdapter().notifyDataSetChanged(); + } + else + { + new MaterialAlertDialogBuilder(requireActivity()) + .setMessage(R.string.unable_to_delete_list) + .setPositiveButton(android.R.string.yes, ((dialog, which) -> { + onAddButtonClick(); + BookmarkManager.INSTANCE.deleteCategory(category.getId()); + getAdapter().notifyDataSetChanged(); + })) + .setNegativeButton(android.R.string.no,(dialog, which) -> dialog.dismiss()) + .show(); + } } private void onSettingsActionSelected(@NonNull BookmarkCategory category) diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index f3f47e64d..ffac47dd1 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -974,4 +974,5 @@ https://cdn-fi-1.comaps.app/ Not set Please enter a full URL starting with https:// and ending with / + The app cannot work without at least one list. Do you want to remove it and create a new one?