From 2c12a4b67761ac74f0acb4590d21ce9b5c42cecb Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 22 Nov 2011 15:49:21 +0300
Subject: more cleanup, initial async apirequest stuff

---
 res/layout/feeds_fragment.xml     | 12 +++---------
 res/layout/headlines_fragment.xml | 13 +++----------
 res/layout/main.xml               |  8 --------
 res/values/strings.xml            |  5 +----
 4 files changed, 7 insertions(+), 31 deletions(-)

(limited to 'res')

diff --git a/res/layout/feeds_fragment.xml b/res/layout/feeds_fragment.xml
index 9b22dce8..09a975ee 100644
--- a/res/layout/feeds_fragment.xml
+++ b/res/layout/feeds_fragment.xml
@@ -2,14 +2,8 @@
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    <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:layout_width="match_parent" android:id="@+id/feeds" android:layout_height="match_parent"></ListView>
-    </LinearLayout>
-     <TextView android:id="@+id/no_unread_feeds"
-     	android:visibility="invisible"    	
-    	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>
+    android:layout_height="fill_parent">
+    <TextView android:layout_width="wrap_content" android:id="@+id/no_unread_feeds" android:textAppearance="?android:attr/textAppearanceLarge" android:layout_height="wrap_content" android:text="@string/no_unread_feeds" android:layout_gravity="center" ></TextView>
+    <ListView android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/feeds"></ListView>
         
     </FrameLayout>
diff --git a/res/layout/headlines_fragment.xml b/res/layout/headlines_fragment.xml
index 4be9fe5b..ffcad32c 100644
--- a/res/layout/headlines_fragment.xml
+++ b/res/layout/headlines_fragment.xml
@@ -2,15 +2,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="#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>
+    android:layout_height="fill_parent" android:id="@+id/headlines_fragment">
+    <ListView android:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/headlines" android:background="#fafafa"></ListView>
+    <TextView android:layout_width="wrap_content" android:textAppearance="?android:attr/textAppearanceLarge" android:layout_height="wrap_content" android:text="@string/no_unread_headlines" android:layout_gravity="center" android:id="@+id/no_unread_headlines"></TextView>
 
     </FrameLayout>
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 65a5be25..86fcf5fa 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -8,14 +8,6 @@
         </LinearLayout>
     </FrameLayout>
     <LinearLayout android:id="@+id/main" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="horizontal">
-        <LinearLayout android:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/linearLayout4" android:layout_weight="1.5">
-            <LinearLayout android:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/feeds_container" android:layout_weight="1"></LinearLayout>
-            <ImageView android:paddingLeft="2dip" android:layout_height="match_parent" android:layout_width="wrap_content" android:layout_weight="1" android:background="?feedlistDivider" android:paddingRight="2dip"></ImageView>
-        </LinearLayout>
-        <LinearLayout android:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/headlines_wrapper" android:layout_weight="0.5" android:orientation="vertical">
-            <LinearLayout android:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/headlines_container" android:layout_weight="1"></LinearLayout>
-            <LinearLayout android:visibility="gone" android:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/article_container" android:layout_weight="1"></LinearLayout>
-        </LinearLayout>
     </LinearLayout>
     
     
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c24d6911..72aa1cb6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -24,9 +24,6 @@
     <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>
-    <string name="offline">Offline</string>
-    <string name="online">Online</string>
-    <string name="synchronizing">Synchronizing...</string>
-    <string name="no_headlines">No articles found.</string>
+    <string name="no_unread_headlines">No unread headlines.</string>
     <string name="loading_message">Loading, please wait...</string>
 </resources>
-- 
cgit v1.2.3