From a8e81d95cfaa14d3e862c939ba34aac552f70e0c Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 15 Jan 2020 12:36:09 +0100 Subject: [PATCH] Verification: migrate to Epoxy - Disable item animation --- .../java/im/vector/riotx/core/extensions/RecyclerView.kt | 9 +++++++-- .../createdirect/CreateDirectRoomKnownUsersFragment.kt | 5 ++--- .../conclusion/VerificationConclusionFragment.kt | 2 +- .../verification/emoji/VerificationEmojiCodeFragment.kt | 2 +- .../verification/request/VerificationRequestFragment.kt | 2 +- .../detail/timeline/action/MessageActionsBottomSheet.kt | 4 +--- .../room/list/actions/RoomListQuickActionsBottomSheet.kt | 4 +--- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/vector/src/main/java/im/vector/riotx/core/extensions/RecyclerView.kt b/vector/src/main/java/im/vector/riotx/core/extensions/RecyclerView.kt index 3d247e149c..51f3ce611a 100644 --- a/vector/src/main/java/im/vector/riotx/core/extensions/RecyclerView.kt +++ b/vector/src/main/java/im/vector/riotx/core/extensions/RecyclerView.kt @@ -28,12 +28,17 @@ fun RecyclerView.configureWith(epoxyController: EpoxyController, itemAnimator: RecyclerView.ItemAnimator? = null, viewPool: RecyclerView.RecycledViewPool? = null, showDivider: Boolean = false, - hasFixedSize: Boolean = true) { + hasFixedSize: Boolean = true, + disableItemAnimation: Boolean = false) { layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false).apply { recycleChildrenOnDetach = viewPool != null } setRecycledViewPool(viewPool) - itemAnimator?.let { this.itemAnimator = it } + if (disableItemAnimation) { + this.itemAnimator = null + } else { + itemAnimator?.let { this.itemAnimator = it } + } if (showDivider) { addItemDecoration(DividerItemDecoration(context, DividerItemDecoration.VERTICAL)) } diff --git a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomKnownUsersFragment.kt b/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomKnownUsersFragment.kt index c3a66dce1e..1fcc8d443b 100644 --- a/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomKnownUsersFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/createdirect/CreateDirectRoomKnownUsersFragment.kt @@ -98,10 +98,9 @@ class CreateDirectRoomKnownUsersFragment @Inject constructor( } private fun setupRecyclerView() { - // Don't activate animation as we might have way to much item animation when filtering - recyclerView.itemAnimator = null knownUsersController.callback = this - recyclerView.configureWith(knownUsersController) + // Don't activate animation as we might have way to much item animation when filtering + recyclerView.configureWith(knownUsersController, disableItemAnimation = true) } private fun setupFilterView() { diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionFragment.kt index 87a1a492cb..a46bb579de 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/conclusion/VerificationConclusionFragment.kt @@ -60,7 +60,7 @@ class VerificationConclusionFragment @Inject constructor( } private fun setupRecyclerView() { - bottomSheetVerificationRecyclerView.configureWith(controller, hasFixedSize = false) + bottomSheetVerificationRecyclerView.configureWith(controller, hasFixedSize = false, disableItemAnimation = true) controller.listener = this } diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt index 19cc85fcb5..2cd20ca4fb 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/emoji/VerificationEmojiCodeFragment.kt @@ -53,7 +53,7 @@ class VerificationEmojiCodeFragment @Inject constructor( } private fun setupRecyclerView() { - bottomSheetVerificationRecyclerView.configureWith(controller, hasFixedSize = false) + bottomSheetVerificationRecyclerView.configureWith(controller, hasFixedSize = false, disableItemAnimation = true) controller.listener = this } diff --git a/vector/src/main/java/im/vector/riotx/features/crypto/verification/request/VerificationRequestFragment.kt b/vector/src/main/java/im/vector/riotx/features/crypto/verification/request/VerificationRequestFragment.kt index 119b14c1c3..8250bd74b8 100644 --- a/vector/src/main/java/im/vector/riotx/features/crypto/verification/request/VerificationRequestFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/crypto/verification/request/VerificationRequestFragment.kt @@ -53,7 +53,7 @@ class VerificationRequestFragment @Inject constructor( } private fun setupRecyclerView() { - bottomSheetVerificationRecyclerView.configureWith(controller, hasFixedSize = false) + bottomSheetVerificationRecyclerView.configureWith(controller, hasFixedSize = false, disableItemAnimation = true) controller.listener = this } diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt index 4fe59a1dec..1336c61b68 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/action/MessageActionsBottomSheet.kt @@ -54,9 +54,7 @@ class MessageActionsBottomSheet : VectorBaseBottomSheetDialogFragment(), Message override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) sharedActionViewModel = activityViewModelProvider.get(MessageSharedActionViewModel::class.java) - recyclerView.configureWith(messageActionsEpoxyController, hasFixedSize = false) - // Disable item animation - recyclerView.itemAnimator = null + recyclerView.configureWith(messageActionsEpoxyController, hasFixedSize = false, disableItemAnimation = true) messageActionsEpoxyController.listener = this } diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt index 5779b66ad7..6148b3c725 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt @@ -70,9 +70,7 @@ class RoomListQuickActionsBottomSheet : VectorBaseBottomSheetDialogFragment(), R override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) sharedActionViewModel = activityViewModelProvider.get(RoomListQuickActionsSharedActionViewModel::class.java) - recyclerView.configureWith(roomListActionsEpoxyController, viewPool = sharedViewPool, hasFixedSize = false) - // Disable item animation - recyclerView.itemAnimator = null + recyclerView.configureWith(roomListActionsEpoxyController, viewPool = sharedViewPool, hasFixedSize = false, disableItemAnimation = true) roomListActionsEpoxyController.listener = this }