rework feeds/cats loading progressbar

5 files changed, 33 insertions, 19 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
index 795c0fe7..db748846 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java
@@ -327,7 +327,7 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt
                 View loadingBar = getView().findViewById(R.id.feeds_loading_bar);
 
                 if (loadingBar != null) {
-                    loadingBar.setVisibility(View.GONE);
+                    loadingBar.setVisibility(View.INVISIBLE);
                 }
             }
 			
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
index fc1c7649..a3a6222d 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java
@@ -512,7 +512,7 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi
                 View loadingBar = getView().findViewById(R.id.feeds_loading_bar);
 
                 if (loadingBar != null) {
-                    loadingBar.setVisibility(View.GONE);
+                    loadingBar.setVisibility(View.INVISIBLE);
                 }
             }
 			
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 684846fe..5d4ea2f6 100755
--- a/org.fox.ttrss/src/main/res/layout/cats_fragment.xml
+++ b/org.fox.ttrss/src/main/res/layout/cats_fragment.xml
@@ -8,7 +8,7 @@
     	android:id="@+id/feeds_swipe_container"
     	android:layout_width="match_parent"
     	android:layout_height="match_parent" >
-    
+
 	    <ListView
 	        android:id="@+id/feeds"
             android:dividerHeight="0dp"
@@ -28,12 +28,12 @@
         android:visibility="invisible" >
     </TextView>
 
-    <ProgressBar
+    <!-- <ProgressBar
         style="?android:attr/progressBarStyleLarge"
         android:visibility="gone"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/feeds_loading_bar"
-        android:layout_gravity="center" />
+        android:layout_gravity="center" /> -->
 
 </FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/drawer_header.xml b/org.fox.ttrss/src/main/res/layout/drawer_header.xml
index 9366633c..ecdce4ef 100755
--- a/org.fox.ttrss/src/main/res/layout/drawer_header.xml
+++ b/org.fox.ttrss/src/main/res/layout/drawer_header.xml
@@ -72,5 +72,13 @@
             />
     </LinearLayout>
 
-
+    <ProgressBar
+        style="?android:attr/progressBarStyleHorizontal"
+        android:visibility="invisible"
+        android:indeterminate="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/feeds_loading_bar"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentBottom="true" />
 </RelativeLayout>
\ No newline at end of file
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 de23ccad..0c2619fc 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_fragment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/feeds_fragment"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent" >
@@ -7,15 +7,18 @@
     <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_below="@+id/feeds_loading_bar">
 
-	    <ListView
-	        android:id="@+id/feeds"
+        <ListView
+            android:id="@+id/feeds"
             android:dividerHeight="0dp"
             android:divider="@null"
-	        android:layout_width="match_parent"
-	        android:layout_height="match_parent" >
-	    </ListView>
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true">
+        </ListView>
     </android.support.v4.widget.SwipeRefreshLayout>
 
     <TextView
@@ -28,11 +31,14 @@
         android:visibility="gone" >
     </TextView>
 
-    <ProgressBar
-        style="?android:attr/progressBarStyleLarge"
-        android:visibility="gone"
-        android:layout_width="wrap_content"
+    <!-- <ProgressBar
+        style="?android:attr/progressBarStyleHorizontal"
+        android:visibility="invisible"
+        android:indeterminate="true"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/feeds_loading_bar"
-        android:layout_gravity="center" />
-</FrameLayout>
\ No newline at end of file
+        android:layout_gravity="center" /> -->
+
+
+</RelativeLayout>
\ No newline at end of file