Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 00:59:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash and icon change issue with shared element transition.

Browse Source
This commit is contained in:
Alex Hart
2022-04-12 14:36:31 -03:00
committed by Greyson Parrelli
parent 27c3fca324
commit e143c47c25
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@ 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 org.signal.core.util.concurrent.SimpleTask
@@ -106,14 +107,23 @@ 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_new)
val newConvoFab = requireView().findViewById<View>(R.id.fab_new)
val extras: Navigator.Extras? = if (cameraFab == null || newConvoFab == null) {
null
} else {
FragmentNavigatorExtras(
cameraFab to "camera_fab",
newConvoFab to "new_convo_fab"
)
}
navController.navigate(
R.id.action_conversationListFragment_to_storiesLandingFragment,
null,
null,
FragmentNavigatorExtras(
requireView().findViewById<View>(R.id.camera_fab_new) to "camera_fab",
requireView().findViewById<View>(R.id.fab_new) to "new_convo_fab"
)
extras
)
}
}

1
app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingFragment.kt
View File

@@ -97,6 +97,7 @@ class StoriesLandingFragment : DSLSettingsFragment(layoutId = R.layout.stories_l
setEnterSharedElementCallback(object : SharedElementCallback() {
override fun onSharedElementStart(sharedElementNames: MutableList<String>?, sharedElements: MutableList<View>?, sharedElementSnapshots: MutableList<View>?) {
if (sharedElementNames?.contains("camera_fab") == true) {
cameraFab.setImageResource(R.drawable.ic_compose_24)
lifecycleDisposable += Single.timer(200, TimeUnit.MILLISECONDS).subscribeBy {
cameraFab.setImageResource(R.drawable.ic_camera_outline_24)
}