Material Icons

src/main/java/de/blau/android/DisambiguationMenu.java

@@ -381,25 +381,25 @@ private Drawable getDrawable(DisambiguationMenuItem item) {
             if (type != null) {
                 switch (type) {
                 case NODE:
-                    return ContextCompat.getDrawable(context, R.drawable.element_node);
+                    return ContextCompat.getDrawable(context, R.drawable.icon_node);
                 case WAY:
-                    return ContextCompat.getDrawable(context, R.drawable.element_way);
+                    return ContextCompat.getDrawable(context, R.drawable.icon_way);
                 case RELATION:
-                    return ContextCompat.getDrawable(context, R.drawable.element_relation);
+                    return ContextCompat.getDrawable(context, R.drawable.icon_relation);
                 case BUG:
-                    return ContextCompat.getDrawable(context, R.drawable.bug_small);
+                    return ContextCompat.getDrawable(context, R.drawable.icon_bug);
                 case NOTE:
-                    return ContextCompat.getDrawable(context, R.drawable.note_small);
+                    return ContextCompat.getDrawable(context, R.drawable.icon_note);
                 case TODO:
-                    return ContextCompat.getDrawable(context, R.drawable.todo_small);
+                    return ContextCompat.getDrawable(context, R.drawable.icon_todo);
                 case MAPROULETTE:
-                    return ContextCompat.getDrawable(context, R.drawable.maproulette_small);
+                    return ContextCompat.getDrawable(context, R.drawable.icon_maproulette);
                 case GEOJSON:
-                    return ContextCompat.getDrawable(context, R.drawable.geojson);
+                    return ContextCompat.getDrawable(context, R.drawable.icon_geojson);
                 case GPX:
-                    return ContextCompat.getDrawable(context, R.drawable.gpx);
+                    return ContextCompat.getDrawable(context, R.drawable.icon_gpx);
                 case IMAGE:
-                    return ContextCompat.getDrawable(context, R.drawable.photo_small);
+                    return ContextCompat.getDrawable(context, R.drawable.icon_photo);
                 case MAPILLARY:
                     return ContextCompat.getDrawable(context, R.drawable.mapillary_small);
                 case PANORAMAX:

src/main/java/de/blau/android/Main.java

@@ -1669,9 +1669,9 @@ private void setupFollowButton() {
      */
     private void setFollowImage(boolean gps, boolean isVisible) {
         FloatingActionButton followButton = getFollowButton();
-        int buttonRes = R.drawable.ic_filter_tilt_shift_black_36dp;
+        int buttonRes = R.drawable.gps_off_black;
         if (gps) {
-            buttonRes = R.drawable.ic_gps_fixed_black_36dp;
+            buttonRes = R.drawable.gps_on_black;
         }
         followButton.setImageResource(buttonRes);
         if (isVisible) {

src/main/java/de/blau/android/Mode.java

@@ -39,7 +39,7 @@ public enum Mode {
     /**
      * Address adding mode
      */
-    MODE_ADDRESS(R.string.mode_address, "ADDRESS", true, true, true, true, null, R.drawable.unlocked_address_white, new FilterModeConfig() {
+    MODE_ADDRESS(R.string.mode_address, "ADDRESS", true, true, true, true, null, R.drawable.address_white, new FilterModeConfig() {
 
         @Override
         public Set<SimpleAction> enabledSimpleActions() {
@@ -141,7 +141,7 @@ public <M extends Map<String, String> & Serializable> M getExtraTags(@NonNull Lo
         public <L extends List<PresetElementPath> & Serializable> L getPresetItems(@NonNull Context ctx, @NonNull OsmElement e) {
             return (L) new ArrayList<PresetElementPath>();
         }
-    }), MODE_CORRECT(R.string.mode_correct, "CORRECT", true, true, true, false, null, R.drawable.unlocked_correct_white, new ModeConfig() {
+    }), MODE_CORRECT(R.string.mode_correct, "CORRECT", true, true, true, false, null, R.drawable.bug_white, new ModeConfig() {
 
         @Override
         public void setup(final Main main, final Logic logic) {

src/main/java/de/blau/android/dialogs/ConsoleDialog.java

@@ -193,7 +193,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
             Button negative = ((AlertDialog) d).getButton(DialogInterface.BUTTON_NEGATIVE);
             negative.setOnClickListener(view -> runScript(dialog, callback, output, dismissOnRun, checkbox1, checkbox2));
             Button positive = ((AlertDialog) d).getButton(DialogInterface.BUTTON_POSITIVE);
-            Drawable more = ThemeUtils.getTintedDrawable(activity, R.drawable.ic_more_vert_black_24dp, R.attr.colorAccent);
+            Drawable more = ThemeUtils.getTintedDrawable(activity, R.drawable.more_black, R.attr.colorAccent);
             positive.setCompoundDrawablesWithIntrinsicBounds(null, null, more, null);
             positive.setText("");
             positive.setOnClickListener(view -> {

src/main/java/de/blau/android/easyedit/BuilderActionModeCallback.java

@@ -45,7 +45,7 @@ public boolean onCreateActionMode(ActionMode mode, Menu menu) {
         FloatingActionButton button = main.getSimpleActionsButton();
         button.setOnClickListener(v -> finishBuilding());
         savedButton = button.getDrawable();
-        button.setImageResource(R.drawable.ic_done_white_36dp);
+        button.setImageResource(R.drawable.check_white);
         if (!prefs.areSimpleActionsEnabled()) {
             main.showSimpleActionsButton();
         }

src/main/java/de/blau/android/easyedit/RotationActionModeCallback.java

@@ -45,7 +45,7 @@ public boolean onCreateActionMode(ActionMode mode, Menu menu) {
         FloatingActionButton button = main.getSimpleActionsButton();
         button.setOnClickListener(v -> manager.startElementSelectionMode());
         savedButton = button.getDrawable();
-        button.setImageResource(R.drawable.ic_done_white_36dp);
+        button.setImageResource(R.drawable.check_white);
         mode.setTitle(R.string.actionmode_rotate);
         mode.setSubtitle(null);
         return true;

src/main/java/de/blau/android/filter/PresetFilter.java

@@ -79,7 +79,7 @@ void setPresetElement(@NonNull Context ctx, @NonNull PresetElementPath path) {
         element = Preset.getElementByPath(searchPreset.getRootGroup(), path);
         if (element == null) {
             if (presetFilterButton != null) {
-                presetFilterButton.setImageResource(R.drawable.ic_filter_list_black_36dp);
+                presetFilterButton.setImageResource(R.drawable.filter_black);
             }
             preset = null;
             Log.e(DEBUG_TAG, path.toString() + " not found");
@@ -210,7 +210,7 @@ private void setIcon(@NonNull final Context ctx) {
                 BitmapDrawable buttonIcon = new BitmapDrawable(ctx.getResources(), icon.getBitmap());
                 presetFilterButton.setImageDrawable(buttonIcon);
             } else {
-                presetFilterButton.setImageResource(R.drawable.ic_filter_list_black_36dp);
+                presetFilterButton.setImageResource(R.drawable.filter_black);
             }
             presetFilterButton.hide(); // workaround https://issuetracker.google.com/issues/117476935
             presetFilterButton.show();
@@ -237,7 +237,7 @@ public void removeControls() {
     @Override
     public void hideControls() {
         if (presetFilterButton != null) {
-            presetFilterButton.setImageResource(R.drawable.ic_filter_list_black_36dp);
+            presetFilterButton.setImageResource(R.drawable.filter_black);
             presetFilterButton.hide();
         }
     }

src/main/java/de/blau/android/imageryoffset/ImageryAlignmentActionModeCallback.java

@@ -228,7 +228,7 @@ public boolean onCreateActionMode(ActionMode mode, Menu menu) {
         button.setOnClickListener(v -> saveAndFinish());
         savedButtonDrawable = button.getDrawable();
         savedButtonEnabled = button.isEnabled();
-        button.setImageResource(R.drawable.ic_done_white_36dp);
+        button.setImageResource(R.drawable.check_white);
         main.enableSimpleActionsButton();
         if (!prefs.areSimpleActionsEnabled()) {
             main.showSimpleActionsButton();

src/main/java/de/blau/android/layer/photos/MapOverlay.java

@@ -168,8 +168,8 @@ public MapOverlay(@NonNull final Map map) {
         Context context = map.getContext();
         this.map = map;
         photos = new ArrayList<>();
-        icon = ContextCompat.getDrawable(context, R.drawable.camera_red);
-        selectedIcon = ContextCompat.getDrawable(context, R.drawable.camera_green);
+        icon = ContextCompat.getDrawable(context, R.drawable.photo_unselected);
+        selectedIcon = ContextCompat.getDrawable(context, R.drawable.photo_selected);
         // note this assumes the icons are the same size
         w2 = icon.getIntrinsicWidth() / 2;
         h2 = icon.getIntrinsicHeight() / 2;

src/main/java/de/blau/android/photos/PhotoViewerFragment.java

@@ -447,13 +447,13 @@ private View createView(@Nullable Bundle savedInstanceState) {
 
         menuView = (ActionMenuView) layout.findViewById(R.id.photoMenuView);
         Menu menu = menuView.getMenu();
-        itemBackward = menu.add(Menu.NONE, MENUITEM_BACK, Menu.NONE, R.string.back).setIcon(R.drawable.ic_arrow_back_white_36dp);
+        itemBackward = menu.add(Menu.NONE, MENUITEM_BACK, Menu.NONE, R.string.back).setIcon(R.drawable.back_white);
         itemBackward.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-        menu.add(Menu.NONE, MENUITEM_SHARE, Menu.NONE, R.string.share).setIcon(R.drawable.ic_share_white_36dp).setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-        menu.add(Menu.NONE, MENUITEM_GOTO, Menu.NONE, R.string.photo_viewer_goto).setIcon(R.drawable.ic_map_white_36dp)
+        menu.add(Menu.NONE, MENUITEM_SHARE, Menu.NONE, R.string.share).setIcon(R.drawable.share_white).setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+        menu.add(Menu.NONE, MENUITEM_GOTO, Menu.NONE, R.string.photo_viewer_goto).setIcon(R.drawable.map_white)
                 .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         if (photoLoader.supportsInfo()) {
-            menu.add(Menu.NONE, MENUITEM_INFO, Menu.NONE, R.string.menu_information).setIcon(R.drawable.outline_info_white_48dp)
+            menu.add(Menu.NONE, MENUITEM_INFO, Menu.NONE, R.string.menu_information).setIcon(R.drawable.info_white)
                     .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         }
         if (photoLoader.supportsUpload() && photoLoader.supportsDelete() && photoLoader.supportsInfo()) {
@@ -464,15 +464,15 @@ private View createView(@Nullable Bundle savedInstanceState) {
             overflow.add(Menu.NONE, MENUITEM_DELETE, Menu.NONE, R.string.delete);
         } else {
             if (photoLoader.supportsUpload()) {
-                menu.add(Menu.NONE, MENUITEM_UPLOAD, Menu.NONE, R.string.photo_viewer_upload).setIcon(R.drawable.outline_import_export_white_36)
+                menu.add(Menu.NONE, MENUITEM_UPLOAD, Menu.NONE, R.string.photo_viewer_upload).setIcon(R.drawable.sync_white)
                         .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
             }
             if (photoLoader.supportsDelete()) {
-                menu.add(Menu.NONE, MENUITEM_DELETE, Menu.NONE, R.string.delete).setIcon(R.drawable.ic_delete_forever_white_36dp)
+                menu.add(Menu.NONE, MENUITEM_DELETE, Menu.NONE, R.string.delete).setIcon(R.drawable.delete_forever_white)
                         .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
             }
         }
-        itemForward = menu.add(Menu.NONE, MENUITEM_FORWARD, Menu.NONE, R.string.forward).setIcon(R.drawable.ic_arrow_forward_white_36dp);
+        itemForward = menu.add(Menu.NONE, MENUITEM_FORWARD, Menu.NONE, R.string.forward).setIcon(R.drawable.forward_white);
         itemForward.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         menuView.setOnMenuItemClickListener(this);
         prepareMenu();
@@ -491,10 +491,10 @@ void prepareMenu() {
         final boolean forwardEnabled = multiple && (wrap || pos < size - 1);
         itemForward.setEnabled(forwardEnabled);
         // for whatever reason drawables with state lists don't seem to work in menus
-        itemForward.setIcon(forwardEnabled ? R.drawable.ic_arrow_forward_white_36dp : R.drawable.ic_arrow_forward_dimmed_36dp);
+        itemForward.setIcon(forwardEnabled ? R.drawable.forward_white : R.drawable.forward_dim);
         final boolean backwardEnabled = multiple && (wrap || pos > 0);
         itemBackward.setEnabled(backwardEnabled);
-        itemBackward.setIcon(backwardEnabled ? R.drawable.ic_arrow_back_white_36dp : R.drawable.ic_arrow_back_dimmed_36dp);
+        itemBackward.setIcon(backwardEnabled ? R.drawable.back_white : R.drawable.back_dim);
     }
 
     private class PhotoPagerAdapter<S extends Serializable> extends ImagePagerAdapter<S> {

src/main/java/de/blau/android/util/SelectByImageFragment.java

@@ -179,14 +179,14 @@ private View createView(@Nullable Bundle savedInstanceState) {
         ActionMenuView menuView = (ActionMenuView) layout.findViewById(R.id.photoMenuView);
         Menu menu = menuView.getMenu();
 
-        MenuItem itemBackward = menu.add(Menu.NONE, MENUITEM_BACK, Menu.NONE, R.string.back).setIcon(R.drawable.ic_arrow_back_white_36dp);
+        MenuItem itemBackward = menu.add(Menu.NONE, MENUITEM_BACK, Menu.NONE, R.string.back).setIcon(R.drawable.back_white);
         itemBackward.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         itemBackward.setEnabled(true);
-        itemBackward.setIcon(R.drawable.ic_arrow_back_white_36dp);
-        MenuItem itemForward = menu.add(Menu.NONE, MENUITEM_FORWARD, Menu.NONE, R.string.forward).setIcon(R.drawable.ic_arrow_forward_white_36dp);
+        itemBackward.setIcon(R.drawable.back_white);
+        MenuItem itemForward = menu.add(Menu.NONE, MENUITEM_FORWARD, Menu.NONE, R.string.forward).setIcon(R.drawable.forward_white);
         itemForward.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         itemForward.setEnabled(true);
-        itemForward.setIcon(R.drawable.ic_arrow_forward_white_36dp);
+        itemForward.setIcon(R.drawable.forward_white);
         menuView.setOnMenuItemClickListener(this);
         return layout;
     }