From 89745c1699b979667059760408cf86c0171f91da Mon Sep 17 00:00:00 2001 From: kenkeiras Date: Wed, 24 Jan 2018 22:19:52 +0100 Subject: [PATCH] Fast stylistic cleanup of deck view. * Bigger card names. * Gray settings button (instead of black). --- .../minicards/CardPreviewArrayAdapter.java | 10 ++++++++-- .../main/res/drawable-hdpi/ic_settings_gray.png | Bin 0 -> 1196 bytes .../main/res/drawable-mdpi/ic_settings_gray.png | Bin 0 -> 803 bytes .../main/res/drawable-xhdpi/ic_settings_gray.png | Bin 0 -> 1541 bytes .../res/drawable-xxhdpi/ic_settings_gray.png | Bin 0 -> 2379 bytes .../res/drawable-xxxhdpi/ic_settings_gray.png | Bin 0 -> 3188 bytes app/src/main/res/layout/card_preview.xml | 4 +++- 7 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_settings_gray.png create mode 100644 app/src/main/res/drawable-mdpi/ic_settings_gray.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_settings_gray.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_settings_gray.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_settings_gray.png diff --git a/app/src/main/java/com/codigoparallevar/minicards/CardPreviewArrayAdapter.java b/app/src/main/java/com/codigoparallevar/minicards/CardPreviewArrayAdapter.java index 6b0aaf1..28a0997 100644 --- a/app/src/main/java/com/codigoparallevar/minicards/CardPreviewArrayAdapter.java +++ b/app/src/main/java/com/codigoparallevar/minicards/CardPreviewArrayAdapter.java @@ -61,9 +61,15 @@ class CardPreviewArrayAdapter extends ArrayAdapter { CardView cardView = (CardView) row.findViewById(R.id.card_preview_card); TextView nameView = (TextView) row.findViewById(R.id.card_preview_name); - cardView.setBackgroundColor(card.getColor()); + int backgroundColor = card.getColor(); + cardView.setBackgroundColor(backgroundColor); nameView.setText(card.getName()); - nameView.setTextColor(0xFFFFFF ^ card.getColor()); + if (backgroundColor == CardFile.DEFAULT_BACKGROUND_COLOR){ + nameView.setTextColor(0xFFF0F0F0); + } + else { + nameView.setTextColor(0xFFFFFF ^ backgroundColor); + } return row; } diff --git a/app/src/main/res/drawable-hdpi/ic_settings_gray.png b/app/src/main/res/drawable-hdpi/ic_settings_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..efc1de5bafd931c68a6d2c15117e2dd4d25f053f GIT binary patch literal 1196 zcmV;d1XKHoP)H5giq$XuALa1U*SaK~!ko z?U{dQRb?2*KeJu!hpn3BTAOkOH)>hZqJnC>f4CO;R|Vqy!4Qka5W^T15-+hH7#T}S z26Ki)Y(rdGV*R0^t8PIQ;kDM(x~s!404vUoXxD|`F&7TaDY-xaF|Er2Y-2I`F@o(S{zuwD!*y{1C?Dy^#1|0 z_%fo|2U52(*LA>6YF@AvD$Bx%D;sEW7Dm_|jA|A=MA$=z#4;jtSkFt8cw`=?g}3E= z#v)X?hOaxs3$i=;++0@EKxHzrPTsKsQU%1B zpW+y$n+_7}WVz)We8f|f(79+tW zXOUx)+vFD=(0qQfIQl-JUQRje(uH(VZJcGCQaP(x)bcYmoHk6fi&`ffkRfX5G0bv` zWvMt$+rEh1L=37^E0ZpYGQ=UOJhSvtmpWaJ+g=jXIG>?uYp31~2jl{48TZJth1yIU zoR)C(QuO0UKg*e|P1P!Uygh5+VCi=q%AsStQh4z?&r96qi;7_AMI#F82#KQ zA6QCQIfiILM^ZPs%d`#BrwKL7kA5_DvBn=W-qJD4%pO2DX#5Fdpb?F~z#q`mzwtT7 z4QN#3FEY+vY?;{uNLTPmW1vdQ%&ym^33uXD<$DNWvYt91~^bnmkPPybQ|D6gv07VmkOy{7~*QU^sUViiYK8|^Zf2Ght!s|$B1U2$aII@;J^E%N(_F#;4*$r9@?-*3os zZa{^^DGabv{7PB6gv}6W(TT_ej|B+SBwu(PjP3LXhVv~uJWpzwWK&>3o8*!~>yU%& z3j}A6d}`Xun)q|ZasJ?W6<1` z)}cJVRS(ikXQsSROL>MTI7GemhjS0L)52ztA+N~G*%tY37SF@hq5 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_settings_gray.png b/app/src/main/res/drawable-mdpi/ic_settings_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..3331058af7299a16df370e2dd711f2bbc453d61d GIT binary patch literal 803 zcmV+;1Kj+HP)H5(y+w?*#w=0<=j)K~z}7 z?U+qSR8bVie^X-#*$1|8rd?1DgtZ8gBs4LN3O7laltC*E!Yo?UP#aR9gA5(7;;s)Oqvnd%hV5GV-kM`M-1j=bm%#J?Fg#EAqF+ zzl(aZHP-_`rD*%H$ppnDWk?F9&uhh`W8LG$z;5|EJ+Q~tX>oMw2 z(p+T0Y!#H7whok^2pLPfx|3wfC%a9)v1EG4Fy$aN0=0+NZcB%w{32K0SRzm!>QX`v z9_n-{Dr2wXw2xdNhjh}}Nl;sx79>v{of~@R!7*l7V>_jZYMC;|ee|ij)Kg(=J;RtK z0%@nvc3n-Jo~Qp~J;_O$ZLB|#FCF@0n#B_eG|35==?&}kMDSVQc239_n`0_b4iK_T z3G3)VCJ0-=+myu8Ya5OljVlg0(r?pXo(gd1%nkLjgT1PZNPErp2MXG*cxLrqwra+@S@P%-v;gOdWUXUKJFoFwckp z0ZOUSu6|C^7WztTKj_pZC>iOHLft8<)t%!cWR_a(CQCPsDRIysy>|B?$i$NAe{d~U zU2QtTQ~PHrjsd3ex}Y>$U6tofr6R;TW7N-id>rGmBYBiE{9Itb&&*z@7jA002ovPDHLkV1kGsUE%-$ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_settings_gray.png b/app/src/main/res/drawable-xhdpi/ic_settings_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..fa86bd88e49403f9686f30e3d09959477d4214e9 GIT binary patch literal 1541 zcmV+g2KxDlP)H5jb9>y!-$F1(r!fK~#9! z?VD?CR8KGfb8po(ZV-?4c_FF+QP$jdH$~#=|V- zUW>zvGFv`tWh<4(DPmYlWbCJxobgIvK8r8<-~i>6$!{&I*}TCR4-xPIFUY|QwhAcV z){E9(ltrEhs4RY_Lz|D!vzbypW*jTH&SMZaP{exjDPjbvZC0D;`R`#l%T*fl#SZWx zl~Ii1cW(CKDZHL_2`r`aGUKg1p!!qoZ^vLIgA+Z<3E-&|s_7qquCa!^_zh5^_rSzJ zz=sHvEIgnxsP*rK?@{W>l~Zm#FfTChA(I6zJ)pYsBWVGep8Um~vd@hNmIVqvT*Ip_ zJfI%rbAl(2$frgGR4Ti;JAed!;GWiXm~#jfdWIk43ubU1T}UI1OolL%t#}<~^=7J> z2WrXnu+4eODVARx>~?1klRb4Hb&_jR3!UhE9XoU z8kGtLu-9;tayRfnYIw^u z^DrPje9c%zzM~(TjPic5>zIDY=)LeE5&7Q3Tu2%i#X_1j+kEMi_cfO5sM4r3GoL5q zWMU<497;@ts5bxDCEdhQElc!QQDzTPre^(XD+0Qql~F%pMxe9yL9;3hJnrg(fG(Lf zSP?j`Svd+xSz`h!i}eh29Tb&}cHX4T;cVnl*Ve0e+Nmc?adhuTbg{}Sm5i0s+S7l}0{%Z~ zb!6Kxb&A7MOZYIH8WqvRe$)~^+`b`n?x1i8ma>Uf4i)+>IWpoG-8(>elydo8yfkBw-YQM^bKSpOREy!`RJO8xsJn) zbG*+mvU!SQp1~hw4B6zf0jKMclg#(j6N8$|l2#d^jB;t27^p5RXPgK46-<{S7rKxF z3b^f}^_jBFD}glj(5)pJw@^Z*v>LXnArxD*KTyRS`KpzzR32k0`7M!AM{iw=Wb(7i zJj&=m1#im!xH>~wNH5fA1b8S?-D2;50TK~#9! z?VWva7sVOJKZKBw5J5np7D12@p<_%Cl$X(lw?dV{sz5q++7d>a;Ix1VDztTFWQl?T zlWJQ?utH_DRZ^U`Bb7QWZS2H^Hxp5W5ME{q0zn`RfxIB3e;CqflHV`8cYBxQ*zbQy zp51-!bIh~XB$-Sr<(d^?uz6o7`cV`&>f z7LWzh(E$1UnimmVB-%v<^~B1{L5`rCUEzT!1_k>Oi|+t6SU{Z_(6A0rgN+~yD5$S_ z(S-}dxU8g(Sa~I=5j4Ox9*AaOhmRmJm{pA7FdKMF)+m>{fuE9Pz~^6(El(@A8bc~` zNuZc4dBhh$B9^_}+W12yuahhHwOM8WOL){k{CuSvUS*{`-e#*K$l!%TT zGfe)+iwF{dzymk3)Po2T@q9`Y!O$fVeGDboI>LxhbD_{ymTRUjcY$<_EaG`b5hVI@gzG$ZZx^|24mGwG*E5?8MtST*HA6zb z?!!gUWRLOeVTpV{oPn%lJ?q6ZR*>wWA8}0LZ6}>{wTDh!WIlI=$J2yq8>4xGS`WRc zarTHsQOar+P(1BKahE;>|%4LwD0*B1qOVg<=mJDrCGa9*}z(Pmu@S>||27 zw^-QkAbFf`vd%c3Z^?5`3d%Dc+^}5ky}D@Re6X6vT4U>?`x);HPt%*V(Aa}k%j0sR zfzdpOk!)eGk*@h}{fDcWFLzLEK5MK{e6dw=!iUIh<&b5e7i?h={uSNbhEO5&6+ldt=EXc7;|bJ}0kzjK1e zd6w(fHSM<>A0p`1c$2ecoC5lqcIRkXr5=0i5>Q`F`!eHz4rton=r17Ma}z3z1JbRr zm%o5?Gd;{tzMa>!kMNM@+jC-y-Uta4kpejv!^Qq+hJoeZnptG9xw;2bd zTjObe0iDpaPcjZD$zzXQ0y?Q_KhZd#Nt*Vjd;}yGF-x<^IAL^Cg6P9o%_5J8g}wk1 zapEmjX`fsbO{&rON!6T9fJk!08zR71j) zG-D6gbjLeE64@nY=oC=TwC~Dt7Q5OdUBYM+2a||M_BfpO{YnjFvs87*k75Lg8+eZ; zE;o@U8#=>ofh#=Fg=g3*`WTELF`7RZId!FmF>x(Fdl$nW`^5=A1;BaJ9|AkN~DZgx_yyIX0u1$d`8mMecF0`&=k*3 zT1jAsSSXYe)J3GoqR2CEMliuyCmn-#>P`;3#C?jNg}YhpX+m&}vq!8qN3|#Cb+v~) z-VT*gCHjy`y65|+D;XSmSu=bm{S+_az3M4qJEa_;g7d(2jfv!w7^^)bb)rm}EH5O@SbaY(R@}#P%@{~itxs*8W2?(GS@*P!EoprHn z?G^csspG6rH`X{+p`bqHEZ+$LpdZWK>c)CY&l}mLXnBPlzFzbWRFD4qkT-NH)&e9O zP|1)u!E%PkF+Awg7x))EAjdG2=M}nu1{O-KOwFD`mc$kb9s}(i6+ozI?;iNN%tBc+HNtSg!00J?Pml#Vq8$utm z-Abw6Ea7PbcwS(o`sOOpo!O*u3m>vrey-n`zyB3s0LKhe(_dEj=d-_C5kBXl>pH6Z z#N#s{*}x&!m6ZGY+3ojcmU0Wo0lh4Ct84v&gFD$v^{=4IFk=!6Bb- zXglm#J=l(=I|ZQfb}VfHSwPnSAlnDEp?|v=(N{T{(dlG>RR&QxnSK xGIO*K8>wU?i?On@va+(Wva+(Wva-4c^j{kyLHaVHOr`(;002ovPDHLkV1n0RYK;H@ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings_gray.png b/app/src/main/res/drawable-xxxhdpi/ic_settings_gray.png new file mode 100644 index 0000000000000000000000000000000000000000..f8dfbbffdb6867fe59d4e0d3750596814c08fc1d GIT binary patch literal 3188 zcmV-)42$!LP)G000002VoOIv0RM-N z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru;sF>H5H_Fypt=A63mToPKD;ceM$Mx4rJ70>s;1 zcUA#Z02M$5(04%6yP>85Wi$)Ha3#&9QX`;loEr-L(3noz1jXA{cUA%7ZL7Pe02%=* zfC``jxbKFV3??v?4AwAPmRVWq%MzN0RNKQ0kmXk1_2W+Zagdk!jg%xt0MncTdRG5g z#4P5>zXSCDZ{U7pCr5$uusDxba=f__~`T zlgZB*%_S%Ou!0L@TM`6#k(+AyxRmF~lXYoJw__S3VtNBU&p7#4TF-ir!_Bm;rTpJz zXzT)*D=F~swGHI+mlI!GrU5xjAv4BK$N_Shbz);=G8oC|%x20H!rtI5SX%3mKfS5z*^h&S?S4?Wc?Ek8316DG>e8 zCUNw`wSnk|(|9zd2r%dIG2cQ_$tChh91-xO(hopmrpM3(nQORCxj%-1Ch&M5U=w5- z^ATN@`D%Phcd3Xn0>&u)|A+5$Z-fzG+Om~4%K8bz%r3G!stA~@^w&Tpk4F>%<_Bz` zkuqKbRrE?f>F6>7rYrqv9_9euQQrcX8~CAeod*5P$dH>L)0CoQ9&|_ucG6YK!i<3N zN`I|rPi}}2V9sH4tt&(dD5tCJ2rB{}SNiKjbEbwA0j3wLlAK>CLFg|loC{zYP)Kj( z))O|+)9cP7?@ds)((f6Ua+~7_FfG`^Im)bOd`XwO_d@|R_Gs{d#L$0)b*!L>&FrL@ z5}+lSwC8-f(Vwh@jMC3!5)++8faye0NXLf!pn_MK#}X;7#nV;{B%AAKk^pZnl&!8J zU}Eg_?_oN5b?-iquUW`Kb2>TPOWRmIZo&jcyNZCdk?-6*9wkiXX@3KJFfAC%gS3dz z?+@i-SG}Op7^|^>t}@jx{UD|CINewjqvxJ{_9j4F)hOo<87{km7MGnej2sTe3=mI| z=VvbHcAk!`H?)x}WuH59rY*}O+s9GCSjl%h5A<_38;S43 zWsUc*`-Z#uIUHa!H@`E$M2BkhkpDH+zZN6^J&5rp-xNxLf#0&Y{Bl- zK8A!!{}gWZdw4b2#;og^<1n}R3H^Q<9v(wx5ko^V{WZ7BLjT1AZOoEI^yHIJs!_r{ zp+2KyDGSB!MtTLIpP+Mx1^ZHS=p4ei-bvv!Kh=I8ND;!hv=#)urkxbrXQq~ryQEw%>Wzvt+S;_ z0a>hcRGA9$A{i*n#8nF8LN2vSP2wP3jqKtoW;&_Pt2U<%eR#Z&*PR%e!Bz6Ptq}+L zf}}#mFp6?(L-U9VbFD3uku76gBm;Mpuu0}x-&0h{lE?&D%n?fqQ)RvzSKMXHI?J;B z`r6id9XCP;c+b+rcU<}6P5|3o6Dx=k%Pq^dOP&C>&qTC0-EE3F-a`<;c5t&fQUPp# zt!?rIusyc7Gg1L|Se9>{JOOMsfD}h6fbFlfOr8L?b3!HcN`NNG6F?EO0Ed$j)Sh6Q zr>-J-0+hx~NwmLKk~{$pSe9=esQ?`;%YT(T0c>~ioFAzGw!gMFc>;W4S-xAO0(6VH zwjl^$J2T!tQUPp#ZCCOHuw9zWGOeOw-?Z_ZY&IRfOqc-XHpW|;XvDzCp8rAC_0Bb; z5+i_VYGyIp!M5G($ON$erRK~rGmV4suzm9G_AKy}=Gx2P=Ikg|g-u&Nca(5*6&A-w zoJ4^65$he%4^8-aB+vgCXZcQhv)-g)i~y6%V@}WI?xmB2d>+lTWP89Q#V1E4zm#b< zufCua$xJ=R-Hs>oGAJ$xd1*3rzvG0n4H=Z`o_eF8BGL#j-B=jPiIY;gNr+1`rV|@O zxua<#!(>Zj?*KELH6b1NX~FM84S*RTU6IwDwdVRrnjq6CHI?ZhrUK}i`l4WcNYDS6 zp!sb*peZ9#%~DGXs{9r6o3!r?UI;yF;z9bz`ytSODTOo*+4m)kl)a$|U@qsSNDjK~ zqOa_5On)Z|IXeR1cW|Sh^sPSL0VaoKkP~<-^JNXC z$o$Iq-gjqOnupjJ+oSW}i4|u8tb|xA@)+CAB;$GeuW4%@W;>HZyBOLVR=Il#cVJV@ zl>s=+Ys_P@)UpA_v|$k0T$6wcwn{nQ%UXfgZm2McWZ($zv7Ak8W(UO-1DRyf;aJ+r z9*Nm(X=Jj?aX86P#>{OJTFxG zX)*7iO1brbqkb~J_z*zWF-O_;fZ2W~)BW`s9*FoLQGLV#9`y5dUn^n-C8?tk?q92) zcu?N<^L4+y=IMN@9M^&^%&M|EM05oUpZpDi#IoT7S;3ZGPA;cXYA8saF72 zkWD+eo+0c>4E=i;EW>EWC<=X-eZcNio8>W8(~vb}dHnKM%q3r{yRYUfW-~Ye^uNj- zQXR?WB1V(#IVap|`bbrb0)Xk~DdXpA@_0dNq&GIVFwNVewVX3gC`gj%T?)B%wb~s^DL$ZIow=pCa<|-ov^@# z0PWeFX5ZWf@_4T9Yi&#~rg25Y^eDd*W|Pj~X61h_xIv}P2ekGnNz8COe1LIeQQobe2$1uJ=0toBlyo-FmYu{!`tNXZ7vF2`+L zMhS~}N}S9C#PRa0tCAmbQCLlnWF@V(Nle_jtsYuFr3Bbo4=rm1XauMLDu4>$2A?^& z66>UsBJza_-~m#_KSME`$X%_;ygy)DJ+i6-r~vh)zrIxk& @@ -46,8 +47,9 @@ android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_alignParentTop="true" + android:alpha="1" android:clickable="true" - android:src="@drawable/ic_settings_black" /> + android:src="@drawable/ic_settings_gray" />