머지에러해결

App.js

@@ -8,7 +8,7 @@ import Monthly from './Monthly';
 import Analy from './Analy';
 import PostMoney from './PostMoney';
 import MainScreen from './MainScreen';
-import DetailInfo from './DetailInfo';
+import CalDetail from './CalDetail';
 import DeptPage from './DeptPage';
 import DeptDetails from './screens/DeptDetails';
 import MemoPage from './MemoPage';
@@ -82,8 +82,8 @@ function App() {
           component={MemoDetails}
           options={{ title: "상세내용" }} />
         <Stack.Screen
-          name="DetailInfo"
-          component={DetailInfo}
+          name="CalDetail"
+          component={CalDetail}
           options={{ title: "일일내역" }} />
         <Stack.Screen
           name="EditOption"

DetailInfo.js → CalDetail.js

@@ -48,7 +48,7 @@ const DetailInfo = ({ route }) => {
             renderItem={renderDetail}
             keyExtractor={item => item.id}
           /> : <View style={{ marginTop: "20%" }}>
-            <Text style={{ textAlign: "center", fontSize: 20 }}>내역이 없습니다.</Text>
+            <Text style={{ textAlign: "center", fontSize: 20, fontFamily: 'GowunDodum-Regular' }}>내역이 없습니다.</Text>
           </View>
         }
 
@@ -69,10 +69,12 @@ const style = StyleSheet.create({
   },
   itemTextNum: {
     flex: 1,
-    textAlign: "center"
+    textAlign: "center",
+    fontFamily: 'GowunDodum-Regular'
   },
   itemText: {
-    flex: 1
+    flex: 1,
+    fontFamily: 'GowunDodum-Regular'
   }
 });
 

MainScreen.js

@@ -74,7 +74,6 @@ function MainScreen({ navigation }) {
     )
 }
 
-
 const style = StyleSheet.create({
     TextInput: {
         borderColor: 'skyblue',
@@ -83,7 +82,7 @@ const style = StyleSheet.create({
         borderWidth: 1
     },
     Font: {
-        fontFamily : 'Jua-Regular',
+        fontFamily: 'GowunDodum-Regular',
         fontSize: 24
     },
     modalToggle: {
@@ -100,7 +99,7 @@ const style = StyleSheet.create({
         marginBottom: 50,
     },
     modalContent: {
-        flex: 1, //이후 유용한 키보드를 추가하려고 ex)dismissing keyboard
+        flex: 1,
     },
     Contents: {
         justifyContent: "center",

MemoPage.js

@@ -2,14 +2,9 @@ import React, { useEffect, useState } from 'react';
 import { StyleSheet, Text, View, FlatList, TouchableOpacity, Modal, TouchableWithoutFeedback, Keyboard } from 'react-native';
 import TodoItem from './components/TodoItem';
 import Ionicons from 'react-native-vector-icons/Ionicons';
-import { NavigationContainer } from '@react-navigation/native';
-import MemoDetails from './screens/MemoDetails';
 import MemoForm from './screens/MemoForm';
-import ButtonsForm from './components/ButtonsForm';
-import { TabView } from 'react-native-elements';
 import memoApi from './db/memoPage.api';
 
-
 function MemoPage({ navigation }) {
     const [memos, setMemos] = useState([])
     const [selectedIndex, setSelectedIndex] = useState(0)

components/Calendar.js

@@ -2,7 +2,6 @@ import React, { useState, useEffect } from 'react';
 import { SafeAreaView, StyleSheet, View, Text, FlatList, TouchableOpacity } from 'react-native';
 import { Button } from 'react-native-elements';
 import Ionicons from 'react-native-vector-icons/Ionicons';
-import DetailInfo from '../DetailInfo';
 
 const DateItem = ({ dateitem, textColor, onPress, flatListHeight }) => {
   return (
@@ -105,7 +104,7 @@ function Calendar({
     }
 
     return (
-      <DateItem dateitem={item} textColor={{ color }} onPress={() => navigation.navigate('DetailInfo', String(item.date.toJSON()).split(/T/)[0])} flatListHeight={flatListHeight / (Dates.length / 7)} />
+      <DateItem dateitem={item} textColor={{ color }} onPress={() => navigation.navigate('CalDetail', String(item.date.toJSON()).split(/T/)[0])} flatListHeight={flatListHeight / (Dates.length / 7)} />
     )
   }
   const prevBtn = () => {