From c9398d0fe13fbce4deafb57c910d4edf97e97723 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 4 Jun 2015 20:17:17 +0300 Subject: rework feeds/cats loading progressbar --- .../java/org/fox/ttrss/FeedCategoriesFragment.java | 2 +- .../src/main/java/org/fox/ttrss/FeedsFragment.java | 2 +- .../src/main/res/layout/cats_fragment.xml | 6 ++-- .../src/main/res/layout/drawer_header.xml | 10 ++++++- .../src/main/res/layout/feeds_fragment.xml | 32 +++++++++++++--------- 5 files changed, 33 insertions(+), 19 deletions(-) (limited to 'org.fox.ttrss/src/main') 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" > - + - + android:layout_gravity="center" /> --> \ 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 @@ /> - + \ 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 @@ - @@ -7,15 +7,18 @@ + android:layout_height="match_parent" + android:layout_below="@+id/feeds_loading_bar"> - - + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true"> + - - \ No newline at end of file + android:layout_gravity="center" /> --> + + + \ No newline at end of file -- cgit v1.2.3