From ca4cb648e760d615a8c3b93170bdf5d0e854e57f Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sat, 1 Nov 2025 08:49:08 +0100 Subject: [PATCH] Predictive back: shown also for TrackRecordedActivity. However: the shared element animation needed to be removed. ActivityOptions.makeSceneTransitionAnimation() seems to overwrite the predictive back animation. --- .../dennisguse/opentracks/TrackRecordedActivity.java | 10 ---------- .../fragments/StatisticsRecordedFragment.java | 3 --- .../de/dennisguse/opentracks/ui/TrackListAdapter.java | 7 +------ 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java index 0b2561fb5..c134f9e2b 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackRecordedActivity.java @@ -25,7 +25,6 @@ import android.view.View; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.core.view.ViewCompat; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import androidx.viewpager2.adapter.FragmentStateAdapter; @@ -60,8 +59,6 @@ public class TrackRecordedActivity extends AbstractTrackDeleteActivity implement private static final String TAG = TrackRecordedActivity.class.getSimpleName(); - public static final String VIEW_TRACK_ICON = "track_icon"; - public static final String EXTRA_TRACK_ID = "track_id"; private static final String CURRENT_TAB_TAG_KEY = "current_tab_tag_key"; @@ -98,8 +95,6 @@ public class TrackRecordedActivity extends AbstractTrackDeleteActivity implement viewBinding.bottomAppBarLayout.bottomAppBar.replaceMenu(R.menu.track_detail); setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar); - - postponeEnterTransition(); } @Override @@ -284,11 +279,6 @@ public class TrackRecordedActivity extends AbstractTrackDeleteActivity implement } } - public void startPostponedEnterTransitionWith(View viewIcon) { - ViewCompat.setTransitionName(viewIcon, TrackRecordedActivity.VIEW_TRACK_ICON); - startPostponedEnterTransition(); - } - private void onRecordingStatusChanged(RecordingStatus status) { recordingStatus = status; } diff --git a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java index 6ecc48678..78f788ddc 100644 --- a/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java +++ b/src/main/java/de/dennisguse/opentracks/fragments/StatisticsRecordedFragment.java @@ -30,7 +30,6 @@ import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; import de.dennisguse.opentracks.R; -import de.dennisguse.opentracks.TrackRecordedActivity; import de.dennisguse.opentracks.data.ContentProviderUtils; import de.dennisguse.opentracks.data.models.DistanceFormatter; import de.dennisguse.opentracks.data.models.SpeedFormatter; @@ -157,8 +156,6 @@ public class StatisticsRecordedFragment extends Fragment { loadTrackDescription(track); updateUI(); updateSensorUI(); - - ((TrackRecordedActivity) getActivity()).startPostponedEnterTransitionWith(viewBinding.statsActivityTypeIcon); } }); } diff --git a/src/main/java/de/dennisguse/opentracks/ui/TrackListAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/TrackListAdapter.java index 671b39022..63f1406cc 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/TrackListAdapter.java +++ b/src/main/java/de/dennisguse/opentracks/ui/TrackListAdapter.java @@ -1,9 +1,7 @@ package de.dennisguse.opentracks.ui; -import android.app.ActivityOptions; import android.content.Intent; import android.database.Cursor; -import android.util.Pair; import android.util.SparseBooleanArray; import android.view.LayoutInflater; import android.view.Menu; @@ -269,10 +267,7 @@ public class TrackListAdapter extends RecyclerView.Adapter open detail activity. Intent newIntent = IntentUtils.newIntent(context, TrackRecordedActivity.class) .putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId); - ActivityOptions activityOptions = ActivityOptions.makeSceneTransitionAnimation( - context, - new Pair<>(viewBinding.getRoot().findViewById(R.id.track_list_item_icon), TrackRecordedActivity.VIEW_TRACK_ICON)); - context.startActivity(newIntent, activityOptions.toBundle()); + context.startActivity(newIntent); } }