mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-18 04:50:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Renaming of filter enum

Browse source
This commit is contained in:
Maxime NATUREL 2023-01-05 15:09:41 +01:00
parent 354554e843
commit d60403545c
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
vector/src/main/java/im/vector/app/features/roomprofile/polls/GetPollsUseCase.kt
View file

@ -24,11 +24,11 @@ import javax.inject.Inject
class GetPollsUseCase @Inject constructor() { class GetPollsUseCase @Inject constructor() {
fun execute(filter: RoomPollsFilter): Flow<List<PollSummary>> { fun execute(filter: RoomPollsFilterType): Flow<List<PollSummary>> {
// TODO unmock and add unit tests // TODO unmock and add unit tests
return when (filter) { return when (filter) {
RoomPollsFilter.ACTIVE -> getActivePolls() RoomPollsFilterType.ACTIVE -> getActivePolls()
RoomPollsFilter.ENDED -> emptyFlow() RoomPollsFilterType.ENDED -> emptyFlow()
}.map { it.sortedByDescending { poll -> poll.creationTimestamp } } }.map { it.sortedByDescending { poll -> poll.creationTimestamp } }
} }

2
vector/src/main/java/im/vector/app/features/roomprofile/polls/RoomPollsAction.kt
View file

@ -19,5 +19,5 @@ package im.vector.app.features.roomprofile.polls
import im.vector.app.core.platform.VectorViewModelAction import im.vector.app.core.platform.VectorViewModelAction
sealed interface RoomPollsAction : VectorViewModelAction { sealed interface RoomPollsAction : VectorViewModelAction {
data class SetFilter(val filter: RoomPollsFilter) : RoomPollsAction data class SetFilter(val filter: RoomPollsFilterType) : RoomPollsAction
} }

2
vector/src/main/java/im/vector/app/features/roomprofile/polls/RoomPollsFilter.kt → vector/src/main/java/im/vector/app/features/roomprofile/polls/RoomPollsFilterType.kt
View file

@ -16,7 +16,7 @@
package im.vector.app.features.roomprofile.polls package im.vector.app.features.roomprofile.polls
enum class RoomPollsFilter { enum class RoomPollsFilterType {
ACTIVE, ACTIVE,
ENDED, ENDED,
} }

2
vector/src/main/java/im/vector/app/features/roomprofile/polls/RoomPollsViewModel.kt
View file

@ -54,7 +54,7 @@ class RoomPollsViewModel @AssistedInject constructor(
super.onCleared() super.onCleared()
} }
private fun handleSetFilter(filter: RoomPollsFilter) { private fun handleSetFilter(filter: RoomPollsFilterType) {
pollsCollectionJob?.cancel() pollsCollectionJob?.cancel()
pollsCollectionJob = getPollsUseCase.execute(filter) pollsCollectionJob = getPollsUseCase.execute(filter)
.onEach { setState { copy(polls = it) } } .onEach { setState { copy(polls = it) } }

4
vector/src/main/java/im/vector/app/features/roomprofile/polls/active/RoomActivePollsFragment.kt
View file

@ -31,7 +31,7 @@ import im.vector.app.core.platform.VectorBaseFragment
import im.vector.app.databinding.FragmentRoomPollsListBinding import im.vector.app.databinding.FragmentRoomPollsListBinding
import im.vector.app.features.roomprofile.polls.PollSummary import im.vector.app.features.roomprofile.polls.PollSummary
import im.vector.app.features.roomprofile.polls.RoomPollsAction 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 im.vector.app.features.roomprofile.polls.RoomPollsViewModel
import timber.log.Timber import timber.log.Timber
import javax.inject.Inject import javax.inject.Inject
@ -73,7 +73,7 @@ class RoomActivePollsFragment :
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
viewModel.handle(RoomPollsAction.SetFilter(RoomPollsFilter.ACTIVE)) viewModel.handle(RoomPollsAction.SetFilter(RoomPollsFilterType.ACTIVE))
} }
override fun invalidate() = withState(viewModel) { viewState -> override fun invalidate() = withState(viewModel) { viewState ->

2
vector/src/test/java/im/vector/app/features/roomprofile/polls/RoomPollsViewModelTest.kt
View file

@ -47,7 +47,7 @@ class RoomPollsViewModelTest {
@Test @Test
fun `given SetFilter action when handle then useCase is called with given filter and viewState is updated`() { fun `given SetFilter action when handle then useCase is called with given filter and viewState is updated`() {
// Given // Given
val filter = RoomPollsFilter.ACTIVE val filter = RoomPollsFilterType.ACTIVE
val action = RoomPollsAction.SetFilter(filter = filter) val action = RoomPollsAction.SetFilter(filter = filter)
val polls = listOf(givenAPollSummary()) val polls = listOf(givenAPollSummary())
every { fakeGetPollsUseCase.execute(any()) } returns flowOf(polls) every { fakeGetPollsUseCase.execute(any()) } returns flowOf(polls)