From 36e0479967c64bdbd5e9b4fc700b72f779c34e69 Mon Sep 17 00:00:00 2001 From: Jeff Mixon Date: Mon, 5 Oct 2015 14:32:10 +0200 Subject: [PATCH] Refresh layout of AppDetails screen This change primarily affects the AppDetails links section to make them easier to click. It also strips down the UI a bit to provide a cleaner interface as well as some modest Material Design tweaks. Fixes #389. --- .../drawable-hdpi/ic_lock_24dp_grey600.png | Bin 0 -> 622 bytes .../drawable-mdpi/ic_lock_24dp_grey600.png | Bin 0 -> 380 bytes .../drawable-xhdpi/ic_lock_24dp_grey600.png | Bin 0 -> 785 bytes .../drawable-xxhdpi/ic_lock_24dp_grey600.png | Bin 0 -> 1186 bytes .../drawable-xxxhdpi/ic_lock_24dp_grey600.png | Bin 0 -> 1696 bytes F-Droid/res/layout/app_details_summary.xml | 149 +++---- F-Droid/res/values-v11/styles.xml | 4 + F-Droid/res/values/dimens.xml | 2 + F-Droid/res/values/strings.xml | 3 + F-Droid/res/values/styles.xml | 20 + F-Droid/src/org/fdroid/fdroid/AppDetails.java | 416 +++++++++--------- 11 files changed, 298 insertions(+), 296 deletions(-) create mode 100644 F-Droid/res/drawable-hdpi/ic_lock_24dp_grey600.png create mode 100644 F-Droid/res/drawable-mdpi/ic_lock_24dp_grey600.png create mode 100644 F-Droid/res/drawable-xhdpi/ic_lock_24dp_grey600.png create mode 100644 F-Droid/res/drawable-xxhdpi/ic_lock_24dp_grey600.png create mode 100644 F-Droid/res/drawable-xxxhdpi/ic_lock_24dp_grey600.png diff --git a/F-Droid/res/drawable-hdpi/ic_lock_24dp_grey600.png b/F-Droid/res/drawable-hdpi/ic_lock_24dp_grey600.png new file mode 100644 index 0000000000000000000000000000000000000000..f08cdff0fdb9434814da134636698832dfa0f4aa GIT binary patch literal 622 zcmV-!0+IcRP)+rfK2Tmj)|poWFlzwr8Dm~#qC|8Ezyg5H79xY1_i@S#NJ@DNz&R`SHVA^_ z?RNY9paYFYV^5l#&rVv&eeY_^uP)~%@m z)$4U-jJaZ)E->@`9EVP4fww?cwbp6|H0Xeoa=H#xtJO`FN`(QO1+dk{ZikvxBD&M- z_3GVj_xncmBSS5vTn12e5b-V{qGhf1C10SgQ*>rndzG2D`2rd5t$RGc%p0E0xFeeZ z{rqN)a#>3G&pPyhh#qAdGsc_%u-hd{MP=xD6h+6BQr|KNrPP)rNuB^WoCj41P@1L( zJDpB8u>D@OT5UcEf|q{105!fIG=JE$)c^nh07*qo IM6N<$f{ZmEs{jB1 literal 0 HcmV?d00001 diff --git a/F-Droid/res/drawable-mdpi/ic_lock_24dp_grey600.png b/F-Droid/res/drawable-mdpi/ic_lock_24dp_grey600.png new file mode 100644 index 0000000000000000000000000000000000000000..bc3a040c814cb431bd31a89bfb1a3c7a072860bb GIT binary patch literal 380 zcmV-?0fYXDP)SMdIXzS3%e;&rAm=mu(t6C>cbmo>p9dkBAD1j90^2- zdHH8Bpt#KzJNx}+z8Q82BQNTsueClTq7wi+Mf{zJoLXxyyY6=aj4=#A7eX(^zFzE> znN1s{6;Nb;0pLkQj$PNi&c%`>*(aiN0GlFm)K*C=z!-A_U{^#AthI}BrdsP65nTbe zW#+x6D!Kr#0NxzO*$9H*y(|(0!AhE@&j41Ld2J{_i0C1TqU|~X&-3m@WQ&;_6YZ+t z=K+PcX8)lvnrNIZm=0;>*iem0000rP=uO>jtDTJ$sYiPhTTgFiYsX1U8INzegL8X5yG1`P1@Lr33#42#mvupfSAl*+z))$E+p}#w-U@erL}&ML`sPX z2qE4O(T(n<%si>JejNpb5aKow?M)$Oeyg><8O1lVCYDmx0h|s4?lhat(XQrgKuk}R z%jJ!p#{Q+0s@VJnohPnVrF;+IddA?QhFexjP5jH)N|h1quQw%TZLIkWfw~w8qRcuIsKC{EbG#yx?;H#^UlB zMh~pD+wJlB`T5OWu(PwXqn%FYV_Xu4PJo#wwARamGA)EKn+fx>NB$0-fa5qLzV9~% zA@qIU4T4}RGI{_7fw*Hd_Ywk-?LfVx3Ux0 zkj*9m4^crxQ1M6pglIe%_h1k_nNt#R4zt@s&rXGcUeKYZyKA~@XF672`_=3BKJ~3v zRo&GB_KGARET3os7Ep{rh6ZSUe!f^Pmk)Hi-2+01M*%zl;O-#azXALyrTk@VZ0yqJ z=H{i9m6i4|)V||@s@3ZB`1tr+0FD8;Ct=dJ0G#oC|HDS3@lV1wnV9V;AR;;n;3EL{ z4jBDS0Bt$$Pypu(08eL` zjFj@L$;ruQO+zvch=^7bC`T#bcL09{5bp=@5P(7q)U(X|T9)8@eHjH5)SS;E61WCn z$@l#)dy8*S%%2fLkd*Sl2p`XxtVzZI1quGqryzF$e9&w*Ppqx2`B4g(o0}V-nwokK zz}o=ELTqpPzQ5bl>}CuQ5uF6^PDnxu&P&YviO$d?Vb!m9)o`1ho?Z{DNkWLH zT-W_3sWOt<839zQ)lLf`UJnW46=pu4G`KK3B6=CXxsZFOnfZ7c-(hWy03xEx0A_n0 z*ztXTSK4A46o0j%zN^RoWoCXnFMw`@%wFrvyf=#ki0C%}dwP7`VCMU>@c(ZgrWB+W ze!V^XBQrmdMFK?h1Av1)zP6Y-ZegkYcvFC6NF?7f^AYU`LmCi~D#nLqFE6VNwAQ5!DA=k0lovSLG!&$EyZxB1lC%NU zYPG5mVp*#jM#s3y%%^n1(FR0BKLgmO^NbNW&?bOUE67Q6_L#Yx)L7XK z0w`=7q4Uh4+UoAtETEX~vVbh0{}Ql6EJhI)kOh=(60{1k3i|&ks4avz1K`t%i3#<3 z0vj6}d!&>v08mF;is_K#dltJcr98B>v~)EL!s6oMBi(NII{-6TLCRANYD+0+`@z`; z5rnGlE?xCV-@Vb6OQb zT(nz_1hh<>G zJ%SelD6fY&0bKPwZ`SxBPQ@>8$AA@_PN#EdM~(q+3oKBQ`tqs1fU2L{M(y0<@D7q2 zorg!vx%Lsf5sTk=I2KS0VhhLuN;e9vf@1jH1}i`}XUnmvzyJUM07*qoM6N<$g4+2a As{jB1 literal 0 HcmV?d00001 diff --git a/F-Droid/res/drawable-xxxhdpi/ic_lock_24dp_grey600.png b/F-Droid/res/drawable-xxxhdpi/ic_lock_24dp_grey600.png new file mode 100644 index 0000000000000000000000000000000000000000..d9797dfe5bd781e6708f0cb2c3dbf67787c00f77 GIT binary patch literal 1696 zcmV;R24DG!P)TB0wY}hyn^Ih(rnpihz(P_!8kOO(Kd2%-!rcAHWhqV(+Xm zCwCY`)g8;DH2n2ut=&Zo*-MiNf4GoPHi^aPE;7%gC2>`AEfJ)nX z4gh{f#2*3RyH=}p`r^fl(?^aRS?FB4-5fm~0i&a%*9{I1K1W0k1Hdf_rJ6;=j~5pg z-=3P9`Zb|#ZrOVhfa5sV2SIQM5g!GBbxbu(6nuz?`#jJ4g;`eS<~;|XR;xXMh~ogT zKI7V+C!#Um_utRBTvl;C1Hf^d%ZbPbfSs%wbv8a)E|;sW>zZ-Hdg=)Pqobpj4Gs=| zL_`ndp$H;=wz#BED;8G+OIF zE@h*Xx*7l;BcdIMczeupx7!?;tpPAoO(HtgX|_W|bBOpxxm=!bU3Wf?sIKdl8jVJs zh+ag*<;7Z<>3KxlY-@^Y4M43{JBEl)MF~no=ZNUR$;rvtIKr>aQ>|7vA>yZqxS@mn zF|GA8X?$>PtN<`8+<}3C9{^w|tO7>-VzKzp#Kgq+oJ!W~_1jvl)+ZexEG#W8-E3pU zYz2VhI0uPnUxfH`M08i$mLC!c-$r#ui1@nadHXrA)7a(?z-+7y4-e0D*xNavwSFZ{ zg~Du}d0teMWd2w-0GuSE zZ6P%=i>zzI=K0*(x7P{3g)P<)@pI4f?&tbRVxKzzrPLV!*c9@RKWVMa%a*PsrIdMT zb7P2uS*^8MQRkLy0Js1ESA^8?q}IBt8*+~0L`C2Qt@V|;sh@D)B$MY-N-Y6E@lu5m z(Q)7RpU%WlNFhq8;{fnv$iG`!>w#|iUtPA12r&J8Sb9%uy`!4~D5cDP(z9VcwAQ(5 zlB+XQX{D3^SV3O^tO^B*0O^9d*#k=#B!jRF!ZHZ2i~<>i`)v@eR;ybIg~E0s8bL&J zxQctSt-FI#=h7F5$h@|k4uass@8gL8kqh1AvI;o$QH1p)lQO zG|n6S%H{IOt~p`-pX9pk!2JBYA|ms#T`7^0 zDKoDX0P{q2ukZV(00W00L5Z)*v7T#djQR5b2#nS>+P@d%{%L^B>@m2tpLcN-ANbJLBtLp-LVlMq71@O zD&_z{rlB?g7~irGiy+YL2xz;Ot%xuNIRP;4Wi#$l5OM_YkNc?YXaF#uMr~n_{0R!^ z`*lD9Ev#e}09IuG*Qo#y0FfVFTb8H$?j-`cuW_UY0U!XR3*xi^`9g-H9so!e#1xQg zE&#X+GVKKbQ$Vh{0N^UfwC@D~@}V{ZB6}7jR~6X5svzmlP%+v|&zai4tV6D=;ay?I z?t)C4lna~EM`k7fVYq_>E8HmgQBy%sh1%Tx?AOHk_Wd$s| qmk1C5mKCt - + android:layout_gravity="bottom|center_horizontal" + android:text="@string/more" + android:textAllCaps="true" + android:textSize="14sp" + android:layout_marginTop="8dp" + android:textColor="?android:textColorSecondary" + tools:ignore="UnusedAttribute" /> + + + android:orientation="vertical" + tools:ignore="UnusedAttribute"> + android:drawableRight="@drawable/ic_expand_more_grey600" + android:drawableEnd="@drawable/ic_expand_more_grey600" + android:drawableLeft="@drawable/ic_website" + android:drawableStart="@drawable/ic_website" /> + android:orientation="vertical" + android:layout_marginLeft="@dimen/layout_horizontal_margin" + android:layout_marginStart="@dimen/layout_horizontal_margin" + android:visibility="gone"> + android:text="@string/menu_source" /> + android:text="@string/menu_issues" /> + android:text="@string/menu_changelog" /> + android:text="@string/menu_website" /> + android:text="@string/menu_donate" /> + android:text="@string/menu_bitcoin" /> + android:text="@string/menu_litecoin" /> + android:text="@string/menu_flattr" /> - android:layout_width="fill_parent" android:layout_height="wrap_content" android:clickable="true" - android:orientation="vertical"> + android:orientation="vertical" + android:layout_marginBottom="8dp" + tools:ignore="UnusedAttribute"> + android:drawableEnd="@drawable/ic_expand_more_grey600" /> @android:dimen/dialog_min_width_minor + + diff --git a/F-Droid/res/values/dimens.xml b/F-Droid/res/values/dimens.xml index f1113aab1..d556a8974 100644 --- a/F-Droid/res/values/dimens.xml +++ b/F-Droid/res/values/dimens.xml @@ -4,4 +4,6 @@ 48dp 32dp + 16dp + 48dp diff --git a/F-Droid/res/values/strings.xml b/F-Droid/res/values/strings.xml index 5028c49bb..fe5dd259d 100644 --- a/F-Droid/res/values/strings.xml +++ b/F-Droid/res/values/strings.xml @@ -64,6 +64,8 @@ Add Links View more + More + Less Back Cancel @@ -189,6 +191,7 @@ Error during update: %s No permissions are used. Permissions for version %s + Permissions You don\'t have any available app that can handle %s. Compact Layout Show icons at a smaller size diff --git a/F-Droid/res/values/styles.xml b/F-Droid/res/values/styles.xml index b81034df8..0766a4a84 100644 --- a/F-Droid/res/values/styles.xml +++ b/F-Droid/res/values/styles.xml @@ -178,4 +178,24 @@ italic + + + + +