Add menu icons for delete and star actions

reixa00 · May 21, 2012 · 2b191f7 · 2b191f7
1 parent c89e0b5
commit 2b191f7
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 7 deletions.
diff --git a/app/res/drawable-hdpi/menu_delete.png b/app/res/drawable-hdpi/menu_delete.png
diff --git a/app/res/drawable-hdpi/menu_star.png b/app/res/drawable-hdpi/menu_star.png
diff --git a/app/res/drawable-ldpi/menu_delete.png b/app/res/drawable-ldpi/menu_delete.png
diff --git a/app/res/drawable-ldpi/menu_star.png b/app/res/drawable-ldpi/menu_star.png
diff --git a/app/res/drawable-mdpi/menu_delete.png b/app/res/drawable-mdpi/menu_delete.png
diff --git a/app/res/drawable-mdpi/menu_star.png b/app/res/drawable-mdpi/menu_star.png
diff --git a/app/res/drawable-xhdpi/menu_delete.png b/app/res/drawable-xhdpi/menu_delete.png
diff --git a/app/res/drawable-xhdpi/menu_star.png b/app/res/drawable-xhdpi/menu_star.png
diff --git a/app/res/menu/gist_view.xml b/app/res/menu/gist_view.xml
@@ -28,11 +28,13 @@
         android:title="@string/refresh"/>
     <item
         android:id="@+id/gist_delete"
+        android:icon="@drawable/menu_delete"
         android:showAsAction="never"
-        android:title="@string/delete_ellipsis"/>
+        android:title="@string/delete"/>
     <item
         android:id="@+id/gist_star"
+        android:icon="@drawable/menu_star"
         android:showAsAction="never"
-        android:title="@string/close_issue"/>
+        android:title="@string/star"/>
 
 </menu>
diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml
@@ -57,7 +57,7 @@
     <string name="filter">Filter</string>
     <string name="bookmark">Bookmark</string>
     <string name="comment">Comment</string>
-    <string name="delete_ellipsis">Delete…</string>
+    <string name="delete">Delete</string>
     <string name="refresh">Refresh</string>
     <string name="dasbhoard_watched">Watched</string>
     <string name="dasbhoard_assigned">Assigned</string>
@@ -103,9 +103,9 @@
     <string name="gist_description_hint">Android created Gist</string>
     <string name="title">Title</string>
     <string name="edit_description">Edit Title/Description</string>
-    <string name="star_gist">Star Gist</string>
+    <string name="star">Star</string>
     <string name="starring_gist">Starring Gist…</string>
-    <string name="unstar_gist">Unstar Gist</string>
+    <string name="unstar">Unstar</string>
     <string name="unstarring_gist">Unstarring Gist…</string>
     <string name="accounts_label">Accounts</string>
     <string name="select_assignee">Select Assignee</string>

diff --git a/app/src/main/java/com/github/mobile/ui/gist/GistFragment.java b/app/src/main/java/com/github/mobile/ui/gist/GistFragment.java
@@ -245,9 +245,9 @@ public void onPrepareOptionsMenu(Menu menu) {
         MenuItem starItem = menu.findItem(id.gist_star);
         starItem.setEnabled(loadFinished && !owner);
         if (starred)
-            starItem.setTitle(string.unstar_gist);
+            starItem.setTitle(string.unstar);
         else
-            starItem.setTitle(string.star_gist);
+            starItem.setTitle(string.star);
     }
 
     @Override