diff --git a/app.json b/app.json index edb95f89..f2eaa16e 100644 --- a/app.json +++ b/app.json @@ -1,5 +1,6 @@ { "expo": { + "newArchEnabled": false, "name": "Schnappix", "slug": "Schnappix", "version": "1.0.0", diff --git a/src/screens/CameraScreen.tsx b/src/screens/CameraScreen.tsx index 15a3e1f7..d8306ef9 100644 --- a/src/screens/CameraScreen.tsx +++ b/src/screens/CameraScreen.tsx @@ -158,6 +158,18 @@ export default function CameraScreen({ }; }, []); + // Cancel capture process + const handleLocalCancel = () => { + if (countdownTimerRef.current) clearInterval(countdownTimerRef.current); + if (burstTimerRef.current) clearTimeout(burstTimerRef.current); + setCountdown(countdownDuration); + setIsCapturing(false); + setBurstIndex(0); + setBurstUris([]); + setShowBurstIndicator(''); + onCancel(); + }; + // 3. Start the countdown on screen load (only when NOT idle) useEffect(() => { if (isIdle) { @@ -353,15 +365,6 @@ export default function CameraScreen({ } }; - const handleCancel = useCallback(() => { - if (burstTimerRef.current) { - clearTimeout(burstTimerRef.current); - } - setHasStarted(false); - setIsCapturing(false); - onCancel(); - }, [onCancel]); - const handleSettingsTap = () => { setEnteredPassword(''); setErrorText(''); @@ -395,7 +398,7 @@ export default function CameraScreen({ Erlaubnis erteilen - + Zurück @@ -538,7 +541,7 @@ export default function CameraScreen({ {/* Cancel Button */} {!isCapturing && !isBurstWaiting && ( - + ABBRECHEN