Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 21:29:54 +01:00
Code Issues Projects Releases Wiki Activity

Remove intro text; extend learn more button text

Browse Source
This commit is contained in:
Sebastian Kürten
2021-01-08 10:25:33 +01:00
parent f9d6bca64e
commit fd544b2c28
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
briar-android/src/main/res/layout/fragment_conversation_settings.xml
View File

@@ -20,14 +20,6 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:tint="?attr/colorControlNormal" /> 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 <TextView
android:id="@+id/buttonLearnMore" android:id="@+id/buttonLearnMore"
@@ -39,7 +31,7 @@
android:text="@string/learn_more" android:text="@string/learn_more"
android:textColor="?android:attr/textColorLink" android:textColor="?android:attr/textColorLink"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textViewExplanation" /> app:layout_constraintTop_toBottomOf="@+id/imageViewBomb" />
<View <View
android:id="@+id/divider" android:id="@+id/divider"

3
briar-android/src/main/res/values/strings.xml
View File

@@ -549,7 +549,6 @@
<!-- Conversation Settings --> <!-- Conversation Settings -->
<string name="disappearing_messages_title">Disappearing messages</string> <string name="disappearing_messages_title">Disappearing messages</string>
<string name="disappearing_messages_cat_title">Self-destructing 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. <string name="disappearing_messages_explanation_long">You can configure disappearing messages here.
Messages that will disappear are marked with a bomb icon. 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. \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\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 \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> 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> <string name="disappearing_messages_summary">Make future messages in this conversation automatically disappear 7\u00A0days after being received.</string>
<!-- Settings Feedback --> <!-- Settings Feedback -->