diff --git a/Graphics/drawables/ic_stat_notify.svg b/Graphics/drawables/ic_stat_notify.svg index 11d326e06..ae82d7147 100644 --- a/Graphics/drawables/ic_stat_notify.svg +++ b/Graphics/drawables/ic_stat_notify.svg @@ -1,4 +1,6 @@ + + image/svg+xml \ No newline at end of file + id="path14" + d="m 415.298,-360.17398 -79.39409,79.13921 c -47.06722,-48.09353 -70.60084,-105.92166 -70.60084,-173.48607 0,-0.28376 0,-0.53694 0,-0.76463 0.15123,-61.1806 19.69177,-114.42094 58.62164,-159.72272 3.23693,-3.76198 6.6064,-7.47128 10.11011,-11.12961 1.36784,-1.42222 2.75606,-2.83933 4.16298,-4.24795 7.6463,-7.6463 15.60525,-14.72677 23.87345,-21.23972 0.28037,-0.2209 0.56413,-0.44859 0.84959,-0.67967 0.57093,-0.44859 1.13675,-0.88697 1.69918,-1.31687 0.26167,-0.2022 0.51655,-0.3993 0.76463,-0.59471 l 22.34419,-15.20764 c 1.27778,-0.77823 2.56746,-1.54286 3.86563,-2.29389 l 0,0.0425 c 0.69666,-0.40441 1.38993,-0.81391 2.08149,-1.23191 l 2.08149,-1.14694 c 0.79692,-0.4248 1.58874,-0.84959 2.37885,-1.27438 7.68708,-4.10522 15.56108,-7.75675 23.61858,-10.9597 6.87317,-2.72039 13.88398,-5.11283 21.02732,-7.17903 1.99994,-0.57772 4.01006,-1.12995 6.03208,-1.6567 20.62972,-5.38129 42.3775,-8.07109 65.24844,-8.07109 15.63073,0 30.72623,1.27438 45.28139,3.82315 5.09753,0.84959 10.19507,1.89798 15.2926,3.14348 12.84069,3.08401 25.25828,7.18922 37.25447,12.31904 23.88359,7.88391 -10.10015,24.79841 4.817,34.16003 -4.83471,78.85212 20.58246,73.23946 -44.79016,57.68053 -0.3959,-0.11214 -0.76463,-0.1988 -1.10446,-0.25487 -2.43662,-0.56583 -4.9548,-1.07558 -7.56134,-1.52926 -0.33814,-0.0561 -0.59472,-0.085 -0.76293,-0.085 -9.00735,-1.18943 -14.01822,-1.81303 -15.03943,-1.8691 l -0.085,0 c -32.2283,-2.15286 -61.39809,4.72881 -87.50766,20.64501 -7.19262,4.36179 -14.13036,9.43044 -20.81493,15.20765 -0.16992,0.11214 -0.28376,0.25487 -0.33983,0.42479 -0.22599,0.16992 -0.48087,0.39591 -0.76463,0.67967 -0.90057,0.78502 -1.79433,1.57854 -2.67451,2.37885 -3.48501,3.17576 -6.76952,6.46197 -9.85523,9.85523 -2.0628,-2.54707 -4.00156,-5.15191 -5.81969,-7.81622 1.73147,-1.93536 3.03304,-3.9166 3.90811,-5.94712 0.73745,-1.47489 1.33216,-3.00415 1.78414,-4.58778 0.79352,-2.6762 1.18943,-5.50704 1.18943,-8.49589 0,-7.49337 -2.46381,-14.00802 -7.39143,-19.54054 l -0.25488,-0.29736 c -0.12064,-0.11215 -0.27696,-0.26847 -0.46727,-0.46727 -0.11724,-0.12914 -0.24468,-0.27017 -0.38231,-0.4248 -0.0867,-0.0867 -0.17332,-0.17162 -0.25488,-0.25488 -1.07558,-1.07558 -2.23782,-2.0679 -3.48332,-2.97356 -3.84014,-2.8801 -8.10168,-4.63535 -12.78631,-5.26745 l -0.0425,0 c -0.73404,-0.16992 -1.52586,-0.25318 -2.37885,-0.25488 -0.73744,-0.11214 -1.47318,-0.16991 -2.20893,-0.16991 -0.56583,0 -1.10446,0.0578 -1.61422,0.16991 -1.13335,0 -2.23782,0.085 -3.31339,0.25488 l -0.085,0 c -0.43499,0.0697 -0.85979,0.15463 -1.27439,0.25488 l -3.73819,1.0195 c -0.74764,0.28037 -1.48508,0.59132 -2.20893,0.93455 -0.1988,0.085 -0.39591,0.16992 -0.59471,0.25488 -2.94128,1.35594 -5.66166,3.28111 -8.15606,5.7772 -0.33983,0.33984 -0.65078,0.70856 -0.93454,1.10447 -0.10535,0.11215 -0.20391,0.22599 -0.29736,0.33984 -3.23523,3.59715 -5.40169,7.6463 -6.49936,12.14912 -0.56582,2.37885 -0.84958,4.84265 -0.84958,7.39142 0,5.9896 1.54285,11.32842 4.63026,16.01475 1.11466,1.68049 2.43152,3.28112 3.95058,4.80018 2.57766,2.57765 5.3813,4.58778 8.41093,6.03208 3.82825,1.81302 8.02012,2.71869 12.57392,2.71869 3.58357,0 6.93944,-0.55224 10.06763,-1.6567 2.71699,3.67532 5.66336,7.25719 8.83573,10.7473 0.0663,-0.0901 0.13763,-0.17502 0.21239,-0.25488 -0.6066,0.81221 -1.20302,1.63291 -1.78413,2.46381 -1.18943,1.69918 -2.29389,3.39836 -3.3134,5.09753 -2.71869,4.1358 -5.23857,8.43982 -7.56134,12.91545 -0.0272,0.0561 -0.0561,0.11215 -0.085,0.16992 -1.72297,3.56997 -3.33719,7.16544 -4.84266,10.78978 -1.07558,2.72039 -2.0662,5.49344 -2.97356,8.32597 -3.85204,11.83818 -6.25807,24.44098 -7.22151,37.80671 -2.58614,36.25366 6.46198,68.69437 27.14437,97.31872 z m 272.71805,-271.95343 c -67.56645,59.01822 -26.3037,18.5581 -51.23021,-39.29349 18.15062,10.49243 35.22566,23.59139 51.23021,39.29349 z m -170.04522,100.93117 c -0.0969,-0.11724 -0.19541,-0.23109 -0.29736,-0.33983 0.43159,0.29905 0.85638,0.61 1.27438,0.93454 -0.32284,-0.2056 -0.64738,-0.4044 -0.97702,-0.59471 z" + clip-rule="evenodd" + sodipodi:nodetypes="ccscccccccccccccccccscccccccccccccccccccscccccccccscccccccccccscscsccccccccccccccccccc" /> \ No newline at end of file diff --git a/Graphics/update-drawables.sh b/Graphics/update-drawables.sh index 61dc51099..5acfba19a 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" +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" do echo $NAME inkscape -w 24 -h 24 -e "$MDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg" diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java index 9679cb7bc..8edd657b5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java @@ -495,7 +495,7 @@ public class PassphraseCacheService extends Service { NotificationCompat.Builder builder = new NotificationCompat.Builder(this); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { - builder.setSmallIcon(R.drawable.ic_stat_notify) + builder.setSmallIcon(R.drawable.ic_stat_notify_24dp) .setLargeIcon(getBitmap(R.drawable.ic_launcher, getBaseContext())) .setContentTitle(getString(R.string.app_name)) .setContentText(String.format(getString(R.string.passp_cache_notif_n_keys), diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_notify.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_notify.png deleted file mode 100644 index b31481995..000000000 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_notify.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_notify_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_notify_24dp.png new file mode 100644 index 000000000..2b7f41971 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_stat_notify_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_notify.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_notify.png deleted file mode 100644 index 39e799e5a..000000000 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_notify.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_notify_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_notify_24dp.png new file mode 100644 index 000000000..c24b41148 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_stat_notify_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_notify.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_notify.png deleted file mode 100644 index af1613d40..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_notify.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_notify_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_notify_24dp.png new file mode 100644 index 000000000..b9198e624 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_stat_notify_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_notify.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_notify.png deleted file mode 100644 index 9da107396..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_notify.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_notify_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_notify_24dp.png new file mode 100644 index 000000000..8ff2b8041 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_stat_notify_24dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_notify.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_notify.png deleted file mode 100644 index 5c81db8bf..000000000 Binary files a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_notify.png and /dev/null differ diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_notify_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_notify_24dp.png new file mode 100644 index 000000000..9dad48842 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_stat_notify_24dp.png differ diff --git a/README.md b/README.md index 87d8fcefd..d4bb8dfe3 100644 --- a/README.md +++ b/README.md @@ -202,12 +202,6 @@ Some parts and some libraries are Apache License v2, MIT X11 License (see below) See [In-app about screen](https://github.com/open-keychain/open-keychain/blob/HEAD/OpenKeychain/src/main/res/raw/help_about.md) ### Images -* icon.svg - modified version of kgpg_key2_kopete.svgz - -* ic_stat_notify.svg - modified version of Key by Egor Culcea from the Noun Project https://thenounproject.com/term/key/2511/ - * Actionbar icons http://developer.android.com/design/downloads/index.html#action-bar-icon-pack @@ -216,6 +210,3 @@ See [In-app about screen](https://github.com/open-keychain/open-keychain/blob/HE * Key status icons by the ModernPGP working group https://github.com/ModernPGP - -* Purple color scheme - http://android-holo-colors.com/