Merge pull request #41 from funnyzak/feature/safearea_style

Author: funnyzak

src/navigation/Navigator.tsx

@@ -8,6 +8,7 @@ import {
   NavigationContainerRefWithCurrent,
   NavigationState,
   PartialState,
+  DefaultTheme,
   Route
 } from '@react-navigation/native'
 import { createNativeStackNavigator, NativeStackNavigationOptions } from '@react-navigation/native-stack'
@@ -194,7 +195,6 @@ const MainAppNavigator = ({ navigation, route }: MainScreenProps) => {
         options={{
           title: translate(`router.${ROUTES.HotDraw}`),
           ...defaultTabBarSetting(theme, insets),
-
           tabBarIcon: ({ focused }) =>
             renderBottomIcon(
               focused,
@@ -295,6 +295,13 @@ export const AppNavigationContainer = () => {
           ref={(navigatorRef: NavigationContainerRefWithCurrent<RootStackParamList>) => {
             NavigationService.setTopLevelNavigator(navigatorRef)
           }}
+          theme={{
+            dark: theme.name === 'dark',
+            colors: {
+              ...DefaultTheme.colors,
+              background: theme.colors.background
+            }
+          }}
           documentTitle={{
             formatter: (options, route) => `${options?.title ?? route?.name}`
           }}>

src/screens/login/SignIn.tsx

@@ -99,10 +99,9 @@ const Screen = ({
   }
 
   return (
-    <KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'padding' : 'height'}>
+    <View style={[SylCommon.Layout.fill, { backgroundColor: theme.colors.background }]}>
       <SetStatusBar backgroundColor={theme.colors.background} />
-      <StatusBar backgroundColor={theme.colors.background} />
-      <SafeAreaView style={[SylCommon.Layout.fill, { backgroundColor: theme.colors.background }]}>
+      <KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'padding' : 'height'} style={{ flex: 1 }}>
         <View style={[SylCommon.Card.container(theme), styles.mainContainer(theme)]}>
           <View style={styles.columnItem(theme)}>
             <Image
@@ -151,8 +150,8 @@ const Screen = ({
             </Text>
           </Pressable>
         </View>
-      </SafeAreaView>
-    </KeyboardAvoidingView>
+      </KeyboardAvoidingView>
+    </View>
   )
 }