From afc8996fff1dfb8b4fa36db7a965100eafe3c852 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Fri, 9 Sep 2011 20:36:09 +0400
Subject: implement webview for content

---
 res/layout/article_fragment.xml   |  9 +++++----
 res/layout/feeds_fragment.xml     |  5 +----
 res/layout/headlines_fragment.xml |  7 ++++++-
 res/layout/main.xml               | 16 +++++++---------
 4 files changed, 19 insertions(+), 18 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml
index cc65deff..1c54d3d7 100644
--- a/res/layout/article_fragment.xml
+++ b/res/layout/article_fragment.xml
@@ -1,7 +1,8 @@
 
-    <LinearLayout android:id="@+id/article_fragment" android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android">
-        <ImageView android:paddingRight="2dip" android:layout_height="match_parent" android:background="?feedlistDivider" android:layout_width="wrap_content" android:paddingLeft="2dip"></ImageView>
-        <LinearLayout  android:gravity="center" android:layout_height="match_parent" android:id="@+id/linearLayout1" android:layout_width="match_parent">
-            <TextView android:text="--- Article ---" android:id="@+id/textView1" android:layout_height="wrap_content" android:layout_width="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge"></TextView>
+    <LinearLayout android:padding="6dip" android:id="@+id/article_fragment" android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical">
+        <LinearLayout android:layout_margin="12dip" android:padding="6dip" android:background="#e0e0e0" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:id="@+id/article_header">
+            <TextView android:layout_weight="1" android:textAppearance="?android:attr/textAppearanceLarge" android:text="TextView" android:layout_height="wrap_content" android:layout_width="match_parent" android:id="@+id/title"></TextView>
+            <Button android:text="Close"  android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/close_button"></Button>
         </LinearLayout>
+        <WebView android:layout_width="match_parent" android:id="@+id/content" android:layout_height="match_parent"></WebView>
     </LinearLayout>
diff --git a/res/layout/feeds_fragment.xml b/res/layout/feeds_fragment.xml
index 9d2db1cc..9b22dce8 100644
--- a/res/layout/feeds_fragment.xml
+++ b/res/layout/feeds_fragment.xml
@@ -7,12 +7,9 @@
         <ListView android:layout_weight="1" 
         android:layout_width="match_parent" android:id="@+id/feeds" android:layout_height="match_parent"></ListView>
     </LinearLayout>
-    <ProgressBar android:layout_height="wrap_content"
-        android:layout_width="wrap_content" android:visibility="invisible"
-        android:layout_gravity="center" android:id="@+id/loading_progress"/>
      <TextView android:id="@+id/no_unread_feeds"
      	android:visibility="invisible"    	
-    	android:layout_gravity="center" 
+    	android:layout_gravity="center" android:color="#909090" 
     	android:textAppearance="?android:attr/textAppearanceLarge" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_unread_feeds"></TextView>
         
     </FrameLayout>
diff --git a/res/layout/headlines_fragment.xml b/res/layout/headlines_fragment.xml
index 588e1404..4be9fe5b 100644
--- a/res/layout/headlines_fragment.xml
+++ b/res/layout/headlines_fragment.xml
@@ -4,8 +4,13 @@
     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" 
+        <ListView android:layout_weight="1"  android:background="#fafafa"
         android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/headlines"></ListView>
     </LinearLayout>
 
+     <TextView android:id="@+id/no_headlines"
+     	android:visibility="invisible"    	
+    	android:layout_gravity="center" 
+    	android:textAppearance="?android:attr/textAppearanceLarge" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_headlines"></TextView>
+
     </FrameLayout>
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 8a8b4b16..c4d233b5 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -19,19 +19,17 @@
     				android:layout_width="wrap_content" android:layout_height="match_parent"></ImageView>
                 
             </LinearLayout>
-    	<LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/LinearLayout1" android:layout_weight="0.5">
-    		<LinearLayout android:layout_width="match_parent" android:layout_weight="0" android:id="@+id/headlines_container" android:layout_height="match_parent"></LinearLayout>
-    		<LinearLayout android:layout_width="match_parent" android:layout_weight="1" android:background="#f0f0ff" android:id="@+id/article_container" android:layout_height="match_parent"></LinearLayout>
+    	<LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="0.5" android:id="@+id/headlines_wrapper">
+    		<LinearLayout android:layout_width="match_parent" android:layout_weight="1" android:id="@+id/headlines_container" android:layout_height="match_parent">
+    		</LinearLayout>
+    		
+    		<ImageView android:paddingRight="2dip" android:layout_height="match_parent" android:background="?feedlistDivider" android:layout_width="wrap_content" android:paddingLeft="2dip"></ImageView>
+    		
+    		<LinearLayout android:layout_weight="1" android:visibility="gone" android:layout_width="match_parent" android:background="#f0f0ff" android:id="@+id/article_container" android:layout_height="match_parent"></LinearLayout>
     	</LinearLayout>
             
         
     </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>
     
-     <TextView android:id="@+id/no_headlines"
-     	android:visibility="invisible"    	
-    	android:layout_gravity="center" 
-    	android:textAppearance="?android:attr/textAppearanceLarge" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_headlines"></TextView>
     
 </FrameLayout>
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf