From aa5b7c192d174bf33e3bd9252151a2a43cc14e65 Mon Sep 17 00:00:00 2001 From: Dmitry Donskoy Date: Thu, 21 Jun 2018 20:12:10 +0300 Subject: [PATCH] [android] Allow remove last category from catalog --- .../bookmarks/BaseBookmarkCategoriesFragment.java | 11 ++++++++--- .../bookmarks/CachedBookmarkCategoriesFragment.java | 7 +++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java b/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java index 565f91afce..98610e8463 100644 --- a/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/BaseBookmarkCategoriesFragment.java @@ -159,7 +159,7 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag .setIcon(item.isVisible() ? R.drawable.ic_hide : R.drawable.ic_show) .setTitle(item.isVisible() ? R.string.hide : R.string.show); - final boolean deleteIsPossible = getAdapter().getBookmarkCategories().size() > 1; + final boolean deleteIsPossible = getAdapter().getBookmarkCategories().size() > 1 || mSelectedCategory.isFromCatalog(); bs.getItemById(getDeleteMenuItemResId()) .setVisible(deleteIsPossible) .setEnabled(deleteIsPossible); @@ -267,6 +267,12 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag SharingHelper.INSTANCE.prepareBookmarkCategoryForSharing(getActivity(), category.getId()); } + protected void onDeleteActionSelected(@NonNull BookmarkCategory category) + { + BookmarkManager.INSTANCE.deleteCategory(category.getId()); + getAdapter().notifyDataSetChanged(); + } + @Override public void onItemLongClick(View v, BookmarkCategory category) { @@ -398,8 +404,7 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag public void process(@NonNull BaseBookmarkCategoriesFragment frag, @NonNull BookmarkCategory category) { - BookmarkManager.INSTANCE.deleteCategory(category.getId()); - frag.getAdapter().notifyDataSetChanged(); + frag.onDeleteActionSelected(category); } } diff --git a/android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java b/android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java index 0a16326bba..dbeae80b32 100644 --- a/android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java +++ b/android/src/com/mapswithme/maps/bookmarks/CachedBookmarkCategoriesFragment.java @@ -74,6 +74,13 @@ public class CachedBookmarkCategoriesFragment extends BaseBookmarkCategoriesFrag startActivity(Intent.createChooser(intent, getString(R.string.share))); } + @Override + protected void onDeleteActionSelected(@NonNull BookmarkCategory category) + { + super.onDeleteActionSelected(category); + updateLoadingPlaceholder(); + } + @Override protected int getDeleteMenuItemResId() {