From 9b5fda2689531063847707804100be2576990afa Mon Sep 17 00:00:00 2001 From: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com> Date: Thu, 5 Jan 2023 15:45:35 +0100 Subject: [PATCH] Fix after rebase --- .../roomprofile/polls/ended/RoomEndedPollsFragment.kt | 6 +++--- .../roomprofile/polls/list/RoomPollsListFragment.kt | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/polls/ended/RoomEndedPollsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/polls/ended/RoomEndedPollsFragment.kt index bad1a4e2da..add7096409 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/polls/ended/RoomEndedPollsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/polls/ended/RoomEndedPollsFragment.kt @@ -18,7 +18,7 @@ package im.vector.app.features.roomprofile.polls.ended import dagger.hilt.android.AndroidEntryPoint import im.vector.app.R -import im.vector.app.features.roomprofile.polls.RoomPollsFilter +import im.vector.app.features.roomprofile.polls.RoomPollsFilterType import im.vector.app.features.roomprofile.polls.list.RoomPollsListFragment @AndroidEntryPoint @@ -28,7 +28,7 @@ class RoomEndedPollsFragment : RoomPollsListFragment() { return getString(R.string.room_polls_ended_no_item) } - override fun getRoomPollsFilter(): RoomPollsFilter { - return RoomPollsFilter.ENDED + override fun getRoomPollsFilter(): RoomPollsFilterType { + return RoomPollsFilterType.ENDED } } diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/polls/list/RoomPollsListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/polls/list/RoomPollsListFragment.kt index f408f1c781..f6aa59f447 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/polls/list/RoomPollsListFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/polls/list/RoomPollsListFragment.kt @@ -28,7 +28,7 @@ import im.vector.app.core.extensions.configureWith import im.vector.app.core.platform.VectorBaseFragment import im.vector.app.databinding.FragmentRoomPollsListBinding import im.vector.app.features.roomprofile.polls.PollSummary -import im.vector.app.features.roomprofile.polls.RoomPollsFilter +import im.vector.app.features.roomprofile.polls.RoomPollsFilterType import im.vector.app.features.roomprofile.polls.RoomPollsViewModel import timber.log.Timber import javax.inject.Inject @@ -53,7 +53,7 @@ abstract class RoomPollsListFragment : abstract fun getEmptyListTitle(): String - abstract fun getRoomPollsFilter(): RoomPollsFilter + abstract fun getRoomPollsFilter(): RoomPollsFilterType private fun setupList() { roomPollsController.listener = this @@ -73,8 +73,8 @@ abstract class RoomPollsListFragment : override fun invalidate() = withState(viewModel) { viewState -> when (getRoomPollsFilter()) { - RoomPollsFilter.ACTIVE -> renderList(viewState.polls.filterIsInstance(PollSummary.ActivePoll::class.java)) - RoomPollsFilter.ENDED -> renderList(viewState.polls.filterIsInstance(PollSummary.EndedPoll::class.java)) + RoomPollsFilterType.ACTIVE -> renderList(viewState.polls.filterIsInstance(PollSummary.ActivePoll::class.java)) + RoomPollsFilterType.ENDED -> renderList(viewState.polls.filterIsInstance(PollSummary.EndedPoll::class.java)) } }