From b9e39671a483b67f595a7bf5357557fb992273b3 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 10 Nov 2019 12:39:51 +0530 Subject: [PATCH] Redo in-app iconography (#566) * Switch out folder icon * Switch out password icon * Switch out 'save and copy' icon * Switch out save icon * Switch out move icon * Switch out delete icon * Switch out edit icon Signed-off-by: Harsh Shandilya --- .../pwdstore/ui/adapters/EntryRecyclerAdapter.kt | 4 ++-- ...c_action_secure.xml => ic_action_secure_24dp.xml} | 2 +- app/src/main/res/drawable/ic_delete_white_24dp.xml | 2 +- .../main/res/drawable/ic_done_copy_white_24dp.xml | 12 ------------ app/src/main/res/drawable/ic_edit_white_24dp.xml | 2 +- ..._white_24dp.xml => ic_move_folder_white_24dp.xml} | 2 +- app/src/main/res/drawable/ic_multiple_files_24dp.xml | 10 ++++++++++ .../res/drawable/ic_multiple_files_tinted_24dp.xml | 10 ---------- .../main/res/drawable/ic_save_copy_white_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_save_white_24dp.xml | 9 +++++++++ app/src/main/res/layout/password_row_layout.xml | 2 +- app/src/main/res/menu/context_pass.xml | 2 +- app/src/main/res/menu/pgp_handler_new_password.xml | 4 ++-- 13 files changed, 38 insertions(+), 32 deletions(-) rename app/src/main/res/drawable/{ic_action_secure.xml => ic_action_secure_24dp.xml} (69%) delete mode 100644 app/src/main/res/drawable/ic_done_copy_white_24dp.xml rename app/src/main/res/drawable/{ic_folder_white_24dp.xml => ic_move_folder_white_24dp.xml} (57%) create mode 100644 app/src/main/res/drawable/ic_multiple_files_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_multiple_files_tinted_24dp.xml create mode 100644 app/src/main/res/drawable/ic_save_copy_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_save_white_24dp.xml diff --git a/app/src/main/java/com/zeapo/pwdstore/ui/adapters/EntryRecyclerAdapter.kt b/app/src/main/java/com/zeapo/pwdstore/ui/adapters/EntryRecyclerAdapter.kt index 176f4a82..f5b982bb 100644 --- a/app/src/main/java/com/zeapo/pwdstore/ui/adapters/EntryRecyclerAdapter.kt +++ b/app/src/main/java/com/zeapo/pwdstore/ui/adapters/EntryRecyclerAdapter.kt @@ -80,7 +80,7 @@ abstract class EntryRecyclerAdapter internal constructor(val values: ArrayList

File(current, name).isFile } ?: emptyArray()).size if (childCount > 0) { @@ -88,7 +88,7 @@ abstract class EntryRecyclerAdapter internal constructor(val values: ArrayList

+ android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2L9,8L9,6zM18,20L6,20L6,10h12v10zM12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z"/> diff --git a/app/src/main/res/drawable/ic_delete_white_24dp.xml b/app/src/main/res/drawable/ic_delete_white_24dp.xml index 40e17522..2ca348f9 100644 --- a/app/src/main/res/drawable/ic_delete_white_24dp.xml +++ b/app/src/main/res/drawable/ic_delete_white_24dp.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M16,9v10H8V9h8m-1.5,-6h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z"/> diff --git a/app/src/main/res/drawable/ic_done_copy_white_24dp.xml b/app/src/main/res/drawable/ic_done_copy_white_24dp.xml deleted file mode 100644 index 20b3e5da..00000000 --- a/app/src/main/res/drawable/ic_done_copy_white_24dp.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_edit_white_24dp.xml b/app/src/main/res/drawable/ic_edit_white_24dp.xml index dd0d25a0..7f32de65 100644 --- a/app/src/main/res/drawable/ic_edit_white_24dp.xml +++ b/app/src/main/res/drawable/ic_edit_white_24dp.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M14.06,9.02l0.92,0.92L5.92,19L5,19v-0.92l9.06,-9.06M17.66,3c-0.25,0 -0.51,0.1 -0.7,0.29l-1.83,1.83 3.75,3.75 1.83,-1.83c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.2,-0.2 -0.45,-0.29 -0.71,-0.29zM14.06,6.19L3,17.25L3,21h3.75L17.81,9.94l-3.75,-3.75z"/> diff --git a/app/src/main/res/drawable/ic_folder_white_24dp.xml b/app/src/main/res/drawable/ic_move_folder_white_24dp.xml similarity index 57% rename from app/src/main/res/drawable/ic_folder_white_24dp.xml rename to app/src/main/res/drawable/ic_move_folder_white_24dp.xml index c4c4c0cd..2849e158 100644 --- a/app/src/main/res/drawable/ic_folder_white_24dp.xml +++ b/app/src/main/res/drawable/ic_move_folder_white_24dp.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M20,6L12,6L10,4L4,4A2,2 0,0 0,2 6L2,18a2,2 0,0 0,2 2L20,20a2,2 0,0 0,2 -2L22,8A2,2 0,0 0,20 6ZM20,18L4,18L4,8L20,8ZM13,12L7,12v2h6v2l4,-3 -4,-3Z"/> diff --git a/app/src/main/res/drawable/ic_multiple_files_24dp.xml b/app/src/main/res/drawable/ic_multiple_files_24dp.xml new file mode 100644 index 00000000..1aadafbc --- /dev/null +++ b/app/src/main/res/drawable/ic_multiple_files_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/ic_multiple_files_tinted_24dp.xml b/app/src/main/res/drawable/ic_multiple_files_tinted_24dp.xml deleted file mode 100644 index b8c2edab..00000000 --- a/app/src/main/res/drawable/ic_multiple_files_tinted_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_save_copy_white_24dp.xml b/app/src/main/res/drawable/ic_save_copy_white_24dp.xml new file mode 100644 index 00000000..53465e16 --- /dev/null +++ b/app/src/main/res/drawable/ic_save_copy_white_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_save_white_24dp.xml b/app/src/main/res/drawable/ic_save_white_24dp.xml new file mode 100644 index 00000000..cac6eef4 --- /dev/null +++ b/app/src/main/res/drawable/ic_save_white_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/password_row_layout.xml b/app/src/main/res/layout/password_row_layout.xml index bf7763ae..916f874f 100644 --- a/app/src/main/res/layout/password_row_layout.xml +++ b/app/src/main/res/layout/password_row_layout.xml @@ -18,7 +18,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" - tools:src="@drawable/ic_multiple_files_tinted_24dp" /> + tools:src="@drawable/ic_multiple_files_24dp" /> diff --git a/app/src/main/res/menu/pgp_handler_new_password.xml b/app/src/main/res/menu/pgp_handler_new_password.xml index 83b58758..6b110ba1 100644 --- a/app/src/main/res/menu/pgp_handler_new_password.xml +++ b/app/src/main/res/menu/pgp_handler_new_password.xml @@ -8,12 +8,12 @@ android:id="@+id/crypto_cancel_add" />