Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #9985 from osmandapp/fix_configure_profile

Browse source 
Fix wrong place of configure profile
This commit is contained in:
vshcherb 2020-10-08 13:48:03 +02:00 committed by GitHub
commit 100fdef017
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java
View file

@ -53,6 +53,9 @@ import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_CONFIGURE_PROFILE_ID;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_SWITCH_PROFILE_ID;
public class ContextMenuAdapter { public class ContextMenuAdapter {
private static final Log LOG = PlatformUtil.getLog(ContextMenuAdapter.class); private static final Log LOG = PlatformUtil.getLog(ContextMenuAdapter.class);
@ -134,6 +137,15 @@ public class ContextMenuAdapter {
Collections.sort(items, new Comparator<ContextMenuItem>() { Collections.sort(items, new Comparator<ContextMenuItem>() {
@Override @Override
public int compare(ContextMenuItem item1, ContextMenuItem item2) { public int compare(ContextMenuItem item1, ContextMenuItem item2) {
if (DRAWER_SWITCH_PROFILE_ID.equals(item1.getId())) {
return -1;
}
if (DRAWER_CONFIGURE_PROFILE_ID.equals(item1.getId()) && DRAWER_SWITCH_PROFILE_ID.equals(item2.getId())) {
return 1;
}
if (DRAWER_CONFIGURE_PROFILE_ID.equals(item1.getId())) {
return -1;
}
int order1 = item1.getOrder(); int order1 = item1.getOrder();
int order2 = item2.getOrder(); int order2 = item2.getOrder();
if (order1 < order2) { if (order1 < order2) {

6
OsmAnd/src/net/osmand/plus/settings/fragments/ConfigureMenuItemsFragment.java
View file

@ -51,6 +51,8 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.APP_PROFILES_ID; import static net.osmand.aidlapi.OsmAndCustomizationConstants.APP_PROFILES_ID;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_CONFIGURE_PROFILE_ID;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.DRAWER_SWITCH_PROFILE_ID;
import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MORE_ID; import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MORE_ID;
import static net.osmand.plus.settings.fragments.RearrangeMenuItemsAdapter.AdapterItemType.BUTTON; import static net.osmand.plus.settings.fragments.RearrangeMenuItemsAdapter.AdapterItemType.BUTTON;
import static net.osmand.plus.settings.fragments.RearrangeMenuItemsAdapter.AdapterItemType.DESCRIPTION; import static net.osmand.plus.settings.fragments.RearrangeMenuItemsAdapter.AdapterItemType.DESCRIPTION;
@ -183,7 +185,9 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment
public static List<ContextMenuItem> getCustomizableDefaultItems(List<ContextMenuItem> defItems) { public static List<ContextMenuItem> getCustomizableDefaultItems(List<ContextMenuItem> defItems) {
List<ContextMenuItem> items = new ArrayList<>(); List<ContextMenuItem> items = new ArrayList<>();
for (ContextMenuItem item : defItems) { for (ContextMenuItem item : defItems) {
if (!APP_PROFILES_ID.equals(item.getId())) { if (!APP_PROFILES_ID.equals(item.getId())
&& !DRAWER_CONFIGURE_PROFILE_ID.equals(item.getId())
&& !DRAWER_SWITCH_PROFILE_ID.equals(item.getId())) {
items.add(item); items.add(item);
} }
} }