diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt index 354a5edea..8a1704866 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt @@ -15,6 +15,7 @@ import androidx.fragment.app.viewModels import androidx.navigation.NavController import androidx.navigation.NavDestination import androidx.navigation.findNavController +import androidx.navigation.fragment.FragmentNavigatorExtras import org.signal.core.util.concurrent.SimpleTask import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.MainActivity @@ -105,7 +106,12 @@ class MainActivityListHostFragment : Fragment(R.layout.main_activity_list_host_f if (state.tab == ConversationListTab.CHATS) { return } else { - navController.navigate(R.id.action_conversationListFragment_to_storiesLandingFragment) + navController.navigate( + R.id.action_conversationListFragment_to_storiesLandingFragment, + null, + null, + FragmentNavigatorExtras(requireView().findViewById(R.id.camera_fab) to "camera_fab") + ) } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt index cb2968b01..f75e79f62 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt @@ -4,6 +4,7 @@ import android.Manifest import android.content.Intent import android.graphics.Color import android.os.Bundle +import android.transition.TransitionInflater import android.view.Menu import android.view.MenuInflater import android.view.MenuItem @@ -73,6 +74,8 @@ class StoriesLandingFragment : DSLSettingsFragment(layoutId = R.layout.stories_l emptyNotice = requireView().findViewById(R.id.empty_notice) cameraFab = requireView().findViewById(R.id.camera_fab) + sharedElementEnterTransition = TransitionInflater.from(requireContext()).inflateTransition(R.transition.change_transform) + cameraFab.setOnClickListener { Permissions.with(this) .request(Manifest.permission.CAMERA) diff --git a/app/src/main/res/layout/conversation_list_fragment.xml b/app/src/main/res/layout/conversation_list_fragment.xml index 524a070b1..0223da5cd 100644 --- a/app/src/main/res/layout/conversation_list_fragment.xml +++ b/app/src/main/res/layout/conversation_list_fragment.xml @@ -110,6 +110,7 @@ app:layout_behavior="org.thoughtcrime.securesms.util.views.SlideUpWithSnackbarBehavior">