From d708c6e2c5d5ffd9c437db33e8c56ed047a79ca9 Mon Sep 17 00:00:00 2001
From: ppc <albie@ppc.moe>
Date: Tue, 22 Jul 2025 12:30:18 +0100
Subject: [PATCH] fix ios status bar colours when opening modals

---
 amnet-native/App.tsx                       | 2 +-
 amnet-native/app/ServerAddModal.tsx        | 8 ++++++--
 amnet-native/app/card/CardAddModal.tsx     | 5 ++++-
 amnet-native/app/card/CardEditorModal.tsx  | 6 ++++--
 amnet-native/app/card/ManualCardEntry.tsx  | 8 +++++---
 amnet-native/app/card/PhyscialCardScan.tsx | 8 +++++---
 6 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/amnet-native/App.tsx b/amnet-native/App.tsx
index f5aed66..9202455 100644
--- a/amnet-native/App.tsx
+++ b/amnet-native/App.tsx
@@ -109,7 +109,7 @@ export default function AppRoot() {
                 <PaperProvider theme={colorScheme === 'dark' ? AMDarkTheme : AMLightTheme}>
                     {/* @ts-ignore */}
                     <NavigationContainer theme={colorScheme === 'dark' ? DarkTheme : LightTheme} linking={linking}>
-                        <StatusBar style={colorScheme}/>
+                        <StatusBar/>
                         <Stack.Navigator initialRouteName="app">
                             {/* main app */}
                             <Stack.Screen name="app" component={AppContent} options={{headerShown: false}}/>
diff --git a/amnet-native/app/ServerAddModal.tsx b/amnet-native/app/ServerAddModal.tsx
index e3482c6..772517d 100644
--- a/amnet-native/app/ServerAddModal.tsx
+++ b/amnet-native/app/ServerAddModal.tsx
@@ -1,3 +1,4 @@
+import {StatusBar} from "expo-status-bar";
 import {Card, Text, useTheme} from "react-native-paper";
 import {useCallback, useEffect, useLayoutEffect, useState} from "react";
 import {Alert, Platform, TextInput, TouchableOpacity, View} from "react-native";
@@ -93,7 +94,9 @@ export default function ServerAddModal({route, navigation}) {
         }, 500);
     }, [realm]);
 
-    return (<View style={{display: "flex", gap: 10, justifyContent: "center", paddingHorizontal: 15, paddingTop: 25}}>
+    return (<>
+        {Platform.OS == 'ios' && <StatusBar style="light"/>}
+        <View style={{display: "flex", gap: 10, justifyContent: "center", paddingHorizontal: 15, paddingTop: 25}}>
         <Card mode="contained">
             <Card.Content>
                 <View style={{...modalStyles.formItemRow, gap: 10}}>
@@ -118,7 +121,8 @@ export default function ServerAddModal({route, navigation}) {
         <Text variant="bodyMedium" style={modalStyles.formFootnote}>
             AMNet uses HTTP by default. HTTPS will not work unless specifically configured using HTTP.SYS
         </Text>
-    </View>)
+    </View>
+</>)
 }
 
 function handleDeepLink(realm, navigation, route, setAddress: (address: string) => void) {
diff --git a/amnet-native/app/card/CardAddModal.tsx b/amnet-native/app/card/CardAddModal.tsx
index 7e8d435..ee0e482 100644
--- a/amnet-native/app/card/CardAddModal.tsx
+++ b/amnet-native/app/card/CardAddModal.tsx
@@ -1,3 +1,4 @@
+import {StatusBar} from "expo-status-bar";
 import NfcManager from "react-native-nfc-manager";
 
 import React, {useEffect, useState} from "react";
@@ -32,6 +33,8 @@ function CardAddMethodSelector({navigation}) {
     }, []);
 
     return (
+        <>
+        {Platform.OS === 'ios' && <StatusBar style="light"/>}
         <View style={{paddingHorizontal: 15, paddingTop: 90, gap: 8}}>
             <View style={{paddingBottom: 25, gap: 5}}>
                 <Text variant="titleLarge" style={{textAlign: "center", fontSize: 32, lineHeight: 32, fontWeight: "bold"}}>
@@ -65,7 +68,7 @@ function CardAddMethodSelector({navigation}) {
                         title="Generate New Card"
                         onPress={() => navigation.navigate('Manual', {autoGenerate: true})}/>
         </View>
-    )
+    </>)
 }
 
 function MethodCard(props: {
diff --git a/amnet-native/app/card/CardEditorModal.tsx b/amnet-native/app/card/CardEditorModal.tsx
index c4b255c..fae5538 100644
--- a/amnet-native/app/card/CardEditorModal.tsx
+++ b/amnet-native/app/card/CardEditorModal.tsx
@@ -1,4 +1,5 @@
 import {BSON} from "realm";
+import {StatusBar} from "expo-status-bar";
 import {Card, Divider, Text, useTheme} from "react-native-paper";
 import {useCallback, useEffect, useLayoutEffect, useState} from "react";
 import {Platform, TextInput, TouchableOpacity, View} from "react-native";
@@ -62,7 +63,8 @@ export default function CardEditorModal({navigation, route}) {
         });
     }, [cardName]);
 
-    return (
+    return (<>
+        {Platform.OS === 'ios' && <StatusBar style="light"/>}
         <View style={modalStyles.rootLayout}>
             <Card mode="contained">
                 <Card.Content>
@@ -93,5 +95,5 @@ export default function CardEditorModal({navigation, route}) {
                 </Card.Content>
             </Card>
         </View>
-    )
+    </>)
 }
\ No newline at end of file
diff --git a/amnet-native/app/card/ManualCardEntry.tsx b/amnet-native/app/card/ManualCardEntry.tsx
index b6efc87..82d16a7 100644
--- a/amnet-native/app/card/ManualCardEntry.tsx
+++ b/amnet-native/app/card/ManualCardEntry.tsx
@@ -1,7 +1,8 @@
+import {StatusBar} from "expo-status-bar";
 import {generateCardNumber, DecodeAMAccessCode} from "amnet-shared";
 import {useCallback, useEffect, useLayoutEffect, useState} from "react";
-import {Alert, Platform, TextInput, TouchableOpacity, View} from "react-native";
 import {Button, Card, Divider, Text, useTheme} from "react-native-paper";
+import {Alert, Platform, TextInput, TouchableOpacity, View} from "react-native";
 
 import {AMCard} from "../../models/AMCard";
 import RealmContext from "../../models/RealmContext";
@@ -87,7 +88,8 @@ export default function CardAddModal({navigation, route}) {
         }
     }, []);
 
-    return (
+    return (<>
+        {Platform.OS == 'ios' && <StatusBar style="light"/>}
         <View style={modalStyles.rootLayout}>
             <Card mode="contained">
                 <Card.Content>
@@ -123,5 +125,5 @@ export default function CardAddModal({navigation, route}) {
 
             <Button mode="text" onPress={() => setCardNumber(generateCardNumber())}>Generate Access Code</Button>
         </View>
-    )
+    </>)
 }
diff --git a/amnet-native/app/card/PhyscialCardScan.tsx b/amnet-native/app/card/PhyscialCardScan.tsx
index aa4a2f4..3269c66 100644
--- a/amnet-native/app/card/PhyscialCardScan.tsx
+++ b/amnet-native/app/card/PhyscialCardScan.tsx
@@ -1,7 +1,8 @@
+import {StatusBar} from "expo-status-bar";
 import {useNavigation} from "@react-navigation/native";
 import {Card, Text, useTheme} from "react-native-paper";
 import {useCallback, useLayoutEffect, useState} from "react";
-import {TextInput, TouchableOpacity, View} from "react-native";
+import {Platform, TextInput, TouchableOpacity, View} from "react-native";
 
 import RealmContext from "../../models/RealmContext";
 import {useModalStyles} from "../../utils/ModalStyles";
@@ -57,7 +58,8 @@ export default function PhysicalCardScan() {
         })
     }, [navigation, modalStyles, cardName]);
 
-    return (
+    return (<>
+        {Platform.OS == 'ios' && <StatusBar style="light"/>}
         <View style={modalStyles.rootLayout}>
             <Card mode="contained">
                 <Card.Content>
@@ -81,5 +83,5 @@ export default function PhysicalCardScan() {
                 After the scan has completed, the card will be saved to your device.
             </Text>
         </View>
-    )
+    </>)
 }
\ No newline at end of file