[#49] Fixed issue with filters menu

jawg · Jun 27, 2016 · 865c2fa · 865c2fa
1 parent 03cdc87
commit 865c2fa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/main/java/io/mapsquare/osmcontributor/ui/activities/MapActivity.java b/src/main/java/io/mapsquare/osmcontributor/ui/activities/MapActivity.java
@@ -342,14 +342,21 @@ public void onPleaseInitializeDrawer(PleaseInitializeDrawer event) {
 
         Menu menu = filterView.getMenu();
 
+        int order = 1;
         for (PoiTypeFilter poiTypeFilter : filters) {
+            PoiTypeFilter nextPoiTypeFilter = null;
+            if (order < filters.size()) {
+                nextPoiTypeFilter = filters.get(order);
+            }
             // Add only menu if not present
             if (menu.findItem(poiTypeFilter.getPoiTypeId().intValue()) == null) {
                 filtersItemList.add(menu
-                        .add(Menu.NONE, poiTypeFilter.getPoiTypeId().intValue(), 0, poiTypeFilter.getPoiTypeName())
+                        .add(Menu.NONE, poiTypeFilter.getPoiTypeId().intValue(), (nextPoiTypeFilter != null ?
+                                (poiTypeFilter.compareTo(nextPoiTypeFilter) > 0 ? order - 1 : order) : order), poiTypeFilter.getPoiTypeName())
                         .setChecked(poiTypeFilter.isActive())
                         .setIcon(bitmapHandler.getDrawable(poiTypeFilter.getPoiTypeIconName())));
             }
+            order++;
         }
 
         // Remove only filter removed by user

diff --git a/src/main/java/io/mapsquare/osmcontributor/ui/fragments/MapFragment.java b/src/main/java/io/mapsquare/osmcontributor/ui/fragments/MapFragment.java
@@ -1229,8 +1229,8 @@ public void loadPoiTypeFloatingBtn() {
         if (!FlavorUtils.isPoiStorage()) {
             floatingActionButton = new FloatingActionButton(getActivity());
             floatingActionButton.setLabelText(getString(R.string.note));
-            floatingActionButton.setColorPressed(getResources().getColor(R.color.material_green_700));
-            floatingActionButton.setColorNormal(getResources().getColor(R.color.material_green_500));
+            floatingActionButton.setColorPressed(ContextCompat.getColor(getActivity(), R.color.material_green_700));
+            floatingActionButton.setColorNormal(ContextCompat.getColor(getActivity(), R.color.material_green_500));
             floatingActionButton.setButtonSize(FloatingActionButton.SIZE_MINI);
             floatingActionButton.setImageDrawable(bitmapHandler.getIconWhite(null));
             floatingActionButton.setOnClickListener(new View.OnClickListener() {