From 1502a8cc30b6f4cfe9d87c34921760ff2acb1de7 Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Tue, 17 Jul 2012 12:56:17 +0200
Subject: [PATCH] Added 'empty'-views for itemlist and feedlist

---
 res/layout/feeditemlist.xml                   | 22 ++++++++++++++
 res/layout/feedlist.xml                       | 30 +++++++++++--------
 res/values/strings.xml                        |  2 ++
 .../antennapod/fragment/FeedlistFragment.java |  1 -
 .../antennapod/fragment/ItemlistFragment.java | 10 +++++++
 5 files changed, 52 insertions(+), 13 deletions(-)
 create mode 100644 res/layout/feeditemlist.xml

diff --git a/res/layout/feeditemlist.xml b/res/layout/feeditemlist.xml
new file mode 100644
index 000000000..c2c51ba63
--- /dev/null
+++ b/res/layout/feeditemlist.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <ListView
+        android:id="@id/android:list"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:drawSelectorOnTop="false" />
+
+    <TextView
+        android:id="@id/android:empty"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:text="@string/no_items_label" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/feedlist.xml b/res/layout/feedlist.xml
index 88a2de329..b88e2eb6e 100644
--- a/res/layout/feedlist.xml
+++ b/res/layout/feedlist.xml
@@ -1,15 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
-	android:orientation="vertical" >
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
 
-	<ListView android:id="@id/android:list"
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1"/>
-	<TextView android:id="@id/android:empty"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:text="@string/nofeeds_msg"/>
-</LinearLayout>
+    <ListView
+        android:id="@id/android:list"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <TextView
+        android:id="@id/android:empty"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:text="@string/no_feeds_label" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d75084d84..3e8743902 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -119,5 +119,7 @@
     <string name="pref_revokeAccess_sum">Revoke the access permission to your flattr account for this app.</string>
     <string name="access_revoked_title">Access revoked</string>
     <string name="access_revoked_info">You have successfully revoked Antennapod\'s access token to your account. In order to complete the process, you have to remove this app from the list of approved applications in your account settings on the flattr website.</string>
+    <string name="no_items_label">There are no items in this list.</string>
+    <string name="no_feeds_label">You haven\'t subscribed to any feeds yet.</string>
 
 </resources>
\ No newline at end of file
diff --git a/src/de/danoeh/antennapod/fragment/FeedlistFragment.java b/src/de/danoeh/antennapod/fragment/FeedlistFragment.java
index b09e411ec..bb96ff4b1 100644
--- a/src/de/danoeh/antennapod/fragment/FeedlistFragment.java
+++ b/src/de/danoeh/antennapod/fragment/FeedlistFragment.java
@@ -67,7 +67,6 @@ public class FeedlistFragment extends SherlockListFragment implements
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 			Bundle savedInstanceState) {
-		super.onCreateView(inflater, container, savedInstanceState);
 		return inflater.inflate(R.layout.feedlist, container, false);
 
 	}
diff --git a/src/de/danoeh/antennapod/fragment/ItemlistFragment.java b/src/de/danoeh/antennapod/fragment/ItemlistFragment.java
index fa25eacab..6eb386abc 100644
--- a/src/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/src/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -8,8 +8,10 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.ViewGroup;
 import android.widget.ListView;
 
 import com.actionbarsherlock.app.SherlockListFragment;
@@ -81,6 +83,12 @@ public class ItemlistFragment extends SherlockListFragment implements
 		return i;
 	}
 
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+			Bundle savedInstanceState) {
+		return inflater.inflate(R.layout.feeditemlist, container, false);
+	}
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -93,6 +101,8 @@ public class ItemlistFragment extends SherlockListFragment implements
 				onButActionClicked, showFeedtitle);
 		setListAdapter(fila);
 	}
+	
+	
 
 	@Override
 	public void onPause() {