From 28cda6ae325ce4e5dc88f129a4ae633fcffd7622 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 28 May 2013 13:34:00 +0400
Subject: reinstate loading_container but hide it by default

---
 res/layout-sw600dp/feeds.xml          | 14 ++++++++++++++
 res/layout-sw600dp/headlines.xml      | 14 ++++++++++++++
 res/layout/feeds.xml                  | 14 ++++++++++++++
 res/layout/headlines.xml              | 14 ++++++++++++++
 src/org/fox/ttrss/CommonActivity.java |  2 +-
 5 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/res/layout-sw600dp/feeds.xml b/res/layout-sw600dp/feeds.xml
index bc176a89..88aa8eb7 100644
--- a/res/layout-sw600dp/feeds.xml
+++ b/res/layout-sw600dp/feeds.xml
@@ -13,6 +13,20 @@
 
     </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/res/layout-sw600dp/headlines.xml b/res/layout-sw600dp/headlines.xml
index bc176a89..88aa8eb7 100644
--- a/res/layout-sw600dp/headlines.xml
+++ b/res/layout-sw600dp/headlines.xml
@@ -13,6 +13,20 @@
 
     </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/res/layout/feeds.xml b/res/layout/feeds.xml
index 05cc1606..fca9c176 100644
--- a/res/layout/feeds.xml
+++ b/res/layout/feeds.xml
@@ -4,6 +4,20 @@
     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/res/layout/headlines.xml b/res/layout/headlines.xml
index a0a67ac1..8174b539 100644
--- a/res/layout/headlines.xml
+++ b/res/layout/headlines.xml
@@ -4,6 +4,20 @@
     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/headlines_fragment"
         android:background="?smallScreenBackground"
diff --git a/src/org/fox/ttrss/CommonActivity.java b/src/org/fox/ttrss/CommonActivity.java
index 9c55ae7f..78d1937c 100644
--- a/src/org/fox/ttrss/CommonActivity.java
+++ b/src/org/fox/ttrss/CommonActivity.java
@@ -56,7 +56,7 @@ public class CommonActivity extends SherlockFragmentActivity {
 			tv.setText(status);
 		}
 		
-		//findViewById(R.id.loading_container).setVisibility(status == R.string.blank ? View.GONE : View.VISIBLE);
+		findViewById(R.id.loading_container).setVisibility(status == R.string.blank ? View.GONE : View.VISIBLE);
 		
 		setProgressBarIndeterminateVisibility(showProgress);
 	}
-- 
cgit v1.2.3-54-g00ecf