TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-05 09:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
alansley
2024-07-26 16:30:28 +10:00
parent 3cee4bc12f
commit 4bc9d09be2
113 changed files with 7 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
View File

@@ -318,7 +318,7 @@ fun PreviewMessageDetails(
MessageDetails(
state = MessageDetailsState(
nonImageAttachmentFileDetails = listOf(
TitledText(R.string.message_details_header__file_id, "Screen Shot 2023-07-06 at 11.35.50 am.png"),
TitledText(R.string.attachmentsFileId, "Screen Shot 2023-07-06 at 11.35.50 am.png"),
TitledText(R.string.attachmentsFileType, "image/png"),
TitledText(R.string.attachmentsFileSize, "195.6kB"),
TitledText(R.string.attachmentsResolution, "342x312"),

2
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailsViewModel.kt
View File

@@ -90,7 +90,7 @@ class MessageDetailsViewModel @Inject constructor(
private val Slide.details: List<TitledText>
get() = listOfNotNull(
fileName.orNull()?.let { TitledText(R.string.message_details_header__file_id, it) },
fileName.orNull()?.let { TitledText(R.string.attachmentsFileId, it) },
TitledText(R.string.attachmentsFileType, asAttachment().contentType),
TitledText(R.string.attachmentsFileSize, Util.getPrettyFileSize(fileSize)),
takeIf { it is ImageSlide }

2
app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.kt
View File

@@ -149,10 +149,8 @@ object DateUtils : android.text.format.DateUtils() {
): String {
return if (isToday(timestamp)) {
getLocalisedRelativeDayString(RelativeDay.TODAY)
//context.getString(R.string.DateUtils_today) // ACL REMOVE WHEN HAPPY
} else if (isYesterday(timestamp)) {
getLocalisedRelativeDayString(RelativeDay.YESTERDAY)
//context.getString(R.string.DateUtils_yesterday) // ACL REMOVE WHEN HAPPY
} else {
getFormattedDateTime(timestamp, "EEE, MMM d, yyyy", locale)
}

2
app/src/main/res/menu/menu_apply.xml
View File

@@ -4,7 +4,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:title="@string/menu_apply_button"
android:title="@string/set"
android:id="@+id/applyButton"
android:icon="?menu_accept_icon"
app:showAsAction="always|withText"/>

2
app/src/main/res/menu/menu_edit_closed_group.xml
View File

@@ -5,7 +5,7 @@
<item
android:id="@+id/action_apply"
android:title="@string/menu_apply_button"
android:title="@string/set"
android:contentDescription="@string/AccessibilityId_apply_changes"
app:showAsAction="always|withText" />