implemented plus button on budget screen and routing for the plus button

This commit is contained in:
thschleicher 2024-01-02 10:14:36 +01:00 committed by Jakob Stornig
parent 85c737e66c
commit 6ee1c01d6a
6 changed files with 45 additions and 16 deletions

View file

@ -34,12 +34,13 @@ export default function Layout() {
return ( return (
<Tabs sceneContainerStyle={styles.sceneContainer} screenOptions={screenOptions}> <Tabs sceneContainerStyle={styles.sceneContainer} screenOptions={screenOptions}>
<Tabs.Screen name="budget/index" options={ <Tabs.Screen name="budget" options={
{ {
tabBarLabel: "Budget", tabBarLabel: "Budget",
tabBarIcon: ({size, color}) => ( tabBarIcon: ({size, color}) => (
<FontAwesome name="money" size={size} color={color}/>), <FontAwesome name="money" size={size} color={color}/>),
unmountOnBlur: true, unmountOnBlur: true,
href: "(tabs)/budget"
} }
}/> }/>
<Tabs.Screen name="home" options={ <Tabs.Screen name="home" options={

View file

@ -0,0 +1,14 @@
import { Stack } from "expo-router";
import { useTheme } from "../../contexts/ThemeContext";
export default function _Layout() {
const { colors } = useTheme();
return (
<Stack initialRouteName="index" screenOptions={{
headerShown: false
}}>
<Stack.Screen name="index"/>
<Stack.Screen name="addCategory"/>
</Stack>
);
}

View file

@ -0,0 +1,8 @@
const addCategory = () => {
return (
<></>
);
}
export default addCategory;

View file

@ -1,9 +1,10 @@
import AsyncStorage from '@react-native-async-storage/async-storage'; import AsyncStorage from '@react-native-async-storage/async-storage';
import { router } from 'expo-router';
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { StyleSheet, View } from 'react-native'; import { StyleSheet, View } from 'react-native';
import { FlatList } from 'react-native-gesture-handler'; import { FlatList } from 'react-native-gesture-handler';
import { SafeAreaView } from 'react-native-safe-area-context'; import { SafeAreaView } from 'react-native-safe-area-context';
import { BudgetHeader, LoadingSymbol } from '../../../components'; import { BudgetHeader, LoadingSymbol, Plus } from '../../../components';
import CategoryItem from '../../../components/budget/categoryItem'; import CategoryItem from '../../../components/budget/categoryItem';
import useFetch from '../../../hooks/useFetch'; import useFetch from '../../../hooks/useFetch';
import { useThemeColor } from '../../../hooks/useThemeColor'; import { useThemeColor } from '../../../hooks/useThemeColor';
@ -26,7 +27,7 @@ export default function Page() {
const {data, isLoading, reFetch} = useFetch({sql: "SELECT guid as category_guid, name as category_name, color as category_color FROM category WHERE type = ?", args: selectedPage === "expenses" ? ["expense"] : selectedPage === "savings" ? ["saving"] : []}); const {data, isLoading, reFetch} = useFetch({sql: "SELECT guid as category_guid, name as category_name, color as category_color FROM category WHERE type = ?", args: selectedPage === "expenses" ? ["expense"] : selectedPage === "savings" ? ["saving"] : []});
useEffect(() => { useEffect(() => {
console.log("reFetch()"); console.log("reFetch()"); //REFETCH LOG
reFetch(); reFetch();
}, [selectedPage]); }, [selectedPage]);
@ -40,10 +41,15 @@ export default function Page() {
return ( return (
<SafeAreaView style={[styles.safeAreaViewStyle, {backgroundColor: containerColor}]}> <SafeAreaView style={[styles.safeAreaViewStyle, {backgroundColor: containerColor}]}>
<BudgetHeader selectedPage={selectedPage} handlePageSelection={handlePageSelection}/> <BudgetHeader selectedPage={selectedPage} handlePageSelection={handlePageSelection}/>
<Plus onPress={() => {
router.push("./(tabs)/budget/addCategory")
}}/>
{isLoading ? (<LoadingSymbol/>) : ( {isLoading ? (<LoadingSymbol/>) : (
<FlatList <FlatList
data={data} data={data}
renderItem = {({item}) => <CategoryItem category={item.category_name} allocated_ammount={100} color={item.category_color} category_guid={item.category_guid}/>} renderItem = {({item}) => <CategoryItem category={item.category_name} allocated_ammount={100} color={item.category_color} category_guid={item.category_guid} total_expenses={calculateSumOfCategory(item.guid, data)}/>}
keyExtractor={item => item.category_guid} keyExtractor={item => item.category_guid}
ItemSeparatorComponent={() => { ItemSeparatorComponent={() => {
return (<View style={styles.itemSeperatorStyle}/>); return (<View style={styles.itemSeperatorStyle}/>);
@ -54,6 +60,15 @@ export default function Page() {
); );
} }
const calculateSumOfCategory = (guid: string, data: {[column: string]: any;}[]): number => {
return 10;
}
const styles = StyleSheet.create({ const styles = StyleSheet.create({
safeAreaViewStyle: { safeAreaViewStyle: {
flex: 1, flex: 1,

View file

@ -6,6 +6,7 @@ export type CategoryItemProps = {
category: string, category: string,
color: ColorValue, color: ColorValue,
allocated_ammount: number, allocated_ammount: number,
total_expenses: number,
category_guid: string, category_guid: string,
} }
@ -13,7 +14,7 @@ const CategoryItem = (properties: CategoryItemProps) => {
const { colors } = useTheme(); const { colors } = useTheme();
const subText = `${calculateSumOfExpenses(properties.category_guid)} / ${properties.allocated_ammount}`; const subText = `${properties.total_expenses} / ${properties.allocated_ammount}`;
return ( return (
<CustomCard> <CustomCard>
@ -53,13 +54,3 @@ const styles = StyleSheet.create({
fontSize: 17.5, fontSize: 17.5,
} }
}) })
const calculateSumOfExpenses = (category_guid: string) => {
// const { data } = useFetch({sql: "SELECT amount FROM expense WHERE category_guid = ?", args: [category_guid]});
// let sum: number = 0;
// console.log(data);
console.log("render");
return 0;
}

View file

@ -7,7 +7,7 @@ import colors from "../constants/colors";
* @returns * @returns
*/ */
export function useThemeColor(colorName: keyof typeof colors.light & keyof typeof colors.dark): string { export function useThemeColor(colorName: keyof typeof colors.light & keyof typeof colors.dark): string {
console.warn("useThemeColor is depreciated. Use useTheme().colors instead") console.log("useThemeColor is depreciated. Use useTheme().colors instead")
const theme = useColorScheme() ?? "light"; const theme = useColorScheme() ?? "light";
return colors[theme][colorName]; return colors[theme][colorName];
} }