From d60403545c4f323f7067bef06776660cdcf4b4d3 Mon Sep 17 00:00:00 2001 From: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com> Date: Thu, 5 Jan 2023 15:09:41 +0100 Subject: [PATCH] Renaming of filter enum --- .../app/features/roomprofile/polls/GetPollsUseCase.kt | 6 +++--- .../app/features/roomprofile/polls/RoomPollsAction.kt | 2 +- .../polls/{RoomPollsFilter.kt => RoomPollsFilterType.kt} | 2 +- .../app/features/roomprofile/polls/RoomPollsViewModel.kt | 2 +- .../roomprofile/polls/active/RoomActivePollsFragment.kt | 4 ++-- .../features/roomprofile/polls/RoomPollsViewModelTest.kt | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename vector/src/main/java/im/vector/app/features/roomprofile/polls/{RoomPollsFilter.kt => RoomPollsFilterType.kt} (95%) diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/polls/GetPollsUseCase.kt b/vector/src/main/java/im/vector/app/features/roomprofile/polls/GetPollsUseCase.kt index fa8c6d0aa6..d35d192e04 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/polls/GetPollsUseCase.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/polls/GetPollsUseCase.kt @@ -24,11 +24,11 @@ import javax.inject.Inject class GetPollsUseCase @Inject constructor() { - fun execute(filter: RoomPollsFilter): Flow> { + fun execute(filter: RoomPollsFilterType): Flow> { // TODO unmock and add unit tests return when (filter) { - RoomPollsFilter.ACTIVE -> getActivePolls() - RoomPollsFilter.ENDED -> emptyFlow() + RoomPollsFilterType.ACTIVE -> getActivePolls() + RoomPollsFilterType.ENDED -> emptyFlow() }.map { it.sortedByDescending { poll -> poll.creationTimestamp } } } diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/polls/RoomPollsAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/polls/RoomPollsAction.kt index 27753b6d16..5f074bdd6f 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/polls/RoomPollsAction.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/polls/RoomPollsAction.kt @@ -19,5 +19,5 @@ package im.vector.app.features.roomprofile.polls import im.vector.app.core.platform.VectorViewModelAction sealed interface RoomPollsAction : VectorViewModelAction { - data class SetFilter(val filter: RoomPollsFilter) : RoomPollsAction + data class SetFilter(val filter: RoomPollsFilterType) : RoomPollsAction } diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/polls/RoomPollsFilter.kt b/vector/src/main/java/im/vector/app/features/roomprofile/polls/RoomPollsFilterType.kt similarity index 95% rename from vector/src/main/java/im/vector/app/features/roomprofile/polls/RoomPollsFilter.kt rename to vector/src/main/java/im/vector/app/features/roomprofile/polls/RoomPollsFilterType.kt index 68ebb13f7d..39f1163536 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/polls/RoomPollsFilter.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/polls/RoomPollsFilterType.kt @@ -16,7 +16,7 @@ package im.vector.app.features.roomprofile.polls -enum class RoomPollsFilter { +enum class RoomPollsFilterType { ACTIVE, ENDED, } diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/polls/RoomPollsViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/polls/RoomPollsViewModel.kt index 7def7a508d..7bc06894fa 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/polls/RoomPollsViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/polls/RoomPollsViewModel.kt @@ -54,7 +54,7 @@ class RoomPollsViewModel @AssistedInject constructor( super.onCleared() } - private fun handleSetFilter(filter: RoomPollsFilter) { + private fun handleSetFilter(filter: RoomPollsFilterType) { pollsCollectionJob?.cancel() pollsCollectionJob = getPollsUseCase.execute(filter) .onEach { setState { copy(polls = it) } } diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/polls/active/RoomActivePollsFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/polls/active/RoomActivePollsFragment.kt index 4cc318edf9..61c7e961bd 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/polls/active/RoomActivePollsFragment.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/polls/active/RoomActivePollsFragment.kt @@ -31,7 +31,7 @@ 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.RoomPollsAction -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 @@ -73,7 +73,7 @@ class RoomActivePollsFragment : override fun onResume() { super.onResume() - viewModel.handle(RoomPollsAction.SetFilter(RoomPollsFilter.ACTIVE)) + viewModel.handle(RoomPollsAction.SetFilter(RoomPollsFilterType.ACTIVE)) } override fun invalidate() = withState(viewModel) { viewState -> diff --git a/vector/src/test/java/im/vector/app/features/roomprofile/polls/RoomPollsViewModelTest.kt b/vector/src/test/java/im/vector/app/features/roomprofile/polls/RoomPollsViewModelTest.kt index 54b2a60d55..0dce2dd6e0 100644 --- a/vector/src/test/java/im/vector/app/features/roomprofile/polls/RoomPollsViewModelTest.kt +++ b/vector/src/test/java/im/vector/app/features/roomprofile/polls/RoomPollsViewModelTest.kt @@ -47,7 +47,7 @@ class RoomPollsViewModelTest { @Test fun `given SetFilter action when handle then useCase is called with given filter and viewState is updated`() { // Given - val filter = RoomPollsFilter.ACTIVE + val filter = RoomPollsFilterType.ACTIVE val action = RoomPollsAction.SetFilter(filter = filter) val polls = listOf(givenAPollSummary()) every { fakeGetPollsUseCase.execute(any()) } returns flowOf(polls)