From fd92359ccd2c709333e8a2470e28bf885eeae51d Mon Sep 17 00:00:00 2001 From: Nathan Freitas Date: Mon, 7 Nov 2016 00:19:06 -0500 Subject: [PATCH] improvements to app selection UI for better layout and error handling --- .../org/torproject/android/ui/AppManager.java | 8 +++---- .../drawable-hdpi/ic_autorenew_black_36dp.png | Bin 0 -> 546 bytes .../ic_filter_none_black_36dp.png | Bin 0 -> 232 bytes .../ic_playlist_add_check_black_36dp.png | Bin 0 -> 221 bytes .../drawable-mdpi/ic_autorenew_black_36dp.png | Bin 0 -> 369 bytes .../ic_filter_none_black_36dp.png | Bin 0 -> 198 bytes .../ic_playlist_add_check_black_36dp.png | Bin 0 -> 163 bytes .../ic_autorenew_black_36dp.png | Bin 0 -> 682 bytes .../ic_filter_none_black_36dp.png | Bin 0 -> 252 bytes .../ic_playlist_add_check_black_36dp.png | Bin 0 -> 236 bytes .../ic_autorenew_black_36dp.png | Bin 0 -> 1000 bytes .../ic_filter_none_black_36dp.png | Bin 0 -> 415 bytes .../ic_playlist_add_check_black_36dp.png | Bin 0 -> 325 bytes .../ic_autorenew_black_36dp.png | Bin 0 -> 1362 bytes .../ic_filter_none_black_36dp.png | Bin 0 -> 505 bytes .../ic_playlist_add_check_black_36dp.png | Bin 0 -> 379 bytes app/src/main/res/layout/layout_apps.xml | 22 +++++++++++------- app/src/main/res/values/strings.xml | 2 +- 18 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_autorenew_black_36dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_filter_none_black_36dp.png create mode 100644 app/src/main/res/drawable-hdpi/ic_playlist_add_check_black_36dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_autorenew_black_36dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_filter_none_black_36dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_playlist_add_check_black_36dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_autorenew_black_36dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_filter_none_black_36dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_playlist_add_check_black_36dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_autorenew_black_36dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_filter_none_black_36dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_playlist_add_check_black_36dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_autorenew_black_36dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_filter_none_black_36dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_playlist_add_check_black_36dp.png diff --git a/app/src/main/java/org/torproject/android/ui/AppManager.java b/app/src/main/java/org/torproject/android/ui/AppManager.java index 8ba26f29..d59eeac2 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManager.java +++ b/app/src/main/java/org/torproject/android/ui/AppManager.java @@ -53,11 +53,11 @@ public class AppManager extends AppCompatActivity implements OnCheckedChangeList setTitle(R.string.apps_mode); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - Button buttonSelectAll, buttonSelectNone, buttonInvert; + View buttonSelectAll, buttonSelectNone, buttonInvert; - buttonSelectAll = (Button) findViewById(R.id.button_proxy_all); - buttonSelectNone = (Button) findViewById(R.id.button_proxy_none); - buttonInvert = (Button) findViewById(R.id.button_invert_selection); + buttonSelectAll = findViewById(R.id.button_proxy_all); + buttonSelectNone = findViewById(R.id.button_proxy_none); + buttonInvert = findViewById(R.id.button_invert_selection); buttonSelectAll.setOnClickListener(new OnAutoClickListener(0)); buttonSelectNone.setOnClickListener(new OnAutoClickListener(1)); diff --git a/app/src/main/res/drawable-hdpi/ic_autorenew_black_36dp.png b/app/src/main/res/drawable-hdpi/ic_autorenew_black_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..6ae7ac8a806f3a84e784f369246850d77714b7e0 GIT binary patch literal 546 zcmV+-0^R+IP)2oP|z~NmafDv;6~Ja82AAsrcGa=Lcx6wZrT{OkYJWB45T6Ok;J1I zg8T?F1cjiHbJ|=ET)141@7=j8e`k9Se;#w^J@DOFB%|}3ImwxmoH@yvlbksjb#9tA zyHpJLi;ONe#wtfhc+%#UI6>k=mjotxi(EPT+@Y}td_}zZ%>fckV(x&i!t5+2GlBSjroi<9vQumkxyD?7Cry?Yls`yTU*{Y^`;k9T=5T0Om zq&IMeuyCr-OZ5q($B3IfuB)rN4>4)$!a{?K^$e3;eOt7+uG{=^+wU-`-0=hI_~^DP zOa|_FhdMfLdw_+08rP}gwcGxO$)!8~k~%ir_5~)t-0?TmvF)}`G5OZ$f*iW-V@%#R zxccLqx$PZHo;UbYFYE3aCXaOCL+#hqkSUBlyOok#_SY~l%TT`-W=|1>FWe2M*e9e# ziMUz8te_uF2_c)B>Qi9HTr?Gmy+Cy4X--puuf-;!vz0dG$7U%Josx;9DUFS@OqU^| z^Mm`TQ^E$@9CC(uQzlMDW{U|D=w2D>GfyImoJT@ERwz*Ea~GU)%noZzp+=RnOOPXH kj+{Ai=E#{NXU=ouKlq5r&Ww;N=>Px#07*qoM6N<$f>&(?8UO$Q literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_filter_none_black_36dp.png b/app/src/main/res/drawable-hdpi/ic_filter_none_black_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..7543f32295e583cc39d110e19f5483a1fd1bf365 GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL0wmRZ7KH(+^`0({Ar*{ouN(F?D2TK?{BNX} zZZxm+MCp|_Fxsw&P#;@{8sc>(X)c#vOZTrTLCuSHXAM24cPCEl+Os}!$ z-VnR5k}YBp=gRnL9L>FIi^Dn$JyQH$h4>qBv&^tMwnfrC;)0XFSB~%|m0Q1O)U_n% g$Rs*)%b%8)l{x<8`ytL6pwk&VUHx3vIVCg!0J#8OqW}N^ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_playlist_add_check_black_36dp.png b/app/src/main/res/drawable-hdpi/ic_playlist_add_check_black_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..7835899edea99e32220ea31a59660a976d46d7cb GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL0wmRZ7KH(+C7v#hAr*{oFK-t-6d=&@@Mthw zs(@CA<&=WdKrY2pjYG4K78lP_-~C@z;rmG^&7~p1rxF@ZCe28cmk7`LLHQN{<_B4_V`v_ UPU~(hpnDlSUHx3vIVCg!08$lMNdN!< literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_autorenew_black_36dp.png b/app/src/main/res/drawable-mdpi/ic_autorenew_black_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..39be19e4733f60baea680a3bc80e8e397e0c2fc3 GIT binary patch literal 369 zcmV-%0gnEOP)O^7@OJ!oIOe~ezPj$h787n?9;i`lOwwOONrx0B}vVyQiHyF(~ zV>%?1!Zcls=7r`yS4+^3;)zq|cXUDpC-e$4X6G8hQTuThgS|a4=*<`IlzFE@!+-G{i|IM`JRYXKB_{DS$LPq84g{p&glM3U|k0wldT1B8K8ucwP+NCo5DYa4lwDDbdeIG@HN zaO1>@-!T(KH%0mt{SKBmetpiLSl0#W6P8N+(c=|nD!q2dr8>>;&g@dVK;iNQY#K@2 z(|>18e=8nvMNFjc!ati8w-tX&ci8>o*IKcli7RU3e0#@(g(U(aQWNA&ntG(9m7@zJ woC7pw3Y4CTw|)I^fuz4=+lt`E)vC|AKU%NjS**m-33M2Pr>mdKI;Vst0Hf|lmH+?% literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_playlist_add_check_black_36dp.png b/app/src/main/res/drawable-mdpi/ic_playlist_add_check_black_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..92448842b50fc2c58ba7785c14447e69a0e51303 GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8mZytjNCo5Di>!=?4Fp;rsy|)g z6QnX{i)ZH~$CAQ}43wdkdu9 zIA`fiS`h8VD0KLji>&0=iiJ5dbW;!KXn3c28|ox`r#TyTt^CS-z39@>vuhYP0&QjR MboFyt=akR{04w@A{{R30 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_autorenew_black_36dp.png b/app/src/main/res/drawable-xhdpi/ic_autorenew_black_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..910746ecc4bc06ceff8bf2f270434d61868805b3 GIT binary patch literal 682 zcmV;b0#*HqP)d{TkLbpZ!DxzHw%1B3WQR+OO-mN6;7$d62CAk4xxTNVe#mUaT1fx zQyN%P?X$`RgLF|UR%aGV)F0Lv4%HaPnx4)Z`ofKl{=~aeXC~xuEhTQ&H!5M*kEMi8 zzvF_|!<1WB);3tD;<&>0aL5n3$xRiLnjwwWbPVG~{t;T&n?*XU>KH${PA(R-@6d+} z9ek0rS#qHZ#yYNSNZR{+>z7Fl!eqW(U^30>5WI{ghe_a4xv+)wJV2I zx?qPn9ibtV&N*U_O;#AEj1ovGI7ua9QzAAcVpAeEC1O(|HYH+Hy5h3(7y1P*B6qJ1 Q9{>OV07*qoM6N<$f;R{`3jhEB literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_filter_none_black_36dp.png b/app/src/main/res/drawable-xhdpi/ic_filter_none_black_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..4c6e500776362fc50df503b085e2f6704344242f GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw4tu&dhEy=Vy=vHX#6ZC1qP%B$ z#N5E1^_Izp`)Wm-3$D%9dXsRKBXGaohfPjvBNlync8u-K!vy8#{fES*_jEUHJ|fP2 z!}Cz+(WY;Qu3GbKdHjlx*)%3{yI|z@t&U8bDR)_fJQNzi#6N8a4HH?w&K>o+vCrVb zarRq>9ImpTicy>sKZ&2E)wtm^bDTg*+?y?mQ;xNJF|liyG_pj=e@RFzEr(jh8 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_playlist_add_check_black_36dp.png b/app/src/main/res/drawable-xhdpi/ic_playlist_add_check_black_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..ac03e19abfc714e97ba924b57fe4770076412b88 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawHha1_hEy=Vy?T6Ri-Ca4Lp5Wj z!_N0^F=VAL`e>oE+DYM$mGmFOk99B>FDHexj6m?B_BcpoL z(rZ(}E60LW_3xDnmsd9hGhVW`e`WDip;j>6C-dCRl2-zK6Y7eV*)53N7E`qHt?KfB zoSG}A1y7&!ZU)aBmdxK@zQ`<5zveF^eDZ+cq}j@E>-_pkxQ{!0DqM2*+(a{L_gimd jGJB7oP*hSf`oezVmbc!XhskC@=QDV^`njxgN@xNA0d!#h literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_autorenew_black_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_autorenew_black_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..2b9fd98af148c8642ee233a5e6d8972fc3a0a399 GIT binary patch literal 1000 zcmV>P)PUQV0~p@+gn2vUTC2g|_L_R4GX6rd{?gXd7BVx)B6j zbXQ3bVhsv!C6X1 zC=acwiB&bRswP&|#HyNDRTHafVpUD7s)*Vsf4ZMOv2ANnrc6GeAgx8 zXHKTuK_A$4f&ZM5l+Qfe+i{=yv`?v~omzi$I{3L_g@9C@HDRCA!B2u`=&+AqTtOT$ z&w%96dWP^`xPEKPxnvAXE-hi5IzhPRT;N9-m|R+d@DTy1JGJfvA|nE6XauePZyf z%6kuwR2-+eXNkcDmG_Cy3gm=iB90P+F-JrDCf>NH27f>-epI>Jc;l8D{5r8%P`Pj5 zjU~rdi^Z(U{T1F=Rf9K)#oH=(7jHaLgHI5PS5@xc@rGXPM~TIV%Kaza(3h+gV)3HN z{Ty%Tz2pUAQPuTg$f>xWSR7Hgdm$H(abltSigmp4lN$UjVsR?ua=#R>1Xj$2tnY7H zEvepDga1G*RzsF^Q;xmlFfkZIR7~NG5`}raiz>k~G5Aj9UBoLNI(q2W z3C*OV=DCDdjymeaPYBH&$LBnTXTDKMwx|-4akgW;wR-noDgI(Q@B#N1h>A0Kr_66T zwH~q;S`MuZY6RfpoLa)*9CY5DUL^?o*~q0O49;DL)+R3zh`C%^;{Qt67yIbs(2^WC zal#s90#eSQHJI2r=X0h$O$vh6lK(sjg@qz(3E3Rvu3L*PwIXX}i?w!rF#VX_KxLk zv64bru9IuHopLW7zSgoTir*@zd`I%@S}mumYuT@sMEkC`^4R^6~+)84T(EmrbK!Ulid+fE{859dt# zdQ^k2S+al1ntVG2w%?2Ae)_vLY7GO=u{S%^eofz)`eoPdL}#%z*8c-e&a!NNGX35o zkgI?Wc5) literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_playlist_add_check_black_36dp.png b/app/src/main/res/drawable-xxhdpi/ic_playlist_add_check_black_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..38b8b271dcc72bae4881e6734dbc5fefa0b99bcf GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz0wh)Q=esd5F!Ff1IEGX(zP-jC$QH=s`tU)5 z=!Gc?J$#1(oQyxssC)S{`kvprIl|08jdUGd;NZ#S85Rc`7@664BsTmM1cLeO1_?lc zXq&|4AEmbY8EkapxhNy#ZDKtwqfF=Gn}|h{8%@OLt-1X|KqumA{LxICqnWDNc0Szu zy28${YR^3QHe>n6NgL7*UE00>=*@d;c6WSDOv-iij&RpLAT%wbbxqX`rEC1RDlJzt zEXzyI@w7e}`TB5Cl;!G8bFNLCdf}ey>*J>~C11y_$=kARP0zLIQ!hkqb}>#`DeVun z-}0@a4*#r(wY$Hibfz5_I@_l@OW50FFVdQ I&MBb@0O)0hzyJUM literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_autorenew_black_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_autorenew_black_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..5f614e441069b2eb0fdb388a5f18a8ac5662f558 GIT binary patch literal 1362 zcmV-Y1+DstP)Qi1s4di)b&Ry@>WA+KXr}qP>XrBHD{+FQUDO z_9C)q%c8B1-gfQo#maII`*nQxmnYfQ{_o3>O*T77rLf#EEESHAm>Dii~P@qBgeC#~6CLI8m7{ z&M}OhElyO=CT=2EaiV&*GKAd4i54?}+{J;Wa}vdQEdS#7IFF@~&rzJm@(S1DJhs<( z5a+S2;1Oc{J>d%7>|_0kNM1tD z?vpy}n!*%9^1OLVAax_i*(5?zM$X1aT@^Vi5t2satU~H4$k}s*q#ZfCN9uk<&R!%W zGm*0)Qa6O0y-G+rk+U15?lN+=jF7BG&iY8*x5(KCgk%?T)6Xf@O{s^Hsikw}~_srlnB|=cg z9pvl)nOKXA-XsLekkLvq(PEw%oFoLNkh4*m$jJBR6_e@Y?PZ3Mv-2U`Z~cV49Sq_6 z%M>ce*+ZJhQ#+5$-x8b2&^O50N95};GU_2yOYC`ayu#VZ6J)fUj9pJ<9+6y$3&^OS z5*b^c$~+>u9ms4wnXBVw3iF7h<}-qf1}T$+bt%jvl4)fKnQbN~7bkokkwhcC$m|+* zprFqeT-uj}pxD6|$q7;Q8lCK2RfPksbG$T7Y>H57bI8`p3G8 zHjfy;`3!mHIZ(WL#Q2ohLB%uAB^ru1kMM&|E+9{L=_ukn!l#|XJVBlwGOu{^_y?N7 zK^`G*6_yrt9^qEUGEOm!{88mUg`CG2sEsuoWHWU*#fkb^?;a;k z^q3x&Q{owMqEXJXg%+L?C#rIt1FWP8TMbQA;T}WWppPDQvw^vPA0|%Z5hwD96Gfhh zBF{vTXQIe6QRJB@@=O$YCW<^0MV^Tw&qR@DqR2B*v4dH+r!Nh zHa;<3%6X)kqlJ?%&Ucl-9%k0}Dr-NmDVZ8At~{)xkl(da>)z8j`@=prRvbNQz+=3* z&z;R~rbh3ZV^g`+zvbNP3lH;J9Bp}db7J|KDaXu<6Bf_=;p@3^e$Iuv@$*co6?VuP zt6o&Ia;jdca@)GGbj{0#u&P5GT zg(37+<-_KQOC@KtPHa?`bzqplsWQQV2~6aI7%Apnr&>!zSKM=5P^I4Z>TM+Js&cUv zap!dc_BK2Ge-*jl|DIybko^#xl9qPOt)4;4={DcoSgTe~DWM4fOX<7G literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_playlist_add_check_black_36dp.png b/app/src/main/res/drawable-xxxhdpi/ic_playlist_add_check_black_36dp.png new file mode 100644 index 0000000000000000000000000000000000000000..25426909185ab70b83bd5c3a65d58822bbbeda80 GIT binary patch literal 379 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q1xWh(YZ)^zFgkg zYhKj?&i~r$&8B?1!kp_+V%@NuEyF5M(BJk#$s((Hzm^G?o-m&K;%-}Cg_*)G-~I2a zR8~E=G!1OGx!ifIZ0@Ve@lGdcX#4o&X-(DJTgo7yRx4kP|W27W#++ozeE;r`1GCWjXa