From 7746b4636e4b7b0122a5046f501ff91f2f5d6b27 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 31 Oct 2014 01:02:06 +0300
Subject: switch to drawerlayout where applicable remove loading_container
 stuff various other changes related to drawerlayout

---
 .../src/main/res/layout/cats_fragment.xml          | 14 -------
 org.fox.ttrss/src/main/res/layout/feeds.xml        | 14 -------
 .../src/main/res/layout/feeds_fragment.xml         | 35 ++++++++---------
 org.fox.ttrss/src/main/res/layout/headlines.xml    | 45 +++++++++++-----------
 .../src/main/res/layout/headlines_articles.xml     | 18 ---------
 .../src/main/res/layout/headlines_fragment.xml     | 14 -------
 6 files changed, 38 insertions(+), 102 deletions(-)

(limited to 'org.fox.ttrss/src/main/res/layout')

diff --git a/org.fox.ttrss/src/main/res/layout/cats_fragment.xml b/org.fox.ttrss/src/main/res/layout/cats_fragment.xml
index 4216ebb2..4a950933 100644
--- a/org.fox.ttrss/src/main/res/layout/cats_fragment.xml
+++ b/org.fox.ttrss/src/main/res/layout/cats_fragment.xml
@@ -4,20 +4,6 @@
     android:layout_width="match_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" >
-
-        <TextView
-            android:id="@+id/loading_message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge" >
-        </TextView>
-    </LinearLayout>
-
     <android.support.v4.widget.SwipeRefreshLayout 
     	android:id="@+id/feeds_swipe_container"
     	android:layout_width="match_parent"
diff --git a/org.fox.ttrss/src/main/res/layout/feeds.xml b/org.fox.ttrss/src/main/res/layout/feeds.xml
index 8af9c50d..34efccec 100644
--- a/org.fox.ttrss/src/main/res/layout/feeds.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds.xml
@@ -5,20 +5,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:visibility="gone" >
-
-        <TextView
-            android:id="@+id/loading_message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-    </LinearLayout>
-
     <FrameLayout
         android:id="@+id/feeds_fragment"
         android:background="?smallScreenBackground"
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml b/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml
index b57f0bac..aa02ffff 100644
--- a/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml
@@ -1,28 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/feeds_fragment"
     android:layout_width="match_parent"
+    android:orientation="vertical"
     android:layout_height="fill_parent" >
 
-    <LinearLayout
-        android:id="@+id/loading_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center" >
-
-        <TextView
-            android:id="@+id/loading_message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge" >
-        </TextView>
-    </LinearLayout>
-
     <android.support.v4.widget.SwipeRefreshLayout 
     	android:id="@+id/feeds_swipe_container"
     	android:layout_width="match_parent"
-    	android:layout_height="match_parent" >
-    
+    	android:layout_height="match_parent"
+        android:layout_weight="1">
+
 	    <ListView
 	        android:id="@+id/feeds"
 	        android:layoutAnimation="@anim/layout_feeds"
@@ -31,6 +19,15 @@
 	    </ListView>
     </android.support.v4.widget.SwipeRefreshLayout>
 
+    <Button
+        style="?android:attr/buttonStyleSmall"
+        android:background="?parentBtnBackground"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/open_parent"
+        android:layout_weight="0"
+        android:id="@+id/open_parent" />
+
     <TextView
         android:id="@+id/no_feeds"
         android:layout_width="wrap_content"
@@ -38,7 +35,7 @@
         android:layout_gravity="center"
         android:text="@string/no_feeds"
         android:textAppearance="?android:attr/textAppearanceLarge"
-        android:visibility="invisible" >
+        android:visibility="gone" >
     </TextView>
 
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines.xml b/org.fox.ttrss/src/main/res/layout/headlines.xml
index 4e9bb566..d8e29167 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines.xml
@@ -1,29 +1,28 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/headlines"
-    android:fitsSystemWindows="true"
-    android:orientation="vertical"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
+    android:layout_height="fill_parent"
+    android:fitsSystemWindows="true">
 
-    <LinearLayout
-        android:id="@+id/loading_container"
+    <android.support.v4.widget.DrawerLayout
+        android:id="@+id/headlines_drawer"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:visibility="gone" >
+        android:layout_height="match_parent">
 
-        <TextView
-            android:id="@+id/loading_message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
-    </LinearLayout>
+        <FrameLayout
+            android:id="@+id/headlines_fragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="?smallScreenBackground"></FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/feeds_fragment"
+            android:layout_width="240dp"
+            android:layout_gravity="start"
+            android:background="?smallScreenBackground"
+            android:layout_height="match_parent" >
+        </FrameLayout>
+
+    </android.support.v4.widget.DrawerLayout>
 
-    <FrameLayout
-        android:id="@+id/headlines_fragment"
-        android:background="?smallScreenBackground"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
-    </FrameLayout>
 
-</LinearLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout/headlines_articles.xml
index 27895b38..6b54759b 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_articles.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_articles.xml
@@ -5,24 +5,6 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
 
-    <LinearLayout
-        android:id="@+id/loading_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?loadingBackground"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="visible" >
-
-        <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>
-
     <LinearLayout
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml b/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
index 63f7f856..b4c51474 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
@@ -20,20 +20,6 @@
 	   </ListView>
 	</android.support.v4.widget.SwipeRefreshLayout>
 
-    <LinearLayout
-        android:id="@+id/loading_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center" >
-
-        <TextView
-            android:id="@+id/loading_message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge" >
-        </TextView>
-    </LinearLayout>
-
     <TextView
         android:id="@+id/no_headlines"
         android:layout_width="wrap_content"
-- 
cgit v1.2.3-54-g00ecf