From c18ed97aa4b10d844e008c9dd610f775b5aaff8e Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 23 Nov 2011 23:18:18 +0300 Subject: [PATCH] add misc drawables update layouts --- res/drawable-hdpi/mark_set.png | Bin 0 -> 1530 bytes res/drawable-hdpi/mark_unset.png | Bin 0 -> 1433 bytes res/drawable/mark_set.svg | 77 ++++++++++++++++++++++ res/drawable/mark_unset.svg | 79 +++++++++++++++++++++++ res/layout/article_fragment.xml | 18 ++++-- res/layout/feeds_fragment.xml | 2 +- res/layout/feeds_row.xml | 7 +- res/layout/headlines_fragment.xml | 2 +- res/layout/headlines_row.xml | 3 +- res/layout/main.xml | 15 +++-- res/values/attrs.xml | 2 + res/values/style.xml | 4 ++ src/org/fox/ttrss/HeadlinesFragment.java | 2 +- src/org/fox/ttrss/MainActivity.java | 14 +++- 14 files changed, 203 insertions(+), 22 deletions(-) create mode 100644 res/drawable-hdpi/mark_set.png create mode 100644 res/drawable-hdpi/mark_unset.png create mode 100644 res/drawable/mark_set.svg create mode 100644 res/drawable/mark_unset.svg diff --git a/res/drawable-hdpi/mark_set.png b/res/drawable-hdpi/mark_set.png new file mode 100644 index 0000000000000000000000000000000000000000..bd7c3755fe3e6ed22a8953319aff1d023c86ad4f GIT binary patch literal 1530 zcmV*su@x*WNHBU(Ahac# zCShlh3{6~$O2?+C1Y0<7>4?k$ z5tU$7H(vsJfFr7Ic1NWrG6#Tjj^~e~Qldn$22|aA9=MiAK5S^BKWtr5Mc}*#?VJbg zp%HonRNXuP{OQyDf}x4u!_*f=1ahNaCFJGR78XK{fU28az#yOi?Aa>m!;?9dEO5}! z#6Va&!;Zj5SjGzl_C78zq2$^XizhUM=76f3&j4@Q?`_Rc7n4_8vy1f&RX6vBr8mq7 zoVDc%1v*n34V@`h6a*ngAruEx-E0Hiw%>PchD3a$JrS2Q2i{V3^XV{jhZTXdSb3F_ zH~Ka@Q?kuM6>ugD#SiU(s++CAyY_o)6Esv8@-Sjxxf%d%}@EF?->}-NV zyNWC9zXjtnCGA=PMksXbx}k}?E(cCt$h;36br@P-QoIjd?SLkq(YG;^hVO?e)d0W( z8xCDjPF~3D2Ks>QK_v(U>f>@=+gGv{wkCr0pIn65Wtd;txE5ByEH5dT0D6^dHfwK# zeSm9G)x{uL0}VCMU>jTmiI{6g2?g0KEUv+P+Hz`DKF_9MX{~^L4Cpm9F`8Qg){bx) zc*^G5nt-G25R0>~e#9QpfR zeSDXv)u9_%pa4>E-wmlKY^r%w=F%`!bZmlQXtKcgYrwG}#zPtDw4sR^;DnRbSTwZ@1`io0EM0+6?l-o@ z`O;KdW^WI8$Y}9k^F_H1bU9!A^8Rv=ER@mZ!RCvK9Z1B($&oe*cl}Jn4(ziZJVvf! zgE@oDq$PG`H&hwM*bx>9W%BhL#fjO*`w-;Lrj!FPo@7|h%!GBUvN^No%OMw@1Ig9u<#ZN94fiHnC z3{A}X$VdVo0v`ay&M+nnP3#C_SI}%U3HaqFYrxmQXT|dNJb5YP-9E0s94l_0R0Ms+&iU8^9q#b|3@1ZfN4W%1jIfYhVtm gx_KOUB}kwD0YV7D5f6&>CIA2c07*qoM6N<$f?Tw>Q~&?~ literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/mark_unset.png b/res/drawable-hdpi/mark_unset.png new file mode 100644 index 0000000000000000000000000000000000000000..cb29576cad1f7b7f45d779fd3f2978441677bcdf GIT binary patch literal 1433 zcmV;K1!nq*P)001s>0UXzeF#rGn8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H11r|v}K~!jgwV7RL9Yqw!e>e5x!AgrF!Hin1M$>$dl(9u^%%=z? zB~Szvi}guGs34R+SX*CwXwetZC#6uO(4r3oAFR;EhN2NlGo>Mkt%-@Ixl@qVVzENo zkgg9in>)LA@7~?q-9Ie5duHbR&zUnbduF!ac^-K|X?lS=Dflrjjyv*FY_ZpJpbcV2|_sVO}JKJm!GXJPn))i94lWBx|m`BCt0?wkJYXGcu2W z(zFBTDim*!g3&Db@`!-j`#0*Dqi+G&@09JgGM_WE zC}iS*(yRqub3})v;7|X>J|A+*UsakXvf$1t0=p^YRg1vBh&uah8NdqQ{Va%Uc0g&? z0NWkW5h?gRT+hmmIHK2W+nSJg8C9A(;1S?SpwYRv0}Zy?ZJzIb1WZ!uxJ$qo zFbzyO_lr_+dsz-BO+&~)|Nb~|cNKl#N)cFzqMY~!c)5z6o4^d^j!jF!rGNvYMeiM; z+c9)y73G!S0qs&S9#=_e+AzIdh^rTa>y#WiRTwRLjlfCZp%h9MfLThtGYw2g!Ouw= zD@`ZRis>*v%4>l;Q`k@h`U;-s`ODx*D4SG8%$RizodV{hSXxmsfzqt7{QgMr9c!Vy zbLW6QDVSZF19n9i1|D-NjsTmb;NL8bO$w#C7x)3#C!92!^DM$Paa6)NT=VxvZmg|J&_A!Mqe%`HH_92r3 z4fH@@E#CkPDb0PETN{Gq7_yu`E&x5&wg4)A$dslYGqIZ;@j2iHDfl}xi-Vl^V~p=` z#J^%D>|arBDy9;)K@SAh^$uWIX&$KA+7PVHVS>hwV|qT)c&L&KNx@~H4+1-=HjESX z%QrU&t83Wm_A!R(`O9%_t0r?&a0TPUSx4N0apJ-B<_2MP3|pN(&SH$eQmuWWY*Y%a z0{sNfde#9ulbc!*JFPAsXMldoSrv)XX({*z7z~NeCv6{tu#Q2?l?Z9~0}Y|~iInZ5 z5Y`dqh(%fl+;Qq*mbh9mX>~<$R7EWgT+AXzl7j0{N)5=_fmY`^i{TTctF>aS2&DbN z;r33f14?rj@V0&ZLW-rsttdLZkyqQ>QfBf!~17>@}q{Z`gfx z6kJ_vELS3=8A8njw}F%43Q9AG`GS58Jn9++d38JkA+WLB}eLBkuwC#ONwY!NW=HO5}hgu9TlF0AB(h#pUfG zef5~XHE&V*C}nk}j&PB52t|d|0}caCQm`Yb@nAMfQm_MPvO1!AG0`we>OfoQ{TSv~ z(KacVO{k*`QZOq8+ko{}XB=lF(mF5#bVgQQDzOM`k%I4+ nVP9fM!B0S^(hLAECTa6O4l#&vl&W(Y00000NkvXXu0mjfr16D# literal 0 HcmV?d00001 diff --git a/res/drawable/mark_set.svg b/res/drawable/mark_set.svg new file mode 100644 index 00000000..5f55e61a --- /dev/null +++ b/res/drawable/mark_set.svg @@ -0,0 +1,77 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/res/drawable/mark_unset.svg b/res/drawable/mark_unset.svg new file mode 100644 index 00000000..0d46aeb0 --- /dev/null +++ b/res/drawable/mark_unset.svg @@ -0,0 +1,79 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml index 31a105e4..4610d207 100644 --- a/res/layout/article_fragment.xml +++ b/res/layout/article_fragment.xml @@ -1,8 +1,16 @@ - - - - + + + + + + + + + - diff --git a/res/layout/feeds_fragment.xml b/res/layout/feeds_fragment.xml index 32f2d229..0dcbc1c4 100644 --- a/res/layout/feeds_fragment.xml +++ b/res/layout/feeds_fragment.xml @@ -6,6 +6,6 @@ - + diff --git a/res/layout/feeds_row.xml b/res/layout/feeds_row.xml index 4eb22e22..08eafd32 100644 --- a/res/layout/feeds_row.xml +++ b/res/layout/feeds_row.xml @@ -3,24 +3,23 @@ android:layout_height="?android:attr/listPreferredItemHeight" android:orientation="horizontal" android:gravity="center_vertical" - android:padding="3dip" android:id="@+id/feeds_row" android:layout_width="match_parent"> + android:id="@+id/feeds_row" android:layout_width="match_parent" android:paddingBottom="4dip" android:paddingLeft="8dip" android:paddingRight="8dip" android:paddingTop="4dip"> + android:text="{FEED}" android:layout_width="wrap_content" android:textSize="21dp"/> + android:text="{123}" android:textSize="16dp"/> \ No newline at end of file diff --git a/res/layout/headlines_fragment.xml b/res/layout/headlines_fragment.xml index 1828adb2..c5536c5c 100644 --- a/res/layout/headlines_fragment.xml +++ b/res/layout/headlines_fragment.xml @@ -3,7 +3,7 @@ - + diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml index 1cb583f6..656ff80a 100644 --- a/res/layout/headlines_row.xml +++ b/res/layout/headlines_row.xml @@ -4,7 +4,8 @@ android:gravity="center_vertical" android:padding="3dip" android:id="@+id/headlines_row" android:orientation="horizontal" android:layout_height="wrap_content"> + android:paddingLeft="6dip" android:paddingRight="6dip" android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/selected"> + diff --git a/res/layout/main.xml b/res/layout/main.xml index 9593924a..fcac33d5 100644 --- a/res/layout/main.xml +++ b/res/layout/main.xml @@ -1,16 +1,17 @@ - - - - + + + + - - - + + + + diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 2e1278de..76647f0e 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -4,4 +4,6 @@ + + \ No newline at end of file diff --git a/res/values/style.xml b/res/values/style.xml index a52af801..84a40558 100644 --- a/res/values/style.xml +++ b/res/values/style.xml @@ -4,6 +4,8 @@ #fafafa #0000ff #ffffff + #f0f0f0 + #ffffff