Commit c0ddf2b0 authored by Soo Hyun Kim's avatar Soo Hyun Kim
Browse files

Merge remote-tracking branch 'origin/DoMIN' into sooHyun

parents 55d7a8af d7f659a4
......@@ -195,12 +195,12 @@ function MainScreen({ navigation }) {
onClose={() => setOpen(!open)}
>
<SpeedDial.Action
icon={{ name: 'add', color: '#fff' }}
icon={<FontAwesome name={'money'} size={20} color={'#fff'}/>}
title="부채"
onPress={() => navigation.navigate('DeptPage')}
/>
<SpeedDial.Action
icon={{ name: 'add', color: '#fff' }}
icon={{ name: 'note', color: '#fff' }}
title="메모"
onPress={() => navigation.navigate('MemoPage')}
/>
......
import React, { useEffect, useState } from 'react';
import { StyleSheet, View, TouchableWithoutFeedback, Keyboard } from 'react-native';
import { StyleSheet, View, TouchableWithoutFeedback, Keyboard, LogBox } from 'react-native';
import InputBox from '../components/InputBox';
import StyledButton from '../components/StyledButton';
import DatePicker from '../components/DatePicker.js';
import deptApi from '../db/deptPage.api';
import { getDateStr } from '../utils/dateFunction';
function DeptDetails({ route, navigation }) {
const { item, loadLoan } = route.params
const getDates = () => {
......@@ -16,6 +17,7 @@ function DeptDetails({ route, navigation }) {
const [message, setMessage] = useState('')
const [money, setMoney] = useState('')
const [repayment, setRepayment] = useState('')
LogBox.ignoreLogs(['Non-serializable values were found in the navigation state']);
useEffect(() => {
setDate(String(item.date))
......
import React, { useState, useEffect } from 'react';
import { StyleSheet, View, TouchableWithoutFeedback, Keyboard } from 'react-native';
import { StyleSheet, View, TouchableWithoutFeedback, Keyboard, LogBox } from 'react-native';
import InputBox from '../components/InputBox';
import StyledButton from '../components/StyledButton';
import DatePicker from '../components/DatePicker.js';
import memoApi from '../db/memoPage.api';
import { getDateStr } from '../utils/dateFunction';
function MemoDetails({ route, navigation }) {
const { item, loadMemos } = route.params
const getDates = () => {
......@@ -19,7 +21,7 @@ function MemoDetails({ route, navigation }) {
loadMemos()
navigation.navigate('MemoPage')
}
LogBox.ignoreLogs(['Non-serializable values were found in the navigation state']);
useEffect(() => {
setDate(String(item.date))
setMessage(item.message)
......
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