From 407134a89f29ed3587f8bb8651c9eabab56eae52 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 5 Feb 2021 19:56:39 +0100
Subject: [PATCH 1/2] RTL: some arrows should be rotated in RTL (#2757)

---
 CHANGES.md                                     |  1 +
 .../main/res/drawable-ldrtl/ic_arrow_right.xml | 16 ++++++++++++++++
 .../src/main/res/drawable/ic_arrow_right.xml   | 18 ++++++++++--------
 3 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 vector/src/main/res/drawable-ldrtl/ic_arrow_right.xml

diff --git a/CHANGES.md b/CHANGES.md
index 6cf6d306e9..a262150e51 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,7 @@ Improvements 🙌:
 Bugfix 🐛:
  - Duplicate thumbs | Mobile reactions for 👍 and 👎 are not the same as web (#2776)
  - Join room by alias other federation error (#2778)
+ - RTL: some arrows should be rotated in RTL (#2757)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/res/drawable-ldrtl/ic_arrow_right.xml b/vector/src/main/res/drawable-ldrtl/ic_arrow_right.xml
new file mode 100644
index 0000000000..b783231437
--- /dev/null
+++ b/vector/src/main/res/drawable-ldrtl/ic_arrow_right.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="7dp"
+    android:height="12dp"
+    android:viewportWidth="7"
+    android:viewportHeight="12">
+    <path
+        android:fillColor="#00000000"
+        android:fillType="evenOdd"
+        android:pathData="M6,11l-5,-5 5,-5"
+        android:strokeWidth="2"
+        android:strokeColor="#2E2F32"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        tools:strokeColor="#FFAF0F" />
+</vector>
diff --git a/vector/src/main/res/drawable/ic_arrow_right.xml b/vector/src/main/res/drawable/ic_arrow_right.xml
index c314196b66..76f2757723 100644
--- a/vector/src/main/res/drawable/ic_arrow_right.xml
+++ b/vector/src/main/res/drawable/ic_arrow_right.xml
@@ -1,14 +1,16 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="7dp"
     android:height="12dp"
     android:viewportWidth="7"
     android:viewportHeight="12">
-  <path
-      android:pathData="M1,11l5,-5 -5,-5"
-      android:strokeLineJoin="round"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:fillType="evenOdd"
-      android:strokeColor="#2E2F32"
-      android:strokeLineCap="round"/>
+    <path
+        android:fillColor="#00000000"
+        android:fillType="evenOdd"
+        android:pathData="M1,11l5,-5 -5,-5"
+        android:strokeWidth="2"
+        android:strokeColor="#2E2F32"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round"
+        tools:strokeColor="#FFAF0F" />
 </vector>

From 5e2e6dcfc39d51a3fe2c1a333a45635193bceab2 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 5 Feb 2021 20:01:24 +0100
Subject: [PATCH 2/2] Fix another RTL issue

---
 vector/src/main/res/layout/fragment_home_drawer.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index d56bae4678..e627882d96 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -84,6 +84,7 @@
             android:insetRight="0dp"
             android:insetBottom="0dp"
             android:padding="0dp"
+            android:rotationY="@integer/rtl_mirror_flip"
             app:cornerRadius="17dp"
             app:icon="@drawable/ic_qr_code_add"
             app:iconGravity="textStart"