From ac8f0722d110b30feab9c300b36da97e241455b9 Mon Sep 17 00:00:00 2001
From: orfelorfel23 <jannik.mueller.jannik+git@googlemail.com>
Date: Sun, 31 May 2026 14:30:19 +0200
Subject: [PATCH] Fix camera unmount crash via overlay architecture

---
 App.tsx | 92 +++++++++++++++++++++++++--------------------------------
 1 file changed, 41 insertions(+), 51 deletions(-)

diff --git a/App.tsx b/App.tsx
index b935dfa6..4d892ee0 100644
--- a/App.tsx
+++ b/App.tsx
@@ -81,54 +81,22 @@ export default function App() {
   };
 
   // 3. Conditional Screen Rendering
-  const renderScreen = () => {
-    switch (currentScreen) {
-      case 'camera':
-        return (
+  return (
+    <GestureHandlerRootView style={styles.container}>
+      <SafeAreaView style={styles.container}>
+        <StatusBar hidden={true} />
+        
+        {/* 
+          Keep CameraScreen ALWAYS mounted in the background to prevent 
+          Android expo-camera hardware crashes when unmounting right after capture 
+        */}
+        <View style={StyleSheet.absoluteFill}>
           <CameraScreen
             countdownDuration={settings.countdownDuration}
             onPhotoCaptured={handlePhotoCaptured}
             onBurstComplete={handleBurstComplete}
             onCancel={handleReset}
-            isIdle={false}
-            burstCount={settings.burstCount}
-            burstIntervalSec={settings.burstIntervalSec}
-            frameMode={settings.frameMode}
-            selectedFrameId={settings.selectedFrameId}
-          />
-        );
-      case 'preview':
-        return (
-          <PreviewScreen
-            photoUris={photoUris}
-            printerIp={settings.printerIp}
-            onRetakeLast={handleRetakeLast}
-            onAddAnother={handleAddAnother}
-            onReset={handleReset}
-            frameMode={settings.frameMode}
-            initialFrameId={settings.selectedFrameId}
-            availableFrameIds={settings.availableFrameIds}
-            dateOverlay={settings.dateOverlay}
-            dateOverlayPosition={settings.dateOverlayPosition}
-            eventText={settings.eventText}
-          />
-        );
-      case 'admin':
-        return (
-          <AdminScreen
-            currentSettings={settings}
-            onSave={handleSaveSettings}
-            onClose={() => setCurrentScreen('home')}
-          />
-        );
-      default:
-        return (
-          <CameraScreen
-            countdownDuration={settings.countdownDuration}
-            onPhotoCaptured={handlePhotoCaptured}
-            onBurstComplete={handleBurstComplete}
-            onCancel={handleReset}
-            isIdle={true}
+            isIdle={currentScreen === 'home'}
             onStartBooth={handleStartBooth}
             onNavigateToAdmin={handleOpenAdmin}
             adminPassword={settings.adminPassword}
@@ -138,15 +106,37 @@ export default function App() {
             frameMode={settings.frameMode}
             selectedFrameId={settings.selectedFrameId}
           />
-        );
-    }
-  };
+        </View>
 
-  return (
-    <GestureHandlerRootView style={styles.container}>
-      <SafeAreaView style={styles.container}>
-        <StatusBar hidden={true} />
-        {renderScreen()}
+        {/* Overlay PreviewScreen if active */}
+        {currentScreen === 'preview' && (
+          <View style={StyleSheet.absoluteFill}>
+            <PreviewScreen
+              photoUris={photoUris}
+              printerIp={settings.printerIp}
+              onRetakeLast={handleRetakeLast}
+              onAddAnother={handleAddAnother}
+              onReset={handleReset}
+              frameMode={settings.frameMode}
+              initialFrameId={settings.selectedFrameId}
+              availableFrameIds={settings.availableFrameIds}
+              dateOverlay={settings.dateOverlay}
+              dateOverlayPosition={settings.dateOverlayPosition}
+              eventText={settings.eventText}
+            />
+          </View>
+        )}
+
+        {/* Overlay AdminScreen if active */}
+        {currentScreen === 'admin' && (
+          <View style={StyleSheet.absoluteFill}>
+            <AdminScreen
+              currentSettings={settings}
+              onSave={handleSaveSettings}
+              onClose={() => setCurrentScreen('home')}
+            />
+          </View>
+        )}
       </SafeAreaView>
     </GestureHandlerRootView>
   );