From 006e7dc736c915fd91a565a828aa571429607604 Mon Sep 17 00:00:00 2001
From: Fumiaki Yoshimatsu <fumiakiy@gmail.com>
Date: Sat, 6 Mar 2021 10:39:20 -0500
Subject: [PATCH] Fix reply and forward icons in RTL.

These vector drawables are `autoMirrored=true` but the attribute does
not work correctly due to [a known Android bug](https://issuetracker.google.com/issues/37138973).
This fix is to work around the bug.

Fixes #11006.
---
 .../ic_forward_24.xml                                    | 2 +-
 .../ic_reply_24.xml                                      | 2 +-
 app/src/main/res/drawable-ldltr/ic_forward_24.xml        | 9 +++++++++
 app/src/main/res/drawable-ldltr/ic_reply_24.xml          | 5 +++++
 app/src/main/res/drawable-ldrtl-night/ic_forward_24.xml  | 5 +++++
 app/src/main/res/drawable-ldrtl-night/ic_reply_24.xml    | 5 +++++
 app/src/main/res/drawable-ldrtl/ic_forward_24.xml        | 5 +++++
 app/src/main/res/drawable-ldrtl/ic_reply_24.xml          | 9 +++++++++
 8 files changed, 40 insertions(+), 2 deletions(-)
 rename app/src/main/res/{drawable-night => drawable-ldltr-night}/ic_forward_24.xml (88%)
 rename app/src/main/res/{drawable-night => drawable-ldltr-night}/ic_reply_24.xml (88%)
 create mode 100644 app/src/main/res/drawable-ldltr/ic_forward_24.xml
 create mode 100644 app/src/main/res/drawable-ldltr/ic_reply_24.xml
 create mode 100644 app/src/main/res/drawable-ldrtl-night/ic_forward_24.xml
 create mode 100644 app/src/main/res/drawable-ldrtl-night/ic_reply_24.xml
 create mode 100644 app/src/main/res/drawable-ldrtl/ic_forward_24.xml
 create mode 100644 app/src/main/res/drawable-ldrtl/ic_reply_24.xml

diff --git a/app/src/main/res/drawable-night/ic_forward_24.xml b/app/src/main/res/drawable-ldltr-night/ic_forward_24.xml
similarity index 88%
rename from app/src/main/res/drawable-night/ic_forward_24.xml
rename to app/src/main/res/drawable-ldltr-night/ic_forward_24.xml
index 10b92dd8e4..13e6fc5df0 100644
--- a/app/src/main/res/drawable-night/ic_forward_24.xml
+++ b/app/src/main/res/drawable-ldltr-night/ic_forward_24.xml
@@ -1,4 +1,4 @@
-<vector android:autoMirrored="true" android:height="24dp"
+<vector android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FFFFFFFF" android:pathData="M2.116,21.426A14.706,14.706 0,0 1,13.021 16v4.793c0,0.664 0.384,0.823 0.853,0.353l8.793,-8.792a0.5,0.5 0,0 0,0 -0.708L13.874,2.854c-0.469,-0.47 -0.853,-0.311 -0.853,0.353V8C5.757,8.934 2.2,14.051 1.217,21.059 1.071,22.1 1.463,22.249 2.116,21.426Z"/>
diff --git a/app/src/main/res/drawable-night/ic_reply_24.xml b/app/src/main/res/drawable-ldltr-night/ic_reply_24.xml
similarity index 88%
rename from app/src/main/res/drawable-night/ic_reply_24.xml
rename to app/src/main/res/drawable-ldltr-night/ic_reply_24.xml
index 5fd2caa43b..e710d82264 100644
--- a/app/src/main/res/drawable-night/ic_reply_24.xml
+++ b/app/src/main/res/drawable-ldltr-night/ic_reply_24.xml
@@ -1,4 +1,4 @@
-<vector android:autoMirrored="true" android:height="24dp"
+<vector android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FFFFFFFF" android:pathData="M21.905,21.426A14.706,14.706 0,0 0,11 16v4.793c0,0.664 -0.384,0.823 -0.854,0.353L1.354,12.354a0.5,0.5 0,0 1,0 -0.708l8.792,-8.792c0.47,-0.47 0.854,-0.311 0.854,0.353V8c7.264,0.934 10.822,6.051 11.8,13.059C22.95,22.1 22.558,22.249 21.905,21.426Z"/>
diff --git a/app/src/main/res/drawable-ldltr/ic_forward_24.xml b/app/src/main/res/drawable-ldltr/ic_forward_24.xml
new file mode 100644
index 0000000000..f77ad2becb
--- /dev/null
+++ b/app/src/main/res/drawable-ldltr/ic_forward_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M12.91,3.91h0m1.71,2.16V9.32l-1.31,0.17A11,11 0,0 0,3.84 17c-0.12,0.33 -0.8,1.59 -0.8,1.59s1,-1 1.3,-1.22A17.36,17.36 0,0 1,13 14.5l1.62,-0.12v3.48l-0.06,0.81L15,18 21,12 14.9,5.9l-0.34,-0.54ZM13.48,2.58a0.76,0.76 0,0 1,0.49 0.27l8.79,8.8a0.48,0.48 0,0 1,0 0.7L14,21.15a0.76,0.76 0,0 1,-0.49 0.27c-0.22,0 -0.36,-0.22 -0.36,-0.63V16c-5,0.39 -8.83,2.48 -11.37,6 -0.14,0.2 -0.27,0.29 -0.37,0.29s-0.2,-0.17 -0.16,-0.5C2,14.43 5.59,9 13.12,8V3.21c0,-0.41 0.14,-0.63 0.36,-0.63Z"/>
+</vector>
diff --git a/app/src/main/res/drawable-ldltr/ic_reply_24.xml b/app/src/main/res/drawable-ldltr/ic_reply_24.xml
new file mode 100644
index 0000000000..726dae1927
--- /dev/null
+++ b/app/src/main/res/drawable-ldltr/ic_reply_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M9.5,5.621v3.7l1.309,0.169a10.932,10.932 0,0 1,9.364 7.253c0.161,0.406 0.8,1.756 0.8,1.756A19.408,19.408 0,0 0,19.5 17.2,17.455 17.455,0 0,0 11.115,14.5L9.5,14.38v4L3.121,12 9.5,5.621m1.137,-3.037a0.758,0.758 0,0 0,-0.491 0.27L1.354,11.646a0.5,0.5 0,0 0,0 0.708l8.792,8.792a0.758,0.758 0,0 0,0.491 0.27c0.219,0 0.363,-0.217 0.363,-0.623V16a14.706,14.706 0,0 1,10.905 5.426c0.282,0.355 0.514,0.529 0.677,0.529 0.214,0 0.3,-0.3 0.222,-0.9C21.822,14.051 18.264,8.934 11,8V3.207c0,-0.406 -0.144,-0.623 -0.363,-0.623Z"/>
+</vector>
diff --git a/app/src/main/res/drawable-ldrtl-night/ic_forward_24.xml b/app/src/main/res/drawable-ldrtl-night/ic_forward_24.xml
new file mode 100644
index 0000000000..e710d82264
--- /dev/null
+++ b/app/src/main/res/drawable-ldrtl-night/ic_forward_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M21.905,21.426A14.706,14.706 0,0 0,11 16v4.793c0,0.664 -0.384,0.823 -0.854,0.353L1.354,12.354a0.5,0.5 0,0 1,0 -0.708l8.792,-8.792c0.47,-0.47 0.854,-0.311 0.854,0.353V8c7.264,0.934 10.822,6.051 11.8,13.059C22.95,22.1 22.558,22.249 21.905,21.426Z"/>
+</vector>
diff --git a/app/src/main/res/drawable-ldrtl-night/ic_reply_24.xml b/app/src/main/res/drawable-ldrtl-night/ic_reply_24.xml
new file mode 100644
index 0000000000..13e6fc5df0
--- /dev/null
+++ b/app/src/main/res/drawable-ldrtl-night/ic_reply_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M2.116,21.426A14.706,14.706 0,0 1,13.021 16v4.793c0,0.664 0.384,0.823 0.853,0.353l8.793,-8.792a0.5,0.5 0,0 0,0 -0.708L13.874,2.854c-0.469,-0.47 -0.853,-0.311 -0.853,0.353V8C5.757,8.934 2.2,14.051 1.217,21.059 1.071,22.1 1.463,22.249 2.116,21.426Z"/>
+</vector>
diff --git a/app/src/main/res/drawable-ldrtl/ic_forward_24.xml b/app/src/main/res/drawable-ldrtl/ic_forward_24.xml
new file mode 100644
index 0000000000..726dae1927
--- /dev/null
+++ b/app/src/main/res/drawable-ldrtl/ic_forward_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M9.5,5.621v3.7l1.309,0.169a10.932,10.932 0,0 1,9.364 7.253c0.161,0.406 0.8,1.756 0.8,1.756A19.408,19.408 0,0 0,19.5 17.2,17.455 17.455,0 0,0 11.115,14.5L9.5,14.38v4L3.121,12 9.5,5.621m1.137,-3.037a0.758,0.758 0,0 0,-0.491 0.27L1.354,11.646a0.5,0.5 0,0 0,0 0.708l8.792,8.792a0.758,0.758 0,0 0,0.491 0.27c0.219,0 0.363,-0.217 0.363,-0.623V16a14.706,14.706 0,0 1,10.905 5.426c0.282,0.355 0.514,0.529 0.677,0.529 0.214,0 0.3,-0.3 0.222,-0.9C21.822,14.051 18.264,8.934 11,8V3.207c0,-0.406 -0.144,-0.623 -0.363,-0.623Z"/>
+</vector>
diff --git a/app/src/main/res/drawable-ldrtl/ic_reply_24.xml b/app/src/main/res/drawable-ldrtl/ic_reply_24.xml
new file mode 100644
index 0000000000..f77ad2becb
--- /dev/null
+++ b/app/src/main/res/drawable-ldrtl/ic_reply_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M12.91,3.91h0m1.71,2.16V9.32l-1.31,0.17A11,11 0,0 0,3.84 17c-0.12,0.33 -0.8,1.59 -0.8,1.59s1,-1 1.3,-1.22A17.36,17.36 0,0 1,13 14.5l1.62,-0.12v3.48l-0.06,0.81L15,18 21,12 14.9,5.9l-0.34,-0.54ZM13.48,2.58a0.76,0.76 0,0 1,0.49 0.27l8.79,8.8a0.48,0.48 0,0 1,0 0.7L14,21.15a0.76,0.76 0,0 1,-0.49 0.27c-0.22,0 -0.36,-0.22 -0.36,-0.63V16c-5,0.39 -8.83,2.48 -11.37,6 -0.14,0.2 -0.27,0.29 -0.37,0.29s-0.2,-0.17 -0.16,-0.5C2,14.43 5.59,9 13.12,8V3.21c0,-0.41 0.14,-0.63 0.36,-0.63Z"/>
+</vector>