From 2d9961d5c0e27332ab87a37e7e263645e490f51c Mon Sep 17 00:00:00 2001 From: Al Lansley Date: Mon, 29 Jul 2024 08:58:01 +1000 Subject: [PATCH] Further cleanup of stragglers --- .../disappearingmessages/State.kt | 2 +- .../disappearingmessages/ui/Adapter.kt | 2 +- .../v2/ConversationReactionOverlay.kt | 4 +- .../res/layout-sw400dp/activity_register.xml | 83 ------------------ app/src/main/res/layout/activity_register.xml | 85 ------------------- .../menu/menu_conversation_item_action.xml | 4 +- .../DisappearingMessagesViewModelTest.kt | 18 ++-- .../src/main/res/values-ar-rSA/strings.xml | 4 - libsession/src/main/res/values-ar/strings.xml | 4 - .../src/main/res/values-az-rAZ/strings.xml | 4 - libsession/src/main/res/values-az/strings.xml | 4 - .../src/main/res/values-bal-rBA/strings.xml | 3 - .../src/main/res/values-bal/strings.xml | 3 - .../src/main/res/values-bg-rBG/strings.xml | 1 - libsession/src/main/res/values-bg/strings.xml | 1 - .../src/main/res/values-ca-rES/strings.xml | 4 - libsession/src/main/res/values-ca/strings.xml | 4 - .../src/main/res/values-cs-rCZ/strings.xml | 4 - libsession/src/main/res/values-cs/strings.xml | 4 - .../src/main/res/values-cy-rGB/strings.xml | 1 - libsession/src/main/res/values-cy/strings.xml | 1 - .../src/main/res/values-da-rDK/strings.xml | 4 - libsession/src/main/res/values-da/strings.xml | 4 - .../src/main/res/values-de-rDE/strings.xml | 4 - libsession/src/main/res/values-de/strings.xml | 4 - .../src/main/res/values-el-rGR/strings.xml | 4 - libsession/src/main/res/values-el/strings.xml | 4 - .../src/main/res/values-eo-rUY/strings.xml | 3 - libsession/src/main/res/values-eo/strings.xml | 3 - .../src/main/res/values-es-rES/strings.xml | 4 - libsession/src/main/res/values-es/strings.xml | 4 - .../src/main/res/values-et-rEE/strings.xml | 1 - libsession/src/main/res/values-et/strings.xml | 1 - .../src/main/res/values-fa-rIR/strings.xml | 4 - libsession/src/main/res/values-fa/strings.xml | 4 - .../src/main/res/values-fi-rFI/strings.xml | 4 - libsession/src/main/res/values-fi/strings.xml | 4 - .../src/main/res/values-fr-rFR/strings.xml | 4 - libsession/src/main/res/values-fr/strings.xml | 4 - .../src/main/res/values-gl-rES/strings.xml | 1 - libsession/src/main/res/values-gl/strings.xml | 1 - .../src/main/res/values-ha-rHG/strings.xml | 1 - libsession/src/main/res/values-ha/strings.xml | 1 - .../src/main/res/values-hi-rIN/strings.xml | 4 - libsession/src/main/res/values-hi/strings.xml | 4 - .../src/main/res/values-hu-rHU/strings.xml | 4 - libsession/src/main/res/values-hu/strings.xml | 4 - .../src/main/res/values-hy-rAM/strings.xml | 4 - libsession/src/main/res/values-hy/strings.xml | 4 - .../src/main/res/values-in-rID/strings.xml | 2 - libsession/src/main/res/values-in/strings.xml | 2 - .../src/main/res/values-it-rIT/strings.xml | 4 - libsession/src/main/res/values-it/strings.xml | 4 - .../src/main/res/values-iw-rIL/strings.xml | 1 - libsession/src/main/res/values-iw/strings.xml | 1 - .../src/main/res/values-ja-rJP/strings.xml | 3 - libsession/src/main/res/values-ja/strings.xml | 3 - .../src/main/res/values-km-rKH/strings.xml | 1 - libsession/src/main/res/values-km/strings.xml | 1 - .../src/main/res/values-ko-rKR/strings.xml | 1 - libsession/src/main/res/values-ko/strings.xml | 1 - .../src/main/res/values-lt-rLT/strings.xml | 3 - libsession/src/main/res/values-lt/strings.xml | 3 - .../src/main/res/values-mk-rMK/strings.xml | 1 - libsession/src/main/res/values-mk/strings.xml | 1 - .../src/main/res/values-nb-rNO/strings.xml | 4 - libsession/src/main/res/values-nb/strings.xml | 4 - .../src/main/res/values-nl-rNL/strings.xml | 4 - libsession/src/main/res/values-nl/strings.xml | 4 - .../src/main/res/values-nn-rNO/strings.xml | 1 - libsession/src/main/res/values-nn/strings.xml | 1 - .../src/main/res/values-ny-rMW/strings.xml | 1 - libsession/src/main/res/values-ny/strings.xml | 1 - .../src/main/res/values-pl-rPL/strings.xml | 4 - libsession/src/main/res/values-pl/strings.xml | 4 - .../src/main/res/values-pt-rBR/strings.xml | 4 - .../src/main/res/values-pt-rPT/strings.xml | 3 - libsession/src/main/res/values-pt/strings.xml | 4 - .../src/main/res/values-ro-rRO/strings.xml | 1 - libsession/src/main/res/values-ro/strings.xml | 1 - .../src/main/res/values-ru-rRU/strings.xml | 4 - libsession/src/main/res/values-ru/strings.xml | 4 - .../src/main/res/values-sk-rSK/strings.xml | 3 - libsession/src/main/res/values-sk/strings.xml | 3 - .../src/main/res/values-sq-rAL/strings.xml | 1 - libsession/src/main/res/values-sq/strings.xml | 1 - .../src/main/res/values-sr-rSP/strings.xml | 2 - libsession/src/main/res/values-sr/strings.xml | 2 - .../src/main/res/values-sv-rSE/strings.xml | 4 - libsession/src/main/res/values-sv/strings.xml | 4 - .../src/main/res/values-sw-rKE/strings.xml | 1 - .../src/main/res/values-te-rIN/strings.xml | 1 - libsession/src/main/res/values-te/strings.xml | 1 - .../src/main/res/values-th-rTH/strings.xml | 1 - libsession/src/main/res/values-th/strings.xml | 1 - .../src/main/res/values-tr-rTR/strings.xml | 4 - libsession/src/main/res/values-tr/strings.xml | 4 - .../src/main/res/values-uk-rUA/strings.xml | 4 - libsession/src/main/res/values-uk/strings.xml | 4 - .../src/main/res/values-vi-rVN/strings.xml | 3 - libsession/src/main/res/values-vi/strings.xml | 3 - .../src/main/res/values-xh-rZA/strings.xml | 1 - libsession/src/main/res/values-xh/strings.xml | 1 - .../src/main/res/values-zh-rCN/strings.xml | 4 - .../src/main/res/values-zh-rTW/strings.xml | 4 - libsession/src/main/res/values-zh/strings.xml | 4 - libsession/src/main/res/values/strings.xml | 15 +--- 107 files changed, 18 insertions(+), 471 deletions(-) delete mode 100644 app/src/main/res/layout-sw400dp/activity_register.xml delete mode 100644 app/src/main/res/layout/activity_register.xml diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/State.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/State.kt index 3a18066974..0fe44b02ed 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/State.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/State.kt @@ -24,7 +24,7 @@ data class State( val showDebugOptions: Boolean = false ) { val subtitle get() = when { - isGroup || isNoteToSelf -> GetString(R.string.activity_disappearing_messages_subtitle_sent) + isGroup || isNoteToSelf -> GetString(R.string.disappearingMessagesDisappearAfterSendDescription) else -> GetString(R.string.activity_disappearing_messages_subtitle) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/ui/Adapter.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/ui/Adapter.kt index c421e14efa..dbd40354a2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/ui/Adapter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/disappearingmessages/ui/Adapter.kt @@ -14,7 +14,7 @@ import kotlin.time.Duration.Companion.seconds fun State.toUiState() = UiState( cards = listOfNotNull( typeOptions()?.let { ExpiryOptionsCardData(GetString(R.string.disappearingMessagesDeleteType), it) }, - timeOptions()?.let { ExpiryOptionsCardData(GetString(R.string.activity_disappearing_messages_timer), it) } + timeOptions()?.let { ExpiryOptionsCardData(GetString(R.string.disappearingMessagesTimer), it) } ), showGroupFooter = isGroup && isNewConfigEnabled, showSetButton = isSelfAdmin diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt index 734e7cdf15..041d322567 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationReactionOverlay.kt @@ -562,11 +562,11 @@ class ConversationReactionOverlay : FrameLayout { } // Resync if (message.isSyncFailed) { - items += ActionItem(R.attr.menu_reply_icon, R.string.conversation_context__menu_resync_message, { handleActionItemClicked(Action.RESYNC) }) + items += ActionItem(R.attr.menu_reply_icon, R.string.resync, { handleActionItemClicked(Action.RESYNC) }) } // Save media if (message.isMms && (message as MediaMmsMessageRecord).containsMediaSlide()) { - items += ActionItem(R.attr.menu_save_icon, R.string.conversation_context_image__save_attachment, { handleActionItemClicked(Action.DOWNLOAD) }, R.string.AccessibilityId_save_attachment) + items += ActionItem(R.attr.menu_save_icon, R.string.save, { handleActionItemClicked(Action.DOWNLOAD) }, R.string.AccessibilityId_save_attachment) } backgroundView.visibility = VISIBLE foregroundView.visibility = VISIBLE diff --git a/app/src/main/res/layout-sw400dp/activity_register.xml b/app/src/main/res/layout-sw400dp/activity_register.xml deleted file mode 100644 index 124a14f667..0000000000 --- a/app/src/main/res/layout-sw400dp/activity_register.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - -