From 2a1217ae3b091ff26e4814006cd828873322d1d3 Mon Sep 17 00:00:00 2001 From: Christopher Eby Date: Mon, 20 Feb 2012 03:00:55 -0600 Subject: [PATCH] Change expander and divider look for MediaView --- generate-pngs.sh | 9 +++++++-- orig/arrow.svgz | Bin 0 -> 889 bytes res/drawable-hdpi/arrow.png | Bin 0 -> 332 bytes res/drawable-hdpi/expander_arrow.9.png | Bin 1508 -> 0 bytes res/drawable-mdpi/arrow.png | Bin 0 -> 174 bytes res/drawable-mdpi/expander_arrow.9.png | Bin 797 -> 0 bytes res/drawable-xhdpi/arrow.png | Bin 0 -> 377 bytes src/org/kreed/vanilla/MediaView.java | 15 ++------------- 8 files changed, 9 insertions(+), 15 deletions(-) create mode 100644 orig/arrow.svgz create mode 100644 res/drawable-hdpi/arrow.png delete mode 100644 res/drawable-hdpi/expander_arrow.9.png create mode 100644 res/drawable-mdpi/arrow.png delete mode 100644 res/drawable-mdpi/expander_arrow.9.png create mode 100644 res/drawable-xhdpi/arrow.png diff --git a/generate-pngs.sh b/generate-pngs.sh index f974056e..e0036e72 100755 --- a/generate-pngs.sh +++ b/generate-pngs.sh @@ -4,14 +4,19 @@ # For each SVG in orig/, PNGs will be created in the drawable directories # for each DPI with the same name as the SVG. If the PNGs already exist # and are newer than the SVG, they will not be recreated. +# +# Requires: +# - inkscape +# - imagemagick +# - optipng gen() { name=`basename "$1" .svgz` png="res/drawable-$2/$name.png" if [ "$1" -nt "$png" -o ! -e "$png" ]; then inkscape --without-gui --export-area-page --export-dpi=$3 --export-png="$png" $1 - convert -strip "$png" "$png" - optipng -quiet -o7 "$png" + convert -strip "$png" "$png" # strip comments and other metadata + optipng -quiet -o7 "$png" # shrink PNG echo fi } diff --git a/orig/arrow.svgz b/orig/arrow.svgz new file mode 100644 index 0000000000000000000000000000000000000000..c92d7f7be9626b9bd0d4eb76fe8c8df69f0d3ff0 GIT binary patch literal 889 zcmV-<1BUz`iwFP!000000F712j@vj8z56Q|^(DcW+Pr9qa2X)aJ{%D$$8+Ba|$>$PYclB~?twL*f1U`4y)gGL}e2 zN+o&WN#%Xn&Nd$~M*nI~EN7?{_K3d87eh(S(Z{2;bshw5+xnv4^p!pYpAg2|*=%D@ zhZ#Z${7REET6n!e-RQC-G8*ubS6o^XM1B-_6P-?U>b#2+r>d%yG@Yh2Pd8-E_9NRx z(=Iwvlx0~E#z7ooU|@5RmYnguD#ZAnY8-}P0NBL*f2`auoqj8rJr-WP?4%xq9?@F0KG=Qrw!qjhzBi6}_2(pTn0P4Y z&{5whvytpC9N@%Dr3>$A->n|lDb2VZpmn$IAO%$s_Hym<-u94|vpVA8 z`?xt0rdp`kTkut>3aqZ*?$dMOt^6W>a1?}Mm{vVjqO)vp>WP7RkWb|rQ z^XvG(dj~RF38xhNXGK|lb58oqZj1_B@@aDu^wIaZ1vklUf+71(I!sl$Yp}7ZCE4+^ z@V+|`J)j4znz~Yq_v$@vHIc?;?@j_`Rxdo4@a^#iHFuCG^Veyznn$s}4zoqFLOAw8c7JH;ujADm{#WoscoadH zNEF_et8}qg%<=FBnpp%FM>5C58%lhzKF8g|Ia#igWSL%dvIP)2YL=|hPHC}RMj67R z)-rT%U&r8G!8NBA?!LveIgY-P5|k3?#4J%UA`Z(gJ)!T>t<7-_X#|*4Eb9*$E^& zIyzcgTY+SEcQ=si>gsB5Z-$APp^n6cAK2l7JCGX;31GM$zye}# z5%pD(Qc6VlXwxuQ{M!7fH*`0gl z{?9r0f6kn<06GtI=sa|YN8?{Qq(#dIkx49$Fwz6bNYoP}N)UPXQn!430Kp7n++zrR zVK`~QbuVjK(fU-&6V2;t9+N#L`PKXVH@nYW{;Y#uu9BJ`NSb%e#cI}`eEo%&E2^A# zNza~d-~Bz^bdfC&R31bo$d<3)dU0FbGTj=yMGs0OM$Z2B&PmQOjd0#dDGL!{$BDhW z-u8ubbOgHN1RYOc_4uc3C5?E?fynrYt!&5{u9|Kz zzNKg*YQogx;zO?4*46xMY@i;$)nQf;7e1MhM}@ zhF_@kE1EmItY*tq_u0!kwHml1$J>6b%iX zIs$yjtWCn0RXzeJg;R0a&P2&b1?D>?k2F2pM>BP+MM5c()q$*xY*pW7d&%lELe+&N z96*daqkK$;ka^F;K_puakt;lkTRB9?) zF5-1`G*WlR1)w9$lv3c=2>VG9$U_{&%alz{2Lwa+$)H)CVYNh{GSf9eN!~ReJ|RUA z2^}3DhfD~2h7&;d2(x6ZuVO2RMuwrE9R?;apmMVDhbkuB$ge&dLf-HOJMByL`la}(LAR{5sH~PT^E^&u3 zYr$uyaGGgG={*>6M=AbkRpI15DU? zHDBu>B9dUD1s-ODg=X`U)7Go6X*v>zFt-9G_y0KE@d2F87!u<*!3s3wRH4+@Iu z&1PM_|hyZ@vD1b(m6tg5qkYI*6GV`@D3pb`RE@s}3^Lc#)z4*}Q$iB}=%PCn literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/expander_arrow.9.png b/res/drawable-mdpi/expander_arrow.9.png deleted file mode 100644 index 19785962ec861a3c0c22ce58f4fdf38b9ef58d6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 797 zcmV+&1LFLNP)eh4MZ$2>ZXgp3vWuH|G?WKl0t}#P`rpD6Y4+c(n2r9 zi!g)&oiYMZ%NDcpBd5-NsBL?5Z6P5R|68MGK_Ga4T_1=z%9IKtwgdKAgqU2U)FWl+_gM{X@A*SIin z<)Xdd)WO$N0Yu~OwVrp(@J4=D19S$WuyctP&fRHnSt<*yry=m`N90rR$vg|p@xm+0&1A(>EamTas2I-okC3x z0xgMm0*^3%+*j%{_j|po@vRNk8@aO8|LsrF+@-nh)Ab9vD- z=4t+4rv0A(J%0a+*=9_6w{mu59)7aScYgQdU6+2*};}|?${an^L HB{Ts5Y>cnJ literal 0 HcmV?d00001 diff --git a/src/org/kreed/vanilla/MediaView.java b/src/org/kreed/vanilla/MediaView.java index c4c8aa01..c7128955 100644 --- a/src/org/kreed/vanilla/MediaView.java +++ b/src/org/kreed/vanilla/MediaView.java @@ -30,8 +30,6 @@ import android.graphics.BitmapFactory; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; -import android.graphics.RadialGradient; -import android.graphics.Shader; import android.util.TypedValue; import android.view.MotionEvent; import android.view.View; @@ -55,10 +53,6 @@ public final class MediaView extends View { * The paint object, cached for reuse. */ private static Paint sPaint; - /** - * The cached divider gradient that separates each view from other views. - */ - private static RadialGradient sDividerGradient; /** * The text size used for the text in all views. */ @@ -67,9 +61,8 @@ public final class MediaView extends View { public static void init(Context context) { Resources res = context.getResources(); - sExpander = BitmapFactory.decodeResource(res, R.drawable.expander_arrow); + sExpander = BitmapFactory.decodeResource(res, R.drawable.arrow); sTextSize = (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 14, res.getDisplayMetrics()); - sDividerGradient = null; sPaint = new Paint(); sPaint.setTextSize(sTextSize); @@ -212,11 +205,7 @@ public final class MediaView extends View { canvas.restore(); width = getWidth(); - - if (sDividerGradient == null) - sDividerGradient = new RadialGradient(width / 2, 1, width / 2, Color.WHITE, Color.TRANSPARENT, Shader.TileMode.CLAMP); - - paint.setShader(sDividerGradient); + paint.setColor(Color.GRAY); canvas.drawLine(0, height - 1, width, height - 1, paint); paint.setShader(null); }