From 1bb2e1621e4a468ad2c92220eef250a19235b856 Mon Sep 17 00:00:00 2001 From: veliymolfar Date: Fri, 17 Apr 2020 10:28:05 +0300 Subject: [PATCH 1/5] toolbar NPE fix --- .../settings/ConfigureMenuItemsFragment.java | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java b/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java index 8790889a1b..d41b3b33b2 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java @@ -21,6 +21,8 @@ import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import com.google.android.material.appbar.AppBarLayout; + import net.osmand.AndroidUtils; import net.osmand.PlatformUtil; import net.osmand.plus.ApplicationMode; @@ -169,27 +171,27 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable final ViewGroup container, @Nullable Bundle savedInstanceState) { View root = mInflater.inflate(R.layout.edit_arrangement_list_fragment, container, false); - Toolbar toolbar = root.findViewById(R.id.toolbar); - TextView toolbarTitle = root.findViewById(R.id.toolbar_title); - ImageButton toolbarButton = root.findViewById(R.id.close_button); - RecyclerView recyclerView = root.findViewById(R.id.profiles_list); + AppBarLayout appbar = root.findViewById(R.id.appbar); + View toolbar = mInflater.inflate(R.layout.global_preference_toolbar, container, false); + TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title); + ImageButton toolbarButton = toolbar.findViewById(R.id.close_button); + toolbar.setBackgroundColor(nightMode + ? getResources().getColor(R.color.list_background_color_dark) + : getResources().getColor(R.color.list_background_color_light)); + toolbarTitle.setTextColor(nightMode + ? getResources().getColor(R.color.text_color_primary_dark) + : getResources().getColor(R.color.list_background_color_dark)); + toolbarButton.setImageDrawable(getPaintedContentIcon(R.drawable.ic_arrow_back, getResources().getColor(R.color.text_color_secondary_light))); + toolbarTitle.setText(screenType.titleRes); + toolbarButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + exitFragment(); + } + }); + appbar.addView(toolbar); + RecyclerView recyclerView = root.findViewById(R.id.profiles_list); recyclerView.setPadding(0, 0, 0, (int) app.getResources().getDimension(R.dimen.dialog_button_ex_min_width)); - toolbar.setBackgroundColor(nightMode - ? getResources().getColor(R.color.list_background_color_dark) - : getResources().getColor(R.color.list_background_color_light)); - toolbarTitle.setTextColor(nightMode - ? getResources().getColor(R.color.text_color_primary_dark) - : getResources().getColor(R.color.list_background_color_dark)); - toolbarButton.setImageDrawable(getPaintedContentIcon(R.drawable.ic_arrow_back, getResources().getColor(R.color.text_color_secondary_light))); - toolbarTitle.setText(screenType.titleRes); - toolbarButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - exitFragment(); - } - }); - - rearrangeAdapter = new RearrangeMenuItemsAdapter(app, getAdapterItems()); recyclerView.setLayoutManager(new LinearLayoutManager(app)); final ItemTouchHelper touchHelper = new ItemTouchHelper(new ReorderItemTouchHelperCallback(rearrangeAdapter)); From 0bb6b6a15e511728a1ebb101defeb0ea39dced99 Mon Sep 17 00:00:00 2001 From: veliymolfar Date: Fri, 17 Apr 2020 12:25:35 +0300 Subject: [PATCH 2/5] fix screenType NPE, fix wrong order after screen orientation changed --- .../settings/ConfigureMenuItemsFragment.java | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java b/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java index d41b3b33b2..38871c9738 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java @@ -14,7 +14,6 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentManager; import androidx.recyclerview.widget.ItemTouchHelper; @@ -70,6 +69,7 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment private static final String ITEMS_ORDER_KEY = "items_order_key"; private static final String HIDDEN_ITEMS_KEY = "hidden_items_key"; private static final String CONFIGURE_MENU_ITEMS_TAG = "configure_menu_items_tag"; + private static final String IS_CHANGED_KEY = "is_changed_key"; private RearrangeMenuItemsAdapter rearrangeAdapter; private HashMap menuItemsOrder; private ContextMenuAdapter contextMenuAdapter; @@ -89,6 +89,7 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment outState.putSerializable(ITEMS_ORDER_KEY, menuItemsOrder); outState.putSerializable(ITEM_TYPE_KEY, screenType); outState.putString(APP_MODE_KEY, appMode.getStringKey()); + outState.putBoolean(IS_CHANGED_KEY, isChanged); } public static ConfigureMenuItemsFragment showInstance( @@ -128,15 +129,12 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment app = requireMyApplication(); nightMode = !app.getSettings().isLightContent(); mInflater = UiUtilities.getInflater(app, nightMode); - instantiateContextMenuAdapter(); - if (savedInstanceState != null - && savedInstanceState.containsKey(ITEM_TYPE_KEY) - && savedInstanceState.containsKey(HIDDEN_ITEMS_KEY) - && savedInstanceState.containsKey(ITEMS_ORDER_KEY)) { + if (savedInstanceState != null) { appMode = ApplicationMode.valueOfStringKey(savedInstanceState.getString(APP_MODE_KEY), null); screenType = (ScreenType) savedInstanceState.getSerializable(ITEM_TYPE_KEY); hiddenMenuItems = savedInstanceState.getStringArrayList(HIDDEN_ITEMS_KEY); - menuItemsOrder = (HashMap) savedInstanceState.getSerializable(ITEMS_ORDER_KEY); + menuItemsOrder = (HashMap) savedInstanceState.getSerializable(ITEMS_ORDER_KEY); + isChanged = savedInstanceState.getBoolean(IS_CHANGED_KEY); } else { hiddenMenuItems = new ArrayList<>(getSettingForScreen(app, screenType).getModeValue(appMode).getHiddenIds()); menuItemsOrder = new HashMap<>(); @@ -144,7 +142,15 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment for (int i = 0; i < orderIds.size(); i++) { menuItemsOrder.put(orderIds.get(i), i); } - } + } + instantiateContextMenuAdapter(); + if (menuItemsOrder.isEmpty()) { + List defItems = contextMenuAdapter.getDefaultItems(); + initDefaultOrders(defItems); + for (int i = 0; i < defItems.size(); i++) { + menuItemsOrder.put(defItems.get(i).getId(), i); + } + } } private void instantiateContextMenuAdapter() { From 038088feb8482854fc598880cd501df2c2926080 Mon Sep 17 00:00:00 2001 From: veliymolfar Date: Fri, 17 Apr 2020 16:25:31 +0300 Subject: [PATCH 3/5] fix crash on deleted actions --- .../MapContextMenuFragment.java | 13 ++++++++--- .../settings/ConfigureMenuItemsFragment.java | 22 +++++++++---------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java index 57717e57eb..11ad2b3af4 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java @@ -88,6 +88,7 @@ import java.util.List; import static net.osmand.aidlapi.OsmAndCustomizationConstants.MAP_CONTEXT_MENU_MORE_ID; import static net.osmand.plus.mapcontextmenu.MenuBuilder.SHADOW_HEIGHT_TOP_DP; +import static net.osmand.plus.settings.ConfigureMenuItemsFragment.MAIN_BUTTONS_QUANTITY; public class MapContextMenuFragment extends BaseOsmAndFragment implements DownloadEvents { @@ -566,11 +567,16 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo // Action buttons // TODO refactor section ContextMenuAdapter adapter = menu.getActionsContextMenuAdapter(false); - List items = adapter.getItems(); + List items = new ArrayList<>(); + for (ContextMenuItem item : adapter.getItems()) { + if (!item.isHidden()) { + items.add(item); + } + } ContextMenuAdapter mainAdapter = new ContextMenuAdapter(requireMyApplication()); ContextMenuAdapter additionalAdapter = new ContextMenuAdapter(requireMyApplication()); for (int i = 0; i < items.size(); i++) { - if (i < 4) { + if (i < MAIN_BUTTONS_QUANTITY) { mainAdapter.addItem(items.get(i)); } else { additionalAdapter.addItem(items.get(i)); @@ -585,7 +591,8 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo ContextMenuItemClickListener mainListener = menu.getContextMenuItemClickListener(mainAdapter); ContextMenuItemClickListener additionalListener = menu.getContextMenuItemClickListener(additionalAdapter); - for (int i = 0; i < 4; i++) { + int mainButtonsQuantity = Math.min(MAIN_BUTTONS_QUANTITY, items.size()); + for (int i = 0; i < mainButtonsQuantity; i++) { buttons.addView(getActionView(items.get(i), i, mainAdapter, additionalAdapter, mainListener, additionalListener), params); } buttons.setGravity(Gravity.CENTER); diff --git a/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java b/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java index 38871c9738..a156558177 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java @@ -308,18 +308,18 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment List visible = getItemsForRearrangeAdapter(hiddenMenuItems, wasReset ? null : menuItemsOrder, false); List hiddenItems = getItemsForRearrangeAdapter(hiddenMenuItems, wasReset ? null : menuItemsOrder, true); if (screenType == ScreenType.CONTEXT_MENU_ACTIONS) { + int buttonMoreIndex = MAIN_BUTTONS_QUANTITY - 1; for (int i = 0; i < visible.size(); i++) { - ContextMenuItem value = (ContextMenuItem) visible.get(i).getValue(); - if (value.getId() != null && value.getId().equals(MAP_CONTEXT_MENU_MORE_ID)) { - int buttonMoreIndex = MAIN_BUTTONS_QUANTITY - 1; - if (i > buttonMoreIndex) { - RearrangeMenuAdapterItem third = visible.get(buttonMoreIndex); - visible.set(buttonMoreIndex, visible.get(i)); - menuItemsOrder.put(((ContextMenuItem) third.getValue()).getId(), i); - menuItemsOrder.put(((ContextMenuItem) visible.get(i).getValue()).getId(), buttonMoreIndex); - } - } - } + ContextMenuItem value = (ContextMenuItem) visible.get(i).getValue(); + if (value.getId() != null && value.getId().equals(MAP_CONTEXT_MENU_MORE_ID) && i > buttonMoreIndex) { + RearrangeMenuAdapterItem third = visible.get(buttonMoreIndex); + visible.set(buttonMoreIndex, visible.get(i)); + visible.set(i, third); + value.setOrder(buttonMoreIndex); + ((ContextMenuItem) third.getValue()).setOrder(i); + break; + } + } List main = new ArrayList<>(); int actionsIndex = Math.min(MAIN_BUTTONS_QUANTITY, visible.size()); From d4ebb6b8361e58738adb1303d147ed76052e37ed Mon Sep 17 00:00:00 2001 From: veliymolfar Date: Fri, 17 Apr 2020 16:34:51 +0300 Subject: [PATCH 4/5] formatting --- .../MapContextMenuFragment.java | 28 +++--- .../settings/ConfigureMenuItemsFragment.java | 88 +++++++++---------- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java index 11ad2b3af4..ab8f716b4f 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java @@ -567,16 +567,16 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo // Action buttons // TODO refactor section ContextMenuAdapter adapter = menu.getActionsContextMenuAdapter(false); - List items = new ArrayList<>(); - for (ContextMenuItem item : adapter.getItems()) { - if (!item.isHidden()) { - items.add(item); - } - } + List items = new ArrayList<>(); + for (ContextMenuItem item : adapter.getItems()) { + if (!item.isHidden()) { + items.add(item); + } + } ContextMenuAdapter mainAdapter = new ContextMenuAdapter(requireMyApplication()); ContextMenuAdapter additionalAdapter = new ContextMenuAdapter(requireMyApplication()); for (int i = 0; i < items.size(); i++) { - if (i < MAIN_BUTTONS_QUANTITY) { + if (i < MAIN_BUTTONS_QUANTITY) { mainAdapter.addItem(items.get(i)); } else { additionalAdapter.addItem(items.get(i)); @@ -591,8 +591,8 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo ContextMenuItemClickListener mainListener = menu.getContextMenuItemClickListener(mainAdapter); ContextMenuItemClickListener additionalListener = menu.getContextMenuItemClickListener(additionalAdapter); - int mainButtonsQuantity = Math.min(MAIN_BUTTONS_QUANTITY, items.size()); - for (int i = 0; i < mainButtonsQuantity; i++) { + int mainButtonsQuantity = Math.min(MAIN_BUTTONS_QUANTITY, items.size()); + for (int i = 0; i < mainButtonsQuantity; i++) { buttons.addView(getActionView(items.get(i), i, mainAdapter, additionalAdapter, mainListener, additionalListener), params); } buttons.setGravity(Gravity.CENTER); @@ -655,11 +655,11 @@ public class MapContextMenuFragment extends BaseOsmAndFragment implements Downlo } private View getActionView(ContextMenuItem contextMenuItem, - final int position, - final ContextMenuAdapter mainAdapter, - final ContextMenuAdapter additionalAdapter, - final ContextMenuItemClickListener mainListener, - final ContextMenuItemClickListener additionalListener) { + final int position, + final ContextMenuAdapter mainAdapter, + final ContextMenuAdapter additionalAdapter, + final ContextMenuItemClickListener mainListener, + final ContextMenuItemClickListener additionalListener) { UiUtilities uiUtilities = requireMyApplication().getUIUtilities(); LayoutInflater inflater = UiUtilities.getInflater(getMyApplication(), nightMode); View view = inflater.inflate(R.layout.context_menu_action_item, null); diff --git a/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java b/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java index a156558177..7c7ee59f9c 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java @@ -89,7 +89,7 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment outState.putSerializable(ITEMS_ORDER_KEY, menuItemsOrder); outState.putSerializable(ITEM_TYPE_KEY, screenType); outState.putString(APP_MODE_KEY, appMode.getStringKey()); - outState.putBoolean(IS_CHANGED_KEY, isChanged); + outState.putBoolean(IS_CHANGED_KEY, isChanged); } public static ConfigureMenuItemsFragment showInstance( @@ -129,12 +129,12 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment app = requireMyApplication(); nightMode = !app.getSettings().isLightContent(); mInflater = UiUtilities.getInflater(app, nightMode); - if (savedInstanceState != null) { + if (savedInstanceState != null) { appMode = ApplicationMode.valueOfStringKey(savedInstanceState.getString(APP_MODE_KEY), null); screenType = (ScreenType) savedInstanceState.getSerializable(ITEM_TYPE_KEY); hiddenMenuItems = savedInstanceState.getStringArrayList(HIDDEN_ITEMS_KEY); - menuItemsOrder = (HashMap) savedInstanceState.getSerializable(ITEMS_ORDER_KEY); - isChanged = savedInstanceState.getBoolean(IS_CHANGED_KEY); + menuItemsOrder = (HashMap) savedInstanceState.getSerializable(ITEMS_ORDER_KEY); + isChanged = savedInstanceState.getBoolean(IS_CHANGED_KEY); } else { hiddenMenuItems = new ArrayList<>(getSettingForScreen(app, screenType).getModeValue(appMode).getHiddenIds()); menuItemsOrder = new HashMap<>(); @@ -142,15 +142,15 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment for (int i = 0; i < orderIds.size(); i++) { menuItemsOrder.put(orderIds.get(i), i); } - } - instantiateContextMenuAdapter(); - if (menuItemsOrder.isEmpty()) { - List defItems = contextMenuAdapter.getDefaultItems(); - initDefaultOrders(defItems); - for (int i = 0; i < defItems.size(); i++) { - menuItemsOrder.put(defItems.get(i).getId(), i); - } - } + } + instantiateContextMenuAdapter(); + if (menuItemsOrder.isEmpty()) { + List defItems = contextMenuAdapter.getDefaultItems(); + initDefaultOrders(defItems); + for (int i = 0; i < defItems.size(); i++) { + menuItemsOrder.put(defItems.get(i).getId(), i); + } + } } private void instantiateContextMenuAdapter() { @@ -177,26 +177,26 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable final ViewGroup container, @Nullable Bundle savedInstanceState) { View root = mInflater.inflate(R.layout.edit_arrangement_list_fragment, container, false); - AppBarLayout appbar = root.findViewById(R.id.appbar); - View toolbar = mInflater.inflate(R.layout.global_preference_toolbar, container, false); - TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title); - ImageButton toolbarButton = toolbar.findViewById(R.id.close_button); - toolbar.setBackgroundColor(nightMode - ? getResources().getColor(R.color.list_background_color_dark) - : getResources().getColor(R.color.list_background_color_light)); - toolbarTitle.setTextColor(nightMode - ? getResources().getColor(R.color.text_color_primary_dark) - : getResources().getColor(R.color.list_background_color_dark)); - toolbarButton.setImageDrawable(getPaintedContentIcon(R.drawable.ic_arrow_back, getResources().getColor(R.color.text_color_secondary_light))); - toolbarTitle.setText(screenType.titleRes); - toolbarButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - exitFragment(); - } - }); - appbar.addView(toolbar); - RecyclerView recyclerView = root.findViewById(R.id.profiles_list); + AppBarLayout appbar = root.findViewById(R.id.appbar); + View toolbar = mInflater.inflate(R.layout.global_preference_toolbar, container, false); + TextView toolbarTitle = toolbar.findViewById(R.id.toolbar_title); + ImageButton toolbarButton = toolbar.findViewById(R.id.close_button); + toolbar.setBackgroundColor(nightMode + ? getResources().getColor(R.color.list_background_color_dark) + : getResources().getColor(R.color.list_background_color_light)); + toolbarTitle.setTextColor(nightMode + ? getResources().getColor(R.color.text_color_primary_dark) + : getResources().getColor(R.color.list_background_color_dark)); + toolbarButton.setImageDrawable(getPaintedContentIcon(R.drawable.ic_arrow_back, getResources().getColor(R.color.text_color_secondary_light))); + toolbarTitle.setText(screenType.titleRes); + toolbarButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + exitFragment(); + } + }); + appbar.addView(toolbar); + RecyclerView recyclerView = root.findViewById(R.id.profiles_list); recyclerView.setPadding(0, 0, 0, (int) app.getResources().getDimension(R.dimen.dialog_button_ex_min_width)); rearrangeAdapter = new RearrangeMenuItemsAdapter(app, getAdapterItems()); recyclerView.setLayoutManager(new LinearLayoutManager(app)); @@ -308,18 +308,18 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment List visible = getItemsForRearrangeAdapter(hiddenMenuItems, wasReset ? null : menuItemsOrder, false); List hiddenItems = getItemsForRearrangeAdapter(hiddenMenuItems, wasReset ? null : menuItemsOrder, true); if (screenType == ScreenType.CONTEXT_MENU_ACTIONS) { - int buttonMoreIndex = MAIN_BUTTONS_QUANTITY - 1; + int buttonMoreIndex = MAIN_BUTTONS_QUANTITY - 1; for (int i = 0; i < visible.size(); i++) { - ContextMenuItem value = (ContextMenuItem) visible.get(i).getValue(); - if (value.getId() != null && value.getId().equals(MAP_CONTEXT_MENU_MORE_ID) && i > buttonMoreIndex) { - RearrangeMenuAdapterItem third = visible.get(buttonMoreIndex); - visible.set(buttonMoreIndex, visible.get(i)); - visible.set(i, third); - value.setOrder(buttonMoreIndex); - ((ContextMenuItem) third.getValue()).setOrder(i); - break; - } - } + ContextMenuItem value = (ContextMenuItem) visible.get(i).getValue(); + if (value.getId() != null && value.getId().equals(MAP_CONTEXT_MENU_MORE_ID) && i > buttonMoreIndex) { + RearrangeMenuAdapterItem third = visible.get(buttonMoreIndex); + visible.set(buttonMoreIndex, visible.get(i)); + visible.set(i, third); + value.setOrder(buttonMoreIndex); + ((ContextMenuItem) third.getValue()).setOrder(i); + break; + } + } List main = new ArrayList<>(); int actionsIndex = Math.min(MAIN_BUTTONS_QUANTITY, visible.size()); From e003d95cb8068e99ecee03011a9171289c8c4a31 Mon Sep 17 00:00:00 2001 From: veliymolfar Date: Fri, 17 Apr 2020 16:38:46 +0300 Subject: [PATCH 5/5] formatting --- .../net/osmand/plus/settings/ConfigureMenuItemsFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java b/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java index 7c7ee59f9c..6777b95add 100644 --- a/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java +++ b/OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java @@ -69,7 +69,7 @@ public class ConfigureMenuItemsFragment extends BaseOsmAndFragment private static final String ITEMS_ORDER_KEY = "items_order_key"; private static final String HIDDEN_ITEMS_KEY = "hidden_items_key"; private static final String CONFIGURE_MENU_ITEMS_TAG = "configure_menu_items_tag"; - private static final String IS_CHANGED_KEY = "is_changed_key"; + private static final String IS_CHANGED_KEY = "is_changed_key"; private RearrangeMenuItemsAdapter rearrangeAdapter; private HashMap menuItemsOrder; private ContextMenuAdapter contextMenuAdapter;