From fc88223779fe8d5b1e654bdd64f23a1955c04bd2 Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Mon, 25 Jun 2012 13:58:40 +0200
Subject: [PATCH] UI improvements in ItemviewActivity and FeeditemlistActivity

---
 res/layout/feeditemlist_item.xml                     | 11 +----------
 src/de/podfetcher/activity/FeedItemlistActivity.java |  9 +++++++--
 src/de/podfetcher/activity/ItemviewActivity.java     | 11 ++++++++++-
 src/de/podfetcher/fragment/ItemlistFragment.java     |  1 +
 src/de/podfetcher/util/FeedItemMenuHandler.java      |  3 +++
 5 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/res/layout/feeditemlist_item.xml b/res/layout/feeditemlist_item.xml
index 73805f19b..690a4951a 100644
--- a/res/layout/feeditemlist_item.xml
+++ b/res/layout/feeditemlist_item.xml
@@ -20,21 +20,12 @@
         android:scaleType="fitXY"
         android:src="@drawable/navigation_expand" />
 
-    <ImageView
-        android:id="@+id/divider"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_centerVertical="true"
-        android:layout_toLeftOf="@id/butAction"
-        android:focusable="false"
-        android:scaleType="fitXY"
-        android:src="@drawable/vertical_divider" />
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_alignParentLeft="true"
-        android:layout_toLeftOf="@id/divider"
+        android:layout_toLeftOf="@id/butAction"
         android:orientation="vertical" >
 
         <TextView
diff --git a/src/de/podfetcher/activity/FeedItemlistActivity.java b/src/de/podfetcher/activity/FeedItemlistActivity.java
index b3a3cb28e..253ebae33 100644
--- a/src/de/podfetcher/activity/FeedItemlistActivity.java
+++ b/src/de/podfetcher/activity/FeedItemlistActivity.java
@@ -1,6 +1,7 @@
 package de.podfetcher.activity;
 
 
+import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
@@ -33,13 +34,15 @@ public class FeedItemlistActivity extends SherlockFragmentActivity {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		this.setContentView(R.layout.feeditemlist_activity);
+		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+		setContentView(R.layout.feeditemlist_activity);
+		
 		manager = FeedManager.getInstance();
 		long feedId = getIntent().getLongExtra(FeedlistFragment.EXTRA_SELECTED_FEED, -1);
 		if(feedId == -1) Log.e(TAG, "Received invalid feed selection.");
 
 		feed = manager.getFeed(feedId);
-
+		getSupportActionBar().setLogo(new BitmapDrawable(feed.getImage().getImageBitmap()));
 		setTitle(feed.getTitle());
 		
 		FragmentManager fragmentManager = getSupportFragmentManager();
@@ -77,6 +80,8 @@ public class FeedItemlistActivity extends SherlockFragmentActivity {
 				};
 				remover.execute(feed);
 				break;
+			case android.R.id.home:
+				finish();
 			}
 		}
 		return true;
diff --git a/src/de/podfetcher/activity/ItemviewActivity.java b/src/de/podfetcher/activity/ItemviewActivity.java
index e83e567e6..e35568d0f 100644
--- a/src/de/podfetcher/activity/ItemviewActivity.java
+++ b/src/de/podfetcher/activity/ItemviewActivity.java
@@ -7,6 +7,7 @@ import java.text.DateFormat;
 import org.apache.commons.lang3.StringEscapeUtils;
 
 import android.content.Intent;
+import android.graphics.drawable.BitmapDrawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.format.DateUtils;
@@ -79,7 +80,9 @@ public class ItemviewActivity extends SherlockActivity {
 	}
 
 	private void populateUI() {
+		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 		setContentView(R.layout.feeditemview);
+		getSupportActionBar().setLogo(new BitmapDrawable(item.getFeed().getImage().getImageBitmap()));
 		txtvTitle = (TextView) findViewById(R.id.txtvItemname);
 		txtvPublished = (TextView) findViewById(R.id.txtvPublished);
 		webvDescription = (WebView) findViewById(R.id.webvDescription);
@@ -113,7 +116,13 @@ public class ItemviewActivity extends SherlockActivity {
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem menuItem) {
-		FeedItemMenuHandler.onMenuItemClicked(this, menuItem, item);
+		if (!FeedItemMenuHandler.onMenuItemClicked(this, menuItem, item)) {
+			switch(menuItem.getItemId()) {
+			case android.R.id.home:
+				finish();
+				break;
+			}
+		}
 		invalidateOptionsMenu();
 		return true;
 	}
diff --git a/src/de/podfetcher/fragment/ItemlistFragment.java b/src/de/podfetcher/fragment/ItemlistFragment.java
index 6cc14548a..6643229b6 100644
--- a/src/de/podfetcher/fragment/ItemlistFragment.java
+++ b/src/de/podfetcher/fragment/ItemlistFragment.java
@@ -155,6 +155,7 @@ public class ItemlistFragment extends SherlockListFragment {
 
 		@Override
 		public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+			mode.setTitle(selectedItem.getTitle());
 			return FeedItemMenuHandler.onCreateMenu(mode.getMenuInflater(), menu);
 
 		}
diff --git a/src/de/podfetcher/util/FeedItemMenuHandler.java b/src/de/podfetcher/util/FeedItemMenuHandler.java
index 7f5690ad9..0edb183d0 100644
--- a/src/de/podfetcher/util/FeedItemMenuHandler.java
+++ b/src/de/podfetcher/util/FeedItemMenuHandler.java
@@ -81,6 +81,9 @@ public class FeedItemMenuHandler {
 		case R.id.stream_item:
 			manager.playMedia(context, selectedItem.getMedia(), true, true,
 					true);
+			break;
+		default:
+			return false;
 		}
 		// Refresh menu state