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

[android] Fixed review notes https://github.com/mapsme/omim/pull/9795#discussion_r231147119

Browse source
This commit is contained in:
Dmitry Donskoy 2018-11-06 18:34:49 +03:00 • committed by Aleksandr Zatsepin
parent 331f7b6b0a
commit aac6d2149e
7 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
android/res/layout/ugc_route_edit_settings_activity.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
</LinearLayout>

8
android/res/menu/menu_bookmark_categories.xml
View file

@ -3,18 +3,18 @@
<item android:id="@+id/list_settings"
android:title="@string/settings"
android:icon="@drawable/ic_24_px_settings"/>
<item android:id="@+id/set_show"/>
<item android:id="@+id/set_share"
<item android:id="@+id/show"/>
<item android:id="@+id/share"
android:title="@string/share"
android:icon="@drawable/ic_share"/>
<item android:id="@+id/set_edit"
<item android:id="@+id/edit"
android:title="@string/rename"
android:icon="@drawable/ic_edit"/>
<item android:id="@+id/sharing_options"
android:title="@string/sharing_options"
android:icon="@drawable/ic_add_members"/>
<item android:id="@+id/set_delete"
<item android:id="@+id/delete"
android:title="@string/delete"
android:icon="@drawable/ic_delete"/>
</menu>

2
android/res/menu/option_menu_bookmarks.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<item android:id="@+id/set_share"
<item android:id="@+id/share"
android:icon="@drawable/ic_add_members"
android:title="@string/share"
app:showAsAction="ifRoom"/>

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

@ -344,10 +344,10 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag
protected enum MenuItemClickProcessorWrapper
{
SET_SHOW(R.id.set_show, showAction()),
SET_SHARE(R.id.set_share, shareAction()),
SET_DELETE(R.id.set_delete, deleteAction()),
SET_EDIT(R.id.set_edit, editAction()),
SET_SHOW(R.id.show, showAction()),
SET_SHARE(R.id.share, shareAction()),
SET_DELETE(R.id.delete, deleteAction()),
SET_EDIT(R.id.edit, editAction()),
SHOW_ON_MAP(R.id.show_on_map, showAction()),
SHARE_LIST(R.id.share_list, shareAction()),
SHARING_OPTIONS(R.id.sharing_options, showSharingOptions()),

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

@ -149,7 +149,7 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Recyc
categoryHolder.mAccessRule.setText(representation);
}
private void onMoreOperationClicked(BookmarkCategory category)
private void onMoreOperationClicked(@NonNull BookmarkCategory category)
{
if (mCategoryListCallback != null)
mCategoryListCallback.onMoreOperationClick(category);

4
android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java
View file

@ -70,9 +70,9 @@ public class BookmarkCategoriesFragment extends BaseBookmarkCategoriesFragment
protected void prepareBottomMenuItems(@NonNull BottomSheet bottomSheet)
{
boolean isMultipleItems = getAdapter().getBookmarkCategories().size() > 1;
setEnableForMenuItem(R.id.set_delete, bottomSheet, isMultipleItems);
setEnableForMenuItem(R.id.delete, bottomSheet, isMultipleItems);
boolean isLocal = getSelectedCategory()
.getAccessRules() == BookmarkCategory.AccessRules.ACCESS_RULES_LOCAL;
setEnableForMenuItem(R.id.set_share, bottomSheet, isLocal);
setEnableForMenuItem(R.id.share, bottomSheet, isLocal);
}
}

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

@ -289,7 +289,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
@Override
public boolean onOptionsItemSelected(MenuItem item)
{
if (item.getItemId() == R.id.set_share)
if (item.getItemId() == R.id.share)
{
openSharingOptionsScreen();
return true;