Skip to content

Commit a0e0d25

Browse files
bmartybmarty
committed
Add EditPoll action and fix tests.
1 parent 2221420 commit a0e0d25

File tree

8 files changed

+36
-47
lines changed

8 files changed

+36
-47
lines changed

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,8 @@ class MessagesPresenter @AssistedInject constructor(
274274
TimelineItemAction.CopyCaption -> handleCopyCaption(targetEvent)
275275
TimelineItemAction.CopyLink -> handleCopyLink(targetEvent)
276276
TimelineItemAction.Redact -> handleActionRedact(targetEvent)
277-
TimelineItemAction.Edit -> handleActionEdit(targetEvent, composerState, enableTextFormatting)
277+
TimelineItemAction.Edit,
278+
TimelineItemAction.EditPoll -> handleActionEdit(targetEvent, composerState, enableTextFormatting)
278279
TimelineItemAction.AddCaption -> handleActionAddCaption(targetEvent, composerState)
279280
TimelineItemAction.EditCaption -> handleActionEditCaption(targetEvent, composerState)
280281
TimelineItemAction.RemoveCaption -> handleRemoveCaption(targetEvent)

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenter.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ class DefaultActionListPresenter @AssistedInject constructor(
178178
add(TimelineItemAction.EditCaption)
179179
add(TimelineItemAction.RemoveCaption)
180180
}
181+
} else if (timelineItem.content is TimelineItemPollContent) {
182+
add(TimelineItemAction.EditPoll)
181183
} else {
182184
add(TimelineItemAction.Edit)
183185
}

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListStateProvider.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ fun aTimelineItemActionList(
203203
fun aTimelineItemPollActionList(): ImmutableList<TimelineItemAction> {
204204
return setOf(
205205
TimelineItemAction.EndPoll,
206+
TimelineItemAction.EditPoll,
206207
TimelineItemAction.Reply,
207208
TimelineItemAction.Pin,
208209
TimelineItemAction.CopyLink,

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemAction.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ enum class TimelineItemAction(
2828
Reply(CommonStrings.action_reply, CompoundDrawables.ic_compound_reply),
2929
ReplyInThread(CommonStrings.action_reply_in_thread, CompoundDrawables.ic_compound_reply),
3030
Edit(CommonStrings.action_edit, CompoundDrawables.ic_compound_edit),
31+
EditPoll(CommonStrings.action_edit_poll, CompoundDrawables.ic_compound_edit),
3132
EditCaption(CommonStrings.action_edit_caption, CompoundDrawables.ic_compound_edit),
3233
AddCaption(CommonStrings.action_add_caption, CompoundDrawables.ic_compound_edit),
3334
RemoveCaption(CommonStrings.action_remove_caption, CompoundDrawables.ic_compound_close, destructive = true),

‎features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/model/TimelineItemActionComparator.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ class TimelineItemActionComparator : Comparator<TimelineItemAction> {
1919
TimelineItemAction.ReplyInThread,
2020
TimelineItemAction.Forward,
2121
TimelineItemAction.Edit,
22+
TimelineItemAction.EditPoll,
2223
TimelineItemAction.AddCaption,
2324
TimelineItemAction.EditCaption,
2425
TimelineItemAction.CopyLink,

‎features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ class MessagesPresenterTest {
467467
presenter.present()
468468
}.test {
469469
val initialState = awaitItem()
470-
initialState.eventSink(MessagesEvents.HandleAction(TimelineItemAction.Edit, aMessageEvent(content = aTimelineItemPollContent())))
470+
initialState.eventSink(MessagesEvents.HandleAction(TimelineItemAction.EditPoll, aMessageEvent(content = aTimelineItemPollContent())))
471471
awaitItem()
472472
onEditPollClickLambda.assertions().isCalledOnce().with(value(AN_EVENT_ID))
473473
}

‎features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/actionlist/ActionListPresenterTest.kt‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ class ActionListPresenterTest {
179179
actions = persistentListOf(
180180
TimelineItemAction.Reply,
181181
TimelineItemAction.Forward,
182-
TimelineItemAction.Pin,
183182
TimelineItemAction.CopyLink,
183+
TimelineItemAction.Pin,
184184
TimelineItemAction.CopyText,
185185
TimelineItemAction.ViewSource,
186186
TimelineItemAction.ReportContent,
@@ -225,8 +225,8 @@ class ActionListPresenterTest {
225225
actions = persistentListOf(
226226
TimelineItemAction.ReplyInThread,
227227
TimelineItemAction.Forward,
228-
TimelineItemAction.Pin,
229228
TimelineItemAction.CopyLink,
229+
TimelineItemAction.Pin,
230230
TimelineItemAction.CopyText,
231231
TimelineItemAction.ViewSource,
232232
TimelineItemAction.ReportContent,
@@ -273,8 +273,8 @@ class ActionListPresenterTest {
273273
verifiedUserSendFailure = VerifiedUserSendFailure.None,
274274
actions = persistentListOf(
275275
TimelineItemAction.Forward,
276-
TimelineItemAction.Pin,
277276
TimelineItemAction.CopyLink,
277+
TimelineItemAction.Pin,
278278
TimelineItemAction.CopyText,
279279
TimelineItemAction.ViewSource,
280280
TimelineItemAction.ReportContent,
@@ -320,8 +320,8 @@ class ActionListPresenterTest {
320320
actions = persistentListOf(
321321
TimelineItemAction.Reply,
322322
TimelineItemAction.Forward,
323-
TimelineItemAction.Pin,
324323
TimelineItemAction.CopyLink,
324+
TimelineItemAction.Pin,
325325
TimelineItemAction.CopyText,
326326
TimelineItemAction.ViewSource,
327327
TimelineItemAction.ReportContent,
@@ -368,8 +368,8 @@ class ActionListPresenterTest {
368368
actions = persistentListOf(
369369
TimelineItemAction.Reply,
370370
TimelineItemAction.Forward,
371-
TimelineItemAction.Pin,
372371
TimelineItemAction.CopyLink,
372+
TimelineItemAction.Pin,
373373
TimelineItemAction.CopyText,
374374
TimelineItemAction.ViewSource,
375375
TimelineItemAction.ReportContent,
@@ -417,9 +417,9 @@ class ActionListPresenterTest {
417417
actions = persistentListOf(
418418
TimelineItemAction.Reply,
419419
TimelineItemAction.Forward,
420-
TimelineItemAction.Pin,
421-
TimelineItemAction.CopyLink,
422420
TimelineItemAction.Edit,
421+
TimelineItemAction.CopyLink,
422+
TimelineItemAction.Pin,
423423
TimelineItemAction.CopyText,
424424
TimelineItemAction.ViewSource,
425425
TimelineItemAction.Redact,
@@ -463,9 +463,9 @@ class ActionListPresenterTest {
463463
actions = persistentListOf(
464464
TimelineItemAction.ReplyInThread,
465465
TimelineItemAction.Forward,
466-
TimelineItemAction.Pin,
467-
TimelineItemAction.CopyLink,
468466
TimelineItemAction.Edit,
467+
TimelineItemAction.CopyLink,
468+
TimelineItemAction.Pin,
469469
TimelineItemAction.CopyText,
470470
TimelineItemAction.ViewSource,
471471
TimelineItemAction.Redact,
@@ -512,9 +512,9 @@ class ActionListPresenterTest {
512512
actions = persistentListOf(
513513
TimelineItemAction.Reply,
514514
TimelineItemAction.Forward,
515-
TimelineItemAction.Pin,
516-
TimelineItemAction.CopyLink,
517515
TimelineItemAction.Edit,
516+
TimelineItemAction.CopyLink,
517+
TimelineItemAction.Pin,
518518
TimelineItemAction.CopyText,
519519
TimelineItemAction.ViewSource,
520520
)
@@ -559,9 +559,9 @@ class ActionListPresenterTest {
559559
actions = persistentListOf(
560560
TimelineItemAction.Reply,
561561
TimelineItemAction.Forward,
562-
TimelineItemAction.Pin,
563-
TimelineItemAction.CopyLink,
564562
TimelineItemAction.AddCaption,
563+
TimelineItemAction.CopyLink,
564+
TimelineItemAction.Pin,
565565
TimelineItemAction.ViewSource,
566566
TimelineItemAction.Redact,
567567
)
@@ -612,8 +612,8 @@ class ActionListPresenterTest {
612612
TimelineItemAction.Forward,
613613
// Not here
614614
// TimelineItemAction.AddCaption,
615-
TimelineItemAction.Pin,
616615
TimelineItemAction.CopyLink,
616+
TimelineItemAction.Pin,
617617
TimelineItemAction.ViewSource,
618618
TimelineItemAction.Redact,
619619
)
@@ -660,9 +660,9 @@ class ActionListPresenterTest {
660660
actions = persistentListOf(
661661
TimelineItemAction.Reply,
662662
TimelineItemAction.Forward,
663-
TimelineItemAction.Pin,
664-
TimelineItemAction.CopyLink,
665663
TimelineItemAction.EditCaption,
664+
TimelineItemAction.CopyLink,
665+
TimelineItemAction.Pin,
666666
TimelineItemAction.CopyCaption,
667667
TimelineItemAction.RemoveCaption,
668668
TimelineItemAction.ViewSource,
@@ -711,8 +711,8 @@ class ActionListPresenterTest {
711711
actions = persistentListOf(
712712
TimelineItemAction.Reply,
713713
TimelineItemAction.Forward,
714-
TimelineItemAction.Pin,
715714
TimelineItemAction.CopyLink,
715+
TimelineItemAction.Pin,
716716
TimelineItemAction.CopyCaption,
717717
TimelineItemAction.ViewSource,
718718
TimelineItemAction.ReportContent,
@@ -830,9 +830,9 @@ class ActionListPresenterTest {
830830
actions = persistentListOf(
831831
TimelineItemAction.Reply,
832832
TimelineItemAction.Forward,
833-
TimelineItemAction.Pin,
834-
TimelineItemAction.CopyLink,
835833
TimelineItemAction.Edit,
834+
TimelineItemAction.CopyLink,
835+
TimelineItemAction.Pin,
836836
TimelineItemAction.CopyText,
837837
TimelineItemAction.Redact,
838838
)
@@ -878,8 +878,8 @@ class ActionListPresenterTest {
878878
actions = persistentListOf(
879879
TimelineItemAction.Reply,
880880
TimelineItemAction.Forward,
881-
TimelineItemAction.CopyLink,
882881
TimelineItemAction.Edit,
882+
TimelineItemAction.CopyLink,
883883
TimelineItemAction.CopyText,
884884
TimelineItemAction.ViewSource,
885885
TimelineItemAction.Redact,
@@ -933,9 +933,9 @@ class ActionListPresenterTest {
933933
actions = persistentListOf(
934934
TimelineItemAction.Reply,
935935
TimelineItemAction.Forward,
936-
TimelineItemAction.Unpin,
937-
TimelineItemAction.CopyLink,
938936
TimelineItemAction.Edit,
937+
TimelineItemAction.CopyLink,
938+
TimelineItemAction.Unpin,
939939
TimelineItemAction.CopyText,
940940
TimelineItemAction.ViewSource,
941941
TimelineItemAction.Redact,
@@ -1072,9 +1072,9 @@ class ActionListPresenterTest {
10721072
actions = persistentListOf(
10731073
TimelineItemAction.EndPoll,
10741074
TimelineItemAction.Reply,
1075-
TimelineItemAction.Pin,
1075+
TimelineItemAction.EditPoll,
10761076
TimelineItemAction.CopyLink,
1077-
TimelineItemAction.Edit,
1077+
TimelineItemAction.Pin,
10781078
TimelineItemAction.Redact,
10791079
)
10801080
)
@@ -1116,8 +1116,8 @@ class ActionListPresenterTest {
11161116
actions = persistentListOf(
11171117
TimelineItemAction.EndPoll,
11181118
TimelineItemAction.Reply,
1119-
TimelineItemAction.Pin,
11201119
TimelineItemAction.CopyLink,
1120+
TimelineItemAction.Pin,
11211121
TimelineItemAction.Redact,
11221122
)
11231123
)
@@ -1158,8 +1158,8 @@ class ActionListPresenterTest {
11581158
verifiedUserSendFailure = VerifiedUserSendFailure.None,
11591159
actions = persistentListOf(
11601160
TimelineItemAction.Reply,
1161-
TimelineItemAction.Pin,
11621161
TimelineItemAction.CopyLink,
1162+
TimelineItemAction.Pin,
11631163
TimelineItemAction.Redact,
11641164
)
11651165
)
@@ -1203,8 +1203,8 @@ class ActionListPresenterTest {
12031203
actions = persistentListOf(
12041204
TimelineItemAction.Reply,
12051205
TimelineItemAction.Forward,
1206-
TimelineItemAction.Pin,
12071206
TimelineItemAction.CopyLink,
1207+
TimelineItemAction.Pin,
12081208
TimelineItemAction.Redact,
12091209
)
12101210
)

‎features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListTimelineActionPostProcessorTest.kt‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,7 @@ class PinnedMessagesListTimelineActionPostProcessorTest {
2727
fun `ensure that some actions are kept and some other are filtered out`() {
2828
val sut = PinnedMessagesListTimelineActionPostProcessor()
2929
val result = sut.process(
30-
listOf(
31-
TimelineItemAction.Forward,
32-
TimelineItemAction.CopyText,
33-
TimelineItemAction.CopyCaption,
34-
TimelineItemAction.CopyLink,
35-
TimelineItemAction.Redact,
36-
TimelineItemAction.Reply,
37-
TimelineItemAction.ReplyInThread,
38-
TimelineItemAction.Edit,
39-
TimelineItemAction.EditCaption,
40-
TimelineItemAction.AddCaption,
41-
TimelineItemAction.RemoveCaption,
42-
TimelineItemAction.ViewSource,
43-
TimelineItemAction.ReportContent,
44-
TimelineItemAction.EndPoll,
45-
TimelineItemAction.Pin,
46-
TimelineItemAction.Unpin,
47-
)
30+
TimelineItemAction.entries.toList()
4831
)
4932
assertThat(result).isEqualTo(
5033
listOf(

0 commit comments

Comments
 (0)