Commit 8590a203 authored by Choi Ga Young's avatar Choi Ga Young
Browse files

병합에러수정

parent a03931d9
...@@ -3,8 +3,8 @@ import { StyleSheet, Text, View, FlatList, TouchableOpacity, Modal, Alert, Touch ...@@ -3,8 +3,8 @@ import { StyleSheet, Text, View, FlatList, TouchableOpacity, Modal, Alert, Touch
import TodoItem from './components/todoItem'; import TodoItem from './components/todoItem';
import InfoForm from './screens/InfoForm'; import InfoForm from './screens/InfoForm';
import Ionicons from 'react-native-vector-icons/Ionicons'; import Ionicons from 'react-native-vector-icons/Ionicons';
import Infodetails from './screens/InfoDetails' import InfoDetails from './screens/InfoDetails'
import ButtonsForm from './components/ButtonsForm'; import ButtonsForm from './components/ButtonsForm';
import { TabView } from 'react-native-elements'; import { TabView } from 'react-native-elements';
...@@ -36,9 +36,6 @@ function DeptPage({ navigation }) { ...@@ -36,9 +36,6 @@ function DeptPage({ navigation }) {
}); });
} }
return ( return (
<TouchableWithoutFeedback onPress={() => { <TouchableWithoutFeedback onPress={() => {
Keyboard.dismiss(); Keyboard.dismiss();
...@@ -95,7 +92,7 @@ function DeptPage({ navigation }) { ...@@ -95,7 +92,7 @@ function DeptPage({ navigation }) {
</View> </View>
</Modal> </Modal>
</View> </View>
</View> </View>
</TouchableWithoutFeedback > </TouchableWithoutFeedback >
); );
} }
......
import React from 'react'; import React, {useState} from 'react';
import { View, Text, TextInput, StyleSheet, Button, Keyboard, TouchableWithoutFeedback, Modal } from 'react-native'; import { View, Text, TextInput, StyleSheet, Button, Keyboard, TouchableWithoutFeedback, Modal } from 'react-native';
import { SpeedDial } from 'react-native-elements'; import { SpeedDial } from 'react-native-elements';
import WeeklyCalendar from './components/WeeklyCalendar'; import WeeklyCalendar from './components/WeeklyCalendar';
import InsertCat from './InsertCat'; import Ionicons from 'react-native-vector-icons/Ionicons';
import DeptPage from './DeptPage';
function MainScreen({ navigation }) { function MainScreen({ navigation }) {
const [number, onChangeNumber] = useState(null); const [number, onChangeNumber] = useState(null);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment