Major refactoring: navigation does not break anymore. the user can now navigate between the tabs without loosing context
This commit is contained in:
parent
457b098883
commit
1beee68bff
23 changed files with 137 additions and 80 deletions
|
|
@ -77,12 +77,11 @@ const styles = StyleSheet.create({
|
|||
containerStyle: {
|
||||
flexDirection: "row",
|
||||
justifyContent: "space-evenly",
|
||||
marginHorizontal: 20,
|
||||
marginBottom: 20,
|
||||
marginHorizontal: 10,
|
||||
marginTop: 10,
|
||||
},
|
||||
searchBarStyle: {
|
||||
marginBottom: 20,
|
||||
marginHorizontal: 10,
|
||||
}
|
||||
});
|
||||
|
|
@ -40,7 +40,6 @@ export default function CustomCard(props : ViewProps) {
|
|||
const styles = StyleSheet.create({
|
||||
container:{
|
||||
borderRadius: 20,
|
||||
marginHorizontal: 10,
|
||||
},
|
||||
boxShadow: {},
|
||||
})
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
import { StyleSheet, Text, View, TouchableOpacity } from 'react-native'
|
||||
import React, { useState } from 'react'
|
||||
import { useTheme } from '../../../app/contexts/ThemeContext'
|
||||
import { SIZES } from '../../../constants/theme';
|
||||
import { Category } from '../../../types/dbItems';
|
||||
import { useTheme } from '../../app/contexts/ThemeContext'
|
||||
import { SIZES } from '../../constants/theme';
|
||||
import { Category } from '../../types/dbItems';
|
||||
import CategorySelectorModal from './CategorySelectorModal';
|
||||
|
||||
interface CategorySelectorProps {
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
import { Modal, NativeSyntheticEvent, StyleSheet, Text, View, FlatList } from 'react-native'
|
||||
import React, { useEffect, useMemo, useState } from 'react'
|
||||
import { Category } from '../../../types/dbItems';
|
||||
import { useTheme } from '../../../app/contexts/ThemeContext';
|
||||
import CategoryListItem from '../../common/CategoryListItem';
|
||||
import { SIZES } from '../../../constants/theme';
|
||||
import useFetch from '../../../hooks/useFetch';
|
||||
import TextInputBar from '../../common/TextInputBar';
|
||||
import { Category } from '../../types/dbItems';
|
||||
import { useTheme } from '../../app/contexts/ThemeContext';
|
||||
import CategoryListItem from '../common/CategoryListItem';
|
||||
import { SIZES } from '../../constants/theme';
|
||||
import useFetch from '../../hooks/useFetch';
|
||||
import TextInputBar from '../common/TextInputBar';
|
||||
|
||||
|
||||
interface CategorySelectorModalProps{
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
import { View, Text, StyleSheet, TouchableOpacity, TouchableOpacityProps } from 'react-native'
|
||||
import React, { useState } from 'react'
|
||||
import { useTheme } from '../../../app/contexts/ThemeContext';
|
||||
import { SIZES } from '../../../constants/theme';
|
||||
import { SimpleDate } from '../../../util/SimpleDate';
|
||||
import { useTheme } from '../../app/contexts/ThemeContext';
|
||||
import { SIZES } from '../../constants/theme';
|
||||
import { SimpleDate } from '../../util/SimpleDate';
|
||||
import { ViewProps } from 'react-native/Libraries/Components/View/ViewPropTypes';
|
||||
|
||||
interface DateSelectorProps extends ViewProps {
|
||||
|
|
@ -4,9 +4,9 @@ import Welcome from "./home/Welcome"
|
|||
import ExpenseItem from "./home/expenseItem"
|
||||
|
||||
//home/addItem
|
||||
import CategorySelector from "./home/addItem/CategorySelector"
|
||||
import CategorySelectorModal from "./home/addItem/CategorySelectorModal"
|
||||
import DateSelectorButton from "./home/addItem/DateSelectorButton"
|
||||
import CategorySelector from "./expense/CategorySelector"
|
||||
import CategorySelectorModal from "./expense/CategorySelectorModal"
|
||||
import DateSelectorButton from "./expense/DateSelectorButton"
|
||||
|
||||
//common
|
||||
import CustomCard from "./common/CustomCard"
|
||||
|
|
|
|||
Reference in a new issue