Skip to content

Commit 57595d6

Browse files
committed
Make TimelineItemAction an enum class.
1 parent 293da98 commit 57595d6

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,26 @@ import io.element.android.libraries.designsystem.icons.CompoundDrawables
1414
import io.element.android.libraries.ui.strings.CommonStrings
1515

1616
@Immutable
17-
sealed class TimelineItemAction(
17+
enum class TimelineItemAction(
1818
@StringRes val titleRes: Int,
1919
@DrawableRes val icon: Int,
2020
val destructive: Boolean = false
2121
) {
22-
data object ViewInTimeline : TimelineItemAction(CommonStrings.action_view_in_timeline, CompoundDrawables.ic_compound_visibility_on)
23-
data object Forward : TimelineItemAction(CommonStrings.action_forward, CompoundDrawables.ic_compound_forward)
24-
data object CopyText : TimelineItemAction(CommonStrings.action_copy_text, CompoundDrawables.ic_compound_copy)
25-
data object CopyCaption : TimelineItemAction(CommonStrings.action_copy_caption, CompoundDrawables.ic_compound_copy)
26-
data object CopyLink : TimelineItemAction(CommonStrings.action_copy_link_to_message, CompoundDrawables.ic_compound_link)
27-
data object Redact : TimelineItemAction(CommonStrings.action_remove, CompoundDrawables.ic_compound_delete, destructive = true)
28-
data object Reply : TimelineItemAction(CommonStrings.action_reply, CompoundDrawables.ic_compound_reply)
29-
data object ReplyInThread : TimelineItemAction(CommonStrings.action_reply_in_thread, CompoundDrawables.ic_compound_reply)
30-
data object Edit : TimelineItemAction(CommonStrings.action_edit, CompoundDrawables.ic_compound_edit)
31-
data object EditCaption : TimelineItemAction(CommonStrings.action_edit_caption, CompoundDrawables.ic_compound_edit)
32-
data object AddCaption : TimelineItemAction(CommonStrings.action_add_caption, CompoundDrawables.ic_compound_edit)
33-
data object RemoveCaption : TimelineItemAction(CommonStrings.action_remove_caption, CompoundDrawables.ic_compound_close, destructive = true)
34-
data object ViewSource : TimelineItemAction(CommonStrings.action_view_source, CompoundDrawables.ic_compound_code)
35-
data object ReportContent : TimelineItemAction(CommonStrings.action_report_content, CompoundDrawables.ic_compound_chat_problem, destructive = true)
36-
data object EndPoll : TimelineItemAction(CommonStrings.action_end_poll, CompoundDrawables.ic_compound_polls_end)
37-
data object Pin : TimelineItemAction(CommonStrings.action_pin, CompoundDrawables.ic_compound_pin)
38-
data object Unpin : TimelineItemAction(CommonStrings.action_unpin, CompoundDrawables.ic_compound_unpin)
22+
ViewInTimeline(CommonStrings.action_view_in_timeline, CompoundDrawables.ic_compound_visibility_on),
23+
Forward(CommonStrings.action_forward, CompoundDrawables.ic_compound_forward),
24+
CopyText(CommonStrings.action_copy_text, CompoundDrawables.ic_compound_copy),
25+
CopyCaption(CommonStrings.action_copy_caption, CompoundDrawables.ic_compound_copy),
26+
CopyLink(CommonStrings.action_copy_link_to_message, CompoundDrawables.ic_compound_link),
27+
Redact(CommonStrings.action_remove, CompoundDrawables.ic_compound_delete, destructive = true),
28+
Reply(CommonStrings.action_reply, CompoundDrawables.ic_compound_reply),
29+
ReplyInThread(CommonStrings.action_reply_in_thread, CompoundDrawables.ic_compound_reply),
30+
Edit(CommonStrings.action_edit, CompoundDrawables.ic_compound_edit),
31+
EditCaption(CommonStrings.action_edit_caption, CompoundDrawables.ic_compound_edit),
32+
AddCaption(CommonStrings.action_add_caption, CompoundDrawables.ic_compound_edit),
33+
RemoveCaption(CommonStrings.action_remove_caption, CompoundDrawables.ic_compound_close, destructive = true),
34+
ViewSource(CommonStrings.action_view_source, CompoundDrawables.ic_compound_code),
35+
ReportContent(CommonStrings.action_report_content, CompoundDrawables.ic_compound_chat_problem, destructive = true),
36+
EndPoll(CommonStrings.action_end_poll, CompoundDrawables.ic_compound_polls_end),
37+
Pin(CommonStrings.action_pin, CompoundDrawables.ic_compound_pin),
38+
Unpin(CommonStrings.action_unpin, CompoundDrawables.ic_compound_unpin),
3939
}

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListTimelineActionPostProcessor.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ class PinnedMessagesListTimelineActionPostProcessor : TimelineItemActionPostProc
1414
override fun process(actions: List<TimelineItemAction>): List<TimelineItemAction> {
1515
return buildList {
1616
add(TimelineItemAction.ViewInTimeline)
17-
actions.firstOrNull { it is TimelineItemAction.Unpin }?.let(::add)
18-
actions.firstOrNull { it is TimelineItemAction.Forward }?.let(::add)
19-
actions.firstOrNull { it is TimelineItemAction.ViewSource }?.let(::add)
17+
actions.firstOrNull { it == TimelineItemAction.Unpin }?.let(::add)
18+
actions.firstOrNull { it == TimelineItemAction.Forward }?.let(::add)
19+
actions.firstOrNull { it == TimelineItemAction.ViewSource }?.let(::add)
2020
}
2121
}
2222
}

0 commit comments

Comments
 (0)