From 7bf9e771c2d89d9d7ccb052e7ed93d13076109e2 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 16 Apr 2013 13:48:44 +0400 Subject: [PATCH] properly toggle unread/marked/published icons on the actionbar --- res/drawable-hdpi/ic_menu_publish_light.png | Bin 1219 -> 0 bytes res/drawable-hdpi/ic_menu_published_light.png | Bin 0 -> 977 bytes .../ic_menu_unpublished_light.png | Bin 0 -> 1169 bytes res/drawable-hdpi/ic_read_light.png | Bin 0 -> 1636 bytes res/drawable-hdpi/ic_unread_light.png | Bin 0 -> 1599 bytes res/drawable-xhdpi/ic_menu_publish_light.png | Bin 1760 -> 0 bytes .../ic_menu_published_light.png | Bin 0 -> 1266 bytes .../ic_menu_unpublished_light.png | Bin 0 -> 1546 bytes res/drawable-xhdpi/ic_read_light.png | Bin 0 -> 1923 bytes res/drawable-xhdpi/ic_unread_light.png | Bin 0 -> 1809 bytes res/drawable/s_menu_published_light.svg | 189 ++++++++++++++++++ ...light.svg => s_menu_unpublished_light.svg} | 8 +- res/menu/headlines_action_menu.xml | 2 +- res/menu/main_menu.xml | 6 +- res/menu/offline_menu.xml | 6 +- src/org/fox/ttrss/OnlineActivity.java | 35 +++- 16 files changed, 231 insertions(+), 15 deletions(-) delete mode 100644 res/drawable-hdpi/ic_menu_publish_light.png create mode 100644 res/drawable-hdpi/ic_menu_published_light.png create mode 100644 res/drawable-hdpi/ic_menu_unpublished_light.png create mode 100644 res/drawable-hdpi/ic_read_light.png create mode 100644 res/drawable-hdpi/ic_unread_light.png delete mode 100644 res/drawable-xhdpi/ic_menu_publish_light.png create mode 100644 res/drawable-xhdpi/ic_menu_published_light.png create mode 100644 res/drawable-xhdpi/ic_menu_unpublished_light.png create mode 100644 res/drawable-xhdpi/ic_read_light.png create mode 100644 res/drawable-xhdpi/ic_unread_light.png create mode 100644 res/drawable/s_menu_published_light.svg rename res/drawable/{s_menu_publish_light.svg => s_menu_unpublished_light.svg} (95%) diff --git a/res/drawable-hdpi/ic_menu_publish_light.png b/res/drawable-hdpi/ic_menu_publish_light.png deleted file mode 100644 index 72acf3dc92f548a6e08cd20fb162f1c7801abe42..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1219 zcmV;!1U&nRP)&&}QU(InCzF8AKG*WUYI_paC3yQQ(rW zBtFN1Bfz+%lhsUUSty8YUj_65-9Ssd46DQ}Fb4EX`mvH?sR6cE0GogwpsmpitHcyA z2<(+~CZtfwg*E}tH-l9K+AliRE=gY(16{zC4WU^X-L_Zdvr{Mr)>58r4oW(j7uvoQxC6KoxB*yMAJ-sS zQf}X6g&_mh#jY%A0vG~@(tq$CU^B2Lo@Yg@BWFM;2I?wOl1@q*1|9=;0LSWCFNXrR zrnM51rX&pkj{xrgr<<`))vZK|TWxm$lfa~;sf8v;ItA>u{SB}aXlVZ)Yru<{&$G6F z14e-nN#m6!N*cGl5qJ~0K62ku)Z;=ez~#U*zz4R6Z9i@Mys`&+FKC9vT?~ zUBC;#XSVOP9Zbb(Z1e-4He%CQ19p%Uv-g1!;6y-Y4e$oAC#?@<*hwxW)`Hj=IFK!5 zwp)RlNb>#zK-PV_f%j~0lXNJ*kfa&gy(B+IS1j>4)a62wrX_tV>2+WOu#cpdpTkAK zfbEA$=AQtz0;g)_(6AVg^t+@!;8|cIGt>sWV*AmOc|QSf)w*xP3z?)blFW2CH`HtU z#*%5nz^}FJ7i+*%wl~jlMz2>dv#!~14MSOjSS+Oflop%m1df3?jVt0fdN;CMhbht26T@jTeRpYUl= diff --git a/res/drawable-hdpi/ic_menu_published_light.png b/res/drawable-hdpi/ic_menu_published_light.png new file mode 100644 index 0000000000000000000000000000000000000000..599ca764342b20e4a7d7deb3763d16936ad53f73 GIT binary patch literal 977 zcmV;?11|iDP)K7+zAtOJt;b2$%!;J|fIDN7a#!>|l&0vo^@Fy~A!8=Al#umfxdLC_gAV4#37 z3|D~$u%4fv6Lx_{5Cr?SPF4XC`4>R7NM;Ub16wu`#vqQ|ror&Y6V2U-xTvsYp-pby zZ8WSSTvXTuY#7>CfMuWtEC6@$%w`TSaj{OkW@w)VDoXnWa0;}d??uAIMYlkd=Ur3f z1Y(sZz;loBHq1qwQZTtt-Xb*)JOG{|E>;9oPJeqVQ3W0XtB9z=;S+ox5He%YX98KB zl4Z;!;#wbpA0BfW;UnNoX{!J;h`Y?7i>UyQfG@zY$Gj?vN`KeLKBkGdO%2`mOF%v9 z^SOwLePUo1m;&yguXG!6vwh6zbRJmrm^%d@3k3YB10BStTSyJKj`ceS-XhsZvqlXO z+w$P>8+o%(86mff0+h;KheRySS{PmrRP#4PJ_2gWxC#=4JzOF2kVM=?y6D@8DHk$60wyxH zw@3$Sm3~WUTXU!VnU8?WjO`sHWhN1igQS~*<3Bf(fOE^3Bc-itXxH8oUtvvv$pR`T zRX}t~+%&wXh3qif2=NP~GHVlPZSfV(DxhgPxwiS+9_9n3Q}i^Lni#$6_HYHf%7*vatXEa)m9m*1^iYy!5CBko~i7vZA9C?L9AXrO13n?f78BQRccSkq{9F2BWa zEV0Xgy8-wgu9!58+$GNKuIMVLeDjRAWU*VM7kot34Ey zNMipe2#N|TB?`GhL5PS63DtuI1vwAZLk2<<6fxvWMvO!h>PzxDQE?~AjGF1;oRQs` zea_sw@0o6w{NTVnYp=D}_uaGi+WYL&H!v_jFJnQs33Q5c0=kW!7jRxmknI8Bf||LU zmUOD!puSeBknIJ)24Dyn1TJcuUTbIqM}aY5MAFn;0doqly%J~ut2^h{7RG^wq!U$6 zl>&0|Zv*Go$*c{W0X9{MD4oRluxZde^5nT2IhQD^s?Y}h{b3WsYBDZSR8^s&68p2j z5@1F#NylSBk|u3G20RJelaM!xx`xn7 z;2~hd_72<8k}7FR(r)0zn(`(I7zMrr3=}t8ePosAUE7b?UKHy<(tE%g3Atw>WeB}6 zQ$}rHNLKrA18xTTbDzazPh^elt&)C@^s^7R0=OlC!&!7Rgd|N$I+$0QJAe;?>A>X% z;7!}BBC%7zb3k;?w2IowsH6!=+kyM}C#e;{e%n_@Vtxg-F?%SsjM~=$Nk_> z=D+~(itVRu_lFIVekZFoe+4z~_0}7l%QT zCV@kNX*e?6ej+33C+96XW;B-aIeMLil@U%JNdu_xP z&Xw4)V3~j@r>KB@Wo(voG-P|H?NzoH*}fWh8Mr>;dtJm93TX8SG|Nt|OV37a@1^{3 zYX;L~^}h^Lz@G)%!u*;+Z1wFg+>c3mJeHtp4vbZ_&7g|>O#l6bt2nWX?M3pHT&e_& z&}L1ZCyZ0E(JK{@SBwVP5qGz6hU^FQirM)N()Cc5(^#+l>W0Q?_5F~!hxANl^v j==tx&=LB>cJul#I&UH51%v}~P00000NkvXXu0mjf_BIp7 literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_read_light.png b/res/drawable-hdpi/ic_read_light.png new file mode 100644 index 0000000000000000000000000000000000000000..9ef52959943404b2ca537170005784dded4e4651 GIT binary patch literal 1636 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>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(#^lGsViy*u>4q+`z@u$-vFf(ACh=#L&{!#L3yw z&D7A`#K{n**Cju>G&eP`1g19yq1P3sUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dHn$kL zn3!4`IN~%9sy79$ z1JgB67srr_TW@BZ_ZCT%I9^`5d5N#^}mfUnesXN^lRALTFYn8ti5+La*nv&hBt5C z)a-w6^Zv8l`PpSM>Y*nWYlS{kHk=@F<1L#J+yCDT5)YnRZpeG2n8}=J!mZcnc;V#x zX$OiwNaY;4+7MpBexg}7?)K^Jdv$VM4mlV;Y<0flp~=?7VV3^n$HDhoV;|&YH!v^kS6( z+pmM#>pJBHx#XFqTmIgEXvswz?ZZ|Er|h|tmT-Uh^jUqwi^ublA81+d^A+>oS}^T` zZJ~s+`GFnktm}${s}}wI8(1*+khIOAyG2e*R$iB!`Oxio-{gcQ{p*y0a3ORZ22jX84v zfayNgiE_@HJWg-C`JYFwv9h4;`aQ#M`AwVu(eCF$vl&XwQjT6WWS=P@(iD>7=*qRS&V6L!s6_oGh1P~hs1 z_~3Z$jnP~(d7>1e@?tQ!~CVBJzRZzL_>FVdQ I&MBb@0NT4~jsO4v literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_unread_light.png b/res/drawable-hdpi/ic_unread_light.png new file mode 100644 index 0000000000000000000000000000000000000000..d516f7708c3e9b6d1c6b47e179c9e34e9afa7465 GIT binary patch literal 1599 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>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(#^lGsViy)Xl=p)xgEn$-vFf(ACh=#L&{!#L3yw z&D7A`#K{n**Cju>G&eP`1g19yq1P3sUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnrq$ zG!Lpb1-DzAaq86vIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zjz4qRi-Cb@qo<2w zNX4x;GtPR41WFt`FPm<%c~R^-tuB_0F)U77IGYq+%ofx1iaxr3frq)`tN4Ug?t_;~ zE*|4((hyK-Qn|EK<@=Zae}~}t4G)*3ukQKe^5Wpnq`%ROqF8m>AkBT*je!I zI!)oknLSa1TQTNd<+Q+~X<51jJ;d$pgx9$-y4(!nhu3e}rH;|br&8-~#xCo<6m;ULt>i|&59J4sH!TZWEV<0r*nPJ8 zp1LU-akHOggr;UKo)YqGmdiu28BG2M)pegQtx&K0&o@7`(D=bbzh#qrQvU8Km$7-U z&)EAf=aMSqhw2d9|^ zERpgkywY*{V3<~V8o$W~j$_GXTXsm42Iqs*3N*=dUH!*pz_35~!fd~~O}jxwx~Hq3 J%Q~loCIAR6TKfP1 literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_menu_publish_light.png b/res/drawable-xhdpi/ic_menu_publish_light.png deleted file mode 100644 index 8c82c45001423a688dee21bf08548184812c2e90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1760 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 literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_menu_unpublished_light.png b/res/drawable-xhdpi/ic_menu_unpublished_light.png new file mode 100644 index 0000000000000000000000000000000000000000..7b32106b1a788cb418bce0d964d66b20d0170647 GIT binary patch literal 1546 zcmV+l2KD)gP)t<88FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H11&2vQK~#90?VD?eRaF>CE62ulkj%nY^Y24z-6XvLu7pUPX7M8AqKiz$>EwO5@KODjj6>BruNvuEGV zoPEy0W?nc9v(~r1_3rnq{jG0ZPF+Jo13ejiYE7Wl=oO&W1Zs_50cuU4*68s9^ee)N z?IFOZB7BvA1Cmab>!hwbd4TPUfw{m0U_5XoP**OQ643#)06zeGfQ^z)l`rE?4mq$J$ zfE$6!a`aItWO2_W!1#>%vyy%%n1(vRb{%jnFg5&Kouj`Zk;OfI8VobM9i%5YvqAwf zVS5BH4Ojq-%+sb!bO1M}WsF%dU=#&rc#?jTv<|ovSOFX@%69_l$Vky^vKW$dTGD!g zAoV&>c23`2)O0l{>2FDEfH}a&wct?1YH*6}y}%)$RZ@GY4kR51p0~XlSOg3xfLAUQ zA;9@bQoHR|pc&W(?2zkFdJA8oQ*LZ1H5Z{VurtF z;2A2g@~n6akaS$q3g9kaXN<{E;1%1mGyH4=))vjLYC%xaFOnL8XMxj^>V5O=;T(yjdilA_TbA_GH`RY+sb8fuwJN`+$9ssv*E? z+n1&^-vs>HJ*r(%ga8YHmw*p|Ew-20o^CsJhLLm-cm#;K^B6d zUx7iuOkg?iq3v7Jj3pf+5b#u_>IUHUl%`vNAIsqRA1WCGMiYFKZ`dA|WF%=1LBDB(T=@H7Pc) z0e?lx?y;>nV@aogugfJ?2?3I_wZXtD+p+6>Nk<9h`SURVxI3k<&r7G*8AS=u4!lpW z+dB!kgJ4r5`i<5DD{c2p@Usp$7%7{PG$R0Cgnf4#MF`LVG)h`6sX5&6YzcRN7XW`o z?8gK1;~a&F&gMvQ18`k}{W0LXa>y4Uzy?WQ##Kn#53Gu*deHXJ1by2gc}B#(l$go>AJK&hYo^gNJQ3(?WFA%GKM*@-1bKVQ`pZ0 z8<^7wwzdbRb&=5TQQK{FJ|RjH3xZJ)7b9A-?h+%KsZm`Gw wVB-IT9{-!6UIA)Npw{RWpw<{9 literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_read_light.png b/res/drawable-xhdpi/ic_read_light.png new file mode 100644 index 0000000000000000000000000000000000000000..62e3d1ad667faafa33230db86866a788f9d2baac GIT binary patch literal 1923 zcmaJ?Yfuwc6kZ|%q6kqQzFjuaf|BfR41~l$41`C-L=34=XpxXC5HQJ_tR`TqA*kgc zm8n$`Z9!WRd;y9&Ma58|)(4f2ia|xe2Rc>3s+6Ji(TxiBN9oS&-h0oS?>pz*^PSm( zSZS1->l9Z20NljUA{n_Zu)i)&#~E zDtpB_j1K^#=xTWaksw*bQ|dHKh24i~(%>W-0QdqEu25!S1el7YtF<9e--*)@s8)qQ z@qrRVf`?-n>gXIj7MCNHD|51xTooh;1^Ff(Nua?91!&SN*BW@H5a=y0kKEhMFa*AJ zA+kcCcS$8kV!?2o9s>iJ2t$bkp;S41&OUFl;m$nZ|icojx5#xm+%cuwWL8L3%I@*;+zjVrUJtAqEj< zQ0mnIEIZ7n|@2b%Zdm9KD z_95T@BsR#iaSWDW2Hi@%l5AWW%^nKph3hc|q0`HCy5&Q+7@MIZbcPHa4u;1CGEq>X zP^z_d%Ugs*!V_x^ghH#t#G(+0^y z5et*a!1mVutJOm$Qa|?XuyD!4u=Fu4sdqgoY$MgMfSi|pu}CO4U4LAblrd50xgq^V z^S+}NuR8f?uVwNoXmmtup{zOPpkH!z1?ZRQ<=N!ix)g{Fd zp-ghv2t=A?_5KybXJ4gMB|7Hk_NUCuxc?)k%iH86+cL+hs`Y;Ce8I1|q{of*)B&H! zcRsTPGHd_vdbX&?fmDuGqr#+(YT$|%op;J9}@bDdv9l%u~nzG%NJ zN8~}dlGob2sU_wPb&X@`_@K6{KDpP;0lh7>WK%2cqzmYMo3hH%@;G|Vy4=P0s8BPl zZLCw#tOboNMfZPCURN^s(WuaQ?7ytHD;)C+TRL5+w3*f~I5WEG=8HWKf^jcu(Fr%V z2wx^5T7Ku!b7Zi~nwa7f~!T#hm4br5s8k*clxAZQ<%QN{>me=J}=4-f@U9k4-csXFD(Z0dRa zMEdsj0K6=W4-8o0nceYwHHTTDPK|DaW$@%RkG{U(CaqUQ9S`*x2!D zgYDa*YP_tu=49;PuUoq53DxU2(8Fr7Z?@iNPF`OaTVlxNKMF_~uQkVuQ2)&C^S?=J z&dI+97T)-VKpF*>az1Crt=O8d*LCtz%EM2}Pj-H`=jRxWztptrjqHFYNn6=-Y)69?^8pOe?ITsr~x!HwW9FG bS_da!>C<=yCo&Nv|B8S(LMl2GmSXt_EZgG| literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_unread_light.png b/res/drawable-xhdpi/ic_unread_light.png new file mode 100644 index 0000000000000000000000000000000000000000..606c902c2142445efbca833b8b0b30f980ba8e17 GIT binary patch literal 1809 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=YshfqHtAVAdlYyI|p{t>#iJ_&diIcOV zo2j9>iIX8ruSMv>2~2MaLa!rEy`aR9TL84#CABECEH%ZgC_h&L>}jh^+-@<) zX&zK>3U0Sp;MA)Rbc{YIYLTKECIn1BASOKF0y*%cpPC0u??u3bz1sg^5iq|rd%8G= zRNQ(q%QNFjfW-01naj4l+aa^6gO&ePN6;My!E(nhkB+k5S=YpF+wq`j5l2(ShlKvB z0!DGIjtHBM2d+n-F3Rxl5`XD>CoBC}-{c?lANXw^ol%+Wr^fl&_Q%D{$!GR_|GjU| z_q`=P#|wMH@|JN3Fe*8)bT9}iFu629ISv1BR~2xjG|t_$G1Y-{4y*sFxhX&QcuGrf z-wM`BXh}9W#8qHXVBN~Z^X=xx%~vk@varlx*4c03l~H`-`?iZ5KR7=n)STL+df4u{ zW!r_*3yfwk-#(aT&}aPmehc57M_r~oa*ewmIIsP8Etumhdv&C=4^u14S{|)Ob9=T$ zeO}+(xI*h-Yl6Fz(IM%N)(>KpwGZZ9V7*tc!1H8>f?#;kvoooYq{MplQMU>oC_1j&seNe=aFYDW&CA4EqnR zd)dZYtm+wOoO?Y-K=6Fgf!znW*pfM9nETz8AIPk=ep4f8!)*TQM2C>|3YI&M8SE<8 z&1Nq96y>~IE#t`dhN)5VzIESDx^ZsUno(j9m6b z)`NUzHyin*pBua+12Wydo#qJM-Ky7o)#vr5^xJ=#WFAz{oOk=Q{-dkg4)dOGFpzx6 zm!jRzU&*%I< zW+fjn-?&YGf=hmTuCA4q@;ZY}c~ZYUOU_50(YfW8c{orcD)8NhJ3SfCm!uW^{hodQ z=jQIoDR!s0HcLjwl2rRyH`d323&A=;JZE=2e?2-B|`*v>XdA3C<{gdzmp&k5k z8NzX$&7t4_BRgw_7$5qis)?N7p{YOP;5YvUMuz)h*}0{6AN>K=Q4F50elF{r G5}E+IvAu%; literal 0 HcmV?d00001 diff --git a/res/drawable/s_menu_published_light.svg b/res/drawable/s_menu_published_light.svg new file mode 100644 index 00000000..752fe0f6 --- /dev/null +++ b/res/drawable/s_menu_published_light.svg @@ -0,0 +1,189 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable/s_menu_publish_light.svg b/res/drawable/s_menu_unpublished_light.svg similarity index 95% rename from res/drawable/s_menu_publish_light.svg rename to res/drawable/s_menu_unpublished_light.svg index a0d818e2..6981beaf 100644 --- a/res/drawable/s_menu_publish_light.svg +++ b/res/drawable/s_menu_unpublished_light.svg @@ -13,10 +13,10 @@ id="RSSicon" viewBox="0 0 32 32" inkscape:version="0.48.4 r9939" - sodipodi:docname="s_menu_publish_light.svg" - inkscape:export-filename="C:\Users\fox\workspace\org.fox.ttrss\res\drawable-xhdpi\ic_menu_publish_light.png" - inkscape:export-xdpi="475.98999" - inkscape:export-ydpi="475.98999"> + sodipodi:docname="s_menu_unpublished_light.svg" + inkscape:export-filename="C:\Users\fox\workspace\org.fox.ttrss\res\drawable-hdpi\ic_menu_unpublished_light.png" + inkscape:export-xdpi="270" + inkscape:export-ydpi="270"> diff --git a/res/menu/headlines_action_menu.xml b/res/menu/headlines_action_menu.xml index 5764e179..c4e6d3c4 100644 --- a/res/menu/headlines_action_menu.xml +++ b/res/menu/headlines_action_menu.xml @@ -14,7 +14,7 @@ diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index 7d41f16f..d7d5389e 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -87,7 +87,7 @@ android:title="@string/selection_toggle_marked"/> diff --git a/res/menu/offline_menu.xml b/res/menu/offline_menu.xml index a4dbd0f1..5a952e08 100644 --- a/res/menu/offline_menu.xml +++ b/res/menu/offline_menu.xml @@ -41,7 +41,7 @@ android:title="@string/selection_toggle_marked"/> 0) { toggleArticlesUnread(tmp); hf.notifyUpdated(); + initMenu(); } } } @@ -960,10 +964,13 @@ public class OnlineActivity extends CommonActivity { case R.id.set_unread: if (ap != null && ap.getSelectedArticle() != null) { Article a = ap.getSelectedArticle(); - a.unread = true; - saveArticleUnread(a); + + if (a != null) { + a.unread = !a.unread; + saveArticleUnread(a); + } + if (hf != null) hf.notifyUpdated(); - //if (ap != null) ap.notifyUpdated(); } return true; case R.id.set_labels: @@ -1188,7 +1195,8 @@ public class OnlineActivity extends CommonActivity { public void saveArticleUnread(final Article article) { ApiRequest req = new ApiRequest(getApplicationContext()) { protected void onPostExecute(JsonElement result) { - toast(R.string.article_set_unread); + //toast(R.string.article_set_unread); + initMenu(); } }; @@ -1210,6 +1218,7 @@ public class OnlineActivity extends CommonActivity { ApiRequest req = new ApiRequest(getApplicationContext()) { protected void onPostExecute(JsonElement result) { toast(article.marked ? R.string.notify_article_marked : R.string.notify_article_unmarked); + initMenu(); } }; @@ -1232,6 +1241,7 @@ public class OnlineActivity extends CommonActivity { ApiRequest req = new ApiRequest(getApplicationContext()) { protected void onPostExecute(JsonElement result) { toast(article.published ? R.string.notify_article_published : R.string.notify_article_unpublished); + initMenu(); } }; @@ -1446,6 +1456,23 @@ public class OnlineActivity extends CommonActivity { MenuItem search = m_menu.findItem(R.id.search); search.setEnabled(getApiLevel() >= 2); + ArticlePager ap = (ArticlePager) getSupportFragmentManager().findFragmentByTag(FRAG_ARTICLE); + + if (ap != null) { + Article article = ap.getSelectedArticle(); + + if (article != null) { + m_menu.findItem(R.id.toggle_marked).setIcon(article.marked ? R.drawable.ic_important_light : + R.drawable.ic_unimportant_light); + + m_menu.findItem(R.id.toggle_published).setIcon(article.published ? R.drawable.ic_menu_published_light : + R.drawable.ic_menu_unpublished_light); + + m_menu.findItem(R.id.set_unread).setIcon(article.unread ? R.drawable.ic_unread_light : + R.drawable.ic_read_light); + } + } + /* if (android.os.Build.VERSION.SDK_INT >= 14) { ShareActionProvider shareProvider = (ShareActionProvider) m_menu.findItem(R.id.share_article).getActionProvider();