From 6557d564c98ec267f23f8488ca0050e570b6d5cb Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 11 Sep 2018 18:09:45 -0300
Subject: [PATCH] Add RTL support to remaining layouts

---
 .../briar/android/test/TestDataActivity.java  |  4 +-
 .../briar/android/view/QrCodeView.java        |  3 +-
 .../briar/android/view/TextAvatarView.java    | 10 -----
 .../android/view/UnreadMessageButton.java     | 10 ++---
 .../res/drawable/social_send_now_white.xml    |  1 +
 .../layout-land/fragment_keyagreement_id.xml  |  7 ++--
 .../src/main/res/layout/navigation_header.xml |  5 ++-
 .../src/main/res/layout/power_view.xml        | 12 +++---
 .../main/res/layout/preferences_category.xml  |  2 +-
 .../src/main/res/layout/qr_code_view.xml      | 38 ++++++++-----------
 briar-android/src/main/res/layout/splash.xml  |  4 +-
 .../src/main/res/layout/text_avatar_view.xml  | 10 +++--
 .../src/main/res/layout/text_input_view.xml   |  6 ++-
 .../main/res/layout/text_input_view_large.xml | 10 ++---
 briar-android/src/main/res/layout/toolbar.xml |  4 +-
 .../main/res/layout/unread_message_button.xml |  3 +-
 16 files changed, 59 insertions(+), 70 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/test/TestDataActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/test/TestDataActivity.java
index fad48f249..cdde71aa6 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/test/TestDataActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/test/TestDataActivity.java
@@ -65,7 +65,7 @@ public class TestDataActivity extends BriarActivity {
 					@Override
 					public void onProgressChanged(SeekBar seekBar,
 							int progress, boolean fromUser) {
-						contactsTextView.setText(String.valueOf(progress + 1));
+						contactsTextView.setText(String.valueOf(progress));
 					}
 
 					@Override
@@ -151,7 +151,7 @@ public class TestDataActivity extends BriarActivity {
 	}
 
 	private void createTestData() {
-		testDataCreator.createTestData(contactsSeekBar.getProgress() + 1,
+		testDataCreator.createTestData(contactsSeekBar.getProgress(),
 				messagesSeekBar.getProgress(), blogPostsSeekBar.getProgress(),
 				forumsSeekBar.getProgress(), forumPostsSeekBar.getProgress());
 		Intent intent = new Intent(this, NavDrawerActivity.class);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/QrCodeView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/QrCodeView.java
index 32b695622..37a9f206a 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/QrCodeView.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/QrCodeView.java
@@ -19,8 +19,7 @@ public class QrCodeView extends FrameLayout {
     private boolean fullscreen = false;
     private FullscreenListener listener;
 
-    public QrCodeView(@NonNull Context context,
-                      @Nullable AttributeSet attrs) {
+    public QrCodeView(@NonNull Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
         LayoutInflater inflater = (LayoutInflater) context
                 .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAvatarView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAvatarView.java
index b06ba5419..979844796 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAvatarView.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAvatarView.java
@@ -3,7 +3,6 @@ package org.briarproject.briar.android.view;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
 import android.support.annotation.UiThread;
 import android.support.v7.widget.AppCompatTextView;
 import android.util.AttributeSet;
@@ -11,13 +10,11 @@ import android.view.LayoutInflater;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import org.briarproject.bramble.api.identity.Author;
 import org.briarproject.briar.R;
 
 import javax.annotation.Nullable;
 
 import de.hdodenhof.circleimageview.CircleImageView;
-import im.delight.android.identicons.IdenticonDrawable;
 
 @UiThread
 public class TextAvatarView extends FrameLayout {
@@ -35,7 +32,6 @@ public class TextAvatarView extends FrameLayout {
 		character = findViewById(R.id.textAvatarView);
 		background = findViewById(R.id.avatarBackground);
 		badge = findViewById(R.id.unreadCountView);
-		badge.setVisibility(INVISIBLE);
 	}
 
 	public TextAvatarView(Context context) {
@@ -72,10 +68,4 @@ public class TextAvatarView extends FrameLayout {
 		}
 	}
 
-	public void setAuthorAvatar(Author author) {
-		Drawable drawable = new IdenticonDrawable(author.getId().getBytes());
-		background.setImageDrawable(drawable);
-		character.setVisibility(GONE);
-	}
-
 }
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/UnreadMessageButton.java b/briar-android/src/main/java/org/briarproject/briar/android/view/UnreadMessageButton.java
index ae19023dd..c2a59639b 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/UnreadMessageButton.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/UnreadMessageButton.java
@@ -49,7 +49,7 @@ public class UnreadMessageButton extends FrameLayout {
 		setDirection(direction);
 		attributes.recycle();
 
-		setUnreadCount(0);
+		if (!isInEditMode()) setUnreadCount(0);
 	}
 
 	private void setDirection(int direction) {
@@ -64,11 +64,11 @@ public class UnreadMessageButton extends FrameLayout {
 
 	public void setUnreadCount(int count) {
 		if (count == 0) {
-			setVisibility(INVISIBLE);
+			fab.hide();
+			unread.setVisibility(INVISIBLE);
 		} else {
-			// FIXME: Use animations when upgrading to support library 24.2.0
-			//        https://code.google.com/p/android/issues/detail?id=216469
-			setVisibility(VISIBLE);
+			fab.show();
+			unread.setVisibility(VISIBLE);
 			unread.setText(String.valueOf(count));
 		}
 	}
diff --git a/briar-android/src/main/res/drawable/social_send_now_white.xml b/briar-android/src/main/res/drawable/social_send_now_white.xml
index 43662f48b..57bd86462 100644
--- a/briar-android/src/main/res/drawable/social_send_now_white.xml
+++ b/briar-android/src/main/res/drawable/social_send_now_white.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
+        android:autoMirrored="true"
         android:viewportHeight="24.0"
         android:viewportWidth="24.0">
 	<path
diff --git a/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml b/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml
index f25b2c554..b7c0714ca 100644
--- a/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml
+++ b/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml
@@ -26,7 +26,8 @@
 			app:layout_constraintBottom_toBottomOf="@id/explanationText"
 			app:layout_constraintEnd_toStartOf="@id/explanationText"
 			app:layout_constraintStart_toStartOf="parent"
-			app:layout_constraintTop_toTopOf="parent"/>
+			app:layout_constraintTop_toTopOf="parent"
+			tools:ignore="ContentDescription"/>
 
 		<ImageView
 			android:id="@+id/explanationImage"
@@ -34,8 +35,8 @@
 			android:layout_height="wrap_content"
 			android:layout_weight="1"
 			android:adjustViewBounds="true"
-			android:paddingLeft="@dimen/margin_large"
-			android:paddingRight="@dimen/margin_large"
+			android:paddingEnd="@dimen/margin_large"
+			android:paddingStart="@dimen/margin_large"
 			android:paddingTop="@dimen/margin_large"
 			android:scaleType="fitCenter"
 			android:src="@drawable/qr_code_explanation"
diff --git a/briar-android/src/main/res/layout/navigation_header.xml b/briar-android/src/main/res/layout/navigation_header.xml
index a54b9b6a0..475224df9 100644
--- a/briar-android/src/main/res/layout/navigation_header.xml
+++ b/briar-android/src/main/res/layout/navigation_header.xml
@@ -10,9 +10,10 @@
 	<ImageView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_gravity="bottom"
+		android:layout_gravity="bottom|start"
 		android:layout_marginBottom="@dimen/margin_medium"
-		android:layout_marginLeft="@dimen/margin_medium"
+		android:layout_marginEnd="@dimen/margin_medium"
+		android:layout_marginStart="@dimen/margin_medium"
 		android:contentDescription="@string/app_name"
 		android:src="@drawable/navigation_drawer_header"/>
 
diff --git a/briar-android/src/main/res/layout/power_view.xml b/briar-android/src/main/res/layout/power_view.xml
index 2a288c217..10e461f49 100644
--- a/briar-android/src/main/res/layout/power_view.xml
+++ b/briar-android/src/main/res/layout/power_view.xml
@@ -11,9 +11,9 @@
 		android:id="@+id/textView"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_marginTop="8dp"
-		android:paddingLeft="@dimen/margin_large"
-		android:paddingRight="@dimen/margin_large"
+		android:layout_marginEnd="@dimen/margin_large"
+		android:layout_marginStart="@dimen/margin_large"
+		android:layout_marginTop="@dimen/margin_medium"
 		android:textSize="@dimen/text_size_medium"
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintStart_toStartOf="parent"
@@ -24,7 +24,7 @@
 		android:id="@+id/checkImage"
 		android:layout_width="24dp"
 		android:layout_height="24dp"
-		android:layout_margin="8dp"
+		android:layout_margin="@dimen/margin_medium"
 		android:src="@drawable/ic_check_white"
 		android:visibility="invisible"
 		app:layout_constraintBottom_toBottomOf="@+id/button"
@@ -38,7 +38,7 @@
 		style="@style/BriarButton"
 		android:layout_width="0dp"
 		android:layout_height="wrap_content"
-		android:layout_margin="8dp"
+		android:layout_margin="@dimen/margin_medium"
 		app:layout_constraintEnd_toStartOf="@+id/helpButton"
 		app:layout_constraintStart_toEndOf="@+id/checkImage"
 		app:layout_constraintTop_toBottomOf="@+id/textView"
@@ -49,7 +49,7 @@
 		style="@style/BriarButtonFlat.Positive"
 		android:layout_width="24dp"
 		android:layout_height="24dp"
-		android:layout_margin="8dp"
+		android:layout_margin="@dimen/margin_medium"
 		android:contentDescription="@string/help"
 		android:src="@drawable/ic_help_outline_white"
 		android:tint="@color/briar_button_text_positive"
diff --git a/briar-android/src/main/res/layout/preferences_category.xml b/briar-android/src/main/res/layout/preferences_category.xml
index c323d8dca..853d70872 100644
--- a/briar-android/src/main/res/layout/preferences_category.xml
+++ b/briar-android/src/main/res/layout/preferences_category.xml
@@ -10,4 +10,4 @@
 	android:textColor="@color/briar_accent"
 	android:textSize="14sp"
 	android:textStyle="bold"
-	tools:text="This is a category"/>
\ No newline at end of file
+	tools:text="@string/security_settings_title"/>
\ No newline at end of file
diff --git a/briar-android/src/main/res/layout/qr_code_view.xml b/briar-android/src/main/res/layout/qr_code_view.xml
index 9062428d0..95d2d8189 100644
--- a/briar-android/src/main/res/layout/qr_code_view.xml
+++ b/briar-android/src/main/res/layout/qr_code_view.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
 	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"
 	tools:showIn="@layout/fragment_keyagreement_qr">
 
@@ -11,29 +10,22 @@
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"/>
 
-	<android.support.constraint.ConstraintLayout
+	<ImageView
+		android:id="@+id/qr_code"
 		android:layout_width="match_parent"
-		android:layout_height="match_parent">
+		android:layout_height="match_parent"
+		android:contentDescription="@string/qr_code"
+		android:scaleType="fitCenter"/>
 
-		<ImageView
-			android:id="@+id/qr_code"
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:contentDescription="@string/qr_code"
-			android:scaleType="fitCenter"/>
+	<ImageView
+		android:id="@+id/fullscreen_button"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="bottom|end|right"
+		android:layout_margin="@dimen/margin_small"
+		android:alpha="0.54"
+		android:background="?attr/selectableItemBackground"
+		android:contentDescription="@string/show_qr_code_fullscreen"
+		android:src="@drawable/ic_fullscreen_black_48dp"/>
 
-		<ImageView
-			android:id="@+id/fullscreen_button"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_margin="@dimen/margin_small"
-			android:alpha="0.54"
-			android:background="?selectableItemBackground"
-			android:contentDescription="@string/show_qr_code_fullscreen"
-			android:src="@drawable/ic_fullscreen_black_48dp"
-			app:layout_constraintBottom_toBottomOf="parent"
-			app:layout_constraintEnd_toEndOf="parent"
-			app:layout_constraintRight_toRightOf="parent"/>
-
-	</android.support.constraint.ConstraintLayout>
 </merge>
diff --git a/briar-android/src/main/res/layout/splash.xml b/briar-android/src/main/res/layout/splash.xml
index bab1dc6fb..9466f9a0e 100644
--- a/briar-android/src/main/res/layout/splash.xml
+++ b/briar-android/src/main/res/layout/splash.xml
@@ -5,11 +5,11 @@
 	android:layout_height="match_parent">
 
 	<ImageView
-		android:src="@drawable/splash_screen"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="center"
 		android:layout_margin="@dimen/margin_xxlarge"
-		android:contentDescription="@string/app_name"/>
+		android:contentDescription="@string/app_name"
+		android:src="@drawable/splash_screen"/>
 
 </FrameLayout>
diff --git a/briar-android/src/main/res/layout/text_avatar_view.xml b/briar-android/src/main/res/layout/text_avatar_view.xml
index 215bc510c..f124dc98c 100644
--- a/briar-android/src/main/res/layout/text_avatar_view.xml
+++ b/briar-android/src/main/res/layout/text_avatar_view.xml
@@ -9,8 +9,8 @@
 		style="@style/BriarAvatar"
 		android:layout_width="@dimen/avatar_forum_size"
 		android:layout_height="@dimen/avatar_forum_size"
-		android:layout_gravity="bottom|left"
-		android:src="@color/briar_button_text_positive"/>
+		android:layout_gravity="bottom|left|start"
+		tools:src="@color/briar_button_text_positive"/>
 
 	<android.support.v7.widget.AppCompatTextView
 		android:id="@+id/textAvatarView"
@@ -32,13 +32,15 @@
 		android:id="@+id/unreadCountView"
 		android:layout_width="wrap_content"
 		android:layout_height="@dimen/unread_bubble_size"
-		android:layout_gravity="right|top"
+		android:layout_gravity="right|end|top"
 		android:background="@drawable/bubble"
 		android:gravity="center"
 		android:minWidth="@dimen/unread_bubble_size"
 		android:textColor="@color/briar_text_primary_inverse"
 		android:textSize="@dimen/unread_bubble_text_size"
 		android:textStyle="bold"
-		tools:text="12"/>
+		android:visibility="invisible"
+		tools:text="12"
+		tools:visibility="visible"/>
 
 </merge>
diff --git a/briar-android/src/main/res/layout/text_input_view.xml b/briar-android/src/main/res/layout/text_input_view.xml
index 5f1ecbb25..d1730c469 100644
--- a/briar-android/src/main/res/layout/text_input_view.xml
+++ b/briar-android/src/main/res/layout/text_input_view.xml
@@ -22,9 +22,9 @@
 			android:layout_height="@dimen/text_input_height"
 			android:layout_gravity="bottom"
 			android:background="?attr/selectableItemBackground"
-			android:src="@drawable/ic_emoji_toggle"
 			android:padding="@dimen/margin_small"
 			android:scaleType="center"
+			android:src="@drawable/ic_emoji_toggle"
 			app:tint="?attr/colorControlNormal"/>
 
 		<com.vanniktech.emoji.EmojiEditText
@@ -37,8 +37,10 @@
 			android:maxLines="4"
 			android:minHeight="@dimen/text_input_height"
 			android:paddingLeft="2dp"
+			android:paddingStart="2dp"
 			android:textColor="?android:attr/textColorPrimary"
-			tools:ignore="RtlSymmetry"/>
+			tools:ignore="RtlSymmetry"
+			tools:text="Line 1\nLine 2\nLine 3"/>
 
 		<android.support.v7.widget.AppCompatImageButton
 			android:id="@+id/btn_send"
diff --git a/briar-android/src/main/res/layout/text_input_view_large.xml b/briar-android/src/main/res/layout/text_input_view_large.xml
index b5ced660d..9f8a8bd99 100644
--- a/briar-android/src/main/res/layout/text_input_view_large.xml
+++ b/briar-android/src/main/res/layout/text_input_view_large.xml
@@ -12,8 +12,6 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginEnd="@dimen/margin_medium"
-		android:layout_marginLeft="@dimen/margin_medium"
-		android:layout_marginRight="@dimen/margin_medium"
 		android:layout_marginStart="@dimen/margin_medium"
 		android:layout_marginTop="@dimen/margin_medium"
 		android:elevation="@dimen/cardview_default_elevation"
@@ -33,9 +31,9 @@
 				android:layout_height="@dimen/text_input_height"
 				android:layout_gravity="bottom"
 				android:background="?attr/selectableItemBackground"
-				android:src="@drawable/ic_emoji_toggle"
 				android:padding="@dimen/margin_small"
 				android:scaleType="center"
+				android:src="@drawable/ic_emoji_toggle"
 				app:tint="?attr/colorControlNormal"/>
 
 			<com.vanniktech.emoji.EmojiEditText
@@ -43,15 +41,15 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:background="@android:color/transparent"
-				android:gravity="bottom"
 				android:inputType="textMultiLine|textLongMessage|textCapSentences|textAutoCorrect"
 				android:minHeight="@dimen/text_input_height"
-				android:paddingBottom="10dp"
+				android:paddingBottom="@dimen/margin_small"
 				android:paddingEnd="@dimen/margin_small"
 				android:paddingRight="@dimen/margin_small"
 				android:paddingTop="@dimen/margin_small"
 				android:textColor="?android:attr/textColorPrimary"
-				tools:ignore="RtlSymmetry"/>
+				tools:ignore="RtlSymmetry"
+				tools:text="Line 1\nLine 2\nLine 3"/>
 
 		</LinearLayout>
 
diff --git a/briar-android/src/main/res/layout/toolbar.xml b/briar-android/src/main/res/layout/toolbar.xml
index 9a17ba10d..e40212f95 100644
--- a/briar-android/src/main/res/layout/toolbar.xml
+++ b/briar-android/src/main/res/layout/toolbar.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.AppBarLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="wrap_content">
+	android:layout_height="wrap_content"
+	tools:context="org.briarproject.briar.android.navdrawer.NavDrawerActivity">
 
 	<android.support.v7.widget.Toolbar
 		android:id="@+id/toolbar"
diff --git a/briar-android/src/main/res/layout/unread_message_button.xml b/briar-android/src/main/res/layout/unread_message_button.xml
index 9c00eca8e..53aa75097 100644
--- a/briar-android/src/main/res/layout/unread_message_button.xml
+++ b/briar-android/src/main/res/layout/unread_message_button.xml
@@ -16,7 +16,8 @@
 		android:id="@+id/unreadCountView"
 		android:layout_width="wrap_content"
 		android:layout_height="@dimen/unread_bubble_size"
-		android:layout_gravity="right|top"
+		android:layout_gravity="right|end|top"
+		android:layout_marginEnd="5dp"
 		android:layout_marginRight="5dp"
 		android:layout_marginTop="10dp"
 		android:background="@drawable/bubble"