From 29f7c98c2e489d1bf33a30c1500db4383cca4077 Mon Sep 17 00:00:00 2001
From: arch-spatula <shkim516@naver.com>
Date: Thu, 12 Jan 2023 14:39:26 +0900
Subject: [PATCH 1/2] =?UTF-8?q?design:=20custom=20=EB=B2=84=ED=8A=BC=20?=
 =?UTF-8?q?=EB=B0=98=EC=98=81=20=EB=B0=8F=20=EC=9E=94=20=EB=B2=84=EA=B7=B8?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95=20#1=20#3=20#5=20#15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CustomInput.jsx   |  2 +-
 src/components/GraphicStatus.jsx |  2 +-
 src/components/ToggleList.jsx    |  1 +
 src/components/index.js          | 11 +++++++++-
 src/screen/MainPage.jsx          |  8 +-------
 src/screen/MyPage.jsx            | 35 +++++++++++++++++---------------
 6 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/components/CustomInput.jsx b/src/components/CustomInput.jsx
index e0ffb29..cff96fb 100644
--- a/src/components/CustomInput.jsx
+++ b/src/components/CustomInput.jsx
@@ -19,7 +19,7 @@ const CustomInput = ({
 }) => {
   return (
     <>
-      <CustonInputTitle>{title}</CustonInputTitle>;
+      <CustonInputTitle>{title}</CustonInputTitle>
       <CustomInputStyle
         type={type}
         keyboardType={keyboardType}
diff --git a/src/components/GraphicStatus.jsx b/src/components/GraphicStatus.jsx
index af671e9..c1c70fb 100644
--- a/src/components/GraphicStatus.jsx
+++ b/src/components/GraphicStatus.jsx
@@ -119,9 +119,9 @@ const GraphicStatus = () => {
 export default GraphicStatus;
 
 const GraphicContainer = styled.View`
-  background-color: white;
   align-items: center;
   padding-bottom: 10px;
+  margin: 0 0 12px;
 `;
 
 const Supports = styled.View`
diff --git a/src/components/ToggleList.jsx b/src/components/ToggleList.jsx
index f6b10de..d2e4370 100644
--- a/src/components/ToggleList.jsx
+++ b/src/components/ToggleList.jsx
@@ -43,6 +43,7 @@ const ToggleListItemTitle = styled.Text`
 const ToggleListItemTime = styled.Text`
   font-size: 16px;
   margin: 0 0 0 16px;
+  text-overflow: ellipsis;
 `;
 
 export default ToggleList;
diff --git a/src/components/index.js b/src/components/index.js
index 08c3169..3612fa0 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -2,5 +2,14 @@ import ManageList from './ManageList';
 import GraphicStatus from './GraphicStatus';
 import TextButton from './TextButton';
 import ToggleList from './ToggleList';
+import CustomButton from './CustomButton';
+import CustomInput from './CustomInput';
 
-export { ManageList, TextButton, ToggleList, GraphicStatus };
+export {
+  ManageList,
+  TextButton,
+  ToggleList,
+  GraphicStatus,
+  CustomButton,
+  CustomInput,
+};
diff --git a/src/screen/MainPage.jsx b/src/screen/MainPage.jsx
index c315c1b..286e95a 100644
--- a/src/screen/MainPage.jsx
+++ b/src/screen/MainPage.jsx
@@ -40,16 +40,10 @@ const MainPage = ({ navigation: { navigate } }) => {
 
   return (
     <View>
-      <GraphicStatus />
-      <TouchableOpacity
-        onPress={() => navigate('Stacks', { screen: '로그인' })}
-      >
-        <Text>로그아웃</Text>
-      </TouchableOpacity>
-      {/* GraphicStatus가 들어오는 자리 */}
       <FlatList
         data={pillList}
         keyExtractor={(item) => item.id}
+        ListHeaderComponent={<GraphicStatus />}
         renderItem={({ item: { pillName, id, time, isTaken } }) => (
           <ToggleList
             pillName={pillName}
diff --git a/src/screen/MyPage.jsx b/src/screen/MyPage.jsx
index 62dea0c..3c863e9 100644
--- a/src/screen/MyPage.jsx
+++ b/src/screen/MyPage.jsx
@@ -1,6 +1,6 @@
 import styled from '@emotion/native';
 import { Text, View, FlatList } from 'react-native';
-import { ManageList } from '../components';
+import { ManageList, CustomButton } from '../components';
 import { useUID } from '../Hooks/useAuth';
 import { useGetPillData } from '../Hooks/usePill';
 
@@ -36,16 +36,6 @@ const MyPage = ({ navigation: { navigate } }) => {
   return (
     <MyPageContainer>
       <PageTitle>나의 약관리</PageTitle>
-      <AddPill
-        onPress={() =>
-          navigate('Stacks', {
-            screen: '수정 페이지',
-            params: { isEdit: false, eachPillName: '', eachTime: '' },
-          })
-        }
-      >
-        <Text>약추가</Text>
-      </AddPill>
       <FlatList
         data={pillList}
         keyExtractor={(item) => item.id}
@@ -57,6 +47,20 @@ const MyPage = ({ navigation: { navigate } }) => {
             navigate={navigate}
           />
         )}
+        ListFooterComponent={
+          <CustomButtonContainer>
+            <CustomButton
+              title="Login"
+              onPress={() =>
+                navigate('Stacks', {
+                  screen: '수정 페이지',
+                  params: { isEdit: false, eachPillName: '', eachTime: '' },
+                })
+              }
+              buttonText="새로운 약 추가하기"
+            />
+          </CustomButtonContainer>
+        }
       />
     </MyPageContainer>
   );
@@ -73,11 +77,10 @@ const PageTitle = styled.Text`
   margin: 20px 16px;
 `;
 
-const AddPill = styled.TouchableOpacity`
-  background-color: #f8f8f8;
-  margin: 8px 16px;
-  height: 80px;
-  border-radius: 16px;
+const CustomButtonContainer = styled.View`
+  width: 100%;
+  align-items: center;
+  margin: -8px 0 16px;
 `;
 
 export default MyPage;

From 0494267c1cbe919aaf74df61f4b22c556becf301 Mon Sep 17 00:00:00 2001
From: arch-spatula <shkim516@naver.com>
Date: Thu, 12 Jan 2023 15:04:04 +0900
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20merge=20=EC=9D=B4=ED=9B=84=20?=
 =?UTF-8?q?=EC=9E=94=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95=20=20#1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/screen/MyPage.jsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/screen/MyPage.jsx b/src/screen/MyPage.jsx
index 3c863e9..9f82605 100644
--- a/src/screen/MyPage.jsx
+++ b/src/screen/MyPage.jsx
@@ -54,7 +54,11 @@ const MyPage = ({ navigation: { navigate } }) => {
               onPress={() =>
                 navigate('Stacks', {
                   screen: '수정 페이지',
-                  params: { isEdit: false, eachPillName: '', eachTime: '' },
+                  params: {
+                    isEdit: false,
+                    eachPillName: '',
+                    eachTime: JSON.stringify(new Date()),
+                  },
                 })
               }
               buttonText="새로운 약 추가하기"