Commit 91c0f0de authored by Thomas's avatar Thomas
Browse files

ViewPager2 - MainActivity

parent eb162ba8

app/build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ dependencies { 
    implementation 'com.github.penfeizhou.android.animation:apng:2.22.0'

    implementation 'com.github.penfeizhou.android.animation:gif:2.22.0'

    implementation 'com.google.android.exoplayer:exoplayer:2.16.1'

    implementation "androidx.viewpager2:viewpager2:1.0.0"

    implementation 'com.github.piasy:rxandroidaudio:1.7.0'

    implementation 'com.github.piasy:AudioProcessor:1.7.0'

    implementation "androidx.work:work-runtime:2.7.1"

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

+2 −2
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
        }

        popup.setOnDismissListener(menu1 -> {

            if (binding.viewPager.getAdapter() != null) {

                Fragment fragment = (Fragment) binding.viewPager.getAdapter().instantiateItem(binding.viewPager, binding.tabLayout.getSelectedTabPosition());

                Fragment fragment = (Fragment) getSupportFragmentManager().findFragmentByTag("f" + binding.viewPager.getCurrentItem());

                if (fragment instanceof FragmentMastodonTimeline && fragment.isVisible()) {

                    FragmentMastodonTimeline fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);

                    fragmentMastodonTimeline.refreshAllAdapters();
@@ -879,7 +879,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
     */

    private void scrollToTop() {

        if (binding.viewPager.getAdapter() != null) {

            Fragment fragment = (Fragment) binding.viewPager.getAdapter().instantiateItem(binding.viewPager, binding.tabLayout.getSelectedTabPosition());

            Fragment fragment = (Fragment) getSupportFragmentManager().findFragmentByTag("f" + binding.viewPager.getCurrentItem());

            if (fragment instanceof FragmentMastodonTimeline) {

                FragmentMastodonTimeline fragmentMastodonTimeline = ((FragmentMastodonTimeline) fragment);

                fragmentMastodonTimeline.scrollToTop();

app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java

+61 −62

File changed.

Preview size limit exceeded, changes collapsed.

app/src/main/java/app/fedilab/android/ui/pageadapter/FedilabPageAdapter.java

+11 −30

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −2
Original line number Diff line number Diff line
@@ -75,9 +75,8 @@ 


        </com.google.android.material.appbar.AppBarLayout>



        <androidx.viewpager.widget.ViewPager

        <androidx.viewpager2.widget.ViewPager2

            android:id="@+id/view_pager"



            android:name="androidx.navigation.fragment.NavHostFragment"

            android:layout_width="match_parent"

            android:layout_height="match_parent"