gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Added checking on last owned category in bookmark list before allowing deletion

Browse source
This commit is contained in:
Александр Зацепин 2020-05-18 17:34:04 +03:00 • committed by yoksnod
parent 9f3e85e35a
commit fe8a0e6a57
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
View file

@ -24,6 +24,7 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.mapswithme.maps.MwmActivity;
import com.mapswithme.maps.R;
import com.mapswithme.maps.base.BaseMwmRecyclerFragment;
import com.mapswithme.maps.bookmarks.data.AbstractCategoriesSnapshot;
import com.mapswithme.maps.bookmarks.data.BookmarkCategory;
import com.mapswithme.maps.bookmarks.data.BookmarkInfo;
import com.mapswithme.maps.bookmarks.data.BookmarkManager;
@ -490,6 +491,12 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
return BookmarkManager.INSTANCE.isSearchAllowed(category.getId());
}
private boolean isLastOwnedCategory()
{
AbstractCategoriesSnapshot snapshot = BookmarkManager.INSTANCE.getOwnedCategoriesSnapshot();
return snapshot.getItems().size() == 1;
}
private void updateSortingProgressBar()
{
requireActivity().invalidateOptionsMenu();
@ -720,6 +727,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
@BookmarkManager.SortingType int[] types = getAvailableSortingTypes();
bs.getMenu().findItem(R.id.sort).setVisible(types.length > 0);
bs.getMenu().findItem(R.id.delete_category).setVisible(!isLastOwnedCategory());
BottomSheetHelper.tint(bs);
bs.show();

2
android/src/com/mapswithme/maps/bookmarks/data/AbstractCategoriesSnapshot.java
View file

@ -17,7 +17,7 @@ public abstract class AbstractCategoriesSnapshot
}
@NonNull
protected List<BookmarkCategory> getItems()
public List<BookmarkCategory> getItems()
{
return mSnapshot;
}