Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/311189
Change subject: [WIP] Scrolling header at the top of Feed.
......................................................................
[WIP] Scrolling header at the top of Feed.
Change-Id: I6a8fb2b061909075fb477bcf7315bc775cd6d09a
---
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, 24 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/89/311189/1
diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index 3195a70..a76981d 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -49,6 +49,7 @@
public class FeedFragment extends Fragment implements BackPressedHandler {
@BindView(R.id.feed_swipe_refresh_layout) SwipeRefreshLayout
swipeRefreshLayout;
@BindView(R.id.fragment_feed_feed) FeedView feedView;
+ @BindView(R.id.fragment_feed_header) View feedHeader;
private Unbinder unbinder;
private WikipediaApp app;
private FeedCoordinator coordinator;
@@ -287,6 +288,11 @@
@Override
public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
super.onScrolled(recyclerView, dx, dy);
+ int yOffset = feedView.computeVerticalScrollOffset();
+ if (yOffset <= feedHeader.getHeight()
+ && feedHeader.getTranslationY() > -feedHeader.getHeight())
{
+ feedHeader.setTranslationY(-yOffset);
+ }
boolean shouldShowSearchIcon =
feedView.getFirstVisibleItemPosition() != 0;
if (shouldShowSearchIcon != searchIconVisible) {
searchIconVisible = shouldShowSearchIcon;
diff --git a/app/src/main/res/layout/fragment_feed.xml
b/app/src/main/res/layout/fragment_feed.xml
index 3216b66..02cdbc5 100644
--- a/app/src/main/res/layout/fragment_feed.xml
+++ b/app/src/main/res/layout/fragment_feed.xml
@@ -7,11 +7,23 @@
android:layout_height="match_parent"
android:background="?attr/feed_window_background_color">
- <org.wikipedia.feed.view.FeedView
- android:id="@+id/fragment_feed_feed"
+ <FrameLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:scrollbars="vertical"
- app:minColumnWidth="@dimen/view_feed_min_column_width"/>
+ android:layout_height="match_parent">
+
+ <View
+ android:id="@+id/fragment_feed_header"
+ android:layout_width="match_parent"
+ android:layout_height="148dp"
+ android:background="@color/dark_blue"/>
+
+ <org.wikipedia.feed.view.FeedView
+ android:id="@+id/fragment_feed_feed"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scrollbars="vertical"
+ app:minColumnWidth="@dimen/view_feed_min_column_width"/>
+
+ </FrameLayout>
</android.support.v4.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/values/dimens.xml
b/app/src/main/res/values/dimens.xml
index 5043a7a..9f4d194 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -92,7 +92,7 @@
<dimen name="view_feed_header_height">160dp</dimen>
<dimen name="view_feed_overlap_top">84dp</dimen>
<dimen name="view_feed_min_column_width">320dp</dimen>
- <dimen name="view_list_first_card_margin_top">10dp</dimen>
+ <dimen name="view_list_first_card_margin_top">120dp</dimen>
<dimen name="view_list_card_margin_vertical">5dp</dimen>
<dimen name="view_list_card_margin_horizontal">7dp</dimen>
<dimen name="view_list_card_item_margin">16dp</dimen>
--
To view, visit https://gerrit.wikimedia.org/r/311189
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a8fb2b061909075fb477bcf7315bc775cd6d09a
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
