From 06212453b2f46c7f88286b9c732904c5f1ae3812 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 16 May 2019 11:12:48 -0300
Subject: [PATCH 1/2] [android] Adapt private group join notices to new
 threaded layout

---
 .../layout/list_item_group_join_notice.xml    | 33 +++++++++----------
 .../src/main/res/layout/list_item_thread.xml  |  4 +--
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/briar-android/src/main/res/layout/list_item_group_join_notice.xml b/briar-android/src/main/res/layout/list_item_group_join_notice.xml
index fbc75385e..c9eba2f0c 100644
--- a/briar-android/src/main/res/layout/list_item_group_join_notice.xml
+++ b/briar-android/src/main/res/layout/list_item_group_join_notice.xml
@@ -8,17 +8,11 @@
 	android:layout_height="wrap_content"
 	android:background="@drawable/list_item_thread_background">
 
-	<com.vanniktech.emoji.EmojiTextView
-		android:id="@+id/text"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_margin="@dimen/margin_medium"
-		android:textColor="?android:attr/textColorSecondary"
-		android:textSize="@dimen/text_size_medium"
-		android:textStyle="italic"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent"
-		tools:text="@string/groups_member_joined"/>
+	<View
+		android:id="@+id/divider"
+		style="@style/Divider.ThreadItem"
+		app:layout_constraintLeft_toLeftOf="parent"
+		app:layout_constraintTop_toTopOf="parent"/>
 
 	<org.briarproject.briar.android.view.AuthorView
 		android:id="@+id/author"
@@ -27,14 +21,19 @@
 		android:layout_margin="@dimen/margin_medium"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/text"
+		app:layout_constraintTop_toBottomOf="@+id/divider"
 		app:persona="commenter"/>
 
-	<View
-		android:id="@+id/divider"
-		style="@style/Divider.ThreadItem"
-		android:layout_marginTop="@dimen/margin_medium"
+	<com.vanniktech.emoji.EmojiTextView
+		android:id="@+id/text"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:padding="@dimen/margin_medium"
+		android:textColor="?android:attr/textColorSecondary"
+		android:textSize="@dimen/text_size_medium"
+		android:textStyle="italic"
 		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toBottomOf="@+id/author"/>
+		app:layout_constraintTop_toBottomOf="@id/author"
+		tools:text="@string/groups_member_joined"/>
 
 </android.support.constraint.ConstraintLayout>
diff --git a/briar-android/src/main/res/layout/list_item_thread.xml b/briar-android/src/main/res/layout/list_item_thread.xml
index beca4fa1a..97cd6d3e6 100644
--- a/briar-android/src/main/res/layout/list_item_thread.xml
+++ b/briar-android/src/main/res/layout/list_item_thread.xml
@@ -89,7 +89,7 @@
 			app:layout_constraintBottom_toBottomOf="@+id/text"
 			app:layout_constraintEnd_toStartOf="@+id/btn_reply"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent"
+			app:layout_constraintTop_toBottomOf="@+id/divider"
 			app:layout_constraintVertical_bias="0.0"
 			app:persona="commenter"/>
 
@@ -105,7 +105,7 @@
 			android:text="@string/btn_reply"
 			android:textSize="@dimen/text_size_tiny"
 			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintTop_toTopOf="@+id/divider"/>
+			app:layout_constraintTop_toBottomOf="@+id/divider"/>
 
 		<com.vanniktech.emoji.EmojiTextView
 			android:id="@+id/text"

From 90437f4fa44f989476d3ec37d2b77c8350afbc14 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 16 May 2019 11:35:20 -0300
Subject: [PATCH 2/2] [android] use same color for thread dividers than
 indentation dividers

---
 briar-android/src/main/res/values/styles.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/briar-android/src/main/res/values/styles.xml b/briar-android/src/main/res/values/styles.xml
index 14e04ad4b..6599a44ef 100644
--- a/briar-android/src/main/res/values/styles.xml
+++ b/briar-android/src/main/res/values/styles.xml
@@ -82,6 +82,7 @@
 	<style name="Divider.ThreadItem" parent="Divider">
 		<item name="android:layout_width">match_parent</item>
 		<item name="android:layout_height">@dimen/forum_nested_line_width</item>
+		<item name="android:background">@color/thread_indicator</item>
 	</style>
 
 	<style name="BriarAvatar">