From 81292967e08f0648e86063081d2fce8cbeefceff Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 11 Sep 2018 13:37:59 -0300 Subject: [PATCH] Add RTL support to conversation message bubbles --- briar-android/build.gradle | 3 +- .../main/res/drawable/message_delivered.xml | 12 +++-- .../res/drawable/message_delivered_white.xml | 14 +++-- .../src/main/res/drawable/message_sent.xml | 12 +++-- .../main/res/drawable/message_sent_white.xml | 14 +++-- .../src/main/res/drawable/msg_in.xml | 4 +- .../src/main/res/drawable/msg_in_top.xml | 4 +- .../src/main/res/drawable/msg_out.xml | 4 +- .../src/main/res/drawable/msg_out_top.xml | 4 +- .../src/main/res/drawable/notice_in.xml | 4 +- .../src/main/res/drawable/notice_out.xml | 4 +- .../layout/list_item_conversation_msg_in.xml | 18 ++++--- .../layout/list_item_conversation_msg_out.xml | 29 +++++----- .../list_item_conversation_notice_in.xml | 24 ++++----- .../list_item_conversation_notice_out.xml | 28 +++++----- .../layout/list_item_conversation_request.xml | 54 +++++++++---------- .../src/main/res/values-ldrtl/dimens.xml | 5 ++ briar-android/src/main/res/values/dimens.xml | 2 + 18 files changed, 137 insertions(+), 102 deletions(-) create mode 100644 briar-android/src/main/res/values-ldrtl/dimens.xml diff --git a/briar-android/build.gradle b/briar-android/build.gradle index 29d7f9424..1bb45a77c 100644 --- a/briar-android/build.gradle +++ b/briar-android/build.gradle @@ -153,8 +153,9 @@ task verifyTranslations { lc.children().each { value -> translations.add(value.text()) } def folders = ["default", "en-US"] + def exceptions = ["values-night", "values-v21", "values-ldrtl"] project.file("src/main/res").eachDir { dir -> - if (dir.name.startsWith("values-") && !dir.name.endsWith("night") && !dir.name.endsWith("v21")) { + if (dir.name.startsWith("values-") && !exceptions.contains(dir.name)) { folders.add(dir.name.substring(7).replace("-r", "-")) } } diff --git a/briar-android/src/main/res/drawable/message_delivered.xml b/briar-android/src/main/res/drawable/message_delivered.xml index 885356268..c8cbedd5b 100644 --- a/briar-android/src/main/res/drawable/message_delivered.xml +++ b/briar-android/src/main/res/drawable/message_delivered.xml @@ -1,8 +1,10 @@ - + diff --git a/briar-android/src/main/res/drawable/message_delivered_white.xml b/briar-android/src/main/res/drawable/message_delivered_white.xml index 720dab1f7..72ae1f631 100644 --- a/briar-android/src/main/res/drawable/message_delivered_white.xml +++ b/briar-android/src/main/res/drawable/message_delivered_white.xml @@ -1,5 +1,11 @@ - - + + diff --git a/briar-android/src/main/res/drawable/message_sent.xml b/briar-android/src/main/res/drawable/message_sent.xml index a205b178d..b3c045afa 100644 --- a/briar-android/src/main/res/drawable/message_sent.xml +++ b/briar-android/src/main/res/drawable/message_sent.xml @@ -1,8 +1,10 @@ - + diff --git a/briar-android/src/main/res/drawable/message_sent_white.xml b/briar-android/src/main/res/drawable/message_sent_white.xml index 59e6d6d1d..33ec48f0c 100644 --- a/briar-android/src/main/res/drawable/message_sent_white.xml +++ b/briar-android/src/main/res/drawable/message_sent_white.xml @@ -1,5 +1,11 @@ - - + + diff --git a/briar-android/src/main/res/drawable/msg_in.xml b/briar-android/src/main/res/drawable/msg_in.xml index 14b8d7d83..b0a822b8c 100644 --- a/briar-android/src/main/res/drawable/msg_in.xml +++ b/briar-android/src/main/res/drawable/msg_in.xml @@ -5,8 +5,8 @@ + android:topLeftRadius="@dimen/message_bubble_radius_top_inner" + android:topRightRadius="@dimen/message_bubble_radius_top_outer"/> + android:topLeftRadius="@dimen/message_bubble_radius_top_inner" + android:topRightRadius="@dimen/message_bubble_radius_top_outer"/> + android:topLeftRadius="@dimen/message_bubble_radius_top_outer" + android:topRightRadius="@dimen/message_bubble_radius_top_inner"/> + android:topLeftRadius="@dimen/message_bubble_radius_top_outer" + android:topRightRadius="@dimen/message_bubble_radius_top_inner"/> + android:topLeftRadius="@dimen/message_bubble_radius_top_inner" + android:topRightRadius="@dimen/message_bubble_radius_top_outer"/> + android:topLeftRadius="@dimen/message_bubble_radius_top_outer" + android:topRightRadius="@dimen/message_bubble_radius_top_inner"/> - + android:elevation="@dimen/message_bubble_elevation"> - + diff --git a/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml b/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml index ccbc8e854..574bf9385 100644 --- a/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml +++ b/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml @@ -1,19 +1,22 @@ - + + android:layout_height="wrap_content"> - @@ -24,6 +27,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/briar_text_primary_inverse" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" tools:text="This is a long long long message that spans over several lines.\n\nIt ends here."/> - + - \ No newline at end of file + \ No newline at end of file diff --git a/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml b/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml index 25f6a88e9..ae5e40cf0 100644 --- a/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml +++ b/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml @@ -1,9 +1,15 @@ @@ -12,20 +18,14 @@ style="@style/TextMessage" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="left|start" - android:layout_marginLeft="@dimen/message_bubble_margin_tail" - android:layout_marginRight="@dimen/message_bubble_margin_non_tail" android:background="@drawable/msg_in_top" android:elevation="@dimen/message_bubble_elevation" tools:text="Short message"/> - @@ -34,7 +34,8 @@ style="@style/TextMessage.Notice" android:layout_width="match_parent" android:layout_height="wrap_content" - android:minWidth="80dp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" tools:text="@string/forum_invitation_received"/> - + \ No newline at end of file diff --git a/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml b/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml index d686c4f17..2b89b8499 100644 --- a/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml +++ b/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml @@ -5,6 +5,11 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/message_bubble_margin" + android:layout_marginEnd="@dimen/message_bubble_margin_tail" + android:layout_marginLeft="@dimen/message_bubble_margin_non_tail" + android:layout_marginRight="@dimen/message_bubble_margin_tail" + android:layout_marginStart="@dimen/message_bubble_margin_non_tail" android:layout_marginTop="@dimen/message_bubble_margin" android:orientation="vertical"> @@ -13,20 +18,15 @@ style="@style/TextMessage" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/message_bubble_margin_non_tail" - android:layout_marginRight="@dimen/message_bubble_margin_tail" android:background="@drawable/msg_out_top" android:elevation="@dimen/message_bubble_elevation" android:textColor="@color/briar_text_primary_inverse" tools:text="This is a long long long message that spans over several lines.\n\nIt ends here."/> - @@ -36,6 +36,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="@color/private_message_date_inverse" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" tools:text="@string/introduction_request_received"/> - + \ No newline at end of file diff --git a/briar-android/src/main/res/layout/list_item_conversation_request.xml b/briar-android/src/main/res/layout/list_item_conversation_request.xml index 9d2abcc86..72898c5aa 100644 --- a/briar-android/src/main/res/layout/list_item_conversation_request.xml +++ b/briar-android/src/main/res/layout/list_item_conversation_request.xml @@ -1,9 +1,15 @@ @@ -12,20 +18,15 @@ style="@style/TextMessage" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/message_bubble_margin_tail" - android:layout_marginRight="@dimen/message_bubble_margin_non_tail" android:background="@drawable/msg_in_top" android:elevation="@dimen/message_bubble_elevation" android:textColor="?android:attr/textColorPrimary" tools:text="Short message"/> - @@ -34,41 +35,38 @@ style="@style/TextMessage.Notice" android:layout_width="match_parent" android:layout_height="wrap_content" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" tools:text="@string/introduction_request_received"/> - -