diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/activities/MainActivity.java b/app/src/main/java/eu/toldi/infinityforlemmy/activities/MainActivity.java index e2900a45..a8370e17 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/activities/MainActivity.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/activities/MainActivity.java @@ -1400,10 +1400,6 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb goToUser(); break; } - case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: { - randomThing(); - break; - } case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: { if (sectionsPagerAdapter != null) { sectionsPagerAdapter.hideReadPosts(); diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/activities/SearchResultActivity.java b/app/src/main/java/eu/toldi/infinityforlemmy/activities/SearchResultActivity.java index 2ddc39ac..6e5636a3 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/activities/SearchResultActivity.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/activities/SearchResultActivity.java @@ -558,10 +558,6 @@ public class SearchResultActivity extends BaseActivity implements SortTypeSelect goToUser(); break; } - case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: { - random(); - break; - } case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: { if (sectionsPagerAdapter != null) { sectionsPagerAdapter.hideReadPosts(); diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/activities/SubscribedThingListingActivity.java b/app/src/main/java/eu/toldi/infinityforlemmy/activities/SubscribedThingListingActivity.java index 1b47dd83..cd3fea7a 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/activities/SubscribedThingListingActivity.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/activities/SubscribedThingListingActivity.java @@ -233,7 +233,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti }); sectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager()); viewPager.setAdapter(sectionsPagerAdapter); - viewPager.setOffscreenPageLimit(3); + viewPager.setOffscreenPageLimit(1); if (viewPager.getCurrentItem() != 2) { fab.hide(); } @@ -358,7 +358,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti } if (!(!forceLoad && mInsertMultiredditSuccess)) { - loadMultiReddits(); + //loadMultiReddits(); } } @@ -412,7 +412,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti public void success() { Toast.makeText(SubscribedThingListingActivity.this, R.string.delete_multi_reddit_success, Toast.LENGTH_SHORT).show(); - loadMultiReddits(); + //loadMultiReddits(); } @Override @@ -439,7 +439,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti @Subscribe public void onRefreshMultiRedditsEvent(RefreshMultiRedditsEvent event) { - loadMultiReddits(); + //loadMultiReddits(); } @Override @@ -477,6 +477,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti @Override public Fragment getItem(int position) { switch (position) { + default: case 0: { SubscribedSubredditsListingFragment fragment = new SubscribedSubredditsListingFragment(); Bundle bundle = new Bundle(); @@ -487,28 +488,12 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti fragment.setArguments(bundle); return fragment; } - case 1: { - FollowedUsersListingFragment fragment = new FollowedUsersListingFragment(); - Bundle bundle = new Bundle(); - bundle.putString(FollowedUsersListingFragment.EXTRA_ACCOUNT_NAME, mAccountName == null ? "-" : mAccountName); - bundle.putString(FollowedUsersListingFragment.EXTRA_ACCESS_TOKEN, mAccessToken); - fragment.setArguments(bundle); - return fragment; - } - default: { - MultiRedditListingFragment fragment = new MultiRedditListingFragment(); - Bundle bundle = new Bundle(); - bundle.putString(MultiRedditListingFragment.EXTRA_ACCESS_TOKEN, mAccessToken); - bundle.putString(MultiRedditListingFragment.EXTRA_ACCOUNT_NAME, mAccountName == null ? "-" : mAccountName); - fragment.setArguments(bundle); - return fragment; - } } } @Override public int getCount() { - return 3; + return 1; } @Override diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewMultiRedditDetailActivity.java b/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewMultiRedditDetailActivity.java index 225f65a0..dd2965c5 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewMultiRedditDetailActivity.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewMultiRedditDetailActivity.java @@ -946,10 +946,6 @@ public class ViewMultiRedditDetailActivity extends BaseActivity implements SortT goToUser(); break; } - case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: { - random(); - break; - } case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: { if (mFragment instanceof PostFragment) { ((PostFragment) mFragment).hideReadPosts(); diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewSubredditDetailActivity.java b/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewSubredditDetailActivity.java index 745ef679..6e010df0 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewSubredditDetailActivity.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewSubredditDetailActivity.java @@ -1402,10 +1402,6 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp goToUser(); break; } - case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: { - random(); - break; - } case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: { if (sectionsPagerAdapter != null) { sectionsPagerAdapter.hideReadPosts(); diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewUserDetailActivity.java b/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewUserDetailActivity.java index b90713f4..f1a71c49 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewUserDetailActivity.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/activities/ViewUserDetailActivity.java @@ -1341,10 +1341,7 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele goToUser(); break; } - case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: { - random(); - break; - } + case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: { if (sectionsPagerAdapter != null) { sectionsPagerAdapter.hideReadPosts(); diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/bottomsheetfragments/FABMoreOptionsBottomSheetFragment.java b/app/src/main/java/eu/toldi/infinityforlemmy/bottomsheetfragments/FABMoreOptionsBottomSheetFragment.java index 263b895e..c29eff6e 100644 --- a/app/src/main/java/eu/toldi/infinityforlemmy/bottomsheetfragments/FABMoreOptionsBottomSheetFragment.java +++ b/app/src/main/java/eu/toldi/infinityforlemmy/bottomsheetfragments/FABMoreOptionsBottomSheetFragment.java @@ -24,7 +24,6 @@ public class FABMoreOptionsBottomSheetFragment extends LandscapeExpandedRoundedB public static final int FAB_OPTION_SEARCH = 4; public static final int FAB_OPTION_GO_TO_SUBREDDIT = 5; public static final int FAB_OPTION_GO_TO_USER = 6; - public static final int FAB_RANDOM = 7; public static final int FAB_HIDE_READ_POSTS = 8; public static final int FAB_FILTER_POSTS = 9; public static final int FAB_GO_TO_TOP = 10; @@ -86,10 +85,6 @@ public class FABMoreOptionsBottomSheetFragment extends LandscapeExpandedRoundedB dismiss(); }); - binding.randomTextViewFabMoreOptionsBottomSheetFragment.setOnClickListener(view -> { - activity.fabOptionSelected(FAB_RANDOM); - dismiss(); - }); binding.filterPostsTextViewFabMoreOptionsBottomSheetFragment.setOnClickListener(view -> { activity.fabOptionSelected(FAB_FILTER_POSTS); diff --git a/app/src/main/res/layout/fragment_fab_more_options_bottom_sheet.xml b/app/src/main/res/layout/fragment_fab_more_options_bottom_sheet.xml index 6dbb217e..5d9ed9a4 100644 --- a/app/src/main/res/layout/fragment_fab_more_options_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_fab_more_options_bottom_sheet.xml @@ -144,25 +144,6 @@ android:focusable="true" android:background="?attr/selectableItemBackground" /> - -