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 30a634188..12a14512e 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsFragment.java @@ -37,7 +37,7 @@ 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/StatusListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java index a3bc0fed5..83d10844e 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java @@ -30,7 +30,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/discover/DiscoverAccountsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java index c89c5c0b1..7eed94236 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.ScrollableToTop; @@ -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 BaseRecyclerFragment implements ScrollableToTop, IsOnTop { +public class DiscoverAccountsFragment extends BaseRecyclerFragment implements ScrollableToTop, IsOnTop, DomainDisplay { private String accountID; private Map relationships=Collections.emptyMap(); private GetAccountRelationships relationshipsRequest; @@ -58,6 +59,11 @@ public class DiscoverAccountsFragment extends BaseRecyclerFragment implements ScrollableToTop, IsOnTop { +public class DiscoverNewsFragment extends BaseRecyclerFragment 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 BaseRecyclerFragment implements 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 0d73a4e9f..dfbf27c8e 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,11 @@ 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/SearchFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java index bdbf20c62..e385b309a 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 @@ -57,6 +57,11 @@ public class SearchFragment extends BaseStatusListFragment{ 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 01c98c615..675118851 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 @@ -7,6 +7,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.ScrollableToTop; import org.joinmastodon.android.model.Hashtag; @@ -24,7 +25,7 @@ import me.grishka.appkit.fragments.BaseRecyclerFragment; import me.grishka.appkit.utils.BindableViewHolder; import me.grishka.appkit.views.UsableRecyclerView; -public class TrendingHashtagsFragment extends BaseRecyclerFragment implements ScrollableToTop, IsOnTop { +public class TrendingHashtagsFragment extends BaseRecyclerFragment implements ScrollableToTop, IsOnTop, DomainDisplay { private String accountID; private DiscoverInfoBannerHelper bannerHelper=new DiscoverInfoBannerHelper(DiscoverInfoBannerHelper.BannerType.TRENDING_HASHTAGS); @@ -32,6 +33,11 @@ public class TrendingHashtagsFragment extends BaseRecyclerFragment impl super(10); } + @Override + public String getDomain() { + return DomainDisplay.super.getDomain() + "/explore/tags"; + } + @Override public void onCreate(Bundle savedInstanceState){ super.onCreate(savedInstanceState);