From 882f3a370ecf602c91b834d090eaaac7cc01141a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 28 May 2013 10:21:01 +0400
Subject: initial implementation of slidingmenu stuff

---
 res/layout-sw600dp/feeds.xml     | 19 +++++--------------
 res/layout-sw600dp/headlines.xml | 34 +++++++++++++---------------------
 res/layout/feeds.xml             | 15 ---------------
 res/layout/headlines.xml         | 17 +----------------
 4 files changed, 19 insertions(+), 66 deletions(-)

(limited to 'res')

diff --git a/res/layout-sw600dp/feeds.xml b/res/layout-sw600dp/feeds.xml
index 5f37b900..bc176a89 100644
--- a/res/layout-sw600dp/feeds.xml
+++ b/res/layout-sw600dp/feeds.xml
@@ -5,22 +5,13 @@
     android:background="?headlinesBackgroundSolid"
     android:orientation="vertical" >
 
-    <LinearLayout
-        android:id="@+id/loading_container"
+    <FrameLayout
+        android:id="@+id/sw600dp_anchor"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?loadingBackground"
-        android:gravity="center"
-        android:orientation="vertical" >
+        android:layout_height="wrap_content"
+        android:visibility="gone" >
 
-        <TextView
-            android:id="@+id/loading_message"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:text="@string/loading_message"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-    </LinearLayout>
+    </FrameLayout>
 
     <LinearLayout
         android:id="@+id/fragment_container"
diff --git a/res/layout-sw600dp/headlines.xml b/res/layout-sw600dp/headlines.xml
index b6cb1c38..bc176a89 100644
--- a/res/layout-sw600dp/headlines.xml
+++ b/res/layout-sw600dp/headlines.xml
@@ -1,48 +1,40 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/headlines"
+    android:id="@+id/main"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:background="?headlinesBackgroundSolid"
     android:orientation="vertical" >
 
-    <LinearLayout
-        android:id="@+id/loading_container"
+    <FrameLayout
+        android:id="@+id/sw600dp_anchor"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?loadingBackground"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="visible" >
+        android:layout_height="wrap_content"
+        android:visibility="gone" >
 
-        <TextView
-            android:id="@+id/loading_message"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:text="@string/loading_message"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-    </LinearLayout>
+    </FrameLayout>
 
     <LinearLayout
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:baselineAligned="false"
+        android:weightSum="1.05"
         android:orientation="horizontal" >
 
         <FrameLayout
-            android:id="@+id/headlines_fragment"
+            android:id="@+id/feeds_fragment"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="0.4"
+            android:layout_weight="1"
             android:background="?feedlistBackground" >
         </FrameLayout>
 
         <FrameLayout
-            android:id="@+id/article_fragment"
+            android:id="@+id/headlines_fragment"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="0.6"
-            android:background="?articleBackground" >
+            android:layout_weight="2"
+            android:background="?headlinesBackground" >
         </FrameLayout>
     </LinearLayout>
 
diff --git a/res/layout/feeds.xml b/res/layout/feeds.xml
index 72067ce0..05cc1606 100644
--- a/res/layout/feeds.xml
+++ b/res/layout/feeds.xml
@@ -4,21 +4,6 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent" >
 
-    <LinearLayout
-        android:id="@+id/loading_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical" >
-
-        <TextView
-            android:id="@+id/loading_message"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:text="@string/loading_message" />
-    </LinearLayout>
-
     <FrameLayout
         android:id="@+id/feeds_fragment"
         android:background="?smallScreenBackground"
diff --git a/res/layout/headlines.xml b/res/layout/headlines.xml
index 9de7f87d..a0a67ac1 100644
--- a/res/layout/headlines.xml
+++ b/res/layout/headlines.xml
@@ -4,23 +4,8 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent" >
 
-    <LinearLayout
-        android:id="@+id/loading_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="vertical" >
-
-        <TextView
-            android:id="@+id/loading_message"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:text="@string/loading_message" />
-    </LinearLayout>
-
     <FrameLayout
-        android:id="@+id/headlines_container"
+        android:id="@+id/headlines_fragment"
         android:background="?smallScreenBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
-- 
cgit v1.2.3-54-g00ecf