Fix issue with pagination

18 files changed, 370 insertions, 176 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b79bd1f0e..b736d8d6a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,12 +18,14 @@
         android:icon="@mipmap/ic_launcher"
         android:usesCleartextTraffic="true"
         android:label="@string/app_name"
+        android:configChanges="orientation|screenSize"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppThemeDark"
        >
         <activity
             android:name=".activities.MainActivity"
+            android:configChanges="orientation|screenSize"
             android:exported="true"
             >
             <intent-filter>
diff --git a/app/src/main/java/app/fedilab/android/BaseMainActivity.java b/app/src/main/java/app/fedilab/android/BaseMainActivity.java
index 80abbd813..08b715c7a 100644
--- a/app/src/main/java/app/fedilab/android/BaseMainActivity.java
+++ b/app/src/main/java/app/fedilab/android/BaseMainActivity.java
@@ -55,6 +55,7 @@ import androidx.core.app.ActivityOptionsCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.GravityCompat;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.navigation.NavController;
@@ -838,8 +839,13 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
     }
 
     public void refreshFragment() {
-        if (binding.viewPager.getAdapter() != null) {
-            binding.viewPager.getAdapter().notifyDataSetChanged();
+        Fragment fragment = getSupportFragmentManager().findFragmentByTag("f" + binding.viewPager.getCurrentItem());
+        if (fragment instanceof FragmentNotificationContainer) {
+            FragmentTransaction fragTransaction = getSupportFragmentManager().beginTransaction();
+            fragTransaction.detach(fragment).commit();
+            FragmentTransaction fragTransaction2 = getSupportFragmentManager().beginTransaction();
+            fragTransaction2.attach(fragment);
+            fragTransaction2.commit();
         }
     }
 
diff --git a/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java b/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java
index 3cb3ac0af..616fb7324 100644
--- a/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java
@@ -59,12 +59,11 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.viewpager2.widget.ViewPager2;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.transition.Transition;
-import com.google.android.material.tabs.TabLayout;
+import com.google.android.material.tabs.TabLayoutMediator;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -249,34 +248,28 @@ public class ProfileActivity extends BaseActivity {
         binding.accountTabLayout.removeAllTabs();
         //Tablayout for timelines/following/followers
         FedilabProfileTLPageAdapter fedilabProfileTLPageAdapter = new FedilabProfileTLPageAdapter(ProfileActivity.this, account);
-        binding.accountTabLayout.addTab(binding.accountTabLayout.newTab().setText(getString(R.string.status_cnt, Helper.withSuffix(account.statuses_count))));
-        binding.accountTabLayout.addTab(binding.accountTabLayout.newTab().setText(getString(R.string.following_cnt, Helper.withSuffix(account.following_count))));
-        binding.accountTabLayout.addTab(binding.accountTabLayout.newTab().setText(getString(R.string.followers_cnt, Helper.withSuffix(account.followers_count))));
+        binding.accountTabLayout.addTab(binding.accountTabLayout.newTab());
+        binding.accountTabLayout.addTab(binding.accountTabLayout.newTab());
+        binding.accountTabLayout.addTab(binding.accountTabLayout.newTab());
         binding.accountViewpager.setAdapter(fedilabProfileTLPageAdapter);
         binding.accountViewpager.setOffscreenPageLimit(3);
-        binding.accountViewpager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-                super.onPageScrolled(position, positionOffset, positionOffsetPixels);
-                binding.accountTabLayout.selectTab(binding.accountTabLayout.getTabAt(position));
-            }
-        });
-        binding.accountTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
-            @Override
-            public void onTabSelected(TabLayout.Tab tab) {
-                binding.accountViewpager.setCurrentItem(tab.getPosition());
-            }
-
-            @Override
-            public void onTabUnselected(TabLayout.Tab tab) {
-
-            }
-
-            @Override
-            public void onTabReselected(TabLayout.Tab tab) {
 
-            }
-        });
+        new TabLayoutMediator(binding.accountTabLayout, binding.accountViewpager,
+                (tab, position) -> {
+                    binding.accountViewpager.setCurrentItem(tab.getPosition(), true);
+                    switch (position) {
+                        case 0:
+                            tab.setText(getString(R.string.status_cnt, Helper.withSuffix(account.statuses_count)));
+                            break;
+                        case 1:
+                            tab.setText(getString(R.string.following_cnt, Helper.withSuffix(account.statuses_count)));
+                            break;
+                        case 2:
+                            tab.setText(getString(R.string.followers_cnt, Helper.withSuffix(account.statuses_count)));
+                            break;
+                    }
+                }
+        ).attach();
         binding.accountTabLayout.setTabTextColors(ThemeHelper.getAttColor(ProfileActivity.this, R.attr.mTextColor), ContextCompat.getColor(ProfileActivity.this, R.color.cyanea_accent_dark_reference));
         binding.accountTabLayout.setTabIconTint(ThemeHelper.getColorStateList(ProfileActivity.this));
         boolean disableGif = sharedpreferences.getBoolean(getString(R.string.SET_DISABLE_GIF), false);
diff --git a/app/src/main/java/app/fedilab/android/activities/ScheduledActivity.java b/app/src/main/java/app/fedilab/android/activities/ScheduledActivity.java
index 4ea741e50..da261e988 100644
--- a/app/src/main/java/app/fedilab/android/activities/ScheduledActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/ScheduledActivity.java
@@ -24,7 +24,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.core.content.ContextCompat;
 
-import com.google.android.material.tabs.TabLayout;
+import com.google.android.material.tabs.TabLayoutMediator;
 
 import app.fedilab.android.R;
 import app.fedilab.android.databinding.ActivityScheduledBinding;
@@ -56,31 +56,31 @@ public class ScheduledActivity extends BaseActivity {
 
         MastodonHelper.loadPPMastodon(binding.profilePicture, currentAccount.mastodon_account);
         binding.title.setText(R.string.scheduled);
-        binding.scheduleTablayout.addTab(binding.scheduleTablayout.newTab().setText(getString(R.string.toots_server)));
-        binding.scheduleTablayout.addTab(binding.scheduleTablayout.newTab().setText(getString(R.string.toots_client)));
-        binding.scheduleTablayout.addTab(binding.scheduleTablayout.newTab().setText(getString(R.string.reblog)));
+        binding.scheduleTablayout.addTab(binding.scheduleTablayout.newTab());
+        binding.scheduleTablayout.addTab(binding.scheduleTablayout.newTab());
+        binding.scheduleTablayout.addTab(binding.scheduleTablayout.newTab());
 
         binding.scheduleViewpager.setAdapter(new FedilabScheduledPageAdapter(ScheduledActivity.this));
         binding.scheduleViewpager.setOffscreenPageLimit(3);
         binding.scheduleTablayout.setTabTextColors(ThemeHelper.getAttColor(ScheduledActivity.this, R.attr.mTextColor), ContextCompat.getColor(ScheduledActivity.this, R.color.cyanea_accent_dark_reference));
         binding.scheduleTablayout.setTabIconTint(ThemeHelper.getColorStateList(ScheduledActivity.this));
 
-        binding.scheduleTablayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
-            @Override
-            public void onTabSelected(TabLayout.Tab tab) {
-                binding.scheduleViewpager.setCurrentItem(tab.getPosition());
-            }
-
-            @Override
-            public void onTabUnselected(TabLayout.Tab tab) {
-
-            }
-
-            @Override
-            public void onTabReselected(TabLayout.Tab tab) {
-
-            }
-        });
+        new TabLayoutMediator(binding.scheduleTablayout, binding.scheduleViewpager,
+                (tab, position) -> {
+                    binding.scheduleViewpager.setCurrentItem(tab.getPosition(), true);
+                    switch (position) {
+                        case 0:
+                            tab.setText(getString(R.string.toots_server));
+                            break;
+                        case 1:
+                            tab.setText(getString(R.string.toots_client));
+                            break;
+                        case 2:
+                            tab.setText(getString(R.string.reblog));
+                            break;
+                    }
+                }
+        ).attach();
     }
 
     @Override
diff --git a/app/src/main/java/app/fedilab/android/activities/SearchResultTabActivity.java b/app/src/main/java/app/fedilab/android/activities/SearchResultTabActivity.java
index c09fac97e..b7814e67a 100644
--- a/app/src/main/java/app/fedilab/android/activities/SearchResultTabActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/SearchResultTabActivity.java
@@ -30,9 +30,9 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.viewpager2.adapter.FragmentStateAdapter;
-import androidx.viewpager2.widget.ViewPager2;
 
 import com.google.android.material.tabs.TabLayout;
+import com.google.android.material.tabs.TabLayoutMediator;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -75,13 +75,34 @@ public class SearchResultTabActivity extends BaseActivity {
             getSupportActionBar().setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.cyanea_primary)));
         }
         setTitle(search);
-        binding.searchTabLayout.addTab(binding.searchTabLayout.newTab().setText(getString(R.string.tags)));
-        binding.searchTabLayout.addTab(binding.searchTabLayout.newTab().setText(getString(R.string.accounts)));
-        binding.searchTabLayout.addTab(binding.searchTabLayout.newTab().setText(getString(R.string.toots)));
-        binding.searchTabLayout.addTab(binding.searchTabLayout.newTab().setText(getString(R.string.action_cache)));
+        binding.searchTabLayout.addTab(binding.searchTabLayout.newTab());
+        binding.searchTabLayout.addTab(binding.searchTabLayout.newTab());
+        binding.searchTabLayout.addTab(binding.searchTabLayout.newTab());
+        binding.searchTabLayout.addTab(binding.searchTabLayout.newTab());
         binding.searchTabLayout.setTabTextColors(ThemeHelper.getAttColor(SearchResultTabActivity.this, R.attr.mTextColor), ContextCompat.getColor(SearchResultTabActivity.this, R.color.cyanea_accent_dark_reference));
         binding.searchTabLayout.setTabIconTint(ThemeHelper.getColorStateList(SearchResultTabActivity.this));
-
+        ScreenSlidePagerAdapter mPagerAdapter = new ScreenSlidePagerAdapter(SearchResultTabActivity.this);
+        binding.searchViewpager.setAdapter(mPagerAdapter);
+        binding.searchViewpager.setOffscreenPageLimit(3);
+        new TabLayoutMediator(binding.searchTabLayout, binding.searchViewpager,
+                (tab, position) -> {
+                    binding.searchViewpager.setCurrentItem(tab.getPosition(), true);
+                    switch (position) {
+                        case 0:
+                            tab.setText(getString(R.string.tags));
+                            break;
+                        case 1:
+                            tab.setText(getString(R.string.accounts));
+                            break;
+                        case 2:
+                            tab.setText(getString(R.string.toots));
+                            break;
+                        case 3:
+                            tab.setText(getString(R.string.action_cache));
+                            break;
+                    }
+                }
+        ).attach();
         binding.searchTabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override
             public void onTabSelected(TabLayout.Tab tab) {
@@ -95,19 +116,16 @@ public class SearchResultTabActivity extends BaseActivity {
 
             @Override
             public void onTabReselected(TabLayout.Tab tab) {
-                Fragment fragment;
-                if (binding.searchViewpager.getAdapter() != null) {
-                    fragment = (Fragment) getSupportFragmentManager().findFragmentByTag("f" + binding.searchViewpager.getCurrentItem());
-                    if (fragment instanceof FragmentMastodonAccount) {
-                        FragmentMastodonAccount fragmentMastodonAccount = ((FragmentMastodonAccount) fragment);
-                        fragmentMastodonAccount.scrollToTop();
-                    } else if (fragment instanceof FragmentMastodonTimeline) {
-                        FragmentMastodonTimeline fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);
-                        fragmentMastodonTimeline.scrollToTop();
-                    } else if (fragment instanceof FragmentMastodonTag) {
-                        FragmentMastodonTag fragmentMastodonTag = ((FragmentMastodonTag) fragment);
-                        fragmentMastodonTag.scrollToTop();
-                    }
+                Fragment fragment = getSupportFragmentManager().findFragmentByTag("f" + binding.searchViewpager.getCurrentItem());
+                if (fragment instanceof FragmentMastodonAccount) {
+                    FragmentMastodonAccount fragmentMastodonAccount = ((FragmentMastodonAccount) fragment);
+                    fragmentMastodonAccount.scrollToTop();
+                } else if (fragment instanceof FragmentMastodonTimeline) {
+                    FragmentMastodonTimeline fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);
+                    fragmentMastodonTimeline.scrollToTop();
+                } else if (fragment instanceof FragmentMastodonTag) {
+                    FragmentMastodonTag fragmentMastodonTag = ((FragmentMastodonTag) fragment);
+                    fragmentMastodonTag.scrollToTop();
                 }
             }
         });
@@ -122,8 +140,6 @@ public class SearchResultTabActivity extends BaseActivity {
         SearchView searchView = (SearchView) menu.findItem(R.id.action_search).getActionView();
         searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
         searchView.setIconifiedByDefault(false);
-
-
         searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String query) {
@@ -156,29 +172,7 @@ public class SearchResultTabActivity extends BaseActivity {
         });
 
 
-        ScreenSlidePagerAdapter mPagerAdapter = new ScreenSlidePagerAdapter(SearchResultTabActivity.this);
-        binding.searchViewpager.setAdapter(mPagerAdapter);
 
-        binding.searchViewpager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-                super.onPageScrolled(position, positionOffset, positionOffsetPixels);
-                binding.searchTabLayout.selectTab(binding.searchTabLayout.getTabAt(position));
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-                super.onPageSelected(position);
-                TabLayout.Tab tab = binding.searchTabLayout.getTabAt(position);
-                if (tab != null)
-                    tab.select();
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-                super.onPageScrollStateChanged(state);
-            }
-        });
         return true;
     }
 
diff --git a/app/src/main/java/app/fedilab/android/helper/NestedScrollableHost.kt b/app/src/main/java/app/fedilab/android/helper/NestedScrollableHost.kt
new file mode 100644
index 000000000..2f23c9418
--- /dev/null
+++ b/app/src/main/java/app/fedilab/android/helper/NestedScrollableHost.kt
@@ -0,0 +1,113 @@
+package app.fedilab.android.helper
+
+/*
+ * Copyright 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewConfiguration
+import android.widget.FrameLayout
+import androidx.viewpager2.widget.ViewPager2
+import androidx.viewpager2.widget.ViewPager2.ORIENTATION_HORIZONTAL
+import kotlin.math.absoluteValue
+import kotlin.math.sign
+
+/**
+ * Layout to wrap a scrollable component inside a ViewPager2. Provided as a solution to the problem
+ * where pages of ViewPager2 have nested scrollable elements that scroll in the same direction as
+ * ViewPager2. The scrollable element needs to be the immediate and only child of this host layout.
+ *
+ * This solution has limitations when using multiple levels of nested scrollable elements
+ * (e.g. a horizontal RecyclerView in a vertical RecyclerView in a horizontal ViewPager2).
+ */
+class NestedScrollableHost : FrameLayout {
+    constructor(context: Context) : super(context)
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
+
+    private var touchSlop = 0
+    private var initialX = 0f
+    private var initialY = 0f
+    private val parentViewPager: ViewPager2?
+        get() {
+            var v: View? = parent as? View
+            while (v != null && v !is ViewPager2) {
+                v = v.parent as? View
+            }
+            return v as? ViewPager2
+        }
+
+    private val child: View? get() = if (childCount > 0) getChildAt(0) else null
+
+    init {
+        touchSlop = ViewConfiguration.get(context).scaledTouchSlop
+    }
+
+    private fun canChildScroll(orientation: Int, delta: Float): Boolean {
+        val direction = -delta.sign.toInt()
+        return when (orientation) {
+            0 -> child?.canScrollHorizontally(direction) ?: false
+            1 -> child?.canScrollVertically(direction) ?: false
+            else -> throw IllegalArgumentException()
+        }
+    }
+
+    override fun onInterceptTouchEvent(e: MotionEvent): Boolean {
+        handleInterceptTouchEvent(e)
+        return super.onInterceptTouchEvent(e)
+    }
+
+    private fun handleInterceptTouchEvent(e: MotionEvent) {
+        val orientation = parentViewPager?.orientation ?: return
+
+        // Early return if child can't scroll in same direction as parent
+        if (!canChildScroll(orientation, -1f) && !canChildScroll(orientation, 1f)) {
+            return
+        }
+
+        if (e.action == MotionEvent.ACTION_DOWN) {
+            initialX = e.x
+            initialY = e.y
+            parent.requestDisallowInterceptTouchEvent(true)
+        } else if (e.action == MotionEvent.ACTION_MOVE) {
+            val dx = e.x - initialX
+            val dy = e.y - initialY
+            val isVpHorizontal = orientation == ORIENTATION_HORIZONTAL
+
+            // assuming ViewPager2 touch-slop is 2x touch-slop of child
+            val scaledDx = dx.absoluteValue * if (isVpHorizontal) .5f else 1f
+            val scaledDy = dy.absoluteValue * if (isVpHorizontal) 1f else .5f
+
+            if (scaledDx > touchSlop || scaledDy > touchSlop) {
+                if (isVpHorizontal == (scaledDy > scaledDx)) {
+                    // Gesture is perpendicular, allow all parents to intercept
+                    parent.requestDisallowInterceptTouchEvent(false)
+                } else {
+                    // Gesture is parallel, query child if movement in that direction is possible
+                    if (canChildScroll(orientation, if (isVpHorizontal) dx else dy)) {
+                        // Child can scroll, disallow all parents to intercept
+                        parent.requestDisallowInterceptTouchEvent(true)
+                    } else {
+                        // Child cannot scroll, allow all parents to intercept
+                        parent.requestDisallowInterceptTouchEvent(false)
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java b/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
index 514a5f3b4..fb5769b1e 100644
--- a/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
+++ b/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
@@ -35,6 +35,7 @@ import androidx.fragment.app.FragmentTransaction;
 import androidx.viewpager2.widget.ViewPager2;
 
 import com.google.android.material.tabs.TabLayout;
+import com.google.android.material.tabs.TabLayoutMediator;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -147,11 +148,14 @@ public class PinnedTimelineHelper {
         activityMainBinding.tabLayout.removeAllTabs();
         //Small hack to hide first tabs (they represent the item of the bottom menu)
         int toRemove = itemToRemoveInBottomMenu(activity);
+        List<String> tabTitle = new ArrayList<>();
         for (int i = 0; i < (BOTTOM_TIMELINE_COUNT - toRemove); i++) {
             activityMainBinding.tabLayout.addTab(activityMainBinding.tabLayout.newTab());
+            tabTitle.add("");
             ((ViewGroup) activityMainBinding.tabLayout.getChildAt(0)).getChildAt(i).setVisibility(View.GONE);
         }
         List<PinnedTimeline> pinnedTimelineVisibleList = new ArrayList<>();
+
         for (PinnedTimeline pinnedTimeline : pinned.pinnedTimelines) {
             if (pinnedTimeline.displayed) {
                 TabLayout.Tab tab = activityMainBinding.tabLayout.newTab();
@@ -172,7 +176,7 @@ public class PinnedTimelineHelper {
                 }
                 TextView tv = (TextView) LayoutInflater.from(activity).inflate(R.layout.custom_tab_instance, new LinearLayout(activity), false);
                 tv.setText(name);
-
+                tabTitle.add(name);
                 tab.setCustomView(tv);
 
                 activityMainBinding.tabLayout.addTab(tab);
@@ -205,16 +209,10 @@ public class PinnedTimelineHelper {
 
         FedilabPageAdapter fedilabPageAdapter = new FedilabPageAdapter(activity, activity, pinned, bottomMenu);
         activityMainBinding.viewPager.setAdapter(fedilabPageAdapter);
-        activityMainBinding.viewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-                super.onPageScrolled(position, positionOffset, positionOffsetPixels);
-                activityMainBinding.tabLayout.selectTab(activityMainBinding.tabLayout.getTabAt(position));
-            }
 
+        activityMainBinding.viewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
             @Override
             public void onPageSelected(int position) {
-                super.onPageSelected(position);
                 if (position < BOTTOM_TIMELINE_COUNT - toRemove) {
                     activityMainBinding.bottomNavView.getMenu().getItem(position).setChecked(true);
                 } else {
@@ -225,18 +223,14 @@ public class PinnedTimelineHelper {
                     activityMainBinding.bottomNavView.getMenu().setGroupCheckable(0, true, true);
                 }
             }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-                super.onPageScrollStateChanged(state);
-            }
         });
-
+        new TabLayoutMediator(activityMainBinding.tabLayout, activityMainBinding.viewPager,
+                (tab, position) -> tab.setText(tabTitle.get(position))
+        ).attach();
 
         activityMainBinding.tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
             @Override
             public void onTabSelected(TabLayout.Tab tab) {
-                activityMainBinding.viewPager.setCurrentItem(tab.getPosition());
             }
 
             @Override
@@ -245,7 +239,7 @@ public class PinnedTimelineHelper {
 
             @Override
             public void onTabReselected(TabLayout.Tab tab) {
-                Fragment fragment = (Fragment) activity.getSupportFragmentManager().findFragmentByTag("f" + activityMainBinding.viewPager.getCurrentItem());
+                Fragment fragment = activity.getSupportFragmentManager().findFragmentByTag("f" + activityMainBinding.viewPager.getCurrentItem());
                 if (fragment instanceof FragmentMastodonTimeline) {
                     ((FragmentMastodonTimeline) fragment).scrollToTop();
                 } else if (fragment instanceof FragmentMastodonConversation) {
@@ -319,7 +313,7 @@ public class PinnedTimelineHelper {
             if (changes[0]) {
                 FragmentMastodonTimeline fragmentMastodonTimeline;
                 if (activityMainBinding.viewPager.getAdapter() != null) {
-                    Fragment fragment = (Fragment) activity.getSupportFragmentManager().findFragmentByTag("f" + activityMainBinding.viewPager.getCurrentItem());
+                    Fragment fragment = activity.getSupportFragmentManager().findFragmentByTag("f" + activityMainBinding.viewPager.getCurrentItem());
                     if (fragment instanceof FragmentMastodonTimeline && fragment.isVisible()) {
                         fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);
                         FragmentTransaction fragTransaction = activity.getSupportFragmentManager().beginTransaction();
@@ -376,7 +370,7 @@ public class PinnedTimelineHelper {
                 }
             } else if (itemId == R.id.action_any) {
                 AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(activity, Helper.dialogStyle());
-                LayoutInflater inflater = ((BaseMainActivity) activity).getLayoutInflater();
+                LayoutInflater inflater = activity.getLayoutInflater();
                 View dialogView = inflater.inflate(R.layout.tags_any, new LinearLayout(activity), false);
                 dialogBuilder.setView(dialogView);
                 final EditText editText = dialogView.findViewById(R.id.filter_any);
@@ -405,7 +399,7 @@ public class PinnedTimelineHelper {
                 View dialogView;
                 AlertDialog alertDialog;
                 dialogBuilder = new AlertDialog.Builder(activity, Helper.dialogStyle());
-                inflater = ((BaseMainActivity) activity).getLayoutInflater();
+                inflater = activity.getLayoutInflater();
                 dialogView = inflater.inflate(R.layout.tags_all, new LinearLayout(activity), false);
                 dialogBuilder.setView(dialogView);
                 final EditText editTextAll = dialogView.findViewById(R.id.filter_all);
@@ -434,7 +428,7 @@ public class PinnedTimelineHelper {
                 View dialogView;
                 AlertDialog alertDialog;
                 dialogBuilder = new AlertDialog.Builder(activity, Helper.dialogStyle());
-                inflater = ((BaseMainActivity) activity).getLayoutInflater();
+                inflater = activity.getLayoutInflater();
                 dialogView = inflater.inflate(R.layout.tags_all, new LinearLayout(activity), false);
                 dialogBuilder.setView(dialogView);
                 final EditText editTextNone = dialogView.findViewById(R.id.filter_all);
@@ -463,7 +457,7 @@ public class PinnedTimelineHelper {
                 View dialogView;
                 AlertDialog alertDialog;
                 dialogBuilder = new AlertDialog.Builder(activity, Helper.dialogStyle());
-                inflater = ((BaseMainActivity) activity).getLayoutInflater();
+                inflater = activity.getLayoutInflater();
                 dialogView = inflater.inflate(R.layout.tags_name, new LinearLayout(activity), false);
                 dialogBuilder.setView(dialogView);
                 final EditText editTextName = dialogView.findViewById(R.id.column_name);
@@ -536,14 +530,14 @@ public class PinnedTimelineHelper {
             changes[0] = true;
             FragmentMastodonTimeline fragmentMastodonTimeline = null;
             if (activityMainBinding.viewPager.getAdapter() != null) {
-                Fragment fragment = (Fragment) activity.getSupportFragmentManager().findFragmentByTag("f" + activityMainBinding.viewPager.getCurrentItem());
+                Fragment fragment = activity.getSupportFragmentManager().findFragmentByTag("f" + activityMainBinding.viewPager.getCurrentItem());
                 if (fragment instanceof FragmentMastodonTimeline && fragment.isVisible()) {
                     fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);
                 }
             }
             if (fragmentMastodonTimeline == null)
                 return false;
-            FragmentTransaction fragTransaction1 = ((BaseMainActivity) activity).getSupportFragmentManager().beginTransaction();
+            FragmentTransaction fragTransaction1 = activity.getSupportFragmentManager().beginTransaction();
 
             pinned.pinnedTimelines.get(offSetPosition).remoteInstance.filteredWith = null;
             remoteInstance.filteredWith = null;
@@ -561,7 +555,7 @@ public class PinnedTimelineHelper {
             bundle.putString("timelineId", remoteInstance.id);
             bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, Timeline.TimeLineEnum.REMOTE);
             fragmentMastodonTimeline.setArguments(bundle);
-            FragmentTransaction fragTransaction2 = ((BaseMainActivity) activity).getSupportFragmentManager().beginTransaction();
+            FragmentTransaction fragTransaction2 = activity.getSupportFragmentManager().beginTransaction();
             fragTransaction2.attach(fragmentMastodonTimeline);
             fragTransaction2.commit();
             popup.getMenu().close();
@@ -583,13 +577,13 @@ public class PinnedTimelineHelper {
                 item.setOnMenuItemClickListener(item1 -> {
                     FragmentMastodonTimeline fragmentMastodonTimeline = null;
                     if (activityMainBinding.viewPager.getAdapter() != null) {
-                        Fragment fragment = (Fragment) activity.getSupportFragmentManager().findFragmentByTag("f" + activityMainBinding.viewPager.getCurrentItem());
+                        Fragment fragment = activity.getSupportFragmentManager().findFragmentByTag("f" + activityMainBinding.viewPager.getCurrentItem());
                         if (fragment instanceof FragmentMastodonTimeline && fragment.isVisible()) {
                             fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);
                             fragmentMastodonTimeline.refreshAllAdapters();
                         }
                     }
-                    FragmentTransaction fragTransaction1 = ((BaseMainActivity) activity).getSupportFragmentManager().beginTransaction();
+                    FragmentTransaction fragTransaction1 = activity.getSupportFragmentManager().beginTransaction();
                     if (fragmentMastodonTimeline == null)
                         return false;
                     pinned.pinnedTimelines.get(offSetPosition).remoteInstance.filteredWith = tag;
@@ -608,7 +602,7 @@ public class PinnedTimelineHelper {
                     bundle.putString("currentfilter", remoteInstance.filteredWith);
                     bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, Timeline.TimeLineEnum.REMOTE);
                     fragmentMastodonTimeline.setArguments(bundle);
-                    FragmentTransaction fragTransaction2 = ((BaseMainActivity) activity).getSupportFragmentManager().beginTransaction();
+                    FragmentTransaction fragTransaction2 = activity.getSupportFragmentManager().beginTransaction();
                     fragTransaction2.attach(fragmentMastodonTimeline);
                     fragTransaction2.commit();
                     return false;
@@ -634,7 +628,7 @@ public class PinnedTimelineHelper {
             });
             changes[0] = true;
             AlertDialog.Bui