rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix after rebase

Browse Source
This commit is contained in:
Maxime NATUREL 2023-01-05 15:45:35 +01:00
parent a5d076a28a
commit 9b5fda2689
2 changed files with 7 additions and 7 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/ended/RoomEndedPollsFragment.kt
View File

@ -18,7 +18,7 @@ package im.vector.app.features.roomprofile.polls.ended
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import im.vector.app.R 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 import im.vector.app.features.roomprofile.polls.list.RoomPollsListFragment
@AndroidEntryPoint @AndroidEntryPoint
@ -28,7 +28,7 @@ class RoomEndedPollsFragment : RoomPollsListFragment() {
return getString(R.string.room_polls_ended_no_item) return getString(R.string.room_polls_ended_no_item)
} }
override fun getRoomPollsFilter(): RoomPollsFilter { override fun getRoomPollsFilter(): RoomPollsFilterType {
return RoomPollsFilter.ENDED return RoomPollsFilterType.ENDED
} }
} }

8
vector/src/main/java/im/vector/app/features/roomprofile/polls/list/RoomPollsListFragment.kt
View File

@ -28,7 +28,7 @@ import im.vector.app.core.extensions.configureWith
import im.vector.app.core.platform.VectorBaseFragment 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.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
@ -53,7 +53,7 @@ abstract class RoomPollsListFragment :
abstract fun getEmptyListTitle(): String abstract fun getEmptyListTitle(): String
abstract fun getRoomPollsFilter(): RoomPollsFilter abstract fun getRoomPollsFilter(): RoomPollsFilterType
private fun setupList() { private fun setupList() {
roomPollsController.listener = this roomPollsController.listener = this
@ -73,8 +73,8 @@ abstract class RoomPollsListFragment :
override fun invalidate() = withState(viewModel) { viewState -> override fun invalidate() = withState(viewModel) { viewState ->
when (getRoomPollsFilter()) { when (getRoomPollsFilter()) {
RoomPollsFilter.ACTIVE -> renderList(viewState.polls.filterIsInstance(PollSummary.ActivePoll::class.java)) RoomPollsFilterType.ACTIVE -> renderList(viewState.polls.filterIsInstance(PollSummary.ActivePoll::class.java))
RoomPollsFilter.ENDED -> renderList(viewState.polls.filterIsInstance(PollSummary.EndedPoll::class.java)) RoomPollsFilterType.ENDED -> renderList(viewState.polls.filterIsInstance(PollSummary.EndedPoll::class.java))
} }
} }