From 5592222e4d5272597cca1ebb28efef4349c0cdfb Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Thu, 14 Dec 2023 09:39:17 -0800 Subject: [PATCH 1/4] Remove Dark UIUserInterfaceStyle --- ios/NewExpensify/Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index a917b6a4499c..0d479c6aaf6e 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -121,7 +121,7 @@ UIInterfaceOrientationPortraitUpsideDown UIUserInterfaceStyle - Dark + unspecified UIViewControllerBasedStatusBarAppearance From b8ffa63513ce75081857d8418c949c27bed96e01 Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Thu, 14 Dec 2023 11:00:58 -0800 Subject: [PATCH 2/4] revert old PR hardcoding dark theme --- .../main/java/com/expensify/chat/MainApplication.java | 4 ---- ios/NewExpensify/Info.plist | 2 -- react-native.config.js | 9 +++++++++ 3 files changed, 9 insertions(+), 6 deletions(-) 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 a4f2bc97416d..bc76be739949 100644 --- a/android/app/src/main/java/com/expensify/chat/MainApplication.java +++ b/android/app/src/main/java/com/expensify/chat/MainApplication.java @@ -3,7 +3,6 @@ import android.content.Context; import android.database.CursorWindow; -import androidx.appcompat.app.AppCompatDelegate; import androidx.multidex.MultiDexApplication; import com.expensify.chat.bootsplash.BootSplashPackage; @@ -67,9 +66,6 @@ public ReactNativeHost getReactNativeHost() { public void onCreate() { super.onCreate(); - // Use night (dark) mode so native UI defaults to dark theme. - AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); - SoLoader.init(this, /* native exopackage */ false); if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) { // If you opted-in for the New Architecture, we load the native entry point for this app. diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 0d479c6aaf6e..28912b1133ae 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -120,8 +120,6 @@ UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown - UIUserInterfaceStyle - unspecified UIViewControllerBasedStatusBarAppearance diff --git a/react-native.config.js b/react-native.config.js index 6d6dd3f5805f..830b3c9f5a17 100644 --- a/react-native.config.js +++ b/react-native.config.js @@ -4,4 +4,13 @@ module.exports = { android: {}, }, assets: ['./assets/fonts/native'], + expo: { + userInterfaceStyle: "automatic", + ios: { + userInterfaceStyle: "automatic", + }, + android: { + userInterfaceStyle: "automatic", + }, + }, }; From 43c71bab1037e07b2d0d7251fa5e90f8cd744655 Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Thu, 14 Dec 2023 11:06:39 -0800 Subject: [PATCH 3/4] prettier --- react-native.config.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/react-native.config.js b/react-native.config.js index 830b3c9f5a17..f279a6a9b412 100644 --- a/react-native.config.js +++ b/react-native.config.js @@ -5,12 +5,12 @@ module.exports = { }, assets: ['./assets/fonts/native'], expo: { - userInterfaceStyle: "automatic", + userInterfaceStyle: 'automatic', ios: { - userInterfaceStyle: "automatic", + userInterfaceStyle: 'automatic', }, android: { - userInterfaceStyle: "automatic", + userInterfaceStyle: 'automatic', }, }, }; From d8034b743c11ee7a5f170ffe01a76c12dc24d1cb Mon Sep 17 00:00:00 2001 From: Georgia Monahan Date: Thu, 14 Dec 2023 13:15:08 -0800 Subject: [PATCH 4/4] reset react-native.config.js to main --- react-native.config.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/react-native.config.js b/react-native.config.js index f279a6a9b412..6d6dd3f5805f 100644 --- a/react-native.config.js +++ b/react-native.config.js @@ -4,13 +4,4 @@ module.exports = { android: {}, }, assets: ['./assets/fonts/native'], - expo: { - userInterfaceStyle: 'automatic', - ios: { - userInterfaceStyle: 'automatic', - }, - android: { - userInterfaceStyle: 'automatic', - }, - }, };