From 098fd1bd9e9df008c1ba8d5bf7ff18afe6b57512 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Thu, 25 Aug 2022 16:01:33 +0700
Subject: [PATCH] TF-874 Fix cursor pointer indicator in composer is wrong
 color on Android

---
 .../app/src/main/res/values-night-v21/styles.xml    | 13 +++++++++++++
 .../app/src/main/res/values-night-v29/styles.xml    |  8 ++++++++
 android/app/src/main/res/values-night/styles.xml    |  1 -
 android/app/src/main/res/values-v21/styles.xml      | 13 +++++++++++++
 android/app/src/main/res/values-v29/styles.xml      | 11 +++++++++++
 android/app/src/main/res/values/colors.xml          |  1 +
 android/app/src/main/res/values/styles.xml          |  1 -
 7 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 android/app/src/main/res/values-night-v21/styles.xml
 create mode 100644 android/app/src/main/res/values-night-v29/styles.xml
 create mode 100644 android/app/src/main/res/values-v21/styles.xml
 create mode 100644 android/app/src/main/res/values-v29/styles.xml

diff --git a/android/app/src/main/res/values-night-v21/styles.xml b/android/app/src/main/res/values-night-v21/styles.xml
new file mode 100644
index 000000000..81c4f02a8
--- /dev/null
+++ b/android/app/src/main/res/values-night-v21/styles.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:colorControlActivated">@color/colorPrimary</item>
+    </style>
+
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+        <item name="android:colorControlActivated">@color/colorPrimary</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-night-v29/styles.xml b/android/app/src/main/res/values-night-v29/styles.xml
new file mode 100644
index 000000000..aa87be1aa
--- /dev/null
+++ b/android/app/src/main/res/values-night-v29/styles.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
index 0398fe499..7c806c658 100644
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -5,7 +5,6 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
-        <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
diff --git a/android/app/src/main/res/values-v21/styles.xml b/android/app/src/main/res/values-v21/styles.xml
new file mode 100644
index 000000000..9cce85e65
--- /dev/null
+++ b/android/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:colorControlActivated">@color/colorPrimary</item>
+    </style>
+
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+        <item name="android:colorControlActivated">@color/colorPrimary</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values-v29/styles.xml b/android/app/src/main/res/values-v29/styles.xml
new file mode 100644
index 000000000..b0859f4ec
--- /dev/null
+++ b/android/app/src/main/res/values-v29/styles.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             Flutter draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index beab31f75..bfa45449f 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="ic_launcher_background">#000000</color>
+    <color name="colorPrimary">#007AFF</color>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 874a500e5..c8a5e6094 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -5,7 +5,6 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
-        <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.