From 94a0cfe3a7bb89a3ae80bc2bf9826cf338fdecd8 Mon Sep 17 00:00:00 2001
From: miroslav <miki.stevanovic.u@gmail.com>
Date: Thu, 29 Dec 2022 00:28:01 +0100
Subject: [PATCH 1/2] apply dark theme throughout the app

---
 .../app/src/main/java/com/expensify/chat/MainApplication.java  | 2 ++
 android/app/src/main/res/values/styles.xml                     | 2 +-
 ios/NewExpensify/Info.plist                                    | 2 ++
 web/index.html                                                 | 3 +++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/android/app/src/main/java/com/expensify/chat/MainApplication.java b/android/app/src/main/java/com/expensify/chat/MainApplication.java
index fd203ecc675d..bb0b15857d2b 100644
--- a/android/app/src/main/java/com/expensify/chat/MainApplication.java
+++ b/android/app/src/main/java/com/expensify/chat/MainApplication.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.database.CursorWindow;
 
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.multidex.MultiDexApplication;
 
 import com.expensify.chat.bootsplash.BootSplashPackage;
@@ -64,6 +65,7 @@ public ReactNativeHost getReactNativeHost() {
   @Override
   public void onCreate() {
       super.onCreate();
+      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
       // If you opted-in for the New Architecture, we enable the TurboModule system
       ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
       SoLoader.init(this, /* native exopackage */ false);
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 9057ea9c1cc2..a804c14abb53 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -4,7 +4,7 @@
     <style name="AppTheme" parent="BaseAppTheme"/>
 
     <!-- Base application theme. Applied to all Android versions -->
-    <style name="BaseAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="BaseAppTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="android:textColor">@color/dark</item>
         <item name="android:colorEdgeEffect">@color/gray4</item>
         <item name="android:statusBarColor">#061B09</item>
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 29b28ed12972..9a38da821be3 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -111,6 +111,8 @@
 		<string>UIInterfaceOrientationLandscapeRight</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 	</array>
+	<key>UIUserInterfaceStyle</key>
+	<string>Dark</string>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
 </dict>
diff --git a/web/index.html b/web/index.html
index d7074a03d3b5..3b43fc03d32c 100644
--- a/web/index.html
+++ b/web/index.html
@@ -23,6 +23,9 @@
         #root > div > div {
             height: 100% !important;
         }
+        :root {
+            color-scheme: dark;
+        }
         #drag-area {
             -webkit-app-region: drag;
         }

From 8cc4dec461e5a53676d02dba37d177bad55aa9cb Mon Sep 17 00:00:00 2001
From: miroslav <miki.stevanovic.u@gmail.com>
Date: Fri, 30 Dec 2022 01:10:58 +0100
Subject: [PATCH 2/2] add comment for dark mode in android

---
 .../app/src/main/java/com/expensify/chat/MainApplication.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/android/app/src/main/java/com/expensify/chat/MainApplication.java b/android/app/src/main/java/com/expensify/chat/MainApplication.java
index bb0b15857d2b..523b24049051 100644
--- a/android/app/src/main/java/com/expensify/chat/MainApplication.java
+++ b/android/app/src/main/java/com/expensify/chat/MainApplication.java
@@ -65,7 +65,10 @@ public ReactNativeHost getReactNativeHost() {
   @Override
   public void onCreate() {
       super.onCreate();
+
+      // Use night (dark) mode so native UI defaults to dark theme.
       AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+      
       // If you opted-in for the New Architecture, we enable the TurboModule system
       ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
       SoLoader.init(this, /* native exopackage */ false);