From 4ea59f79ccbfac85129d09c52dfe5d5247713d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 25 Feb 2015 15:18:00 +0100 Subject: Use material icon for safeslinger --- Graphics/get-material-icons.sh | 1 + Graphics/update-drawables.sh | 2 +- .../src/main/res/drawable-hdpi/ic_action_safeslinger.png | Bin 2616 -> 0 bytes .../main/res/drawable-hdpi/ic_swap_vert_grey_24dp.png | Bin 0 -> 300 bytes .../src/main/res/drawable-mdpi/ic_action_safeslinger.png | Bin 1457 -> 0 bytes .../main/res/drawable-mdpi/ic_swap_vert_grey_24dp.png | Bin 0 -> 230 bytes .../main/res/drawable-xhdpi/ic_action_safeslinger.png | Bin 4012 -> 0 bytes .../main/res/drawable-xhdpi/ic_swap_vert_grey_24dp.png | Bin 0 -> 332 bytes .../main/res/drawable-xxhdpi/ic_action_safeslinger.png | Bin 6626 -> 0 bytes .../main/res/drawable-xxhdpi/ic_swap_vert_grey_24dp.png | Bin 0 -> 418 bytes .../main/res/drawable-xxxhdpi/ic_swap_vert_grey_24dp.png | Bin 0 -> 531 bytes OpenKeychain/src/main/res/layout/key_list_item.xml | 2 +- .../src/main/res/layout/safe_slinger_activity.xml | 2 +- .../src/main/res/layout/view_key_adv_share_fragment.xml | 2 +- 14 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_safeslinger.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_grey_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_safeslinger.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_grey_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_safeslinger.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_grey_24dp.png delete mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_safeslinger.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_grey_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_grey_24dp.png diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh index fee8457f4..49023c8aa 100755 --- a/Graphics/get-material-icons.sh +++ b/Graphics/get-material-icons.sh @@ -9,6 +9,7 @@ python copy OpenKeychain navigation black expand_more 24 python copy OpenKeychain navigation white refresh 24 python copy OpenKeychain action white swap_vert 24 python copy OpenKeychain action white swap_vert_circle 24 +python copy OpenKeychain action grey swap_vert 24 python copy OpenKeychain editor white mode_edit 24 # navigation drawer sections diff --git a/Graphics/update-drawables.sh b/Graphics/update-drawables.sh index d80f4b7ca..bfb62523e 100755 --- a/Graphics/update-drawables.sh +++ b/Graphics/update-drawables.sh @@ -39,7 +39,7 @@ SRC_DIR=./drawables/ # xhdpi: 64x64 # xxhdpi: 96x96 -for NAME in "ic_action_nfc" "ic_action_qr_code" "ic_action_safeslinger" "ic_action_search_cloud" "ic_cloud_search_24px" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" +for NAME in "ic_action_nfc" "ic_action_qr_code" "ic_action_search_cloud" "ic_cloud_search_24px" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" do echo $NAME inkscape -w 32 -h 32 -e "$MDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_safeslinger.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_safeslinger.png deleted file mode 100644 index 6ff9bb7b4..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_safeslinger.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_grey_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_grey_24dp.png new file mode 100644 index 000000000..961aedecc Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_swap_vert_grey_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_safeslinger.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_safeslinger.png deleted file mode 100644 index bfea67f33..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_safeslinger.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_grey_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_grey_24dp.png new file mode 100644 index 000000000..f7faa5cf4 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_swap_vert_grey_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_safeslinger.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_safeslinger.png deleted file mode 100644 index 864a18d1a..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_safeslinger.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_grey_24dp.png new file mode 100644 index 000000000..22ff0c308 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_swap_vert_grey_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_safeslinger.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_safeslinger.png deleted file mode 100644 index 02efa1d24..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_safeslinger.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_grey_24dp.png new file mode 100644 index 000000000..3edec452e Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_swap_vert_grey_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_grey_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_grey_24dp.png new file mode 100644 index 000000000..3dea0d014 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_swap_vert_grey_24dp.png differ diff --git a/OpenKeychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml index 5a3a97358..9f9cf4eca 100644 --- a/OpenKeychain/src/main/res/layout/key_list_item.xml +++ b/OpenKeychain/src/main/res/layout/key_list_item.xml @@ -58,7 +58,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="center" - android:src="@drawable/ic_action_safeslinger" + android:src="@drawable/ic_swap_vert_grey_24dp" android:padding="12dp" style="@style/SelectableItem" /> diff --git a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml index 8dbe1d62e..ff5fa6d94 100644 --- a/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml +++ b/OpenKeychain/src/main/res/layout/safe_slinger_activity.xml @@ -69,7 +69,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" - android:src="@drawable/ic_action_safeslinger" + android:src="@drawable/ic_swap_vert_grey_24dp" android:layout_gravity="center_vertical" /> diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml index 9971032ce..782091f16 100644 --- a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml @@ -135,7 +135,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" - android:src="@drawable/ic_action_safeslinger" + android:src="@drawable/ic_swap_vert_grey_24dp" android:layout_gravity="center_vertical" style="@style/SelectableItem" /> -- cgit v1.2.3