diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java index c7e38656..ca9d05b0 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java @@ -49,7 +49,6 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop, private DiscoverNewsFragment newsFragment; private DiscoverAccountsFragment accountsFragment; private SearchFragment searchFragment; - private LocalTimelineFragment localTimelineFragment; private String accountID; private String currentQuery; @@ -71,15 +70,14 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop, tabLayout=view.findViewById(R.id.tabbar); pager=view.findViewById(R.id.pager); - tabViews=new FrameLayout[5]; + tabViews=new FrameLayout[4]; for(int i=0;i R.id.discover_posts; case 1 -> R.id.discover_hashtags; case 2 -> R.id.discover_news; - case 3 -> R.id.discover_local_timeline; - case 4 -> R.id.discover_users; + case 3 -> R.id.discover_users; default -> throw new IllegalStateException("Unexpected value: "+i); }); tabView.setVisibility(View.GONE); @@ -122,12 +120,8 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop, accountsFragment=new DiscoverAccountsFragment(); accountsFragment.setArguments(args); - localTimelineFragment=new LocalTimelineFragment(); - localTimelineFragment.setArguments(args); - getChildFragmentManager().beginTransaction() .add(R.id.discover_posts, postsFragment) - .add(R.id.discover_local_timeline, localTimelineFragment) .add(R.id.discover_hashtags, hashtagsFragment) .add(R.id.discover_news, newsFragment) .add(R.id.discover_users, accountsFragment) @@ -141,8 +135,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop, case 0 -> R.string.posts; case 1 -> R.string.hashtags; case 2 -> R.string.news; - case 3 -> R.string.local_timeline; - case 4 -> R.string.for_you; + case 3 -> R.string.for_you; default -> throw new IllegalStateException("Unexpected value: "+position); }); } @@ -245,8 +238,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop, case 0 -> postsFragment; case 1 -> hashtagsFragment; case 2 -> newsFragment; - case 3 -> localTimelineFragment; - case 4 -> accountsFragment; + case 3 -> accountsFragment; default -> throw new IllegalStateException("Unexpected value: "+page); }; } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java deleted file mode 100644 index 8ae1fd38..00000000 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.joinmastodon.android.fragments.discover; - -import android.os.Bundle; - -import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline; -import org.joinmastodon.android.api.session.AccountSessionManager; -import org.joinmastodon.android.fragments.StatusListFragment; -import org.joinmastodon.android.model.FilterContext; -import org.joinmastodon.android.model.Status; -import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper; - -import java.util.List; - -import androidx.recyclerview.widget.RecyclerView; -import me.grishka.appkit.api.SimpleCallback; -import me.grishka.appkit.utils.MergeRecyclerAdapter; - -public class LocalTimelineFragment extends StatusListFragment{ - private DiscoverInfoBannerHelper bannerHelper; - - private String maxID; - - @Override - public void onCreate(Bundle savedInstanceState){ - super.onCreate(savedInstanceState); - bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.LOCAL_TIMELINE, accountID); - } - - @Override - protected void doLoadData(int offset, int count){ - currentRequest=new GetPublicTimeline(true, false, refreshing ? null : maxID, null, count, null) - .setCallback(new SimpleCallback<>(this){ - @Override - public void onSuccess(List result){ - if(!result.isEmpty()) - maxID=result.get(result.size()-1).id; - boolean empty=result.isEmpty(); - AccountSessionManager.get(accountID).filterStatuses(result, FilterContext.PUBLIC); - onDataLoaded(result, !empty); - bannerHelper.onBannerBecameVisible(); - } - }) - .exec(accountID); - } - - @Override - protected RecyclerView.Adapter getAdapter(){ - MergeRecyclerAdapter adapter=new MergeRecyclerAdapter(); - bannerHelper.maybeAddBanner(list, adapter); - adapter.addAdapter(super.getAdapter()); - return adapter; - } -}