feat: onboarding

fix - android 이용시 헤더에 component 이름이 보이는 현상 수정 #14
Amattang · Mar 6, 2022 · 9545288 · 9545288
1 parent a4e60bf
commit 9545288
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/navigation/OnBoarding/StackNavigationOfOnBoarding.tsx b/navigation/OnBoarding/StackNavigationOfOnBoarding.tsx
@@ -32,7 +32,7 @@ function OnBoardingStack({ setIsLogin }: IProps) {
         children={() => <Login setIsLogin={setIsLogin} />}
         options={{
           headerTransparent: true,
-          headerTitle: '',
+          title: '',
           headerLeft: () => (
             <Pressable onPress={() => navigation.goBack()}>
               <Image source={require('../../assets/images/common/leftArrow.png')} />
@@ -45,7 +45,7 @@ function OnBoardingStack({ setIsLogin }: IProps) {
         component={OnBoarding}
         options={{
           headerTransparent: true,
-          headerTitle: '',
+          title: '',
           headerLeft: () => (
             <Pressable onPress={() => navigation.goBack()}>
               <Image source={require('../../assets/images/common/leftArrow.png')} />

diff --git a/react-native.config.js b/react-native.config.js
@@ -0,0 +1,3 @@
+module.exports = {
+  assets: ['./src/assets/fonts'],
+};
diff --git a/screens/landing/styles.tsx b/screens/landing/styles.tsx
@@ -1,11 +1,21 @@
-import { StyleSheet } from 'react-native';
+import { StyleSheet, Platform } from 'react-native';
 import { mainBlack, mainBlue, mainLightBlue, mainOrange } from '../../color';
 
 const styles = StyleSheet.create({
-  landingPageFullScreen: { backgroundColor: 'white', flex: 1 },
-  onBoardingFullScreen: { backgroundColor: mainLightBlue, flex: 1 },
-  upperElement: { marginTop: 115, marginHorizontal: 17 },
-  lowerElement: { position: 'absolute', bottom: 60, marginHorizontal: '5%', width: '90%' },
+  landingPageFullScreen: { backgroundColor: 'white', flex: 1, fontFamily: 'AppleSDGothicNeoM' },
+  onBoardingFullScreen: {
+    backgroundColor: mainLightBlue,
+    flex: 1,
+    fontFamily: 'AppleSDGothicNeoM',
+  },
+  upperElement:
+    Platform.OS === 'ios'
+      ? { marginTop: 110, marginHorizontal: 17 }
+      : { marginTop: 50, marginHorizontal: 17 },
+  lowerElement:
+    Platform.OS === 'ios'
+      ? { position: 'absolute', bottom: 60, marginHorizontal: '5%', width: '90%' }
+      : { position: 'absolute', bottom: 40, marginHorizontal: '5%', width: '90%' },
   mainText: { fontSize: 24, lineHeight: 40, color: mainBlack },
   subText: { marginTop: 32, lineHeight: 30, color: mainBlack },