Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions app/(tabs)/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,12 @@ const formatNumber = (value: number) => value.toLocaleString();

const handleAddFood = useCallback(
(mealType: MealType) => {
router.push({ pathname: '/food-search', params: { meal: mealType } });
router.push({
pathname: '/food-search',
params: { meal: mealType, date: selectedDate.toISOString() },
});
},
[router]
[router, selectedDate]
);

return (
Expand Down
18 changes: 16 additions & 2 deletions app/food-search.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import MaterialIcons from '@expo/vector-icons/MaterialIcons';
import { Audio } from 'expo-av';
import { useRouter } from 'expo-router';
import { useLocalSearchParams, useRouter } from 'expo-router';
import { useEffect, useMemo, useRef, useState } from 'react';
import {
ActivityIndicator,
Expand Down Expand Up @@ -43,6 +43,16 @@ export default function FoodSearch() {
const [onlyBranded, setOnlyBranded] = useState(false);
const [mealSheetFood, setMealSheetFood] = useState<FoodItem | null>(null);
const router = useRouter();
const { date: dateParam } = useLocalSearchParams<{ date?: string | string[] }>();
const normalizedDateParam = useMemo(() => {
if (!dateParam) return undefined;
return Array.isArray(dateParam) ? dateParam[0] : dateParam;
}, [dateParam]);
const targetDate = useMemo(() => {
if (!normalizedDateParam) return null;
const parsed = new Date(normalizedDateParam);
return Number.isNaN(parsed.getTime()) ? null : parsed;
}, [normalizedDateParam]);
const { theme } = useAppTheme();
const openAiKey = getOpenAiApiKey();
const PAGE_SIZE = 20;
Expand Down Expand Up @@ -111,7 +121,11 @@ export default function FoodSearch() {

const addFoodToLog = async (food: FoodItem, mealType: MealType) => {
try {
await createMeal(mapFoodToMealInput(food, mealType));
const mealInput = mapFoodToMealInput(food, mealType);
await createMeal({
...mealInput,
consumedAt: targetDate?.toISOString(),
});
Alert.alert('Success', 'Meal added to your log!');
router.replace('/(tabs)');
} catch {
Expand Down
Loading