From e069fef17047c7765918be83239edd51c4a6ccfa Mon Sep 17 00:00:00 2001
From: orfelorfel23 <jannik.mueller.jannik+git@googlemail.com>
Date: Mon, 1 Jun 2026 10:08:55 +0200
Subject: [PATCH] Fix ViewShot dropping frames and stickers on Android by
 grouping all layers into a single composited parent View

---
 src/components/FrameOverlay.tsx |  1 +
 src/screens/PreviewScreen.tsx   | 46 +++++++++++++++++----------------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/components/FrameOverlay.tsx b/src/components/FrameOverlay.tsx
index 3a3d4c21..fbcef5c3 100644
--- a/src/components/FrameOverlay.tsx
+++ b/src/components/FrameOverlay.tsx
@@ -19,6 +19,7 @@ export default function FrameOverlay({ frameAsset }: FrameOverlayProps) {
         source={frameAsset}
         style={styles.frameImage}
         resizeMode="cover"
+        fadeDuration={0}
       />
     </View>
   );
diff --git a/src/screens/PreviewScreen.tsx b/src/screens/PreviewScreen.tsx
index 7e80653b..5d826a7b 100644
--- a/src/screens/PreviewScreen.tsx
+++ b/src/screens/PreviewScreen.tsx
@@ -445,31 +445,33 @@ export default function PreviewScreen({
           style={styles.viewShotContainer}
           collapsable={false}
         >
-          {renderCollageView()}
+          <View style={StyleSheet.absoluteFill} collapsable={false}>
+            {renderCollageView()}
 
-          {/* Frame Overlay */}
-          {activeFrame && <FrameOverlay frameAsset={activeFrame.asset} />}
+            {/* Frame Overlay */}
+            {activeFrame && <FrameOverlay frameAsset={activeFrame.asset} />}
 
-          {/* Date/Time Overlay */}
-          {dateOverlay !== 'off' && (
-            <View style={[styles.dateOverlay, getDatePositionStyle()]} pointerEvents="none">
-              <Text style={styles.dateOverlayText}>
-                {formatDate(dateOverlay)}
-              </Text>
-            </View>
-          )}
+            {/* Date/Time Overlay */}
+            {dateOverlay !== 'off' && (
+              <View style={[styles.dateOverlay, getDatePositionStyle()]} pointerEvents="none">
+                <Text style={styles.dateOverlayText}>
+                  {formatDate(dateOverlay)}
+                </Text>
+              </View>
+            )}
 
-          {/* Stickers */}
-          {stickers.map((sticker) => (
-            <DraggableSticker
-              key={sticker.id}
-              sticker={sticker}
-              isSelected={selectedStickerId === sticker.id}
-              onSelect={handleStickerSelect}
-              onDelete={handleStickerDelete}
-              onUpdate={handleStickerUpdate}
-            />
-          ))}
+            {/* Stickers */}
+            {stickers.map((sticker) => (
+              <DraggableSticker
+                key={sticker.id}
+                sticker={sticker}
+                isSelected={selectedStickerId === sticker.id}
+                onSelect={handleStickerSelect}
+                onDelete={handleStickerDelete}
+                onUpdate={handleStickerUpdate}
+              />
+            ))}
+          </View>
         </ViewShot>
 
         {/* Sticker Tray (outside ViewShot — not captured) */}