Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-25 05:27:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use ViewCompat.setTransitionName in a safe way.

Browse Source 
Fixes #13307
This commit is contained in:
Haris Dautovic
2023-12-06 18:02:30 +01:00
committed by Cody Henthorne
parent 818356dfed
commit 2a4ccf69b2
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt
View File

@@ -15,7 +15,6 @@ import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.navigation.NavController
import androidx.navigation.NavDestination
import androidx.navigation.Navigator
import androidx.navigation.findNavController
import androidx.navigation.fragment.FragmentNavigatorExtras
import androidx.recyclerview.widget.RecyclerView
@@ -113,19 +112,20 @@ class MainActivityListHostFragment : Fragment(R.layout.main_activity_list_host_f
if (state.tab == ConversationListTab.CHATS) {
return
} else {
val cameraFab = requireView().findViewById<View>(R.id.camera_fab)
val newConvoFab = requireView().findViewById<View>(R.id.fab)
val cameraFab = requireView().findViewById<View?>(R.id.camera_fab)
val newConvoFab = requireView().findViewById<View?>(R.id.fab)
ViewCompat.setTransitionName(cameraFab, "camera_fab")
ViewCompat.setTransitionName(newConvoFab, "new_convo_fab")
val extras = when {
cameraFab != null && newConvoFab != null -> {
ViewCompat.setTransitionName(cameraFab, "camera_fab")
ViewCompat.setTransitionName(newConvoFab, "new_convo_fab")
val extras: Navigator.Extras? = if (cameraFab == null || newConvoFab == null) {
null
} else {
FragmentNavigatorExtras(
cameraFab to "camera_fab",
newConvoFab to "new_convo_fab"
)
FragmentNavigatorExtras(
cameraFab to "camera_fab",
newConvoFab to "new_convo_fab"
)
}
else -> null
}
val destination = if (state.tab == ConversationListTab.STORIES) {