owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/add-federated-timeline' into fork

Browse Source
This commit is contained in:
sk
2022-05-02 21:35:14 +02:00
parent 6533163fd0 318d271127
commit eb3adf1dfd
5 changed files with 73 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
View File

@@ -51,6 +51,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
private DiscoverAccountsFragment accountsFragment; private DiscoverAccountsFragment accountsFragment;
private SearchFragment searchFragment; private SearchFragment searchFragment;
private LocalTimelineFragment localTimelineFragment; private LocalTimelineFragment localTimelineFragment;
private FederatedTimelineFragment federatedTimelineFragment;
private String accountID; private String accountID;
private Runnable searchDebouncer=this::onSearchChangedDebounced; private Runnable searchDebouncer=this::onSearchChangedDebounced;
@@ -72,15 +73,16 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
tabLayout=view.findViewById(R.id.tabbar); tabLayout=view.findViewById(R.id.tabbar);
pager=view.findViewById(R.id.pager); pager=view.findViewById(R.id.pager);
tabViews=new FrameLayout[5]; tabViews=new FrameLayout[6];
for(int i=0;i<tabViews.length;i++){ for(int i=0;i<tabViews.length;i++){
FrameLayout tabView=new FrameLayout(getActivity()); FrameLayout tabView=new FrameLayout(getActivity());
tabView.setId(switch(i){ tabView.setId(switch(i){
case 0 -> R.id.discover_posts; case 0 -> R.id.discover_local_timeline;
case 1 -> R.id.discover_hashtags; case 1 -> R.id.discover_federated_timeline;
case 2 -> R.id.discover_news; case 2 -> R.id.discover_hashtags;
case 3 -> R.id.discover_local_timeline; case 3 -> R.id.discover_posts;
case 4 -> R.id.discover_users; case 4 -> R.id.discover_news;
case 5 -> R.id.discover_users;
default -> throw new IllegalStateException("Unexpected value: "+i); default -> throw new IllegalStateException("Unexpected value: "+i);
}); });
tabView.setVisibility(View.GONE); tabView.setVisibility(View.GONE);
@@ -106,7 +108,7 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
} }
}); });
if(postsFragment==null){ if(localTimelineFragment==null){
Bundle args=new Bundle(); Bundle args=new Bundle();
args.putString("account", accountID); args.putString("account", accountID);
args.putBoolean("__is_tab", true); args.putBoolean("__is_tab", true);
@@ -126,9 +128,13 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
localTimelineFragment=new LocalTimelineFragment(); localTimelineFragment=new LocalTimelineFragment();
localTimelineFragment.setArguments(args); localTimelineFragment.setArguments(args);
federatedTimelineFragment=new FederatedTimelineFragment();
federatedTimelineFragment.setArguments(args);
getChildFragmentManager().beginTransaction() getChildFragmentManager().beginTransaction()
.add(R.id.discover_posts, postsFragment) .add(R.id.discover_posts, postsFragment)
.add(R.id.discover_local_timeline, localTimelineFragment) .add(R.id.discover_local_timeline, localTimelineFragment)
.add(R.id.discover_federated_timeline, federatedTimelineFragment)
.add(R.id.discover_hashtags, hashtagsFragment) .add(R.id.discover_hashtags, hashtagsFragment)
.add(R.id.discover_news, newsFragment) .add(R.id.discover_news, newsFragment)
.add(R.id.discover_users, accountsFragment) .add(R.id.discover_users, accountsFragment)
@@ -139,11 +145,12 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
@Override @Override
public void onConfigureTab(@NonNull TabLayout.Tab tab, int position){ public void onConfigureTab(@NonNull TabLayout.Tab tab, int position){
tab.setText(switch(position){ tab.setText(switch(position){
case 0 -> R.string.posts; case 0 -> R.string.local_timeline;
case 1 -> R.string.hashtags; case 1 -> R.string.federated_timeline;
case 2 -> R.string.news; case 2 -> R.string.hashtags;
case 3 -> R.string.local_timeline; case 3 -> R.string.posts;
case 4 -> R.string.for_you; case 4 -> R.string.news;
case 5 -> R.string.for_you;
default -> throw new IllegalStateException("Unexpected value: "+position); default -> throw new IllegalStateException("Unexpected value: "+position);
}); });
tab.view.textView.setAllCaps(true); tab.view.textView.setAllCaps(true);
@@ -217,8 +224,8 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
} }
public void loadData(){ public void loadData(){
if(postsFragment!=null && !postsFragment.loaded && !postsFragment.dataLoading) if(localTimelineFragment!=null && !localTimelineFragment.loaded && !localTimelineFragment.dataLoading)
postsFragment.loadData(); localTimelineFragment.loadData();
} }
private void onSearchEditFocusChanged(View v, boolean hasFocus){ private void onSearchEditFocusChanged(View v, boolean hasFocus){
@@ -254,11 +261,12 @@ public class DiscoverFragment extends AppKitFragment implements ScrollableToTop,
private Fragment getFragmentForPage(int page){ private Fragment getFragmentForPage(int page){
return switch(page){ return switch(page){
case 0 -> postsFragment; case 0 -> localTimelineFragment;
case 1 -> hashtagsFragment; case 1 -> federatedTimelineFragment;
case 2 -> newsFragment; case 2 -> hashtagsFragment;
case 3 -> localTimelineFragment; case 3 -> postsFragment;
case 4 -> accountsFragment; case 4 -> newsFragment;
case 5 -> accountsFragment;
default -> throw new IllegalStateException("Unexpected value: "+page); default -> throw new IllegalStateException("Unexpected value: "+page);
}; };
} }

41
mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java Normal file
View File

@@ -0,0 +1,41 @@
package org.joinmastodon.android.fragments.discover;
import android.os.Bundle;
import android.view.View;
import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline;
import org.joinmastodon.android.fragments.StatusListFragment;
import org.joinmastodon.android.model.Filter;
import org.joinmastodon.android.model.Status;
import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;
import org.joinmastodon.android.utils.StatusFilterPredicate;
import java.util.List;
import java.util.stream.Collectors;
import me.grishka.appkit.api.SimpleCallback;
public class FederatedTimelineFragment extends StatusListFragment{
private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.FEDERATED_TIMELINE);
private String maxID;
@Override
protected void doLoadData(int offset, int count){
currentRequest=new GetPublicTimeline(false, false, refreshing ? null : maxID, count)
.setCallback(new SimpleCallback<>(this){
@Override
public void onSuccess(List<Status> result){
if(!result.isEmpty())
maxID=result.get(result.size()-1).id;
onDataLoaded(result.stream().filter(new StatusFilterPredicate(accountID, Filter.FilterContext.PUBLIC)).collect(Collectors.toList()), !result.isEmpty());
}
})
.exec(accountID);
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState){
super.onViewCreated(view, savedInstanceState);
bannerHelper.maybeAddBanner(contentWrap);
}
}

2
mastodon/src/main/java/org/joinmastodon/android/ui/utils/DiscoverInfoBannerHelper.java
View File

@@ -36,6 +36,7 @@ public class DiscoverInfoBannerHelper{
case TRENDING_HASHTAGS -> R.string.trending_hashtags_info_banner; case TRENDING_HASHTAGS -> R.string.trending_hashtags_info_banner;
case TRENDING_LINKS -> R.string.trending_links_info_banner; case TRENDING_LINKS -> R.string.trending_links_info_banner;
case LOCAL_TIMELINE -> R.string.local_timeline_info_banner; case LOCAL_TIMELINE -> R.string.local_timeline_info_banner;
case FEDERATED_TIMELINE -> R.string.federated_timeline_info_banner;
}); });
} }
} }
@@ -59,6 +60,7 @@ public class DiscoverInfoBannerHelper{
TRENDING_HASHTAGS, TRENDING_HASHTAGS,
TRENDING_LINKS, TRENDING_LINKS,
LOCAL_TIMELINE, LOCAL_TIMELINE,
FEDERATED_TIMELINE,
// ACCOUNTS // ACCOUNTS
} }
} }

1
mastodon/src/main/res/values/ids.xml
View File

@@ -12,6 +12,7 @@
<item name="discover_news" type="id"/> <item name="discover_news" type="id"/>
<item name="discover_users" type="id"/> <item name="discover_users" type="id"/>
<item name="discover_local_timeline" type="id"/> <item name="discover_local_timeline" type="id"/>
<item name="discover_federated_timeline" type="id"/>
<item name="notifications_all" type="id"/> <item name="notifications_all" type="id"/>
<item name="notifications_mentions" type="id"/> <item name="notifications_mentions" type="id"/>

2
mastodon/src/main/res/values/strings.xml
View File

@@ -308,10 +308,12 @@
<string name="downloading">Downloading…</string> <string name="downloading">Downloading…</string>
<string name="no_app_to_handle_action">There\'s no app to handle this action</string> <string name="no_app_to_handle_action">There\'s no app to handle this action</string>
<string name="local_timeline">Community</string> <string name="local_timeline">Community</string>
<string name="federated_timeline">Federation</string>
<string name="trending_posts_info_banner">These are the posts gaining traction in your corner of Mastodon.</string> <string name="trending_posts_info_banner">These are the posts gaining traction in your corner of Mastodon.</string>
<string name="trending_hashtags_info_banner">These are the hashtags gaining traction in your corner of Mastodon.</string> <string name="trending_hashtags_info_banner">These are the hashtags gaining traction in your corner of Mastodon.</string>
<string name="trending_links_info_banner">These are the news stories being shared the most in your corner of Mastodon.</string> <string name="trending_links_info_banner">These are the news stories being shared the most in your corner of Mastodon.</string>
<string name="local_timeline_info_banner">These are the most recent posts by the people who use the same Mastodon server as you.</string> <string name="local_timeline_info_banner">These are the most recent posts by the people who use the same Mastodon server as you.</string>
<string name="federated_timeline_info_banner">These are the most recent posts by the people in your federation.</string>
<string name="dismiss">Dismiss</string> <string name="dismiss">Dismiss</string>
<string name="see_new_posts">See new posts</string> <string name="see_new_posts">See new posts</string>
<string name="load_missing_posts">Load missing posts</string> <string name="load_missing_posts">Load missing posts</string>