From 138d5a1d9c1bd4b0fa607c8fbbbed988670bd7ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 31 Jul 2014 21:18:24 +0200 Subject: [PATCH] Robots like coffee too... --- .../keychain/keyimport/FileImportCache.java | 4 - .../keychain/ui/DecryptFragment.java | 12 +-- .../keychain/ui/KeyListFragment.java | 7 +- .../keychain/ui/ViewCertActivity.java | 2 +- .../keychain/ui/ViewKeyActivity.java | 8 +- .../keychain/ui/adapter/UserIdsAdapter.java | 4 +- .../res/drawable-hdpi/create_key_robot.png | Bin 0 -> 2259 bytes .../res/drawable-mdpi/create_key_robot.png | Bin 0 -> 1766 bytes .../res/drawable-xhdpi/create_key_robot.png | Bin 0 -> 3176 bytes .../res/drawable-xxhdpi/create_key_robot.png | Bin 0 -> 4039 bytes .../res/layout/create_key_final_fragment.xml | 31 ++++-- .../res/layout/decrypt_result_include.xml | 2 +- .../res/layout/edit_key_subkey_added_item.xml | 2 +- .../layout/edit_key_user_id_added_item.xml | 2 +- OpenKeychain/src/main/res/values/colors.xml | 14 ++- Resources/graphics/create_key_robot.svg | 102 ++++++++++++++++++ Resources/graphics/update-drawables.sh | 9 ++ 17 files changed, 163 insertions(+), 36 deletions(-) create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/create_key_robot.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/create_key_robot.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/create_key_robot.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/create_key_robot.png create mode 100644 Resources/graphics/create_key_robot.svg diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/FileImportCache.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/FileImportCache.java index ff391af1a..08b8afae7 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/FileImportCache.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/FileImportCache.java @@ -21,13 +21,10 @@ import android.content.Context; import android.os.Bundle; import android.os.Parcel; -import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.KeychainApplication; -import org.sufficientlysecure.keychain.util.Log; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.util.ArrayList; @@ -80,7 +77,6 @@ public class FileImportCache { File tempFile = new File(cacheDir, FILENAME); try { - FileInputStream fis = new FileInputStream(tempFile); byte[] array = new byte[(int) fis.getChannel().size()]; fis.read(array, 0, array.length); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java index 6b8358538..d4235b82b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java @@ -132,7 +132,7 @@ public class DecryptFragment extends Fragment { mResultText.setText(R.string.decrypt_result_decrypted_and_signature_certified); } - mResultLayout.setBackgroundColor(getResources().getColor(R.color.result_green)); + mResultLayout.setBackgroundColor(getResources().getColor(R.color.android_green_light)); mSignatureStatusImage.setImageResource(R.drawable.overlay_ok); mSignatureLayout.setVisibility(View.VISIBLE); mLookupKey.setVisibility(View.GONE); @@ -146,7 +146,7 @@ public class DecryptFragment extends Fragment { mResultText.setText(R.string.decrypt_result_decrypted_and_signature_uncertified); } - mResultLayout.setBackgroundColor(getResources().getColor(R.color.result_orange)); + mResultLayout.setBackgroundColor(getResources().getColor(R.color.android_orange_light)); mSignatureStatusImage.setImageResource(R.drawable.overlay_ok); mSignatureLayout.setVisibility(View.VISIBLE); mLookupKey.setVisibility(View.GONE); @@ -160,7 +160,7 @@ public class DecryptFragment extends Fragment { mResultText.setText(R.string.decrypt_result_decrypted_unknown_pub_key); } - mResultLayout.setBackgroundColor(getResources().getColor(R.color.result_orange)); + mResultLayout.setBackgroundColor(getResources().getColor(R.color.android_orange_light)); mSignatureStatusImage.setImageResource(R.drawable.overlay_error); mSignatureLayout.setVisibility(View.VISIBLE); mLookupKey.setVisibility(View.VISIBLE); @@ -170,7 +170,7 @@ public class DecryptFragment extends Fragment { case OpenPgpSignatureResult.SIGNATURE_ERROR: { mResultText.setText(R.string.decrypt_result_invalid_signature); - mResultLayout.setBackgroundColor(getResources().getColor(R.color.result_red)); + mResultLayout.setBackgroundColor(getResources().getColor(R.color.android_red_light)); mSignatureStatusImage.setImageResource(R.drawable.overlay_error); mSignatureLayout.setVisibility(View.GONE); mLookupKey.setVisibility(View.GONE); @@ -180,7 +180,7 @@ public class DecryptFragment extends Fragment { default: { mResultText.setText(R.string.error); - mResultLayout.setBackgroundColor(getResources().getColor(R.color.result_red)); + mResultLayout.setBackgroundColor(getResources().getColor(R.color.android_red_light)); mSignatureStatusImage.setImageResource(R.drawable.overlay_error); mSignatureLayout.setVisibility(View.GONE); mLookupKey.setVisibility(View.GONE); @@ -192,7 +192,7 @@ public class DecryptFragment extends Fragment { mLookupKey.setVisibility(View.GONE); // successful decryption-only - mResultLayout.setBackgroundColor(getResources().getColor(R.color.result_purple)); + mResultLayout.setBackgroundColor(getResources().getColor(R.color.android_purple_light)); mResultText.setText(R.string.decrypt_result_decrypted); } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java index 9f1ac0cdd..b0caaa10c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java @@ -47,7 +47,6 @@ import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.AbsListView.MultiChoiceModeListener; import android.widget.AdapterView; -import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; @@ -493,19 +492,19 @@ public class KeyListFragment extends LoaderFragment if (isRevoked) { h.mStatus.setImageDrawable( getResources().getDrawable(R.drawable.status_signature_revoked_cutout)); - h.mStatus.setColorFilter(getResources().getColor(R.color.result_red), + h.mStatus.setColorFilter(getResources().getColor(R.color.android_red_light), PorterDuff.Mode.SRC_ATOP); h.mStatus.setVisibility(View.VISIBLE); } else if (isExpired) { h.mStatus.setImageDrawable( getResources().getDrawable(R.drawable.status_signature_expired_cutout)); - h.mStatus.setColorFilter(getResources().getColor(R.color.result_orange), + h.mStatus.setColorFilter(getResources().getColor(R.color.android_orange_light), PorterDuff.Mode.SRC_ATOP); h.mStatus.setVisibility(View.VISIBLE); } else if (isVerified) { h.mStatus.setImageDrawable( getResources().getDrawable(R.drawable.status_signature_verified_cutout)); - h.mStatus.setColorFilter(getResources().getColor(R.color.result_green), + h.mStatus.setColorFilter(getResources().getColor(R.color.android_green_light), PorterDuff.Mode.SRC_ATOP); h.mStatus.setVisibility(View.VISIBLE); } else { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java index 37c583920..5201b5df8 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java @@ -152,7 +152,7 @@ public class ViewCertActivity extends ActionBarActivity sig.init(signerRing.getPublicKey()); if (sig.verifySignature(signeeRing.getPublicKey(), signeeUid)) { mStatus.setText(R.string.cert_verify_ok); - mStatus.setTextColor(getResources().getColor(R.color.result_green)); + mStatus.setTextColor(getResources().getColor(R.color.android_green_light)); } else { mStatus.setText(R.string.cert_verify_failed); mStatus.setTextColor(getResources().getColor(R.color.alert)); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java index 7a833026b..03e446723 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -516,19 +516,19 @@ public class ViewKeyActivity extends ActionBarActivity implements // Note: order is important if (isRevoked) { mStatusText.setText(R.string.view_key_revoked); - mStatusText.setTextColor(getResources().getColor(R.color.result_red)); + mStatusText.setTextColor(getResources().getColor(R.color.android_red_light)); mStatusImage.setImageDrawable( getResources().getDrawable(R.drawable.status_signature_revoked_cutout)); - mStatusImage.setColorFilter(getResources().getColor(R.color.result_red), + mStatusImage.setColorFilter(getResources().getColor(R.color.android_red_light), PorterDuff.Mode.SRC_ATOP); mStatusDivider.setVisibility(View.VISIBLE); mStatusLayout.setVisibility(View.VISIBLE); } else if (isExpired) { mStatusText.setText(R.string.view_key_expired); - mStatusText.setTextColor(getResources().getColor(R.color.result_orange)); + mStatusText.setTextColor(getResources().getColor(R.color.android_orange_light)); mStatusImage.setImageDrawable( getResources().getDrawable(R.drawable.status_signature_expired_cutout)); - mStatusImage.setColorFilter(getResources().getColor(R.color.result_orange), + mStatusImage.setColorFilter(getResources().getColor(R.color.android_orange_light), PorterDuff.Mode.SRC_ATOP); mStatusDivider.setVisibility(View.VISIBLE); mStatusLayout.setVisibility(View.VISIBLE); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java index 6519915fa..c8b74da2e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java @@ -188,7 +188,7 @@ public class UserIdsAdapter extends CursorAdapter implements AdapterView.OnItemC case Certs.VERIFIED_SECRET: vVerified.setImageResource(R.drawable.status_signature_verified_cutout); vVerified.setColorFilter( - mContext.getResources().getColor(R.color.result_green), + mContext.getResources().getColor(R.color.android_green_light), PorterDuff.Mode.SRC_IN); break; case Certs.VERIFIED_SELF: @@ -200,7 +200,7 @@ public class UserIdsAdapter extends CursorAdapter implements AdapterView.OnItemC default: vVerified.setImageResource(R.drawable.status_signature_invalid_cutout); vVerified.setColorFilter( - mContext.getResources().getColor(R.color.result_red), + mContext.getResources().getColor(R.color.android_red_light), PorterDuff.Mode.SRC_IN); break; } diff --git a/OpenKeychain/src/main/res/drawable-hdpi/create_key_robot.png b/OpenKeychain/src/main/res/drawable-hdpi/create_key_robot.png new file mode 100644 index 0000000000000000000000000000000000000000..acc198fc3e10248107200b6bc75f3d092b76ca0c GIT binary patch literal 2259 zcmV;^2rT!BP)xNz9{(i6UyM(`IVajuLB~Nn&aYh)VE*Xixzk;IdMe zhsyHUWl#Tr-2nw;@2;$ld}i*<&bjA&&-eWH+R-cO2Ggi zxFxwlNXmd~=_&G3clr_C(F2mVh>1cn7nlhQxKH*nAX5r5EhD>dn?2k9uySUtT`O(w@U3!(2!J7!H)(17n5cOyOxlW< z${U-_%7K$_^UmIQii}xzH@>>%0Kg`jC^BZTZf^qr&P$`oX2DD4&BCOujES0O&o-l_ zF1O&89P{(}zMjq1n|b!E79rVaQ}Kh^%BhXZWC_6X zO(M#wW|Ydtgq9npH^2bhNLKvfD}n+B(r7jFUS=YtrqckmYAb_3TP}^RdUs0zlDCLW zLb4R#%~{8Z2u?ss8|(KcQEbe%XFDS#FQ%u+Go5KI*(ye;Z0rEy0HQ+@`TdL|2%+Li z#R=B!8w-FGq-QLV%Ut#D@+GipgXk?JivUJP&LJW=0f2AvKWN?ftw8+!8V|7L6`2nt zw3MOPn9ZTHe+3{SIDyfTa{v&MMXNT5-mdz0IRN#(Ob0Xo6Nfbq`-ZA>Wd8UkdzN!P z4XoUpEG=Et+?*^ejT%yc^8ovD*Kniy0ShK0yo#Ndn+N-kU#{c4O+{Y21)ZR^hF#lU7vSIG zK`|}`z^e(z2``aMT>^5wYI&kyFDnur2u$a5O=3FTFv&Kmd(l1 zeD`^0Y0q8_)(=N0G>ABX?g%d++dD4=jxqRT z$sUZ=g{`07s8ce;TkiB(WXxiJ-dh+d3mhk;;MJ52QQbkg%l@_O`tUVb*O73C%i)v^ z;SC%G#wfP^aPT8AzN5uhhnIkmOy|*WJiwTiwzNxUmq4if$9umq&_^5EN!Evt8gn^s z{KN4uwnOt>x(N!`CR-k%tDYbGQJ^OPo;KiVdII2S1D>WQ0G>ABX?g2;3A16(v5X8YlnoYqnlfRmU1 zMOkG&yN<2K+)#zZTF363)fg%ZICCXaiKJ6x6>e=e{et1Yj(r4OMNt6aqZa^RvDUF} zZvyY^OTgSv1wgF+mr5j^qSf2yd#I`{b4p8503w6O^78@H0I0ZC;nm^7t#o>ZaIa~T4f_o2U(y$ed zUg->vGQF+Ay7_Ohr(D14Jbp6{l>4DlX1_j3}mF<+P6}eQK z4QNsL+SlD^9~!Ni!w#15R!zT7qB7VpGjt;0}Rz|QPc zc4nud>lHy%@His-k3%0cl3sqn`1|Sz@X$^nBkZlnQmXfbo&aq#XH-S z5eUbPtG@9TlFm16hXuuw6qC%@AupiSxU@5_4Q?FXrb zL~Xr^+J;KU0nPi2TOYxFo*>ZQj926 zXRD0{k18FmpF8XUp+*h@IS<56_mb1nmUij%o1uBTg(j$y*;2H>OYC7sNG?|fv3J*8 h+1PQO$Ncm8{{usU^#DAOsXqV!002ovPDHLkV1j>xP&WVo literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-mdpi/create_key_robot.png b/OpenKeychain/src/main/res/drawable-mdpi/create_key_robot.png new file mode 100644 index 0000000000000000000000000000000000000000..58476bfc94c497ea21f0a1949ebfea2ab65c25ac GIT binary patch literal 1766 zcmV58K}-Uoif%zr^SwAM;*|T542cnZKV~VwI5d7l0XNP5WyH@4J6r0 z3|TfwNp`c#X7A}AX?Dy;lf9dml$reg+BxUE@A*CV+-i*+on#JH_j*)PDcSVlM8S<3IK4qYiYe)i_2Zh2W@XjuiqmOG$|qO z+gBz}Od3F0g?LN~eh4UwX02u2(w|{drvnhuf_&1|0KoN$^DrnT0K9$=zdHV1PG5Kh zKogQ5mzT<26An;PCGHZEBXO1ldGFG4u_)^v`a=QUIQt}LTaWUw=N$c7005(6Aw4OV zn=)4M)tkPL(O}{9`QPx%<7Kih&@H53Rpl0Wbix2OKQEGuA>Nmew(a)cljmGXbH^!O zJa&KhssopSGynUX4x5 zi?cV9=Uho$%V8@1x&|pjNWl?J;i3JTWK#t6Y(?XzpL8{>dg90uO22Z5g&B9VIC~@i z{P5>#ipI0RI=xRD0hZ6-ifXp=QcW3Nzefm-J)@Zi zsN5nC3XMHpzel`OQ-*4`vwZ&6A-TU$0H6RM!%;}LuZ_Bv!yst2`q&w50;`Xm2wLk} z4%6*xBg0WRB)1;L3@|gffL8Zu03^Km)Pu4w+5}HMDElP53DD|3&CKMm?=Kc$;{l-x znCGx(VYMXUa@PVNB(-`c9*l9hYq44qaoDpEFmK}lq3X$_3&83lL4q+}O$MN|*9Cy4 zP_HM?r(*_l#H-0jFj{>i=*bhyEfkg{yn_W}2oFZ&h)H7t_{-lCTgrQ`*Xi|NMo3dAb60qQR*t7V~vi%e0ZY2Gp zdNb}T=dlD(_iUGePxlS`Hrg`{VZI6$Q#^BLte7y9BgtZl2L`-F_FeN2@f5&hYYJep zH3cx)ngW_% z(b`=U=YEg0gq$%MAJl<=+(%vWs{k~%{f!G9C)s}c>!Zd+4e*zDpP<{dTxYBotcUxW?()PaVPjvRWNQ!rk7#sC7P&DV;gtQE|e3P3D$4>pAh^ z3*olHtZ#9h_4-j`qXsY;R8|-6W_982*j$dHdvB{CC%riQ5HHHQC#pDIyHHzaJr}!l zmw=*{5DF{iZ^N0KA9YOB020aLuN4vOkGg^wlT_0*p5D-jqC{scY5;-Y?!w1;_3a-w5G+jEunG3(A@9KX5n3HxJ z>z7rLnvku>lKwYwYC<*--BnFX$JPPe894Ck z4S4YSJ@oW-5a{=YbD51+mSo@0vKvduNGZ~5B{qOTWuz35ky6CkTc74%?bS4QoTB;C zNj~^D7b@I6 zIeY<`>MH-{+)&toO?G<0fNkPzo`E`Mi8*|-2DKD~r<%?qE6Cko&S!fF2KxJ>$e#_+lBVc%ZOHxNxEWnMUj6sFz z$dqw(%6X`1b9MYiR%law?l0-6e#pFjsKp$``7VegfLcOqq~mY$UD8AHkAq*)hT)fr294X+u$=!i;NyS2a4t=&10E9C1h~+DP%j@`lgI@N12IRSwMoCGRTFL zBh{PQMSQfte{3RhfT^8Xv{|CoGCKa+WnP2_3nQu6l3#VtgwjolX_NbHC^hmekLct2GclT zi}Ohv9Pr%FqcQ1{;DgEhrkB#u*iaC&O_v6>y{D8Hx=vLIyOhpes?O$s`yChVM8br=C3`Qepk3zZ_IeC(Afbm@L;-_fuf7#d8+3iv);q zXk0YGZXhpvq}DCaVJJC%IxKKiSb^Pe9C%fnFgXjoD_( zmTh|6`9K5vH>=yc2c_-VAggZEcUOI|h_0HD3n*7U>&6em)t3sjc^n zw10>O5@G(>J<3x?C8q&^uokmS)qFEv*gRwE%lq|j*BRgHkfjWMdcJQ1n_txw-ir^C zob{G@!FrE>U9=4pTb=q+33v&kmOhIei*foh9=D*4L07krt4qK;Tj%sF{CJT8X78Ho zdmc_IB*IR@;n5ul6^^*t0Cg`) zG(|-}wPr8PYLZl98iF&P6zQJBeZvX+ZO`aVfqB{m2;MinpI{ zIRq9hcVHiW?iS*`$_x|6BMjo|ZN2a6atM!}DQY`x*OXJ9V)jt&FVN%*0pDT#G2W*- z{?DzA|A;BtSh%LQGq{0@4!8%6P*)iKUn5)puDH z%SKN=BT0B2NCG)RC7;WL3{tc-HR&Pi4@UqBx*;>op@SDBXHt!bcyNznn!egfAOm;Y zKI}Q=^Mtx<*~GYqUx8w%0_<^9zT{%}8|GYr4)wD|U1ggDggK;O0WiCQEs>IgYfJex}#WEerm~Pthyd7}M}eRxYvA2p~ty7tvA1 zR?b$c`~moXL3q#Xx4%cD8;V~uFIe9R6G2?(7SDr4cJneFKe6~}dJ)H3!PbI(xX|#! zL68XEWA~mvobZ&=y^^Qo0Mpk*N6B_Z;(hOi88S>iA&OjGU%%ljOYB<+A0}HJ0k_mK zyBnCcLb+MFJm^>EsR$odasS6}paGW4KGZJqZrU1>G^E6H6w!A*wc{Tezxk7|;{(v& ziYT=~%th{uCfX&<0^1rVGYD=ZN6j9JgnsIVY`G0r{ID|^;ir(pY9wlRmF<4E7r%Rt zsVoddcS!I2)dpnD96Z_`z!Xb&_-F&hHhr3|&6D|SwcjKqHm`F8E^m7lcs3VZK1vUI z(Dl_>?hm)J`lJo9f?M#~tNdhxj(0^fNbEQ!DmA@DzE-CdNfgX%i6hXmxwv(3?TV7t zHYG^Aqcb5zxaWz(gUOp-dL~>NRL|4Zmi6(q+~@`I2-=3f^>Ri3 zzqUO5mWQ)iMQByV>t!cr8BL-x%v%twOUjX7qmJ%wkv3K3KsG=UNjT2iXW@6!<_eJN zyS1Xe{Bn=;Rwkh&QktBUvdHjJIZT)?SA4cD7mSTSSIwvv7fX5RN*887qW8d)w-gJ> zxmoeYunSwX{C58Anz~&!_WlNQQ==M! zxbju7e+AuK|4)N-ePogXqfazrp5}u#5o7so0%CAy(&zqPPR+NiNS#XD!o>r}r;!!x zTZgn{Wi4MZUTc0{Q8gosvKIR7fevlBhP2+hpT@2MkbJ3YH~ro0qqF^0`e)dM_)B_; zaPNlI^-c0k+OxTph#~dO>DY%iXd@UepIIq9r;Aw#nQ1yolpf!IWtXm5l5xAeukxit zgo?_(CS7KEpstnK4X8BooE3Dzjg&^qMI^3asf!*J+@o+W&6?XT4_i0O6TmAjw~85@mnO}S2jHs*g;!NLpAM{H}k1rapPG-!Nl z7Jt6PH-KQyXEVVhX8@zdA9@4H+qbL6K=NHJZ+yl?Gv-;jr2nexG&T+|eB-*B9q|;| ziWtgjx5%}08A;w)M!O&4@>1aws!~+$^z*Ny_6#ib-00yY<8Qq^iOprm>I1^JlUW;#Ms?ri#B9U-%g>`4k@Xvd0DHEuf#{x?VD;)8$TNL38m@+YWe6dd9 zv~VZCT9{s?bGcUGX8idsPAcSal~gAzZg_iVj7vyhQ=|7p^yRV7+ip}9b7Q`vPv?Yu zw&&IjjZN#0get~ykGqK$=eBQCFP*%h8MlbcOELPg#Q6VlmN#7 literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/create_key_robot.png b/OpenKeychain/src/main/res/drawable-xxhdpi/create_key_robot.png new file mode 100644 index 0000000000000000000000000000000000000000..5392deafd0e273d3cef1ffd5cd768797b5acf1b1 GIT binary patch literal 4039 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 AcmMzZ literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml index cc152a323..74231142a 100644 --- a/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_final_fragment.xml @@ -76,15 +76,30 @@ android:layout_height="1dip" android:background="?android:attr/listDivider" /> - + android:layout_marginTop="16dp" + android:layout_marginBottom="8dp" + android:orientation="horizontal"> + + + + + + diff --git a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml index 05877656b..fcad91df3 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_result_include.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_result_include.xml @@ -8,7 +8,7 @@ android:paddingRight="16dp" android:paddingTop="4dp" android:paddingBottom="4dp" - android:background="@color/result_purple"> + android:background="@color/android_purple_light"> + android:background="@color/android_green_light" /> + android:background="@color/android_green_light" /> #33999999 #33CCCCCC - #ffff4444 - #ffffbb33 - #ff99cc00 - #aa66cc + + #ffff4444 + #ffCC0000 + #ffffbb33 + #ffFF8800 + #ff99cc00 + #ff669900 + #ffaa66cc + #ff9933CC + diff --git a/Resources/graphics/create_key_robot.svg b/Resources/graphics/create_key_robot.svg new file mode 100644 index 000000000..7301dc5bb --- /dev/null +++ b/Resources/graphics/create_key_robot.svg @@ -0,0 +1,102 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/Resources/graphics/update-drawables.sh b/Resources/graphics/update-drawables.sh index c319a869a..ae77d313a 100755 --- a/Resources/graphics/update-drawables.sh +++ b/Resources/graphics/update-drawables.sh @@ -53,4 +53,13 @@ inkscape -w 24 -h 24 -e "$MDPI_DIR/${NAME%%.*}.png" $NAME inkscape -w 32 -h 32 -e "$HDPI_DIR/${NAME%%.*}.png" $NAME inkscape -w 48 -h 48 -e "$XDPI_DIR/${NAME%%.*}.png" $NAME inkscape -w 64 -h 64 -e "$XXDPI_DIR/${NAME%%.*}.png" $NAME +done + +for NAME in "create_key_robot" +do +echo $NAME +inkscape -w 48 -h 48 -e "$MDPI_DIR/$NAME.png" $NAME.svg +inkscape -w 64 -h 64 -e "$HDPI_DIR/$NAME.png" $NAME.svg +inkscape -w 96 -h 96 -e "$XDPI_DIR/$NAME.png" $NAME.svg +inkscape -w 128 -h 128 -e "$XXDPI_DIR/$NAME.png" $NAME.svg done \ No newline at end of file