feat: add trip edit/archive flow and item bulk filters

README.md

@@ -5,7 +5,7 @@ Minimal local-first luggage management app built with Expo.
 ## Current Features (V2)
 
 - No auth, no server, local storage only (AsyncStorage)
-- Trips with name, location, dates, optional image from gallery
+- Trips with name, location, calendar date picker, optional image from gallery
 - Active trip auto-select on first load, with manual trip switching anytime via global trip picker
 - Default trip template (copied into new trip, not linked)
 - Luggage items with:
@@ -14,10 +14,10 @@ Minimal local-first luggage management app built with Expo.
   - placement: suitcase, backpack, with-user, other
   - optional image from gallery
 - Item create/edit via modal
-- Check-up flow as yes/no checklist:
+- Check-up flow as yes/no checklist with live stats (correct/bad/pending):
   - “No” opens update modal
   - fixes can be check-up-only or optionally synced to trip item list
-- Check-up history per trip with saved snapshots
+- Check-up history per selected trip with saved snapshots + stats
 
 ## Notes
 

TODO.md

@@ -34,3 +34,19 @@ Improving & Fixing Bugs (V3)
 - [x] Improved keyboard focus scrolling to focused input (not scroll-to-end)
 - [x] Reworked bottom nav to real icons + labels
 - [x] Clarified history as selected-trip check-up history
+- [x] Increased safe top inset to avoid status-bar overlap
+- [x] Added check-up stats (correct/bad/pending) and persisted per snapshot
+- [x] Extra UI polish pass (spacing, cards, hierarchy)
+- [x] Centered and enlarged edit/check-up modals to fully overlay nav
+- [x] Fixed modal keyboard glitching (stable centered keyboard-aware layout)
+- [x] Added trip view editing in modal (name/location/date/image)
+- [x] Added trip archive/unarchive flow with archived section
+- [x] Added item filters + bulk pack/unpack actions
+
+## Next Improvements (Requested)
+- [x] Edit trip directly in the trip view modal (name/location/dates/image)
+- [x] Add archive flow for trips (hide from active list without deleting history)
+- [ ] Enhance check-up modal UX (progress bar + back/skip controls)
+- [x] Add bulk item actions and filters (pack all/unpack all + status/category chips)
+- [ ] Add image optimization controls before save (compress/crop)
+- [ ] Add JSON export/import backup + restore flow

app.json

@@ -34,6 +34,15 @@
       "eas": {
         "projectId": "1275f90e-33c6-4af1-942e-ca29a309f8c8"
       }
-    }
+    },
+    "plugins": [
+      [
+        "expo-image-picker",
+        {
+          "photosPermission": "Allow Luggage List to access your photos for trip and item images.",
+          "cameraPermission": "Allow Luggage List to use your camera to take trip and item photos."
+        }
+      ]
+    ]
   }
 }

src/AppRoot.js

@@ -1,5 +1,5 @@
 import React, { useEffect, useMemo, useRef, useState } from 'react';
-import { Alert, KeyboardAvoidingView, Platform, SafeAreaView, ScrollView, Text, View } from 'react-native';
+import { Alert, KeyboardAvoidingView, Platform, SafeAreaView, ScrollView, StatusBar as RNStatusBar, Text, View } from 'react-native';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import * as ImagePicker from 'expo-image-picker';
 import { StatusBar } from 'expo-status-bar';
@@ -7,13 +7,13 @@ import BottomTab from './components/BottomTab';
 import TripPicker from './components/TripPicker';
 import DatePickerModal from './components/DatePickerModal';
 import ItemModal from './modals/ItemModal';
-import CheckupFixModal from './modals/CheckupFixModal';
+import CheckupFlowModal from './modals/CheckupFlowModal';
 import TripsTab from './tabs/TripsTab';
 import ItemsTab from './tabs/ItemsTab';
 import CheckupTab from './tabs/CheckupTab';
 import HistoryTab from './tabs/HistoryTab';
 import { emptyData, STORAGE_KEY } from './constants';
-import { findActiveTripId, makeId, parseYMD, todayYMD } from './utils/date';
+import { findBestTripId, makeId, parseYMD, todayYMD } from './utils/date';
 import { styles } from './styles';
 
 const emptyTripForm = () => ({
@@ -37,6 +37,28 @@ const emptyItemForm = () => ({
   imageUri: '',
 });
 
+const emptyCheckupNoForm = () => ({
+  status: 'unpacked',
+  placement: 'suitcase',
+  lentTo: '',
+  updateMasterList: false,
+});
+
+function buildCheckupSession(items) {
+  return items.map((item) => ({
+    itemId: item.id,
+    name: item.name,
+    category: item.category,
+    current: {
+      status: item.status,
+      placement: item.placement,
+      lentTo: item.lentTo || '',
+    },
+    confirmed: false,
+    result: 'pending',
+  }));
+}
+
 export default function AppRoot() {
   const scrollRef = useRef(null);
 
@@ -52,18 +74,18 @@ export default function AppRoot() {
   const [itemForm, setItemForm] = useState(emptyItemForm());
 
   const [checkupSession, setCheckupSession] = useState([]);
-  const [checkupFixModalVisible, setCheckupFixModalVisible] = useState(false);
+  const [checkupFlowVisible, setCheckupFlowVisible] = useState(false);
-  const [checkupFixTargetId, setCheckupFixTargetId] = useState(null);
+  const [checkupFlowIndex, setCheckupFlowIndex] = useState(0);
-  const [checkupFixForm, setCheckupFixForm] = useState({
+  const [checkupFlowMode, setCheckupFlowMode] = useState('question');
-    status: 'unpacked',
+  const [checkupNoForm, setCheckupNoForm] = useState(emptyCheckupNoForm());
-    placement: 'suitcase',
-    lentTo: '',
-    updateMasterList: false,
-  });
 
   const [selectedCheckupId, setSelectedCheckupId] = useState(null);
 
-  const selectedTrip = useMemo(() => data.trips.find((trip) => trip.id === selectedTripId) || null, [data.trips, selectedTripId]);
+  const topInset = Platform.OS === 'android' ? (RNStatusBar.currentHeight || 0) + 10 : 0;
+
+  const visibleTrips = useMemo(() => data.trips.filter((trip) => !trip.archived), [data.trips]);
+
+  const selectedTrip = useMemo(() => visibleTrips.find((trip) => trip.id === selectedTripId) || null, [visibleTrips, selectedTripId]);
 
   const selectedTripItems = useMemo(() => {
     if (!selectedTripId) return [];
@@ -80,6 +102,20 @@ export default function AppRoot() {
     [data.trips, data.defaultTemplateTripId]
   );
 
+  const checkupStats = useMemo(() => {
+    const total = checkupSession.length;
+    const correct = checkupSession.filter((entry) => entry.result === 'correct').length;
+    const bad = checkupSession.filter((entry) => entry.result === 'bad').length;
+    const pending = total - correct - bad;
+    return { total, correct, bad, pending };
+  }, [checkupSession]);
+
+  const checkupCurrentEntry = useMemo(() => {
+    if (!checkupFlowVisible) return null;
+    if (checkupFlowIndex >= checkupSession.length) return null;
+    return checkupSession[checkupFlowIndex] || null;
+  }, [checkupFlowVisible, checkupFlowIndex, checkupSession]);
+
   useEffect(() => {
     (async () => {
       try {
@@ -105,18 +141,18 @@ export default function AppRoot() {
 
   useEffect(() => {
     if (!loaded) return;
-    if (!data.trips.length) {
+    if (!visibleTrips.length) {
       setSelectedTripId(null);
       return;
     }
 
-    if (selectedTripId && data.trips.some((trip) => trip.id === selectedTripId)) {
+    if (selectedTripId && visibleTrips.some((trip) => trip.id === selectedTripId)) {
       return;
     }
 
-    const activeTripId = findActiveTripId(data.trips);
+    const bestTripId = findBestTripId(visibleTrips);
-    setSelectedTripId(activeTripId || data.trips[0].id);
+    setSelectedTripId(bestTripId || visibleTrips[0].id);
-  }, [data.trips, selectedTripId, loaded]);
+  }, [visibleTrips, selectedTripId, loaded]);
 
   useEffect(() => {
     if (tab !== 'checkup') return;
@@ -159,10 +195,27 @@ export default function AppRoot() {
     }
   }
 
+  async function takeImage(onPicked) {
+    const perm = await ImagePicker.requestCameraPermissionsAsync();
+    if (!perm.granted) {
+      Alert.alert('Permission needed', 'Allow camera access to take photos.');
+      return;
+    }
+
+    const result = await ImagePicker.launchCameraAsync({
+      allowsEditing: false,
+      quality: 0.85,
+    });
+
+    if (!result.canceled && result.assets?.[0]?.uri) {
+      onPicked(result.assets[0].uri);
+    }
+  }
+
   function createTrip() {
     if (!tripForm.name.trim()) {
       Alert.alert('Missing name', 'Trip name is required.');
-      return;
+      return false;
     }
 
     const start = parseYMD(tripForm.startDate);
@@ -170,12 +223,12 @@ export default function AppRoot() {
 
     if (!start || !end) {
       Alert.alert('Invalid dates', 'Please select valid trip dates.');
-      return;
+      return false;
     }
 
     if (start > end) {
       Alert.alert('Invalid dates', 'Start date cannot be after end date.');
-      return;
+      return false;
     }
 
     const now = Date.now();
@@ -193,6 +246,7 @@ export default function AppRoot() {
             startDate: tripForm.startDate,
             endDate: tripForm.endDate,
             imageUri: tripForm.imageUri,
+            archived: false,
             createdAt: now,
             updatedAt: now,
           },
@@ -220,12 +274,69 @@ export default function AppRoot() {
 
     setSelectedTripId(tripId);
     setTripForm(emptyTripForm());
+    return true;
   }
 
   function setTripAsTemplate(tripId) {
     setData((prev) => ({ ...prev, defaultTemplateTripId: tripId }));
   }
 
+  function saveTripEdits(tripId, patch) {
+    if (!patch.name.trim()) {
+      Alert.alert('Missing name', 'Trip name is required.');
+      return false;
+    }
+
+    const start = parseYMD(patch.startDate);
+    const end = parseYMD(patch.endDate);
+
+    if (!start || !end) {
+      Alert.alert('Invalid dates', 'Please select valid trip dates.');
+      return false;
+    }
+
+    if (start > end) {
+      Alert.alert('Invalid dates', 'Start date cannot be after end date.');
+      return false;
+    }
+
+    setData((prev) => ({
+      ...prev,
+      trips: prev.trips.map((trip) =>
+        trip.id === tripId
+          ? {
+              ...trip,
+              name: patch.name.trim(),
+              location: patch.location.trim(),
+              startDate: patch.startDate,
+              endDate: patch.endDate,
+              imageUri: patch.imageUri,
+              updatedAt: Date.now(),
+            }
+          : trip
+      ),
+    }));
+
+    return true;
+  }
+
+  function setTripArchived(tripId, archived) {
+    setData((prev) => ({
+      ...prev,
+      trips: prev.trips.map((trip) =>
+        trip.id === tripId
+          ? {
+              ...trip,
+              archived,
+              archivedAt: archived ? Date.now() : null,
+              updatedAt: Date.now(),
+            }
+          : trip
+      ),
+      defaultTemplateTripId: archived && prev.defaultTemplateTripId === tripId ? null : prev.defaultTemplateTripId,
+    }));
+  }
+
   function deleteTrip(tripId) {
     Alert.alert('Delete trip?', 'Trip items and check-up history will also be deleted.', [
       { text: 'Cancel', style: 'cancel' },
@@ -331,68 +442,8 @@ export default function AppRoot() {
     });
   }
 
-  function createFreshCheckupSession() {
+  function quickSetItemStatus(itemId, status) {
-    if (!selectedTripItems.length) {
+    if (!selectedTripId) return;
-      setCheckupSession([]);
-      return;
-    }
-
-    const fresh = selectedTripItems.map((item) => ({
-      itemId: item.id,
-      name: item.name,
-      category: item.category,
-      current: {
-        status: item.status,
-        placement: item.placement,
-        lentTo: item.lentTo || '',
-      },
-      confirmed: false,
-    }));
-
-    setCheckupSession(fresh);
-  }
-
-  function answerCheckupYes(itemId) {
-    setCheckupSession((prev) => prev.map((entry) => (entry.itemId === itemId ? { ...entry, confirmed: true } : entry)));
-  }
-
-  function openFixModal(itemId) {
-    const entry = checkupSession.find((x) => x.itemId === itemId);
-    if (!entry) return;
-
-    setCheckupFixTargetId(itemId);
-    setCheckupFixForm({
-      status: entry.current.status || 'unpacked',
-      placement: entry.current.placement || 'suitcase',
-      lentTo: entry.current.lentTo || '',
-      updateMasterList: false,
-    });
-    setCheckupFixModalVisible(true);
-  }
-
-  function saveFixModal() {
-    if (!checkupFixTargetId) return;
-
-    const targetId = checkupFixTargetId;
-    const patch = {
-      status: checkupFixForm.status,
-      placement: checkupFixForm.placement,
-      lentTo: checkupFixForm.status === 'lent-to' ? checkupFixForm.lentTo.trim() : '',
-    };
-
-    setCheckupSession((prev) =>
-      prev.map((entry) =>
-        entry.itemId === targetId
-          ? {
-              ...entry,
-              current: patch,
-              confirmed: true,
-            }
-          : entry
-      )
-    );
-
-    if (checkupFixForm.updateMasterList && selectedTripId) {
     setData((prev) => {
       const items = prev.itemsByTrip[selectedTripId] || [];
       return {
@@ -400,7 +451,151 @@ export default function AppRoot() {
         itemsByTrip: {
           ...prev.itemsByTrip,
           [selectedTripId]: items.map((item) =>
-              item.id === targetId
+            item.id === itemId
+              ? {
+                  ...item,
+                  status,
+                  lentTo: status === 'lent-to' ? item.lentTo : '',
+                  updatedAt: Date.now(),
+                }
+              : item
+          ),
+        },
+      };
+    });
+  }
+
+  function bulkSetItemStatus(itemIds, status) {
+    if (!selectedTripId || !itemIds.length) return;
+    const idSet = new Set(itemIds);
+    setData((prev) => {
+      const items = prev.itemsByTrip[selectedTripId] || [];
+      return {
+        ...prev,
+        itemsByTrip: {
+          ...prev.itemsByTrip,
+          [selectedTripId]: items.map((item) =>
+            idSet.has(item.id)
+              ? {
+                  ...item,
+                  status,
+                  lentTo: status === 'lent-to' ? item.lentTo : '',
+                  updatedAt: Date.now(),
+                }
+              : item
+          ),
+        },
+      };
+    });
+  }
+
+  function deleteCheckup(checkupId) {
+    if (!selectedTripId) return;
+    setData((prev) => {
+      const existing = prev.checkupsByTrip[selectedTripId] || [];
+      return {
+        ...prev,
+        checkupsByTrip: {
+          ...prev.checkupsByTrip,
+          [selectedTripId]: existing.filter((checkup) => checkup.id !== checkupId),
+        },
+      };
+    });
+    setSelectedCheckupId((prev) => (prev === checkupId ? null : prev));
+  }
+
+  function createFreshCheckupSession() {
+    if (!selectedTripItems.length) {
+      setCheckupSession([]);
+      return;
+    }
+    setCheckupSession(buildCheckupSession(selectedTripItems));
+  }
+
+  function startCheckupFlow() {
+    if (!selectedTripId) {
+      Alert.alert('No trip selected', 'Please select a trip first.');
+      return;
+    }
+    if (!selectedTripItems.length) {
+      Alert.alert('No items', 'Add items before starting a check-up.');
+      return;
+    }
+
+    const fresh = buildCheckupSession(selectedTripItems);
+    setCheckupSession(fresh);
+    setCheckupFlowIndex(0);
+    setCheckupFlowMode('question');
+    setCheckupNoForm(emptyCheckupNoForm());
+    setCheckupFlowVisible(true);
+  }
+
+  function closeCheckupFlow() {
+    setCheckupFlowVisible(false);
+    setCheckupFlowMode('question');
+    setCheckupNoForm(emptyCheckupNoForm());
+  }
+
+  function goNextInCheckup() {
+    setCheckupFlowIndex((prev) => prev + 1);
+    setCheckupFlowMode('question');
+    setCheckupNoForm(emptyCheckupNoForm());
+  }
+
+  function answerCurrentCheckupYes() {
+    const entry = checkupCurrentEntry;
+    if (!entry) return;
+
+    setCheckupSession((prev) =>
+      prev.map((x) => (x.itemId === entry.itemId ? { ...x, confirmed: true, result: 'correct' } : x))
+    );
+    goNextInCheckup();
+  }
+
+  function openCurrentCheckupNo() {
+    const entry = checkupCurrentEntry;
+    if (!entry) return;
+    setCheckupNoForm({
+      status: entry.current.status || 'unpacked',
+      placement: entry.current.placement || 'suitcase',
+      lentTo: entry.current.lentTo || '',
+      updateMasterList: false,
+    });
+    setCheckupFlowMode('edit');
+  }
+
+  function saveCurrentCheckupNo() {
+    const entry = checkupCurrentEntry;
+    if (!entry) return;
+
+    const patch = {
+      status: checkupNoForm.status,
+      placement: checkupNoForm.placement,
+      lentTo: checkupNoForm.status === 'lent-to' ? checkupNoForm.lentTo.trim() : '',
+    };
+
+    setCheckupSession((prev) =>
+      prev.map((x) =>
+        x.itemId === entry.itemId
+          ? {
+              ...x,
+              current: patch,
+              confirmed: true,
+              result: 'bad',
+            }
+          : x
+      )
+    );
+
+    if (checkupNoForm.updateMasterList && selectedTripId) {
+      setData((prev) => {
+        const items = prev.itemsByTrip[selectedTripId] || [];
+        return {
+          ...prev,
+          itemsByTrip: {
+            ...prev.itemsByTrip,
+            [selectedTripId]: items.map((item) =>
+              item.id === entry.itemId
                 ? {
                     ...item,
                     status: patch.status,
@@ -415,34 +610,34 @@ export default function AppRoot() {
       });
     }
 
-    setCheckupFixModalVisible(false);
+    goNextInCheckup();
-    setCheckupFixTargetId(null);
   }
 
-  function saveCheckup() {
+  function saveCheckupSnapshot(sessionToSave) {
     if (!selectedTripId) {
       Alert.alert('No trip selected', 'Please select a trip first.');
-      return;
+      return false;
     }
 
-    if (!checkupSession.length) {
+    if (!sessionToSave.length) {
       Alert.alert('No items', 'Add items before creating a check-up.');
-      return;
+      return false;
     }
 
-    const pending = checkupSession.filter((entry) => !entry.confirmed).length;
+    const pending = sessionToSave.filter((entry) => !entry.confirmed).length;
     if (pending > 0) {
       Alert.alert('Incomplete', `Please confirm all items first (${pending} remaining).`);
-      return;
+      return false;
     }
 
-    const snapshot = checkupSession.map((entry) => ({
+    const snapshot = sessionToSave.map((entry) => ({
       itemId: entry.itemId,
       name: entry.name,
       category: entry.category,
       status: entry.current.status,
       placement: entry.current.placement,
       lentTo: entry.current.status === 'lent-to' ? entry.current.lentTo : '',
+      result: entry.result || 'pending',
     }));
 
     setData((prev) => {
@@ -457,13 +652,25 @@ export default function AppRoot() {
               id: makeId('checkup'),
               createdAt: Date.now(),
               snapshot,
+              stats: {
+                correct: snapshot.filter((entry) => entry.result === 'correct').length,
+                bad: snapshot.filter((entry) => entry.result === 'bad').length,
+              },
             },
           ],
         },
       };
     });
 
+    return true;
+  }
+
+  function finishCheckupFlow() {
+    const ok = saveCheckupSnapshot(checkupSession);
+    if (!ok) return;
+
     Alert.alert('Saved', 'Check-up snapshot saved.');
+    closeCheckupFlow();
     createFreshCheckupSession();
   }
 
@@ -480,7 +687,7 @@ export default function AppRoot() {
 
   if (!loaded) {
     return (
-      <SafeAreaView style={styles.safe}>
+      <SafeAreaView style={[styles.safe, { paddingTop: topInset }]}>
         <StatusBar style="light" translucent={false} />
         <View style={styles.center}>
           <Text style={styles.muted}>Loading local data...</Text>
@@ -490,7 +697,7 @@ export default function AppRoot() {
   }
 
   return (
-    <SafeAreaView style={styles.safe}>
+    <SafeAreaView style={[styles.safe, { paddingTop: topInset }]}>
       <StatusBar style="light" translucent={false} />
 
       <KeyboardAvoidingView style={styles.flex} behavior={Platform.OS === 'ios' ? 'padding' : 'height'}>
@@ -500,24 +707,38 @@ export default function AppRoot() {
           keyboardShouldPersistTaps="handled"
           showsVerticalScrollIndicator={false}
         >
-          <View style={styles.statusSpacer} />
+          <TripPicker trips={visibleTrips} selectedTripId={selectedTripId} onChooseTrip={setSelectedTripId} />
-          <TripPicker trips={data.trips} selectedTripId={selectedTripId} onChooseTrip={setSelectedTripId} />
 
           {tab === 'trips' && (
             <TripsTab
               tripForm={tripForm}
               updateTripForm={updateTripForm}
-              pickTripImage={() => pickImage((uri) => updateTripForm('imageUri', uri))}
+              pickTripImage={(onPicked) =>
+                pickImage((uri) => {
+                  if (typeof onPicked === 'function') onPicked(uri);
+                  else updateTripForm('imageUri', uri);
+                })
+              }
+              takeTripImage={(onPicked) =>
+                takeImage((uri) => {
+                  if (typeof onPicked === 'function') onPicked(uri);
+                  else updateTripForm('imageUri', uri);
+                })
+              }
               templateTrip={templateTrip}
               createTrip={createTrip}
               trips={data.trips}
               selectedTripId={selectedTripId}
               chooseTrip={setSelectedTripId}
               setTripAsTemplate={setTripAsTemplate}
+              saveTripEdits={saveTripEdits}
+              setTripArchived={setTripArchived}
               deleteTrip={deleteTrip}
               onInputFocus={onInputFocus}
               defaultTemplateTripId={data.defaultTemplateTripId}
               openDatePicker={openDatePicker}
+              activeTripItemCount={selectedTripItems.length}
+              activeTripCheckupCount={selectedTripCheckups.length}
             />
           )}
 
@@ -528,16 +749,17 @@ export default function AppRoot() {
               openAddItemModal={openAddItemModal}
               openEditItemModal={openEditItemModal}
               deleteItem={deleteItem}
+              quickSetItemStatus={quickSetItemStatus}
+              bulkSetItemStatus={bulkSetItemStatus}
             />
           )}
 
           {tab === 'checkup' && (
             <CheckupTab
-              checkupSession={checkupSession}
+              selectedTrip={selectedTrip}
-              answerCheckupYes={answerCheckupYes}
+              selectedTripItems={selectedTripItems}
-              openFixModal={openFixModal}
+              checkupStats={checkupStats}
-              createFreshCheckupSession={createFreshCheckupSession}
+              startCheckupFlow={startCheckupFlow}
-              saveCheckup={saveCheckup}
             />
           )}
 
@@ -547,6 +769,7 @@ export default function AppRoot() {
               selectedTripCheckups={selectedTripCheckups}
               selectedCheckupId={selectedCheckupId}
               setSelectedCheckupId={setSelectedCheckupId}
+              onDeleteCheckup={deleteCheckup}
             />
           )}
         </ScrollView>
@@ -568,15 +791,23 @@ export default function AppRoot() {
         setItemModalVisible={setItemModalVisible}
         updateItemForm={updateItemForm}
         pickItemImage={() => pickImage((uri) => updateItemForm('imageUri', uri))}
+        takeItemImage={() => takeImage((uri) => updateItemForm('imageUri', uri))}
         saveItemFromModal={saveItemFromModal}
       />
 
-      <CheckupFixModal
+      <CheckupFlowModal
-        visible={checkupFixModalVisible}
+        visible={checkupFlowVisible}
-        checkupFixForm={checkupFixForm}
+        entry={checkupCurrentEntry}
-        setCheckupFixForm={setCheckupFixForm}
+        stepIndex={checkupFlowIndex}
-        setCheckupFixModalVisible={setCheckupFixModalVisible}
+        total={checkupSession.length}
-        saveFixModal={saveFixModal}
+        mode={checkupFlowMode}
+        noForm={checkupNoForm}
+        setNoForm={setCheckupNoForm}
+        onClose={closeCheckupFlow}
+        onYes={answerCurrentCheckupYes}
+        onNo={openCurrentCheckupNo}
+        onSaveNo={saveCurrentCheckupNo}
+        onFinish={finishCheckupFlow}
       />
     </SafeAreaView>
   );

src/components/ItemCard.js

@@ -7,7 +7,10 @@ function statusAccent(status) {
   return STATUS_COLORS[status] || '#64748b';
 }
 
-export default function ItemCard({ item, onEdit, onDelete }) {
+export default function ItemCard({ item, onEdit, onDelete, onQuickPack, onQuickUnpack }) {
+  const isPacked = item.status === 'packed';
+  const isUnpacked = item.status === 'unpacked';
+
   return (
     <View style={styles.itemCard}>
       <View style={[styles.itemAccent, { backgroundColor: statusAccent(item.status) }]} />
@@ -29,6 +32,16 @@ export default function ItemCard({ item, onEdit, onDelete }) {
             </Pressable>
           </View>
         </View>
+
+        <View style={styles.quickStatusRow}>
+          <Pressable style={[styles.quickStatusBtn, isPacked && styles.quickStatusBtnActive]} onPress={onQuickPack}>
+            <Text style={[styles.quickStatusBtnText, isPacked && styles.quickStatusBtnTextActive]}>Pack</Text>
+          </Pressable>
+          <Pressable style={[styles.quickStatusBtn, isUnpacked && styles.quickStatusBtnActive]} onPress={onQuickUnpack}>
+            <Text style={[styles.quickStatusBtnText, isUnpacked && styles.quickStatusBtnTextActive]}>Unpack</Text>
+          </Pressable>
+        </View>
+
         {item.imageUri ? <Image source={{ uri: item.imageUri }} style={styles.previewImageSmall} /> : null}
       </View>
     </View>

src/modals/CheckupFixModal.js

@@ -15,7 +15,7 @@ export default function CheckupFixModal({
   return (
     <Modal visible={visible} animationType="slide" transparent>
       <View style={styles.modalBackdrop}>
-        <KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'padding' : 'height'} style={styles.modalKeyboardWrap}>
+        <KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'padding' : undefined} style={styles.modalKeyboardWrap}>
           <View style={styles.modalCard}>
             <View style={styles.sectionRow}>
               <Text style={styles.sectionTitle}>Update for this Check-Up</Text>
@@ -24,7 +24,12 @@ export default function CheckupFixModal({
               </Pressable>
             </View>
 
-            <ScrollView keyboardShouldPersistTaps="handled" showsVerticalScrollIndicator={false}>
+            <ScrollView
+              keyboardShouldPersistTaps="handled"
+              keyboardDismissMode="interactive"
+              contentContainerStyle={{ paddingBottom: 12 }}
+              showsVerticalScrollIndicator={false}
+            >
               <Field label="Status">
                 <ChipGroup
                   options={ITEM_STATUSES}

src/modals/CheckupFlowModal.js

@@ -0,0 +1,121 @@
+import React from 'react';
+import { KeyboardAvoidingView, Modal, Platform, Pressable, ScrollView, Text, TextInput, View } from 'react-native';
+import { ITEM_PLACEMENTS, ITEM_STATUSES } from '../constants';
+import ChipGroup from '../components/ChipGroup';
+import Field from '../components/Field';
+import { styles } from '../styles';
+
+export default function CheckupFlowModal({
+  visible,
+  entry,
+  stepIndex,
+  total,
+  mode,
+  noForm,
+  setNoForm,
+  onClose,
+  onYes,
+  onNo,
+  onSaveNo,
+  onFinish,
+}) {
+  const finished = !entry;
+
+  return (
+    <Modal visible={visible} animationType="slide" transparent>
+      <View style={styles.modalBackdrop}>
+        <KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'padding' : undefined} style={styles.modalKeyboardWrap}>
+          <View style={styles.modalCard}>
+            <View style={styles.sectionRow}>
+              <Text style={styles.sectionTitle}>Check-Up</Text>
+              <Pressable onPress={onClose}>
+                <Text style={styles.closeText}>Close</Text>
+              </Pressable>
+            </View>
+
+            {finished ? (
+              <View style={styles.section}>
+                <Text style={styles.cardTitle}>Done. Save this snapshot?</Text>
+                <Text style={styles.cardMeta}>All {total} items were checked.</Text>
+                <Pressable style={styles.primaryBtn} onPress={onFinish}>
+                  <Text style={styles.primaryBtnText}>Save Check-Up Snapshot</Text>
+                </Pressable>
+              </View>
+            ) : (
+              <ScrollView
+                keyboardShouldPersistTaps="handled"
+                keyboardDismissMode="interactive"
+                contentContainerStyle={{ paddingBottom: 12 }}
+                showsVerticalScrollIndicator={false}
+              >
+                <Text style={styles.tripHistoryLabel}>
+                  Item {stepIndex + 1} / {total}
+                </Text>
+                <Text style={styles.cardTitle}>{entry.name}</Text>
+                <Text style={styles.cardMeta}>{entry.category || 'uncategorized'}</Text>
+                <Text style={styles.cardMeta}>
+                  Current: {entry.current.status} · {entry.current.placement}
+                  {entry.current.status === 'lent-to' && entry.current.lentTo ? ` · ${entry.current.lentTo}` : ''}
+                </Text>
+
+                {mode === 'question' ? (
+                  <View style={styles.answerRowWide}>
+                    <Pressable style={styles.answerYesWide} onPress={onYes}>
+                      <Text style={styles.answerText}>Yes, correct</Text>
+                    </Pressable>
+                    <Pressable style={styles.answerNoWide} onPress={onNo}>
+                      <Text style={styles.answerText}>No, update</Text>
+                    </Pressable>
+                  </View>
+                ) : (
+                  <View style={styles.section}>
+                    <Field label="Status">
+                      <ChipGroup
+                        options={ITEM_STATUSES}
+                        value={noForm.status}
+                        onChange={(v) => setNoForm((prev) => ({ ...prev, status: v }))}
+                      />
+                    </Field>
+
+                    <Field label="Placement">
+                      <ChipGroup
+                        options={ITEM_PLACEMENTS}
+                        value={noForm.placement}
+                        onChange={(v) => setNoForm((prev) => ({ ...prev, placement: v }))}
+                      />
+                    </Field>
+
+                    {noForm.status === 'lent-to' ? (
+                      <Field label="Lent to">
+                        <TextInput
+                          style={styles.input}
+                          value={noForm.lentTo}
+                          onChangeText={(v) => setNoForm((prev) => ({ ...prev, lentTo: v }))}
+                          placeholder="Person name"
+                          placeholderTextColor="#6b7280"
+                        />
+                      </Field>
+                    ) : null}
+
+                    <Pressable
+                      style={styles.inlineToggle}
+                      onPress={() => setNoForm((prev) => ({ ...prev, updateMasterList: !prev.updateMasterList }))}
+                    >
+                      <Text style={styles.inlineToggleText}>
+                        {noForm.updateMasterList ? '☑' : '☐'} Also update item in trip list
+                      </Text>
+                    </Pressable>
+
+                    <Pressable style={styles.primaryBtn} onPress={onSaveNo}>
+                      <Text style={styles.primaryBtnText}>Save update + next</Text>
+                    </Pressable>
+                  </View>
+                )}
+              </ScrollView>
+            )}
+          </View>
+        </KeyboardAvoidingView>
+      </View>
+    </Modal>
+  );
+}

src/modals/ItemModal.js

@@ -11,12 +11,13 @@ export default function ItemModal({
   setItemModalVisible,
   updateItemForm,
   pickItemImage,
+  takeItemImage,
   saveItemFromModal,
 }) {
   return (
     <Modal visible={visible} animationType="slide" transparent>
       <View style={styles.modalBackdrop}>
-        <KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'padding' : 'height'} style={styles.modalKeyboardWrap}>
+        <KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'padding' : undefined} style={styles.modalKeyboardWrap}>
           <View style={styles.modalCard}>
             <View style={styles.sectionRow}>
               <Text style={styles.sectionTitle}>{itemForm.id ? 'Update Item' : 'Add Item'}</Text>
@@ -25,7 +26,12 @@ export default function ItemModal({
               </Pressable>
             </View>
 
-            <ScrollView keyboardShouldPersistTaps="handled" showsVerticalScrollIndicator={false}>
+            <ScrollView
+              keyboardShouldPersistTaps="handled"
+              keyboardDismissMode="interactive"
+              contentContainerStyle={{ paddingBottom: 12 }}
+              showsVerticalScrollIndicator={false}
+            >
               <Field label="Name">
                 <TextInput
                   style={styles.input}
@@ -76,9 +82,14 @@ export default function ItemModal({
                 </Field>
               ) : null}
 
-              <Pressable style={styles.secondaryBtn} onPress={pickItemImage}>
+              <View style={styles.actionRow}>
-                <Text style={styles.secondaryBtnText}>{itemForm.imageUri ? 'Change image' : 'Add image'}</Text>
+                <Pressable style={[styles.secondaryBtnTight, styles.flex]} onPress={takeItemImage}>
+                  <Text style={styles.secondaryBtnText}>Take photo</Text>
                 </Pressable>
+                <Pressable style={[styles.secondaryBtnTight, styles.flex]} onPress={pickItemImage}>
+                  <Text style={styles.secondaryBtnText}>{itemForm.imageUri ? 'From gallery (change)' : 'From gallery'}</Text>
+                </Pressable>
+              </View>
               {!!itemForm.imageUri && <Image source={{ uri: itemForm.imageUri }} style={styles.previewImageSmall} />}
 
               <Pressable style={styles.primaryBtn} onPress={saveItemFromModal}>

src/styles.js

@@ -10,10 +10,10 @@ export const styles = StyleSheet.create({
     flex: 1,
   },
   content: {
-    paddingHorizontal: 14,
+    paddingHorizontal: 16,
-    paddingTop: 10,
+    paddingTop: 12,
-    paddingBottom: TAB_BAR_HEIGHT + 20,
+    paddingBottom: TAB_BAR_HEIGHT + 22,
-    gap: 12,
+    gap: 14,
   },
   statusSpacer: {
     height: Platform.OS === 'android' ? 8 : 0,
@@ -64,7 +64,7 @@ export const styles = StyleSheet.create({
   },
 
   section: {
-    gap: 10,
+    gap: 12,
   },
   sectionTitle: {
     color: '#f1f5f9',
@@ -80,7 +80,7 @@ export const styles = StyleSheet.create({
 
   card: {
     backgroundColor: '#111827',
-    borderRadius: 14,
+    borderRadius: 16,
     borderWidth: 1,
     borderColor: '#1f2937',
     padding: 12,
@@ -89,9 +89,13 @@ export const styles = StyleSheet.create({
   cardActive: {
     borderColor: '#60a5fa',
   },
+  cardArchived: {
+    opacity: 0.72,
+    borderColor: '#374151',
+  },
   cardSoft: {
     backgroundColor: '#0f172a',
-    borderRadius: 14,
+    borderRadius: 16,
     borderWidth: 1,
     borderColor: '#1e293b',
     padding: 12,
@@ -117,6 +121,32 @@ export const styles = StyleSheet.create({
     marginTop: -2,
     marginBottom: 2,
   },
+  tripHeroCard: {
+    backgroundColor: '#0f172a',
+    borderRadius: 18,
+    borderWidth: 1,
+    borderColor: '#334155',
+    padding: 12,
+    gap: 8,
+  },
+  tripHeroImage: {
+    width: '100%',
+    height: 180,
+    borderRadius: 12,
+    backgroundColor: '#111827',
+  },
+  tripHeroTitle: {
+    color: '#f8fafc',
+    fontWeight: '800',
+    fontSize: 22,
+  },
+  tripListTitle: {
+    color: '#cbd5e1',
+    fontWeight: '700',
+    fontSize: 13,
+    letterSpacing: 0.4,
+    textTransform: 'uppercase',
+  },
 
   fieldWrap: {
     gap: 6,
@@ -211,6 +241,11 @@ export const styles = StyleSheet.create({
     color: '#dbeafe',
     fontWeight: '700',
   },
+  actionRow: {
+    flexDirection: 'row',
+    gap: 8,
+    marginTop: 4,
+  },
 
   inlineToggle: {
     marginTop: 2,
@@ -241,7 +276,7 @@ export const styles = StyleSheet.create({
   },
 
   itemCard: {
-    borderRadius: 14,
+    borderRadius: 16,
     backgroundColor: '#111827',
     borderWidth: 1,
     borderColor: '#1f2937',
@@ -266,6 +301,31 @@ export const styles = StyleSheet.create({
     marginTop: 2,
     fontSize: 13,
   },
+  quickStatusRow: {
+    flexDirection: 'row',
+    gap: 8,
+    marginTop: 2,
+  },
+  quickStatusBtn: {
+    paddingVertical: 6,
+    paddingHorizontal: 12,
+    borderRadius: 999,
+    borderWidth: 1,
+    borderColor: '#334155',
+    backgroundColor: '#0b1220',
+  },
+  quickStatusBtnActive: {
+    borderColor: '#60a5fa',
+    backgroundColor: '#1d2a3a',
+  },
+  quickStatusBtnText: {
+    color: '#cbd5e1',
+    fontWeight: '700',
+    fontSize: 12,
+  },
+  quickStatusBtnTextActive: {
+    color: '#dbeafe',
+  },
 
   answerRow: {
     marginTop: 8,
@@ -293,6 +353,28 @@ export const styles = StyleSheet.create({
     color: '#f8fafc',
     fontWeight: '700',
   },
+  answerRowWide: {
+    marginTop: 14,
+    gap: 10,
+  },
+  answerYesWide: {
+    backgroundColor: '#163223',
+    borderWidth: 1,
+    borderColor: '#1f7a4e',
+    borderRadius: 10,
+    paddingHorizontal: 16,
+    paddingVertical: 11,
+    alignItems: 'center',
+  },
+  answerNoWide: {
+    backgroundColor: '#3b1d22',
+    borderWidth: 1,
+    borderColor: '#7f1d1d',
+    borderRadius: 10,
+    paddingHorizontal: 16,
+    paddingVertical: 11,
+    alignItems: 'center',
+  },
   answerStateDot: {
     width: 10,
     height: 10,
@@ -302,6 +384,38 @@ export const styles = StyleSheet.create({
   answerStateDotOn: {
     backgroundColor: '#22c55e',
   },
+  answerStateDotBad: {
+    backgroundColor: '#ef4444',
+  },
+
+  statsRow: {
+    flexDirection: 'row',
+    gap: 8,
+    flexWrap: 'wrap',
+  },
+  statPill: {
+    borderRadius: 999,
+    paddingVertical: 7,
+    paddingHorizontal: 11,
+    borderWidth: 1,
+  },
+  statPillCorrect: {
+    backgroundColor: '#163223',
+    borderColor: '#1f7a4e',
+  },
+  statPillBad: {
+    backgroundColor: '#3b1d22',
+    borderColor: '#7f1d1d',
+  },
+  statPillPending: {
+    backgroundColor: '#1f2937',
+    borderColor: '#334155',
+  },
+  statPillText: {
+    color: '#e2e8f0',
+    fontWeight: '700',
+    fontSize: 12,
+  },
 
   snapshotWrap: {
     marginTop: 8,
@@ -368,20 +482,23 @@ export const styles = StyleSheet.create({
   modalBackdrop: {
     flex: 1,
     backgroundColor: 'rgba(2,6,23,0.72)',
-    justifyContent: 'flex-end',
+    paddingHorizontal: 12,
   },
   modalKeyboardWrap: {
+    flex: 1,
     width: '100%',
+    alignItems: 'center',
+    justifyContent: 'center',
   },
   modalCard: {
-    maxHeight: '87%',
+    width: '96%',
+    maxHeight: '90%',
     backgroundColor: '#0f172a',
-    borderTopLeftRadius: 18,
+    borderRadius: 20,
-    borderTopRightRadius: 18,
     borderWidth: 1,
     borderColor: '#1e293b',
-    padding: 14,
+    padding: 16,
-    gap: 8,
+    gap: 10,
   },
   closeText: {
     color: '#93c5fd',

src/tabs/CheckupTab.js

@@ -2,44 +2,36 @@ import React from 'react';
 import { Pressable, Text, View } from 'react-native';
 import { styles } from '../styles';
 
-export default function CheckupTab({ checkupSession, answerCheckupYes, openFixModal, createFreshCheckupSession, saveCheckup }) {
+export default function CheckupTab({ selectedTrip, selectedTripItems, checkupStats, startCheckupFlow }) {
   return (
     <View style={styles.section}>
-      <View style={styles.sectionRow}>
       <Text style={styles.sectionTitle}>Check-Up</Text>
-        <Pressable style={styles.secondaryBtnTight} onPress={createFreshCheckupSession}>
+
-          <Text style={styles.secondaryBtnText}>Restart</Text>
+      {!selectedTrip ? <Text style={styles.muted}>Select a trip first.</Text> : null}
-        </Pressable>
+      {selectedTrip && selectedTripItems.length === 0 ? <Text style={styles.muted}>No items for this trip yet.</Text> : null}
+
+      {selectedTrip && selectedTripItems.length > 0 ? (
+        <View style={styles.cardSoft}>
+          <Text style={styles.cardTitle}>Run a check-up for {selectedTrip.name}</Text>
+          <Text style={styles.cardMeta}>{selectedTripItems.length} items will be checked one by one.</Text>
+
+          <View style={styles.statsRow}>
+            <View style={[styles.statPill, styles.statPillCorrect]}>
+              <Text style={styles.statPillText}>Correct: {checkupStats.correct}</Text>
             </View>
-
+            <View style={[styles.statPill, styles.statPillBad]}>
-      {checkupSession.length === 0 ? <Text style={styles.muted}>No items for this trip yet.</Text> : null}
+              <Text style={styles.statPillText}>Bad: {checkupStats.bad}</Text>
-
+            </View>
-      {checkupSession.map((entry) => (
+            <View style={[styles.statPill, styles.statPillPending]}>
-        <View key={entry.itemId} style={styles.cardSoft}>
+              <Text style={styles.statPillText}>Pending: {checkupStats.pending}</Text>
-          <Text style={styles.cardTitle}>{entry.name}</Text>
-          <Text style={styles.cardMeta}>{entry.category || 'uncategorized'}</Text>
-          <Text style={styles.cardMeta}>
-            {entry.current.status} · {entry.current.placement}
-            {entry.current.status === 'lent-to' && entry.current.lentTo ? ` · ${entry.current.lentTo}` : ''}
-          </Text>
-
-          <View style={styles.answerRow}>
-            <Pressable style={styles.answerYes} onPress={() => answerCheckupYes(entry.itemId)}>
-              <Text style={styles.answerText}>Yes</Text>
-            </Pressable>
-            <Pressable style={styles.answerNo} onPress={() => openFixModal(entry.itemId)}>
-              <Text style={styles.answerText}>No</Text>
-            </Pressable>
-            <View style={[styles.answerStateDot, entry.confirmed ? styles.answerStateDotOn : null]} />
             </View>
           </View>
-      ))}
 
-      {!!checkupSession.length && (
+          <Pressable style={styles.primaryBtn} onPress={startCheckupFlow}>
-        <Pressable style={styles.primaryBtn} onPress={saveCheckup}>
+            <Text style={styles.primaryBtnText}>Start Check-Up</Text>
-          <Text style={styles.primaryBtnText}>Save Check-Up Snapshot</Text>
           </Pressable>
-      )}
+        </View>
+      ) : null}
     </View>
   );
 }

src/tabs/HistoryTab.js

@@ -1,8 +1,25 @@
 import React from 'react';
-import { Pressable, Text, View } from 'react-native';
+import { Alert, Pressable, Text, View } from 'react-native';
 import { styles } from '../styles';
 
-export default function HistoryTab({ selectedTrip, selectedTripCheckups, selectedCheckupId, setSelectedCheckupId }) {
+export default function HistoryTab({
+  selectedTrip,
+  selectedTripCheckups,
+  selectedCheckupId,
+  setSelectedCheckupId,
+  onDeleteCheckup,
+}) {
+  function askDelete(checkup) {
+    Alert.alert('Delete check-up?', 'This snapshot will be removed from history.', [
+      { text: 'Cancel', style: 'cancel' },
+      {
+        text: 'Delete',
+        style: 'destructive',
+        onPress: () => onDeleteCheckup(checkup.id),
+      },
+    ]);
+  }
+
   return (
     <View style={styles.section}>
       <Text style={styles.sectionTitle}>History</Text>
@@ -13,10 +30,17 @@ export default function HistoryTab({ selectedTrip, selectedTripCheckups, selecte
 
       {selectedTripCheckups.map((checkup) => (
         <View key={checkup.id} style={styles.cardSoft}>
-          <Pressable onPress={() => setSelectedCheckupId((prev) => (prev === checkup.id ? null : checkup.id))}>
+          <Pressable
+            onPress={() => setSelectedCheckupId((prev) => (prev === checkup.id ? null : checkup.id))}
+            onLongPress={() => askDelete(checkup)}
+            delayLongPress={280}
+          >
             <Text style={styles.cardTitle}>{new Date(checkup.createdAt).toLocaleString()}</Text>
-            <Text style={styles.cardMeta}>{checkup.snapshot.length} items</Text>
+            <Text style={styles.cardMeta}>
-            <Text style={styles.cardMeta}>{selectedCheckupId === checkup.id ? 'Tap to collapse' : 'Tap to open'}</Text>
+              {checkup.snapshot.length} items · correct: {checkup.stats?.correct ?? checkup.snapshot.filter((x) => x.result === 'correct').length} · bad:{' '}
+              {checkup.stats?.bad ?? checkup.snapshot.filter((x) => x.result === 'bad').length}
+            </Text>
+            <Text style={styles.cardMeta}>{selectedCheckupId === checkup.id ? 'Tap to collapse' : 'Tap to open'} · long hold to delete</Text>
           </Pressable>
 
           {selectedCheckupId === checkup.id ? (

src/tabs/ItemsTab.js

@@ -1,9 +1,40 @@
-import React from 'react';
+import React, { useMemo, useState } from 'react';
 import { Pressable, Text, View } from 'react-native';
 import ItemCard from '../components/ItemCard';
+import { ITEM_STATUSES } from '../constants';
 import { styles } from '../styles';
 
-export default function ItemsTab({ selectedTrip, selectedTripItems, openAddItemModal, openEditItemModal, deleteItem }) {
+export default function ItemsTab({
+  selectedTrip,
+  selectedTripItems,
+  openAddItemModal,
+  openEditItemModal,
+  deleteItem,
+  quickSetItemStatus,
+  bulkSetItemStatus,
+}) {
+  const [statusFilter, setStatusFilter] = useState('all');
+  const [categoryFilter, setCategoryFilter] = useState('all');
+
+  const categories = useMemo(
+    () => Array.from(new Set(selectedTripItems.map((item) => item.category?.trim()).filter(Boolean))).sort((a, b) => a.localeCompare(b)),
+    [selectedTripItems]
+  );
+
+  const filteredItems = useMemo(
+    () =>
+      selectedTripItems.filter((item) => {
+        const matchStatus = statusFilter === 'all' || item.status === statusFilter;
+        const itemCategory = item.category?.trim() || '';
+        const matchCategory = categoryFilter === 'all' || itemCategory === categoryFilter;
+        return matchStatus && matchCategory;
+      }),
+    [selectedTripItems, statusFilter, categoryFilter]
+  );
+
+  const filterStatusOptions = ['all', ...ITEM_STATUSES];
+  const filterCategoryOptions = ['all', ...categories];
+
   return (
     <View style={styles.section}>
       <View style={styles.sectionRow}>
@@ -16,9 +47,62 @@ export default function ItemsTab({ selectedTrip, selectedTripItems, openAddItemM
       {!selectedTrip ? <Text style={styles.muted}>Select a trip first.</Text> : null}
       {selectedTripItems.length === 0 && selectedTrip ? <Text style={styles.muted}>No items yet.</Text> : null}
 
-      {selectedTripItems.map((item) => (
+      {selectedTrip ? (
-        <ItemCard key={item.id} item={item} onEdit={openEditItemModal} onDelete={deleteItem} />
+        <View style={styles.cardSoft}>
+          <Text style={styles.cardTitle}>Quick actions</Text>
+          <View style={styles.actionRow}>
+            <Pressable style={[styles.secondaryBtnTight, styles.flex]} onPress={() => bulkSetItemStatus(filteredItems.map((x) => x.id), 'packed')}>
+              <Text style={styles.secondaryBtnText}>Pack shown ({filteredItems.length})</Text>
+            </Pressable>
+            <Pressable style={[styles.secondaryBtnTight, styles.flex]} onPress={() => bulkSetItemStatus(filteredItems.map((x) => x.id), 'unpacked')}>
+              <Text style={styles.secondaryBtnText}>Unpack shown ({filteredItems.length})</Text>
+            </Pressable>
+          </View>
+        </View>
+      ) : null}
+
+      {selectedTripItems.length > 0 ? (
+        <View style={styles.cardSoft}>
+          <Text style={styles.cardTitle}>Filters</Text>
+
+          <Text style={styles.cardMeta}>Status</Text>
+          <View style={styles.chipGroup}>
+            {filterStatusOptions.map((status) => {
+              const active = statusFilter === status;
+              return (
+                <Pressable key={status} style={[styles.chip, active && styles.chipActive]} onPress={() => setStatusFilter(status)}>
+                  <Text style={[styles.chipText, active && styles.chipTextActive]}>{status}</Text>
+                </Pressable>
+              );
+            })}
+          </View>
+
+          <Text style={styles.cardMeta}>Category</Text>
+          <View style={styles.chipGroup}>
+            {filterCategoryOptions.map((category) => {
+              const active = categoryFilter === category;
+              return (
+                <Pressable key={category} style={[styles.chip, active && styles.chipActive]} onPress={() => setCategoryFilter(category)}>
+                  <Text style={[styles.chipText, active && styles.chipTextActive]}>{category}</Text>
+                </Pressable>
+              );
+            })}
+          </View>
+        </View>
+      ) : null}
+
+      {filteredItems.map((item) => (
+        <ItemCard
+          key={item.id}
+          item={item}
+          onEdit={openEditItemModal}
+          onDelete={deleteItem}
+          onQuickPack={() => quickSetItemStatus(item.id, 'packed')}
+          onQuickUnpack={() => quickSetItemStatus(item.id, 'unpacked')}
+        />
       ))}
+
+      {selectedTripItems.length > 0 && filteredItems.length === 0 ? <Text style={styles.muted}>No items match the current filters.</Text> : null}
     </View>
   );
 }

src/tabs/TripsTab.js

@@ -1,5 +1,6 @@
-import React from 'react';
+import React, { useMemo, useState } from 'react';
-import { Image, Pressable, Text, TextInput, View } from 'react-native';
+import { Image, KeyboardAvoidingView, Modal, Platform, Pressable, ScrollView, Text, TextInput, View } from 'react-native';
+import DatePickerModal from '../components/DatePickerModal';
 import Field from '../components/Field';
 import { styles } from '../styles';
 
@@ -13,26 +14,193 @@ function DateField({ label, value, onPress }) {
   );
 }
 
+const emptyEditForm = {
+  name: '',
+  location: '',
+  startDate: '',
+  endDate: '',
+  imageUri: '',
+};
+
 export default function TripsTab({
   tripForm,
   updateTripForm,
   pickTripImage,
+  takeTripImage,
   templateTrip,
   createTrip,
   trips,
   selectedTripId,
   chooseTrip,
   setTripAsTemplate,
+  saveTripEdits,
+  setTripArchived,
   deleteTrip,
   onInputFocus,
   defaultTemplateTripId,
   openDatePicker,
+  activeTripItemCount,
+  activeTripCheckupCount,
 }) {
+  const [createModalVisible, setCreateModalVisible] = useState(false);
+  const [viewTripId, setViewTripId] = useState(null);
+  const [editMode, setEditMode] = useState(false);
+  const [editForm, setEditForm] = useState(emptyEditForm);
+  const [viewDatePicker, setViewDatePicker] = useState({ visible: false, field: 'startDate' });
+
+  const activeTrip = useMemo(() => trips.find((trip) => trip.id === selectedTripId) || null, [trips, selectedTripId]);
+  const viewingTrip = useMemo(() => trips.find((trip) => trip.id === viewTripId) || null, [trips, viewTripId]);
+  const activeTrips = useMemo(() => trips.filter((trip) => !trip.archived), [trips]);
+  const archivedTrips = useMemo(() => trips.filter((trip) => trip.archived), [trips]);
+
+  function submitCreateTrip() {
+    const ok = createTrip();
+    if (ok) setCreateModalVisible(false);
+  }
+
+  function openView(tripId) {
+    const trip = trips.find((x) => x.id === tripId);
+    if (!trip) return;
+    setViewTripId(tripId);
+    setEditMode(false);
+    setEditForm({
+      name: trip.name || '',
+      location: trip.location || '',
+      startDate: trip.startDate || '',
+      endDate: trip.endDate || '',
+      imageUri: trip.imageUri || '',
+    });
+  }
+
+  function updateEditForm(field, value) {
+    setEditForm((prev) => ({ ...prev, [field]: value }));
+  }
+
+  function saveEditFromView() {
+    if (!viewingTrip) return;
+    const ok = saveTripEdits(viewingTrip.id, editForm);
+    if (!ok) return;
+    setEditMode(false);
+  }
+
+  function pickViewTripImage() {
+    pickTripImage((uri) => updateEditForm('imageUri', uri));
+  }
+
+  function takeViewTripImage() {
+    takeTripImage((uri) => updateEditForm('imageUri', uri));
+  }
+
+  function applyTemplateFromView() {
+    if (!viewingTrip) return;
+    setTripAsTemplate(viewingTrip.id);
+  }
+
+  function toggleArchiveFromView() {
+    if (!viewingTrip) return;
+    setTripArchived(viewingTrip.id, !viewingTrip.archived);
+    if (!viewingTrip.archived) {
+      setViewTripId(null);
+      setEditMode(false);
+    }
+  }
+
+  function deleteFromView() {
+    if (!viewingTrip) return;
+    const tripId = viewingTrip.id;
+    setViewTripId(null);
+    setEditMode(false);
+    deleteTrip(tripId);
+  }
+
   return (
     <View style={styles.section}>
+      <View style={styles.sectionRow}>
         <Text style={styles.sectionTitle}>Trips</Text>
+        <Pressable style={styles.primaryBtnTight} onPress={() => setCreateModalVisible(true)}>
+          <Text style={styles.primaryBtnText}>+ New Trip</Text>
+        </Pressable>
+      </View>
 
-      <View style={styles.cardSoft}>
+      {activeTrip ? (
+        <View style={styles.tripHeroCard}>
+          {activeTrip.imageUri ? <Image source={{ uri: activeTrip.imageUri }} style={styles.tripHeroImage} /> : null}
+          <Text style={styles.tripHeroTitle}>{activeTrip.name}</Text>
+          <Text style={styles.cardMeta}>{activeTrip.location || 'No location'} · {activeTrip.startDate} → {activeTrip.endDate}</Text>
+          <Text style={styles.cardMeta}>{activeTripItemCount} items · {activeTripCheckupCount} check-ups</Text>
+        </View>
+      ) : (
+        <Text style={styles.muted}>No active trips. Unarchive or create one.</Text>
+      )}
+
+      <Text style={styles.tripListTitle}>Active Trips</Text>
+
+      {activeTrips
+        .slice()
+        .sort((a, b) => b.startDate.localeCompare(a.startDate))
+        .map((trip) => (
+          <View key={trip.id} style={[styles.card, selectedTripId === trip.id && styles.cardActive]}>
+            <View style={styles.cardRow}>
+              <View style={styles.flex}>
+                <Text style={styles.cardTitle}>{trip.name}</Text>
+                <Text style={styles.cardMeta}>{trip.location || 'No location'} · {trip.startDate} → {trip.endDate}</Text>
+                <Text style={styles.cardMeta}>{defaultTemplateTripId === trip.id ? 'Default template' : ' '}</Text>
+              </View>
+              <View style={styles.stackButtons}>
+                <Pressable style={styles.miniBtn} onPress={() => chooseTrip(trip.id)}>
+                  <Text style={styles.miniBtnText}>Select</Text>
+                </Pressable>
+                <Pressable style={styles.miniBtn} onPress={() => openView(trip.id)}>
+                  <Text style={styles.miniBtnText}>View</Text>
+                </Pressable>
+              </View>
+            </View>
+            {trip.imageUri ? <Image source={{ uri: trip.imageUri }} style={styles.previewImageSmall} /> : null}
+          </View>
+        ))}
+
+      {archivedTrips.length > 0 ? (
+        <>
+          <Text style={styles.tripListTitle}>Archived Trips</Text>
+          {archivedTrips
+            .slice()
+            .sort((a, b) => b.startDate.localeCompare(a.startDate))
+            .map((trip) => (
+              <View key={trip.id} style={[styles.card, styles.cardArchived]}>
+                <View style={styles.cardRow}>
+                  <View style={styles.flex}>
+                    <Text style={styles.cardTitle}>{trip.name}</Text>
+                    <Text style={styles.cardMeta}>{trip.location || 'No location'} · {trip.startDate} → {trip.endDate}</Text>
+                    <Text style={styles.cardMeta}>Archived</Text>
+                  </View>
+                  <View style={styles.stackButtons}>
+                    <Pressable style={styles.miniBtn} onPress={() => openView(trip.id)}>
+                      <Text style={styles.miniBtnText}>View</Text>
+                    </Pressable>
+                  </View>
+                </View>
+              </View>
+            ))}
+        </>
+      ) : null}
+
+      <Modal visible={createModalVisible} animationType="slide" transparent>
+        <View style={styles.modalBackdrop}>
+          <KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'padding' : undefined} style={styles.modalKeyboardWrap}>
+            <View style={styles.modalCard}>
+              <View style={styles.sectionRow}>
+                <Text style={styles.sectionTitle}>Create Trip</Text>
+                <Pressable onPress={() => setCreateModalVisible(false)}>
+                  <Text style={styles.closeText}>Close</Text>
+                </Pressable>
+              </View>
+
+              <ScrollView
+                keyboardShouldPersistTaps="handled"
+                keyboardDismissMode="interactive"
+                contentContainerStyle={{ paddingBottom: 12 }}
+                showsVerticalScrollIndicator={false}
+              >
                 <Field label="Name">
                   <TextInput
                     style={styles.input}
@@ -58,9 +226,14 @@ export default function TripsTab({
                 <DateField label="Start Date" value={tripForm.startDate} onPress={() => openDatePicker('startDate')} />
                 <DateField label="End Date" value={tripForm.endDate} onPress={() => openDatePicker('endDate')} />
 
-        <Pressable style={styles.secondaryBtn} onPress={pickTripImage}>
+                <View style={styles.actionRow}>
-          <Text style={styles.secondaryBtnText}>{tripForm.imageUri ? 'Change trip image' : 'Add trip image'}</Text>
+                  <Pressable style={[styles.secondaryBtnTight, styles.flex]} onPress={takeTripImage}>
+                    <Text style={styles.secondaryBtnText}>Take photo</Text>
                   </Pressable>
+                  <Pressable style={[styles.secondaryBtnTight, styles.flex]} onPress={pickTripImage}>
+                    <Text style={styles.secondaryBtnText}>{tripForm.imageUri ? 'From gallery (change)' : 'From gallery'}</Text>
+                  </Pressable>
+                </View>
 
                 {tripForm.imageUri ? <Image source={{ uri: tripForm.imageUri }} style={styles.previewImage} /> : null}
 
@@ -76,37 +249,126 @@ export default function TripsTab({
                   <Text style={styles.inlineToggleText}>{tripForm.setAsDefaultTemplate ? '☑' : '☐'} Set as default template</Text>
                 </Pressable>
 
-        <Pressable style={styles.primaryBtn} onPress={createTrip}>
+                <Pressable style={styles.primaryBtn} onPress={submitCreateTrip}>
                   <Text style={styles.primaryBtnText}>Create Trip</Text>
                 </Pressable>
+              </ScrollView>
+            </View>
+          </KeyboardAvoidingView>
+        </View>
+      </Modal>
+
+      <Modal visible={!!viewingTrip} animationType="slide" transparent>
+        <View style={styles.modalBackdrop}>
+          <KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'padding' : undefined} style={styles.modalKeyboardWrap}>
+            <View style={styles.modalCard}>
+              <View style={styles.sectionRow}>
+                <Text style={styles.sectionTitle}>Trip View</Text>
+                <Pressable
+                  onPress={() => {
+                    setViewTripId(null);
+                    setEditMode(false);
+                  }}
+                >
+                  <Text style={styles.closeText}>Close</Text>
+                </Pressable>
               </View>
 
-      {trips
+              {viewingTrip ? (
-        .slice()
+                <ScrollView
-        .sort((a, b) => b.startDate.localeCompare(a.startDate))
+                  keyboardShouldPersistTaps="handled"
-        .map((trip) => (
+                  keyboardDismissMode="interactive"
-          <View key={trip.id} style={[styles.card, selectedTripId === trip.id && styles.cardActive]}>
+                  contentContainerStyle={{ paddingBottom: 12 }}
-            <View style={styles.cardRow}>
+                  showsVerticalScrollIndicator={false}
-              <View style={styles.flex}>
+                >
-                <Text style={styles.cardTitle}>{trip.name}</Text>
+                  {!editMode ? (
-                <Text style={styles.cardMeta}>{trip.location || 'No location'} · {trip.startDate} → {trip.endDate}</Text>
+                    <>
-                <Text style={styles.cardMeta}>{defaultTemplateTripId === trip.id ? 'Default template' : ' '}</Text>
+                      {viewingTrip.imageUri ? <Image source={{ uri: viewingTrip.imageUri }} style={styles.previewImage} /> : null}
-              </View>
+                      <Text style={styles.tripHeroTitle}>{viewingTrip.name}</Text>
-              <View style={styles.stackButtons}>
+                      <Text style={styles.cardMeta}>{viewingTrip.location || 'No location'}</Text>
-                <Pressable style={styles.miniBtn} onPress={() => chooseTrip(trip.id)}>
+                      <Text style={styles.cardMeta}>{viewingTrip.startDate} → {viewingTrip.endDate}</Text>
-                  <Text style={styles.miniBtnText}>Select</Text>
+                      <Text style={styles.cardMeta}>{defaultTemplateTripId === viewingTrip.id ? 'Default template trip' : 'Not default template'}</Text>
+                      <Text style={styles.cardMeta}>{viewingTrip.archived ? 'Archived' : 'Active'}</Text>
+
+                      <Pressable style={styles.miniBtn} onPress={() => setEditMode(true)}>
+                        <Text style={styles.miniBtnText}>Edit Trip</Text>
                       </Pressable>
-                <Pressable style={styles.miniBtn} onPress={() => setTripAsTemplate(trip.id)}>
+
-                  <Text style={styles.miniBtnText}>Template</Text>
+                      <Pressable style={styles.secondaryBtn} onPress={applyTemplateFromView}>
+                        <Text style={styles.secondaryBtnText}>Set as Template</Text>
                       </Pressable>
-                <Pressable style={styles.miniBtnDanger} onPress={() => deleteTrip(trip.id)}>
+
-                  <Text style={styles.miniBtnText}>Delete</Text>
+                      <Pressable style={styles.secondaryBtn} onPress={toggleArchiveFromView}>
+                        <Text style={styles.secondaryBtnText}>{viewingTrip.archived ? 'Unarchive Trip' : 'Archive Trip'}</Text>
+                      </Pressable>
+
+                      <Pressable style={styles.miniBtnDanger} onPress={deleteFromView}>
+                        <Text style={styles.miniBtnText}>Delete Trip</Text>
+                      </Pressable>
+                    </>
+                  ) : (
+                    <>
+                      <Field label="Name">
+                        <TextInput
+                          style={styles.input}
+                          value={editForm.name}
+                          onChangeText={(v) => updateEditForm('name', v)}
+                          placeholder="Trip name"
+                          placeholderTextColor="#6b7280"
+                          onFocus={onInputFocus}
+                        />
+                      </Field>
+
+                      <Field label="Location">
+                        <TextInput
+                          style={styles.input}
+                          value={editForm.location}
+                          onChangeText={(v) => updateEditForm('location', v)}
+                          placeholder="Location"
+                          placeholderTextColor="#6b7280"
+                          onFocus={onInputFocus}
+                        />
+                      </Field>
+
+                      <DateField label="Start Date" value={editForm.startDate} onPress={() => setViewDatePicker({ visible: true, field: 'startDate' })} />
+                      <DateField label="End Date" value={editForm.endDate} onPress={() => setViewDatePicker({ visible: true, field: 'endDate' })} />
+
+                      <View style={styles.actionRow}>
+                        <Pressable style={[styles.secondaryBtnTight, styles.flex]} onPress={takeViewTripImage}>
+                          <Text style={styles.secondaryBtnText}>Take photo</Text>
+                        </Pressable>
+                        <Pressable style={[styles.secondaryBtnTight, styles.flex]} onPress={pickViewTripImage}>
+                          <Text style={styles.secondaryBtnText}>{editForm.imageUri ? 'From gallery (change)' : 'From gallery'}</Text>
                         </Pressable>
                       </View>
+
+                      {editForm.imageUri ? <Image source={{ uri: editForm.imageUri }} style={styles.previewImage} /> : null}
+
+                      <Pressable style={styles.primaryBtn} onPress={saveEditFromView}>
+                        <Text style={styles.primaryBtnText}>Save Trip</Text>
+                      </Pressable>
+                      <Pressable style={styles.secondaryBtn} onPress={() => setEditMode(false)}>
+                        <Text style={styles.secondaryBtnText}>Cancel Edit</Text>
+                      </Pressable>
+                    </>
+                  )}
+                </ScrollView>
+              ) : null}
             </View>
-            {trip.imageUri ? <Image source={{ uri: trip.imageUri }} style={styles.previewImageSmall} /> : null}
+          </KeyboardAvoidingView>
         </View>
-        ))}
+      </Modal>
+
+      <DatePickerModal
+        visible={viewDatePicker.visible}
+        title={viewDatePicker.field === 'startDate' ? 'Pick start date' : 'Pick end date'}
+        value={editForm[viewDatePicker.field]}
+        onClose={() => setViewDatePicker((prev) => ({ ...prev, visible: false }))}
+        onSelect={(ymd) => {
+          updateEditForm(viewDatePicker.field, ymd);
+          setViewDatePicker((prev) => ({ ...prev, visible: false }));
+        }}
+      />
     </View>
   );
 }

src/utils/date.js

@@ -23,3 +23,34 @@ export function findActiveTripId(trips) {
   });
   return active?.id || null;
 }
+
+export function findNextTripId(trips) {
+  const today = parseYMD(todayYMD());
+  if (!today) return null;
+
+  const next = trips
+    .map((trip) => ({ id: trip.id, start: parseYMD(trip.startDate) }))
+    .filter((trip) => !!trip.start && trip.start >= today)
+    .sort((a, b) => a.start - b.start)[0];
+
+  return next?.id || null;
+}
+
+export function findBestTripId(trips) {
+  const activeTripId = findActiveTripId(trips);
+  if (activeTripId) return activeTripId;
+
+  const nextTripId = findNextTripId(trips);
+  if (nextTripId) return nextTripId;
+
+  const latestPast = trips
+    .map((trip) => ({ id: trip.id, end: parseYMD(trip.endDate), start: parseYMD(trip.startDate) }))
+    .filter((trip) => !!trip.end || !!trip.start)
+    .sort((a, b) => {
+      const aTime = (a.end || a.start).getTime();
+      const bTime = (b.end || b.start).getTime();
+      return bTime - aTime;
+    })[0];
+
+  return latestPast?.id || null;
+}