Add trends

app/src/main/AndroidManifest.xml

@@ -117,6 +117,11 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:theme="@style/AppThemeBar"
             android:label="@string/search" />
+        <activity
+            android:name=".activities.TrendsActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:label="@string/trending"
+            android:theme="@style/AppThemeBar" />
         <activity
             android:name=".activities.ReorderTimelinesActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"

app/src/main/java/app/fedilab/android/BaseMainActivity.java

@@ -107,6 +107,7 @@ import app.fedilab.android.activities.ReorderTimelinesActivity;
 import app.fedilab.android.activities.ScheduledActivity;
 import app.fedilab.android.activities.SearchResultTabActivity;
 import app.fedilab.android.activities.SettingsActivity;
+import app.fedilab.android.activities.TrendsActivity;
 import app.fedilab.android.broadcastreceiver.NetworkStateReceiver;
 import app.fedilab.android.client.entities.api.Emoji;
 import app.fedilab.android.client.entities.api.EmojiInstance;
@@ -509,6 +510,9 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
             } else if (id == R.id.nav_announcements) {
                 Intent intent = new Intent(this, AnnouncementActivity.class);
                 startActivity(intent);
+            } else if (id == R.id.nav_trends) {
+                Intent intent = new Intent(this, TrendsActivity.class);
+                startActivity(intent);
             } else if (id == R.id.nav_cache) {
                 Intent intent = new Intent(BaseMainActivity.this, CacheActivity.class);
                 startActivity(intent);

app/src/main/java/app/fedilab/android/activities/TrendsActivity.java

@@ -0,0 +1,156 @@
+package app.fedilab.android.activities;
+/* Copyright 2022 Thomas Schneider
+ *
+ * This file is a part of Fedilab
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software Foundation; either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Fedilab; if not,
+ * see <http://www.gnu.org/licenses>. */
+
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
+import com.google.android.material.tabs.TabLayout;
+
+import org.jetbrains.annotations.NotNull;
+
+import app.fedilab.android.R;
+import app.fedilab.android.client.entities.app.Timeline;
+import app.fedilab.android.databinding.ActivityTrendsBinding;
+import app.fedilab.android.helper.Helper;
+import app.fedilab.android.helper.ThemeHelper;
+import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTag;
+import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline;
+
+
+public class TrendsActivity extends BaseActivity {
+
+
+    private ActivityTrendsBinding binding;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ThemeHelper.applyThemeBar(this);
+        binding = ActivityTrendsBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+
+
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
+        }
+
+        binding.searchTabLayout.addTab(binding.searchTabLayout.newTab().setText(getString(R.string.tags)));
+        binding.searchTabLayout.addTab(binding.searchTabLayout.newTab().setText(getString(R.string.toots)));
+        binding.searchTabLayout.setTabTextColors(ThemeHelper.getAttColor(TrendsActivity.this, R.attr.mTextColor), ContextCompat.getColor(TrendsActivity.this, R.color.cyanea_accent_dark_reference));
+        binding.searchTabLayout.setTabIconTint(ThemeHelper.getColorStateList(TrendsActivity.this));
+        binding.searchTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                binding.trendsViewpager.setCurrentItem(tab.getPosition());
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+                Fragment fragment;
+                if (binding.trendsViewpager.getAdapter() != null) {
+                    fragment = (Fragment) binding.trendsViewpager.getAdapter().instantiateItem(binding.trendsViewpager, tab.getPosition());
+                    if (fragment instanceof FragmentMastodonTimeline) {
+                        FragmentMastodonTimeline fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);
+                        fragmentMastodonTimeline.scrollToTop();
+                    } else if (fragment instanceof FragmentMastodonTag) {
+                        FragmentMastodonTag fragmentMastodonTag = ((FragmentMastodonTag) fragment);
+                        fragmentMastodonTag.scrollToTop();
+                    }
+                }
+            }
+        });
+
+        PagerAdapter mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager());
+        binding.trendsViewpager.setAdapter(mPagerAdapter);
+        binding.trendsViewpager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                TabLayout.Tab tab = binding.searchTabLayout.getTabAt(position);
+                if (tab != null)
+                    tab.select();
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+            }
+        });
+    }
+
+
+    @Override
+    public boolean onOptionsItemSelected(@NotNull MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            finish();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+
+    /**
+     * Pager adapter for the 4 fragments
+     */
+    @SuppressWarnings("deprecation")
+    private static class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {
+        ScreenSlidePagerAdapter(FragmentManager fm) {
+            super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
+        }
+
+        @NotNull
+        @Override
+        public Fragment getItem(int position) {
+            Bundle bundle = new Bundle();
+            if (position == 0) {
+                FragmentMastodonTag fragmentMastodonTag = new FragmentMastodonTag();
+                bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, Timeline.TimeLineEnum.TREND_TAG);
+                fragmentMastodonTag.setArguments(bundle);
+                return fragmentMastodonTag;
+            }
+            FragmentMastodonTimeline fragmentMastodonTimeline = new FragmentMastodonTimeline();
+            bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, Timeline.TimeLineEnum.TREND_MESSAGE);
+            fragmentMastodonTimeline.setArguments(bundle);
+            return fragmentMastodonTimeline;
+        }
+
+        @Override
+        public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
+        }
+
+        @Override
+        public int getCount() {
+            return 2;
+        }
+    }
+}

app/src/main/java/app/fedilab/android/client/endpoints/MastodonTimelinesService.java

@@ -21,6 +21,7 @@ import app.fedilab.android.client.entities.api.Conversation;
 import app.fedilab.android.client.entities.api.Marker;
 import app.fedilab.android.client.entities.api.MastodonList;
 import app.fedilab.android.client.entities.api.Status;
+import app.fedilab.android.client.entities.api.Tag;
 import app.fedilab.android.client.entities.misskey.MisskeyNote;
 import app.fedilab.android.client.entities.nitter.Nitter;
 import app.fedilab.android.client.entities.peertube.PeertubeVideo;
@@ -52,6 +53,14 @@ public interface MastodonTimelinesService {
             @Query("limit") Integer limit
     );
 
+
+    @GET("trends/statuses")
+    Call<List<Status>> getStatusTrends(@Header("Authorization") String token);
+
+
+    @GET("trends/tags")
+    Call<List<Tag>> getTagTrends(@Header("Authorization") String token);
+
     //Public Tags timelines
     @GET("timelines/tag/{hashtag}")
     Call<List<Status>> getHashTag(

app/src/main/java/app/fedilab/android/client/entities/app/Timeline.java

@@ -370,6 +370,10 @@ public class Timeline {
         LIST("LIST"),
         @SerializedName("REMOTE")
         REMOTE("REMOTE"),
+        @SerializedName("TREND_TAG")
+        TREND_TAG("TREND_TAG"),
+        @SerializedName("TREND_MESSAGE")
+        TREND_MESSAGE("TREND_MESSAGE"),
         @SerializedName("ACCOUNT_TIMELINE")
         ACCOUNT_TIMELINE("ACCOUNT_TIMELINE"),
         @SerializedName("MUTED_TIMELINE")

app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTag.java

@@ -31,12 +31,14 @@ import java.util.List;
 import app.fedilab.android.BaseMainActivity;
 import app.fedilab.android.R;
 import app.fedilab.android.client.entities.api.Tag;
+import app.fedilab.android.client.entities.app.Timeline;
 import app.fedilab.android.databinding.FragmentPaginationBinding;
 import app.fedilab.android.helper.Helper;
 import app.fedilab.android.helper.MastodonHelper;
 import app.fedilab.android.helper.ThemeHelper;
 import app.fedilab.android.ui.drawer.TagAdapter;
 import app.fedilab.android.viewmodel.mastodon.SearchVM;
+import app.fedilab.android.viewmodel.mastodon.TimelinesVM;
 
 
 public class FragmentMastodonTag extends Fragment {
@@ -45,11 +47,13 @@ public class FragmentMastodonTag extends Fragment {
     private FragmentPaginationBinding binding;
     private TagAdapter tagAdapter;
     private String search;
+    private Timeline.TimeLineEnum timelineType;
 
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
         if (getArguments() != null) {
             search = getArguments().getString(Helper.ARG_SEARCH_KEYWORD, null);
+            timelineType = (Timeline.TimeLineEnum) getArguments().get(Helper.ARG_TIMELINE_TYPE);
         }
 
         binding = FragmentPaginationBinding.inflate(inflater, container, false);
@@ -74,7 +78,7 @@ public class FragmentMastodonTag extends Fragment {
      * Router for timelines
      */
     private void router() {
-        if (search != null) {
+        if (search != null && timelineType == null) {
             SearchVM searchVM = new ViewModelProvider(FragmentMastodonTag.this).get(SearchVM.class);
             searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, search.trim(), null, "hashtags", false, true, false, 0, null, null, MastodonHelper.STATUSES_PER_CALL)
                     .observe(getViewLifecycleOwner(), results -> {
@@ -82,6 +86,12 @@ public class FragmentMastodonTag extends Fragment {
                             initializeTagCommonView(results.hashtags);
                         }
                     });
+        } else if (timelineType == Timeline.TimeLineEnum.TREND_TAG) {
+            TimelinesVM timelinesVM = new ViewModelProvider(FragmentMastodonTag.this).get(TimelinesVM.class);
+            timelinesVM.getTagsTrends(BaseMainActivity.currentToken, BaseMainActivity.currentInstance)
+                    .observe(getViewLifecycleOwner(), tags -> {
+                        initializeTagCommonView(tags);
+                    });
         }
     }
 

app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java

@@ -286,11 +286,13 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
         binding.loader.setVisibility(View.GONE);
         binding.noAction.setVisibility(View.GONE);
         binding.swipeContainer.setRefreshing(false);
+        if (searchCache == null && timelineType != Timeline.TimeLineEnum.TREND_MESSAGE) {
             binding.swipeContainer.setOnRefreshListener(() -> {
                 binding.swipeContainer.setRefreshing(true);
                 flagLoading = false;
                 route(DIRECTION.REFRESH, true);
             });
+        }
 
         if (statuses == null || statuses.statuses == null || statuses.statuses.size() == 0) {
             binding.noAction.setVisibility(View.VISIBLE);
@@ -356,7 +358,7 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
             binding.recyclerView.scrollToPosition(position);
         }
 
-        if (searchCache == null) {
+        if (searchCache == null && timelineType != Timeline.TimeLineEnum.TREND_MESSAGE) {
             binding.recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
                 @Override
                 public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
@@ -849,6 +851,19 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
                         } else {
                             flagLoading = false;
                         }
+                    } else if (timelineType == Timeline.TimeLineEnum.TREND_MESSAGE) {
+                        if (direction == null) {
+                            timelinesVM.getStatusTrends(BaseMainActivity.currentToken, BaseMainActivity.currentInstance)
+                                    .observe(getViewLifecycleOwner(), statusesTrends -> {
+                                        Statuses statuses = new Statuses();
+                                        statuses.statuses = new ArrayList<>();
+                                        if (statusesTrends != null) {
+                                            statuses.statuses.addAll(statusesTrends);
+                                        }
+                                        statuses.pagination = new Pagination();
+                                        initializeStatusesCommonView(statuses);
+                                    });
+                        }
                     }
                 };
                 mainHandler.post(myRunnable);

app/src/main/java/app/fedilab/android/viewmodel/mastodon/TimelinesVM.java

@@ -38,6 +38,7 @@ import app.fedilab.android.client.entities.api.MastodonList;
 import app.fedilab.android.client.entities.api.Pagination;
 import app.fedilab.android.client.entities.api.Status;
 import app.fedilab.android.client.entities.api.Statuses;
+import app.fedilab.android.client.entities.api.Tag;
 import app.fedilab.android.client.entities.app.BaseAccount;
 import app.fedilab.android.client.entities.app.StatusCache;
 import app.fedilab.android.client.entities.app.StatusDraft;
@@ -75,6 +76,8 @@ public class TimelinesVM extends AndroidViewModel {
     private MutableLiveData<MastodonList> mastodonListMutableLiveData;
     private MutableLiveData<List<MastodonList>> mastodonListListMutableLiveData;
     private MutableLiveData<Marker> markerMutableLiveData;
+    private MutableLiveData<List<Status>> statusListMutableLiveData;
+    private MutableLiveData<List<Tag>> tagListMutableLiveData;
 
     public TimelinesVM(@NonNull Application application) {
         super(application);
@@ -107,6 +110,56 @@ public class TimelinesVM extends AndroidViewModel {
         return retrofit.create(MastodonTimelinesService.class);
     }
 
+    public LiveData<List<Status>> getStatusTrends(String token, @NonNull String instance) {
+        MastodonTimelinesService mastodonTimelinesService = init(instance);
+        statusListMutableLiveData = new MutableLiveData<>();
+        new Thread(() -> {
+            Call<List<Status>> publicTlCall = mastodonTimelinesService.getStatusTrends(token);
+            List<Status> statusList = null;
+            if (publicTlCall != null) {
+                try {
+                    Response<List<Status>> publicTlResponse = publicTlCall.execute();
+                    if (publicTlResponse.isSuccessful()) {
+                        statusList = publicTlResponse.body();
+                        statusList = SpannableHelper.convertStatus(getApplication().getApplicationContext(), statusList);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            Handler mainHandler = new Handler(Looper.getMainLooper());
+            List<Status> finalStatusList = statusList;
+            Runnable myRunnable = () -> statusListMutableLiveData.setValue(finalStatusList);
+            mainHandler.post(myRunnable);
+        }).start();
+        return statusListMutableLiveData;
+    }
+
+
+    public LiveData<List<Tag>> getTagsTrends(String token, @NonNull String instance) {
+        MastodonTimelinesService mastodonTimelinesService = init(instance);
+        tagListMutableLiveData = new MutableLiveData<>();
+        new Thread(() -> {
+            Call<List<Tag>> publicTlCall = mastodonTimelinesService.getTagTrends(token);
+            List<Tag> tagList = null;
+            if (publicTlCall != null) {
+                try {
+                    Response<List<Tag>> publicTlResponse = publicTlCall.execute();
+                    if (publicTlResponse.isSuccessful()) {
+                        tagList = publicTlResponse.body();
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            Handler mainHandler = new Handler(Looper.getMainLooper());
+            List<Tag> finalTagList = tagList;
+            Runnable myRunnable = () -> tagListMutableLiveData.setValue(finalTagList);
+            mainHandler.post(myRunnable);
+        }).start();
+        return tagListMutableLiveData;
+    }
+
     /**
      * Public timeline
      *

app/src/main/res/drawable/ic_baseline_trending_up_24.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M16,6l2.29,2.29 -4.88,4.88 -4,-4L2,16.59 3.41,18l6,-6 4,4 6.3,-6.29L22,12V6z" />
+</vector>

app/src/main/res/layout/activity_trends.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+    Copyright 2022 Thomas Schneider
+
+    This file is a part of Fedilab
+
+    This program is free software; you can redistribute it and/or modify it under the terms of the
+    GNU General Public License as published by the Free Software Foundation; either version 3 of the
+    License, or (at your option) any later version.
+
+    Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+    the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+    Public License for more details.
+
+    You should have received a copy of the GNU General Public License along with Fedilab; if not,
+    see <http://www.gnu.org/licenses>.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.google.android.material.tabs.TabLayout
+        android:id="@+id/search_tabLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?backgroundColorLight"
+        app:tabGravity="fill"
+        app:tabIndicatorColor="@color/cyanea_accent_dark_reference"
+        app:tabMode="fixed" />
+
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/trends_viewpager"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+</LinearLayout>

app/src/main/res/menu/activity_main_drawer.xml

@@ -35,6 +35,12 @@
             android:title="@string/action_announcements"
             android:visible="true" />
 
+        <item
+            android:id="@+id/nav_trends"
+            android:icon="@drawable/ic_baseline_trending_up_24"
+            android:title="@string/trending"
+            android:visible="true" />
+
         <item
             android:id="@+id/nav_scheduled"
             android:icon="@drawable/ic_baseline_schedule_24"