Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/296618
Change subject: Improve positioning and behavior of feed refresh circle.
......................................................................
Improve positioning and behavior of feed refresh circle.
Now using a more correct arrangement of SwipeRefreshLayout ->
CoordinatorLayout -> RecyclerView.
No longer need custom refresh start/stop offsets.
Change-Id: I4918a00bfe1c16b71c95fa6b0f490ff1ea8865b0
---
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
M app/src/main/res/layout/fragment_feed.xml
M app/src/main/res/values/dimens.xml
3 files changed, 45 insertions(+), 49 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/18/296618/1
diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index 067640b..de3b152 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -78,9 +78,6 @@
appBarLayout.addOnOffsetChangedListener(headerOffsetChangedListener);
searchIconShowThresholdPx = (int)
getResources().getDimension(R.dimen.view_feed_header_height) -
DimenUtil.getContentTopOffsetPx(getContext());
- swipeRefreshLayout.setProgressViewOffset(true,
- (int)
getResources().getDimension(R.dimen.view_feed_refresh_offset_start),
- (int)
getResources().getDimension(R.dimen.view_feed_refresh_offset_end));
swipeRefreshLayout.setOnRefreshListener(new
SwipeRefreshLayout.OnRefreshListener() {
@Override
public void onRefresh() {
diff --git a/app/src/main/res/layout/fragment_feed.xml
b/app/src/main/res/layout/fragment_feed.xml
index 772f582..37153f5 100644
--- a/app/src/main/res/layout/fragment_feed.xml
+++ b/app/src/main/res/layout/fragment_feed.xml
@@ -1,54 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<android.support.v4.widget.SwipeRefreshLayout
xmlns:android="http://schemas.android.com/apk/res/android";
xmlns:app="http://schemas.android.com/apk/res-auto";
+ android:id="@+id/feed_swipe_refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/feed_window_background"
android:fitsSystemWindows="true">
- <android.support.design.widget.AppBarLayout
- android:id="@+id/feed_app_bar_layout"
- android:layout_width="match_parent"
- android:layout_height="@dimen/view_feed_header_height"
- android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
- android:fitsSystemWindows="true">
-
- <android.support.design.widget.CollapsingToolbarLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:fitsSystemWindows="true"
- app:layout_scrollFlags="scroll|exitUntilCollapsed"
- app:contentScrim="@color/main_toolbar_background"
- app:titleEnabled="false">
-
- <ImageView
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:scaleType="centerCrop"
- android:fitsSystemWindows="true"
- android:src="@drawable/feed_app_bar"
- android:contentDescription="@null"
- app:layout_collapseMode="parallax"
- />
-
- <android.support.v7.widget.Toolbar
- android:id="@+id/feed_toolbar"
- android:layout_width="match_parent"
- android:layout_height="?attr/actionBarSize"
- app:title="@string/activity_feed_title"
- app:background="@color/main_toolbar_background"
- app:layout_collapseMode="pin" />
- </android.support.design.widget.CollapsingToolbarLayout>
-
- </android.support.design.widget.AppBarLayout>
-
- <android.support.v4.widget.SwipeRefreshLayout
- android:id="@+id/feed_swipe_refresh_layout"
+ <android.support.design.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- app:behavior_overlapTop="100dp"
- app:layout_behavior="@string/appbar_scrolling_view_behavior">
+ android:background="@color/feed_window_background"
+ android:fitsSystemWindows="true">
+
+ <android.support.design.widget.AppBarLayout
+ android:id="@+id/feed_app_bar_layout"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/view_feed_header_height"
+ android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+ android:fitsSystemWindows="true">
+
+ <android.support.design.widget.CollapsingToolbarLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fitsSystemWindows="true"
+ app:layout_scrollFlags="scroll|exitUntilCollapsed"
+ app:contentScrim="@color/main_toolbar_background"
+ app:titleEnabled="false">
+
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scaleType="centerCrop"
+ android:fitsSystemWindows="true"
+ android:src="@drawable/feed_app_bar"
+ android:contentDescription="@null"
+ app:layout_collapseMode="parallax"
+ />
+
+ <android.support.v7.widget.Toolbar
+ android:id="@+id/feed_toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="?attr/actionBarSize"
+ app:title="@string/activity_feed_title"
+ app:background="@color/main_toolbar_background"
+ app:layout_collapseMode="pin" />
+ </android.support.design.widget.CollapsingToolbarLayout>
+
+ </android.support.design.widget.AppBarLayout>
<org.wikipedia.feed.view.FeedView
android:id="@+id/fragment_feed_feed"
@@ -57,8 +56,10 @@
android:scrollbars="vertical"
android:paddingLeft="@dimen/view_list_card_margin_horizontal"
android:paddingRight="@dimen/view_list_card_margin_horizontal"
+ app:behavior_overlapTop="100dp"
+ app:layout_behavior="@string/appbar_scrolling_view_behavior"
app:minColumnWidth="@dimen/view_feed_min_column_width"/>
- </android.support.v4.widget.SwipeRefreshLayout>
+ </android.support.design.widget.CoordinatorLayout>
-</android.support.design.widget.CoordinatorLayout>
+</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml
b/app/src/main/res/values/dimens.xml
index 27c9ece..a124a0d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -90,8 +90,6 @@
<!-- The Feed -->
<dimen name="view_feed_header_height">260dp</dimen>
- <dimen name="view_feed_refresh_offset_start">40dp</dimen>
- <dimen name="view_feed_refresh_offset_end">60dp</dimen>
<dimen name="view_feed_min_column_width">229.3dp</dimen>
<dimen name="view_list_card_margin_vertical">8dp</dimen>
<dimen name="view_list_card_margin_horizontal">5.3dp</dimen>
--
To view, visit https://gerrit.wikimedia.org/r/296618
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4918a00bfe1c16b71c95fa6b0f490ff1ea8865b0
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
