Skip to content

Commit b013b31

Browse files
bmartybmarty
committed
Change wording of message action "Copy" from "Copy" to "Copy text"
1 parent 5610b19 commit b013b31

File tree

7 files changed

+20
-18
lines changed

7 files changed

+20
-18
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ class MessagesPresenter @AssistedInject constructor(
272272
timelineState: TimelineState,
273273
) = launch {
274274
when (action) {
275-
TimelineItemAction.Copy -> handleCopyContents(targetEvent)
275+
TimelineItemAction.CopyText -> handleCopyContents(targetEvent)
276276
TimelineItemAction.CopyLink -> handleCopyLink(targetEvent)
277277
TimelineItemAction.Redact -> handleActionRedact(targetEvent)
278278
TimelineItemAction.Edit -> handleActionEdit(targetEvent, composerState, enableTextFormatting)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ class DefaultActionListPresenter @AssistedInject constructor(
183183
}
184184
}
185185
if (timelineItem.content.canBeCopied()) {
186-
add(TimelineItemAction.Copy)
186+
add(TimelineItemAction.CopyText)
187187
}
188188
if (timelineItem.isRemote) {
189189
add(TimelineItemAction.CopyLink)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ fun aTimelineItemActionList(): ImmutableList<TimelineItemAction> {
165165
return persistentListOf(
166166
TimelineItemAction.Reply,
167167
TimelineItemAction.Forward,
168-
TimelineItemAction.Copy,
168+
TimelineItemAction.CopyText,
169169
TimelineItemAction.CopyLink,
170170
TimelineItemAction.Edit,
171171
TimelineItemAction.Redact,
@@ -178,7 +178,7 @@ fun aTimelineItemPollActionList(): ImmutableList<TimelineItemAction> {
178178
return persistentListOf(
179179
TimelineItemAction.EndPoll,
180180
TimelineItemAction.Reply,
181-
TimelineItemAction.Copy,
181+
TimelineItemAction.CopyText,
182182
TimelineItemAction.CopyLink,
183183
TimelineItemAction.ViewSource,
184184
TimelineItemAction.ReportContent,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ sealed class TimelineItemAction(
2222
) {
2323
data object ViewInTimeline : TimelineItemAction(CommonStrings.action_view_in_timeline, CompoundDrawables.ic_compound_visibility_on)
2424
data object Forward : TimelineItemAction(CommonStrings.action_forward, CompoundDrawables.ic_compound_forward)
25-
data object Copy : TimelineItemAction(CommonStrings.action_copy, CompoundDrawables.ic_compound_copy)
25+
data object CopyText : TimelineItemAction(CommonStrings.action_copy_text, CompoundDrawables.ic_compound_copy)
2626
data object CopyLink : TimelineItemAction(CommonStrings.action_copy_link_to_message, CompoundDrawables.ic_compound_link)
2727
data object Redact : TimelineItemAction(CommonStrings.action_remove, CompoundDrawables.ic_compound_delete, destructive = true)
2828
data object Reply : TimelineItemAction(CommonStrings.action_reply, CompoundDrawables.ic_compound_reply)

‎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
@@ -242,7 +242,7 @@ class MessagesPresenterTest {
242242
presenter.present()
243243
}.test {
244244
val initialState = awaitItem()
245-
initialState.eventSink(MessagesEvents.HandleAction(TimelineItemAction.Copy, event))
245+
initialState.eventSink(MessagesEvents.HandleAction(TimelineItemAction.CopyText, event))
246246
skipItems(2)
247247
assertThat(clipboardHelper.clipboardContents).isEqualTo((event.content as TimelineItemTextContent).body)
248248
}

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ class ActionListPresenterTest {
176176
TimelineItemAction.Reply,
177177
TimelineItemAction.Forward,
178178
TimelineItemAction.Pin,
179-
TimelineItemAction.Copy,
179+
TimelineItemAction.CopyText,
180180
TimelineItemAction.CopyLink,
181181
TimelineItemAction.ViewSource,
182182
TimelineItemAction.ReportContent,
@@ -221,7 +221,7 @@ class ActionListPresenterTest {
221221
TimelineItemAction.ReplyInThread,
222222
TimelineItemAction.Forward,
223223
TimelineItemAction.Pin,
224-
TimelineItemAction.Copy,
224+
TimelineItemAction.CopyText,
225225
TimelineItemAction.CopyLink,
226226
TimelineItemAction.ViewSource,
227227
TimelineItemAction.ReportContent,
@@ -268,7 +268,7 @@ class ActionListPresenterTest {
268268
actions = persistentListOf(
269269
TimelineItemAction.Forward,
270270
TimelineItemAction.Pin,
271-
TimelineItemAction.Copy,
271+
TimelineItemAction.CopyText,
272272
TimelineItemAction.CopyLink,
273273
TimelineItemAction.ViewSource,
274274
TimelineItemAction.ReportContent,
@@ -314,7 +314,7 @@ class ActionListPresenterTest {
314314
TimelineItemAction.Reply,
315315
TimelineItemAction.Forward,
316316
TimelineItemAction.Pin,
317-
TimelineItemAction.Copy,
317+
TimelineItemAction.CopyText,
318318
TimelineItemAction.CopyLink,
319319
TimelineItemAction.ViewSource,
320320
TimelineItemAction.ReportContent,
@@ -361,7 +361,7 @@ class ActionListPresenterTest {
361361
TimelineItemAction.Reply,
362362
TimelineItemAction.Forward,
363363
TimelineItemAction.Pin,
364-
TimelineItemAction.Copy,
364+
TimelineItemAction.CopyText,
365365
TimelineItemAction.CopyLink,
366366
TimelineItemAction.ViewSource,
367367
TimelineItemAction.ReportContent,
@@ -410,7 +410,7 @@ class ActionListPresenterTest {
410410
TimelineItemAction.Forward,
411411
TimelineItemAction.Edit,
412412
TimelineItemAction.Pin,
413-
TimelineItemAction.Copy,
413+
TimelineItemAction.CopyText,
414414
TimelineItemAction.CopyLink,
415415
TimelineItemAction.ViewSource,
416416
TimelineItemAction.Redact,
@@ -455,7 +455,7 @@ class ActionListPresenterTest {
455455
TimelineItemAction.Forward,
456456
TimelineItemAction.Edit,
457457
TimelineItemAction.Pin,
458-
TimelineItemAction.Copy,
458+
TimelineItemAction.CopyText,
459459
TimelineItemAction.CopyLink,
460460
TimelineItemAction.ViewSource,
461461
TimelineItemAction.Redact,
@@ -503,7 +503,7 @@ class ActionListPresenterTest {
503503
TimelineItemAction.Forward,
504504
TimelineItemAction.Edit,
505505
TimelineItemAction.Pin,
506-
TimelineItemAction.Copy,
506+
TimelineItemAction.CopyText,
507507
TimelineItemAction.CopyLink,
508508
TimelineItemAction.ViewSource,
509509
)
@@ -766,7 +766,7 @@ class ActionListPresenterTest {
766766
TimelineItemAction.Forward,
767767
TimelineItemAction.Edit,
768768
TimelineItemAction.Pin,
769-
TimelineItemAction.Copy,
769+
TimelineItemAction.CopyText,
770770
TimelineItemAction.CopyLink,
771771
TimelineItemAction.Redact,
772772
)
@@ -812,7 +812,7 @@ class ActionListPresenterTest {
812812
TimelineItemAction.Reply,
813813
TimelineItemAction.Forward,
814814
TimelineItemAction.Edit,
815-
TimelineItemAction.Copy,
815+
TimelineItemAction.CopyText,
816816
TimelineItemAction.CopyLink,
817817
TimelineItemAction.ViewSource,
818818
TimelineItemAction.Redact,
@@ -867,7 +867,7 @@ class ActionListPresenterTest {
867867
TimelineItemAction.Forward,
868868
TimelineItemAction.Edit,
869869
TimelineItemAction.Unpin,
870-
TimelineItemAction.Copy,
870+
TimelineItemAction.CopyText,
871871
TimelineItemAction.CopyLink,
872872
TimelineItemAction.ViewSource,
873873
TimelineItemAction.Redact,
@@ -961,7 +961,7 @@ class ActionListPresenterTest {
961961
verifiedUserSendFailure = VerifiedUserSendFailure.None,
962962
actions = persistentListOf(
963963
TimelineItemAction.Edit,
964-
TimelineItemAction.Copy,
964+
TimelineItemAction.CopyText,
965965
TimelineItemAction.Redact,
966966
)
967967
)

‎libraries/ui-strings/src/main/res/values/localazy.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@
4646
<string name="action_confirm_password">"Confirm password"</string>
4747
<string name="action_continue">"Continue"</string>
4848
<string name="action_copy">"Copy"</string>
49+
<string name="action_copy_caption">"Copy caption"</string>
4950
<string name="action_copy_link">"Copy link"</string>
5051
<string name="action_copy_link_to_message">"Copy link to message"</string>
52+
<string name="action_copy_text">"Copy text"</string>
5153
<string name="action_create">"Create"</string>
5254
<string name="action_create_a_room">"Create a room"</string>
5355
<string name="action_deactivate">"Deactivate"</string>

0 commit comments

Comments
 (0)