jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393590 )
Change subject: Scroll feed to top when Explore tab clicked again.
......................................................................
Scroll feed to top when Explore tab clicked again.
Bug: T181394
Change-Id: Iaa856e8de921614c4d9962679bbff7e77a34e653
---
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
M app/src/main/java/org/wikipedia/main/MainFragment.java
2 files changed, 10 insertions(+), 7 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index 3ef0cbe..bcd8ea4 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -285,6 +285,10 @@
return false;
}
+ public void scrollToTop() {
+ feedView.smoothScrollToPosition(0);
+ }
+
public void onGoOffline() {
refresh();
}
diff --git a/app/src/main/java/org/wikipedia/main/MainFragment.java
b/app/src/main/java/org/wikipedia/main/MainFragment.java
index 1c50fe9..3a7112e 100644
--- a/app/src/main/java/org/wikipedia/main/MainFragment.java
+++ b/app/src/main/java/org/wikipedia/main/MainFragment.java
@@ -14,12 +14,10 @@
import android.speech.RecognizerIntent;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
-import android.support.design.widget.BottomNavigationView;
import android.support.v4.app.ActivityOptionsCompat;
import android.support.v4.app.Fragment;
import android.support.v4.view.ViewPager;
import android.view.LayoutInflater;
-import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
@@ -108,12 +106,13 @@
unbinder = ButterKnife.bind(this, view);
viewPager.setAdapter(new
NavTabFragmentPagerAdapter(getChildFragmentManager()));
- tabLayout.setOnNavigationItemSelectedListener(new
BottomNavigationView.OnNavigationItemSelectedListener() {
- @Override
- public boolean onNavigationItemSelected(@NonNull MenuItem item) {
- viewPager.setCurrentItem(item.getOrder());
- return true;
+ tabLayout.setOnNavigationItemSelectedListener(item -> {
+ Fragment fragment = ((NavTabFragmentPagerAdapter)
viewPager.getAdapter()).getCurrentFragment();
+ if (fragment instanceof FeedFragment && item.getOrder() == 0) {
+ ((FeedFragment) fragment).scrollToTop();
}
+ viewPager.setCurrentItem(item.getOrder());
+ return true;
});
if (savedInstanceState == null) {
--
To view, visit https://gerrit.wikimedia.org/r/393590
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa856e8de921614c4d9962679bbff7e77a34e653
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Cooltey <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Sharvaniharan <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
