Skip to content

Commit a365d53

Browse files
committed
differentiate "pinned by" messages
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
1 parent ba21010 commit a365d53

2 files changed

Lines changed: 18 additions & 5 deletions

File tree

app/src/main/java/com/nextcloud/talk/ui/PinnedMessage.kt

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,23 @@ fun PinnedMessageView(
6969
) {
7070
message.incoming = true
7171

72-
val pinnedBy = stringResource(R.string.pinned_by)
73-
74-
val pinnedHeadline = remember(message.pinnedActorDisplayName) {
75-
"${message.actorDisplayName} ($pinnedBy ${message.pinnedActorDisplayName})"
72+
val pinnedHeadline = if (message.pinnedActorId != message.actorId) {
73+
if (message.pinnedActorId == currentConversation?.actorId) {
74+
stringResource(
75+
R.string.pinned_by_you,
76+
message.actorDisplayName.orEmpty()
77+
)
78+
} else {
79+
stringResource(
80+
R.string.pinned_by_author,
81+
message.actorDisplayName.orEmpty(),
82+
message.pinnedActorDisplayName.orEmpty()
83+
)
84+
}
85+
} else {
86+
"${message.actorDisplayName}"
7687
}
88+
7789
val scrollState = rememberScrollState()
7890

7991
val context = LocalContext.current

app/src/main/res/values/strings.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,8 @@ How to translate with transifex:
914914
<string name="pin_indefinitely">Pin indefinitely</string>
915915
<string name="pinned_indefinitely">Pinned indefinitely</string>
916916
<string name="pinned_until">Pinned until</string>
917-
<string name="pinned_by">pinned by</string>
917+
<string name="pinned_by_you">%1$s (pinned by you)</string>
918+
<string name="pinned_by_author">%1$s (pinned by %2$s)</string>
918919
<string name="pinned">Pinned</string>
919920
<string name="until_unpin">Until unpin</string>
920921
<string name="pinned_go_to_message">Go to message</string>

0 commit comments

Comments
 (0)