PinnedMessagesBannerEvents -> PinnedMessagesBannerEvent
This commit is contained in:
@@ -8,6 +8,6 @@
|
||||
|
||||
package io.element.android.features.messages.impl.pinned.banner
|
||||
|
||||
sealed interface PinnedMessagesBannerEvents {
|
||||
data object MoveToNextPinned : PinnedMessagesBannerEvents
|
||||
sealed interface PinnedMessagesBannerEvent {
|
||||
data object MoveToNextPinned : PinnedMessagesBannerEvent
|
||||
}
|
||||
@@ -58,9 +58,9 @@ class PinnedMessagesBannerPresenter(
|
||||
},
|
||||
)
|
||||
|
||||
fun handleEvent(event: PinnedMessagesBannerEvents) {
|
||||
fun handleEvent(event: PinnedMessagesBannerEvent) {
|
||||
when (event) {
|
||||
is PinnedMessagesBannerEvents.MoveToNextPinned -> {
|
||||
is PinnedMessagesBannerEvent.MoveToNextPinned -> {
|
||||
val loadedCount = pinnedItems.value.dataOrNull().orEmpty().size
|
||||
currentPinnedMessageIndex = (currentPinnedMessageIndex - 1).mod(loadedCount)
|
||||
}
|
||||
@@ -80,7 +80,7 @@ class PinnedMessagesBannerPresenter(
|
||||
expectedPinnedMessagesCount: Int,
|
||||
pinnedItems: AsyncData<ImmutableList<PinnedMessagesBannerItem>>,
|
||||
currentPinnedMessageIndex: Int,
|
||||
eventSink: (PinnedMessagesBannerEvents) -> Unit
|
||||
eventSink: (PinnedMessagesBannerEvent) -> Unit
|
||||
): PinnedMessagesBannerState {
|
||||
return when (pinnedItems) {
|
||||
is AsyncData.Failure, is AsyncData.Uninitialized -> PinnedMessagesBannerState.Hidden
|
||||
|
||||
@@ -41,6 +41,6 @@ sealed interface PinnedMessagesBannerState {
|
||||
val currentPinnedMessage: PinnedMessagesBannerItem,
|
||||
val currentPinnedMessageIndex: Int,
|
||||
val loadedPinnedMessagesCount: Int,
|
||||
val eventSink: (PinnedMessagesBannerEvents) -> Unit
|
||||
val eventSink: (PinnedMessagesBannerEvent) -> Unit
|
||||
) : Visible
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ internal fun aLoadedPinnedMessagesBannerState(
|
||||
eventId = EventId("\$" + Random.nextInt().toString()),
|
||||
formatted = AnnotatedString(message)
|
||||
),
|
||||
eventSink: (PinnedMessagesBannerEvents) -> Unit = {}
|
||||
eventSink: (PinnedMessagesBannerEvent) -> Unit = {}
|
||||
) = PinnedMessagesBannerState.Loaded(
|
||||
currentPinnedMessage = currentPinnedMessage,
|
||||
currentPinnedMessageIndex = currentPinnedMessageIndex,
|
||||
|
||||
@@ -96,7 +96,7 @@ private fun PinnedMessagesBannerRow(
|
||||
if (state is PinnedMessagesBannerState.Loaded) {
|
||||
analyticsService.captureInteraction(Interaction.Name.PinnedMessageBannerClick)
|
||||
onClick(state.currentPinnedMessage.eventId)
|
||||
state.eventSink(PinnedMessagesBannerEvents.MoveToNextPinned)
|
||||
state.eventSink(PinnedMessagesBannerEvent.MoveToNextPinned)
|
||||
}
|
||||
},
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
|
||||
@@ -127,7 +127,7 @@ class PinnedMessagesBannerPresenterTest {
|
||||
assertThat(loadedState.currentPinnedMessageIndex).isEqualTo(1)
|
||||
assertThat(loadedState.loadedPinnedMessagesCount).isEqualTo(2)
|
||||
assertThat(loadedState.currentPinnedMessage.formatted.text).isEqualTo(messageContent2.toString())
|
||||
loadedState.eventSink(PinnedMessagesBannerEvents.MoveToNextPinned)
|
||||
loadedState.eventSink(PinnedMessagesBannerEvent.MoveToNextPinned)
|
||||
}
|
||||
|
||||
awaitItem().also { loadedState ->
|
||||
@@ -135,7 +135,7 @@ class PinnedMessagesBannerPresenterTest {
|
||||
assertThat(loadedState.currentPinnedMessageIndex).isEqualTo(0)
|
||||
assertThat(loadedState.loadedPinnedMessagesCount).isEqualTo(2)
|
||||
assertThat(loadedState.currentPinnedMessage.formatted.text).isEqualTo(messageContent1.toString())
|
||||
loadedState.eventSink(PinnedMessagesBannerEvents.MoveToNextPinned)
|
||||
loadedState.eventSink(PinnedMessagesBannerEvent.MoveToNextPinned)
|
||||
}
|
||||
|
||||
awaitItem().also { loadedState ->
|
||||
|
||||
@@ -33,7 +33,7 @@ class PinnedMessagesBannerViewTest {
|
||||
|
||||
@Test
|
||||
fun `clicking on the banner invoke expected callback`() {
|
||||
val eventsRecorder = EventsRecorder<PinnedMessagesBannerEvents>()
|
||||
val eventsRecorder = EventsRecorder<PinnedMessagesBannerEvent>()
|
||||
val state = aLoadedPinnedMessagesBannerState(
|
||||
eventSink = eventsRecorder
|
||||
)
|
||||
@@ -44,13 +44,13 @@ class PinnedMessagesBannerViewTest {
|
||||
onClick = callback
|
||||
)
|
||||
rule.onRoot().performClick()
|
||||
eventsRecorder.assertSingle(PinnedMessagesBannerEvents.MoveToNextPinned)
|
||||
eventsRecorder.assertSingle(PinnedMessagesBannerEvent.MoveToNextPinned)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `clicking on view all emit the expected event`() {
|
||||
val eventsRecorder = EventsRecorder<PinnedMessagesBannerEvents>(expectEvents = true)
|
||||
val eventsRecorder = EventsRecorder<PinnedMessagesBannerEvent>(expectEvents = true)
|
||||
val state = aLoadedPinnedMessagesBannerState(
|
||||
eventSink = eventsRecorder
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user