From 194602fa15f37e4f1633b6de8df7b24584db9180 Mon Sep 17 00:00:00 2001
From: sjsjmine129 <sjsjmine129@gmail.com>
Date: Sun, 16 Jun 2024 22:34:46 +0900
Subject: [PATCH 1/8] Fix/headers

---
 src/components/Header.js                  | 16 +++++--
 src/components/HeaderWhite.js             | 54 -----------------------
 src/screens/signup/CheckEmailScreen.js    |  9 +++-
 src/screens/signup/CheckEmailScreen2.js   | 12 +++--
 src/screens/signup/FindPasswordScreen.js  |  9 +++-
 src/screens/signup/LoginScreen.js         |  2 +-
 src/screens/signup/ProfileSetScreen.js    |  9 +++-
 src/screens/signup/ResetPasswordScreen.js | 12 +++--
 src/screens/signup/SignupScreen.js        | 10 ++++-
 9 files changed, 60 insertions(+), 73 deletions(-)
 delete mode 100644 src/components/HeaderWhite.js

diff --git a/src/components/Header.js b/src/components/Header.js
index 8f194b8..cb51976 100644
--- a/src/components/Header.js
+++ b/src/components/Header.js
@@ -13,6 +13,7 @@ import {
   COLOR_BACKGROUND,
   COLOR_GRAY,
   COLOR_PRIMARY,
+  COLOR_TEXT_BLACK,
 } from '../assets/color';
 import AnimatedButton from './AnimationButton';
 import {useNavigation} from '@react-navigation/native';
@@ -22,7 +23,8 @@ import {StatusBarHeight} from './Safe';
 
 export default function Header(props) {
   const navigation = useNavigation();
-  const {title, isBackButton, noSafe} = props;
+  const {title, isBackButton, noSafe, color} = props;
+
   return (
     <View
       style={{
@@ -31,7 +33,7 @@ export default function Header(props) {
             ? 0
             : StatusBarHeight
           : 0,
-        backgroundColor: COLOR_PRIMARY,
+        backgroundColor: color == 'white' ? COLOR_BACKGROUND : COLOR_PRIMARY,
         // height: 56,
         justifyContent: 'center',
         alignItems: 'center',
@@ -54,12 +56,18 @@ export default function Header(props) {
           onPress={() => {
             navigation.goBack();
           }}>
-          <SvgXml xml={svgXml.button.goback} width="24" height="24" />
+          <SvgXml
+            xml={
+              color == 'white' ? svgXml.button.gobackGray : svgXml.button.goback
+            }
+            width="24"
+            height="24"
+          />
         </AnimatedButton>
       ) : null}
       <Text
         style={{
-          color: COLOR_WHITE,
+          color: color ? COLOR_TEXT_BLACK : COLOR_WHITE,
           fontSize: 16,
           // fontWeight: 'bold',
           fontFamily: 'NanumSquareRoundB',
diff --git a/src/components/HeaderWhite.js b/src/components/HeaderWhite.js
deleted file mode 100644
index 93d0654..0000000
--- a/src/components/HeaderWhite.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import React, {useState, useCallback, useEffect} from 'react';
-import {View, Text, SafeAreaView, ScrollView, StyleSheet} from 'react-native';
-import {
-  COLOR_WHITE,
-  COLOR_BACKGROUND,
-  COLOR_GRAY,
-  COLOR_PRIMARY,
-  COLOR_TEXT70GRAY,
-} from '../assets/color';
-import AnimatedButton from './AnimationButton';
-import {useNavigation} from '@react-navigation/native';
-import {SvgXml} from 'react-native-svg';
-import {svgXml} from '../assets/svg';
-
-export default function HeaderWhite(props) {
-  const navigation = useNavigation();
-  const {title, isBackButton} = props;
-  return (
-    <View
-      style={{
-        backgroundColor: COLOR_BACKGROUND,
-        height: 56,
-        justifyContent: 'center',
-        alignItems: 'center',
-        flexDirection: 'row',
-      }}>
-      {isBackButton ? (
-        <AnimatedButton
-          style={{
-            position: 'absolute',
-            // backgroundColor: 'red',
-            left: 6,
-            padding: 10,
-          }}
-          onPress={() => {
-            navigation.goBack();
-          }}>
-          <SvgXml xml={svgXml.button.gobackGray} width="24" height="24" />
-        </AnimatedButton>
-      ) : null}
-      <Text
-        style={{
-          color: COLOR_PRIMARY,
-          fontSize: 16,
-          fontWeight: 'bold',
-          textAlign: 'center',
-        }}>
-        {title}
-      </Text>
-    </View>
-  );
-}
-
-const styles = StyleSheet.create({});
diff --git a/src/screens/signup/CheckEmailScreen.js b/src/screens/signup/CheckEmailScreen.js
index aa7d029..5b096d2 100644
--- a/src/screens/signup/CheckEmailScreen.js
+++ b/src/screens/signup/CheckEmailScreen.js
@@ -29,12 +29,12 @@ import AnimatedButton from '../../components/AnimationButton';
 import {useNavigation} from '@react-navigation/native';
 import {API_URL} from '@env';
 import axios, {AxiosError} from 'axios';
-import HeaderWhite from '../../components/HeaderWhite';
 import {SvgXml} from 'react-native-svg';
 import {svgXml} from '../../assets/svg';
 import LongPrimaryButton from '../../components/LongPrimaryButton';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import AppContext from '../../components/AppContext';
+import Header from '../../components/Header';
 
 export default function CheckEmailScreen(props) {
   const navigation = useNavigation();
@@ -88,7 +88,12 @@ export default function CheckEmailScreen(props) {
 
   return (
     <>
-      <HeaderWhite title={'인증번호 확인'} isBackButton={true} />
+      <Header
+        title={'인증번호 확인'}
+        isBackButton={true}
+        color={'white'}
+        noSafe={true}
+      />
       <TouchableWithoutFeedback onPress={Keyboard.dismiss} accessible={false}>
         <View style={styles.entire}>
           <View style={styles.container}>
diff --git a/src/screens/signup/CheckEmailScreen2.js b/src/screens/signup/CheckEmailScreen2.js
index 33c6c9f..55a633b 100644
--- a/src/screens/signup/CheckEmailScreen2.js
+++ b/src/screens/signup/CheckEmailScreen2.js
@@ -29,7 +29,7 @@ import AnimatedButton from '../../components/AnimationButton';
 import {useNavigation} from '@react-navigation/native';
 import {API_URL} from '@env';
 import axios, {AxiosError} from 'axios';
-import HeaderWhite from '../../components/HeaderWhite';
+import Header from '../../components/Header';
 import {SvgXml} from 'react-native-svg';
 import {svgXml} from '../../assets/svg';
 import LongPrimaryButton from '../../components/LongPrimaryButton';
@@ -84,7 +84,12 @@ export default function CheckEmailScreen2(props) {
 
   return (
     <>
-      <HeaderWhite title={'인증번호 확인'} isBackButton={true} />
+      <Header
+        color={'white'}
+        title={'인증번호 확인'}
+        isBackButton={true}
+        noSafe={true}
+      />
       <TouchableWithoutFeedback onPress={Keyboard.dismiss} accessible={false}>
         <View style={styles.entire}>
           <View style={styles.container}>
@@ -137,13 +142,14 @@ const styles = StyleSheet.create({
     flex: 1,
     backgroundColor: COLOR_BACKGROUND,
     alignItems: 'center',
-    justifyContent: 'center',
+    // justifyContent: 'center',
   },
   container: {
     width: '90%',
     // backgroundColor: 'green',
     alignItems: 'center',
     justifyContent: 'center',
+    marginTop: 160,
     marginHorizontal: 16,
   },
   textAndInput: {
diff --git a/src/screens/signup/FindPasswordScreen.js b/src/screens/signup/FindPasswordScreen.js
index b61a314..a3b2ee6 100644
--- a/src/screens/signup/FindPasswordScreen.js
+++ b/src/screens/signup/FindPasswordScreen.js
@@ -28,7 +28,7 @@ import AnimatedButton from '../../components/AnimationButton';
 import {useNavigation} from '@react-navigation/native';
 import {API_URL} from '@env';
 import axios, {AxiosError} from 'axios';
-import HeaderWhite from '../../components/HeaderWhite';
+import Header from '../../components/Header';
 import {SvgXml} from 'react-native-svg';
 import {svgXml} from '../../assets/svg';
 import LongPrimaryButton from '../../components/LongPrimaryButton';
@@ -75,7 +75,12 @@ export default function FindPasswordScreen() {
 
   return (
     <>
-      <HeaderWhite title={'비밀번호 찾기'} isBackButton={true} />
+      <Header
+        color={'white'}
+        title={'비밀번호 찾기'}
+        isBackButton={true}
+        noSafe={true}
+      />
       <TouchableWithoutFeedback onPress={Keyboard.dismiss} accessible={false}>
         <View style={styles.entire}>
           <View style={styles.container}>
diff --git a/src/screens/signup/LoginScreen.js b/src/screens/signup/LoginScreen.js
index b15b705..bff07a2 100644
--- a/src/screens/signup/LoginScreen.js
+++ b/src/screens/signup/LoginScreen.js
@@ -30,7 +30,7 @@ import Toast from 'react-native-toast-message';
 import {useNavigation} from '@react-navigation/native';
 import {API_URL} from '@env';
 import axios from 'axios';
-import HeaderWhite from '../../components/HeaderWhite';
+import Header from '../../components/Header';
 import {SvgXml} from 'react-native-svg';
 import {svgXml} from '../../assets/svg';
 import LongPrimaryButton from '../../components/LongPrimaryButton';
diff --git a/src/screens/signup/ProfileSetScreen.js b/src/screens/signup/ProfileSetScreen.js
index c7e75d8..9bb855d 100644
--- a/src/screens/signup/ProfileSetScreen.js
+++ b/src/screens/signup/ProfileSetScreen.js
@@ -31,7 +31,7 @@ import AnimatedButton from '../../components/AnimationButton';
 import {useNavigation} from '@react-navigation/native';
 import {API_URL, IMG_URL} from '@env';
 import axios, {AxiosError} from 'axios';
-import HeaderWhite from '../../components/HeaderWhite';
+import Header from '../../components/Header';
 import {SvgXml} from 'react-native-svg';
 import {svgXml} from '../../assets/svg';
 import LongPrimaryButton from '../../components/LongPrimaryButton';
@@ -143,7 +143,12 @@ export default function ProfileSetScreen(props) {
   //check
   return (
     <>
-      <HeaderWhite title={'프로필 설정'} isBackButton={true} />
+      <Header
+        color={'white'}
+        title={'프로필 설정'}
+        isBackButton={true}
+        noSafe={true}
+      />
       <TouchableWithoutFeedback onPress={Keyboard.dismiss} accessible={false}>
         <View style={styles.entire}>
           <AnimatedButton
diff --git a/src/screens/signup/ResetPasswordScreen.js b/src/screens/signup/ResetPasswordScreen.js
index a587076..c4b729e 100644
--- a/src/screens/signup/ResetPasswordScreen.js
+++ b/src/screens/signup/ResetPasswordScreen.js
@@ -29,7 +29,7 @@ import AnimatedButton from '../../components/AnimationButton';
 import {useNavigation} from '@react-navigation/native';
 import {API_URL} from '@env';
 import axios, {AxiosError} from 'axios';
-import HeaderWhite from '../../components/HeaderWhite';
+import Header from '../../components/Header';
 import {SvgXml} from 'react-native-svg';
 import {svgXml} from '../../assets/svg';
 import LongPrimaryButton from '../../components/LongPrimaryButton';
@@ -103,7 +103,12 @@ export default function ResetPasswordScreen(props) {
 
   return (
     <>
-      <HeaderWhite title={'비밀번호 재설정'} isBackButton={true} />
+      <Header
+        color={'white'}
+        title={'비밀번호 재설정'}
+        isBackButton={true}
+        noSafe={true}
+      />
       <TouchableWithoutFeedback onPress={Keyboard.dismiss} accessible={false}>
         <View style={styles.entire}>
           <View style={styles.container}>
@@ -194,11 +199,12 @@ const styles = StyleSheet.create({
     flex: 1,
     backgroundColor: COLOR_BACKGROUND,
     alignItems: 'center',
-    justifyContent: 'center',
+    // justifyContent: 'center',
   },
   container: {
     width: '90%',
     // backgroundColor: 'green',
+    marginTop: 160,
     alignItems: 'center',
     justifyContent: 'center',
     marginHorizontal: 16,
diff --git a/src/screens/signup/SignupScreen.js b/src/screens/signup/SignupScreen.js
index 6f56809..ff0bb70 100644
--- a/src/screens/signup/SignupScreen.js
+++ b/src/screens/signup/SignupScreen.js
@@ -28,7 +28,7 @@ import AnimatedButton from '../../components/AnimationButton';
 import {useNavigation} from '@react-navigation/native';
 import {API_URL} from '@env';
 import axios, {AxiosError} from 'axios';
-import HeaderWhite from '../../components/HeaderWhite';
+import Header from '../../components/Header';
 import {SvgXml} from 'react-native-svg';
 import {svgXml} from '../../assets/svg';
 import LongPrimaryButton from '../../components/LongPrimaryButton';
@@ -127,7 +127,12 @@ export default function SignupScreen() {
 
   return (
     <>
-      <HeaderWhite title={'회원가입'} isBackButton={true} />
+      <Header
+        color={'white'}
+        title={'회원가입'}
+        isBackButton={true}
+        noSafe={true}
+      />
       <TouchableWithoutFeedback onPress={Keyboard.dismiss} accessible={false}>
         <View style={styles.entire}>
           <View style={styles.container}>
@@ -269,6 +274,7 @@ const styles = StyleSheet.create({
   },
   container: {
     width: '90%',
+    // marginTop: 80,
     // backgroundColor: 'green',
     alignItems: 'center',
     justifyContent: 'center',

From 50db7c444e436e8bee320392b2799d1757270096 Mon Sep 17 00:00:00 2001
From: sjsjmine129 <sjsjmine129@gmail.com>
Date: Wed, 19 Jun 2024 12:23:48 +0900
Subject: [PATCH 2/8] Fix/ioName

---
 ios/meokguskku.xcodeproj/project.pbxproj | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/ios/meokguskku.xcodeproj/project.pbxproj b/ios/meokguskku.xcodeproj/project.pbxproj
index de0b3b0..bda476e 100644
--- a/ios/meokguskku.xcodeproj/project.pbxproj
+++ b/ios/meokguskku.xcodeproj/project.pbxproj
@@ -41,7 +41,7 @@
 		00E356EE1AD99517003FC87E /* meokguskkuTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = meokguskkuTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* meokguskkuTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = meokguskkuTests.m; sourceTree = "<group>"; };
-		05A0D76595064C7D82FC26A9 /* NanumSquareRoundB.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundB.otf; path = ../src/assets/fonts/NanumSquareRoundB.otf; sourceTree = "<group>"; };
+		05A0D76595064C7D82FC26A9 /* NanumSquareRoundB.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundB.otf; path = ../src/assets/fonts/NanumSquareRoundB.otf; sourceTree = "<group>"; };
 		13B07F961A680F5B00A75B9A /* meokguskku.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = meokguskku.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = meokguskku/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = meokguskku/AppDelegate.mm; sourceTree = "<group>"; };
@@ -49,23 +49,23 @@
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = meokguskku/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = meokguskku/main.m; sourceTree = "<group>"; };
 		19F6CBCC0A4E27FBF8BF4A61 /* libPods-meokguskku-meokguskkuTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-meokguskku-meokguskkuTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		1C6B42C5E19141E9895D2EC6 /* NanumSquareRoundL.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundL.otf; path = ../src/assets/fonts/NanumSquareRoundL.otf; sourceTree = "<group>"; };
+		1C6B42C5E19141E9895D2EC6 /* NanumSquareRoundL.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundL.otf; path = ../src/assets/fonts/NanumSquareRoundL.otf; sourceTree = "<group>"; };
 		1EA088AE07AA4A008F5DECC0 /* NanumSquareRoundB.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundB.ttf; path = ../src/assets/fonts/NanumSquareRoundB.ttf; sourceTree = "<group>"; };
 		3105D155E65943C28C5F5FDB /* NanumSquareRoundR.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundR.ttf; path = ../src/assets/fonts/NanumSquareRoundR.ttf; sourceTree = "<group>"; };
 		3B4392A12AC88292D35C810B /* Pods-meokguskku.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-meokguskku.debug.xcconfig"; path = "Target Support Files/Pods-meokguskku/Pods-meokguskku.debug.xcconfig"; sourceTree = "<group>"; };
 		5709B34CF0A7D63546082F79 /* Pods-meokguskku.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-meokguskku.release.xcconfig"; path = "Target Support Files/Pods-meokguskku/Pods-meokguskku.release.xcconfig"; sourceTree = "<group>"; };
 		5B7EB9410499542E8C5724F5 /* Pods-meokguskku-meokguskkuTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-meokguskku-meokguskkuTests.debug.xcconfig"; path = "Target Support Files/Pods-meokguskku-meokguskkuTests/Pods-meokguskku-meokguskkuTests.debug.xcconfig"; sourceTree = "<group>"; };
 		5DCACB8F33CDC322A6C60F78 /* libPods-meokguskku.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-meokguskku.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		74704C3B020D4AC293BF0FF9 /* NanumSquareRoundEB.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundEB.otf; path = ../src/assets/fonts/NanumSquareRoundEB.otf; sourceTree = "<group>"; };
+		74704C3B020D4AC293BF0FF9 /* NanumSquareRoundEB.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundEB.otf; path = ../src/assets/fonts/NanumSquareRoundEB.otf; sourceTree = "<group>"; };
 		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = meokguskku/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		89C6BE57DB24E9ADA2F236DE /* Pods-meokguskku-meokguskkuTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-meokguskku-meokguskkuTests.release.xcconfig"; path = "Target Support Files/Pods-meokguskku-meokguskkuTests/Pods-meokguskku-meokguskkuTests.release.xcconfig"; sourceTree = "<group>"; };
 		AD65022AAA184922BE36CA7C /* NanumSquareRoundEB.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundEB.ttf; path = ../src/assets/fonts/NanumSquareRoundEB.ttf; sourceTree = "<group>"; };
-		BF3E8CB4790F421288F1C7F9 /* NanumSquareRoundR.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundR.otf; path = ../src/assets/fonts/NanumSquareRoundR.otf; sourceTree = "<group>"; };
+		BF3E8CB4790F421288F1C7F9 /* NanumSquareRoundR.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundR.otf; path = ../src/assets/fonts/NanumSquareRoundR.otf; sourceTree = "<group>"; };
 		CA822710062140ACB7F5B758 /* NanumSquareRoundL.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = NanumSquareRoundL.ttf; path = ../src/assets/fonts/NanumSquareRoundL.ttf; sourceTree = "<group>"; };
 		CE1AB077A2FE48F1BC9E56AE /* NIXGONFONTS L 2.0.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "NIXGONFONTS L 2.0.ttf"; path = "../src/assets/fonts/NIXGONFONTS L 2.0.ttf"; sourceTree = "<group>"; };
 		E734FDCFB6374063BE1E6506 /* NIXGONFONTS M 2.0.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "NIXGONFONTS M 2.0.ttf"; path = "../src/assets/fonts/NIXGONFONTS M 2.0.ttf"; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
-		EE95F34BC81444CEAE8A7E42 /* NIXGONFONTS M 2.0.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "NIXGONFONTS M 2.0.otf"; path = "../src/assets/fonts/NIXGONFONTS M 2.0.otf"; sourceTree = "<group>"; };
+		EE95F34BC81444CEAE8A7E42 /* NIXGONFONTS M 2.0.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "NIXGONFONTS M 2.0.otf"; path = "../src/assets/fonts/NIXGONFONTS M 2.0.otf"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -521,6 +521,7 @@
 				DEVELOPMENT_TEAM = B4BSCLJVA5;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = meokguskku/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "먹구스꾸";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -548,6 +549,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = B4BSCLJVA5;
 				INFOPLIST_FILE = meokguskku/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "먹구스꾸";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -634,10 +636,7 @@
 					"-DFOLLY_USE_LIBCPP=1",
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					" ",
-				);
+				OTHER_LDFLAGS = "$(inherited)  ";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;
@@ -705,10 +704,7 @@
 					"-DFOLLY_USE_LIBCPP=1",
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					" ",
-				);
+				OTHER_LDFLAGS = "$(inherited)  ";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;

From 5d1f3583c9b37927df162af1e9bc760cd64ab067 Mon Sep 17 00:00:00 2001
From: sjsjmine129 <sjsjmine129@gmail.com>
Date: Wed, 19 Jun 2024 12:38:19 +0900
Subject: [PATCH 3/8] Fix/iosName

---
 ios/meokguskku.xcodeproj/project.pbxproj | 12 +++++-
 ios/meokguskku/Info.plist                | 48 +++++++++++++-----------
 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/ios/meokguskku.xcodeproj/project.pbxproj b/ios/meokguskku.xcodeproj/project.pbxproj
index bda476e..c97674b 100644
--- a/ios/meokguskku.xcodeproj/project.pbxproj
+++ b/ios/meokguskku.xcodeproj/project.pbxproj
@@ -522,6 +522,7 @@
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = meokguskku/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "먹구스꾸";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.food-and-drink";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -550,6 +551,7 @@
 				DEVELOPMENT_TEAM = B4BSCLJVA5;
 				INFOPLIST_FILE = meokguskku/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "먹구스꾸";
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.food-and-drink";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -636,7 +638,10 @@
 					"-DFOLLY_USE_LIBCPP=1",
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
-				OTHER_LDFLAGS = "$(inherited)  ";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;
@@ -704,7 +709,10 @@
 					"-DFOLLY_USE_LIBCPP=1",
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 				);
-				OTHER_LDFLAGS = "$(inherited)  ";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;
diff --git a/ios/meokguskku/Info.plist b/ios/meokguskku/Info.plist
index d363253..4184c3d 100644
--- a/ios/meokguskku/Info.plist
+++ b/ios/meokguskku/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
-	<string>meokguskku</string>
+	<string>먹구스꾸</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -38,31 +38,17 @@
 		</dict>
 	</dict>
 	<key>NSCameraUsageDescription</key>
-  <string>리뷰/프로필 이미지 업로드를 위해 카메라 접근 권한이 필요합니다.</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-  <string>리뷰/프로필 이미지 업로드를 위해 카메라 접근 권한이 필요합니다.</string>
+	<string>리뷰/프로필 이미지 업로드를 위해 카메라 접근 권한이 필요합니다.</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
 	<string>위치 기반 서비스 이용을 위해 위치 정보 접근 권한이 필요합니다.</string>
-  <key>NSLocationWhenInUseUsageDescription</key>
-  <string>위치 기반 서비스 이용을 위해 위치 정보 접근 권한이 필요합니다.</string>
 	<key>NSLocationAlwaysUsageDescription</key>
 	<string>위치 기반 서비스 이용을 위해 위치 정보 접근 권한이 필요합니다.</string>
-  <key>NSPhotoLibraryAddUsageDescription</key>
-  <string>리뷰/및 프로필 사진 업로드를 위해 갤러리 접근 권한이 필요합니다.</string>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>위치 기반 서비스 이용을 위해 위치 정보 접근 권한이 필요합니다.</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>리뷰/및 프로필 사진 업로드를 위해 갤러리 접근 권한이 필요합니다.</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>리뷰/프로필 이미지 업로드를 위해 카메라 접근 권한이 필요합니다.</string>
 	<key>UIAppFonts</key>
 	<array>
 		<string>NanumSquareRoundB.ttf</string>
@@ -77,5 +63,23 @@
 		<string>NanumSquareRoundL.otf</string>
 		<string>NanumSquareRoundR.otf</string>
 	</array>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+		<string>UIInterfaceOrientationPortrait</string>
+	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 </dict>
 </plist>

From aceab04c3d126a9b47f151b90061ef1443c0ceb8 Mon Sep 17 00:00:00 2001
From: sjsjmine129 <sjsjmine129@gmail.com>
Date: Wed, 19 Jun 2024 12:58:23 +0900
Subject: [PATCH 4/8] Feat/map mlocation focus

---
 src/assets/svg.js            | 10 ++++++++++
 src/screens/map/MapScreen.js | 37 ++++++++++++++++++++++++++++++++----
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/src/assets/svg.js b/src/assets/svg.js
index 238bf37..4d64da7 100644
--- a/src/assets/svg.js
+++ b/src/assets/svg.js
@@ -201,6 +201,16 @@ export const svgXml = {
     <path d="M3 12H5" stroke="#003C71" stroke-width="2" stroke-linecap="round"/>
     </svg>
     `,
+    gpsWhite: `
+    <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <circle cx="12" cy="12" r="7" stroke="white" stroke-width="2"/>
+    <circle cx="12" cy="12" r="2" fill="white" stroke="white" stroke-width="2"/>
+    <path d="M12 5V3" stroke="white" stroke-width="2" stroke-linecap="round"/>
+    <path d="M19 12L21 12" stroke="white" stroke-width="2" stroke-linecap="round"/>
+    <path d="M12 21L12 19" stroke="white" stroke-width="2" stroke-linecap="round"/>
+    <path d="M3 12H5" stroke="white" stroke-width="2" stroke-linecap="round"/>
+    </svg>
+    `,
     refresh: `
     <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path d="M14 15L10 19L14 23" stroke="#535353" stroke-width="2"/>
diff --git a/src/screens/map/MapScreen.js b/src/screens/map/MapScreen.js
index 9c90d3f..20c6290 100644
--- a/src/screens/map/MapScreen.js
+++ b/src/screens/map/MapScreen.js
@@ -34,6 +34,7 @@ import MapView, {
   PROVIDER_GOOGLE,
   Marker,
   PROVIDER_DEFAULT,
+  MapPolyline,
 } from 'react-native-maps';
 import {Svg, SvgXml} from 'react-native-svg';
 import {svgXml} from '../../assets/svg';
@@ -258,6 +259,18 @@ export default function MapScreen() {
     mapRef.current.animateCamera({heading: 0});
   };
 
+  const focusOnCoordinate = () => {
+    mapRef.current.animateToRegion(
+      {
+        latitude: myLocation.latitude,
+        longitude: myLocation.longitude,
+        latitudeDelta: 0.005,
+        longitudeDelta: 0.005,
+      },
+      1000,
+    );
+  };
+
   useEffect(() => {
     getStoreDatas();
   }, [
@@ -272,6 +285,12 @@ export default function MapScreen() {
     search,
   ]);
 
+  useEffect(() => {
+    if (myLocation.latitude !== 0) {
+      focusOnCoordinate();
+    }
+  }, [myLocation]);
+
   return (
     <>
       <Header title={'지도'} isBackButton={false} />
@@ -625,19 +644,30 @@ export default function MapScreen() {
 
         {/* 나침반 버튼*/}
         <AnimatedButton
-          style={[styles.cornerButton, {left: 16}]}
+          style={[styles.cornerButton, {left: 16, backgroundColor: 'white'}]}
           onPress={alignToNorth}>
           <SvgXml xml={svgXml.icon.compass} width="30" height="30" />
         </AnimatedButton>
 
         {/* gps 버튼*/}
         <AnimatedButton
-          style={[styles.cornerButton, {right: 16}]}
+          style={[
+            styles.cornerButton,
+            {
+              right: 16,
+              backgroundColor:
+                myLocation.latitude === 0 ? 'white' : COLOR_PRIMARY,
+            },
+          ]}
           onPress={() => {
             console.log('press gps');
             getMyLocation();
           }}>
-          <SvgXml xml={svgXml.icon.gps} width="24" height="24" />
+          {myLocation.latitude === 0 ? (
+            <SvgXml xml={svgXml.icon.gps} width="24" height="24" />
+          ) : (
+            <SvgXml xml={svgXml.icon.gpsWhite} width="24" height="24" />
+          )}
         </AnimatedButton>
       </View>
 
@@ -857,7 +887,6 @@ const styles = StyleSheet.create({
   cornerButton: {
     position: 'absolute',
     bottom: 16,
-    backgroundColor: 'white',
     borderRadius: 15,
     height: 30,
     width: 30,

From 916c9c99628af2b427e90f9823de42b85e236c89 Mon Sep 17 00:00:00 2001
From: sjsjmine129 <sjsjmine129@gmail.com>
Date: Wed, 19 Jun 2024 13:28:22 +0900
Subject: [PATCH 5/8] Fix/iosUI

---
 src/screens/detail/StoreDetailScreen.js | 52 ++++++++++++++-----------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/screens/detail/StoreDetailScreen.js b/src/screens/detail/StoreDetailScreen.js
index 5ad7ed3..15ec7f4 100644
--- a/src/screens/detail/StoreDetailScreen.js
+++ b/src/screens/detail/StoreDetailScreen.js
@@ -280,7 +280,7 @@ export default function StoreDetailScreen(props) {
                 ) : (
                   <View style={styles.reviewAuthorImagePlaceholder} />
                 )}
-                <Text style={styles.reviewAuthor}>{item.username}</Text>
+                <Text style={styles.reviewAuthor}>{' ' + item.username}</Text>
                 <Text style={styles.reviewAuthor2}>님</Text>
                 <TouchableOpacity
                   style={styles.contactButton}
@@ -364,7 +364,9 @@ export default function StoreDetailScreen(props) {
                 flexDirection: 'row',
                 justifyContent: 'space-between',
               }}>
-              <Text style={styles.storeName}>{restaurant.restaurant.name}</Text>
+              <Text style={styles.storeName}>
+                {restaurant.restaurant.name + ' '}
+              </Text>
               <Text style={styles.storeCategory}>
                 {restaurant.restaurant.categories}
               </Text>
@@ -453,12 +455,13 @@ export default function StoreDetailScreen(props) {
               <Text style={styles.storeAddress}>
                 위치: {restaurant.restaurant.detailInfo.address}
               </Text>
-              <TouchableOpacity
+              <AnimatedButton
                 onPress={() => {
                   onCopy(restaurant.restaurant.detailInfo.address);
-                }}>
+                }}
+                style={styles.copyButton}>
                 <Text style={styles.copyButtonText}>복사</Text>
-              </TouchableOpacity>
+              </AnimatedButton>
             </View>
           </View>
           <View style={{flexDirection: 'row', alignItems: 'center'}}>
@@ -468,15 +471,16 @@ export default function StoreDetailScreen(props) {
               width={24}
               height={24}
             />
-            <Text style={styles.storePhoneNum}>
+            <Text style={styles.storeAddress}>
               전화번호: {restaurant.restaurant.detailInfo.contactNumber}
             </Text>
-            <TouchableOpacity
+            <AnimatedButton
               onPress={() => {
                 onCopy(restaurant.restaurant.detailInfo.contactNumber);
-              }}>
+              }}
+              style={styles.copyButton}>
               <Text style={styles.copyButtonText}>복사</Text>
-            </TouchableOpacity>
+            </AnimatedButton>
           </View>
         </View>
         <View style={styles.section}>
@@ -525,10 +529,9 @@ export default function StoreDetailScreen(props) {
         noSafe={true}
         style={{backgroundColor: 'trasparent'}}
       />
-      <FlatList
-        ListHeaderComponent={ListHeader}
-        contentContainerStyle={styles.entire}
-      />
+      <ScrollView>
+        <ListHeader />
+      </ScrollView>
       <Modal
         animationType="fade"
         transparent={true}
@@ -652,29 +655,34 @@ const styles = StyleSheet.create({
     color: COLOR_TEXT_DARKGRAY,
     marginVertical: 8,
     fontFamily: 'NanumSquareRoundB',
+    flex: 10,
+    // backgroundColor: 'green',
+  },
+  copyButton: {
+    // backgroundColor: 'red',
+    justifyContent: 'center',
+    alignItems: 'center',
+    padding: 5,
   },
   storeHours: {
     fontSize: 15,
     color: COLOR_TEXT_DARKGRAY,
     marginVertical: 7,
   },
-  storePhoneNum: {
-    fontSize: 13,
-    color: COLOR_TEXT_DARKGRAY,
-    marginVertical: 8,
-    fontFamily: 'NanumSquareRoundB',
-  },
   copyContainer: {
     flexDirection: 'row',
-    width: 315,
+    flex: 1,
+    justifyContent: 'center',
+    alignContent: 'center',
+    // backgroundColor: 'blue',
   },
   copyButtonText: {
+    // backgroundColor: 'red',
     fontSize: 13,
-    marginVertical: 7,
-    marginLeft: 7,
     color: COLOR_GRAY,
     textDecorationLine: 'underline',
     fontFamily: 'NanumSquareRoundB',
+    textAlign: 'center',
   },
   section: {
     width: '92%',

From ca9442403acf8325377b5e8fad83c4ae0079ea7e Mon Sep 17 00:00:00 2001
From: sjsjmine129 <sjsjmine129@gmail.com>
Date: Wed, 19 Jun 2024 13:29:41 +0900
Subject: [PATCH 6/8] Fix/data

---
 src/screens/detail/StoreDetailScreen.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/screens/detail/StoreDetailScreen.js b/src/screens/detail/StoreDetailScreen.js
index 15ec7f4..bf17db9 100644
--- a/src/screens/detail/StoreDetailScreen.js
+++ b/src/screens/detail/StoreDetailScreen.js
@@ -100,7 +100,7 @@ export default function StoreDetailScreen(props) {
       const data = response.data.data;
       const dataReview = responseReview.data.data;
 
-      console.log('storedata: ', data);
+      // console.log('storedata: ', data);
 
       setRestaurant(data);
       setIsHearted(data.restaurant.isLike);

From 7ff89679aa3d7d8e56516f61e0ca4cdd12a85bf8 Mon Sep 17 00:00:00 2001
From: sjsjmine129 <sjsjmine129@gmail.com>
Date: Wed, 19 Jun 2024 13:30:56 +0900
Subject: [PATCH 7/8] Fix/release

---
 .../xcshareddata/xcschemes/meokguskku.xcscheme                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ios/meokguskku.xcodeproj/xcshareddata/xcschemes/meokguskku.xcscheme b/ios/meokguskku.xcodeproj/xcshareddata/xcschemes/meokguskku.xcscheme
index 369a12a..66dfe20 100644
--- a/ios/meokguskku.xcodeproj/xcshareddata/xcschemes/meokguskku.xcscheme
+++ b/ios/meokguskku.xcodeproj/xcshareddata/xcschemes/meokguskku.xcscheme
@@ -41,7 +41,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

From ebaf1d251bb117f3dcfe75ed91976f33c6468ed7 Mon Sep 17 00:00:00 2001
From: sjsjmine129 <sjsjmine129@gmail.com>
Date: Wed, 19 Jun 2024 21:40:17 +0900
Subject: [PATCH 8/8] Fix

---
 .../xcshareddata/xcschemes/meokguskku.xcscheme                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ios/meokguskku.xcodeproj/xcshareddata/xcschemes/meokguskku.xcscheme b/ios/meokguskku.xcodeproj/xcshareddata/xcschemes/meokguskku.xcscheme
index 66dfe20..369a12a 100644
--- a/ios/meokguskku.xcodeproj/xcshareddata/xcschemes/meokguskku.xcscheme
+++ b/ios/meokguskku.xcodeproj/xcshareddata/xcschemes/meokguskku.xcscheme
@@ -41,7 +41,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"