From 9545288e341c0a7ec34836be82ceee9499855aa0 Mon Sep 17 00:00:00 2001
From: 11t518s <11t518s20161759@gmail.com>
Date: Sun, 6 Mar 2022 14:13:07 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20onboarding=20fix=20-=20android=20?=
=?UTF-8?q?=EC=9D=B4=EC=9A=A9=EC=8B=9C=20=ED=97=A4=EB=8D=94=EC=97=90=20com?=
=?UTF-8?q?ponent=20=EC=9D=B4=EB=A6=84=EC=9D=B4=20=EB=B3=B4=EC=9D=B4?=
=?UTF-8?q?=EB=8A=94=20=ED=98=84=EC=83=81=20=EC=88=98=EC=A0=95=20#14?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../StackNavigationOfOnBoarding.tsx | 4 ++--
react-native.config.js | 3 +++
screens/landing/styles.tsx | 20 ++++++++++++++-----
3 files changed, 20 insertions(+), 7 deletions(-)
create mode 100644 react-native.config.js
diff --git a/navigation/OnBoarding/StackNavigationOfOnBoarding.tsx b/navigation/OnBoarding/StackNavigationOfOnBoarding.tsx
index d81f4c8..6f85c53 100644
--- a/navigation/OnBoarding/StackNavigationOfOnBoarding.tsx
+++ b/navigation/OnBoarding/StackNavigationOfOnBoarding.tsx
@@ -32,7 +32,7 @@ function OnBoardingStack({ setIsLogin }: IProps) {
children={() => }
options={{
headerTransparent: true,
- headerTitle: '',
+ title: '',
headerLeft: () => (
navigation.goBack()}>
@@ -45,7 +45,7 @@ function OnBoardingStack({ setIsLogin }: IProps) {
component={OnBoarding}
options={{
headerTransparent: true,
- headerTitle: '',
+ title: '',
headerLeft: () => (
navigation.goBack()}>
diff --git a/react-native.config.js b/react-native.config.js
new file mode 100644
index 0000000..240776e
--- /dev/null
+++ 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
index 0a82924..80d62e9 100644
--- 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 },