From fd544b2c2827f924de0c6e7e02f487b0b3ed02bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Fri, 8 Jan 2021 10:25:33 +0100
Subject: [PATCH] Remove intro text; extend learn more button text

---
 .../main/res/layout/fragment_conversation_settings.xml | 10 +---------
 briar-android/src/main/res/values/strings.xml          |  3 +--
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/briar-android/src/main/res/layout/fragment_conversation_settings.xml b/briar-android/src/main/res/layout/fragment_conversation_settings.xml
index d9bbbf12d..7d24f6e9f 100644
--- a/briar-android/src/main/res/layout/fragment_conversation_settings.xml
+++ b/briar-android/src/main/res/layout/fragment_conversation_settings.xml
@@ -20,14 +20,6 @@
 			app:layout_constraintTop_toTopOf="parent"
 			app:tint="?attr/colorControlNormal" />
 
-		<TextView
-			android:id="@+id/textViewExplanation"
-			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:text="@string/disappearing_messages_explanation_short"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/imageViewBomb" />
 
 		<TextView
 			android:id="@+id/buttonLearnMore"
@@ -39,7 +31,7 @@
 			android:text="@string/learn_more"
 			android:textColor="?android:attr/textColorLink"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toBottomOf="@+id/textViewExplanation" />
+			app:layout_constraintTop_toBottomOf="@+id/imageViewBomb" />
 
 		<View
 			android:id="@+id/divider"
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index d869c75bb..2cf0b85b3 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -549,7 +549,6 @@
 	<!-- Conversation Settings -->
 	<string name="disappearing_messages_title">Disappearing messages</string>
 	<string name="disappearing_messages_cat_title">Self-destructing messages</string>
-	<string name="disappearing_messages_explanation_short">You can configure disappearing messages here.</string>
 	<string name="disappearing_messages_explanation_long">You can configure disappearing messages here.
 		Messages that will disappear are marked with a bomb icon.
 		\n\nTurning on this setting will make new messages in this conversation automatically disappear 7 days after being received.
@@ -558,7 +557,7 @@
 		\n\nKeep in mind that recipients can still make analogue copies of the messages you sent.
 		\n\nIf you change this setting, it will apply to your messages immediately and to messages of
 		your contact once they receive any message from you after changing the setting.</string>
-	<string name="learn_more">Learn more</string>
+	<string name="learn_more">Learn more about disappearing messages</string>
 	<string name="disappearing_messages_summary">Make future messages in this conversation automatically disappear 7\u00A0days after being received.</string>
 
 	<!-- Settings Feedback -->