From 6e01d834534be10a77e4b6f09d598a34a9c72c96 Mon Sep 17 00:00:00 2001
From: KimHyeongKeun <107840065+KimHyeongKeun@users.noreply.github.com>
Date: Mon, 19 Jun 2023 02:19:53 +0900
Subject: [PATCH 1/6] ToDo.js

---
 src/components/CheckBox2.js         | 37 +++++++++++++++++++++++++++++
 src/components/Checkbox.js          |  2 +-
 src/components/input2.js            | 21 +++++++++-------
 src/screens/Calendar/BottomSheet.js |  4 +---
 src/screens/Calendar/ToDo.js        | 27 ++++++++++++++++++---
 5 files changed, 76 insertions(+), 15 deletions(-)
 create mode 100644 src/components/CheckBox2.js

diff --git a/src/components/CheckBox2.js b/src/components/CheckBox2.js
new file mode 100644
index 0000000..a577ad1
--- /dev/null
+++ b/src/components/CheckBox2.js
@@ -0,0 +1,37 @@
+import { Pressable, StyleSheet, Text, View } from "react-native";
+import React from "react";
+import { MaterialCommunityIcons } from "@expo/vector-icons";
+  
+const CheckBox2 = (props) => {
+    const iconName = props.isChecked ?
+        "checkbox-marked" : "checkbox-blank-outline";
+  
+    return (
+        <View style={styles.container}>
+            <Pressable onPress={props.onPress}>
+                <MaterialCommunityIcons 
+                    name={iconName} size={24} color="#000" />
+            </Pressable>
+        </View>
+    );
+};
+  
+export default CheckBox2;
+  
+const styles = StyleSheet.create({
+    container: {
+        // justifyContent: "flex-start",
+        // alignItems: "center",
+        flexDirection: "row",
+        width: 20,
+        marginTop: 28,
+        marginHorizontal: 5,
+    },
+    title: {
+        fontSize: 18,
+        color: "#000",
+        marginLeft: 5,
+        fontWeight: "500",
+
+    },
+});
\ No newline at end of file
diff --git a/src/components/Checkbox.js b/src/components/Checkbox.js
index 652de27..235c8b3 100644
--- a/src/components/Checkbox.js
+++ b/src/components/Checkbox.js
@@ -25,7 +25,7 @@ const styles = StyleSheet.create({
         // alignItems: "center",
         flexDirection: "row",
         width: 250,
-        marginTop: 20,
+        marginTop: 30,
         marginHorizontal: 5,
     },
     title: {
diff --git a/src/components/input2.js b/src/components/input2.js
index ae3b61d..77f810b 100644
--- a/src/components/input2.js
+++ b/src/components/input2.js
@@ -40,26 +40,31 @@ Input2.displayName = "Input2";
 const defaultStyles = StyleSheet.create({
   container: {
     width: "50%",
-    marginRight: 10,
-    // justifyContent: 'center'
+    // marginRight: 100,
+    marginRight: 20,
+    justifyContent: 'flex-start',
+    marginLeft: 3,
+    
 
   },
   title: {
-    marginBottom: 4,
-    fontWeight: "100",
+    marginBottom: 17,
+    fontWeight: "700",
+    fontSize: 16,
+    width:'150%',
+    
   },
   input: {
     // flexDirection: "row",
-
     borderBottomWidth: 2,
-    borderRadius: 1,
-    height: 15,
+    // borderRadius: 1,
+    // height: 15,
     // justifyContent: 'center'
     // paddingHorizontal: 10,
 
   },
   icon: {
-    paddingHorizontal:100,
+    paddingHorizontal:300,
     // position: "absolute",
     // left: 8,
     // height: "100%",
diff --git a/src/screens/Calendar/BottomSheet.js b/src/screens/Calendar/BottomSheet.js
index dea12c5..0864f81 100644
--- a/src/screens/Calendar/BottomSheet.js
+++ b/src/screens/Calendar/BottomSheet.js
@@ -15,11 +15,9 @@ import Button2 from '../../components/Button2';
 import { BLACK, GRAY, PRIMARY, WHITE, GHOSTWHITE, LIGHTGRAY, ALICEBLUE } from '../../colors';
 import Calendar from 'react-calendar';
 import ToDo from './ToDo';
-import Logo from '../../components/Logo';
 import { AuthRoutes } from '../../navigations/routes';
 import { useNavigation } from '@react-navigation/native';
-
-
+import Logo from '../../components/Logo';
 
 
 
diff --git a/src/screens/Calendar/ToDo.js b/src/screens/Calendar/ToDo.js
index 8bdef19..4118cb1 100644
--- a/src/screens/Calendar/ToDo.js
+++ b/src/screens/Calendar/ToDo.js
@@ -24,6 +24,7 @@ import {
     import React from 'react';
     import BottomSheet from './BottomSheet';
     import Button2 from '../../components/Button2';
+    import CheckBox2 from '../../components/CheckBox2';
 
 
 
@@ -130,21 +131,26 @@ import {
 
         <View style={{ flexDirection: 'row'}}>
 
-            <CheckBox
+            <View style={styles.aa}>
+            <CheckBox2 style={styles.aa}
                 onPress={() => setBlank(!isBlank)}
                 isChecked={isBlank}
+            
               />
+            </View>
 
+            <View style={{}}>
             <Input2 
                 keyboardType={KeyboardTypes.DEFAULT}
                 returnKeyType = {ReturnKeyTypes.NEXT}
                 value={email}
                 onChangeText = {(email) => setEmail(email.trim())}
             />
+            </View>
 
         </View>
 
-             <View style={styles.m}>
+             <View style={styles.mm}>
             <Button style={styles.c} title= "완료" onPress ={() => navigation.navigate(AuthRoutes.CalendarView)}/>
 
             </View>
@@ -191,6 +197,8 @@ import {
     size: {
         fontSize:20,
         fontWeight: 'bold',
+        marginTop: 6,
+
         
     },
     round:{
@@ -255,6 +263,8 @@ import {
     },
     m: {
         marginTop: 250,
+        paddingHorizontal: 40,
+
     },
     c: {
         color:'#add8e6',
@@ -264,7 +274,18 @@ import {
         justifyContent: 'center',
         alignItems: 'center',
         margin: 40,
-    }
+    },
+    aa:{
+        marginLeft: 38,
+    },
+    bb: {
+        // marginRight:,
+    },
+    mm: {
+        marginTop: 200,
+        paddingHorizontal: 40,
+
+    },
 
   });
   

From 7f19367d076c743e51eb3d634db3a8126a7b320f Mon Sep 17 00:00:00 2001
From: KimHyeongKeun <107840065+KimHyeongKeun@users.noreply.github.com>
Date: Mon, 19 Jun 2023 02:31:27 +0900
Subject: [PATCH 2/6] =?UTF-8?q?[Fix]ToDo=ED=99=94=EB=A9=B4=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/App.js b/src/App.js
index 22873d6..fc0495e 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import { StatusBar } from 'expo-status-bar';
 import { StyleSheet, View } from 'react-native';
 import SignInScreen from './screens/SignInScreen';
@@ -5,16 +6,25 @@ import SignUpScreen from './screens/SignUpScreen';
 import Logo from './components/Logo';
 import Navigation from './navigations/Navigation';
 import SettingScreen from './screens/SettingScreen';
+=======
+import { StatusBar } from "expo-status-bar";
+import { StyleSheet, Text, View } from "react-native";
+>>>>>>> 410b0f6 (first)
 
 export default function App() {
   return (
     <View style={styles.container}>
+<<<<<<< HEAD
       <StatusBar style="auto" />
       {/* <SignUpScreen /> */}
       {/* <StatusBar style="dark" /> */}
       <Navigation>
         <SignInScreen />
       </Navigation>
+=======
+      <Text>Open up App.js to start working on your app!</Text>
+      <StatusBar style="auto" />
+>>>>>>> 410b0f6 (first)
     </View>
   );
 }
@@ -22,9 +32,15 @@ export default function App() {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
+<<<<<<< HEAD
     backgroundColor: '#fff',
     // alignItems: 'center',
     // justifyContent: 'center',
     width: '100%',
+=======
+    backgroundColor: "#fff",
+    alignItems: "center",
+    justifyContent: "center",
+>>>>>>> 410b0f6 (first)
   },
 });

From b8a8d021030555a615a714b658a69fc538181e17 Mon Sep 17 00:00:00 2001
From: KimHyeongKeun <107840065+KimHyeongKeun@users.noreply.github.com>
Date: Mon, 19 Jun 2023 14:12:35 +0900
Subject: [PATCH 3/6] =?UTF-8?q?[Fix]ToDo=ED=99=94=EB=A9=B4=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.js | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/App.js b/src/App.js
index fc0495e..ae7b68e 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import { StatusBar } from 'expo-status-bar';
 import { StyleSheet, View } from 'react-native';
 import SignInScreen from './screens/SignInScreen';
@@ -6,25 +5,16 @@ import SignUpScreen from './screens/SignUpScreen';
 import Logo from './components/Logo';
 import Navigation from './navigations/Navigation';
 import SettingScreen from './screens/SettingScreen';
-=======
-import { StatusBar } from "expo-status-bar";
-import { StyleSheet, Text, View } from "react-native";
->>>>>>> 410b0f6 (first)
 
 export default function App() {
   return (
     <View style={styles.container}>
-<<<<<<< HEAD
       <StatusBar style="auto" />
       {/* <SignUpScreen /> */}
       {/* <StatusBar style="dark" /> */}
       <Navigation>
         <SignInScreen />
       </Navigation>
-=======
-      <Text>Open up App.js to start working on your app!</Text>
-      <StatusBar style="auto" />
->>>>>>> 410b0f6 (first)
     </View>
   );
 }
@@ -32,15 +22,9 @@ export default function App() {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-<<<<<<< HEAD
     backgroundColor: '#fff',
     // alignItems: 'center',
     // justifyContent: 'center',
     width: '100%',
-=======
-    backgroundColor: "#fff",
-    alignItems: "center",
-    justifyContent: "center",
->>>>>>> 410b0f6 (first)
   },
-});
+});
\ No newline at end of file

From 519387c64ab35f6b6bc7d97e83b7e0086230959a Mon Sep 17 00:00:00 2001
From: KimHyeongKeun <107840065+KimHyeongKeun@users.noreply.github.com>
Date: Mon, 19 Jun 2023 17:48:02 +0900
Subject: [PATCH 4/6] =?UTF-8?q?[Fix]=20=EC=BA=98=EB=A6=B0=EB=8D=94=20?=
 =?UTF-8?q?=EB=B2=84=ED=8A=BC=20add]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/screens/Calendar/BottomSheet.js  |  2 ++
 src/screens/Calendar/CalendarView.js | 43 ++++++++++++++++++++++++++++
 src/screens/Calendar/ToDo.js         | 14 +++++----
 3 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/src/screens/Calendar/BottomSheet.js b/src/screens/Calendar/BottomSheet.js
index 0864f81..e8ac382 100644
--- a/src/screens/Calendar/BottomSheet.js
+++ b/src/screens/Calendar/BottomSheet.js
@@ -205,6 +205,8 @@ const BottomSheet = (props) => {
                         title="📅날짜 바꾸기"
                         // onPress={pressButton}
                     ></Button2>     
+                     
+                    {/* <Calendar></Calendar>*/}
                 
                 </Animated.View>
                   
diff --git a/src/screens/Calendar/CalendarView.js b/src/screens/Calendar/CalendarView.js
index e77c996..0d9beeb 100644
--- a/src/screens/Calendar/CalendarView.js
+++ b/src/screens/Calendar/CalendarView.js
@@ -10,6 +10,8 @@ import { AuthRoutes } from "../../navigations/routes";
 import Day from "react-native-calendars/src/calendar/day";
 import Logo from "../../components/Logo";
 import Gear from "../../components/Gear";
+import SwitchSelector from "react-native-switch-selector";
+import { Colors } from "react-native/Libraries/NewAppScreen";
 
 
 function CalanderView() {
@@ -53,6 +55,13 @@ function CalanderView() {
     }
     
   }
+  
+  const options = [
+    { label: "할일", value: "todo", selectedBackgroundColor: "#0097e6",},
+    { label: "일기", value: "diary" },
+
+  
+  ];
 
 
   return (
@@ -88,6 +97,36 @@ function CalanderView() {
       onDayPress ={(day) => navigation.navigate(AuthRoutes.ToDo)}
       />
 
+      <Text></Text>
+      <Text></Text>
+      <Text></Text>
+      <Text></Text>
+      <Text></Text>
+
+
+      <SwitchSelector 
+       backgroundColor={"#f5f5f5"}
+       buttonColor="lightskyblue"
+       fontColor="black"
+       selectedFontColor="black"
+       fontSize={30}
+       options={options}
+       initial={1}
+       buttonMargin={10}
+       borderWidth={3}
+       borderColor="black"
+       height={70}
+       hasPadding
+       bold
+       style={{ transform: [{ scaleX: .6 }, { scaleY: .6 }] }}
+
+      //  height={10}
+        onPress={value => console.log(`Call onPress with value: ${value}`)}      
+      />
+
+
+        
+
 
 
 <View style={styles.container}>
@@ -155,6 +194,10 @@ const styles3 = StyleSheet.create({
   a: {
     alignItems: 'center',
     
+  },
+  v:{
+    color: `#6495ed` ,
+    marginBottom: 20,
   } 
  
 });
diff --git a/src/screens/Calendar/ToDo.js b/src/screens/Calendar/ToDo.js
index 4118cb1..68bd940 100644
--- a/src/screens/Calendar/ToDo.js
+++ b/src/screens/Calendar/ToDo.js
@@ -30,18 +30,20 @@ import {
 
 
   const ToDo = (props) => {
-    const [email, setEmail] = useState('');
+    // const [email, setEmail] = useState('');
     const [password, setPassword] = useState('');
     const [disabled, setDisabled] = useState(true);
     const navigation = useNavigation();
+    const [todo, setTodo] = useState('');
   
     useEffect(() => {
-      setDisabled(!(email.trim() && password.trim()));
-    }, [email, password]);
+      setDisabled(!(todo.trim() && password.trim()));
+    }, [todo, password]);
+
+
   
     const onSubmit = () => {
       Keyboard.dismiss();
-      console.log(email, password);
     };
   
 
@@ -143,8 +145,8 @@ import {
             <Input2 
                 keyboardType={KeyboardTypes.DEFAULT}
                 returnKeyType = {ReturnKeyTypes.NEXT}
-                value={email}
-                onChangeText = {(email) => setEmail(email.trim())}
+                value={todo}
+                onChangeText = {(todo) => setTodo(todo.trim())}
             />
             </View>
 

From d1c40d6a860e3978b3738e211cf3b50b90af5829 Mon Sep 17 00:00:00 2001
From: KimHyeongKeun <107840065+KimHyeongKeun@users.noreply.github.com>
Date: Mon, 19 Jun 2023 18:46:31 +0900
Subject: [PATCH 5/6] pull test

---
 package-lock.json | 9 +++++++++
 package.json      | 1 +
 2 files changed, 10 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index 5661966..86c323b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,6 +27,7 @@
         "react-native-navigation": "^7.33.4",
         "react-native-reanimated": "^2.14.4",
         "react-native-svg": "^13.9.0",
+        "react-native-switch-selector": "^2.3.0",
         "react-native-web": "~0.18.10",
         "typescript": "^4.9.4"
       },
@@ -16059,6 +16060,14 @@
       "resolved": "https://registry.npmjs.org/react-native-swipe-gestures/-/react-native-swipe-gestures-1.0.5.tgz",
       "integrity": "sha512-Ns7Bn9H/Tyw278+5SQx9oAblDZ7JixyzeOczcBK8dipQk2pD7Djkcfnf1nB/8RErAmMLL9iXgW0QHqiII8AhKw=="
     },
+    "node_modules/react-native-switch-selector": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/react-native-switch-selector/-/react-native-switch-selector-2.3.0.tgz",
+      "integrity": "sha512-BnhbC7vRu5HIanANszNS5rbrXqYwDggJGg/Xik2NXDA1FSzId/WrxU5hicmmZzTrQSh9N5TS76YsnG1swNzBpA==",
+      "dependencies": {
+        "prop-types": "^15.7.2"
+      }
+    },
     "node_modules/react-native-web": {
       "version": "0.18.12",
       "resolved": "https://registry.npmjs.org/react-native-web/-/react-native-web-0.18.12.tgz",
diff --git a/package.json b/package.json
index 3cde670..f0760e8 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
     "react-native-navigation": "^7.33.4",
     "react-native-reanimated": "^2.14.4",
     "react-native-svg": "^13.9.0",
+    "react-native-switch-selector": "^2.3.0",
     "react-native-web": "~0.18.10",
     "typescript": "^4.9.4"
   },

From 2bdde7ec66ca0194496a8a43020ae3f029fda28f Mon Sep 17 00:00:00 2001
From: KimHyeongKeun <107840065+KimHyeongKeun@users.noreply.github.com>
Date: Mon, 19 Jun 2023 19:40:07 +0900
Subject: [PATCH 6/6] test

---
 package-lock.json                    | 168 +++++++++++
 package.json                         |   1 +
 src/screens/Calendar/CalendarView.js | 417 ++++++++++++++++++---------
 src/screens/InformationScreen.js     |   3 +-
 src/screens/NoticeScreen.js          |   3 +-
 src/screens/PrivacyPolicyScreen.js   |   3 +-
 src/screens/SignUpScreen.js          |  33 ++-
 7 files changed, 474 insertions(+), 154 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 86c323b..f28a8b5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
         "@react-navigation/native": "^6.1.6",
         "@react-navigation/native-stack": "^6.9.12",
         "@react-navigation/stack": "^6.3.16",
+        "@rneui/themed": "^4.0.0-rc.7",
         "@types/react": "~18.0.27",
         "date-fns": "^2.30.0",
         "expo": "~48.0.18",
@@ -5258,6 +5259,59 @@
         "react-native-screens": ">= 3.0.0"
       }
     },
+    "node_modules/@rneui/base": {
+      "version": "4.0.0-rc.7",
+      "resolved": "https://registry.npmjs.org/@rneui/base/-/base-4.0.0-rc.7.tgz",
+      "integrity": "sha512-dffzoYek3Qp+7wJzC42QjI/Fu1HOUNxFIR88t1laDrBV5QZQB55f+Vu5zLbC80/bh1b8fYtl63HTIWpORuA3Eg==",
+      "peer": true,
+      "dependencies": {
+        "@types/react-native-vector-icons": "^6.4.10",
+        "color": "^3.2.1",
+        "deepmerge": "^4.2.2",
+        "hoist-non-react-statics": "^3.3.2",
+        "react-native-ratings": "^8.1.0",
+        "react-native-size-matters": "^0.4.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/react-native-elements"
+      },
+      "peerDependencies": {
+        "react-native-safe-area-context": "^3.1.9 || ^4.0.0",
+        "react-native-vector-icons": ">7.0.0"
+      }
+    },
+    "node_modules/@rneui/base/node_modules/color": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
+      "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
+      "peer": true,
+      "dependencies": {
+        "color-convert": "^1.9.3",
+        "color-string": "^1.6.0"
+      }
+    },
+    "node_modules/@rneui/base/node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@rneui/themed": {
+      "version": "4.0.0-rc.7",
+      "resolved": "https://registry.npmjs.org/@rneui/themed/-/themed-4.0.0-rc.7.tgz",
+      "integrity": "sha512-nRF95gFTv/8JEx01L8q9p9VWKE5M/luPWPKYsWHKUQ5PHqwveQId/V5+ba9yiXsYIl9VbJJ1nLlqfHVP00u/3Q==",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/react-native-elements"
+      },
+      "peerDependencies": {
+        "@rneui/base": "4.0.0-rc.7"
+      }
+    },
     "node_modules/@segment/loosely-validate-event": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@segment/loosely-validate-event/-/loosely-validate-event-2.0.0.tgz",
@@ -5500,6 +5554,25 @@
         "csstype": "^3.0.2"
       }
     },
+    "node_modules/@types/react-native": {
+      "version": "0.70.14",
+      "resolved": "https://registry.npmjs.org/@types/react-native/-/react-native-0.70.14.tgz",
+      "integrity": "sha512-Kwc+BYBrnDqvacNxKp1UtcZJnJJnTih2NYmi/ieAKlHdxEPN6sYMwmIwgHdoLHggvml6bf3DYRaH2jt+gzaLjw==",
+      "peer": true,
+      "dependencies": {
+        "@types/react": "*"
+      }
+    },
+    "node_modules/@types/react-native-vector-icons": {
+      "version": "6.4.13",
+      "resolved": "https://registry.npmjs.org/@types/react-native-vector-icons/-/react-native-vector-icons-6.4.13.tgz",
+      "integrity": "sha512-1PqFoKuXTSzMHwGMAr+REdYJBQAbe9xrww3ecZR0FsHcD1K+vGS/rxuAriL4rsI6+p69sZQjDzpEVAbDQcjSwA==",
+      "peer": true,
+      "dependencies": {
+        "@types/react": "*",
+        "@types/react-native": "^0.70"
+      }
+    },
     "node_modules/@types/retry": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
@@ -15933,6 +16006,19 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
       "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
     },
+    "node_modules/react-native-ratings": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/react-native-ratings/-/react-native-ratings-8.1.0.tgz",
+      "integrity": "sha512-+QOJ4G3NjVkI1D+tk4EGx1dCvVfbD2nQdkrj9cXrcAoEiwmbep4z4bZbCKmWMpQ5h2dqbxABU8/eBnbDmvAc3g==",
+      "peer": true,
+      "dependencies": {
+        "lodash": "^4.17.15"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
+      }
+    },
     "node_modules/react-native-reanimated": {
       "version": "2.14.4",
       "resolved": "https://registry.npmjs.org/react-native-reanimated/-/react-native-reanimated-2.14.4.tgz",
@@ -15976,6 +16062,15 @@
         "react-native": "*"
       }
     },
+    "node_modules/react-native-size-matters": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/react-native-size-matters/-/react-native-size-matters-0.4.0.tgz",
+      "integrity": "sha512-8/C0htHrFWeUm9N8JegmadovUfgTWkGBkDPZ1N3YkXtDWb+98Ya2gThiKcu445r8c7YhcrBfnHz/mYsXIusaOQ==",
+      "peer": true,
+      "peerDependencies": {
+        "react-native": "*"
+      }
+    },
     "node_modules/react-native-svg": {
       "version": "13.9.0",
       "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-13.9.0.tgz",
@@ -16068,6 +16163,79 @@
         "prop-types": "^15.7.2"
       }
     },
+    "node_modules/react-native-vector-icons": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/react-native-vector-icons/-/react-native-vector-icons-9.2.0.tgz",
+      "integrity": "sha512-wKYLaFuQST/chH3AJRjmOLoLy3JEs1JR6zMNgTaemFpNoXs0ztRnTxcxFD9xhX7cJe1/zoN5BpQYe7kL0m5yyA==",
+      "peer": true,
+      "dependencies": {
+        "prop-types": "^15.7.2",
+        "yargs": "^16.1.1"
+      },
+      "bin": {
+        "fa5-upgrade": "bin/fa5-upgrade.sh",
+        "generate-icon": "bin/generate-icon.js"
+      }
+    },
+    "node_modules/react-native-vector-icons/node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "peer": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/react-native-vector-icons/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "peer": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/react-native-vector-icons/node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/react-native-vector-icons/node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "peer": true,
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/react-native-vector-icons/node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/react-native-web": {
       "version": "0.18.12",
       "resolved": "https://registry.npmjs.org/react-native-web/-/react-native-web-0.18.12.tgz",
diff --git a/package.json b/package.json
index f0760e8..5223309 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
     "@react-navigation/native": "^6.1.6",
     "@react-navigation/native-stack": "^6.9.12",
     "@react-navigation/stack": "^6.3.16",
+    "@rneui/themed": "^4.0.0-rc.7",
     "@types/react": "~18.0.27",
     "date-fns": "^2.30.0",
     "expo": "~48.0.18",
diff --git a/src/screens/Calendar/CalendarView.js b/src/screens/Calendar/CalendarView.js
index 0d9beeb..80a07c2 100644
--- a/src/screens/Calendar/CalendarView.js
+++ b/src/screens/Calendar/CalendarView.js
@@ -1,140 +1,284 @@
-import React, { useContext, useState ,Pressable} from "react";
-import { format } from "date-fns";
-import { Calendar } from "react-native-calendars";
-import { StyleSheet,View, Text } from "react-native";
-import BouncyCheckbox from "react-native-bouncy-checkbox";
-import { useNavigation } from '@react-navigation/native';
-import { Navigation } from "react-calendar";
-// import Button from "../../components/button";
-import { AuthRoutes } from "../../navigations/routes";
-import Day from "react-native-calendars/src/calendar/day";
-import Logo from "../../components/Logo";
-import Gear from "../../components/Gear";
-import SwitchSelector from "react-native-switch-selector";
-import { Colors } from "react-native/Libraries/NewAppScreen";
+// import React, { useContext, useState ,Pressable} from "react";
+// import { format } from "date-fns";
+// import { Calendar } from "react-native-calendars";
+// import { StyleSheet,View, Text } from "react-native";
+// import BouncyCheckbox from "react-native-bouncy-checkbox";
+// import { useNavigation } from '@react-navigation/native';
+// import { Navigation } from "react-calendar";
+// // import Button from "../../components/button";
+// import { AuthRoutes } from "../../navigations/routes";
+// import Day from "react-native-calendars/src/calendar/day";
+// import Logo from "../../components/Logo";
+// import Gear from "../../components/Gear";
+// import SwitchSelector from "react-native-switch-selector";
+// import { Colors } from "react-native/Libraries/NewAppScreen";
+
+
+// function CalanderView() {
+
+//   const [ modalVisible, setModalVisible ] = useState(false);
+//   const pressButton = () => {
+//       setModalVisible(true);
+//   }
+
+//   <View style = {styles.container}>
+
+
+//   </View>
+
+//   const navigation = useNavigation();
+
+//   const posts = [
+//     {
+//       date: "2023-06-19",
+//     },
+//     {   
+//       date: "2023-06-27",
+//     }
+//   ];
+//   const markedDates = posts.reduce((acc, current) => {
+//     const formattedDate = format(new Date(current.date), 'yyyy-MM-dd');
+//     <Text>aa</Text>
+//     acc[formattedDate] = {marked: true};
+//     return acc;
+//   }, {});
+
+//   const [selectedDate, setSelectedDate] = useState(
+//     format(new Date(), "yyyy-MM-dd"),
+//   );
+//   const markedSelectedDates = {
+//     ...markedDates,
+//     [selectedDate]: {
+//       selected: true,
+//       marked: markedDates[selectedDate]?.marked,
+      
+//     }
+    
+//   }
+  
+//   const options = [
+//     { label: "할일", value: "todo", selectedBackgroundColor: "#0097e6",},
+//     { label: "일기", value: "diary" },
 
+  
+//   ];
+
+
+//   return (
+//     <View >
+
+           
+                
+
+//       <View >
+//         <View style={styles3.cc}>
+        
+//         <Pressable onPssress={() => navigation.navigate(AuthRoutes.Setting)}>
+//           <Gear />
+//         </Pressable>
+//         </View>
+//         <View style={styles3.a}>
+//           <Logo />
+//         </View>
+//       </View>
+
+//     <Calendar 
+//       style={styles.calendar} 
+//       markedDates={markedSelectedDates}
+//       theme={{
+//         selectedDayBackgroundColor: 'red',
+//         arrowColor: '#009688',
+//         dotColor: '#009688',
+//         todayTextColor: '#009688',
+
+//       }}    
+//       onDayPress ={(day) => navigation.navigate(AuthRoutes.ToDo)}
+//       />
+
+//       <Text></Text>
+//       <Text></Text>
+//       <Text></Text>
+//       <Text></Text>
+//       <Text></Text>
+
+
+//       <SwitchSelector 
+//        backgroundColor={"#f5f5f5"}
+//        buttonColor="lightskyblue"
+//        fontColor="black"
+//        selectedFontColor="black"
+//        fontSize={30}
+//        options={options}
+//        initial={1}
+//        buttonMargin={10}
+//        borderWidth={3}
+//        borderColor="black"
+//        height={70}
+//        hasPadding
+//        bold
+//        style={{ transform: [{ scaleX: .6 }, { scaleY: .6 }] }}
+
+//       //  height={10}
+//         onPress={value => console.log(`Call onPress with value: ${value}`)}      
+//       />
+
+
+        
 
-function CalanderView() {
 
-  const [ modalVisible, setModalVisible ] = useState(false);
-  const pressButton = () => {
-      setModalVisible(true);
-  }
 
-  <View style = {styles.container}>
+// <View style={styles.container}>
+   
+//     </View>
+
+// </View>
+
+//   );
+// }
+
+// const styles2 = StyleSheet.create({
+//   container: {
+//     flex: 1,
+//     justifyContent: 'center',
+//     alignItems: 'center'
+//   },
+//   checkbox: {
+//     margin: 10
+//   }
+// })
+
+// const styles = StyleSheet.create({
+//   calendar: {
+//     borderBottomWidth: 1,
+//     borderBottomColor: '#e0e0e0',
+//   }
+// });
+
+// const styles3 = StyleSheet.create({
+//   container: {
+//       flex: 1,
+//       justifyContent: 'center',
+//       alignItems: 'center',
+//       // height: 42,
+
+//   },
+//   title:{
+//       fontFamily: 'Cochin',
+//       fontSize:50,
+//       fontWeight: 'bold',
+//       justifyContent: 'center',
+//       alignItems: 'center',
+
+//   },
+//   size: {
+//       fontSize:20,
+//       fontWeight: 'bold',
+      
+//   },
+//   round:{
+//       borderWidth: 6,
+//       borderColor: '#cdcdcd',
+//       borderRadius: 20
+//   },
+//   orange:{
+//       color:'orange',
+//   },
+//   blue:{
+//       color: '#1090FF',
+//   },
+//   cc: {
+//     alignItems: 'flex-end',
+//   },
+//   a: {
+//     alignItems: 'center',
+    
+//   },
+//   v:{
+//     color: `#6495ed` ,
+//     marginBottom: 20,
+//   } 
+ 
+// });
+
+
+
+// export default CalanderView;
+
+import React, { useContext, useState } from 'react';
+import { format } from 'date-fns';
+import { Calendar } from 'react-native-calendars';
+import { StyleSheet, View, Text, Pressable } from 'react-native';
+import BouncyCheckbox from 'react-native-bouncy-checkbox';
+import { useNavigation } from '@react-navigation/native';
+import { Navigation } from 'react-calendar';
+// import Button from "../../components/button";
+import { AuthRoutes } from '../../navigations/routes';
+import Day from 'react-native-calendars/src/calendar/day';
+import Logo from '../../components/Logo';
+import Gear from '../../components/Gear';
 
+function CalanderView() {
+  const [modalVisible, setModalVisible] = useState(false);
+  const pressButton = () => {
+    setModalVisible(true);
+  };
 
-  </View>
+  <View style={styles.container}></View>;
 
   const navigation = useNavigation();
 
   const posts = [
     {
-      date: "2023-06-19",
+      date: '2023-06-19',
+    },
+    {
+      date: '2023-06-27',
     },
-    {   
-      date: "2023-06-27",
-    }
   ];
   const markedDates = posts.reduce((acc, current) => {
     const formattedDate = format(new Date(current.date), 'yyyy-MM-dd');
-    <Text>aa</Text>
-    acc[formattedDate] = {marked: true};
+    <Text>aa</Text>;
+    acc[formattedDate] = { marked: true };
     return acc;
   }, {});
 
   const [selectedDate, setSelectedDate] = useState(
-    format(new Date(), "yyyy-MM-dd"),
+    format(new Date(), 'yyyy-MM-dd')
   );
   const markedSelectedDates = {
     ...markedDates,
     [selectedDate]: {
       selected: true,
       marked: markedDates[selectedDate]?.marked,
-      
-    }
-    
-  }
-  
-  const options = [
-    { label: "할일", value: "todo", selectedBackgroundColor: "#0097e6",},
-    { label: "일기", value: "diary" },
-
-  
-  ];
-
+    },
+  };
 
   return (
-    <View >
-
-           
-                
-
-      <View >
-        <View style={styles3.cc}>
-        
-            {/* <Pressable
-              onPress={pressButton}
-            >       
-            <Gear/>
-            </Pressable> */}
-        </View>
-        <View style={styles3.a}>
-          <Logo />
-        </View>
+    <View>
+      <View style={styles3.cc}>
+        <Pressable onPress={() => navigation.navigate(AuthRoutes.Setting)}>
+          <Gear />
+        </Pressable>
       </View>
 
-    <Calendar 
-      style={styles.calendar} 
-      markedDates={markedSelectedDates}
-      theme={{
-        selectedDayBackgroundColor: 'red',
-        arrowColor: '#009688',
-        dotColor: '#009688',
-        todayTextColor: '#009688',
-
-      }}    
-      onDayPress ={(day) => navigation.navigate(AuthRoutes.ToDo)}
-      />
+      <View style={styles3.a}>
+        <Logo />
+      </View>
 
-      <Text></Text>
-      <Text></Text>
-      <Text></Text>
-      <Text></Text>
-      <Text></Text>
-
-
-      <SwitchSelector 
-       backgroundColor={"#f5f5f5"}
-       buttonColor="lightskyblue"
-       fontColor="black"
-       selectedFontColor="black"
-       fontSize={30}
-       options={options}
-       initial={1}
-       buttonMargin={10}
-       borderWidth={3}
-       borderColor="black"
-       height={70}
-       hasPadding
-       bold
-       style={{ transform: [{ scaleX: .6 }, { scaleY: .6 }] }}
-
-      //  height={10}
-        onPress={value => console.log(`Call onPress with value: ${value}`)}      
+      <Calendar
+        style={styles.calendar}
+        markedDates={markedSelectedDates}
+        theme={{
+          selectedDayBackgroundColor: 'red',
+          arrowColor: '#009688',
+          dotColor: '#009688',
+          todayTextColor: '#009688',
+        }}
+        onDayPress={(day) => navigation.navigate(AuthRoutes.ToDo)}
       />
 
-
-        
-
-
-
-<View style={styles.container}>
-   
+      <View style={styles.container}></View>
     </View>
-
-</View>
-
   );
 }
 
@@ -142,66 +286,57 @@ const styles2 = StyleSheet.create({
   container: {
     flex: 1,
     justifyContent: 'center',
-    alignItems: 'center'
+    alignItems: 'center',
   },
   checkbox: {
-    margin: 10
-  }
-})
+    margin: 10,
+  },
+});
 
 const styles = StyleSheet.create({
   calendar: {
     borderBottomWidth: 1,
     borderBottomColor: '#e0e0e0',
-  }
+  },
 });
 
 const styles3 = StyleSheet.create({
   container: {
-      flex: 1,
-      justifyContent: 'center',
-      alignItems: 'center',
-      // height: 42,
-
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    // height: 42,
   },
-  title:{
-      fontFamily: 'Cochin',
-      fontSize:50,
-      fontWeight: 'bold',
-      justifyContent: 'center',
-      alignItems: 'center',
-
+  title: {
+    fontFamily: 'Cochin',
+    fontSize: 50,
+    fontWeight: 'bold',
+    justifyContent: 'center',
+    alignItems: 'center',
   },
   size: {
-      fontSize:20,
-      fontWeight: 'bold',
-      
+    fontSize: 20,
+    fontWeight: 'bold',
   },
-  round:{
-      borderWidth: 6,
-      borderColor: '#cdcdcd',
-      borderRadius: 20
+  round: {
+    borderWidth: 6,
+    borderColor: '#cdcdcd',
+    borderRadius: 20,
   },
-  orange:{
-      color:'orange',
+  orange: {
+    color: 'orange',
   },
-  blue:{
-      color: '#1090FF',
+  blue: {
+    color: '#1090FF',
   },
   cc: {
+    marginRight: 15,
+    height: 60,
     alignItems: 'flex-end',
   },
   a: {
     alignItems: 'center',
-    
   },
-  v:{
-    color: `#6495ed` ,
-    marginBottom: 20,
-  } 
- 
 });
 
-
-
-export default CalanderView;
+export default CalanderView;
\ No newline at end of file
diff --git a/src/screens/InformationScreen.js b/src/screens/InformationScreen.js
index 70a5729..efe682b 100644
--- a/src/screens/InformationScreen.js
+++ b/src/screens/InformationScreen.js
@@ -31,6 +31,7 @@ const InformationScreen = () => {
 
 const infostyles = StyleSheet.create({
   header: {
+    marginTop: 40,
     justifyContent: 'center',
     alignItems: 'center',
   },
@@ -55,4 +56,4 @@ const infostyles = StyleSheet.create({
   },
 });
 
-export default InformationScreen;
+export default InformationScreen;
\ No newline at end of file
diff --git a/src/screens/NoticeScreen.js b/src/screens/NoticeScreen.js
index 0d0385b..4dc3fd8 100644
--- a/src/screens/NoticeScreen.js
+++ b/src/screens/NoticeScreen.js
@@ -53,6 +53,7 @@ const NoticeScreen = () => {
 
 const noticestyles = StyleSheet.create({
   header: {
+    marginTop: 40,
     justifyContent: 'center',
     alignItems: 'center',
   },
@@ -89,4 +90,4 @@ const noticestyles = StyleSheet.create({
   },
 });
 
-export default NoticeScreen;
+export default NoticeScreen;
\ No newline at end of file
diff --git a/src/screens/PrivacyPolicyScreen.js b/src/screens/PrivacyPolicyScreen.js
index 7ec7a21..022e78b 100644
--- a/src/screens/PrivacyPolicyScreen.js
+++ b/src/screens/PrivacyPolicyScreen.js
@@ -28,6 +28,7 @@ const PrivacyPolicyScreen = () => {
 
 const privacypolicystyles = StyleSheet.create({
   header: {
+    marginTop: 40,
     justifyContent: 'center',
     alignItems: 'center',
   },
@@ -49,4 +50,4 @@ const privacypolicystyles = StyleSheet.create({
   },
 });
 
-export default PrivacyPolicyScreen;
+export default PrivacyPolicyScreen;
\ No newline at end of file
diff --git a/src/screens/SignUpScreen.js b/src/screens/SignUpScreen.js
index 0b9f012..8a1d5c0 100644
--- a/src/screens/SignUpScreen.js
+++ b/src/screens/SignUpScreen.js
@@ -11,24 +11,31 @@ import Input, { KeyboardTypes, ReturnKeyTypes } from '../components/Input';
 import { useEffect, useState } from 'react';
 import Button from '../components/Button';
 import Logo from '../components/Logo';
-
+import { CheckBox } from '@rneui/themed';
 import { useNavigation } from '@react-navigation/native';
 import { AuthRoutes } from '../navigations/routes';
 
-const SignInScreen = () => {
+const SignUpScreen = () => {
   const [name, setName] = useState('');
   const [email, setEmail] = useState('');
   const [password, setPassword] = useState('');
   const [passwordCheck, setPasswordCheck] = useState('');
+  const [checked, setChecked] = useState(false);
   const [disabled, setDisabled] = useState(true);
   const [disabled2, setDisabled2] = useState(true);
   const navigation = useNavigation();
 
   useEffect(() => {
     setDisabled(
-      !(name.trim() && email.trim() && password.trim() && passwordCheck.trim())
+      !(
+        name.trim() &&
+        email.trim() &&
+        password.trim() &&
+        passwordCheck.trim() &&
+        checked == true
+      )
     );
-  }, [name, email, password, passwordCheck]);
+  }, [name, email, password, passwordCheck, checked]);
   useEffect(() => {
     setDisabled2(!email.trim());
   }, [email]);
@@ -41,6 +48,7 @@ const SignInScreen = () => {
     Keyboard.dismiss();
     console.log('DuplicationCheck:', email);
   };
+  const toggleCheckbox = () => setChecked(!checked);
 
   return (
     <KeyboardAvoidingView
@@ -56,7 +64,6 @@ const SignInScreen = () => {
             <Input
               title={'이름'}
               // placeholder="홍길동"
-              keyboardType={KeyboardTypes.NAME}
               returnKeyType={ReturnKeyTypes.NEXT}
               value={name}
               onChangeText={(name) => setName(name.trim())}
@@ -79,10 +86,9 @@ const SignInScreen = () => {
               </View>
             </View>
           </View>
-
           <Input
             title={'비밀번호'}
-            returnKeyType={ReturnKeyTypes.NEXK}
+            returnKeyType={ReturnKeyTypes.NEXT}
             secureTextEntry
             value={password}
             onChangeText={(password) => setPassword(password.trim())}
@@ -98,15 +104,22 @@ const SignInScreen = () => {
             }
             onSubmitEditing={onSubmit}
           />
+          <CheckBox
+            title="이용약관 및 개인정보 정책에 동의합니다."
+            checked={checked}
+            onPress={toggleCheckbox}
+            iconType="material-community"
+            checkedIcon="checkbox-outline"
+            uncheckedIcon={'checkbox-blank-outline'}
+          />
           <View style={styles.buttonContainer}>
             <Button
               title={'회원가입'}
               onPress={() => {
                 onSubmit;
-                navigation.goBack();
+                navigation.navigate(AuthRoutes.SIGN_IN);
               }}
               disabled={disabled}
-              // onPress={() => navigation.navigate(AuthRoutes.CALENDAR_View)}
             />
           </View>
           <View style={styles.rowWrapper}>
@@ -167,4 +180,4 @@ const styles = StyleSheet.create({
   },
 });
 
-export default SignInScreen;
+export default SignUpScreen;
\ No newline at end of file