Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions android/app/src/main/res/values-v29/styles.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.FullScreenDialog">
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">false</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:enforceNavigationBarContrast">false</item>
</style>
</resources>
1 change: 0 additions & 1 deletion android/app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<item name="android:colorEdgeEffect">@color/gray4</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:enforceNavigationBarContrast">false</item>
<item name="colorAccent">@color/accent</item>
<item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
<item name="popupTheme">@style/AppTheme.Popup</item>
Expand Down
11 changes: 10 additions & 1 deletion patches/react-native/details.md
Original file line number Diff line number Diff line change
Expand Up @@ -189,4 +189,13 @@
- Reason: This patch fixes a crash that occurred when the clipboard text data can be null.
- Upstream PR/issue: 🛑
- E/App issue: [#66925](https://github.com/Expensify/App/issues/66925)
- PR introducing patch: [#66749](https://github.com/Expensify/App/pull/66749)
- PR introducing patch: [#66749](https://github.com/Expensify/App/pull/66749)

- PR introducing patch: [#66749](https://github.com/Expensify/App/pull/66749)
-
### [react-native+0.79.2+028+fix-modal-transparent-navigation-bar.patch](react-native+0.79.2+028+fix-modal-transparent-navigation-bar.patch)

- Reason: This patch fixes an issue where it is not possible to enable a transparent navigation bar on Android
- Upstream PR/issue: 🛑
- E/App issue: [#69005](https://github.com/Expensify/App/issues/69005)
- PR introducing patch: [#69004](https://github.com/Expensify/App/pull/69004)
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt
index 139a1c1..f6d1faa 100644
--- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt
+++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt
@@ -361,6 +361,21 @@ public class ReactModalHostView(context: ThemedReactContext) :
// Navigation bar cannot be translucent without status bar being translucent too
dialogWindow.setSystemBarsTranslucency(navigationBarTranslucent)

+ // If enforceNavigationBarContrast is explicitly set in the app theme (AppTheme),
+ // we need to override the default behaviour for edge-to-edge mode in WindowUtils.setSystemBarsTranslucency.
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+ val attrs = intArrayOf(android.R.attr.enforceNavigationBarContrast)
+ val ta = context.obtainStyledAttributes(R.style.Theme_FullScreenDialog, attrs)
+
+ if (ta.length() == 1) {
+ val enforceNavigationBarContrastStyleValue = ta.getBoolean(0, false)
+ dialogWindow.isNavigationBarContrastEnforced = enforceNavigationBarContrastStyleValue
+ }
+
+ ta.recycle()
+ }
+
+
if (!navigationBarTranslucent) {
dialogWindow.setStatusBarTranslucency(statusBarTranslucent)
}
Loading