feat: Sprint 5 — PIN lock, biometric auth, sync screen, QR code, merge logic
- lib/pinService.ts: PIN storage/verification via expo-secure-store - lib/syncService.ts: sync abstraction with full merge logic (mDNS/TCP stubbed) - app/lock.tsx: full-screen PIN lock with biometric support - components/ui/PinPad.tsx: reusable 6-digit PIN pad component - components/sync/QRScanner.tsx: QR code scanner via expo-camera - app/(tabs)/sync.tsx: Sync tab with QR display, partner input, history - app/sync-progress.tsx: animated sync progress screen with summary - app/(tabs)/settings.tsx: full settings with PIN setup, security, data sections - app/(tabs)/_layout.tsx: added Sync tab (RefreshCw icon) - app/_layout.tsx: AppState listener locks app after 60s background - package.json: added expo-secure-store, react-native-qrcode-svg
This commit is contained in:
@@ -1,10 +1,574 @@
|
||||
import { View, Text } from 'react-native';
|
||||
// app/(tabs)/settings.tsx — Full Settings Screen with PIN setup
|
||||
import React, { useState, useEffect, useCallback } from 'react';
|
||||
import {
|
||||
View,
|
||||
Text,
|
||||
StyleSheet,
|
||||
ScrollView,
|
||||
Switch,
|
||||
TouchableOpacity,
|
||||
Alert,
|
||||
Modal,
|
||||
SafeAreaView,
|
||||
ActivityIndicator,
|
||||
} from 'react-native';
|
||||
import { router } from 'expo-router';
|
||||
import {
|
||||
User,
|
||||
Shield,
|
||||
Fingerprint,
|
||||
RefreshCw,
|
||||
BookOpen,
|
||||
Download,
|
||||
Upload,
|
||||
Trash2,
|
||||
Info,
|
||||
ChevronRight,
|
||||
X,
|
||||
} from 'lucide-react-native';
|
||||
import * as LocalAuthentication from 'expo-local-authentication';
|
||||
import { useUserStore } from '@/store/useUserStore';
|
||||
import {
|
||||
isPinEnabled,
|
||||
setPin,
|
||||
verifyPin,
|
||||
disablePin,
|
||||
isBiometricEnabled,
|
||||
setBiometricEnabled,
|
||||
} from '@/lib/pinService';
|
||||
import { getDatabase } from '@/lib/database';
|
||||
import PinPad from '@/components/ui/PinPad';
|
||||
|
||||
// ── PIN Flow Modal ────────────────────────────────────────────────────────────
|
||||
type PinFlowMode = 'set' | 'verify';
|
||||
|
||||
interface PinFlowProps {
|
||||
mode: PinFlowMode;
|
||||
onSuccess: (pin?: string) => void;
|
||||
onCancel: () => void;
|
||||
title: string;
|
||||
subtitle?: string;
|
||||
}
|
||||
|
||||
function PinFlowModal({ mode, onSuccess, onCancel, title, subtitle }: PinFlowProps) {
|
||||
const [step, setStep] = useState<'enter' | 'confirm'>('enter');
|
||||
const [pin, setCurrentPin] = useState('');
|
||||
const [firstPin, setFirstPin] = useState('');
|
||||
const [error, setError] = useState('');
|
||||
|
||||
const handlePinChange = async (newPin: string) => {
|
||||
setCurrentPin(newPin);
|
||||
setError('');
|
||||
|
||||
if (newPin.length < 6) return;
|
||||
|
||||
if (mode === 'verify') {
|
||||
const ok = await verifyPin(newPin);
|
||||
if (ok) {
|
||||
onSuccess(newPin);
|
||||
} else {
|
||||
setError('Incorrect PIN. Try again.');
|
||||
setTimeout(() => setCurrentPin(''), 600);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// mode === 'set'
|
||||
if (step === 'enter') {
|
||||
setFirstPin(newPin);
|
||||
setCurrentPin('');
|
||||
setStep('confirm');
|
||||
} else {
|
||||
// confirm step
|
||||
if (newPin === firstPin) {
|
||||
onSuccess(newPin);
|
||||
} else {
|
||||
setError('PINs do not match. Try again.');
|
||||
setStep('enter');
|
||||
setFirstPin('');
|
||||
setTimeout(() => setCurrentPin(''), 400);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const displayTitle = mode === 'set'
|
||||
? step === 'enter' ? 'Set PIN' : 'Confirm PIN'
|
||||
: title;
|
||||
|
||||
const displaySubtitle = mode === 'set'
|
||||
? step === 'enter'
|
||||
? 'Enter a 6-digit PIN'
|
||||
: 'Re-enter your PIN to confirm'
|
||||
: subtitle;
|
||||
|
||||
export default function SettingsScreen() {
|
||||
return (
|
||||
<View className="flex-1 items-center justify-center bg-secondary">
|
||||
<Text className="text-xl text-charcoal">Settings</Text>
|
||||
<Text className="text-gray-500 mt-2">Coming in Sprint 6</Text>
|
||||
</View>
|
||||
<Modal visible animationType="slide" onRequestClose={onCancel}>
|
||||
<SafeAreaView style={pinStyles.container}>
|
||||
<View style={pinStyles.header}>
|
||||
<TouchableOpacity onPress={onCancel} style={pinStyles.closeBtn}>
|
||||
<X size={22} color="#9CA3AF" />
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
<View style={pinStyles.content}>
|
||||
<Text style={pinStyles.title}>{displayTitle}</Text>
|
||||
{displaySubtitle ? (
|
||||
<Text style={pinStyles.subtitle}>{displaySubtitle}</Text>
|
||||
) : null}
|
||||
{error ? <Text style={pinStyles.error}>{error}</Text> : null}
|
||||
<PinPad pin={pin} onPinChange={handlePinChange} maxLength={6} />
|
||||
</View>
|
||||
</SafeAreaView>
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
|
||||
const pinStyles = StyleSheet.create({
|
||||
container: { flex: 1, backgroundColor: '#0F172A' },
|
||||
header: { alignItems: 'flex-end', padding: 16 },
|
||||
closeBtn: {
|
||||
width: 36, height: 36, borderRadius: 18,
|
||||
backgroundColor: 'rgba(255,255,255,0.08)',
|
||||
justifyContent: 'center', alignItems: 'center',
|
||||
},
|
||||
content: {
|
||||
flex: 1, alignItems: 'center', justifyContent: 'center',
|
||||
paddingHorizontal: 24, gap: 28,
|
||||
},
|
||||
title: { fontSize: 24, fontWeight: '700', color: '#F9FAFB' },
|
||||
subtitle: { fontSize: 15, color: '#9CA3AF', textAlign: 'center' },
|
||||
error: { fontSize: 14, color: '#F87171', textAlign: 'center' },
|
||||
});
|
||||
|
||||
// ── Settings Screen ───────────────────────────────────────────────────────────
|
||||
|
||||
export default function SettingsScreen() {
|
||||
const user = useUserStore((s) => s.user);
|
||||
const clearUser = useUserStore((s) => s.clearUser);
|
||||
|
||||
const [pinEnabled, setPinEnabledState] = useState(false);
|
||||
const [biometricEnabled, setBiometricEnabledState] = useState(false);
|
||||
const [biometricSupported, setBiometricSupported] = useState(false);
|
||||
const [loading, setLoading] = useState(true);
|
||||
|
||||
const [pinFlowVisible, setPinFlowVisible] = useState(false);
|
||||
const [pinFlowMode, setPinFlowMode] = useState<'set' | 'verify'>('set');
|
||||
const [pinFlowCallback, setPinFlowCallback] = useState<((pin?: string) => void) | null>(null);
|
||||
const [pinFlowTitle, setPinFlowTitle] = useState('');
|
||||
const [pinFlowSubtitle, setPinFlowSubtitle] = useState('');
|
||||
|
||||
useEffect(() => {
|
||||
loadSecurityState();
|
||||
}, []);
|
||||
|
||||
const loadSecurityState = async () => {
|
||||
try {
|
||||
const [pinOn, bioOn, hw, enrolled] = await Promise.all([
|
||||
isPinEnabled(),
|
||||
isBiometricEnabled(),
|
||||
LocalAuthentication.hasHardwareAsync(),
|
||||
LocalAuthentication.isEnrolledAsync(),
|
||||
]);
|
||||
setPinEnabledState(pinOn);
|
||||
setBiometricEnabledState(bioOn);
|
||||
setBiometricSupported(hw && enrolled);
|
||||
} catch {
|
||||
// ignore
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
const openPinFlow = useCallback(
|
||||
(
|
||||
mode: 'set' | 'verify',
|
||||
title: string,
|
||||
subtitle: string,
|
||||
callback: (pin?: string) => void
|
||||
) => {
|
||||
setPinFlowMode(mode);
|
||||
setPinFlowTitle(title);
|
||||
setPinFlowSubtitle(subtitle);
|
||||
setPinFlowCallback(() => callback);
|
||||
setPinFlowVisible(true);
|
||||
},
|
||||
[]
|
||||
);
|
||||
|
||||
const handleTogglePin = async (value: boolean) => {
|
||||
if (value) {
|
||||
// Turning ON: show Set PIN flow
|
||||
openPinFlow('set', 'Set PIN', 'Enter a 6-digit PIN', async (pin) => {
|
||||
if (pin) {
|
||||
await setPin(pin);
|
||||
setPinEnabledState(true);
|
||||
setPinFlowVisible(false);
|
||||
Alert.alert('PIN Set', 'Your app is now protected with a PIN.');
|
||||
}
|
||||
});
|
||||
} else {
|
||||
// Turning OFF: verify first
|
||||
openPinFlow(
|
||||
'verify',
|
||||
'Disable PIN Lock',
|
||||
'Enter your current PIN to disable',
|
||||
async () => {
|
||||
await disablePin();
|
||||
setPinEnabledState(false);
|
||||
setBiometricEnabledState(false);
|
||||
setPinFlowVisible(false);
|
||||
Alert.alert('PIN Disabled', 'App lock has been turned off.');
|
||||
}
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
const handleToggleBiometric = async (value: boolean) => {
|
||||
await setBiometricEnabled(value);
|
||||
setBiometricEnabledState(value);
|
||||
};
|
||||
|
||||
const handleClearData = () => {
|
||||
Alert.alert(
|
||||
'Clear All Data',
|
||||
'This will permanently delete all contacts, visits, territories, and sync history. This cannot be undone.',
|
||||
[
|
||||
{ text: 'Cancel', style: 'cancel' },
|
||||
{
|
||||
text: 'Delete Everything',
|
||||
style: 'destructive',
|
||||
onPress: async () => {
|
||||
try {
|
||||
const db = await getDatabase();
|
||||
await db.execAsync(`
|
||||
DELETE FROM contacts;
|
||||
DELETE FROM visits;
|
||||
DELETE FROM territories;
|
||||
DELETE FROM sync_log;
|
||||
`);
|
||||
Alert.alert('Done', 'All data has been cleared.');
|
||||
} catch {
|
||||
Alert.alert('Error', 'Failed to clear data.');
|
||||
}
|
||||
},
|
||||
},
|
||||
]
|
||||
);
|
||||
};
|
||||
|
||||
const handleExportBackup = () => {
|
||||
Alert.alert('Export Backup', 'Export feature coming in a future sprint.');
|
||||
};
|
||||
|
||||
const handleImportBackup = () => {
|
||||
Alert.alert('Import Backup', 'Import feature coming in a future sprint.');
|
||||
};
|
||||
|
||||
if (loading) {
|
||||
return (
|
||||
<View style={styles.loadingContainer}>
|
||||
<ActivityIndicator color="#1A6B72" />
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<SafeAreaView style={styles.safe}>
|
||||
<ScrollView
|
||||
style={styles.container}
|
||||
contentContainerStyle={styles.content}
|
||||
showsVerticalScrollIndicator={false}
|
||||
>
|
||||
{/* Header */}
|
||||
<Text style={styles.pageTitle}>Settings</Text>
|
||||
|
||||
{/* ── Profile ── */}
|
||||
<SectionHeader title="Profile" />
|
||||
<View style={styles.card}>
|
||||
<View style={styles.profileRow}>
|
||||
<View style={styles.avatar}>
|
||||
<User size={28} color="#1A6B72" />
|
||||
</View>
|
||||
<View style={{ flex: 1, gap: 2 }}>
|
||||
<Text style={styles.profileName}>{user?.displayName ?? '—'}</Text>
|
||||
<Text style={styles.profileShareId}>
|
||||
Share ID: <Text style={styles.shareIdMono}>{user?.shareId ?? '—'}</Text>
|
||||
</Text>
|
||||
</View>
|
||||
</View>
|
||||
</View>
|
||||
|
||||
{/* ── Security ── */}
|
||||
<SectionHeader title="Security" />
|
||||
<View style={styles.card}>
|
||||
<SettingsRow
|
||||
icon={<Shield size={18} color="#1A6B72" />}
|
||||
label="App Lock (PIN)"
|
||||
right={
|
||||
<Switch
|
||||
value={pinEnabled}
|
||||
onValueChange={handleTogglePin}
|
||||
trackColor={{ false: '#D1D5DB', true: '#1A6B72' }}
|
||||
thumbColor="#fff"
|
||||
/>
|
||||
}
|
||||
/>
|
||||
{pinEnabled && biometricSupported && (
|
||||
<>
|
||||
<Divider />
|
||||
<SettingsRow
|
||||
icon={<Fingerprint size={18} color="#1A6B72" />}
|
||||
label="Biometric Unlock"
|
||||
right={
|
||||
<Switch
|
||||
value={biometricEnabled}
|
||||
onValueChange={handleToggleBiometric}
|
||||
trackColor={{ false: '#D1D5DB', true: '#1A6B72' }}
|
||||
thumbColor="#fff"
|
||||
/>
|
||||
}
|
||||
/>
|
||||
</>
|
||||
)}
|
||||
</View>
|
||||
|
||||
{/* ── Sync ── */}
|
||||
<SectionHeader title="Sync" />
|
||||
<View style={styles.card}>
|
||||
<SettingsRow
|
||||
icon={<RefreshCw size={18} color="#1A6B72" />}
|
||||
label="Sync with Device"
|
||||
right={<ChevronRight size={16} color="#9CA3AF" />}
|
||||
onPress={() => router.push('/(tabs)/sync')}
|
||||
/>
|
||||
</View>
|
||||
|
||||
{/* ── Data ── */}
|
||||
<SectionHeader title="Data" />
|
||||
<View style={styles.card}>
|
||||
<SettingsRow
|
||||
icon={<BookOpen size={18} color="#1A6B72" />}
|
||||
label="Topic Library"
|
||||
right={<ChevronRight size={16} color="#9CA3AF" />}
|
||||
onPress={() =>
|
||||
Alert.alert('Topic Library', 'Manage visit topics in a future update.')
|
||||
}
|
||||
/>
|
||||
<Divider />
|
||||
<SettingsRow
|
||||
icon={<Download size={18} color="#1A6B72" />}
|
||||
label="Export Backup"
|
||||
right={<ChevronRight size={16} color="#9CA3AF" />}
|
||||
onPress={handleExportBackup}
|
||||
/>
|
||||
<Divider />
|
||||
<SettingsRow
|
||||
icon={<Upload size={18} color="#1A6B72" />}
|
||||
label="Import Backup"
|
||||
right={<ChevronRight size={16} color="#9CA3AF" />}
|
||||
onPress={handleImportBackup}
|
||||
/>
|
||||
<Divider />
|
||||
<SettingsRow
|
||||
icon={<Trash2 size={18} color="#EF4444" />}
|
||||
label="Clear All Data"
|
||||
labelStyle={{ color: '#EF4444' }}
|
||||
right={<ChevronRight size={16} color="#9CA3AF" />}
|
||||
onPress={handleClearData}
|
||||
/>
|
||||
</View>
|
||||
|
||||
{/* ── About ── */}
|
||||
<SectionHeader title="About" />
|
||||
<View style={styles.card}>
|
||||
<SettingsRow
|
||||
icon={<Info size={18} color="#1A6B72" />}
|
||||
label="TerritoryLog"
|
||||
right={<Text style={styles.versionText}>v1.0.0 (Sprint 5)</Text>}
|
||||
/>
|
||||
<Divider />
|
||||
<View style={styles.aboutRow}>
|
||||
<Text style={styles.aboutText}>
|
||||
A local-first ministry record keeping app. All data stays on your device.
|
||||
</Text>
|
||||
</View>
|
||||
</View>
|
||||
|
||||
<View style={{ height: 32 }} />
|
||||
</ScrollView>
|
||||
|
||||
{/* PIN Flow Modal */}
|
||||
{pinFlowVisible && pinFlowCallback && (
|
||||
<PinFlowModal
|
||||
mode={pinFlowMode}
|
||||
title={pinFlowTitle}
|
||||
subtitle={pinFlowSubtitle}
|
||||
onSuccess={(pin) => pinFlowCallback(pin)}
|
||||
onCancel={() => setPinFlowVisible(false)}
|
||||
/>
|
||||
)}
|
||||
</SafeAreaView>
|
||||
);
|
||||
}
|
||||
|
||||
// ── Sub-components ──────────────────────────────────────────────────────────
|
||||
|
||||
function SectionHeader({ title }: { title: string }) {
|
||||
return <Text style={styles.sectionHeader}>{title}</Text>;
|
||||
}
|
||||
|
||||
function Divider() {
|
||||
return <View style={styles.divider} />;
|
||||
}
|
||||
|
||||
interface SettingsRowProps {
|
||||
icon: React.ReactNode;
|
||||
label: string;
|
||||
labelStyle?: object;
|
||||
right?: React.ReactNode;
|
||||
onPress?: () => void;
|
||||
}
|
||||
|
||||
function SettingsRow({ icon, label, labelStyle, right, onPress }: SettingsRowProps) {
|
||||
const Row = onPress ? TouchableOpacity : View;
|
||||
return (
|
||||
<Row
|
||||
style={styles.settingsRow}
|
||||
onPress={onPress}
|
||||
activeOpacity={0.7}
|
||||
>
|
||||
<View style={styles.settingsRowLeft}>
|
||||
<View style={styles.rowIcon}>{icon}</View>
|
||||
<Text style={[styles.rowLabel, labelStyle]}>{label}</Text>
|
||||
</View>
|
||||
{right && <View style={styles.settingsRowRight}>{right}</View>}
|
||||
</Row>
|
||||
);
|
||||
}
|
||||
|
||||
// ── Styles ──────────────────────────────────────────────────────────────────
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
safe: {
|
||||
flex: 1,
|
||||
backgroundColor: '#F8F4EF',
|
||||
},
|
||||
loadingContainer: {
|
||||
flex: 1,
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center',
|
||||
backgroundColor: '#F8F4EF',
|
||||
},
|
||||
container: {
|
||||
flex: 1,
|
||||
},
|
||||
content: {
|
||||
paddingBottom: 16,
|
||||
},
|
||||
pageTitle: {
|
||||
fontSize: 28,
|
||||
fontWeight: '700',
|
||||
color: '#111827',
|
||||
paddingHorizontal: 20,
|
||||
paddingTop: 20,
|
||||
paddingBottom: 4,
|
||||
},
|
||||
sectionHeader: {
|
||||
fontSize: 12,
|
||||
fontWeight: '600',
|
||||
color: '#6B7280',
|
||||
letterSpacing: 0.8,
|
||||
textTransform: 'uppercase',
|
||||
paddingHorizontal: 20,
|
||||
paddingTop: 20,
|
||||
paddingBottom: 6,
|
||||
},
|
||||
card: {
|
||||
backgroundColor: '#fff',
|
||||
marginHorizontal: 16,
|
||||
borderRadius: 16,
|
||||
paddingVertical: 4,
|
||||
shadowColor: '#000',
|
||||
shadowOffset: { width: 0, height: 1 },
|
||||
shadowOpacity: 0.05,
|
||||
shadowRadius: 4,
|
||||
elevation: 2,
|
||||
},
|
||||
profileRow: {
|
||||
flexDirection: 'row',
|
||||
alignItems: 'center',
|
||||
padding: 16,
|
||||
gap: 14,
|
||||
},
|
||||
avatar: {
|
||||
width: 52,
|
||||
height: 52,
|
||||
borderRadius: 26,
|
||||
backgroundColor: '#EFF9F9',
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center',
|
||||
borderWidth: 2,
|
||||
borderColor: '#B2DFDF',
|
||||
},
|
||||
profileName: {
|
||||
fontSize: 17,
|
||||
fontWeight: '700',
|
||||
color: '#111827',
|
||||
},
|
||||
profileShareId: {
|
||||
fontSize: 13,
|
||||
color: '#6B7280',
|
||||
},
|
||||
shareIdMono: {
|
||||
fontFamily: 'monospace',
|
||||
color: '#1A6B72',
|
||||
fontWeight: '600',
|
||||
},
|
||||
settingsRow: {
|
||||
flexDirection: 'row',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'space-between',
|
||||
paddingHorizontal: 16,
|
||||
paddingVertical: 14,
|
||||
},
|
||||
settingsRowLeft: {
|
||||
flexDirection: 'row',
|
||||
alignItems: 'center',
|
||||
gap: 12,
|
||||
flex: 1,
|
||||
},
|
||||
rowIcon: {
|
||||
width: 32,
|
||||
height: 32,
|
||||
borderRadius: 8,
|
||||
backgroundColor: '#F3F4F6',
|
||||
justifyContent: 'center',
|
||||
alignItems: 'center',
|
||||
},
|
||||
rowLabel: {
|
||||
fontSize: 15,
|
||||
color: '#111827',
|
||||
fontWeight: '500',
|
||||
},
|
||||
settingsRowRight: {
|
||||
flexShrink: 0,
|
||||
marginLeft: 8,
|
||||
},
|
||||
divider: {
|
||||
height: 1,
|
||||
backgroundColor: '#F3F4F6',
|
||||
marginHorizontal: 16,
|
||||
},
|
||||
versionText: {
|
||||
fontSize: 13,
|
||||
color: '#9CA3AF',
|
||||
},
|
||||
aboutRow: {
|
||||
paddingHorizontal: 16,
|
||||
paddingVertical: 12,
|
||||
},
|
||||
aboutText: {
|
||||
fontSize: 13,
|
||||
color: '#6B7280',
|
||||
lineHeight: 20,
|
||||
},
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user