From c442d3bd0d3bac96614d3d5c0e833a42cab4706e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sun, 26 Apr 2015 00:33:26 +0200 Subject: [PATCH] Put decrypt result in toolbar, some ui fixes for decrypt --- Graphics/get-material-icons.sh | 2 + .../keychain/ui/DecryptFragment.java | 19 +-- .../keychain/ui/DecryptTextFragment.java | 6 +- .../ic_content_copy_black_24dp.png | Bin 0 -> 284 bytes .../res/drawable-hdpi/ic_share_black_24dp.png | Bin 0 -> 499 bytes .../ic_content_copy_black_24dp.png | Bin 0 -> 214 bytes .../res/drawable-mdpi/ic_share_black_24dp.png | Bin 0 -> 355 bytes .../ic_content_copy_black_24dp.png | Bin 0 -> 304 bytes .../drawable-xhdpi/ic_share_black_24dp.png | Bin 0 -> 614 bytes .../ic_content_copy_black_24dp.png | Bin 0 -> 397 bytes .../drawable-xxhdpi/ic_share_black_24dp.png | Bin 0 -> 804 bytes .../ic_content_copy_black_24dp.png | Bin 0 -> 480 bytes .../drawable-xxxhdpi/ic_share_black_24dp.png | Bin 0 -> 1052 bytes .../main/res/layout/decrypt_text_activity.xml | 2 +- .../main/res/layout/decrypt_text_fragment.xml | 2 +- .../res/layout/toolbar_result_decrypt.xml | 145 ++++++++++++++++++ .../src/main/res/menu/decrypt_menu.xml | 4 +- 17 files changed, 164 insertions(+), 16 deletions(-) create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_share_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_share_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_share_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_content_copy_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_content_copy_black_24dp.png create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png create mode 100644 OpenKeychain/src/main/res/layout/toolbar_result_decrypt.xml diff --git a/Graphics/get-material-icons.sh b/Graphics/get-material-icons.sh index 299ae9713..11e0cda18 100755 --- a/Graphics/get-material-icons.sh +++ b/Graphics/get-material-icons.sh @@ -41,6 +41,8 @@ python copy OpenKeychain navigation grey chevron_left 24 python copy OpenKeychain navigation grey chevron_right 24 python copy OpenKeychain social grey person 48 python copy OpenKeychain communication grey email 24 +python copy OpenKeychain social black share 24 +python copy OpenKeychain content black content_copy 24 # navigation drawer sections python copy OpenKeychain communication black vpn_key 24 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 d641f02f9..651b56ab0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java @@ -79,17 +79,18 @@ public abstract class DecryptFragment extends CryptoOperationFragment implements public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - mResultLayout = (LinearLayout) view.findViewById(R.id.result_main_layout); + // NOTE: These views are inside the activity! + mResultLayout = (LinearLayout) getActivity().findViewById(R.id.result_main_layout); mResultLayout.setVisibility(View.GONE); - mEncryptionIcon = (ImageView) view.findViewById(R.id.result_encryption_icon); - mEncryptionText = (TextView) view.findViewById(R.id.result_encryption_text); - mSignatureIcon = (ImageView) view.findViewById(R.id.result_signature_icon); - mSignatureText = (TextView) view.findViewById(R.id.result_signature_text); - mSignatureLayout = view.findViewById(R.id.result_signature_layout); - mSignatureName = (TextView) view.findViewById(R.id.result_signature_name); - mSignatureEmail = (TextView) view.findViewById(R.id.result_signature_email); - mSignatureAction = (TextView) view.findViewById(R.id.result_signature_action); + mEncryptionIcon = (ImageView) getActivity().findViewById(R.id.result_encryption_icon); + mEncryptionText = (TextView) getActivity().findViewById(R.id.result_encryption_text); + mSignatureIcon = (ImageView) getActivity().findViewById(R.id.result_signature_icon); + mSignatureText = (TextView) getActivity().findViewById(R.id.result_signature_text); + mSignatureLayout = getActivity().findViewById(R.id.result_signature_layout); + mSignatureName = (TextView) getActivity().findViewById(R.id.result_signature_name); + mSignatureEmail = (TextView) getActivity().findViewById(R.id.result_signature_email); + mSignatureAction = (TextView) getActivity().findViewById(R.id.result_signature_action); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java index 1b9ae917f..6f576a112 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java @@ -97,9 +97,9 @@ public class DecryptTextFragment extends DecryptFragment { /** * Create Intent Chooser but exclude decrypt activites */ - private Intent sendWithChooserExcludingEncrypt(String text) { + private Intent sendWithChooserExcludingDecrypt(String text) { Intent prototype = createSendIntent(text); - String title = getString(R.string.title_share_file); + String title = getString(R.string.title_share_message); // we don't want to decrypt the decrypted, no inception ;) String[] blacklist = new String[]{ @@ -147,7 +147,7 @@ public class DecryptTextFragment extends DecryptFragment { public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.decrypt_share: { - startActivity(sendWithChooserExcludingEncrypt(mText.getText().toString())); + startActivity(sendWithChooserExcludingDecrypt(mText.getText().toString())); break; } case R.id.decrypt_copy: { diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..dc8c85cceb0959a316c1415bf3d2d2af3d889c25 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00C=BL_t(Y$L-d?OF~f;!11pbwM1A;KZb||p*?un50_}E zp(!G;z<(i22x)XGf>Nou!B!zGX$#s)EeR`c%jIG3I&@EMb?*MT_nmX@ zxexxsjR+T1sdCQvPnZQhP;o~IhHMry+-NMPd2zIo&;z#4A-x1i zaZ7;|gZ5Yt2YQTD8m4v$M{+WUoKe#ve%YwqG^ogLy&_Q=G-*H+GN^?+&n5Cpo57*v pGLLq{*Bb-uktfeC{eR@Q=@UH=_@0h@V?6)>002ovPDHLkV1gZS$7KKj literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..4ad9e552dd509a6126605622447bb7b656f0a584 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO=~G=WkM1 z=jq}YVsSb-L4ljaXiv(Ie&!_B9aA4)Xb5H!SBPfL+rKC2!|`Q|^W)=^E;roH%rIIk z)wY7|P-nr5jEYwE%KZnH9h6V+t2p?;JMQNp1_s@y%ei@MXX*n@X7F_Nb6Mw<&;$U7 CHbGbb literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_share_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..f0ff945b8f376325149dcc79ad941d53a8225ce6 GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tWO=~G=WkKx z+tbA{#NzbPNw!^w0z};Wb$VLumv-G2a4XPl;@QE($#&Fqg~S^c!8@l8a0D+uHDxi! zBzavH#q(}*nO|ZP5B$DWTyg*Jjt}oNHz+6`J3Nh(`^w+5sZNVpJ(|LIWGR{)w5*ab zSvSM(`0YOnI$jzpE2Vh-GrW_~td#0`H6*_2_yprF{aKfOiPV>Dc=9z?!;7oO*eOz} zVx~v6-Pwsb&s6~X?|1=A) vH0gJX?a}Jl^56sux469g@jYMa&+^{m&RclXe(z79HyJ!#{an^LB{Ts5s$7RX literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_content_copy_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..c6f0e6b8551874901d5097241f3337dcf1a52aaf GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tg=CK)Uj~LMH3o);76yi2K%s^g z3=E|}g|8AA7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^+;1OBOz`!jG!i)^F=12eq zS9rQOhD02GJKdYB!GOoby-+>QdC%VYTPsvF>#mimN9m|BiofcSb~IYQP12)Lf2C71 zXWUPXH*;^rux9vt+uo2;KRaNCnc2j;Z=0CbURrMb{5C_ao><9>q_V`@k;M;_Is_8V zwz_L)2WRUwJdKcKk0>e(JS-#Nz`)2N;LzYPv!vsxq`-%6nU<)D^Pl;i{hzopr07SEF3jhEB literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_share_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..4b3675766143abfcfb68ef68f1f561a3a8dfccf1 GIT binary patch literal 614 zcmV-s0-61ZP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00G`fL_t(o!|j(pXcJK!$3H1eE)_y2v5J3iQ0O2?hYY0% z1v7|?ql@C;W}w<8PHs-^)VV_cgiyP6sf%L=lhP0q&nOBVL{M-jHce@dki0J8cz3z$ z@_q*`^xbwmzMmi8_q{Lg;C!9^HNhqM%KD&&y6EHfeju&9T|v`LoAKFhInj;cqDbZw~Qm-A; zlr`iBZp%j@##8>d2!}aR@{km>I4CW078a*{J+BCjbBd07*qoM6N<$fI(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g&? zz`)4r>EalYaqsO-N4_Ql0oDurh6z3D6Do|?I~c@x>M!;XIppiX5MHXyEwU`Q^+|o0 zuh(y*%w^q7XC4VF9Ah=@xs*PWgWt4^Nh9ESL{n1fxs(a_rDgxsx9q*Q;@Gv1e8S76 ze>z2de15HzL+M5N0@I);FGQkJ+ok(Bj^|k2N&LQIigiV&2Vd0cVjdnYmY{%F4ao@; zJREl_2dM3}+EwUYP!yGuqHx#x-Q%pB9u`3t0Y?;KLRQ$`iO0Dh;#)rK&e1r(eL3sm z9o5=v1D>vsnJQ9J#$x4J&l6}>F=tnO{Q+se7N@zJH*4p2ut-X=dNpe&&3p~T?n>gTe~DWM4f$=!-5 literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_share_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..09d4df6afe38938a3d55aceb5358b97bf7f2c90e GIT binary patch literal 804 zcmV+<1Ka$GP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00NvzL_t(&-tE{wOp`$v$MJ6)TLy)~;K1k~l*Y})I2nQn z64c!oAX;V}jF>cOLSh`y;9i!#mR$#9s0l%hZ4ix{#MshFgDi?ILt7%}K&VaMYv0%5 zeXhnnw>3@PPwsv0-rpUxt6lB-_shp93*@O#W}PG>W;v%=Mb(WJ!lpQbY}+^rMUeqB zv!mzik;3x5v)YiOP-LV*qfI#q#jq@B!4YK1g7S`_oGhr~2r9{fc3KVe*%6eL!vwk0 zWDnXO2`SE)i`h{qh9od2dF~3Mc;h{$i-#`O*4`*^!s`#kb-vji`<5RKIOn|OoaLSE zprD&UhryMgAzb=!rVb-`{ z2Gh@?4YS294oHOa9r7e=(o2Xr+w%TJoWs)LJWU^dB5Z2b&1o~?e2WjZ-@b6wWH_&1 z-uF0YI-LI*PdL&V;as8k$obX@=LK$hxxD{AoUi@o;k?{xpmi4wEm}!OP?6gNk=#5*2bJ7_9!@$phQ=xr;@w$=g-k3AMm9L6fL4vYH!>OD0J{rZw%qNWV#x?x0v< zj!^X<-9)fhW(kWadL&S~qx2>b`~-;A1>$XHBs$H{4b5rfJ?RE_)FSf~;*pD+#r-3d z(C0bK3zwvrT$^8Uk*O4gnzr}6I*7VB+fB%B2MI^eyew$h5tNbzEwviRasI(3)EF2VS{N990fib~ zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g&? zz`z*c>EaktaqI0Z$Gk%Z0<90lL$*FN5PifYv&>c?B;{bJ!wU8U&#QU@#}#6a#BN;a zC}1de`UC%NkIv`a=@Z<$Tm+81lvsVSKdSY}eig$jN|lc|8J%l)EuGJ@p}^;VnnUTL zZ|3XvhTSdut+4A;+_idNo*7eEJIps+E%sCuxi6O^{y|@H>OE$l>lgyq6u$1c@G82v z_m_Iv+02XiaWAf{*v9tb9Jk}^x|Y)n_bU}OGV(Yjb}yH|GWUJ!Ki@gYaVx&0v7a#3 z_j%KI`QGP4g;#HJJuuae*~#b52{I86cp>V4acY+=l8Oh3&l|lz{(gV>`h!X7+1r_a z>*!advqz*d>b#XR4VwP&^Y8G}+b`~5PTO`nGW+eUe_s06L?c%hYAx|I{{5wY?}vr@ mvXhq9T?h-leM`Ngy2pObQq{%xWLW2ctnhU8b6Mw<&;$T_g|k)w literal 0 HcmV?d00001 diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_share_black_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..0fe15fc056771d76cc8b830697d18ab4f6ce804e GIT binary patch literal 1052 zcmV+%1mpXOP)004R> z004l5008;`004mK004C`008P>0026e000+ooVrmw00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_00WdsL_t(|+U=W5NK{c6$A1|Tgykd1%rsy0phcV9)G8^G z7Ue=}Q7VB(i$b!(RDyKVLqcrRCKIF7P{cALQv_#`n_2~xmV}{JhL)-MYUZ{`%g3BM zbB5@CH}3yi&RzU}!#V$RzHjb;BS(%LIr@(jM36m=Z>AU*Ll_tg;o>5j>|;KOMm!jc z%0mMQcCdep?@P?j)i{~b?H4G`&sDx;`&mBi8yFmsYCnN-zW~PAC=;OGFZ%`twKBhd zkKX`p;^YAo`EB38;JiG5HZ6b_c>n`i0DbZRrnLa38t$RJOS`7p|v(X>B9w3L49IG;7m8yHl|u)mAv0hl-V!aD2CM^hb;c>@n=R-0cz z5n~E_AAMZu+?=r5ei}Ura}yM^k~D^u_J=uWt@*7yQJSm&-KIoQ;U$-*xk;pz=0hn{ z#^nokFM2wPTprNFC?mX~kyF-g+#s?UR4$8?ESEiL*vT{Hmb}3l+2+@CN4e@d*e=21 zGLyJ0U{raVJZ!D)L@vwYLIrDOAmsW$@F>USU&$j_ z0zx_?rnAcsE;FV0{1vGZ5Td#5C6Q*hMbzvQNi-=Tn@ExYk;g;cG0p_NG;?~%k3Olq zR$eo%$ck5$f;ppHZUbb>iB~g4QlZ@Tog`xmCDWy3=y)qPA%1xlS8}=2(x%?p7(0&K020s?vinan8)i?RuM*>60(5^>GAqOIh6lZ z-Ned|SM%y3Tz)?8o6y}1l>OEza&(0 z=NwCy5BnRWH~--#EoF`DZ~u?>(!Qu)^Ux-D>v~rVS(H*m6{Td#%za0W9653%Pd@>k W_~uS4Xs)3E0000 + layout="@layout/toolbar_result_decrypt" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OpenKeychain/src/main/res/menu/decrypt_menu.xml b/OpenKeychain/src/main/res/menu/decrypt_menu.xml index c0d7a519f..9e90fc9c7 100644 --- a/OpenKeychain/src/main/res/menu/decrypt_menu.xml +++ b/OpenKeychain/src/main/res/menu/decrypt_menu.xml @@ -5,13 +5,13 @@ \ No newline at end of file