From 4ed791762558721e22574e783cd1bbb3bbdbcf75 Mon Sep 17 00:00:00 2001 From: Anton Chekulaev Date: Tue, 8 Sep 2020 12:04:51 +1000 Subject: [PATCH 1/2] Fixed passphrase prompt activity theming attributes. --- AndroidManifest.xml | 3 +- res/drawable-hdpi/ic_arrow_forward_dark.png | Bin 186 -> 0 bytes res/drawable-hdpi/ic_arrow_forward_light.png | Bin 178 -> 0 bytes .../ic_visibility_grey600_24dp.png | Bin 366 -> 0 bytes .../ic_visibility_off_grey600_24dp.png | Bin 560 -> 0 bytes .../ic_visibility_off_white_24dp.png | Bin 528 -> 0 bytes .../ic_visibility_white_24dp.png | Bin 472 -> 0 bytes res/drawable-mdpi/ic_arrow_forward_dark.png | Bin 203 -> 0 bytes res/drawable-mdpi/ic_arrow_forward_light.png | Bin 186 -> 0 bytes .../ic_visibility_grey600_24dp.png | Bin 250 -> 0 bytes .../ic_visibility_off_grey600_24dp.png | Bin 387 -> 0 bytes .../ic_visibility_off_white_24dp.png | Bin 356 -> 0 bytes .../ic_visibility_white_24dp.png | Bin 310 -> 0 bytes res/drawable-xhdpi/ic_arrow_forward_dark.png | Bin 263 -> 0 bytes res/drawable-xhdpi/ic_arrow_forward_light.png | Bin 239 -> 0 bytes .../ic_visibility_grey600_24dp.png | Bin 458 -> 0 bytes .../ic_visibility_off_grey600_24dp.png | Bin 706 -> 0 bytes .../ic_visibility_off_white_24dp.png | Bin 652 -> 0 bytes .../ic_visibility_white_24dp.png | Bin 581 -> 0 bytes res/drawable-xxhdpi/ic_arrow_forward_dark.png | Bin 261 -> 0 bytes .../ic_arrow_forward_light.png | Bin 250 -> 0 bytes .../ic_visibility_grey600_24dp.png | Bin 650 -> 0 bytes .../ic_visibility_off_grey600_24dp.png | Bin 1019 -> 0 bytes .../ic_visibility_off_white_24dp.png | Bin 919 -> 0 bytes .../ic_visibility_white_24dp.png | Bin 846 -> 0 bytes res/drawable/ic_baseline_arrow_forward_24.xml | 10 ++ res/drawable/ic_baseline_visibility_24.xml | 10 ++ .../ic_baseline_visibility_off_24.xml | 10 ++ res/layout/prompt_passphrase_activity.xml | 96 +++++++++--------- res/values/attrs.xml | 3 +- res/values/themes.xml | 4 + .../securesms/PassphrasePromptActivity.java | 35 +++---- 32 files changed, 100 insertions(+), 71 deletions(-) delete mode 100644 res/drawable-hdpi/ic_arrow_forward_dark.png delete mode 100644 res/drawable-hdpi/ic_arrow_forward_light.png delete mode 100644 res/drawable-hdpi/ic_visibility_grey600_24dp.png delete mode 100644 res/drawable-hdpi/ic_visibility_off_grey600_24dp.png delete mode 100644 res/drawable-hdpi/ic_visibility_off_white_24dp.png delete mode 100644 res/drawable-hdpi/ic_visibility_white_24dp.png delete mode 100644 res/drawable-mdpi/ic_arrow_forward_dark.png delete mode 100644 res/drawable-mdpi/ic_arrow_forward_light.png delete mode 100644 res/drawable-mdpi/ic_visibility_grey600_24dp.png delete mode 100644 res/drawable-mdpi/ic_visibility_off_grey600_24dp.png delete mode 100644 res/drawable-mdpi/ic_visibility_off_white_24dp.png delete mode 100644 res/drawable-mdpi/ic_visibility_white_24dp.png delete mode 100644 res/drawable-xhdpi/ic_arrow_forward_dark.png delete mode 100644 res/drawable-xhdpi/ic_arrow_forward_light.png delete mode 100644 res/drawable-xhdpi/ic_visibility_grey600_24dp.png delete mode 100644 res/drawable-xhdpi/ic_visibility_off_grey600_24dp.png delete mode 100644 res/drawable-xhdpi/ic_visibility_off_white_24dp.png delete mode 100644 res/drawable-xhdpi/ic_visibility_white_24dp.png delete mode 100644 res/drawable-xxhdpi/ic_arrow_forward_dark.png delete mode 100644 res/drawable-xxhdpi/ic_arrow_forward_light.png delete mode 100644 res/drawable-xxhdpi/ic_visibility_grey600_24dp.png delete mode 100644 res/drawable-xxhdpi/ic_visibility_off_grey600_24dp.png delete mode 100644 res/drawable-xxhdpi/ic_visibility_off_white_24dp.png delete mode 100644 res/drawable-xxhdpi/ic_visibility_white_24dp.png create mode 100644 res/drawable/ic_baseline_arrow_forward_24.xml create mode 100644 res/drawable/ic_baseline_visibility_24.xml create mode 100644 res/drawable/ic_baseline_visibility_off_24.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a65c1bdfb0..166b896dc6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -342,7 +342,8 @@ + android:launchMode="singleTask" + android:theme="@style/Theme.Session.DayNight.NoActionBar"/> V#TnMuOwGtYyX{k`~A;X?)i7%^k-v>syZ?CuYamLKewv= k7U4?2`L*@*k3BPer^#9*RFVdQ&MBb@05S$i9smFU diff --git a/res/drawable-hdpi/ic_arrow_forward_light.png b/res/drawable-hdpi/ic_arrow_forward_light.png deleted file mode 100644 index b55688a81f332c2ac5ae8324fbc843cbc5132659..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DN>3NZkcwMxuNZPQ7znsrv~1^U zk~<=LM{Rk~MYZMEoP1IROC}uH^Y*(w3zOhUvqKId0_O`SNIWuS>*D%6_d}BKRw1t` z(<5$ls@V(1_iSX!oFmI|r=eKh@B bDOL=3E&CT$o~W<|I)cH|)z4*}Q$iB}3N=9> diff --git a/res/drawable-hdpi/ic_visibility_grey600_24dp.png b/res/drawable-hdpi/ic_visibility_grey600_24dp.png deleted file mode 100644 index 619b076ea4aa5adfc3dc262972a4c3e7af8d3afc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 366 zcmV-!0g?WRP)dz4lotNp`5Fa{4-cz9)9!Nb_QLK016;|34! ztQ)cuO>c;ChLH2IY`}v@8$R(lXXq6%_6iOe^jyUv&E?lfvx?!Iy&u{uFXd+nrwq2^ z%=#>z#SX)qswoXZo!DZK3wNgUV!(n$M)Bm%;DX_{sFMjoibsH=1-4$5Dc`7!+glJE zC{$gDktv7Gs55c6(33s-V1P&srgB0X^+1P(ZI~=zP^4ogrDcxAl9n z3ks6H`=FR0QP%{5EtGz-f)r{Ip{5lYBSM2sWYmfbe}V7lx6wa60!S2;i(vnJYXATM M07*qoM6N<$f*hZpHUIzs diff --git a/res/drawable-hdpi/ic_visibility_off_grey600_24dp.png b/res/drawable-hdpi/ic_visibility_off_grey600_24dp.png deleted file mode 100644 index e6bddf2ef74062c9f17cdc2bc520de3371b9705a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 560 zcmV-00?+-4P){Y#>~m`HJUms@Ew878;r4hWZAIzwJK=(wxyS9z$l`|i`8cR#Ok;b*u>@2CsTS_+5rvchWx{iIQa5Kfu99Efg) zU_3tZFuCncJxxdR86F);CtLWX_+_a1GM{1R^Ph=E*#>9G?_MPKx-rn0f{c!u#!k6l zn0qr|kAY6dhK<*AYRDyr9aI%O)nW6<@MmPDd8WCNN+UiLrD(D`gBudzqIx)|sAoaP z{LWA;$5Nb)q0T1jM~}!oMP2Ya*)M~o_#t(1AKF`rddl-8D=F%NSDNB0=$3Go-yFG- zFVAjdA{+bZoy{u#izH3**njTm1d!vj=hw{4N|+( yP#R7H7dLdj!3tI7Q&0WA6@-M!2?iwoh58MBOQggVNiGKf0000?Ilv66$3sGW5{jD4 zH$r`215M%}p+N~L_{d7iMMFYQeky7b5820R*0P`H=q}JW3hKr~fQa2*fjKVMyW0ohpfV)T?MG-3p!y;R2hm-@L1VG4K@e7gqv|_q0fMj&+pz!8Xl!c{ zgcV?@$`R0T+@{?OY?{yyH09=S)TRl;u{*m0f^a-QmEjq>f&Ss&fo=|hP@7``YNEOZ zHz7V$gFO76(bRp@hh;1!p{PlYf`mOGg?2o_FN4XBTczvcRL4J$2yMi1{VoOm5+NIm1iX%iB3}%GSigxye};!gr_>w*=P3I zL-sSBcI1R8A%1Gnoxb#^hxa&YNVcLYLWU`s@ S+q;nf00006P)Nkl_U#TG5w%{Ggog?4^%XLs!=Fi)wzdny!`Kaue+n z9$Q(@Y2Kk-r&qaS#_$~5TNcwzd~{O0mfe7qDIQbM+2wa&Sy1?xT5r zP_CRAKZ|xJIA{j0t!8{Fu4QI?1Fq@i4q9)X~q_#9S|FFI^MpQJ0 z@CsWCeZrrbHf%2#C}E7`DYmyPRG)US^P0yDm(u9X^-$W+vVo0wyhpo24=InXtmFsP zd}ldbq#Am&i*Jk4UlRRA~)z2eB#u%jghw1x{_B6BnyZ7t=*}OAK7C}MtE8V=^-^p1h z+P#Tk7EE_JebBaWrryM}vvz#z+?&5BP$)-piuOvue6!@nuEuo-*|?58IVD@UqF7e@ zU5EJV$Y)pW&*vY$^W6DoQm?eoyidFCFV8xwv_<~eX^pQ%GdykqUB}?*>gTe~DWM4f D_WoAM diff --git a/res/drawable-mdpi/ic_arrow_forward_light.png b/res/drawable-mdpi/ic_arrow_forward_light.png deleted file mode 100644 index 1df381e4b51a36410d90b8996cfe36156d1028a2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4Ujh-%!Ar*|t3v4A=yBs_i1JW{B zokBnHen@`7bSRCDwTL$%g@Zx*;;98j8a)AW0m@7(Q(d_2l%Gg``QX6ZRD diff --git a/res/drawable-mdpi/ic_visibility_grey600_24dp.png b/res/drawable-mdpi/ic_visibility_grey600_24dp.png deleted file mode 100644 index 9d554fe3de950c6e216efd0135cd02929f464ae9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 250 zcmVM29;F9wVY_+f(w_;L6{EI&Q{u4 z`Vb%7 diff --git a/res/drawable-mdpi/ic_visibility_off_grey600_24dp.png b/res/drawable-mdpi/ic_visibility_off_grey600_24dp.png deleted file mode 100644 index 08dcac59fa2be04157001d75797c630e7d7185b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 387 zcmV-}0et?6P)Nkl+yQpic7^wxK?E68{FNk;81Ye=i(Mz`a@4>x`w2)m6^pIzDd8lGrx@R zPeqd;w*-CwfDAhn6>0I5MC4J4f)+|*i}$lYOCS^-!6fY5v5|3DUPa1$$U5w%^MKAW zpGQDV1omN9krr=6ksuO8<6t$Q-HLGY{ikX`MOcK?8~#(yPZkXKor+|6VFj)im0wFAleK&x8?u8I%$|dYNVg|^8 z`a(Ph#5phM=G&K|xoCpk#f;&!I%npKURdyr002ovPDHLkV1gSguPFck diff --git a/res/drawable-mdpi/ic_visibility_off_white_24dp.png b/res/drawable-mdpi/ic_visibility_off_white_24dp.png deleted file mode 100644 index fb21efe6d9e33ca059a00d2924f9c04ecffd7f35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 356 zcmV-q0h|7bP)^-93{0;`}c# z$T7vQfa5q-l6pN&Fv|?%bXWIvP&gZ83q+5s)BLqPRGcYEtwTQTg(d1f2c6sirxogS z)u2%?hvhD5_c3Vg9t24-ljLqF0@x$>v?R4QTA@L5RBlrS!$k%=6J(#|lHMZy-hbl))>(zGe-E0i^$4Pe?gt6* z>D20KjOk_=ql;P Cgq$w` diff --git a/res/drawable-mdpi/ic_visibility_white_24dp.png b/res/drawable-mdpi/ic_visibility_white_24dp.png deleted file mode 100644 index 0e8e507f213398e3d59540a950821f0f513aef84..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmV-60m=S}P)kn?(Pl|P6g=0DP=7~4;Q(=^(|okpPrFyOfVvZTM^vM6K?~}R zNTb+B?Mj6)g9AHLgi0Nv)^&LmPI=NZs7a{;oXX56u5k*JcA#uh5jg$#y}^#M`rc51 zQ@->RYD}sSr&9Bc4b;9=D3jQ*GDe8hF>1vqBDq7g7#Fmou8A;CByfp3q<{#y3OPod z66byB`gp;YXL|5`2uWoQ8?LO(kZc0sFIm*kDOZjB{WU@81L^a(3*?i%`Tzg`07*qo IM6N<$f{NvaivR!s diff --git a/res/drawable-xhdpi/ic_arrow_forward_dark.png b/res/drawable-xhdpi/ic_arrow_forward_dark.png deleted file mode 100644 index 70057432f3099e57d750713d145d0fdc5b48831e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 263 zcmV+i0r>ujP)|0brKE6qjT0U7*DRz@35;l+fsexe}D{Nth|&KN1*|dz}L> zug97RKckw0SwNLw8*rr`IKX2I7_sy^E1tMq=tbe6%^H^jsq}%M^QGTg>yt+5H+9mN z(%b2ahUvF;(&r?WUoAuBS-ap>N9O+ZV8?YB+Lw-OzaGFEq_$U8zm2{cF*i`|n40a2RlIWV9`P z$#6V;L&Ec0^V%=oU!i$oO7q2Xm6z_T*SjsX=kvVp70>n3-}#bx$V7h=aiP|g8OeV6 nLQY@Q7Jhu)JU^>dz-bS| diff --git a/res/drawable-xhdpi/ic_visibility_grey600_24dp.png b/res/drawable-xhdpi/ic_visibility_grey600_24dp.png deleted file mode 100644 index b121c9ae2967d12a6f905c37e49ec1abd2ea1e34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 458 zcmV;*0X6=KP)J0#ql^BWvKY~QqzH!EZBG-%N9 zEFk~2=SW4ULLa8Fc`DQBLzPry&yoM$liK)|iBba&a7+shqy{D$zut*F@0V1Bl>kag zR-~f5U$1a9i7T&$TA-fukIvn3Y>eS#H(6a=L5y87CfnbkfKiN-v6a5)jq$-<Mg znpUMMRcM_MI&ClmTku6d+@wy*UpyRdjX5B+p%%2=M$kJNp}a-I zgy)hFMhqcgAE>wTdM3QG?12cu|J3a$S*z1^%W5IqnmB;d6tkd$GQtkQe*@V6PNfw!_Otx@!v;I~}6j%2L(D78jDA|(G%B-LE>kDoTE!G5;Dx4FaVWwG)_G>+!Cmx@q z{tJ%j7W2I;Qld8k8^xIR&)CT;1>09NPZ2@`@{LVKxIP;S(^YT9Q~q z0v#mS$4CnJ0u1rMB8qSfcQ2VjVSj)}ZAly@SrdPU0pyoQUEj|PNRvFxiB5k08I&?auas1 zsIPz`+yqEM6k-oYnLsW)b5cL3D-^JSwb(_(UsPd^0H-Nu?w2P8yCs={Zm8B$lY5%r z6gkcPRjAsL29S;OsQThLi1FrLUsNZ^k_HSxSJ6y^0ZAM&w=1LTmj)a`m(6@c1O&0$ z+{%USKpJomT@LdRVf`0njycdBP6PToe?%TfK@z@yL|Hh6s<-)w3E&_GqB>31G{B<+ zs+Flf<BQdauqBQlh`7O;>d?g56ApqB@I0Kl;W-jrP2ytF>mCekiAI0(XlH?z7pXAW{5r7_g2KfHOj_(MF&HqKp m{3yVqHajT&yZxX1A9x37W9dUQW?0Dp00008$8QV_E*s5Yz>)kfC`YLw%C${_8ww*HOdhpErqqDl_8^@Vn`yS(-D{*mg ze*~J6$6Ai^gnYbs$>#}2SxX*GBsSD#1{d%Xh@bOJr;bE}hAbzaaC~AZ^(7J{FpZBy z;saAiknqrw<3!^a%_TGj@*10qEu_1P5YTns}EuSv>nSX|Dml#xMKG$&J;wp2gCWg9DPn5gC zHf%1;+S7)+RCb$ICTWcu+eT;eBhYLqAN^gNZjoxz?P!Kb1roW9Cf(%o(abSvCYl>m zTs(5nwKe%QG*?X89$l7{;Uc;ele^HAn6w(Y3%{^~?BGkpRWz4P+5uf=<*(`dGs}L~eLH6)G;wBo?pUV&XN}^+v?flqHL4H!fMRMNJp6y0 z^)NWdGVRi3<^`9ah|ONH{*iy^H%GHAEPpxCFgfOh@1#^o1 y?+V&}d%1t(`MLIs)SkJkg`9RhYZ?!7Q`|v`rG|D1Jgb2IV(@hJb6Mw<&;$Tg8*OL+ diff --git a/res/drawable-xxhdpi/ic_arrow_forward_light.png b/res/drawable-xxhdpi/ic_arrow_forward_light.png deleted file mode 100644 index 44956477ad76a3765b842cb7142afcad5caf760d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcg4tlychEy=Vy|z*Ckb!{9Mc#&m zN*=BSoeMab3LMnKO&ghoHJ-R_p7;OCfx2WjF`y0xk)10~MucmL8kL4?)e6g4UQ>gzw%L@N@d`wd=y`m>|@>fqv|v0a2MngelXj;2}7SqL2b7@%U+|}Yb@JS?F}Uz4<2ht{$gu?S~MFi*1x@2wI7>o z@fQ|r5l*otbVv2?blTw*y?W7ii>rEy-G<_$>VLG`U%fi64!H>p?IZiwo}Ci_0Du4p z?BALiH$Vk{vVB!>6-y7h=dpI|8#@OA4GXX$!F!uzW^>kEmm!vY%;ZIw8NuizmV%Lz`9 z!$bHA9G~2w>Lfar#^HU;!qNh5Ha=%0j#Hs3kT`|uSn98FBfsFDQejf!7_?%kRr{Oo z^x~By9fcMwwQLPM#EVvp{QQ2F~bh4L7(*THW^x9HO*1 z`(UoI&a~0n76j3o!T^6|Ix3U{)EqFqx`m)L&zCc)li{1VBI$xx&$SwU%KK{E9@-@QY1(m#eK8#q)!L+Xk*m`UN)LXJ zyLg*x|Gpbb%_RC$AAh+zey|6{wSV6$olDL>+W2oHSEp~XZXLNxY8MSO(dI&N4wb9p zvg}PiL+X+^Qvx*ozU3y5Iu-jC2yfFT@nPq(8pM)O; z&~JGkYdA-^Iu@mO)2@kw(dCciMNwz2ixXA;@XNygG?6u z2%78cll4JgluVjITdBg~lZ6M`r`fxKFX5Ll5&h`KUszyG8gNc1^$DA{_-ZMUmf(6N z2alOwFLXoMNE4K=gy?niLk(#aDxHK^RLK7q#W#dA>6661rIGkKnWHC!r_3Y_(v!5S z$`d+(z7coa1Z5u{fdv9;5q$%qGiX;Y?ro0U>3k5rz#{1o7`MGDE_^y>V`(u>A{CwS zJK_y2SwBeH(T9oa8Oe+C5HwVmB%|VdC;qN7NsfC8zrc;YKfVr6yC>02SSXN6Oek?2 z1D_jq;2eBPV{p6|HXW4}NOA`p&sXpeayY>WjK)2D6&>qsX?uECAsZ_xAib~DdPJg6 phQyRwPe>A{`lR=3#R(E5$TFX;5a+#nS_l9D002ovPDHLkV1oKH=b``r diff --git a/res/drawable-xxhdpi/ic_visibility_off_white_24dp.png b/res/drawable-xxhdpi/ic_visibility_off_white_24dp.png deleted file mode 100644 index f88d24ff5ff7cb6691bd23c233a2cadb03254e0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 919 zcmV;I18Dq-P)%h`-4Hx)amYvRxre- z4yuFdpgL&ifm+;b?V$r|aR)jEkJKASOd3qk%@C6Y7qpI!vPdH=W<9$&$Po^;w;io% ze#5H;#iY(Gslh@Hbgv)u)z|K{zjE%8};qv+{b==31%&1?$$B z#J9H9R5>VEujVA)vs`h|z>p@o)KukzvIl`GNPK3&N8+LprJmXjiBiX&31>%Yl~ENd=^7ec}^WTeS!2W~u%$cM3GjH&792Cf|Y= z%_iQwf0gP3ll2X{M!Ls!%9H-EeDw39r8}!H&??e(8gIRVq}ik6QioI%EYusQ*@x0S zBnSmbFGWASPr6rn1MMW&o+9rtiF8LsmtMXQDgO-RT%j+}R6djHS7W2g z&+dh)NuQ)1egq3?m+EFgJgd6eXa3dh1D$1){xM(fA?$Y2?JEClw>W9@A`kLUk*dr3 zH6tA>6ah83JVV;0CZr3CKT&LSrF1tNTbQ(NucZ7F#b_FwEZwh;HcIGaru7UN((zTi z*pR5hefF@VG1@d6Yiav=(gaA7hFAL5!Xmy>MF~=cpkSCQ29{Jry`m2WjuaG`CfoUL zU`RpHX|aX3`kxe(Hw!w;_lowdvn^y(UByX3B{R4E+@9D2zjK%U%=iDHuMAR9%?vZ2 zHSAz7hd9FicC?O#4eRBSn-nDl12r2LBLzc@6b$5SlqUrPI~zu%8wMW~Y@icxtLC8q t3f9*daRwa}tmj6}^^aQAL3PmJ%zx{}%V?bo;luy{002ovPDHLkV1nQ#wKxC( diff --git a/res/drawable-xxhdpi/ic_visibility_white_24dp.png b/res/drawable-xxhdpi/ic_visibility_white_24dp.png deleted file mode 100644 index 987af79f8b6e6b922788b3179b60ffdb3c2a6cfa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 846 zcmV-U1F`&xP)Y$Y`ItO4a50#d3$Dl)!vpwB9TZW z68|7natIf42M;qSRUYOJF63Y;<*!8n2k`{Y(ndaQJj)XtNP)zSBbh}PUUe~(!zCV+ zaSI<4#7EpjsYHol?xK@0I=F*ki3X?h1yT5%Qza}aSV5GQQz5}|6fH!pnIj|^?xPo7 zH_vhpM^Zy+s?=~K_wpP)=z6$I{GyQQ=)PkJRgweM4C4oMlPK^PXBE1&)QEyQHlSNZ zq4zi|(DZSKc)&fWnwljZTZt(~oQuUHE;AyH7aMn=yF+~7ZgjVZj>C;PvNmg@J)6}u z(nB}ju!=J!gE5x6IYf)ID~-m?su2hK@FtmFXRq|(ZOpi@*je&n3A!QT;1qr#m!COF z9E?CWUvlFFblp_Bt>eVWjKddMDwaRcmdr9Io2d@#Bz^Q z`)n*{IJNJ`a&7jBry0wUPW{zbRyehf!O}>vxVQ>ijZ?o7%hyirT5Ok#i`TK0I`w<7 z{E>G2wY?TDP_5)b1 z$+a+kgzh;XqwZyK@FKeRDUfU&%Ydc!NaDwSJjxbj1~##UN7z^XYLs&z=W{y`@^q>^$Zed@fs{)kkw_#GiGPki Y0k;+P7Z|;w(*OVf07*qoM6N<$f&zJt!2kdN diff --git a/res/drawable/ic_baseline_arrow_forward_24.xml b/res/drawable/ic_baseline_arrow_forward_24.xml new file mode 100644 index 0000000000..702e70c537 --- /dev/null +++ b/res/drawable/ic_baseline_arrow_forward_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_baseline_visibility_24.xml b/res/drawable/ic_baseline_visibility_24.xml new file mode 100644 index 0000000000..a3e222a2d1 --- /dev/null +++ b/res/drawable/ic_baseline_visibility_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_baseline_visibility_off_24.xml b/res/drawable/ic_baseline_visibility_off_24.xml new file mode 100644 index 0000000000..92c48569fd --- /dev/null +++ b/res/drawable/ic_baseline_visibility_off_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/layout/prompt_passphrase_activity.xml b/res/layout/prompt_passphrase_activity.xml index fd88069b91..372a67663b 100644 --- a/res/layout/prompt_passphrase_activity.xml +++ b/res/layout/prompt_passphrase_activity.xml @@ -6,7 +6,8 @@ android:id="@+id/prompt_layout" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"> + android:orientation="vertical" + tools:context="org.thoughtcrime.securesms.PassphrasePromptActivity"> + android:layout_alignParentTop="true"> + tools:visibility="visible"> + android:paddingEnd="40dp" + tools:text="password"/> - - - - - - - - + - - - - - - - - - - + - - - - - - - - - - + - + - - - - - - - - - - - - - - + diff --git a/res/values/attrs.xml b/res/values/attrs.xml index f4239b0104..4bc4d4db39 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -26,9 +26,8 @@ - - + diff --git a/res/values/themes.xml b/res/values/themes.xml index 8a8e9e240a..59c0ffd766 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -43,6 +43,10 @@ ?dividerVertical + @drawable/ic_baseline_visibility_24 + @drawable/ic_baseline_visibility_off_24 + @drawable/ic_baseline_arrow_forward_24 + @color/black @color/black diff --git a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java index fedb1649c0..475c097647 100644 --- a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java +++ b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java @@ -23,9 +23,6 @@ import android.content.Intent; import android.graphics.PorterDuff; import android.os.Build; import android.os.Bundle; -import androidx.core.hardware.fingerprint.FingerprintManagerCompat; -import androidx.core.os.CancellationSignal; -import androidx.appcompat.widget.Toolbar; import android.text.Editable; import android.text.InputType; import android.text.SpannableString; @@ -49,6 +46,9 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; +import androidx.core.hardware.fingerprint.FingerprintManagerCompat; +import androidx.core.os.CancellationSignal; + import org.thoughtcrime.securesms.animation.AnimationCompleteListener; import org.thoughtcrime.securesms.components.AnimatingToggle; import org.thoughtcrime.securesms.crypto.InvalidPassphraseException; @@ -76,8 +76,8 @@ public class PassphrasePromptActivity extends PassphraseActivity { private Button lockScreenButton; private EditText passphraseText; -// private ImageButton showButton; -// private ImageButton hideButton; + private ImageButton showButton; + private ImageButton hideButton; private AnimatingToggle visibilityToggle; private FingerprintManagerCompat fingerprintManager; @@ -91,8 +91,6 @@ public class PassphrasePromptActivity extends PassphraseActivity { public void onCreate(Bundle savedInstanceState) { Log.i(TAG, "onCreate()"); dynamicLanguage.onCreate(this); - getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); - getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION); super.onCreate(savedInstanceState); setContentView(R.layout.prompt_passphrase_activity); @@ -203,11 +201,10 @@ public class PassphrasePromptActivity extends PassphraseActivity { private void initializeResources() { -// ImageButton okButton = findViewById(R.id.ok_button); - Toolbar toolbar = findViewById(R.id.toolbar); + ImageButton okButton = findViewById(R.id.ok_button); -// showButton = findViewById(R.id.passphrase_visibility); -// hideButton = findViewById(R.id.passphrase_visibility_off); + showButton = findViewById(R.id.passphrase_visibility); + hideButton = findViewById(R.id.passphrase_visibility_off); visibilityToggle = findViewById(R.id.button_toggle); passphraseText = findViewById(R.id.passphrase_edit); passphraseAuthContainer = findViewById(R.id.password_auth_container); @@ -217,20 +214,16 @@ public class PassphrasePromptActivity extends PassphraseActivity { fingerprintCancellationSignal = new CancellationSignal(); fingerprintListener = new FingerprintListener(); -// setSupportActionBar(toolbar); -// getSupportActionBar().setTitle(""); - SpannableString hint = new SpannableString(" " + getString(R.string.PassphrasePromptActivity_enter_passphrase)); hint.setSpan(new RelativeSizeSpan(0.9f), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); hint.setSpan(new TypefaceSpan("sans-serif"), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE); passphraseText.setHint(hint); -// okButton.setOnClickListener(new OkButtonClickListener()); -// showButton.setOnClickListener(new ShowButtonOnClickListener()); -// hideButton.setOnClickListener(new HideButtonOnClickListener()); + okButton.setOnClickListener(new OkButtonClickListener()); + showButton.setOnClickListener(new ShowButtonOnClickListener()); + hideButton.setOnClickListener(new HideButtonOnClickListener()); passphraseText.setOnEditorActionListener(new PassphraseActionListener()); - passphraseText.setImeActionLabel(getString(R.string.prompt_passphrase_activity__unlock), - EditorInfo.IME_ACTION_DONE); + passphraseText.setImeActionLabel(getString(R.string.prompt_passphrase_activity__unlock), EditorInfo.IME_ACTION_DONE); fingerprintPrompt.setImageResource(R.drawable.ic_fingerprint_white_48dp); fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.signal_primary), PorterDuff.Mode.SRC_IN); @@ -316,7 +309,7 @@ public class PassphrasePromptActivity extends PassphraseActivity { private class ShowButtonOnClickListener implements OnClickListener { @Override public void onClick(View v) { -// visibilityToggle.display(hideButton); + visibilityToggle.display(hideButton); setPassphraseVisibility(true); } } @@ -324,7 +317,7 @@ public class PassphrasePromptActivity extends PassphraseActivity { private class HideButtonOnClickListener implements OnClickListener { @Override public void onClick(View v) { -// visibilityToggle.display(showButton); + visibilityToggle.display(showButton); setPassphraseVisibility(false); } } From 819494d1fe60cebcc893abb7df5e529aaede94cd Mon Sep 17 00:00:00 2001 From: Anton Chekulaev Date: Tue, 8 Sep 2020 13:29:36 +1000 Subject: [PATCH 2/2] Theme attributes cleanup. --- res/drawable/ic_baseline_add_24.xml | 10 +++ res/drawable/ic_baseline_mic_24.xml | 10 +++ .../conversation_item_sent_document.xml | 2 +- res/layout/fragment_search.xml | 2 +- res/layout/invite_activity.xml | 3 +- res/layout/media_keyboard.xml | 4 +- res/values-notnight-v21/themes.xml | 44 +---------- res/values-notnight-v23/themes.xml | 2 +- res/values-v23/themes.xml | 2 +- res/values/attrs.xml | 73 +------------------ res/values/styles.xml | 1 - res/values/themes.xml | 56 +------------- res/xml/recipient_preferences.xml | 2 +- 13 files changed, 34 insertions(+), 177 deletions(-) create mode 100644 res/drawable/ic_baseline_add_24.xml create mode 100644 res/drawable/ic_baseline_mic_24.xml diff --git a/res/drawable/ic_baseline_add_24.xml b/res/drawable/ic_baseline_add_24.xml new file mode 100644 index 0000000000..eb232541d8 --- /dev/null +++ b/res/drawable/ic_baseline_add_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_baseline_mic_24.xml b/res/drawable/ic_baseline_mic_24.xml new file mode 100644 index 0000000000..791b475704 --- /dev/null +++ b/res/drawable/ic_baseline_mic_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/layout/conversation_item_sent_document.xml b/res/layout/conversation_item_sent_document.xml index ce627e27a6..2145cfdbf2 100644 --- a/res/layout/conversation_item_sent_document.xml +++ b/res/layout/conversation_item_sent_document.xml @@ -9,5 +9,5 @@ android:visibility="gone" app:doc_titleColor="?conversation_item_sent_text_primary_color" app:doc_captionColor="?conversation_item_sent_text_secondary_color" - app:doc_downloadButtonTint="?conversation_item_sent_download_icon_color" + app:doc_downloadButtonTint="?android:colorControlNormal" tools:visibility="visible"/> diff --git a/res/layout/fragment_search.xml b/res/layout/fragment_search.xml index ae8401c6e8..18766af64e 100644 --- a/res/layout/fragment_search.xml +++ b/res/layout/fragment_search.xml @@ -9,7 +9,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" - android:background="?attr/search_background" + android:background="?android:windowBackground" android:visibility="gone" /> + android:padding="10dp"> - + @@ -162,14 +156,7 @@ @color/action_bar_background @color/action_bar_background - #d00000 - #66eeeeee - #ffeeeeee - #afeeeeee - #66eeeeee - @color/transparent - @color/white @color/text dark @@ -179,8 +166,6 @@ @drawable/ic_document_small_dark @drawable/ic_document_large_dark - @color/core_grey_25 - @drawable/conversation_list_item_background_dark #ffdddddd #ffdddddd @@ -198,22 +183,14 @@ @color/core_grey_05 @color/core_grey_25 @color/core_grey_25 - @color/core_white #99ffffff @color/text @color/text @drawable/conversation_item_sent_indicator_text_shape_dark - @color/core_grey_45 - @color/core_grey_25 - @color/core_grey_25 - @color/core_grey_45 - @color/core_grey_05 @drawable/sticky_date_header_background_dark @color/core_grey_45 @color/transparent_white_30 - @drawable/contact_list_divider_dark - @color/core_grey_95 @drawable/ic_info_outline_dark @@ -221,12 +198,6 @@ @color/device_link_item_background_dark - @drawable/mediapicker_item_border_dark - - @color/import_export_item_background_dark - @color/import_export_item_background_shadow_dark - @drawable/clickable_card_dark - @color/textsecure_primary_dark @drawable/divet_lower_right_light @@ -273,27 +244,9 @@ @color/text @color/transparent - - @drawable/ic_mic_white_24dp - - @color/core_grey_25 - - @drawable/ic_add_white_24dp - @drawable/ic_group_white_24dp - @drawable/ic_search_white_24dp - @drawable/ic_call_white_24dp - @drawable/ic_unlocked_white_24dp - @drawable/ic_lock_white_24dp - @drawable/ic_lock_white_18dp - @drawable/ic_check_white_24dp - @drawable/ic_refresh_white_24dp - @drawable/ic_info_outline_white_24dp - @drawable/ic_audio_dark @drawable/ic_video_dark - @color/textsecure_primary_dark - @drawable/sticker_button_dark @color/core_grey_75 @color/core_grey_85 @@ -307,15 +260,8 @@ #FFFFFF - @drawable/preference_divider_dark - - @color/core_grey_05 - @drawable/ic_group_white_24dp @style/PreferenceThemeOverlay.Fix - @color/black - @color/black - @color/black @color/grey_800 @color/grey_900 diff --git a/res/xml/recipient_preferences.xml b/res/xml/recipient_preferences.xml index 0b90fb0901..0dbeaf492f 100644 --- a/res/xml/recipient_preferences.xml +++ b/res/xml/recipient_preferences.xml @@ -44,7 +44,7 @@ android:negativeButtonText="@null" android:positiveButtonText="@null" android:persistent="false" - app:numColumns="5" /> + app:columns="5" />