feat(#3,#4,#7): add backup/restore, polish labels, and rename bulk actions

src/AppRoot.js

@@ -9,6 +9,7 @@ import DatePickerModal from './components/DatePickerModal';
 import AppDialogModal from './components/AppDialogModal';
 import ItemModal from './modals/ItemModal';
 import CheckupFlowModal from './modals/CheckupFlowModal';
+import BackupModal from './modals/BackupModal';
 import TripsTab from './tabs/TripsTab';
 import ItemsTab from './tabs/ItemsTab';
 import CheckupTab from './tabs/CheckupTab';
@@ -35,6 +36,8 @@ const emptyItemForm = () => ({
   placement: 'suitcase',
   lentTo: '',
   imageUri: '',
+  imageQuality: 'balanced',
+  imageAllowCrop: false,
 });
 
 const emptyCheckupNoForm = () => ({
@@ -83,6 +86,8 @@ export default function AppRoot() {
 
   const [selectedCheckupId, setSelectedCheckupId] = useState(null);
   const [dialogState, setDialogState] = useState({ visible: false, title: '', message: '', buttons: [] });
+  const [backupModalVisible, setBackupModalVisible] = useState(false);
+  const [backupImportText, setBackupImportText] = useState('');
 
   const topInset = Platform.OS === 'android' ? (RNStatusBar.currentHeight || 0) + 10 : 0;
   const fakeLoadTotalMs = useMemo(() => 1200 + Math.floor(Math.random() * 2801), []);
@@ -234,7 +239,7 @@ export default function AppRoot() {
     setDatePicker((prev) => ({ ...prev, visible: false }));
   }
 
-  async function pickImage(onPicked) {
+  async function pickImage(onPicked, options = {}) {
     const perm = await ImagePicker.requestMediaLibraryPermissionsAsync();
     if (!perm.granted) {
       showAlert('Permission needed', 'Allow gallery access to select images.');
@@ -243,8 +248,8 @@ export default function AppRoot() {
 
     const result = await ImagePicker.launchImageLibraryAsync({
       mediaTypes: ImagePicker.MediaTypeOptions.Images,
-      allowsEditing: false,
+      allowsEditing: !!options.allowCrop,
-      quality: 0.85,
+      quality: typeof options.quality === 'number' ? options.quality : 0.85,
     });
 
     if (!result.canceled && result.assets?.[0]?.uri) {
@@ -252,7 +257,7 @@ export default function AppRoot() {
     }
   }
 
-  async function takeImage(onPicked) {
+  async function takeImage(onPicked, options = {}) {
     const perm = await ImagePicker.requestCameraPermissionsAsync();
     if (!perm.granted) {
       showAlert('Permission needed', 'Allow camera access to take photos.');
@@ -260,8 +265,8 @@ export default function AppRoot() {
     }
 
     const result = await ImagePicker.launchCameraAsync({
-      allowsEditing: false,
+      allowsEditing: !!options.allowCrop,
-      quality: 0.85,
+      quality: typeof options.quality === 'number' ? options.quality : 0.85,
     });
 
     if (!result.canceled && result.assets?.[0]?.uri) {
@@ -434,6 +439,8 @@ export default function AppRoot() {
       placement: item.placement || 'suitcase',
       lentTo: item.lentTo || '',
       imageUri: item.imageUri || '',
+      imageQuality: item.imageQuality || 'balanced',
+      imageAllowCrop: !!item.imageAllowCrop,
     });
     setItemModalVisible(true);
   }
@@ -463,6 +470,8 @@ export default function AppRoot() {
         placement: itemForm.placement,
         lentTo: itemForm.status === 'lent-to' ? itemForm.lentTo.trim() : '',
         imageUri: itemForm.imageUri,
+        imageQuality: itemForm.imageQuality,
+        imageAllowCrop: itemForm.imageAllowCrop,
         createdAt: existingCreatedAt,
         updatedAt: now,
       };
@@ -606,6 +615,28 @@ export default function AppRoot() {
     setCheckupNoForm(emptyCheckupNoForm());
   }
 
+  function goBackInCheckup() {
+    setCheckupFlowIndex((prev) => Math.max(0, prev - 1));
+    setCheckupFlowMode('question');
+    setCheckupNoForm(emptyCheckupNoForm());
+  }
+
+  function skipCurrentCheckupItem() {
+    if (!checkupCurrentEntry) return;
+    setCheckupSession((prev) =>
+      prev.map((x) =>
+        x.itemId === checkupCurrentEntry.itemId
+          ? {
+              ...x,
+              confirmed: false,
+              result: 'pending',
+            }
+          : x
+      )
+    );
+    goNextInCheckup();
+  }
+
   function answerCurrentCheckupYes() {
     const entry = checkupCurrentEntry;
     if (!entry) return;
@@ -757,6 +788,58 @@ export default function AppRoot() {
     openAddItemModal();
   }
 
+  function buildBackupJson() {
+    return JSON.stringify(
+      {
+        version: 2,
+        exportedAt: new Date().toISOString(),
+        data,
+      },
+      null,
+      2
+    );
+  }
+
+  function openBackupModal() {
+    setBackupImportText('');
+    setBackupModalVisible(true);
+  }
+
+  function applyBackupImport() {
+    if (!backupImportText.trim()) {
+      showAlert('Missing backup', 'Paste backup JSON first.');
+      return;
+    }
+
+    let parsed;
+    try {
+      parsed = JSON.parse(backupImportText);
+    } catch {
+      showAlert('Invalid JSON', 'Backup JSON could not be parsed.');
+      return;
+    }
+
+    const payload = parsed?.data && typeof parsed.data === 'object' ? parsed.data : parsed;
+
+    if (!payload || typeof payload !== 'object' || !Array.isArray(payload.trips) || !payload.itemsByTrip || !payload.checkupsByTrip) {
+      showAlert('Invalid backup', 'Backup format is not supported.');
+      return;
+    }
+
+    showConfirm({
+      title: 'Import backup?',
+      message: 'This will replace all current local data.',
+      confirmText: 'Import',
+      tone: 'danger',
+      onConfirm: () => {
+        setData({ ...emptyData, ...payload });
+        setBackupModalVisible(false);
+        setBackupImportText('');
+        showAlert('Imported', 'Backup data was restored.');
+      },
+    });
+  }
+
   if (!appReady) {
     return (
       <SafeAreaView style={[styles.safe, { paddingTop: topInset }]}>
@@ -804,6 +887,7 @@ export default function AppRoot() {
               openDatePicker={openDatePicker}
               activeTripItemCount={selectedTripItems.length}
               activeTripCheckupCount={selectedTripCheckups.length}
+              openBackupModal={openBackupModal}
             />
           )}
 
@@ -855,8 +939,8 @@ export default function AppRoot() {
         itemForm={itemForm}
         setItemModalVisible={setItemModalVisible}
         updateItemForm={updateItemForm}
-        pickItemImage={() => pickImage((uri) => updateItemForm('imageUri', uri))}
+        pickItemImage={(options) => pickImage((uri) => updateItemForm('imageUri', uri), options)}
-        takeItemImage={() => takeImage((uri) => updateItemForm('imageUri', uri))}
+        takeItemImage={(options) => takeImage((uri) => updateItemForm('imageUri', uri), options)}
         saveItemFromModal={saveItemFromModal}
       />
 
@@ -872,9 +956,20 @@ export default function AppRoot() {
         onYes={answerCurrentCheckupYes}
         onNo={openCurrentCheckupNo}
         onSaveNo={saveCurrentCheckupNo}
+        onSkip={skipCurrentCheckupItem}
+        onBack={goBackInCheckup}
         onFinish={finishCheckupFlow}
       />
 
+      <BackupModal
+        visible={backupModalVisible}
+        onClose={() => setBackupModalVisible(false)}
+        exportJson={buildBackupJson()}
+        importJson={backupImportText}
+        setImportJson={setBackupImportText}
+        applyImport={applyBackupImport}
+      />
+
       <AppDialogModal
         visible={dialogState.visible}
         title={dialogState.title}

src/components/ItemCard.js

@@ -2,6 +2,7 @@ import React from 'react';
 import { Image, Pressable, Text, View } from 'react-native';
 import { STATUS_COLORS } from '../constants';
 import { styles } from '../styles';
+import { formatStatusLabel } from '../utils/labels';
 
 function statusAccent(status) {
   return STATUS_COLORS[status] || '#64748b';
@@ -29,9 +30,9 @@ export default function ItemCard({ item, onEdit, onDelete, onQuickPack, onQuickU
         <View style={styles.cardRow}>
           <View style={styles.flex}>
             <Text style={styles.itemTitle}>{item.name}</Text>
-            <Text style={styles.itemMeta}>{item.category || 'uncategorized'} · {item.status}</Text>
+            <Text style={styles.itemMeta}>{item.category || 'uncategorized'} · {formatStatusLabel(item.status, item.lentTo)}</Text>
             <Text style={styles.itemMeta}>Location: {item.placement}</Text>
-            {item.status === 'lent-to' && !!item.lentTo ? <Text style={styles.itemMeta}>Lent to: {item.lentTo}</Text> : null}
+            {item.status === 'lent-to' && !!item.lentTo ? <Text style={styles.itemMeta}>Borrower: {item.lentTo}</Text> : null}
             {!!item.description ? <Text style={styles.itemMeta}>{item.description}</Text> : null}
           </View>
           <View style={styles.stackButtons}>

src/modals/BackupModal.js

@@ -0,0 +1,54 @@
+import React from 'react';
+import { KeyboardAvoidingView, Modal, Platform, Pressable, ScrollView, Text, TextInput, View } from 'react-native';
+import { styles } from '../styles';
+
+export default function BackupModal({
+  visible,
+  onClose,
+  exportJson,
+  importJson,
+  setImportJson,
+  applyImport,
+}) {
+  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}>Backup & Restore</Text>
+              <Pressable onPress={onClose}>
+                <Text style={styles.closeText}>Close</Text>
+              </Pressable>
+            </View>
+
+            <ScrollView keyboardShouldPersistTaps="handled" contentContainerStyle={{ paddingBottom: 12 }} showsVerticalScrollIndicator={false}>
+              <Text style={styles.cardTitle}>Export JSON</Text>
+              <Text style={styles.cardMeta}>Copy this JSON and store it safely.</Text>
+              <TextInput
+                style={styles.inputMultiline}
+                multiline
+                value={exportJson}
+                editable={false}
+                selectTextOnFocus
+              />
+              <Text style={styles.cardTitle}>Import JSON</Text>
+              <Text style={styles.cardMeta}>Paste a previous backup. This will replace current data.</Text>
+              <TextInput
+                style={styles.inputMultiline}
+                multiline
+                value={importJson}
+                onChangeText={setImportJson}
+                placeholder="Paste backup JSON here"
+                placeholderTextColor="#6b7280"
+              />
+              <Pressable style={styles.primaryBtn} onPress={applyImport}>
+                <Text style={styles.primaryBtnText}>Import & Replace</Text>
+              </Pressable>
+            </ScrollView>
+          </View>
+        </KeyboardAvoidingView>
+      </View>
+    </Modal>
+  );
+}

src/modals/CheckupFlowModal.js

@@ -4,6 +4,7 @@ import { ITEM_PLACEMENTS, ITEM_STATUSES } from '../constants';
 import ChipGroup from '../components/ChipGroup';
 import Field from '../components/Field';
 import { styles } from '../styles';
+import { formatStatusLabel } from '../utils/labels';
 
 export default function CheckupFlowModal({
   visible,
@@ -17,6 +18,8 @@ export default function CheckupFlowModal({
   onYes,
   onNo,
   onSaveNo,
+  onSkip,
+  onBack,
   onFinish,
 }) {
   const finished = !entry;
@@ -37,9 +40,14 @@ export default function CheckupFlowModal({
               <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}>
+                <View style={styles.actionRow}>
-                  <Text style={styles.primaryBtnText}>Save Check-Up Snapshot</Text>
+                  <Pressable style={[styles.secondaryBtnTight, styles.flex]} onPress={onBack}>
+                    <Text style={styles.secondaryBtnText}>Back</Text>
                   </Pressable>
+                  <Pressable style={[styles.primaryBtnTight, styles.flex]} onPress={onFinish}>
+                    <Text style={styles.primaryBtnText}>Save Snapshot</Text>
+                  </Pressable>
+                </View>
               </View>
             ) : (
               <ScrollView
@@ -51,15 +59,25 @@ export default function CheckupFlowModal({
                 <Text style={styles.tripHistoryLabel}>
                   Item {stepIndex + 1} / {total}
                 </Text>
+                <View style={styles.checkupProgressTrack}>
+                  <View style={[styles.checkupProgressFill, { width: `${Math.round(((stepIndex + 1) / total) * 100)}%` }]} />
+                </View>
                 <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}
+                  Current: {formatStatusLabel(entry.current.status, entry.current.lentTo)} · {entry.current.placement}
-                  {entry.current.status === 'lent-to' && entry.current.lentTo ? ` · ${entry.current.lentTo}` : ''}
                 </Text>
 
                 {mode === 'question' ? (
                   <View style={styles.answerRowWide}>
+                    <View style={styles.actionRow}>
+                      <Pressable style={[styles.secondaryBtnTight, styles.flex]} onPress={onBack}>
+                        <Text style={styles.secondaryBtnText}>Back</Text>
+                      </Pressable>
+                      <Pressable style={[styles.secondaryBtnTight, styles.flex]} onPress={onSkip}>
+                        <Text style={styles.secondaryBtnText}>Skip</Text>
+                      </Pressable>
+                    </View>
                     <Pressable style={styles.answerYesWide} onPress={onYes}>
                       <Text style={styles.answerText}>Yes, correct</Text>
                     </Pressable>
@@ -106,9 +124,14 @@ export default function CheckupFlowModal({
                       </Text>
                     </Pressable>
 
-                    <Pressable style={styles.primaryBtn} onPress={onSaveNo}>
+                    <View style={styles.actionRow}>
-                      <Text style={styles.primaryBtnText}>Save update + next</Text>
+                      <Pressable style={[styles.secondaryBtnTight, styles.flex]} onPress={onBack}>
+                        <Text style={styles.secondaryBtnText}>Back</Text>
                       </Pressable>
+                      <Pressable style={[styles.primaryBtnTight, styles.flex]} onPress={onSaveNo}>
+                        <Text style={styles.primaryBtnText}>Save + Next</Text>
+                      </Pressable>
+                    </View>
                   </View>
                 )}
               </ScrollView>

src/modals/ItemModal.js

@@ -5,6 +5,12 @@ import ChipGroup from '../components/ChipGroup';
 import Field from '../components/Field';
 import { styles } from '../styles';
 
+function qualityValue(level) {
+  if (level === 'high') return 0.95;
+  if (level === 'low') return 0.45;
+  return 0.75;
+}
+
 export default function ItemModal({
   visible,
   itemForm,
@@ -14,6 +20,11 @@ export default function ItemModal({
   takeItemImage,
   saveItemFromModal,
 }) {
+  const mediaOptions = {
+    quality: qualityValue(itemForm.imageQuality),
+    allowCrop: !!itemForm.imageAllowCrop,
+  };
+
   return (
     <Modal visible={visible} animationType="slide" transparent>
       <View style={styles.modalBackdrop}>
@@ -82,11 +93,28 @@ export default function ItemModal({
                 </Field>
               ) : null}
 
+              <Field label="Image optimization">
+                <View style={styles.chipGroup}>
+                  {['low', 'balanced', 'high'].map((level) => {
+                    const active = itemForm.imageQuality === level;
+                    return (
+                      <Pressable key={level} style={[styles.chip, active && styles.chipActive]} onPress={() => updateItemForm('imageQuality', level)}>
+                        <Text style={[styles.chipText, active && styles.chipTextActive]}>{level}</Text>
+                      </Pressable>
+                    );
+                  })}
+                </View>
+              </Field>
+
+              <Pressable style={styles.inlineToggle} onPress={() => updateItemForm('imageAllowCrop', !itemForm.imageAllowCrop)}>
+                <Text style={styles.inlineToggleText}>{itemForm.imageAllowCrop ? '☑' : '☐'} Enable optional crop before save</Text>
+              </Pressable>
+
               <View style={styles.actionRow}>
-                <Pressable style={[styles.secondaryBtnTight, styles.flex]} onPress={takeItemImage}>
+                <Pressable style={[styles.secondaryBtnTight, styles.flex]} onPress={() => takeItemImage(mediaOptions)}>
                   <Text style={styles.secondaryBtnText}>Take photo</Text>
                 </Pressable>
-                <Pressable style={[styles.secondaryBtnTight, styles.flex]} onPress={pickItemImage}>
+                <Pressable style={[styles.secondaryBtnTight, styles.flex]} onPress={() => pickItemImage(mediaOptions)}>
                   <Text style={styles.secondaryBtnText}>{itemForm.imageUri ? 'From gallery (change)' : 'From gallery'}</Text>
                 </Pressable>
               </View>

src/styles.js

@@ -186,6 +186,19 @@ export const styles = StyleSheet.create({
     paddingHorizontal: 10,
     paddingVertical: 11,
   },
+  inputMultiline: {
+    borderWidth: 1,
+    borderColor: '#243244',
+    borderRadius: 10,
+    backgroundColor: '#0b1220',
+    color: '#e5e7eb',
+    paddingHorizontal: 10,
+    paddingVertical: 10,
+    minHeight: 150,
+    textAlignVertical: 'top',
+    fontSize: 12,
+    fontFamily: Platform.OS === 'ios' ? 'Menlo' : 'monospace',
+  },
   dateInput: {
     borderWidth: 1,
     borderColor: '#29415e',
@@ -404,6 +417,19 @@ export const styles = StyleSheet.create({
     marginTop: 14,
     gap: 10,
   },
+  checkupProgressTrack: {
+    width: '100%',
+    height: 8,
+    borderRadius: 999,
+    backgroundColor: '#1e293b',
+    overflow: 'hidden',
+    marginTop: 4,
+    marginBottom: 8,
+  },
+  checkupProgressFill: {
+    height: '100%',
+    backgroundColor: '#2563eb',
+  },
   answerYesWide: {
     backgroundColor: '#163223',
     borderWidth: 1,
@@ -494,7 +520,7 @@ export const styles = StyleSheet.create({
 
   tabBarWrap: {
     position: 'absolute',
-    bottom: 0,
+    bottom: 6,
     left: 0,
     right: 0,
     paddingHorizontal: 10,

src/tabs/HistoryTab.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { Pressable, Text, View } from 'react-native';
 import { styles } from '../styles';
+import { formatStatusLabel } from '../utils/labels';
 
 export default function HistoryTab({ selectedTrip, selectedTripCheckups, selectedCheckupId, setSelectedCheckupId, onDeleteCheckup }) {
   return (
@@ -32,8 +33,7 @@ export default function HistoryTab({ selectedTrip, selectedTripCheckups, selecte
                 <View key={entry.itemId} style={styles.snapshotRow}>
                   <Text style={styles.snapshotTitle}>{entry.name}</Text>
                   <Text style={styles.cardMeta}>
-                    {entry.status} · {entry.placement}
+                    {formatStatusLabel(entry.status, entry.lentTo)} · {entry.placement}
-                    {entry.status === 'lent-to' && entry.lentTo ? ` · ${entry.lentTo}` : ''}
                   </Text>
                 </View>
               ))}

src/tabs/ItemsTab.js

@@ -3,6 +3,7 @@ import { Pressable, Text, View } from 'react-native';
 import ItemCard from '../components/ItemCard';
 import { ITEM_STATUSES } from '../constants';
 import { styles } from '../styles';
+import { formatFilterLabel, formatStatusLabel } from '../utils/labels';
 
 export default function ItemsTab({
   selectedTrip,
@@ -52,10 +53,10 @@ export default function ItemsTab({
           <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>
+              <Text style={styles.secondaryBtnText}>Pack All ({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>
+              <Text style={styles.secondaryBtnText}>Unpack All ({filteredItems.length})</Text>
             </Pressable>
           </View>
         </View>
@@ -71,7 +72,7 @@ export default function ItemsTab({
               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>
+                  <Text style={[styles.chipText, active && styles.chipTextActive]}>{status === 'all' ? formatFilterLabel(status) : formatStatusLabel(status)}</Text>
                 </Pressable>
               );
             })}
@@ -83,7 +84,7 @@ export default function ItemsTab({
               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>
+                  <Text style={[styles.chipText, active && styles.chipTextActive]}>{formatFilterLabel(category)}</Text>
                 </Pressable>
               );
             })}

src/tabs/TripsTab.js

@@ -38,6 +38,7 @@ export default function TripsTab({
   openDatePicker,
   activeTripItemCount,
   activeTripCheckupCount,
+  openBackupModal,
 }) {
   const [createModalVisible, setCreateModalVisible] = useState(false);
   const [viewTripId, setViewTripId] = useState(null);
@@ -105,10 +106,15 @@ export default function TripsTab({
     <View style={styles.section}>
       <View style={styles.sectionRow}>
         <Text style={styles.sectionTitle}>Trips</Text>
+        <View style={styles.actionRow}>
+          <Pressable style={styles.secondaryBtnTight} onPress={openBackupModal}>
+            <Text style={styles.secondaryBtnText}>Backup</Text>
+          </Pressable>
           <Pressable style={styles.primaryBtnTight} onPress={() => setCreateModalVisible(true)}>
             <Text style={styles.primaryBtnText}>+ New Trip</Text>
           </Pressable>
         </View>
+      </View>
 
       {activeTrip ? (
         <View style={styles.tripHeroCard}>

src/utils/labels.js

@@ -0,0 +1,23 @@
+export function toTitleWords(value) {
+  if (!value) return '';
+  return value
+    .toString()
+    .split('-')
+    .map((part) => (part ? part[0].toUpperCase() + part.slice(1) : part))
+    .join(' ');
+}
+
+export function formatStatusLabel(status, lentTo = '') {
+  if (!status) return '';
+  if (status === 'lent-to') {
+    const name = lentTo?.trim();
+    return name ? `Lent To ${name}` : 'Lent To';
+  }
+  return toTitleWords(status);
+}
+
+export function formatFilterLabel(value) {
+  if (!value) return '';
+  if (value === 'all') return 'All';
+  return toTitleWords(value);
+}