mirror of
https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git
synced 2024-12-28 20:08:22 +01:00
Remove some reddit specific options from a few places
Removed multireddits. Also remove the "random" option from the "more options" menu
This commit is contained in:
parent
4bfe1b0c02
commit
5de8751079
@ -1400,10 +1400,6 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
|
|||||||
goToUser();
|
goToUser();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: {
|
|
||||||
randomThing();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: {
|
case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: {
|
||||||
if (sectionsPagerAdapter != null) {
|
if (sectionsPagerAdapter != null) {
|
||||||
sectionsPagerAdapter.hideReadPosts();
|
sectionsPagerAdapter.hideReadPosts();
|
||||||
|
@ -558,10 +558,6 @@ public class SearchResultActivity extends BaseActivity implements SortTypeSelect
|
|||||||
goToUser();
|
goToUser();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: {
|
|
||||||
random();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: {
|
case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: {
|
||||||
if (sectionsPagerAdapter != null) {
|
if (sectionsPagerAdapter != null) {
|
||||||
sectionsPagerAdapter.hideReadPosts();
|
sectionsPagerAdapter.hideReadPosts();
|
||||||
|
@ -233,7 +233,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
|
|||||||
});
|
});
|
||||||
sectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
|
sectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
|
||||||
viewPager.setAdapter(sectionsPagerAdapter);
|
viewPager.setAdapter(sectionsPagerAdapter);
|
||||||
viewPager.setOffscreenPageLimit(3);
|
viewPager.setOffscreenPageLimit(1);
|
||||||
if (viewPager.getCurrentItem() != 2) {
|
if (viewPager.getCurrentItem() != 2) {
|
||||||
fab.hide();
|
fab.hide();
|
||||||
}
|
}
|
||||||
@ -358,7 +358,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!(!forceLoad && mInsertMultiredditSuccess)) {
|
if (!(!forceLoad && mInsertMultiredditSuccess)) {
|
||||||
loadMultiReddits();
|
//loadMultiReddits();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -412,7 +412,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
|
|||||||
public void success() {
|
public void success() {
|
||||||
Toast.makeText(SubscribedThingListingActivity.this,
|
Toast.makeText(SubscribedThingListingActivity.this,
|
||||||
R.string.delete_multi_reddit_success, Toast.LENGTH_SHORT).show();
|
R.string.delete_multi_reddit_success, Toast.LENGTH_SHORT).show();
|
||||||
loadMultiReddits();
|
//loadMultiReddits();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -439,7 +439,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
|
|||||||
|
|
||||||
@Subscribe
|
@Subscribe
|
||||||
public void onRefreshMultiRedditsEvent(RefreshMultiRedditsEvent event) {
|
public void onRefreshMultiRedditsEvent(RefreshMultiRedditsEvent event) {
|
||||||
loadMultiReddits();
|
//loadMultiReddits();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -477,6 +477,7 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
|
|||||||
@Override
|
@Override
|
||||||
public Fragment getItem(int position) {
|
public Fragment getItem(int position) {
|
||||||
switch (position) {
|
switch (position) {
|
||||||
|
default:
|
||||||
case 0: {
|
case 0: {
|
||||||
SubscribedSubredditsListingFragment fragment = new SubscribedSubredditsListingFragment();
|
SubscribedSubredditsListingFragment fragment = new SubscribedSubredditsListingFragment();
|
||||||
Bundle bundle = new Bundle();
|
Bundle bundle = new Bundle();
|
||||||
@ -487,28 +488,12 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
|
|||||||
fragment.setArguments(bundle);
|
fragment.setArguments(bundle);
|
||||||
return fragment;
|
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
|
@Override
|
||||||
public int getCount() {
|
public int getCount() {
|
||||||
return 3;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -946,10 +946,6 @@ public class ViewMultiRedditDetailActivity extends BaseActivity implements SortT
|
|||||||
goToUser();
|
goToUser();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: {
|
|
||||||
random();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: {
|
case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: {
|
||||||
if (mFragment instanceof PostFragment) {
|
if (mFragment instanceof PostFragment) {
|
||||||
((PostFragment) mFragment).hideReadPosts();
|
((PostFragment) mFragment).hideReadPosts();
|
||||||
|
@ -1402,10 +1402,6 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
|
|||||||
goToUser();
|
goToUser();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: {
|
|
||||||
random();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: {
|
case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: {
|
||||||
if (sectionsPagerAdapter != null) {
|
if (sectionsPagerAdapter != null) {
|
||||||
sectionsPagerAdapter.hideReadPosts();
|
sectionsPagerAdapter.hideReadPosts();
|
||||||
|
@ -1341,10 +1341,7 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
|
|||||||
goToUser();
|
goToUser();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case FABMoreOptionsBottomSheetFragment.FAB_RANDOM: {
|
|
||||||
random();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: {
|
case FABMoreOptionsBottomSheetFragment.FAB_HIDE_READ_POSTS: {
|
||||||
if (sectionsPagerAdapter != null) {
|
if (sectionsPagerAdapter != null) {
|
||||||
sectionsPagerAdapter.hideReadPosts();
|
sectionsPagerAdapter.hideReadPosts();
|
||||||
|
@ -24,7 +24,6 @@ public class FABMoreOptionsBottomSheetFragment extends LandscapeExpandedRoundedB
|
|||||||
public static final int FAB_OPTION_SEARCH = 4;
|
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_SUBREDDIT = 5;
|
||||||
public static final int FAB_OPTION_GO_TO_USER = 6;
|
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_HIDE_READ_POSTS = 8;
|
||||||
public static final int FAB_FILTER_POSTS = 9;
|
public static final int FAB_FILTER_POSTS = 9;
|
||||||
public static final int FAB_GO_TO_TOP = 10;
|
public static final int FAB_GO_TO_TOP = 10;
|
||||||
@ -86,10 +85,6 @@ public class FABMoreOptionsBottomSheetFragment extends LandscapeExpandedRoundedB
|
|||||||
dismiss();
|
dismiss();
|
||||||
});
|
});
|
||||||
|
|
||||||
binding.randomTextViewFabMoreOptionsBottomSheetFragment.setOnClickListener(view -> {
|
|
||||||
activity.fabOptionSelected(FAB_RANDOM);
|
|
||||||
dismiss();
|
|
||||||
});
|
|
||||||
|
|
||||||
binding.filterPostsTextViewFabMoreOptionsBottomSheetFragment.setOnClickListener(view -> {
|
binding.filterPostsTextViewFabMoreOptionsBottomSheetFragment.setOnClickListener(view -> {
|
||||||
activity.fabOptionSelected(FAB_FILTER_POSTS);
|
activity.fabOptionSelected(FAB_FILTER_POSTS);
|
||||||
|
@ -144,25 +144,6 @@
|
|||||||
android:focusable="true"
|
android:focusable="true"
|
||||||
android:background="?attr/selectableItemBackground" />
|
android:background="?attr/selectableItemBackground" />
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/random_text_view_fab_more_options_bottom_sheet_fragment"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:gravity="center_vertical"
|
|
||||||
android:paddingTop="16dp"
|
|
||||||
android:paddingBottom="16dp"
|
|
||||||
android:paddingStart="32dp"
|
|
||||||
android:paddingEnd="32dp"
|
|
||||||
android:text="@string/random"
|
|
||||||
android:textColor="?attr/primaryTextColor"
|
|
||||||
android:textSize="?attr/font_default"
|
|
||||||
android:fontFamily="?attr/font_family"
|
|
||||||
app:drawableStartCompat="@drawable/ic_random_24dp"
|
|
||||||
android:drawablePadding="48dp"
|
|
||||||
android:clickable="true"
|
|
||||||
android:focusable="true"
|
|
||||||
android:background="?attr/selectableItemBackground" />
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/hide_read_posts_text_view_fab_more_options_bottom_sheet_fragment"
|
android:id="@+id/hide_read_posts_text_view_fab_more_options_bottom_sheet_fragment"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
Loading…
Reference in New Issue
Block a user