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

Fix talkback saying meters instead of minutes.

Browse Source
This commit is contained in:
Michelle Tang
2025-12-17 13:20:36 -05:00
committed by jeffrey-signal
parent 942c155723
commit 282a707bf9
20 changed files with 106 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

1
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
View File

@@ -95,6 +95,7 @@ public class ConversationTitleView extends ConstraintLayout {
isSelf = recipient.isSelf();
expirationBadgeTime.setText(ExpirationUtil.getExpirationAbbreviatedDisplayValue(getContext(), recipient.getExpiresInSeconds()));
expirationBadgeTime.setContentDescription(ExpirationUtil.getExpirationDisplayValue(getContext(), recipient.getExpiresInSeconds()));
expirationBadgeContainer.setVisibility(View.VISIBLE);
updateSubtitleVisibility();
}

2
app/src/main/java/org/thoughtcrime/securesms/conversation/colors/ui/ChatColorPreviewView.kt
View File

@@ -87,7 +87,7 @@ class ChatColorPreviewView @JvmOverloads constructor(
findViewById(R.id.bubble_4_delivery)
)
val now: String = DateUtils.getExtendedRelativeTimeSpanString(context, Locale.getDefault(), System.currentTimeMillis())
val (now, _) = DateUtils.getExtendedRelativeTimeSpanString(context, Locale.getDefault(), System.currentTimeMillis())
listOf(sent1, sent2, recv1, recv2).forEach {
it.time.text = now
it.delivery?.setRead()

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

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

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

@@ -709,13 +709,17 @@ open class V2ConversationItemTextOnlyViewHolder<Model : MappingModel<Model>>(
binding.footerDate.text = conversationMessage.computedProperties.formattedDate.value
} else {
var dateLabel = conversationMessage.computedProperties.formattedDate.value
var dateLabelContentDesc = conversationMessage.computedProperties.formattedDate.contentDescValue
if (conversationContext.displayMode != ConversationItemDisplayMode.Detailed && record is MmsMessageRecord && record.isEditMessage) {
dateLabel = if (conversationMessage.computedProperties.formattedDate.isNow) {
getContext().getString(R.string.ConversationItem_edited_now_timestamp_footer)
if (conversationMessage.computedProperties.formattedDate.isNow) {
dateLabel = getContext().getString(R.string.ConversationItem_edited_now_timestamp_footer)
dateLabelContentDesc = dateLabel
} else if (conversationMessage.computedProperties.formattedDate.isRelative) {
getContext().getString(R.string.ConversationItem_edited_relative_timestamp_footer, dateLabel)
dateLabel = getContext().getString(R.string.ConversationItem_edited_relative_timestamp_footer, dateLabel)
dateLabelContentDesc = getContext().getString(R.string.ConversationItem_edited_relative_timestamp_footer, dateLabelContentDesc)
} else {
getContext().getString(R.string.ConversationItem_edited_absolute_timestamp_footer, dateLabel)
dateLabelContentDesc = dateLabel
}
binding.footerDate.setOnClickListener {
@@ -728,6 +732,7 @@ open class V2ConversationItemTextOnlyViewHolder<Model : MappingModel<Model>>(
}
binding.footerDate.text = dateLabel
binding.footerDate.contentDescription = dateLabelContentDesc
}
}