From e97a1b2cf60d4310a945097ce9108af44e165c68 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Mon, 2 Aug 2021 11:09:10 -0400
Subject: [PATCH] Fix mixed theme use when system force dark is on.

Thanks to flodo from the forum for the help.
---
 app/src/main/res/values/themes.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 4dbd43a76..a50690124 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,6 +3,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="Signal.Transparent" parent="Theme.AppCompat">
+        <item name="android:forceDarkAllowed" tools:targetApi="29">false</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowContentOverlay">@null</item>
@@ -89,6 +90,7 @@
     </style>
 
     <style name="TextSecure.LightIntroTheme" parent="@style/Theme.AppCompat.Light">
+        <item name="android:forceDarkAllowed" tools:targetApi="29">false</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="windowActionModeOverlay">true</item>
@@ -99,6 +101,7 @@
     </style>
 
     <style name="TextSecure.DarkIntroTheme" parent="@style/Theme.AppCompat">
+        <item name="android:forceDarkAllowed" tools:targetApi="29">false</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="windowActionModeOverlay">true</item>
@@ -126,6 +129,7 @@
 
     <style name="TextSecure.BaseLightTheme" parent="@style/Theme.MaterialComponents.Light.Bridge">
         <item name="theme_type">light</item>
+        <item name="android:forceDarkAllowed" tools:targetApi="29">false</item>
 
         <item name="search_view_style">@style/Signal.SearchView</item>
 
@@ -180,6 +184,7 @@
 
     <style name="TextSecure.BaseDarkTheme" parent="@style/Theme.MaterialComponents.Bridge">
         <item name="theme_type">dark</item>
+        <item name="android:forceDarkAllowed" tools:targetApi="29">false</item>
 
         <item name="search_view_style">@style/Signal.SearchView</item>
 
@@ -311,6 +316,7 @@
     </style>
 
     <style name="TextSecure.DarkTheme.WebRTCCall">
+        <item name="android:forceDarkAllowed" tools:targetApi="29">false</item>
         <item name="android:statusBarColor" tools:ignore="NewApi">@color/core_ultramarine</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowTranslucentStatus">true</item>