Merge pull request #468 from cachapa/menu_icons

Menu icons

31 files changed, 24 insertions, 21 deletions

diff --git a/res/drawable-hdpi/ic_menu_barcode.png b/res/drawable-hdpi/ic_menu_barcode.png
new file mode 100644
index 0000000..747e92e
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_barcode.png
diff --git a/res/drawable-hdpi/ic_menu_circle.png b/res/drawable-hdpi/ic_menu_circle.png
new file mode 100644
index 0000000..de9126d
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_circle.png
diff --git a/res/drawable-hdpi/ic_menu_clear_playlist.png b/res/drawable-hdpi/ic_menu_clear_playlist.png
new file mode 100644
index 0000000..0c3e06d
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_clear_playlist.png
diff --git a/res/drawable-hdpi/ic_menu_filter.png b/res/drawable-hdpi/ic_menu_filter.png
new file mode 100644
index 0000000..365c92d
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_filter.png
diff --git a/res/drawable-hdpi/ic_menu_globe.png b/res/drawable-hdpi/ic_menu_globe.png
new file mode 100644
index 0000000..1c870fe
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_globe.png
diff --git a/res/drawable-hdpi/ic_menu_mark.png b/res/drawable-hdpi/ic_menu_mark.png
new file mode 100644
index 0000000..724d787
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_mark.png
diff --git a/res/drawable-hdpi/ic_menu_notifications.png b/res/drawable-hdpi/ic_menu_notifications.png
new file mode 100644
index 0000000..fb63937
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_notifications.png
diff --git a/res/drawable-hdpi/ic_menu_shopping.png b/res/drawable-hdpi/ic_menu_shopping.png
new file mode 100644
index 0000000..cd63cb5
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_shopping.png
diff --git a/res/drawable-ldpi/ic_menu_barcode.png b/res/drawable-ldpi/ic_menu_barcode.png
new file mode 100644
index 0000000..3e1e591
--- /dev/null
+++ b/res/drawable-ldpi/ic_menu_barcode.png
diff --git a/res/drawable-ldpi/ic_menu_clear_playlist.png b/res/drawable-ldpi/ic_menu_clear_playlist.png
new file mode 100644
index 0000000..f3e6b51
--- /dev/null
+++ b/res/drawable-ldpi/ic_menu_clear_playlist.png
diff --git a/res/drawable-ldpi/ic_menu_filter.png b/res/drawable-ldpi/ic_menu_filter.png
new file mode 100644
index 0000000..11b728d
--- /dev/null
+++ b/res/drawable-ldpi/ic_menu_filter.png
diff --git a/res/drawable-ldpi/ic_menu_globe.png b/res/drawable-ldpi/ic_menu_globe.png
new file mode 100644
index 0000000..b096a9e
--- /dev/null
+++ b/res/drawable-ldpi/ic_menu_globe.png
diff --git a/res/drawable-ldpi/ic_menu_mark.png b/res/drawable-ldpi/ic_menu_mark.png
new file mode 100644
index 0000000..19bcd03
--- /dev/null
+++ b/res/drawable-ldpi/ic_menu_mark.png
diff --git a/res/drawable-ldpi/ic_menu_more.png b/res/drawable-ldpi/ic_menu_more.png
new file mode 100644
index 0000000..62983c6
--- /dev/null
+++ b/res/drawable-ldpi/ic_menu_more.png
diff --git a/res/drawable-ldpi/ic_menu_notifications.png b/res/drawable-ldpi/ic_menu_notifications.png
new file mode 100644
index 0000000..3a5ebb9
--- /dev/null
+++ b/res/drawable-ldpi/ic_menu_notifications.png
diff --git a/res/drawable-ldpi/ic_menu_shopping.png b/res/drawable-ldpi/ic_menu_shopping.png
new file mode 100644
index 0000000..e881d50
--- /dev/null
+++ b/res/drawable-ldpi/ic_menu_shopping.png
diff --git a/res/drawable/ic_menu_barcode.png b/res/drawable/ic_menu_barcode.png
new file mode 100644
index 0000000..1901177
--- /dev/null
+++ b/res/drawable/ic_menu_barcode.png
diff --git a/res/drawable/ic_menu_circle.png b/res/drawable/ic_menu_circle.png
new file mode 100644
index 0000000..a3a26f9
--- /dev/null
+++ b/res/drawable/ic_menu_circle.png
diff --git a/res/drawable/ic_menu_clear_playlist.png b/res/drawable/ic_menu_clear_playlist.png
new file mode 100644
index 0000000..750db62
--- /dev/null
+++ b/res/drawable/ic_menu_clear_playlist.png
diff --git a/res/drawable/ic_menu_filter.png b/res/drawable/ic_menu_filter.png
new file mode 100644
index 0000000..84176c5
--- /dev/null
+++ b/res/drawable/ic_menu_filter.png
diff --git a/res/drawable/ic_menu_globe.png b/res/drawable/ic_menu_globe.png
new file mode 100644
index 0000000..cd283ab
--- /dev/null
+++ b/res/drawable/ic_menu_globe.png
diff --git a/res/drawable/ic_menu_mark.png b/res/drawable/ic_menu_mark.png
new file mode 100644
index 0000000..5e95da7
--- /dev/null
+++ b/res/drawable/ic_menu_mark.png
diff --git a/res/drawable/ic_menu_notifications.png b/res/drawable/ic_menu_notifications.png
new file mode 100644
index 0000000..866d4e0
--- /dev/null
+++ b/res/drawable/ic_menu_notifications.png
diff --git a/res/drawable/ic_menu_shopping.png b/res/drawable/ic_menu_shopping.png
new file mode 100644
index 0000000..7088155
--- /dev/null
+++ b/res/drawable/ic_menu_shopping.png
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 93b945c..e8294f1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -944,6 +944,7 @@
     · <a href="http://code.google.com/p/mapsforge/">Mapsforge</a> (OSM-rendering)\n
     · <a href="http://thenounproject.com/">The Noun Project</a> (basis for attribute icons)\n
     · <a href="http://commons.apache.org/">The Apache Commons Project</a>\n
+    · <a href="http://androidicons.com/">Android Icons</a>\n
   </string>
 
   <!-- changelog -->
diff --git a/src/cgeo/geocaching/activity/ActivityMixin.java b/src/cgeo/geocaching/activity/ActivityMixin.java
index ece589b..fd60962 100644
--- a/src/cgeo/geocaching/activity/ActivityMixin.java
+++ b/src/cgeo/geocaching/activity/ActivityMixin.java
@@ -27,7 +27,7 @@ import gnu.android.app.appmanualclient.AppManualReaderClient;
 import java.util.List;
 
 public final class ActivityMixin {
-    private static final int MENU_ICON_LOG_VISIT = android.R.drawable.ic_menu_agenda;
+    private static final int MENU_ICON_LOG_VISIT = android.R.drawable.ic_menu_edit;
 
     public final static void goHome(final Activity fromActivity) {
         final Intent intent = new Intent(fromActivity, cgeo.class);
diff --git a/src/cgeo/geocaching/cgeo.java b/src/cgeo/geocaching/cgeo.java
index 59757f7..3870e83 100644
--- a/src/cgeo/geocaching/cgeo.java
+++ b/src/cgeo/geocaching/cgeo.java
@@ -250,9 +250,9 @@ public class cgeo extends AbstractActivity {
     public boolean onCreateOptionsMenu(Menu menu) {
         menu.add(0, MENU_SETTINGS, 0, res.getString(R.string.menu_settings)).setIcon(android.R.drawable.ic_menu_preferences);
         menu.add(0, MENU_HISTORY, 0, res.getString(R.string.menu_history)).setIcon(android.R.drawable.ic_menu_recent_history);
-        menu.add(0, MENU_HELPERS, 0, res.getString(R.string.menu_helpers)).setIcon(android.R.drawable.ic_menu_add);
-        menu.add(0, MENU_SCAN, 0, res.getString(R.string.menu_scan)).setIcon(android.R.drawable.ic_menu_camera);
-        menu.add(0, MENU_ABOUT, 0, res.getString(R.string.menu_about)).setIcon(android.R.drawable.ic_menu_help);
+        menu.add(0, MENU_HELPERS, 0, res.getString(R.string.menu_helpers)).setIcon(R.drawable.ic_menu_shopping);
+        menu.add(0, MENU_SCAN, 0, res.getString(R.string.menu_scan)).setIcon(R.drawable.ic_menu_barcode);
+        menu.add(0, MENU_ABOUT, 0, res.getString(R.string.menu_about)).setIcon(android.R.drawable.ic_menu_info_details);
         return true;
     }
 
diff --git a/src/cgeo/geocaching/cgeoadvsearch.java b/src/cgeo/geocaching/cgeoadvsearch.java
index d48c23f..ea17205 100644
--- a/src/cgeo/geocaching/cgeoadvsearch.java
+++ b/src/cgeo/geocaching/cgeoadvsearch.java
@@ -493,7 +493,7 @@ public class cgeoadvsearch extends AbstractActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        menu.add(0, MENU_SEARCH_OWN_CACHES, 0, res.getString(R.string.search_own_caches));
+        menu.add(0, MENU_SEARCH_OWN_CACHES, 0, res.getString(R.string.search_own_caches)).setIcon(android.R.drawable.ic_menu_myplaces);
         return true;
     }
 
diff --git a/src/cgeo/geocaching/cgeocaches.java b/src/cgeo/geocaching/cgeocaches.java
index fdcc79b..4d864ca 100644
--- a/src/cgeo/geocaching/cgeocaches.java
+++ b/src/cgeo/geocaching/cgeocaches.java
@@ -41,7 +41,6 @@ import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
 import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -49,11 +48,12 @@ import android.view.MenuItem;
 import android.view.SubMenu;
 import android.view.View;
 import android.view.WindowManager;
-import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+import android.widget.AdapterView.AdapterContextMenuInfo;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -753,7 +753,7 @@ public class cgeocaches extends AbstractListActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        SubMenu subMenuFilter = menu.addSubMenu(0, SUBMENU_FILTER, 0, res.getString(R.string.caches_filter)).setIcon(android.R.drawable.ic_menu_search);
+        SubMenu subMenuFilter = menu.addSubMenu(0, SUBMENU_FILTER, 0, res.getString(R.string.caches_filter)).setIcon(R.drawable.ic_menu_filter);
         subMenuFilter.setHeaderTitle(res.getString(R.string.caches_filter_title));
         if (settings.cacheType == null) {
             subMenuFilter.add(0, SUBMENU_FILTER_TYPE, 0, res.getString(R.string.caches_filter_type));
@@ -791,7 +791,7 @@ public class cgeocaches extends AbstractListActivity {
         subMenuSort.setGroupCheckable(1, true, true);
 
         menu.add(0, MENU_SWITCH_SELECT_MODE, 0, res.getString(R.string.caches_select_mode)).setIcon(android.R.drawable.ic_menu_agenda);
-        menu.add(0, MENU_INVERT_SELECTION, 0, res.getString(R.string.caches_select_invert)).setIcon(android.R.drawable.ic_menu_agenda);
+        menu.add(0, MENU_INVERT_SELECTION, 0, res.getString(R.string.caches_select_invert)).setIcon(R.drawable.ic_menu_mark);
         if (type.equals("offline")) {
             SubMenu subMenu = menu.addSubMenu(0, SUBMENU_MANAGE_OFFLINE, 0, res.getString(R.string.caches_manage)).setIcon(android.R.drawable.ic_menu_save);
             subMenu.add(0, MENU_DROP_CACHES, 0, res.getString(R.string.caches_drop_all)); // delete saved caches
@@ -834,10 +834,12 @@ public class cgeocaches extends AbstractListActivity {
 
         try {
             if (adapter != null && adapter.getSelectMode()) {
-                menu.findItem(MENU_SWITCH_SELECT_MODE).setTitle(res.getString(R.string.caches_select_mode_exit));
+                menu.findItem(MENU_SWITCH_SELECT_MODE).setTitle(res.getString(R.string.caches_select_mode_exit))
+                        .setIcon(R.drawable.ic_menu_clear_playlist);
                 menu.findItem(MENU_INVERT_SELECTION).setVisible(true);
             } else {
-                menu.findItem(MENU_SWITCH_SELECT_MODE).setTitle(res.getString(R.string.caches_select_mode));
+                menu.findItem(MENU_SWITCH_SELECT_MODE).setTitle(res.getString(R.string.caches_select_mode))
+                        .setIcon(android.R.drawable.ic_menu_agenda);
                 menu.findItem(MENU_INVERT_SELECTION).setVisible(false);
             }
 
diff --git a/src/cgeo/geocaching/cgeodetail.java b/src/cgeo/geocaching/cgeodetail.java
index ac6fc00..8ae91cf 100644
--- a/src/cgeo/geocaching/cgeodetail.java
+++ b/src/cgeo/geocaching/cgeodetail.java
@@ -40,9 +40,9 @@ import android.view.MenuItem;
 import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewGroup.LayoutParams;
 import android.view.ViewParent;
 import android.view.WindowManager;
+import android.view.ViewGroup.LayoutParams;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -60,8 +60,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.UUID;
+import java.util.Map.Entry;
 
 /**
  * Activity to display all details of a cache like owner, difficulty, description etc.
@@ -499,7 +499,7 @@ public class cgeodetail extends AbstractActivity {
     public boolean onCreateOptionsMenu(Menu menu) {
         if (cache != null && cache.coords != null) {
             menu.add(0, 2, 0, res.getString(R.string.cache_menu_compass)).setIcon(android.R.drawable.ic_menu_compass); // compass
-            SubMenu subMenu = menu.addSubMenu(1, 0, 0, res.getString(R.string.cache_menu_navigate)).setIcon(android.R.drawable.ic_menu_more);
+            SubMenu subMenu = menu.addSubMenu(1, 0, 0, res.getString(R.string.cache_menu_navigate)).setIcon(android.R.drawable.ic_menu_mapmode);
             addNavigationMenuItems(subMenu);
         }
 
@@ -517,7 +517,7 @@ public class cgeodetail extends AbstractActivity {
         }
 
         if (cache != null && cache.canOpenInBrowser()) {
-            menu.add(1, 7, 0, res.getString(R.string.cache_menu_browser)).setIcon(android.R.drawable.ic_menu_info_details); // browser
+            menu.add(1, 7, 0, res.getString(R.string.cache_menu_browser)).setIcon(R.drawable.ic_menu_globe); // browser
         }
         menu.add(0, 12, 0, res.getString(R.string.cache_menu_share)).setIcon(android.R.drawable.ic_menu_share); // share cache
 
diff --git a/src/cgeo/geocaching/mapcommon/cgeomap.java b/src/cgeo/geocaching/mapcommon/cgeomap.java
index 9e33dbe..a185314 100644
--- a/src/cgeo/geocaching/mapcommon/cgeomap.java
+++ b/src/cgeo/geocaching/mapcommon/cgeomap.java
@@ -7,13 +7,13 @@ import cgeo.geocaching.cgCoord;
 import cgeo.geocaching.cgDirection;
 import cgeo.geocaching.cgGeo;
 import cgeo.geocaching.cgSettings;
-import cgeo.geocaching.cgSettings.mapSourceEnum;
 import cgeo.geocaching.cgUpdateDir;
 import cgeo.geocaching.cgUpdateLoc;
 import cgeo.geocaching.cgUser;
 import cgeo.geocaching.cgWaypoint;
 import cgeo.geocaching.cgeoapplication;
 import cgeo.geocaching.activity.ActivityMixin;
+import cgeo.geocaching.cgSettings.mapSourceEnum;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.mapinterfaces.ActivityImpl;
 import cgeo.geocaching.mapinterfaces.CacheOverlayItemImpl;
@@ -42,12 +42,12 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.SubMenu;
 import android.view.View;
-import android.view.ViewGroup.LayoutParams;
 import android.view.WindowManager;
+import android.view.ViewGroup.LayoutParams;
 import android.widget.ImageSwitcher;
 import android.widget.ImageView;
-import android.widget.ImageView.ScaleType;
 import android.widget.TextView;
+import android.widget.ImageView.ScaleType;
 import android.widget.ViewSwitcher.ViewFactory;
 
 import java.util.ArrayList;
@@ -479,13 +479,13 @@ public class cgeomap extends MapBase implements OnDragListener, ViewFactory {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
 
-        SubMenu submenu = menu.addSubMenu(1, MENU_SELECT_MAPVIEW, 0, res.getString(R.string.map_view_map)).setIcon(android.R.drawable.ic_menu_more);
+        SubMenu submenu = menu.addSubMenu(1, MENU_SELECT_MAPVIEW, 0, res.getString(R.string.map_view_map)).setIcon(android.R.drawable.ic_menu_mapmode);
         addMapViewMenuItems(submenu);
 
-        menu.add(0, MENU_MAP_LIVE, 0, res.getString(R.string.map_live_disable)).setIcon(android.R.drawable.ic_menu_close_clear_cancel);
+        menu.add(0, MENU_MAP_LIVE, 0, res.getString(R.string.map_live_disable)).setIcon(R.drawable.ic_menu_notifications);
         menu.add(0, MENU_STORE_CACHES, 0, res.getString(R.string.caches_store_offline)).setIcon(android.R.drawable.ic_menu_set_as).setEnabled(false);
         menu.add(0, MENU_TRAIL_MODE, 0, res.getString(R.string.map_trail_hide)).setIcon(android.R.drawable.ic_menu_recent_history);
-        menu.add(0, MENU_CIRCLE_MODE, 0, res.getString(R.string.map_circles_hide)).setIcon(android.R.drawable.ic_menu_view);
+        menu.add(0, MENU_CIRCLE_MODE, 0, res.getString(R.string.map_circles_hide)).setIcon(R.drawable.ic_menu_circle);
 
         return true;
     }