From b06ef713c239c37533bc61782141aa393f01cd6e Mon Sep 17 00:00:00 2001
From: charles <charles@oxen.io>
Date: Thu, 8 Dec 2022 10:53:47 +1100
Subject: [PATCH] Update outdated client banner message

---
 .../securesms/conversation/v2/ConversationActivityV2.kt     | 3 ++-
 app/src/main/res/layout/activity_conversation_v2.xml        | 6 +++---
 app/src/main/res/values/dimens.xml                          | 1 +
 app/src/main/res/values/strings.xml                         | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 480ab9f5cf..922781594a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -571,7 +571,8 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
     private fun setUpOutdatedClientBanner() {
         val recipient = viewModel.recipient ?: return
         if (recipient.expireMessages == 0) { return }
-        binding?.outdatedBannerTextView?.text = resources.getString(R.string.activity_conversation_outdated_client_banner_text)
+        binding?.outdatedBannerTextView?.text =
+            resources.getString(R.string.activity_conversation_outdated_client_banner_text, recipient.name)
         binding?.outdatedBanner?.isVisible = true
     }
 
diff --git a/app/src/main/res/layout/activity_conversation_v2.xml b/app/src/main/res/layout/activity_conversation_v2.xml
index 5df54c7809..097a8b662e 100644
--- a/app/src/main/res/layout/activity_conversation_v2.xml
+++ b/app/src/main/res/layout/activity_conversation_v2.xml
@@ -212,10 +212,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:layout_margin="@dimen/medium_spacing"
+            android:layout_marginVertical="@dimen/very_small_spacing"
+            android:layout_marginHorizontal="@dimen/medium_spacing"
             android:textColor="@color/black"
-            android:textSize="@dimen/small_font_size"
-            android:textStyle="bold"
+            android:textSize="@dimen/tiny_font_size"
             tools:text="This user's client is outdated, things may not work as expected" />
 
     </RelativeLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index a28637306b..78cf67252c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -2,6 +2,7 @@
 <resources>
 
     <!-- Font Sizes -->
+    <dimen name="tiny_font_size">9sp</dimen>
     <dimen name="very_small_font_size">12sp</dimen>
     <dimen name="small_font_size">15sp</dimen>
     <dimen name="medium_font_size">17sp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3232e0bb7e..9e96207feb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -884,5 +884,5 @@
     <string name="activity_expiration_settings_delete_type">Delete Type</string>
     <string name="activity_expiration_settings_timer">Timer</string>
     <string name="activity_expiration_settings_group_footer"><![CDATA[This setting applies to everyone in this conversation.<br/>Only group admins can change this setting.]]></string>
-    <string name="activity_conversation_outdated_client_banner_text">This user\'s client is outdated.</string>
+    <string name="activity_conversation_outdated_client_banner_text">%s is using an outdated client. Disappearing messages may not work as expected.</string>
 </resources>