From fa2db823efd0da492b0b4d0c64f26be9635a2d86 Mon Sep 17 00:00:00 2001 From: RyanBateman Date: Fri, 6 Jul 2012 14:50:26 -0400 Subject: [PATCH] Moved some images, prototyped row with a stripe. --- media/android/NewsBlur/AndroidManifest.xml | 3 +- .../NewsBlur/res/drawable-hdpi/folder.png | Bin 0 -> 1443 bytes .../NewsBlur/res/drawable-mdpi/folder.png | Bin 0 -> 1307 bytes .../NewsBlur/res/drawable-xhdpi/folder.png | Bin 0 -> 1604 bytes .../android/NewsBlur/res/drawable/divider.xml | 8 -- .../NewsBlur/res/drawable/divider_dark.xml | 4 + .../NewsBlur/res/drawable/divider_light.xml | 4 + .../res/{drawable-hdpi => drawable}/logo.png | Bin .../res/drawable/negative_count_stripe.xml | 4 + .../res/drawable/neutral_count_stripe.xml | 4 + .../orangeline_shadow.png | Bin .../res/drawable/positive_count_stripe.xml | 4 + .../textfield_activated_blur.9.png | Bin .../textfield_default_blur.9.png | Bin .../textfield_disabled_blur.9.png | Bin .../textfield_disabled_focused_blur.9.png | Bin .../textfield_focused_holo_light.9.png | Bin .../res/layout/fragment_folderfeedlist.xml | 3 +- .../android/NewsBlur/res/layout/row_feed.xml | 61 +++++++------- .../NewsBlur/res/layout/row_feed_stripes.xml | 77 ++++++++++++++++++ .../res/layout/row_folder_collapsed.xml | 23 ++++-- .../res/layout/row_folder_expanded.xml | 14 ++-- media/android/NewsBlur/res/values/strings.xml | 2 + .../fragment/FolderFeedListFragment.java | 10 ++- .../com/newsblur/view/RoundedImageView.java | 2 +- 25 files changed, 168 insertions(+), 55 deletions(-) create mode 100644 media/android/NewsBlur/res/drawable-hdpi/folder.png create mode 100644 media/android/NewsBlur/res/drawable-mdpi/folder.png create mode 100644 media/android/NewsBlur/res/drawable-xhdpi/folder.png delete mode 100644 media/android/NewsBlur/res/drawable/divider.xml create mode 100644 media/android/NewsBlur/res/drawable/divider_dark.xml create mode 100644 media/android/NewsBlur/res/drawable/divider_light.xml rename media/android/NewsBlur/res/{drawable-hdpi => drawable}/logo.png (100%) create mode 100644 media/android/NewsBlur/res/drawable/negative_count_stripe.xml create mode 100644 media/android/NewsBlur/res/drawable/neutral_count_stripe.xml rename media/android/NewsBlur/res/{drawable-hdpi => drawable}/orangeline_shadow.png (100%) create mode 100644 media/android/NewsBlur/res/drawable/positive_count_stripe.xml rename media/android/NewsBlur/res/{drawable-mdpi => drawable}/textfield_activated_blur.9.png (100%) rename media/android/NewsBlur/res/{drawable-mdpi => drawable}/textfield_default_blur.9.png (100%) rename media/android/NewsBlur/res/{drawable-mdpi => drawable}/textfield_disabled_blur.9.png (100%) rename media/android/NewsBlur/res/{drawable-mdpi => drawable}/textfield_disabled_focused_blur.9.png (100%) rename media/android/NewsBlur/res/{drawable-mdpi => drawable}/textfield_focused_holo_light.9.png (100%) create mode 100644 media/android/NewsBlur/res/layout/row_feed_stripes.xml diff --git a/media/android/NewsBlur/AndroidManifest.xml b/media/android/NewsBlur/AndroidManifest.xml index d6b1975a1..51b33ef4a 100644 --- a/media/android/NewsBlur/AndroidManifest.xml +++ b/media/android/NewsBlur/AndroidManifest.xml @@ -28,7 +28,8 @@ + android:label="@string/newsblur" + android:hardwareAccelerated="false" /> l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVip)X3b))xy}+$-u?X(ACh=#L&{!#L3yw z&D7A`#K{n**Cju>G&eP`1g19yq1ObbUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnqfX zG!Lpb1-Dy_aO%|uIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zZVc0V!oa{J>gnPb zQgQ3e%+p?n9YoqDmxQ3e_Z=S9g z!2ctfQSV@=P^UOo>wJ}zH4T*koIiT(Ht?G{B;D4Sb?TUKjkQqnYSZ%>!~ZreX$HgQH(&GGj#sA4 zvRgc@*7tCPszZTe(3-}l0>W1BUa;TRV!ZS__1`Cp{M6XyCnv-56T+{idK|E}U@J}t znEYhv*8CaMm{_*2^A~#%@r&hY*eCrJmz`2)mM6`6yX5G_`L8#ukP0!|?k{8@`Kj&# z?{AyN&t*(;KfNREKEEzXef@CPniVW3zP;S^KU?bN@znp?=dC2;{w5l%n)qMyeEPO+ zMM9Uq>1_Pp>c(`!PCX}oX#?B(KQr7;o>o4RcwuwE-Amd}zUUq=RepW!!!8E?Oi_p4 zryA$13-5gU`D1PEGFOJR|MtF$db#Alf7Q_Bi;)dB(?y%(G;_tCWNi7>zi)OTFb=fW zWrZ9t*|V>S>jopc6tB_E|5xpd|6c${R|3nQY{vUcJPb=4)~l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVip)Y8@5)y%@w$-u?X(ACh=#L&{!#L3yw z&D7A`#K{n**Cju>G&eP`1g19yq1O_pUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnv1> zG!Lpb1-Dzwaq86vIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zPT$&;z`(%R>*?Yc zQgQ3e^u1opjv}qbyQGdD^E)Ea)XQbIX>F^S(v67UER`biN5wY?90_V+JvgJIUL$Ma zGL9d!6CPFZ-4ltNQ>a`$Gfltdq@HBixj8edzaKkN81q4rnf3fc?hkqj58Nf%F8`Rt zD0_N`V*o3Eq@SGY#eRk(Ha8f2Pv20w!F)R^+Cfp7@5KS58JC0(Bz<_gfYra8#YuoJIhpLdyK!CmJ*_NhlV)-}D$Z9Kf6<-gSLZq!PXvYdfMO0tZ4}SurTD0Muz%JhO4%x91~+J1RW#UWA_PG zc^Mv!X(}{$xS}gEB`);RZg+`)v8Tzn+Zm z6NILSu(CWV($;MFZOCSpIw5TSvC6*KzYWixY}wDK7sF&?9U}Ke+cQ63Ht=Y;_p!>j zgDc<0CZtT5wqTLS&RxC^(YH1(Tg2_YZhN9{(dNZ77^lX2C;z*yBmN-zz;*^^h6nqi UlsBvium%-Zp00i_>zopr0Pc&+djJ3c literal 0 HcmV?d00001 diff --git a/media/android/NewsBlur/res/drawable-xhdpi/folder.png b/media/android/NewsBlur/res/drawable-xhdpi/folder.png new file mode 100644 index 0000000000000000000000000000000000000000..d1324014d0df9390f1cbe97a5afd4201471f5cbb GIT binary patch literal 1604 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh**NZ(?$0 z9!LbN!`Ii!Gq1QLF)umQ)5TT^Xog;9W{Q=Gsgb#ptGS!0lYxt&p{t>#iJ_&diIcOV zo2j9>iIX8ruSMv>2~2MaT(5-zPQ9SSkXrz>*(J3ovn(~mttdZN0qkk3Ox$j9 z!D${;ZwgMgn7iWCs}FRHJ}7FDq8cUyOg|tdJmCU4@T8xb2Tbopz=VCq$*h-wfoYqk zi(^Q|tv9oL{Y4xF+S1Er@$c=pD4{H6`0Atp?@gEFJue&gKR76VbiQKDj*8O5j@MlR zL|i!!hIVlL*tq#|bkJNMvy>P2*8BK|tNWLU&rtkaQW_qb{#fVqq6zM6m_i!30vNR% zSXVHJE?{yJ4_JSF{e!1WGg#)zy`SEYpRo50|Gf;8fBR?MIsfcHZGq&Uw;%UCPGHt) zsO1z4cwLqMtL4y3wF;F~&L^xX%nj50xa69PFR}1sO=##&unS=fJH%`tyQ;y=f`49% zmck>SPXcGAL^eo1+G}0&fBA!_6aG(^O@5$U5y-|^rg?{HySvH4^n;%hIXr$%5$*SI zc(i*>?_;}-++}V*6!!LUZm`T?EV-<@;S7`3Ra?pSoA;mpns=-;Z^k7f^9t69UgwKB zqGT>E=Q5B9ivIIcatC)E=iCpT=RCUCF=YhbWOIMOwu9xHmmH((#ERIZLX9*{tm`-ig2NhTk(-X2GO#{-4D8y4#@) zu@|0fDQBM}IEN{j?|y=9e3Ri4vQy$ z><@3Pci+&^a(RBS@sz@|HpjE;o0Oei9j@>1^Y7flB9T{f>D?j6gkOuVe80I}*01uJ z^23MoKgC^p`P9bY*FpC)v&%nkVOqFK`Qfp2;}FKS^!>7n7^MHL)-x>%O|PF_JyU^I zCFa!oHjM*q|7T^-j&NnP?>=>Z759P<@%=LU7l*hqhWy)Cr2E7t{Kb=rcmC9T@DvYR z_bmVUgjxU07CnBfpUmdKI;Vst054N##{d8T literal 0 HcmV?d00001 diff --git a/media/android/NewsBlur/res/drawable/divider.xml b/media/android/NewsBlur/res/drawable/divider.xml deleted file mode 100644 index 98b30dcd0..000000000 --- a/media/android/NewsBlur/res/drawable/divider.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/media/android/NewsBlur/res/drawable/divider_dark.xml b/media/android/NewsBlur/res/drawable/divider_dark.xml new file mode 100644 index 000000000..ab1bfec8b --- /dev/null +++ b/media/android/NewsBlur/res/drawable/divider_dark.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/media/android/NewsBlur/res/drawable/divider_light.xml b/media/android/NewsBlur/res/drawable/divider_light.xml new file mode 100644 index 000000000..ab1bfec8b --- /dev/null +++ b/media/android/NewsBlur/res/drawable/divider_light.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/media/android/NewsBlur/res/drawable-hdpi/logo.png b/media/android/NewsBlur/res/drawable/logo.png similarity index 100% rename from media/android/NewsBlur/res/drawable-hdpi/logo.png rename to media/android/NewsBlur/res/drawable/logo.png diff --git a/media/android/NewsBlur/res/drawable/negative_count_stripe.xml b/media/android/NewsBlur/res/drawable/negative_count_stripe.xml new file mode 100644 index 000000000..315236b2f --- /dev/null +++ b/media/android/NewsBlur/res/drawable/negative_count_stripe.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/media/android/NewsBlur/res/drawable/neutral_count_stripe.xml b/media/android/NewsBlur/res/drawable/neutral_count_stripe.xml new file mode 100644 index 000000000..8e9912d56 --- /dev/null +++ b/media/android/NewsBlur/res/drawable/neutral_count_stripe.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/media/android/NewsBlur/res/drawable-hdpi/orangeline_shadow.png b/media/android/NewsBlur/res/drawable/orangeline_shadow.png similarity index 100% rename from media/android/NewsBlur/res/drawable-hdpi/orangeline_shadow.png rename to media/android/NewsBlur/res/drawable/orangeline_shadow.png diff --git a/media/android/NewsBlur/res/drawable/positive_count_stripe.xml b/media/android/NewsBlur/res/drawable/positive_count_stripe.xml new file mode 100644 index 000000000..8efc0532c --- /dev/null +++ b/media/android/NewsBlur/res/drawable/positive_count_stripe.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/media/android/NewsBlur/res/drawable-mdpi/textfield_activated_blur.9.png b/media/android/NewsBlur/res/drawable/textfield_activated_blur.9.png similarity index 100% rename from media/android/NewsBlur/res/drawable-mdpi/textfield_activated_blur.9.png rename to media/android/NewsBlur/res/drawable/textfield_activated_blur.9.png diff --git a/media/android/NewsBlur/res/drawable-mdpi/textfield_default_blur.9.png b/media/android/NewsBlur/res/drawable/textfield_default_blur.9.png similarity index 100% rename from media/android/NewsBlur/res/drawable-mdpi/textfield_default_blur.9.png rename to media/android/NewsBlur/res/drawable/textfield_default_blur.9.png diff --git a/media/android/NewsBlur/res/drawable-mdpi/textfield_disabled_blur.9.png b/media/android/NewsBlur/res/drawable/textfield_disabled_blur.9.png similarity index 100% rename from media/android/NewsBlur/res/drawable-mdpi/textfield_disabled_blur.9.png rename to media/android/NewsBlur/res/drawable/textfield_disabled_blur.9.png diff --git a/media/android/NewsBlur/res/drawable-mdpi/textfield_disabled_focused_blur.9.png b/media/android/NewsBlur/res/drawable/textfield_disabled_focused_blur.9.png similarity index 100% rename from media/android/NewsBlur/res/drawable-mdpi/textfield_disabled_focused_blur.9.png rename to media/android/NewsBlur/res/drawable/textfield_disabled_focused_blur.9.png diff --git a/media/android/NewsBlur/res/drawable-mdpi/textfield_focused_holo_light.9.png b/media/android/NewsBlur/res/drawable/textfield_focused_holo_light.9.png similarity index 100% rename from media/android/NewsBlur/res/drawable-mdpi/textfield_focused_holo_light.9.png rename to media/android/NewsBlur/res/drawable/textfield_focused_holo_light.9.png diff --git a/media/android/NewsBlur/res/layout/fragment_folderfeedlist.xml b/media/android/NewsBlur/res/layout/fragment_folderfeedlist.xml index b64cf032e..db6964a7a 100644 --- a/media/android/NewsBlur/res/layout/fragment_folderfeedlist.xml +++ b/media/android/NewsBlur/res/layout/fragment_folderfeedlist.xml @@ -3,5 +3,6 @@ android:id="@+id/folderfeed_list" android:layout_width="match_parent" android:layout_height="match_parent" - android:childDivider="@color/white" + android:dividerHeight="1px" + /> \ No newline at end of file diff --git a/media/android/NewsBlur/res/layout/row_feed.xml b/media/android/NewsBlur/res/layout/row_feed.xml index df2214534..55e0c2e9d 100644 --- a/media/android/NewsBlur/res/layout/row_feed.xml +++ b/media/android/NewsBlur/res/layout/row_feed.xml @@ -7,27 +7,8 @@ android:paddingBottom="10dp" android:paddingTop="10dp" > - - - - + + + + \ No newline at end of file diff --git a/media/android/NewsBlur/res/layout/row_feed_stripes.xml b/media/android/NewsBlur/res/layout/row_feed_stripes.xml new file mode 100644 index 000000000..bcaab305e --- /dev/null +++ b/media/android/NewsBlur/res/layout/row_feed_stripes.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/media/android/NewsBlur/res/layout/row_folder_collapsed.xml b/media/android/NewsBlur/res/layout/row_folder_collapsed.xml index 65d232c94..bf088cc0d 100644 --- a/media/android/NewsBlur/res/layout/row_folder_collapsed.xml +++ b/media/android/NewsBlur/res/layout/row_folder_collapsed.xml @@ -1,20 +1,25 @@ - + + + android:gravity="center_vertical" + android:textColor="@color/darkgray" /> - \ No newline at end of file + \ No newline at end of file diff --git a/media/android/NewsBlur/res/layout/row_folder_expanded.xml b/media/android/NewsBlur/res/layout/row_folder_expanded.xml index c2a65a920..7cdac80cd 100644 --- a/media/android/NewsBlur/res/layout/row_folder_expanded.xml +++ b/media/android/NewsBlur/res/layout/row_folder_expanded.xml @@ -1,11 +1,15 @@ - + + - \ No newline at end of file + \ No newline at end of file diff --git a/media/android/NewsBlur/res/values/strings.xml b/media/android/NewsBlur/res/values/strings.xml index e92859ab3..c86d283a0 100644 --- a/media/android/NewsBlur/res/values/strings.xml +++ b/media/android/NewsBlur/res/values/strings.xml @@ -21,6 +21,7 @@ Press to sign up The feed\'s favicon The user\'s profile picture + folder icon Profile Refresh @@ -32,4 +33,5 @@ shared subscribers + \ No newline at end of file diff --git a/media/android/NewsBlur/src/com/newsblur/fragment/FolderFeedListFragment.java b/media/android/NewsBlur/src/com/newsblur/fragment/FolderFeedListFragment.java index 02a872e83..01aba4f88 100644 --- a/media/android/NewsBlur/src/com/newsblur/fragment/FolderFeedListFragment.java +++ b/media/android/NewsBlur/src/com/newsblur/fragment/FolderFeedListFragment.java @@ -2,8 +2,10 @@ package com.newsblur.fragment; import android.content.ContentResolver; import android.database.Cursor; +import android.graphics.Point; import android.os.Bundle; import android.support.v4.app.Fragment; +import android.view.Display; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -17,7 +19,6 @@ import com.newsblur.view.FolderTreeViewBinder; public class FolderFeedListFragment extends Fragment { - private ExpandableListView list; private ContentResolver resolver; private FolderTreeAdapter folderAdapter; @@ -41,6 +42,13 @@ public class FolderFeedListFragment extends Fragment { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View v = inflater.inflate(R.layout.fragment_folderfeedlist, container); list = (ExpandableListView) v.findViewById(R.id.folderfeed_list); + + Display display = getActivity().getWindowManager().getDefaultDisplay(); + int width = display.getWidth(); + + list.setIndicatorBounds(width - 50, width - 10); + + list.setChildDivider(getActivity().getResources().getDrawable(R.drawable.divider_light)); list.setAdapter(folderAdapter); return v; diff --git a/media/android/NewsBlur/src/com/newsblur/view/RoundedImageView.java b/media/android/NewsBlur/src/com/newsblur/view/RoundedImageView.java index 799441e73..7bf1f84cb 100644 --- a/media/android/NewsBlur/src/com/newsblur/view/RoundedImageView.java +++ b/media/android/NewsBlur/src/com/newsblur/view/RoundedImageView.java @@ -23,7 +23,7 @@ public class RoundedImageView extends ImageView { // TODO: Fix this to use proper anti-aliasing for the corners protected void onDraw(Canvas canvas) { - clipPath.addRoundRect(new RectF(0, 0, getWidth(), getHeight()), getWidth() / 12, getWidth() / 12, Path.Direction.CW); + clipPath.addRoundRect(new RectF(0, 0, getWidth(), getHeight()), getWidth() / 10, getWidth() / 10, Path.Direction.CW); canvas.clipPath(clipPath); super.onDraw(canvas); };