Merge pull request #189 from DSIW/master

Some restyling

5 files changed, 24 insertions, 9 deletions

diff --git a/app/src/main/res/menu/autofill_preference.xml b/app/src/main/res/menu/autofill_preference.xml
index 77ce95f4..31f694e0 100644
--- a/app/src/main/res/menu/autofill_preference.xml
+++ b/app/src/main/res/menu/autofill_preference.xml
@@ -4,7 +4,7 @@
       tools:context=".pwdstore.autofill.AutofillPreferenceActivity">
     <item
         android:id="@+id/action_search"
-        android:icon="@drawable/ic_action_search"
+        android:icon="@drawable/ic_search_white_24dp"
         android:title="@string/action_search"
         pwstore:actionViewClass="android.support.v7.widget.SearchView"
         pwstore:showAsAction="ifRoom|collapseActionView"/>
diff --git a/app/src/main/res/menu/context_pass.xml b/app/src/main/res/menu/context_pass.xml
index 30008abc..ac0d88ab 100644
--- a/app/src/main/res/menu/context_pass.xml
+++ b/app/src/main/res/menu/context_pass.xml
@@ -4,12 +4,12 @@
     tools:context=".pwdstore">
 
     <item android:id="@+id/menu_edit_password"
-          android:icon="@drawable/ic_action_edit"
+          android:icon="@drawable/ic_edit_white_24dp"
           app:showAsAction="ifRoom"
           android:title="Edit"/>
 
     <item android:id="@+id/menu_delete_password"
-        android:icon="@drawable/ic_action_discard"
+        android:icon="@drawable/ic_delete_white_24dp"
         app:showAsAction="ifRoom"
         android:title="Delete"/>
 
diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml
index af6a84c7..730b7533 100644
--- a/app/src/main/res/menu/main_menu.xml
+++ b/app/src/main/res/menu/main_menu.xml
@@ -5,7 +5,7 @@
 
     <item android:id="@+id/action_search"
           android:title="@string/action_search"
-          android:icon="@drawable/ic_action_search"
+          android:icon="@drawable/ic_search_white_24dp"
           pwstore:showAsAction="ifRoom|collapseActionView"
           pwstore:actionViewClass="android.support.v7.widget.SearchView" />
 
@@ -20,12 +20,12 @@
         android:title="@string/git_push"/>
 
     <item android:id="@+id/refresh"
-        android:title="Refresh list"
+        android:title="@string/refresh_list"
         pwstore:showAsAction="never"
-        android:icon="@drawable/ic_action_refresh"/>
+        android:icon="@drawable/ic_refresh_white_24dp"/>
 
     <item android:id="@+id/user_pref"
-        android:title="Settings"
+        android:title="@string/action_settings"
         android:orderInCategory="100"/>
 </menu>
 
diff --git a/app/src/main/res/menu/pgp_handler.xml b/app/src/main/res/menu/pgp_handler.xml
index 233a0940..fbdef0c2 100644
--- a/app/src/main/res/menu/pgp_handler.xml
+++ b/app/src/main/res/menu/pgp_handler.xml
@@ -3,12 +3,12 @@
     xmlns:pwstore="http://schemas.android.com/apk/res-auto"
     tools:context="com.zeapo.pwdstore.crypto.PgpHandler" >
     <item android:title="Copy password"
-        android:icon="@drawable/ic_action_copy"
+        android:icon="@drawable/ic_content_copy_white_24dp"
         pwstore:showAsAction="ifRoom"
         android:id="@+id/copy_password"
         />
     <item android:title="Edit password"
-        android:icon="@drawable/ic_action_edit"
+        android:icon="@drawable/ic_edit_white_24dp"
         pwstore:showAsAction="ifRoom"
         android:id="@+id/edit_password"
         />
diff --git a/app/src/main/res/menu/pgp_handler_new_password.xml b/app/src/main/res/menu/pgp_handler_new_password.xml
new file mode 100644
index 00000000..0e2ef32c
--- /dev/null
+++ b/app/src/main/res/menu/pgp_handler_new_password.xml
@@ -0,0 +1,15 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:pwstore="http://schemas.android.com/apk/res-auto"
+    tools:context="com.zeapo.pwdstore.crypto.PgpHandler" >
+    <item android:title="Cancel"
+        android:icon="@drawable/ic_clear_white_24dp"
+        pwstore:showAsAction="ifRoom"
+        android:id="@+id/crypto_cancel_add"
+        />
+    <item android:title="Save"
+        android:icon="@drawable/ic_done_white_24dp"
+        pwstore:showAsAction="ifRoom"
+        android:id="@+id/crypto_confirm_add"
+        />
+</menu>