From 3d392d6ea14a265885f4863e93181ee32a660d52 Mon Sep 17 00:00:00 2001
From: rory <rory@expensify.com>
Date: Thu, 23 Feb 2023 17:12:59 -0800
Subject: [PATCH 1/6] Fix status bar not matching background on Android

---
 .../java/com/expensify/chat/MainActivity.java  |  6 ++++++
 android/app/src/main/res/values/styles.xml     |  7 ++++++-
 .../CustomStatusBar/index.android.js           | 18 ------------------
 3 files changed, 12 insertions(+), 19 deletions(-)
 delete mode 100644 src/components/CustomStatusBar/index.android.js

diff --git a/android/app/src/main/java/com/expensify/chat/MainActivity.java b/android/app/src/main/java/com/expensify/chat/MainActivity.java
index 24dcf36a177b..78bd2e4af28f 100644
--- a/android/app/src/main/java/com/expensify/chat/MainActivity.java
+++ b/android/app/src/main/java/com/expensify/chat/MainActivity.java
@@ -2,6 +2,8 @@
 
 import android.os.Bundle;
 import android.content.pm.ActivityInfo;
+import android.view.Window;
+import android.view.WindowManager;
 import com.expensify.chat.bootsplash.BootSplash;
 import com.facebook.react.ReactActivity;
 import com.facebook.react.ReactActivityDelegate;
@@ -52,6 +54,10 @@ protected boolean isConcurrentRootEnabled() {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(null);
+
+    Window w = getWindow();
+    w.setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS, WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
+
     if (getResources().getBoolean(R.bool.portrait_only)) {
       setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
     }
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index dbaeb878951e..7f7af78caade 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -6,7 +6,9 @@
     <!-- Base application theme. Applied to all Android versions -->
     <style name="BaseAppTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="android:colorEdgeEffect">@color/gray4</item>
-        <item name="android:statusBarColor">#061B09</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
         <item name="colorAccent">@color/accent</item>
         <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
     </style>
@@ -16,6 +18,9 @@
         <item name="android:background">@drawable/bootsplash</item>
         <item name="android:windowTranslucentStatus">false</item>
         <item name="android:fitsSystemWindows">true</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
     </style>
 
 </resources>
diff --git a/src/components/CustomStatusBar/index.android.js b/src/components/CustomStatusBar/index.android.js
deleted file mode 100644
index fa3f8921e82a..000000000000
--- a/src/components/CustomStatusBar/index.android.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from 'react';
-import {StatusBar} from 'react-native';
-import themeColors from '../../styles/themes/default';
-
-/**
- * Only the Android platform supports "setBackgroundColor"
- */
-
-export default class CustomStatusBar extends React.Component {
-    componentDidMount() {
-        StatusBar.setBarStyle('light-content');
-        StatusBar.setBackgroundColor(themeColors.appBG);
-    }
-
-    render() {
-        return <StatusBar />;
-    }
-}

From a223dab28d9898029742e48ee2b006b8bdd13f2c Mon Sep 17 00:00:00 2001
From: rory <rory@expensify.com>
Date: Thu, 23 Feb 2023 17:24:06 -0800
Subject: [PATCH 2/6] Add comment

---
 android/app/src/main/java/com/expensify/chat/MainActivity.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android/app/src/main/java/com/expensify/chat/MainActivity.java b/android/app/src/main/java/com/expensify/chat/MainActivity.java
index 78bd2e4af28f..6a9bc5dd89a0 100644
--- a/android/app/src/main/java/com/expensify/chat/MainActivity.java
+++ b/android/app/src/main/java/com/expensify/chat/MainActivity.java
@@ -55,6 +55,7 @@ protected boolean isConcurrentRootEnabled() {
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(null);
 
+    // Make the app take up the full screen (painted behind transparent status bar)
     Window w = getWindow();
     w.setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS, WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
 

From 6d4ee6c7915fc4e521f9dc69e4300f57a2518a52 Mon Sep 17 00:00:00 2001
From: rory <rory@expensify.com>
Date: Fri, 24 Feb 2023 09:13:29 -0800
Subject: [PATCH 3/6] Remove redundant styles in BootTheme

---
 android/app/src/main/res/values/styles.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 7f7af78caade..08e8b3aceba8 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -18,9 +18,6 @@
         <item name="android:background">@drawable/bootsplash</item>
         <item name="android:windowTranslucentStatus">false</item>
         <item name="android:fitsSystemWindows">true</item>
-        <item name="android:navigationBarColor">@android:color/transparent</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
     </style>
 
 </resources>

From 776f1da7e858f2ea5a673d08a858ee42c073739f Mon Sep 17 00:00:00 2001
From: rory <rory@expensify.com>
Date: Fri, 24 Feb 2023 09:51:10 -0800
Subject: [PATCH 4/6] Remove unnecessary styles from BootTheme

---
 android/app/src/main/res/values/styles.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 08e8b3aceba8..0f9aaa520798 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -16,8 +16,6 @@
     <!-- Themes unique to the boot splash page -->
     <style name="BootTheme" parent="AppTheme">
         <item name="android:background">@drawable/bootsplash</item>
-        <item name="android:windowTranslucentStatus">false</item>
-        <item name="android:fitsSystemWindows">true</item>
     </style>
 
 </resources>

From 37e720e974153d2184e3c09a0c2e1b30cab0cb5d Mon Sep 17 00:00:00 2001
From: rory <rory@expensify.com>
Date: Fri, 24 Feb 2023 10:40:28 -0800
Subject: [PATCH 5/6] Fix black icons in status bar

---
 android/app/src/main/res/values/styles.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 0f9aaa520798..49196bd354ad 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,18 +1,17 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <!-- App Theme for Android versions 7.1 and below -->
-    <style name="AppTheme" parent="BaseAppTheme"/>
-
     <!-- Base application theme. Applied to all Android versions -->
     <style name="BaseAppTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="android:colorEdgeEffect">@color/gray4</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
         <item name="colorAccent">@color/accent</item>
         <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
     </style>
 
+    <!-- App Theme for Android versions 7.1 and below -->
+    <style name="AppTheme" parent="BaseAppTheme"/>
+
     <!-- Themes unique to the boot splash page -->
     <style name="BootTheme" parent="AppTheme">
         <item name="android:background">@drawable/bootsplash</item>

From d5cc9a78e5e168d1b323d1b1bcb054d6d09eb60f Mon Sep 17 00:00:00 2001
From: rory <rory@expensify.com>
Date: Fri, 24 Feb 2023 10:44:44 -0800
Subject: [PATCH 6/6] Replace RN SafeAreaView with SafeAreaView from
 react-native-safe-area-context

---
 src/pages/SetPasswordPage.js   | 2 +-
 src/pages/signin/SignInPage.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/SetPasswordPage.js b/src/pages/SetPasswordPage.js
index 32d25f38fa56..9ee7e86c4195 100755
--- a/src/pages/SetPasswordPage.js
+++ b/src/pages/SetPasswordPage.js
@@ -1,8 +1,8 @@
 import React, {Component} from 'react';
 import {
-    SafeAreaView,
     View,
 } from 'react-native';
+import {SafeAreaView} from 'react-native-safe-area-context';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index 851bdd2372d5..6e6f5662dba6 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -1,7 +1,7 @@
 import React, {Component} from 'react';
 import {
     SafeAreaView,
-} from 'react-native';
+} from 'react-native-safe-area-context';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
 import ONYXKEYS from '../../ONYXKEYS';