From a033d711c13b3883b0eab14ef71b8761a7351ffa Mon Sep 17 00:00:00 2001 From: FineFindus Date: Tue, 30 May 2023 15:40:20 +0200 Subject: [PATCH] feat: show page URL in recents --- .../joinmastodon/android/DomainManager.java | 26 +++++++++++++++++++ .../joinmastodon/android/MainActivity.java | 11 ++++++++ .../fragments/BaseStatusListFragment.java | 2 +- .../android/fragments/DomainDisplay.java | 15 +++++++++++ .../fragments/HashtagTimelineFragment.java | 7 +++++ .../android/fragments/HomeFragment.java | 7 +++++ .../android/fragments/HomeTabFragment.java | 16 +++++++++++- .../fragments/HomeTimelineFragment.java | 5 ++++ .../fragments/NotificationsFragment.java | 19 +++++++++----- .../android/fragments/ProfileFragment.java | 10 +++++++ .../android/fragments/StatusListFragment.java | 2 +- .../android/fragments/ThreadFragment.java | 9 ++++++- .../discover/DiscoverAccountsFragment.java | 8 +++++- .../fragments/discover/DiscoverFragment.java | 24 +++++++++++++++-- .../discover/DiscoverNewsFragment.java | 8 +++++- .../discover/DiscoverPostsFragment.java | 6 +++++ .../discover/FederatedTimelineFragment.java | 4 +++ .../discover/LocalTimelineFragment.java | 4 +++ .../fragments/discover/SearchFragment.java | 8 +++++- .../discover/TrendingHashtagsFragment.java | 8 +++++- 20 files changed, 182 insertions(+), 17 deletions(-) create mode 100644 mastodon/src/main/java/org/joinmastodon/android/DomainManager.java create mode 100644 mastodon/src/main/java/org/joinmastodon/android/fragments/DomainDisplay.java diff --git a/mastodon/src/main/java/org/joinmastodon/android/DomainManager.java b/mastodon/src/main/java/org/joinmastodon/android/DomainManager.java new file mode 100644 index 000000000..ddd58c2ce --- /dev/null +++ b/mastodon/src/main/java/org/joinmastodon/android/DomainManager.java @@ -0,0 +1,26 @@ +package org.joinmastodon.android; + +public class DomainManager { + private static final String TAG="DomainManager"; + + private static final DomainManager instance=new DomainManager(); + + private String currentDomain = ""; + + + public static DomainManager getInstance(){ + return instance; + } + + private DomainManager(){ + + } + + public String getCurrentDomain() { + return currentDomain; + } + + public void setCurrentDomain(String domain) { + this.currentDomain = domain; + } +} \ No newline at end of file diff --git a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java index ddfb01371..6b57c982a 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java +++ b/mastodon/src/main/java/org/joinmastodon/android/MainActivity.java @@ -2,8 +2,10 @@ package org.joinmastodon.android; import android.Manifest; import android.app.Fragment; +import android.app.assist.AssistContent; import android.content.Intent; import android.content.pm.PackageManager; +import android.net.Uri; import android.os.Build; import android.os.Bundle; import android.util.Log; @@ -94,6 +96,7 @@ public class MainActivity extends FragmentStackActivity{ Fragment fragment=new HomeFragment(); fragment.setArguments(args); showFragmentClearingBackStack(fragment); + DomainManager.getInstance().setCurrentDomain(accountSession.domain); } }else if(intent.getBooleanExtra("compose", false)){ showCompose(); @@ -167,4 +170,12 @@ public class MainActivity extends FragmentStackActivity{ super.onBackPressed(); } } + + @Override + public void onProvideAssistContent(AssistContent outContent) { + super.onProvideAssistContent(outContent); + + outContent.setWebUri(Uri.parse(DomainManager.getInstance().getCurrentDomain())); + } + } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java index 71a0009a5..3ba365274 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java @@ -68,7 +68,7 @@ import me.grishka.appkit.utils.BindableViewHolder; import me.grishka.appkit.utils.V; import me.grishka.appkit.views.UsableRecyclerView; -public abstract class BaseStatusListFragment extends RecyclerFragment implements PhotoViewerHost, ScrollableToTop, HasFab{ +public abstract class BaseStatusListFragment extends RecyclerFragment implements PhotoViewerHost, ScrollableToTop, HasFab, DomainDisplay{ protected ArrayList displayItems=new ArrayList<>(); protected DisplayItemsAdapter adapter; protected String accountID; diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/DomainDisplay.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/DomainDisplay.java new file mode 100644 index 000000000..369014e69 --- /dev/null +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/DomainDisplay.java @@ -0,0 +1,15 @@ +package org.joinmastodon.android.fragments; + +import org.joinmastodon.android.api.session.AccountSession; +import org.joinmastodon.android.api.session.AccountSessionManager; + +public interface DomainDisplay { + + default String getDomain(){ + AccountSession session = AccountSessionManager.getInstance().getLastActiveAccount(); + if (session != null) + return session.domain; + else + return ""; + } +} \ No newline at end of file diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java index 815a6c307..a4c8146f3 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java @@ -11,6 +11,7 @@ import android.view.ViewGroup; import android.widget.ImageButton; import android.widget.Toast; +import org.joinmastodon.android.DomainManager; import org.joinmastodon.android.E; import org.joinmastodon.android.R; import org.joinmastodon.android.api.requests.tags.GetHashtag; @@ -43,12 +44,18 @@ public class HashtagTimelineFragment extends PinnableStatusListFragment { return true; } + @Override + public String getDomain() { + return super.getDomain() + "/tags/" + hashtag; + } + @Override public void onAttach(Activity activity){ super.onAttach(activity); updateTitle(getArguments().getString("hashtag")); following=getArguments().getBoolean("following", false); setHasOptionsMenu(true); + DomainManager.getInstance().setCurrentDomain(getDomain()); } private void updateTitle(String hashtagName) { diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java index 8a24dad36..0037c770c 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java @@ -16,6 +16,7 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; +import org.joinmastodon.android.DomainManager; import org.joinmastodon.android.E; import org.joinmastodon.android.R; import org.joinmastodon.android.api.requests.notifications.GetNotifications; @@ -180,6 +181,8 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene @Override public void onHiddenChanged(boolean hidden){ super.onHiddenChanged(hidden); + if (!hidden && fragmentForTab(currentTab) instanceof DomainDisplay display) + DomainManager.getInstance().setCurrentDomain(display.getDomain()); fragmentForTab(currentTab).onHiddenChanged(hidden); } @@ -237,6 +240,10 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene currentTab=tab; ((FragmentStackActivity)getActivity()).invalidateSystemBarColors(this); if (tab == R.id.tab_search && isPleroma) searchFragment.selectSearch(); + + if (newFragment instanceof DomainDisplay display) { + DomainManager.getInstance().setCurrentDomain(display.getDomain()); + } } private void maybeTriggerLoading(Fragment newFragment){ diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java index 3616eb5e4..b95e5eea5 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java @@ -36,6 +36,7 @@ import androidx.viewpager2.widget.ViewPager2; import com.squareup.otto.Subscribe; +import org.joinmastodon.android.DomainManager; import org.joinmastodon.android.E; import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.R; @@ -71,7 +72,7 @@ import me.grishka.appkit.fragments.OnBackPressedListener; import me.grishka.appkit.utils.CubicBezierInterpolator; import me.grishka.appkit.utils.V; -public class HomeTabFragment extends MastodonToolbarFragment implements ScrollableToTop, OnBackPressedListener, HasFab { +public class HomeTabFragment extends MastodonToolbarFragment implements ScrollableToTop, OnBackPressedListener, HasFab, DomainDisplay { private static final int ANNOUNCEMENTS_RESULT = 654; private String accountID; @@ -203,6 +204,10 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab if (fragments[position] instanceof BaseRecyclerFragment page){ if(!page.loaded && !page.isDataLoading()) page.loadData(); } + + //update recent app list url + if (fragments[position] instanceof DomainDisplay page) + DomainManager.getInstance().setCurrentDomain(page.getDomain()); } }); @@ -287,6 +292,15 @@ public class HomeTabFragment extends MastodonToolbarFragment implements Scrollab }).exec(accountID); } + + @Override + public String getDomain() { + if (fragments[pager.getCurrentItem()] instanceof DomainDisplay page) { + return page.getDomain(); + } + return DomainDisplay.super.getDomain(); + } + private void onFabClick(View v){ if (fragments[pager.getCurrentItem()] instanceof BaseStatusListFragment l) { l.onFabClick(v); diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java index 1e3ca22a8..0c98f7d7e 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java @@ -40,6 +40,11 @@ public class HomeTimelineFragment extends StatusListFragment { return true; } + @Override + public String getDomain() { + return super.getDomain() + "/home"; + } + @Override public void onAttach(Activity activity){ super.onAttach(activity); diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java index 4500fac60..ce5435a52 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java @@ -13,6 +13,12 @@ import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.LinearLayout; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; +import androidx.viewpager2.widget.ViewPager2; + +import com.squareup.otto.Subscribe; + import org.joinmastodon.android.E; import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.R; @@ -25,19 +31,13 @@ import org.joinmastodon.android.ui.tabs.TabLayout; import org.joinmastodon.android.ui.tabs.TabLayoutMediator; import org.joinmastodon.android.ui.utils.UiUtils; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.RecyclerView; -import androidx.viewpager2.widget.ViewPager2; - -import com.squareup.otto.Subscribe; - import me.grishka.appkit.Nav; import me.grishka.appkit.api.Callback; import me.grishka.appkit.api.ErrorResponse; import me.grishka.appkit.fragments.BaseRecyclerFragment; import me.grishka.appkit.utils.V; -public class NotificationsFragment extends MastodonToolbarFragment implements ScrollableToTop{ +public class NotificationsFragment extends MastodonToolbarFragment implements ScrollableToTop, DomainDisplay { private TabLayout tabLayout; private ViewPager2 pager; @@ -48,6 +48,11 @@ public class NotificationsFragment extends MastodonToolbarFragment implements Sc private String accountID; + @Override + public String getDomain() { + return DomainDisplay.super.getDomain() + "/notifications"; + } + @Override public void onCreate(Bundle savedInstanceState){ super.onCreate(savedInstanceState); diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java index 174d3d19b..dae1b47e4 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java @@ -42,6 +42,7 @@ import android.widget.TextView; import android.widget.Toast; import android.widget.Toolbar; +import org.joinmastodon.android.DomainManager; import org.joinmastodon.android.GlobalUserPreferences; import org.joinmastodon.android.R; import org.joinmastodon.android.api.requests.accounts.GetAccountByID; @@ -206,6 +207,14 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList setHasOptionsMenu(true); } + @Override + public void onHiddenChanged(boolean hidden) { + super.onHiddenChanged(hidden); + if (!hidden) { + DomainManager.getInstance().setCurrentDomain(account.url); + } + } + @Override public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState){ View content=inflater.inflate(R.layout.fragment_profile, container, false); @@ -761,6 +770,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList followsYouView.setVisibility(relationship.followedBy ? View.VISIBLE : View.GONE); notifyButton.setSelected(relationship.notifying); notifyButton.setContentDescription(getString(relationship.notifying ? R.string.sk_user_post_notifications_on : R.string.sk_user_post_notifications_off, '@'+account.username)); + DomainManager.getInstance().setCurrentDomain(account.url); } public ImageButton getFab() { diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java index e330631d4..dd879bb75 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java @@ -28,7 +28,7 @@ import java.util.stream.Stream; import androidx.recyclerview.widget.RecyclerView; import me.grishka.appkit.Nav; -public abstract class StatusListFragment extends BaseStatusListFragment{ +public abstract class StatusListFragment extends BaseStatusListFragment implements DomainDisplay{ protected EventListener eventListener=new EventListener(); protected List buildDisplayItems(Status s){ diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java index 9a4ded773..176e3d5b1 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java @@ -3,6 +3,7 @@ package org.joinmastodon.android.fragments; import android.os.Bundle; import android.view.View; +import org.joinmastodon.android.DomainManager; import org.joinmastodon.android.R; import org.joinmastodon.android.api.requests.statuses.GetStatusContext; import org.joinmastodon.android.api.session.AccountSession; @@ -29,9 +30,14 @@ import java.util.stream.Collectors; import me.grishka.appkit.api.SimpleCallback; -public class ThreadFragment extends StatusListFragment{ +public class ThreadFragment extends StatusListFragment implements DomainDisplay{ protected Status mainStatus; + @Override + public String getDomain() { + return mainStatus.url; + } + @Override public void onCreate(Bundle savedInstanceState){ super.onCreate(savedInstanceState); @@ -42,6 +48,7 @@ public class ThreadFragment extends StatusListFragment{ data.add(mainStatus); onAppendItems(Collections.singletonList(mainStatus)); setTitle(HtmlParser.parseCustomEmoji(getString(R.string.post_from_user, mainStatus.account.displayName), mainStatus.account.emojis)); + DomainManager.getInstance().setCurrentDomain(getDomain()); } @Override diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java index ae26e50e3..cca6ba389 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java @@ -15,6 +15,7 @@ import android.widget.TextView; import org.joinmastodon.android.R; import org.joinmastodon.android.api.requests.accounts.GetAccountRelationships; import org.joinmastodon.android.api.requests.accounts.GetFollowSuggestions; +import org.joinmastodon.android.fragments.DomainDisplay; import org.joinmastodon.android.fragments.IsOnTop; import org.joinmastodon.android.fragments.ProfileFragment; import org.joinmastodon.android.fragments.RecyclerFragment; @@ -49,7 +50,7 @@ import me.grishka.appkit.utils.BindableViewHolder; import me.grishka.appkit.utils.V; import me.grishka.appkit.views.UsableRecyclerView; -public class DiscoverAccountsFragment extends RecyclerFragment implements ScrollableToTop, IsOnTop { +public class DiscoverAccountsFragment extends RecyclerFragment implements ScrollableToTop, IsOnTop, DomainDisplay { private String accountID; private Map relationships=Collections.emptyMap(); private GetAccountRelationships relationshipsRequest; @@ -58,6 +59,11 @@ public class DiscoverAccountsFragment extends RecyclerFragment implements ScrollableToTop, IsOnTop { +public class DiscoverNewsFragment extends RecyclerFragment implements ScrollableToTop, IsOnTop, DomainDisplay { private String accountID; private List imageRequests=Collections.emptyList(); private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.TRENDING_LINKS); @@ -44,6 +45,11 @@ public class DiscoverNewsFragment extends RecyclerFragment implements Scro super(10); } + @Override + public String getDomain() { + return DomainDisplay.super.getDomain() + "/explore/links"; + } + @Override public void onCreate(Bundle savedInstanceState){ super.onCreate(savedInstanceState); diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java index 8b16f9c58..2f6522179 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java @@ -19,6 +19,12 @@ import me.grishka.appkit.api.SimpleCallback; public class DiscoverPostsFragment extends StatusListFragment implements IsOnTop { private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.TRENDING_POSTS); + @Override + public String getDomain() { + return super.getDomain() + "/explore/posts"; + } + + @Override protected void doLoadData(int offset, int count){ currentRequest=new GetTrendingStatuses(offset, count) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java index bd3fecce2..86f54d8ab 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java @@ -25,6 +25,10 @@ public class FederatedTimelineFragment extends StatusListFragment { return true; } + @Override + public String getDomain() { + return super.getDomain() + "/public"; + } @Override protected void doLoadData(int offset, int count){ 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 index eea58b6a8..631a8d64f 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java @@ -24,6 +24,10 @@ public class LocalTimelineFragment extends StatusListFragment { return true; } + @Override + public String getDomain() { + return super.getDomain() + "/public/local"; + } @Override protected void doLoadData(int offset, int count){ diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java index e9fd83fca..77b2f1212 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java @@ -11,6 +11,7 @@ import org.joinmastodon.android.R; import org.joinmastodon.android.api.requests.search.GetSearchResults; import org.joinmastodon.android.api.session.AccountSessionManager; import org.joinmastodon.android.fragments.BaseStatusListFragment; +import org.joinmastodon.android.fragments.DomainDisplay; import org.joinmastodon.android.fragments.IsOnTop; import org.joinmastodon.android.fragments.ProfileFragment; import org.joinmastodon.android.fragments.ThreadFragment; @@ -42,7 +43,7 @@ import me.grishka.appkit.api.ErrorResponse; import me.grishka.appkit.utils.MergeRecyclerAdapter; import me.grishka.appkit.utils.V; -public class SearchFragment extends BaseStatusListFragment implements IsOnTop { +public class SearchFragment extends BaseStatusListFragment implements IsOnTop, DomainDisplay { private String currentQuery; private List prevDisplayItems; private EnumSet currentFilter=EnumSet.allOf(SearchResult.Type.class); @@ -57,6 +58,11 @@ public class SearchFragment extends BaseStatusListFragment impleme setLayout(R.layout.fragment_search); } + @Override + public String getDomain() { + return super.getDomain() + "/search"; + } + @Override public void onCreate(Bundle savedInstanceState){ super.onCreate(savedInstanceState); diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java index f5063456b..8a4ab38f9 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java @@ -10,6 +10,7 @@ import android.widget.TextView; import org.joinmastodon.android.R; import org.joinmastodon.android.api.requests.trends.GetTrendingHashtags; +import org.joinmastodon.android.fragments.DomainDisplay; import org.joinmastodon.android.fragments.IsOnTop; import org.joinmastodon.android.fragments.RecyclerFragment; import org.joinmastodon.android.fragments.ScrollableToTop; @@ -27,7 +28,7 @@ import me.grishka.appkit.api.SimpleCallback; import me.grishka.appkit.utils.BindableViewHolder; import me.grishka.appkit.views.UsableRecyclerView; -public class TrendingHashtagsFragment extends RecyclerFragment implements ScrollableToTop, IsOnTop { +public class TrendingHashtagsFragment extends RecyclerFragment implements ScrollableToTop, IsOnTop, DomainDisplay { private String accountID; private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.TRENDING_HASHTAGS); @@ -41,6 +42,11 @@ public class TrendingHashtagsFragment extends RecyclerFragment implemen accountID=getArguments().getString("account"); } + @Override + public String getDomain() { + return DomainDisplay.super.getDomain() + "/explore/tags"; + } + @Override protected void doLoadData(int offset, int count){ currentRequest=new GetTrendingHashtags(10)