From 1fdd394e9d53beabcd78bc1272dff5593c8ac5b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B3=A0=EB=B3=91=EC=B0=AC?= <70642609+byungchanKo99@users.noreply.github.com> Date: Mon, 18 Nov 2024 17:58:45 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[SZ-522]feat:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=20=ED=99=94=EB=A9=B4=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/index.jsx | 189 +++++++++++++++++++------- assets/googleIcon.png | Bin 0 -> 17458 bytes components/{ => icons}/GoogleIcon.jsx | 0 components/icons/GoogleImageIcon.tsx | 29 ++++ theme/mapping.json | 8 +- 5 files changed, 171 insertions(+), 55 deletions(-) create mode 100644 assets/googleIcon.png rename components/{ => icons}/GoogleIcon.jsx (100%) create mode 100644 components/icons/GoogleImageIcon.tsx diff --git a/app/index.jsx b/app/index.jsx index cc80476..76cf368 100755 --- a/app/index.jsx +++ b/app/index.jsx @@ -4,11 +4,32 @@ import useGoogleAuth from '@/hooks/auth/useGoogleAuth'; import useNotificationPermission from '@/hooks/auth/useNotificationPermission'; import '@/locales/index'; import { AppleButton } from '@invertase/react-native-apple-authentication'; -import { GoogleSigninButton } from '@react-native-google-signin/google-signin'; -import { Text } from '@ui-kitten/components'; import { StatusBar } from 'expo-status-bar'; -import { Image, Linking, Platform, StyleSheet, View } from 'react-native'; -import imageSource from '../assets/todo_logo.png'; +import { Linking, Platform, View } from 'react-native'; +import { moderateScale, scale, verticalScale } from 'react-native-size-matters'; +import * as Animatable from 'react-native-animatable'; +import { + useStyleSheet, + StyleService, + Layout, + Button, + Text, +} from '@ui-kitten/components'; +import GoogleImageIcon from '@/components/icons/GoogleImageIcon'; + +const PlaceholderItem = () => { + const styles = useStyleSheet(themedStyles); + return ( + + + + + ); +}; + +const AccessoryLeft = () => ( + +); const Login = () => { const { signInWithGoogle } = useGoogleAuth(); @@ -17,43 +38,66 @@ const Login = () => { isMessagingPermissionAlertModalVisible, setIsMessagingPermissionAlertModalVisible, } = useNotificationPermission(); + const styles = useStyleSheet(themedStyles); return ( - + - - - - - - OneStep - - - {Platform.OS === 'android' ? ( - { - signInWithGoogle(); - }} - /> - ) : null} - {Platform.OS === 'ios' ? ( - { - signInWithApple(); - }} - /> - ) : null} - + + {'할 일을 정리하고,\n한 걸음씩 이뤄보세요'} + + + + + + + + + + + + + + + + {Platform.OS === 'android' ? ( + + ) : null} + {Platform.OS === 'ios' ? ( + { + signInWithApple(); + }} + /> + ) : null} + { @@ -68,16 +112,49 @@ const Login = () => { confirmTextKey="common.yes" cancelTextKey="common.no" /> - + ); }; -const styles = StyleSheet.create({ +const themedStyles = StyleService.create({ container: { flex: 1, - backgroundColor: '#fff', + backgroundColor: 'background-basic-color-1', + paddingHorizontal: scale(20), + paddingTop: verticalScale(120), + paddingBottom: verticalScale(20), + }, + title: { + fontSize: moderateScale(28), + fontWeight: 'bold', + color: 'text-basic-color', + marginBottom: verticalScale(40), + lineHeight: moderateScale(34), + }, + placeholderContainer: { + flex: 1, + gap: verticalScale(16), + }, + placeholderItem: { + flexDirection: 'row', alignItems: 'center', - justifyContent: 'center', + backgroundColor: 'background-basic-color-2', + padding: moderateScale(16), + borderRadius: moderateScale(12), + gap: scale(12), + height: scale(64), + }, + placeholderCircle: { + width: scale(33), + height: scale(33), + borderRadius: moderateScale(10), + backgroundColor: 'background-basic-color-3', + }, + placeholderLine: { + height: scale(12), + backgroundColor: 'background-basic-color-3', + borderRadius: moderateScale(6), + width: scale(97), }, iconContainer: { flex: 1, @@ -86,6 +163,7 @@ const styles = StyleSheet.create({ alignContent: 'center', justifyContent: 'center', }, + buttonContainer: {}, icon: { height: '100%', width: '100%', @@ -93,15 +171,6 @@ const styles = StyleSheet.create({ alignContent: 'center', justifyContent: 'center', }, - buttonAndTextContainer: { - flex: 1, - alignItems: 'center', - justifyContent: 'center', - }, - buttonContainer: { - marginTop: 40, - justifyContent: 'center', - }, textContainer: { marginBottom: 40, }, @@ -111,9 +180,25 @@ const styles = StyleSheet.create({ justifyContent: 'center', }, button: { + flexDirection: 'row', alignItems: 'center', - justifyContent: 'center', - margin: 5, + paddingVertical: moderateScale(12), + paddingHorizontal: moderateScale(16), + borderRadius: moderateScale(8), + borderWidth: 1, + borderColor: 'background-basic-color-3', + }, + googleButton: { + backgroundColor: 'white', + borderWidth: 1, + borderColor: '#E0E0E0', + borderRadius: moderateScale(8), + height: verticalScale(48), + }, + googleButtonText: { + fontSize: moderateScale(16), + fontWeight: 700, + color: '#202020', }, }); diff --git a/assets/googleIcon.png b/assets/googleIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..304c5499e9221632476a84fbf43c377bc89985ad GIT binary patch literal 17458 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

SC^3&@v1Sx4Mryz9{z%q~}2XT?EVu!XU| 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 { + return ( + + + + + + + + + ); +}; + +export default GoogleImageIcon; diff --git a/theme/mapping.json b/theme/mapping.json index 2f1f04e..fca957c 100644 --- a/theme/mapping.json +++ b/theme/mapping.json @@ -246,9 +246,11 @@ }, "Button": { "appearances": { - "variantGroups": { - "size": { - "large": {} + "filled": { + "variantGroups": { + "status": { + "basic": {} + } } } } From 683ea77546ed77f2387bbdfe7995c4da22cdbbd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B3=A0=EB=B3=91=EC=B0=AC?= <70642609+byungchanKo99@users.noreply.github.com> Date: Mon, 18 Nov 2024 18:12:39 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[SZ-522]feat:=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/index.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/index.jsx b/app/index.jsx index 76cf368..4364654 100755 --- a/app/index.jsx +++ b/app/index.jsx @@ -89,8 +89,8 @@ const Login = () => { buttonStyle={AppleButton.Style.BLACK} buttonType={AppleButton.Type.SIGN_IN} style={{ - width: 160, // You must specify a width - height: 45, // You must specify a height + width: '100%', + height: scale(52), // You must specify a height }} onPress={() => { signInWithApple(); @@ -193,7 +193,7 @@ const themedStyles = StyleService.create({ borderWidth: 1, borderColor: '#E0E0E0', borderRadius: moderateScale(8), - height: verticalScale(48), + height: verticalScale(52), }, googleButtonText: { fontSize: moderateScale(16), From b044150f118cfabd135e6f3797d48bbf34c01c6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B3=A0=EB=B3=91=EC=B0=AC?= <70642609+byungchanKo99@users.noreply.github.com> Date: Mon, 18 Nov 2024 18:16:59 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[SZ-522]fix:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=20=EB=B2=84=ED=8A=BC=20=EB=86=92=EC=9D=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/index.jsx b/app/index.jsx index 4364654..95589ff 100755 --- a/app/index.jsx +++ b/app/index.jsx @@ -122,7 +122,7 @@ const themedStyles = StyleService.create({ backgroundColor: 'background-basic-color-1', paddingHorizontal: scale(20), paddingTop: verticalScale(120), - paddingBottom: verticalScale(20), + paddingBottom: verticalScale(40), }, title: { fontSize: moderateScale(28),