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-sw600dp-land/headlines.xml | 14 -------
 .../res/layout-sw600dp-land/headlines_articles.xml | 18 --------
 .../src/main/res/layout-sw600dp-port/headlines.xml | 48 +++++++++++-----------
 .../res/layout-sw600dp-port/headlines_articles.xml | 18 --------
 .../src/main/res/layout-sw700dp/headlines.xml      | 14 -------
 .../main/res/layout-sw700dp/headlines_articles.xml | 18 --------
 .../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 -------
 org.fox.ttrss/src/main/res/values/arrays.xml       |  2 -
 org.fox.ttrss/src/main/res/values/attrs.xml        |  1 +
 org.fox.ttrss/src/main/res/values/strings.xml      |  1 +
 org.fox.ttrss/src/main/res/values/style.xml        |  2 +
 16 files changed, 66 insertions(+), 210 deletions(-)

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

diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml
index 2162232e..f2f431a3 100644
--- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines.xml
@@ -13,20 +13,6 @@
 
     </FrameLayout>
 
-    <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>
-
     <LinearLayout
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml
index 367f492a..b4688ad4 100644
--- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/headlines_articles.xml
@@ -12,24 +12,6 @@
         android:visibility="gone" >
     </FrameLayout>
 
-    <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-sw600dp-port/headlines.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines.xml
index e6daa46c..ba5b20e3 100644
--- a/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines.xml
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines.xml
@@ -1,35 +1,35 @@
-<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">
 
     <FrameLayout
         android:id="@+id/sw600dp_port_anchor"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" >
-
+        android:layout_height="wrap_content"
+        android:visibility="gone" >
     </FrameLayout>
 
-    <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="300dp"
+            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: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-sw600dp-port/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml
index 36b29751..4809a230 100644
--- a/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp-port/headlines_articles.xml
@@ -12,24 +12,6 @@
         android:visibility="gone" >
     </FrameLayout>
 
-    <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-sw700dp/headlines.xml b/org.fox.ttrss/src/main/res/layout-sw700dp/headlines.xml
index 2162232e..f2f431a3 100644
--- a/org.fox.ttrss/src/main/res/layout-sw700dp/headlines.xml
+++ b/org.fox.ttrss/src/main/res/layout-sw700dp/headlines.xml
@@ -13,20 +13,6 @@
 
     </FrameLayout>
 
-    <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>
-
     <LinearLayout
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
diff --git a/org.fox.ttrss/src/main/res/layout-sw700dp/headlines_articles.xml b/org.fox.ttrss/src/main/res/layout-sw700dp/headlines_articles.xml
index 367f492a..b4688ad4 100644
--- a/org.fox.ttrss/src/main/res/layout-sw700dp/headlines_articles.xml
+++ b/org.fox.ttrss/src/main/res/layout-sw700dp/headlines_articles.xml
@@ -12,24 +12,6 @@
         android:visibility="gone" >
     </FrameLayout>
 
-    <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/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"
diff --git a/org.fox.ttrss/src/main/res/values/arrays.xml b/org.fox.ttrss/src/main/res/values/arrays.xml
index 79d9a4d3..b1ab9730 100644
--- a/org.fox.ttrss/src/main/res/values/arrays.xml
+++ b/org.fox.ttrss/src/main/res/values/arrays.xml
@@ -3,13 +3,11 @@
         <item>@string/theme_light</item>
         <item>@string/theme_dark</item>
         <item>@string/theme_sepia</item>        
-        <item>@string/theme_holo</item>
     </string-array>
     <string-array name="pref_theme_values" translatable="false">
         <item>THEME_LIGHT</item>
         <item>THEME_DARK</item>
         <item>THEME_SEPIA</item>
-        <item>THEME_HOLO</item>
     </string-array>
     <string-array name="pref_view_mode_names">
         <item>@string/category_browse_headlines</item>
diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml
index 3558beb6..272c3dbd 100644
--- a/org.fox.ttrss/src/main/res/values/attrs.xml
+++ b/org.fox.ttrss/src/main/res/values/attrs.xml
@@ -28,4 +28,5 @@
     <attr name="articleNoteBackground" format="reference|color" />
     <attr name="articleNoteTextColor" format="reference|color" />
     <attr name="statusBarHintColor" format="reference|color" />
+    <attr name="parentBtnBackground" format="reference|color" />
 </resources>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/values/strings.xml b/org.fox.ttrss/src/main/res/values/strings.xml
index 8c08929a..ac522c50 100644
--- a/org.fox.ttrss/src/main/res/values/strings.xml
+++ b/org.fox.ttrss/src/main/res/values/strings.xml
@@ -242,5 +242,6 @@
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>
     <string name="error_loading_image">Error loading image.</string>
+    <string name="open_parent">Open parent</string>
 
 </resources>
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index 6e58a8b2..b1ac677c 100644
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -29,6 +29,7 @@
     	<item name="unreadSelectedCounterBackground">@drawable/counter_background_selected_light</item>
     	<item name="articleNoteTextColor">#9a8c59</item>
     	<item name="articleNoteBackground">#fff7d5</item>
+        <item name="parentBtnBackground">#dddddd</item>
 
         <item name="colorPrimary">#6482af</item>
         <item name="colorPrimaryDark">#526A8E</item>
@@ -89,6 +90,7 @@
         <item name="unreadSelectedCounterBackground">@drawable/counter_background_dark</item>
     	<item name="articleNoteTextColor">@android:color/secondary_text_dark</item>
     	<item name="articleNoteBackground">#303030</item>
+        <item name="parentBtnBackground">#101010</item>
 	</style>
 
 	<style name="HoloTheme" parent="HoloThemeBase">
-- 
cgit v1.2.3-54-g00ecf