aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/ml
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/java/ml')
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubscribedThingListingActivity.java19
-rw-r--r--app/src/main/java/ml/docilealligator/infinityforreddit/fragments/MultiRedditListingFragment.java4
2 files changed, 19 insertions, 4 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubscribedThingListingActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubscribedThingListingActivity.java
index c4a90904..2d457dc4 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubscribedThingListingActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubscribedThingListingActivity.java
@@ -79,7 +79,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
@BindView(R.id.view_pager_subscribed_thing_listing_activity)
ViewPager viewPager;
@BindView(R.id.fab_subscribed_thing_listing_activity)
- public FloatingActionButton fab;
+ FloatingActionButton fab;
@Inject
@Named("oauth")
Retrofit mOauthRetrofit;
@@ -189,6 +189,9 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
sectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
viewPager.setAdapter(sectionsPagerAdapter);
viewPager.setOffscreenPageLimit(3);
+ if (viewPager.getCurrentItem() != 2) {
+ fab.hide();
+ }
viewPager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
@Override
public void onPageSelected(int position) {
@@ -197,7 +200,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
fab.hide();
} else {
lockSwipeRightToGoBack();
- if (position == 1) {
+ if (position != 2) {
fab.hide();
} else {
fab.show();
@@ -276,6 +279,18 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
}
}
+ public void showFabInMultiredditTab() {
+ if (viewPager.getCurrentItem() == 2) {
+ fab.show();
+ }
+ }
+
+ public void hideFabInMultiredditTab() {
+ if (viewPager.getCurrentItem() == 2) {
+ fab.hide();
+ }
+ }
+
private void loadMultiReddits() {
FetchMyMultiReddits.fetchMyMultiReddits(mOauthRetrofit, mAccessToken, new FetchMyMultiReddits.FetchMyMultiRedditsListener() {
@Override
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/MultiRedditListingFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/MultiRedditListingFragment.java
index 9c86135c..fc0723eb 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/MultiRedditListingFragment.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/fragments/MultiRedditListingFragment.java
@@ -144,9 +144,9 @@ public class MultiRedditListingFragment extends Fragment implements FragmentComm
public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
super.onScrolled(recyclerView, dx, dy);
if (dy > 0) {
- ((SubscribedThingListingActivity) mActivity).fab.hide();
+ ((SubscribedThingListingActivity) mActivity).hideFabInMultiredditTab();
} else {
- ((SubscribedThingListingActivity) mActivity).fab.show();
+ ((SubscribedThingListingActivity) mActivity).showFabInMultiredditTab();
}
}
});