diff options
14 files changed, 31 insertions, 9 deletions
diff --git a/Graphics/drawables/account_key.svg b/Graphics/drawables/account_key.svg new file mode 100644 index 000000000..d4965a384 --- /dev/null +++ b/Graphics/drawables/account_key.svg @@ -0,0 +1 @@ +<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M11,10V12H10V14H8V12H5.83C5.42,13.17 4.31,14 3,14A3,3 0 0,1 0,11A3,3 0 0,1 3,8C4.31,8 5.42,8.83 5.83,10H11M3,10A1,1 0 0,0 2,11A1,1 0 0,0 3,12A1,1 0 0,0 4,11A1,1 0 0,0 3,10M16,14C18.67,14 24,15.34 24,18V20H8V18C8,15.34 13.33,14 16,14M16,12A4,4 0 0,1 12,8A4,4 0 0,1 16,4A4,4 0 0,1 20,8A4,4 0 0,1 16,12Z" /></svg>
\ No newline at end of file diff --git a/Graphics/drawables/link.svg b/Graphics/drawables/link.svg new file mode 100644 index 000000000..11d3be9b2 --- /dev/null +++ b/Graphics/drawables/link.svg @@ -0,0 +1 @@ +<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M16,6H13V7.9H16C18.26,7.9 20.1,9.73 20.1,12A4.1,4.1 0 0,1 16,16.1H13V18H16A6,6 0 0,0 22,12C22,8.68 19.31,6 16,6M3.9,12C3.9,9.73 5.74,7.9 8,7.9H11V6H8A6,6 0 0,0 2,12A6,6 0 0,0 8,18H11V16.1H8C5.74,16.1 3.9,14.26 3.9,12M8,13H16V11H8V13Z" /></svg>
\ No newline at end of file diff --git a/Graphics/update-drawables.sh b/Graphics/update-drawables.sh index fd70ff8c2..be620428e 100755 --- a/Graphics/update-drawables.sh +++ b/Graphics/update-drawables.sh @@ -22,7 +22,7 @@ SRC_DIR=./drawables/ #inkscape -w 512 -h 512 -e "$PLAY_DIR/$NAME.png" $NAME.svg -for NAME in "ic_cloud_search" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" "ic_action_encrypt_copy" "ic_action_encrypt_save" "ic_action_encrypt_share" "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign" "yubi_icon" "ic_stat_notify" "status_signature_verified_inner" +for NAME in "ic_cloud_search" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" "ic_action_encrypt_copy" "ic_action_encrypt_save" "ic_action_encrypt_share" "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign" "yubi_icon" "ic_stat_notify" "status_signature_verified_inner" "link" do echo $NAME inkscape -w 24 -h 24 -e "$MDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg" @@ -41,7 +41,7 @@ inkscape -w 192 -h 192 -e "$XDPI_DIR/${NAME}_96dp.png" "$SRC_DIR/$NAME.svg" inkscape -w 256 -h 256 -e "$XXDPI_DIR/${NAME}_96dp.png" "$SRC_DIR/$NAME.svg" done -for NAME in "create_key_robot" "linked_dns" "linked_https" "linked_github" "linked_twitter" +for NAME in "create_key_robot" "linked_dns" "linked_https" "linked_github" "linked_twitter" "account_key" do echo $NAME inkscape -w 48 -h 48 -e "$MDPI_DIR/$NAME.png" "$SRC_DIR/$NAME.svg" diff --git a/OpenKeychain/src/main/res/drawable-hdpi/account_key.png b/OpenKeychain/src/main/res/drawable-hdpi/account_key.png Binary files differnew file mode 100644 index 000000000..b6a99772e --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/account_key.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/link_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/link_24dp.png Binary files differnew file mode 100644 index 000000000..17482011b --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/link_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/account_key.png b/OpenKeychain/src/main/res/drawable-mdpi/account_key.png Binary files differnew file mode 100644 index 000000000..d5e22f248 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/account_key.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/link_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/link_24dp.png Binary files differnew file mode 100644 index 000000000..df43ca5f4 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/link_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/account_key.png b/OpenKeychain/src/main/res/drawable-xhdpi/account_key.png Binary files differnew file mode 100644 index 000000000..14ce08dbc --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/account_key.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/link_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/link_24dp.png Binary files differnew file mode 100644 index 000000000..95eaeb381 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/link_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96dp.png Binary files differindex 568b48c43..e69de29bb 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96dp.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/account_key.png b/OpenKeychain/src/main/res/drawable-xxhdpi/account_key.png Binary files differnew file mode 100644 index 000000000..c100a3034 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/account_key.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/link_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/link_24dp.png Binary files differnew file mode 100644 index 000000000..a87af0738 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/link_24dp.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/link_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/link_24dp.png Binary files differnew file mode 100644 index 000000000..b8778938f --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/link_24dp.png diff --git a/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml index 983d4efd5..be1f5e7a9 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml @@ -15,17 +15,37 @@ android:padding="16dp" android:orientation="vertical"> - <ImageView + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_margin="8dp" - android:src="@drawable/linked_github" /> + android:layout_gravity="center_horizontal"> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:src="@drawable/linked_github" /> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_margin="8dp" + android:src="@drawable/link_24dp" /> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_margin="8dp" + android:src="@drawable/account_key" /> + + </LinearLayout> <TextView android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="8dp" + android:layout_marginTop="16dp" android:layout_marginBottom="16dp" android:text="This operation links your key to your GitHub account." style="?android:textAppearanceSmall"/> @@ -111,8 +131,8 @@ android:layout_marginTop="16dp" android:layout_marginBottom="16dp" style="?android:buttonBarButtonStyle" - android:drawableLeft="@drawable/ic_person_add_grey_24dp" - android:drawableStart="@drawable/ic_person_add_grey_24dp" + android:drawableLeft="@drawable/link_24dp" + android:drawableStart="@drawable/link_24dp" android:drawablePadding="12dp" android:text="Link to Github Account" android:id="@+id/button_send" |
