update: implement event-based photo storage, add event name validation, version apks

2026-06-12 18:45:21 +02:00
parent 652a3b8418
commit 8664c38908
8 changed files with 252 additions and 94 deletions
@@ -337,81 +337,6 @@ export default function AdminScreen({ currentSettings, onSave, onClose }: AdminS
      </View>

      <ScrollView contentContainerStyle={styles.scrollContent}>
-        <View style={styles.card}>
-          <View style={styles.cardHeader}>
-            <FontAwesomeIcon icon={faUserGear} size={16} color={THEME.colors.accent} />
-            <Text style={styles.cardTitle}>System & Hardware</Text>
-          </View>
-          <View style={styles.inputGroup}>
-            <Text style={styles.label}>Drucker IP-Adresse</Text>
-            <TextInput
-              style={styles.input}
-              placeholder="z.B. 192.168.1.100"
-              placeholderTextColor={THEME.colors.textMuted}
-              value={printerIp}
-              onChangeText={setPrinterIp}
-              keyboardType="numeric"
-            />
-          </View>
-          <View style={styles.inputGroup}>
-            <Text style={styles.label}>Admin-Passwort</Text>
-            <TextInput
-              style={styles.input}
-              placeholder="Standard: 1234"
-              placeholderTextColor={THEME.colors.textMuted}
-              secureTextEntry
-              maxLength={20}
-              value={password}
-              onChangeText={setPassword}
-              keyboardType="number-pad"
-            />
-          </View>
-          <View style={styles.toggleRow}>
-            <Text style={styles.toggleLabel}>Tablet-Frontkamera als Fallback erzwingen</Text>
-            <Switch
-              value={useFrontCamera}
-              onValueChange={setUseFrontCamera}
-              trackColor={{ false: THEME.colors.surfaceSecondary, true: THEME.colors.accent }}
-              thumbColor={THEME.colors.text}
-            />
-          </View>
-          <View style={styles.toggleRow}>
-            <Text style={styles.toggleLabel}>App-Protokollierung (Logs) aktivieren</Text>
-            <Switch
-              value={enableLogs}
-              onValueChange={setEnableLogs}
-              trackColor={{ false: THEME.colors.surfaceSecondary, true: THEME.colors.accent }}
-              thumbColor={THEME.colors.text}
-            />
-          </View>
-          <View style={styles.statusRow}>
-            <Text style={styles.statusLabel}>Kiosk-Modus Status:</Text>
-            <Text style={[styles.statusValue, kioskActive ? styles.statusActive : styles.statusInactive]}>
-              {kioskActive ? 'GESPERRT 🔒' : 'ENTSPERRT 🔓'}
-            </Text>
-          </View>
-          <View style={styles.statusRow}>
-            <Text style={styles.statusLabel}>Device-Owner-Modus:</Text>
-            <Text style={[styles.statusValue, isDeviceOwner ? styles.statusActive : styles.statusWarning]}>
-              {isDeviceOwner ? 'AKTIV (Echte Sperre) ✅' : 'INAKTIV (Screen Pinning Fallback) ⚠️'}
-            </Text>
-          </View>
-          {!isDeviceOwner && (
-            <Text style={styles.kioskWarningText}>
-              Hinweis: Um den echten Lock-Task-Modus ohne Bestätigungsaufforderung zu aktivieren, mache die App mittels ADB zum Device Owner.
-            </Text>
-          )}
-          <View style={styles.toggleRow}>
-            <Text style={styles.toggleLabel}>Bildschirm sperren (Kiosk-Modus)</Text>
-            <Switch
-              value={kioskActive}
-              onValueChange={handleKioskToggle}
-              trackColor={{ false: THEME.colors.surfaceSecondary, true: THEME.colors.accent }}
-              thumbColor={THEME.colors.text}
-            />
-          </View>
-        </View>
-
        <View style={styles.card}>
          <View style={styles.cardHeader}>
            <FontAwesomeIcon icon={faBorderAll} size={16} color={THEME.colors.accent} />
@@ -638,6 +563,91 @@ export default function AdminScreen({ currentSettings, onSave, onClose }: AdminS
          )}
        </View>

+        <View style={styles.card}>
+          <View style={styles.cardHeader}>
+            <FontAwesomeIcon icon={faUserGear} size={16} color={THEME.colors.accent} />
+            <Text style={styles.cardTitle}>System & Hardware</Text>
+          </View>
+          <View style={styles.inputGroup}>
+            <Text style={styles.label}>Drucker IP-Adresse</Text>
+            <TextInput
+              style={styles.input}
+              placeholder="z.B. 192.168.1.100"
+              placeholderTextColor={THEME.colors.textMuted}
+              value={printerIp}
+              onChangeText={setPrinterIp}
+              keyboardType="numeric"
+            />
+          </View>
+          <View style={styles.inputGroup}>
+            <Text style={styles.label}>Admin-Passwort</Text>
+            <TextInput
+              style={styles.input}
+              placeholder="Standard: 1234"
+              placeholderTextColor={THEME.colors.textMuted}
+              secureTextEntry
+              maxLength={20}
+              value={password}
+              onChangeText={setPassword}
+              keyboardType="number-pad"
+            />
+          </View>
+          <View style={styles.toggleRow}>
+            <Text style={styles.toggleLabel}>Tablet-Frontkamera als Fallback erzwingen</Text>
+            <Switch
+              value={useFrontCamera}
+              onValueChange={setUseFrontCamera}
+              trackColor={{ false: THEME.colors.surfaceSecondary, true: THEME.colors.accent }}
+              thumbColor={THEME.colors.text}
+            />
+          </View>
+          <View style={styles.toggleRow}>
+            <Text style={styles.toggleLabel}>App-Protokollierung (Logs) aktivieren</Text>
+            <Switch
+              value={enableLogs}
+              onValueChange={setEnableLogs}
+              trackColor={{ false: THEME.colors.surfaceSecondary, true: THEME.colors.accent }}
+              thumbColor={THEME.colors.text}
+            />
+          </View>
+        </View>
+
+        <View style={styles.card}>
+          <View style={styles.cardHeader}>
+            <FontAwesomeIcon icon={faLock} size={16} color={THEME.colors.accent} />
+            <Text style={styles.cardTitle}>Sicherheit & Kiosk-Modus</Text>
+          </View>
+          <Text style={styles.cardDesc}>
+            Sperre den Bildschirm, um zu verhindern, dass Gäste die App schließen oder auf die Systemeinstellungen zugreifen.
+          </Text>
+          <View style={styles.statusRow}>
+            <Text style={styles.statusLabel}>Kiosk-Modus Status:</Text>
+            <Text style={[styles.statusValue, kioskActive ? styles.statusActive : styles.statusInactive]}>
+              {kioskActive ? 'GESPERRT 🔒' : 'ENTSPERRT 🔓'}
+            </Text>
+          </View>
+          <View style={styles.statusRow}>
+            <Text style={styles.statusLabel}>Device-Owner-Modus:</Text>
+            <Text style={[styles.statusValue, isDeviceOwner ? styles.statusActive : styles.statusWarning]}>
+              {isDeviceOwner ? 'AKTIV (Echte Sperre) ✅' : 'INAKTIV (Screen Pinning Fallback) ⚠️'}
+            </Text>
+          </View>
+          {!isDeviceOwner && (
+            <Text style={styles.kioskWarningText}>
+              Hinweis: Um den echten Lock-Task-Modus ohne Bestätigungsaufforderung zu aktivieren, mache die App mittels ADB zum Device Owner.
+            </Text>
+          )}
+          <View style={styles.toggleRow}>
+            <Text style={styles.toggleLabel}>Bildschirm sperren (Kiosk-Modus)</Text>
+            <Switch
+              value={kioskActive}
+              onValueChange={handleKioskToggle}
+              trackColor={{ false: THEME.colors.surfaceSecondary, true: THEME.colors.accent }}
+              thumbColor={THEME.colors.text}
+            />
+          </View>
+        </View>
+
        <TouchableOpacity style={styles.saveBtn} onPress={handleSave} activeOpacity={0.8}>
          <LinearGradient
            colors={THEME.gradient.primary}
@@ -57,6 +57,7 @@ interface CameraScreenProps {
  footerText: string;
  useFrontCamera: boolean;
  isObscured: boolean;
+  eventText: string;
 }

 export default function CameraScreen({
@@ -76,6 +77,7 @@ export default function CameraScreen({
  footerText,
  useFrontCamera,
  isObscured,
+  eventText,
 }: CameraScreenProps) {
  const [permission, requestPermission] = useCameraPermissions();
  const [isUsbConnected, setIsUsbConnected] = useState<boolean>(false);
@@ -354,7 +356,7 @@ export default function CameraScreen({

      // Auto-save the high-res original raw photo to the gallery
      try {
-        await saveToGallery(capturedUri);
+        await saveToGallery(capturedUri, 'Raw', eventText);
        console.log('Auto-saved high-res raw capture to gallery');
      } catch (e) {
        console.error('Failed to auto-save raw capture:', e);
@@ -289,7 +289,7 @@ export default function PreviewScreen({
      });

      setStatusMessage('Wird in Galerie gespeichert...');
-      await saveToGallery(printUri);
+      await saveToGallery(printUri, 'Collage', eventText);
      if (!mountedRef.current) return;

      setStatusMessage('Druck erfolgreich! Viel Spaß! 🎉');
@@ -331,7 +331,7 @@ export default function PreviewScreen({
      const capturedUri = await captureComposite(state.currentPhoto);
      if (!mountedRef.current) return;
      setStatusMessage('Wird gespeichert...');
-      await saveToGallery(capturedUri);
+      await saveToGallery(capturedUri, 'Collage', eventText);
      if (!mountedRef.current) return;
      setStatusMessage('Erfolgreich gespeichert!');
      setTimeout(() => {
@@ -378,7 +378,7 @@ export default function PreviewScreen({
        const capturedUri = await captureComposite(currentPhoto);
        if (!mountedRef.current) return;
        setStatusMessage('Wird vor dem Wiederholen gespeichert...');
-        await saveToGallery(capturedUri);
+        await saveToGallery(capturedUri, 'Collage', eventText);
        if (!mountedRef.current) return;
      } catch (e) {
        if (!mountedRef.current) return;