From 3608ba18b68830f9bd65b0970ba85a4a3a1d5d44 Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Sat, 23 Jun 2012 15:57:00 +0200
Subject: [PATCH] Improved Feedmenu

---
 res/drawable-hdpi/action_about.png               | Bin 0 -> 1764 bytes
 res/menu/feedlist.xml                            |   4 +++-
 res/values/strings.xml                           |   3 +++
 src/de/podfetcher/fragment/FeedlistFragment.java |   9 +++++++++
 4 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 res/drawable-hdpi/action_about.png

diff --git a/res/drawable-hdpi/action_about.png b/res/drawable-hdpi/action_about.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f39c428ac6cacd0ad4fd9e7ab4252a77ce91a53
GIT binary patch
literal 1764
zcmaJ?X;2eq7!F0za*QByiN{V56ohOx2O)t#fg~6p2!TRSYh98JNg>%BOA;)tBa9k|
z9j`Lrg(DzZ$67$N7MO|x3d${t##%eHf>taPPz$2%1_Aq{bZ2(I?|bKcp7(mb+5Gsp
zC<oi+wgdvffxm$x#8<NAU2KDYQ$Cp3gD)N!SA->^QcMqP5JI>FO+x^_0!~MS2rS7~
zw;~|~g7q4Ck_ZzCVp(ETL4qwlB!fbQqX~qNFoOyfXCN4mhNR1tY~pa;6(S&)u!$*j
z0a>7mL}c;}+ciky_P8YR_6#voLJSK9LJTaNK!IQ|U{GW#wJZahIL*t#_ZBlq1g2fE
z3^wsyQX)Y-5Q%CKfKDO@h{=Hv5J)3IG%}OM^am(phzvp$kjw~x$SgX8MTUTxhloeh
zNTe(whc^=oKe3523{$Z{P_NgM^i&e6Ne3Y&lL?Y3AcYcudjx2+l^ARYP-?wq890bm
ztdXlQIjRIKjBpy7g|UfvrteBnsOD&u+L<=t4Fe6Z3WP{xOG&ei0>S^gDim|xT1<$%
z&-XuxwMp431Qa4#G)p7K2PgHigi^60H3*EMnj{p>ob6(~48>5b3{?S<iF6VK2w<^X
zX|YTr1OgUcsl{NW7~yl+M4W>pmrGbw9y0<84`R?G$Q%gbLQERO<kBJ{!+CUwL5qN9
zu^d#Kr9hO}ELQR!8#FK0A_j#DkIX?davdV!X;1|)T{KHRe=hWS`DU<^`Ev=J7YpLa
zfR@qzYt*wQTtAlWoN)2Oob(YTu6GSC>^O7T6n<Zl`JC`1gL$YpA!b>E`|k9tzH)zO
zYBkUjeP%&pAjG$=wYB5d+u2T9eexpl_lomNYd<b8_pGZdT@%>aRdBP^?oc$9%6WM4
zIeWz3-tJl3P@BKa*wwtey21Lf682#5U`~EcDEg-JfYG7JCe6BP=e>{0ZF-*8oOr7<
zS(hgC=0Bg>!S^?&{+XKd$_)D)x<4`|S)3Q|8)uADi!xpANL98!rt?1I`kR*YA2#^j
z%`+~dt76BE(gg3f6!WLej1oa_flUIaGwRe^>fIvK&i-WM*W|4(>F&ta54gE~cbJ&5
zP;s_+Q&cm*yXnHj>v($#;eaPO@i*H<pR2Mk$4;&;Pj|h`&E4sA)56#nBX%#S%|vQ^
z>n%N`Z#O=2)`q@@c&kl}eoDp}Q|BLlrMkI<?)uz4+l%a{EF2l_C@$NVFge6&EV$O-
z)ZJd=;if<Qy1Dd7v$;cC)zaM;^o736<?PO{pSWypd8`D{(v4g8gcc2(eWcw_xKx_;
zx8>1Z*a<;vz{^UhU$)M)aI)j%o#hofZ|`kc3k_6#)k;I*Ch<{-CY0?yxT|eIYg}<$
z%`faQG?#3fXc<nW9qFc-$HE;}ETi}DD;}?U(pmMuEM1kI$;eN3Fz<9262tA4E%n#G
zr0mZ>5o&H9?GeZpZM6>OqhUF*tAj6`i|B}|^WXGgjkRaxz9thAG61^D_FQsCYe&)=
zve%GOdR=9UC?lp@8}j-dLfgu_ZkDaQ*I;i~RZ@obb{p^d;W1)^M>R1X_BBB-k3S{b
z7ayBCFkInP!t<s1bsbx>-j3}ZcC`IeV^nVC67AM3R#!`@hZ$Dp+Fic?11O}ZO)k|f
zOFNYbQIGgFKG*7nN1Qwy86rtav!H0DZvU@UkKwg(J?UO1eZ#Z!!|7hs8~t$4X3t!H
zQOp$OT()5%aB>xI{lS<wj&~SZtFXvR>mCcy8>Abjem+;YR>ny#6rCQ2)m9s|Y2(6V
z-?qSx>gbZ9;a8i#S$~Qosc2Hf?X9T1n6kw=J!V~|cj_<RZkKXh^`=7C_K7PZx!UtK
z(moo$X>aZ2U@pI^^74Zw#Z3>L`qlRr^9$-;)*7r%7WG+gJlVd=BJ4~c(9v`8vcDI&
Y6RKUD#(0B`J1qYlJ~xhYK4M$$KMBsYYybcN

literal 0
HcmV?d00001

diff --git a/res/menu/feedlist.xml b/res/menu/feedlist.xml
index 8df6bab26..871768fed 100644
--- a/res/menu/feedlist.xml
+++ b/res/menu/feedlist.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:id="@+id/remove_item" android:title="@string/remove_label" android:icon="@drawable/content_discard" android:visible="true"></item>
+    <item android:id="@+id/mark_all_read_item" android:title="@string/mark_all_read_label" android:showAsAction="ifRoom|withText"></item><item android:id="@+id/show_info_item" android:icon="@drawable/action_about" android:title="@string/show_info_label" android:showAsAction="always"></item><item android:id="@+id/remove_item" android:title="@string/remove_feed_label" android:icon="@drawable/content_discard" android:visible="true" android:showAsAction="collapseActionView"></item>
+    
+    
     
 
 </menu>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 43ff88699..23562ca59 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -55,4 +55,7 @@
 	<string name="stream_label">Stream</string>
 	<string name="player_seeking_msg">Seeking</string>
 	<string name="player_playing_msg"></string>
+	<string name="mark_all_read_label">Mark all read</string>
+	<string name="show_info_label">Show information</string>
+	<string name="remove_feed_label">Remove Feed</string>
 </resources>
diff --git a/src/de/podfetcher/fragment/FeedlistFragment.java b/src/de/podfetcher/fragment/FeedlistFragment.java
index 1dc925164..aecaa7165 100644
--- a/src/de/podfetcher/fragment/FeedlistFragment.java
+++ b/src/de/podfetcher/fragment/FeedlistFragment.java
@@ -111,6 +111,9 @@ public class FeedlistFragment extends SherlockListFragment {
 	public void onPause() {
 		super.onPause();
 		pActivity.unregisterReceiver(contentUpdate);
+		if (mActionMode != null) {
+			mActionMode.finish();
+		}
 	}
 
 	private BroadcastReceiver contentUpdate = new BroadcastReceiver() {
@@ -158,6 +161,12 @@ public class FeedlistFragment extends SherlockListFragment {
 				};
 				remover.execute(selectedFeed);
 				break;
+			case R.id.mark_all_read_item:
+				for (FeedItem feeditem : selectedFeed.getItems()) {
+					manager.markItemRead(getSherlockActivity(), feeditem, true);
+				}
+				fla.notifyDataSetChanged();
+				break;
 			}
 			mode.finish();
 			return true;