From 5122c961b45e22b2731b2cc948ad72601a39f312 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 11 Sep 2018 17:18:55 -0300
Subject: [PATCH] Simplify dev reporter and add RTL support

---
 .../android/reporting/DevReportActivity.java  |  3 +-
 .../main/res/layout/activity_dev_report.xml   |  2 +-
 .../src/main/res/layout/list_item_crash.xml   | 43 ++++++++-----------
 3 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
index f4bb30d2a..9a5329c6b 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java
@@ -292,8 +292,7 @@ public class DevReportActivity extends BaseCrashReportDialog
 						cb.setChecked(required || !excluded);
 						cb.setEnabled(!required);
 						cb.setOnCheckedChangeListener(DevReportActivity.this);
-						TextView title = v.findViewById(R.id.title);
-						title.setText(field.toString());
+						cb.setText(field.toString());
 						TextView content = v.findViewById(R.id.content);
 						content.setText(value);
 						report.addView(v);
diff --git a/briar-android/src/main/res/layout/activity_dev_report.xml b/briar-android/src/main/res/layout/activity_dev_report.xml
index e4c9d130b..e2fa8c120 100644
--- a/briar-android/src/main/res/layout/activity_dev_report.xml
+++ b/briar-android/src/main/res/layout/activity_dev_report.xml
@@ -86,7 +86,7 @@
 
 		<ScrollView
 			android:id="@+id/report_scroll"
-			android:layout_width="wrap_content"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			app:layout_constraintStart_toStartOf="parent"
 			app:layout_constraintTop_toBottomOf="@id/include_debug_report">
diff --git a/briar-android/src/main/res/layout/list_item_crash.xml b/briar-android/src/main/res/layout/list_item_crash.xml
index 63439eddb..b8e954cd9 100644
--- a/briar-android/src/main/res/layout/list_item_crash.xml
+++ b/briar-android/src/main/res/layout/list_item_crash.xml
@@ -1,38 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<android.support.constraint.ConstraintLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:orientation="vertical">
+	android:layout_height="wrap_content">
 
-	<LinearLayout
-		android:layout_width="match_parent"
+	<CheckBox
+		android:id="@+id/include_in_report"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:orientation="horizontal">
-
-		<CheckBox
-			android:id="@+id/include_in_report"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"/>
-
-		<TextView
-			android:id="@+id/title"
-			android:layout_width="wrap_content"
-			android:layout_height="match_parent"
-			android:layout_marginBottom="@dimen/margin_small"
-			android:gravity="bottom"
-			android:textSize="@dimen/text_size_large"
-			android:textColor="?android:attr/textColorPrimary"
-			tools:text="Crash log entry title"/>
-	</LinearLayout>
+		android:textColor="?android:attr/textColorPrimary"
+		android:textSize="@dimen/text_size_large"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:text="Crash log entry title"/>
 
 	<TextView
 		android:id="@+id/content"
-		android:layout_width="wrap_content"
+		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginBottom="@dimen/margin_medium"
+		android:layout_marginTop="4dp"
 		android:textColor="?android:attr/textColorSecondary"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toBottomOf="@+id/include_in_report"
 		tools:text="Crash log entry value"/>
 
-</LinearLayout>
\ No newline at end of file
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file