From 30eea4c5e4022a5630138f2d3bd36eccf8031dc4 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 8 Sep 2011 16:45:08 +0400
Subject: implement placeholder headlinesfragment fix reloading feedsfragment
 on rotate

---
 res/layout/headlines_fragment.xml | 13 +++++++++++++
 res/layout/main.xml               | 14 ++++++++++++--
 res/menu/main_menu.xml            |  5 +++--
 res/values/attrs.xml              |  1 +
 res/values/strings.xml            |  1 +
 res/values/style.xml              | 10 ++++++++++
 6 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 res/layout/headlines_fragment.xml

(limited to 'res')

diff --git a/res/layout/headlines_fragment.xml b/res/layout/headlines_fragment.xml
new file mode 100644
index 00000000..05281162
--- /dev/null
+++ b/res/layout/headlines_fragment.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" android:id="@+id/headlines_fragment">
+    <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android">
+        <ListView android:layout_weight="1" android:background="?headlinesBackground"
+        android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/headlines"></ListView>
+    </LinearLayout>
+    <ProgressBar android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_gravity="center" android:id="@+id/loading_progress"/>
+    </FrameLayout>
diff --git a/res/layout/main.xml b/res/layout/main.xml
index c91f2a76..63cdbda7 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,9 +1,15 @@
-
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"    
+    android:layout_height="fill_parent">
+    
     <LinearLayout android:id="@+id/linearLayout1" android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal">
     
     	<LinearLayout android:layout_weight="1.5" android:layout_height="match_parent" android:id="@+id/linearLayout4" android:layout_width="match_parent">
 
-            <LinearLayout android:layout_height="match_parent" android:id="@+id/feeds_container" android:layout_width="match_parent">
+            <LinearLayout android:layout_height="match_parent" android:id="@+id/feeds_container"
+                            	android:layout_weight="1" 
+             
+            android:layout_width="match_parent">
             </LinearLayout>
 			
                 <ImageView
@@ -19,3 +25,7 @@
             
         
     </LinearLayout>
+    <TextView android:layout_gravity="center" android:visibility="invisible"
+    android:textAppearance="?android:attr/textAppearanceLarge" android:text="@string/no_unread_feeds" android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/no_unread_feeds"></TextView>
+    
+</FrameLayout>
\ No newline at end of file
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index 8552cfcd..5b87eed0 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -6,7 +6,8 @@
           android:showAsAction="ifRoom|withText"/>
 
      <item android:id="@+id/logout"
-          android:title="@string/logout" 
-          android:showAsAction=""/>    
+          android:title="@string/logout"          
+          android:icon="@android:drawable/presence_offline"
+          android:showAsAction="ifRoom|withText"/>    
               
     </menu>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index fa4748c5..2e1278de 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -3,4 +3,5 @@
     <attr name="feedlistDivider" format="reference|color" />
     <attr name="feedlistBackground" format="reference|color" />
     <attr name="unreadCounterColor" format="reference|color" />
+    <attr name="headlinesBackground" format="reference|color" />
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 76ff7d7e..e4ac1e8a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -23,4 +23,5 @@
     <string name="login_api_disabled">Login failed: API disabled.</string>
     <string name="login_wrong_password">Login failed: username or password incorrect.</string>
     <string name="login_success">Logged in.</string>
+    <string name="no_unread_feeds">No unread feeds.</string>
 </resources>
diff --git a/res/values/style.xml b/res/values/style.xml
index b9c13774..ba0bca29 100644
--- a/res/values/style.xml
+++ b/res/values/style.xml
@@ -3,12 +3,22 @@
 		<item name="feedlistDivider">@android:drawable/divider_horizontal_bright</item>
 		<item name="feedlistBackground">#fafafa</item>
 		<item name="unreadCounterColor">#0000ff</item>
+		<item name="headlinesBackground">#ffffff</item>
 	</style>
 
 	<style name="DarkTheme" parent="android:Theme.Holo">
 		<item name="feedlistDivider">@android:drawable/divider_horizontal_dark</item>
 		<item name="feedlistBackground">#101010</item>
 		<item name="unreadCounterColor">#0000ff</item>
+		<item name="headlinesBackground">#000000</item>
+	</style>
+	
+	<style name="SelectedFeed">
+		<item name="android:textStyle">bold</item>
+	</style>
+	
+	<style name="Feed">
+		<item name="android:textStyle">normal</item>
 	</style>
 	
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf