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

[android] Added menu icons, added correct implementation menu item click

Browse source
This commit is contained in:
Dmitry Donskoy 2018-10-30 13:33:26 +03:00 • committed by Aleksandr Zatsepin
parent cbeead6b84
commit 53657206a3
7 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
android/res/drawable-hdpi/ic_24_px_settings.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 601 B

BIN
android/res/drawable-mdpi/ic_24_px_settings.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 391 B

BIN
android/res/drawable-xhdpi/ic_24_px_settings.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 793 B

BIN
android/res/drawable-xxhdpi/ic_24_px_settings.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
android/res/drawable-xxxhdpi/ic_24_px_settings.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

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

@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/list_settings"
android:title="@string/list_settings"
android:icon="@drawable/ic_24_px_settings"/>
<item android:id="@+id/set_show"/>
<item android:id="@+id/set_share"
android:title="@string/share"
android:icon="@drawable/ic_share"/>
@ -10,12 +11,9 @@
<item android:id="@+id/set_edit"
android:title="@string/rename"
android:icon="@drawable/ic_edit"/>
<item android:id="@+id/list_settings"
android:title="@string/list_settings"
android:icon="@drawable/ic_menu_settings"/>
<item android:id="@+id/sharing_options"
android:title="@string/sharing_options"
android:icon="@drawable/ic_menu_settings"/>
android:icon="@drawable/ic_add_members"/>
<item android:id="@+id/set_delete"
android:title="@string/delete"
android:icon="@drawable/ic_delete"/>

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

@ -40,6 +40,8 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag
{
private static final int MAX_CATEGORY_NAME_LENGTH = 60;
private static final int SHOW_ON_MAP_ITEM_MENU_INDEX = 1;
@NonNull
private BookmarkCategory mSelectedCategory;
@Nullable
@ -169,7 +171,7 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag
BottomSheet bottomSheet = bs.build();
prepareBottomMenuItems(bottomSheet);
bottomSheet
.getMenu().getItem(0)
.getMenu().getItem(SHOW_ON_MAP_ITEM_MENU_INDEX)
.setIcon(item.isVisible() ? R.drawable.ic_hide : R.drawable.ic_show)
.setTitle(item.isVisible() ? R.string.hide : R.string.show);
BottomSheetHelper.tint(bottomSheet);
@ -436,9 +438,6 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag
@NonNull BookmarkCategory category)
{
frag.onShareActionSelected(category);
Intent intent = new Intent(frag.getContext(), UgcRouteEditSettingsActivity.class);
intent.putExtra(UgcRouteEditSettingsActivity.EXTRA_BOOKMARK_CATEGORY, frag.mSelectedCategory);
frag.startActivity(intent);
}
}
@ -487,7 +486,9 @@ public abstract class BaseBookmarkCategoriesFragment extends BaseMwmRecyclerFrag
public void process(@NonNull BaseBookmarkCategoriesFragment frag,
@NonNull BookmarkCategory category)
{
Intent intent = new Intent(frag.getContext(), UgcRouteEditSettingsActivity.class);
intent.putExtra(UgcRouteEditSettingsActivity.EXTRA_BOOKMARK_CATEGORY, frag.mSelectedCategory);
frag.startActivity(intent);
}
}
}