Skip to content

Commit d604035

Browse files
committed
Renaming of filter enum
1 parent 354554e commit d604035

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ import javax.inject.Inject
2424

2525
class GetPollsUseCase @Inject constructor() {
2626

27-
fun execute(filter: RoomPollsFilter): Flow<List<PollSummary>> {
27+
fun execute(filter: RoomPollsFilterType): Flow<List<PollSummary>> {
2828
// TODO unmock and add unit tests
2929
return when (filter) {
30-
RoomPollsFilter.ACTIVE -> getActivePolls()
31-
RoomPollsFilter.ENDED -> emptyFlow()
30+
RoomPollsFilterType.ACTIVE -> getActivePolls()
31+
RoomPollsFilterType.ENDED -> emptyFlow()
3232
}.map { it.sortedByDescending { poll -> poll.creationTimestamp } }
3333
}
3434

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ package im.vector.app.features.roomprofile.polls
1919
import im.vector.app.core.platform.VectorViewModelAction
2020

2121
sealed interface RoomPollsAction : VectorViewModelAction {
22-
data class SetFilter(val filter: RoomPollsFilter) : RoomPollsAction
22+
data class SetFilter(val filter: RoomPollsFilterType) : RoomPollsAction
2323
}

vector/src/main/java/im/vector/app/features/roomprofile/polls/RoomPollsFilter.kt renamed to vector/src/main/java/im/vector/app/features/roomprofile/polls/RoomPollsFilterType.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package im.vector.app.features.roomprofile.polls
1818

19-
enum class RoomPollsFilter {
19+
enum class RoomPollsFilterType {
2020
ACTIVE,
2121
ENDED,
2222
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class RoomPollsViewModel @AssistedInject constructor(
5454
super.onCleared()
5555
}
5656

57-
private fun handleSetFilter(filter: RoomPollsFilter) {
57+
private fun handleSetFilter(filter: RoomPollsFilterType) {
5858
pollsCollectionJob?.cancel()
5959
pollsCollectionJob = getPollsUseCase.execute(filter)
6060
.onEach { setState { copy(polls = it) } }

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import im.vector.app.core.platform.VectorBaseFragment
3131
import im.vector.app.databinding.FragmentRoomPollsListBinding
3232
import im.vector.app.features.roomprofile.polls.PollSummary
3333
import im.vector.app.features.roomprofile.polls.RoomPollsAction
34-
import im.vector.app.features.roomprofile.polls.RoomPollsFilter
34+
import im.vector.app.features.roomprofile.polls.RoomPollsFilterType
3535
import im.vector.app.features.roomprofile.polls.RoomPollsViewModel
3636
import timber.log.Timber
3737
import javax.inject.Inject
@@ -73,7 +73,7 @@ class RoomActivePollsFragment :
7373

7474
override fun onResume() {
7575
super.onResume()
76-
viewModel.handle(RoomPollsAction.SetFilter(RoomPollsFilter.ACTIVE))
76+
viewModel.handle(RoomPollsAction.SetFilter(RoomPollsFilterType.ACTIVE))
7777
}
7878

7979
override fun invalidate() = withState(viewModel) { viewState ->

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class RoomPollsViewModelTest {
4747
@Test
4848
fun `given SetFilter action when handle then useCase is called with given filter and viewState is updated`() {
4949
// Given
50-
val filter = RoomPollsFilter.ACTIVE
50+
val filter = RoomPollsFilterType.ACTIVE
5151
val action = RoomPollsAction.SetFilter(filter = filter)
5252
val polls = listOf(givenAPollSummary())
5353
every { fakeGetPollsUseCase.execute(any()) } returns flowOf(polls)

0 commit comments

Comments
 (0)