From fca4206c8654eb73cf5bfe0de51b325dc207a80b Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Wed, 25 Jun 2025 19:41:45 +0200
Subject: [PATCH] Migrated MarkerDetailActivity to ViewPager2.

---
 .../ui/markers/MarkerDetailActivity.java      | 43 ++++++-------------
 .../res/layout/marker_detail_activity.xml     |  2 +-
 2 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailActivity.java b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailActivity.java
index dbde6b68b..873a007b9 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/markers/MarkerDetailActivity.java
@@ -24,9 +24,9 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentStatePagerAdapter;
-import androidx.viewpager.widget.ViewPager;
+import androidx.fragment.app.FragmentActivity;
+import androidx.viewpager2.adapter.FragmentStateAdapter;
+import androidx.viewpager2.widget.ViewPager2;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -87,22 +87,13 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark
             }
         }
 
-        final MarkerDetailPagerAdapter markerAdapter = new MarkerDetailPagerAdapter(getSupportFragmentManager());
+        final MarkerDetailPagerAdapter markerAdapter = new MarkerDetailPagerAdapter(this);
         viewBinding.makerDetailActivityViewPager.setAdapter(markerAdapter);
-        viewBinding.makerDetailActivityViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-            }
-
+        viewBinding.makerDetailActivityViewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
             @Override
             public void onPageSelected(int position) {
                 viewBinding.markerDetailToolbar.setTitle(markerAdapter.getPageTitle(position));
             }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-            }
         });
         viewBinding.makerDetailActivityViewPager.setCurrentItem(markerIndex == -1 ? 0 : markerIndex);
 
@@ -121,32 +112,26 @@ public class MarkerDetailActivity extends AbstractActivity implements DeleteMark
         runOnUiThread(this::finish);
     }
 
-    /**
-     * Marker detail pager adapter.
-     *
-     * @author Jimmy Shih
-     */
-    private class MarkerDetailPagerAdapter extends FragmentStatePagerAdapter {
+    private class MarkerDetailPagerAdapter extends FragmentStateAdapter {
 
-        MarkerDetailPagerAdapter(FragmentManager fragmentManager) {
-            super(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
+        MarkerDetailPagerAdapter(@NonNull FragmentActivity fa) {
+            super(fa);
         }
 
         @Override
         @NonNull
-        public Fragment getItem(int position) {
+        public Fragment createFragment(int position) {
             return MarkerDetailFragment.newInstance(markerIds.get(position));
         }
 
-        @Nullable
         @Override
-        public CharSequence getPageTitle(int position) {
-            return getString(R.string.marker_title, position + 1, getCount());
+        public int getItemCount() {
+            return markerIds.size();
         }
 
-        @Override
-        public int getCount() {
-            return markerIds.size();
+        @Nullable //TODO Used?
+        public CharSequence getPageTitle(int position) {
+            return getString(R.string.marker_title, position + 1, getItemCount());
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/res/layout/marker_detail_activity.xml b/src/main/res/layout/marker_detail_activity.xml
index 2494b556f..263c3515e 100644
--- a/src/main/res/layout/marker_detail_activity.xml
+++ b/src/main/res/layout/marker_detail_activity.xml
@@ -36,7 +36,7 @@ limitations under the License.
         android:orientation="vertical"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <androidx.viewpager.widget.ViewPager
+        <androidx.viewpager2.widget.ViewPager2
             android:id="@+id/maker_detail_activity_view_pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />