Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 01:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unique string resource for "edited now".

Browse Source
This commit is contained in:
Nicholas
2023-11-28 09:36:53 -05:00
committed by Cody Henthorne
parent 67ef831681
commit 64457b0235
6 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationMessage.java
View File

@@ -161,7 +161,7 @@ public class ConversationMessage {
}
public static @NonNull FormattedDate getFormattedDate(@NonNull Context context, @NonNull MessageRecord messageRecord) {
return MessageRecordUtil.isScheduled(messageRecord) ? new FormattedDate(false, DateUtils.getOnlyTimeString(context, ((MmsMessageRecord) messageRecord).getScheduledDate()))
return MessageRecordUtil.isScheduled(messageRecord) ? new FormattedDate(false, false, DateUtils.getOnlyTimeString(context, ((MmsMessageRecord) messageRecord).getScheduledDate()))
: DateUtils.getDatelessRelativeTimeSpanFormattedDate(context, Locale.getDefault(), messageRecord.getTimestamp());
}

1
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/computed/FormattedDate.kt
View File

@@ -7,5 +7,6 @@ package org.thoughtcrime.securesms.conversation.v2.computed
data class FormattedDate(
val isRelative: Boolean,
val isNow: Boolean,
val value: String
)

6
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt
View File

@@ -643,7 +643,11 @@ open class V2ConversationItemTextOnlyViewHolder<Model : MappingModel<Model>>(
} else {
var date = dateString
if (conversationContext.displayMode != ConversationItemDisplayMode.Detailed && record is MmsMessageRecord && record.isEditMessage()) {
date = getContext().getString(R.string.ConversationItem_edited_timestamp_footer, date)
date = if (conversationMessage.computedProperties.formattedDate.isNow) {
getContext().getString(R.string.ConversationItem_edited_now_timestamp_footer)
} else {
getContext().getString(R.string.ConversationItem_edited_timestamp_footer, date)
}
binding.footerDate.setOnClickListener {
conversationContext.clickListener.onEditedIndicatorClicked(record)