From 99423bacb234706cc42bf6803857f19266a8fc45 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 9 Dec 2019 22:09:17 +0100 Subject: [PATCH] Cleanup --- .../java/im/vector/riotx/core/extensions/RecyclerView.kt | 7 +++++-- .../timeline/edithistory/ViewEditHistoryBottomSheet.kt | 2 +- .../riotx/features/reactions/EmojiSearchResultFragment.kt | 3 +-- .../riotx/features/settings/push/PushGatewaysFragment.kt | 3 +-- .../riotx/features/settings/push/PushRulesFragment.kt | 3 +-- 5 files changed, 9 insertions(+), 9 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 b34edc0e89..003045af51 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 @@ -16,6 +16,7 @@ package im.vector.riotx.core.extensions +import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.airbnb.epoxy.EpoxyController @@ -25,11 +26,13 @@ import com.airbnb.epoxy.EpoxyController */ fun RecyclerView.configureWith(epoxyController: EpoxyController, itemAnimator: RecyclerView.ItemAnimator? = null, - itemDecoration: RecyclerView.ItemDecoration? = null, + showDivider: Boolean = false, hasFixedSize: Boolean = true) { layoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false) itemAnimator?.let { this.itemAnimator = it } - itemDecoration?.let { addItemDecoration(it) } + if (showDivider) { + addItemDecoration(DividerItemDecoration(context, DividerItemDecoration.VERTICAL)) + } setHasFixedSize(hasFixedSize) adapter = epoxyController.adapter } diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt index 5a5fc5de95..845d2a2b7a 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt @@ -68,7 +68,7 @@ class ViewEditHistoryBottomSheet : VectorBaseBottomSheetDialogFragment() { super.onActivityCreated(savedInstanceState) recyclerView.configureWith( epoxyController, - itemDecoration = DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL), + showDivider = true, hasFixedSize = false) bottomSheetTitle.text = context?.getString(R.string.message_edits) } diff --git a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultFragment.kt b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultFragment.kt index d87b7d7946..b34a5f2357 100644 --- a/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultFragment.kt @@ -17,7 +17,6 @@ package im.vector.riotx.features.reactions import android.os.Bundle import android.view.View -import androidx.recyclerview.widget.DividerItemDecoration import com.airbnb.mvrx.activityViewModel import com.airbnb.mvrx.withState import im.vector.riotx.R @@ -49,7 +48,7 @@ class EmojiSearchResultFragment @Inject constructor( } } - recyclerView.configureWith(epoxyController, itemDecoration = DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)) + recyclerView.configureWith(epoxyController, showDivider = true) } override fun onDestroyView() { diff --git a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysFragment.kt index c4d2118a77..d5c19e8781 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/push/PushGatewaysFragment.kt @@ -18,7 +18,6 @@ package im.vector.riotx.features.settings.push import android.os.Bundle import android.view.View -import androidx.recyclerview.widget.DividerItemDecoration import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState import im.vector.riotx.R @@ -46,7 +45,7 @@ class PushGatewaysFragment @Inject constructor( override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - recyclerView.configureWith(epoxyController, itemDecoration = DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)) + recyclerView.configureWith(epoxyController, showDivider = true) } override fun onDestroyView() { diff --git a/vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesFragment.kt b/vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesFragment.kt index 4deb410d03..bee9cf54d9 100644 --- a/vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesFragment.kt +++ b/vector/src/main/java/im/vector/riotx/features/settings/push/PushRulesFragment.kt @@ -17,7 +17,6 @@ package im.vector.riotx.features.settings.push import android.os.Bundle import android.view.View -import androidx.recyclerview.widget.DividerItemDecoration import com.airbnb.epoxy.TypedEpoxyController import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState @@ -46,7 +45,7 @@ class PushRulesFragment : VectorBaseFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - recyclerView.configureWith(epoxyController, itemDecoration = DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL)) + recyclerView.configureWith(epoxyController, showDivider = true) } override fun onDestroyView() {