From 17a2cbc77152578abb29556b2e792b6df13fc94f Mon Sep 17 00:00:00 2001
From: Brad Pitcher <bradpitcher@gmail.com>
Date: Thu, 4 Jun 2026 22:32:05 -0700
Subject: [PATCH 1/4] Merge pull request #2 from
 brad/feature-android-screen-saver-support-13193880336557798301

Enable Android "Screen saver" (DreamService) support
---
 android/app/build.gradle.kts                  |  4 ++--
 android/app/src/main/AndroidManifest.xml      | 15 +++++++++++++++
 .../openphotoframe/PhotoFrameDreamService.kt  | 19 +++++++++++++++++++
 android/app/src/main/res/values/strings.xml   |  4 ++++
 android/app/src/main/res/xml/dream_info.xml   |  2 ++
 5 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 android/app/src/main/kotlin/io/github/micw/openphotoframe/PhotoFrameDreamService.kt
 create mode 100644 android/app/src/main/res/values/strings.xml
 create mode 100644 android/app/src/main/res/xml/dream_info.xml

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index d93a49d..b790e94 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -18,7 +18,7 @@ if (keystorePropertiesFile.exists()) {
 
 android {
     namespace = "io.github.micw.openphotoframe"
-    compileSdk = 37
+    compileSdk = 36
     ndkVersion = flutter.ndkVersion
 
     // Disable dependency metadata in APK signature block (required for F-Droid reproducible builds)
@@ -41,7 +41,7 @@ android {
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = 24
-        targetSdk = 37
+        targetSdk = 36
         versionCode = flutter.versionCode
         versionName = flutter.versionName
     }
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 703aebf..2acb728 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -105,6 +105,21 @@
         <meta-data
             android:name="io.flutter.embedding.android.EnableImpeller"
             android:value="false" />
+        <!-- Screen Saver (Dream) Service -->
+        <service
+            android:name=".PhotoFrameDreamService"
+            android:exported="true"
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/dream_label"
+            android:permission="android.permission.BIND_DREAM_SERVICE">
+            <intent-filter>
+                <action android:name="android.service.dreams.DreamService" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data
+                android:name="android.service.dream"
+                android:resource="@xml/dream_info" />
+        </service>
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and
diff --git a/android/app/src/main/kotlin/io/github/micw/openphotoframe/PhotoFrameDreamService.kt b/android/app/src/main/kotlin/io/github/micw/openphotoframe/PhotoFrameDreamService.kt
new file mode 100644
index 0000000..ccabad7
--- /dev/null
+++ b/android/app/src/main/kotlin/io/github/micw/openphotoframe/PhotoFrameDreamService.kt
@@ -0,0 +1,19 @@
+package io.github.micw.openphotoframe
+
+import android.content.Intent
+import android.service.dreams.DreamService
+
+class PhotoFrameDreamService : DreamService() {
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+
+        isInteractive = false
+        isFullscreen = true
+
+        val intent = Intent(this, MainActivity::class.java).apply {
+            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        }
+        startActivity(intent)
+        finish()
+    }
+}
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000..9c49298
--- /dev/null
+++ b/android/app/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="dream_label">Open Photo Frame</string>
+</resources>
diff --git a/android/app/src/main/res/xml/dream_info.xml b/android/app/src/main/res/xml/dream_info.xml
new file mode 100644
index 0000000..7e82cbc
--- /dev/null
+++ b/android/app/src/main/res/xml/dream_info.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<dream xmlns:android="http://schemas.android.com/apk/res/android" />

From f45fdc194334be47224f0e17bbe9b1af779677dd Mon Sep 17 00:00:00 2001
From: Brad Pitcher <bradpitcher@gmail.com>
Date: Wed, 24 Jun 2026 22:40:52 -0800
Subject: [PATCH 2/4] feat: exit app on center tap in dream mode (#5)

- Added 'is_dream' flag to Intent in PhotoFrameDreamService
- Track isDreamMode in MainActivity and expose via MethodChannel
- Implement 'exitApp' native method to finish activity and remove task
- Update SlideshowScreen to exit app on center tap when in dream mode
- Update localizations for 'Tap to exit' message

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Co-authored-by: brad <1614+brad@users.noreply.github.com>
---
 .../micw/openphotoframe/MainActivity.kt       | 14 +++++++++
 .../openphotoframe/PhotoFrameDreamService.kt  |  1 +
 .../openphotoframe/ScreenControlHandler.kt    | 17 +++++++++++
 .../native_screen_control_service.dart        | 30 +++++++++++++++++++
 lib/l10n/app_de.arb                           |  1 +
 lib/l10n/app_en.arb                           |  1 +
 lib/l10n/app_localizations.dart               |  6 ++++
 lib/l10n/app_localizations_de.dart            |  3 ++
 lib/l10n/app_localizations_en.dart            |  3 ++
 lib/ui/screens/slideshow_screen.dart          | 22 +++++++++++---
 10 files changed, 94 insertions(+), 4 deletions(-)

diff --git a/android/app/src/main/kotlin/io/github/micw/openphotoframe/MainActivity.kt b/android/app/src/main/kotlin/io/github/micw/openphotoframe/MainActivity.kt
index e666e98..1daa749 100644
--- a/android/app/src/main/kotlin/io/github/micw/openphotoframe/MainActivity.kt
+++ b/android/app/src/main/kotlin/io/github/micw/openphotoframe/MainActivity.kt
@@ -1,5 +1,6 @@
 package io.github.micw.openphotoframe
 
+import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import io.flutter.embedding.android.FlutterActivity
@@ -15,9 +16,15 @@ class MainActivity : FlutterActivity() {
     private lateinit var screenControlHandler: ScreenControlHandler
     private lateinit var keepAliveHandler: KeepAliveHandler
     private lateinit var updaterHandler: UpdaterHandler
+    var isDreamMode = false
+        private set
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        isDreamMode = intent?.getBooleanExtra("is_dream", false) ?: false
+        Log.d("MainActivity", "isDreamMode: $isDreamMode")
+
         // Debug logging for screen size detection
         val display = windowManager.defaultDisplay
         val size = android.graphics.Point()
@@ -25,6 +32,13 @@ class MainActivity : FlutterActivity() {
         Log.d("MainActivity", "Window size onCreate: ${size.x}x${size.y}")
     }
 
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        setIntent(intent)
+        isDreamMode = intent.getBooleanExtra("is_dream", false)
+        Log.d("MainActivity", "onNewIntent isDreamMode: $isDreamMode")
+    }
+
     override fun onWindowFocusChanged(hasFocus: Boolean) {
         super.onWindowFocusChanged(hasFocus)
         if (hasFocus) {
diff --git a/android/app/src/main/kotlin/io/github/micw/openphotoframe/PhotoFrameDreamService.kt b/android/app/src/main/kotlin/io/github/micw/openphotoframe/PhotoFrameDreamService.kt
index ccabad7..f055cdc 100644
--- a/android/app/src/main/kotlin/io/github/micw/openphotoframe/PhotoFrameDreamService.kt
+++ b/android/app/src/main/kotlin/io/github/micw/openphotoframe/PhotoFrameDreamService.kt
@@ -12,6 +12,7 @@ class PhotoFrameDreamService : DreamService() {
 
         val intent = Intent(this, MainActivity::class.java).apply {
             addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            putExtra("is_dream", true)
         }
         startActivity(intent)
         finish()
diff --git a/android/app/src/main/kotlin/io/github/micw/openphotoframe/ScreenControlHandler.kt b/android/app/src/main/kotlin/io/github/micw/openphotoframe/ScreenControlHandler.kt
index 15af24e..92463bf 100644
--- a/android/app/src/main/kotlin/io/github/micw/openphotoframe/ScreenControlHandler.kt
+++ b/android/app/src/main/kotlin/io/github/micw/openphotoframe/ScreenControlHandler.kt
@@ -82,6 +82,23 @@ class ScreenControlHandler(private val context: Context) {
                 "isScreenOn" -> {
                     result.success(powerManager.isInteractive)
                 }
+                "isDreamMode" -> {
+                    val activity = context as? MainActivity
+                    result.success(activity?.isDreamMode ?: false)
+                }
+                "exitApp" -> {
+                    val activity = context as? android.app.Activity
+                    if (activity != null) {
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                            activity.finishAndRemoveTask()
+                        } else {
+                            activity.finish()
+                        }
+                        result.success(true)
+                    } else {
+                        result.error("UNAVAILABLE", "Activity not available", null)
+                    }
+                }
                 else -> {
                     result.notImplemented()
                 }
diff --git a/lib/infrastructure/services/native_screen_control_service.dart b/lib/infrastructure/services/native_screen_control_service.dart
index 5c899e4..8e29e79 100644
--- a/lib/infrastructure/services/native_screen_control_service.dart
+++ b/lib/infrastructure/services/native_screen_control_service.dart
@@ -7,6 +7,7 @@ import 'package:flutter/services.dart';
 /// - Turn the screen completely off using lockNow()
 /// - Schedule wake-up using AlarmManager
 /// - Wake the screen immediately
+/// - Handle Dream Mode (Daydream) interactions
 /// 
 /// Requires Device Admin permission to be enabled by the user.
 class NativeScreenControlService {
@@ -125,4 +126,33 @@ class NativeScreenControlService {
       return true;
     }
   }
+
+  /// Check if the app is currently running in Dream Mode (Daydream/Screen Saver).
+  static Future<bool> isDreamMode() async {
+    if (!isSupported) return false;
+
+    try {
+      final result = await _channel.invokeMethod<bool>('isDreamMode');
+      return result ?? false;
+    } catch (e) {
+      print('Error checking Dream Mode: $e');
+      return false;
+    }
+  }
+
+  /// Exit the app and remove it from recent tasks.
+  /// This is used to return to the previous state (e.g., from Dream Mode).
+  static Future<void> exitApp() async {
+    if (!isSupported) {
+      // For non-Android platforms, we just pop the current route
+      // which might not exit the app but is the closest behavior.
+      return;
+    }
+
+    try {
+      await _channel.invokeMethod('exitApp');
+    } catch (e) {
+      print('Error exiting app: $e');
+    }
+  }
 }
diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb
index 9e33cda..1749946 100644
--- a/lib/l10n/app_de.arb
+++ b/lib/l10n/app_de.arb
@@ -233,6 +233,7 @@
   
   "noPhotosFound": "Keine Fotos gefunden",
   "tapCenterToOpenSettings": "Tippe auf die Bildschirmmitte um Einstellungen zu öffnen",
+  "tapToExit": "Tippen zum Beenden",
   
   "screenOrientation": "Bildschirmausrichtung",
   "screenOrientationAuto": "Automatisch (Sensor)",
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index e69db4a..cd92de6 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -240,6 +240,7 @@
   
   "noPhotosFound": "No photos found",
   "tapCenterToOpenSettings": "Tap center of screen to open settings",
+  "tapToExit": "Tap to exit",
   
   "screenOrientation": "Screen Orientation",
   "screenOrientationAuto": "Automatic (Sensor)",
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
index 8b5ecc7..828bb6a 100644
--- a/lib/l10n/app_localizations.dart
+++ b/lib/l10n/app_localizations.dart
@@ -950,6 +950,12 @@ abstract class AppLocalizations {
   /// **'Tap center of screen to open settings'**
   String get tapCenterToOpenSettings;
 
+  /// No description provided for @tapToExit.
+  ///
+  /// In en, this message translates to:
+  /// **'Tap to exit'**
+  String get tapToExit;
+
   /// No description provided for @screenOrientation.
   ///
   /// In en, this message translates to:
diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart
index b63fdeb..056f78c 100644
--- a/lib/l10n/app_localizations_de.dart
+++ b/lib/l10n/app_localizations_de.dart
@@ -504,6 +504,9 @@ class AppLocalizationsDe extends AppLocalizations {
   String get tapCenterToOpenSettings =>
       'Tippe auf die Bildschirmmitte um Einstellungen zu öffnen';
 
+  @override
+  String get tapToExit => 'Tippen zum Beenden';
+
   @override
   String get screenOrientation => 'Bildschirmausrichtung';
 
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
index e617181..dc10020 100644
--- a/lib/l10n/app_localizations_en.dart
+++ b/lib/l10n/app_localizations_en.dart
@@ -499,6 +499,9 @@ class AppLocalizationsEn extends AppLocalizations {
   @override
   String get tapCenterToOpenSettings => 'Tap center of screen to open settings';
 
+  @override
+  String get tapToExit => 'Tap to exit';
+
   @override
   String get screenOrientation => 'Screen Orientation';
 
diff --git a/lib/ui/screens/slideshow_screen.dart b/lib/ui/screens/slideshow_screen.dart
index 2d84a2f..c6b7021 100644
--- a/lib/ui/screens/slideshow_screen.dart
+++ b/lib/ui/screens/slideshow_screen.dart
@@ -82,6 +82,9 @@ class _SlideshowScreenState extends State<SlideshowScreen> with TickerProviderSt
   // Current photo location name (from geocoding)
   String? _currentLocationName;
 
+  // Dream Mode status
+  bool _isDreamMode = false;
+
   @override
   void initState() {
     super.initState();
@@ -98,6 +101,7 @@ class _SlideshowScreenState extends State<SlideshowScreen> with TickerProviderSt
     // Initialize Service
     WidgetsBinding.instance.addPostFrameCallback((_) {
       _initService();
+      _checkDreamMode();
       _initKeepAliveService();
       _showStartupConfigNoticeIfNeeded();
       // Schedule init is now handled reactively in build() via _updateDisplaySchedule()
@@ -157,6 +161,7 @@ class _SlideshowScreenState extends State<SlideshowScreen> with TickerProviderSt
         }
         
         // Resume slideshow if it was paused
+        _checkDreamMode();
         _resumeSlideshow();
         break;
       case AppLifecycleState.detached:
@@ -436,10 +441,18 @@ class _SlideshowScreenState extends State<SlideshowScreen> with TickerProviderSt
     _startTimer();
   }
 
+  Future<void> _checkDreamMode() async {
+    final isDream = await NativeScreenControlService.isDreamMode();
+    if (mounted) setState(() => _isDreamMode = isDream);
+  }
+
   void _openSettings() {
     _timer?.cancel(); // Stop auto-advance while in settings
     
-    Navigator.of(context).push(
+    if (_isDreamMode) {
+      NativeScreenControlService.exitApp();
+    } else {
+      Navigator.of(context).push(
       MaterialPageRoute(builder: (context) => const SettingsScreen()),
     ).then((_) {
       // Restore immersive mode after returning from settings
@@ -452,6 +465,7 @@ class _SlideshowScreenState extends State<SlideshowScreen> with TickerProviderSt
       // Restart timer when returning from settings
       _startTimer();
     });
+    }
   }
 
   Future<void> _transitionTo(PhotoEntry photo, {SlideDirection? slideDirection}) async {
@@ -673,10 +687,10 @@ class _SlideshowScreenState extends State<SlideshowScreen> with TickerProviderSt
                   AppLocalizations.of(context)!.noPhotosFound,
                   style: TextStyle(color: Colors.white, fontSize: 20),
                 ),
-                SizedBox(height: 8),
+                const SizedBox(height: 8),
                 Text(
-                  AppLocalizations.of(context)!.tapCenterToOpenSettings,
-                  style: TextStyle(color: Colors.white54, fontSize: 14),
+                  _isDreamMode ? AppLocalizations.of(context)!.tapToExit : AppLocalizations.of(context)!.tapCenterToOpenSettings,
+                  style: const TextStyle(color: Colors.white54, fontSize: 14),
                 ),
               ],
             ),

From e96835bc883d4b7b3020e9ba7b3b0ec07304f264 Mon Sep 17 00:00:00 2001
From: Brad Pitcher <bradpitcher@gmail.com>
Date: Thu, 25 Jun 2026 18:24:14 -0800
Subject: [PATCH 3/4] Ensure app returns to slideshow when entering dream mode
 (#6)

When the app is triggered in dream/screensaver mode, it now automatically
pops any active routes (like the settings screen) to ensure the photo
slideshow is displayed immediately.

Modified lib/ui/screens/slideshow_screen.dart:
- Updated _checkDreamMode() to call Navigator.popUntil when dream mode is detected.

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Co-authored-by: brad <1614+brad@users.noreply.github.com>
---
 lib/ui/screens/slideshow_screen.dart | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/ui/screens/slideshow_screen.dart b/lib/ui/screens/slideshow_screen.dart
index c6b7021..c99d5f2 100644
--- a/lib/ui/screens/slideshow_screen.dart
+++ b/lib/ui/screens/slideshow_screen.dart
@@ -443,7 +443,13 @@ class _SlideshowScreenState extends State<SlideshowScreen> with TickerProviderSt
 
   Future<void> _checkDreamMode() async {
     final isDream = await NativeScreenControlService.isDreamMode();
-    if (mounted) setState(() => _isDreamMode = isDream);
+    if (mounted) {
+      setState(() => _isDreamMode = isDream);
+      if (isDream) {
+        // If we are in dream mode, ensure we are showing the slideshow (root route)
+        Navigator.of(context).popUntil((route) => route.isFirst);
+      }
+    }
   }
 
   void _openSettings() {

From fc51b166cce067fd20c4da30b8fcce0860ee1ed7 Mon Sep 17 00:00:00 2001
From: Brad Pitcher <bradpitcher@gmail.com>
Date: Tue, 30 Jun 2026 01:37:23 +0000
Subject: [PATCH 4/4] undo unneeded dreamservice changes

---
 android/app/build.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index b790e94..d93a49d 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -18,7 +18,7 @@ if (keystorePropertiesFile.exists()) {
 
 android {
     namespace = "io.github.micw.openphotoframe"
-    compileSdk = 36
+    compileSdk = 37
     ndkVersion = flutter.ndkVersion
 
     // Disable dependency metadata in APK signature block (required for F-Droid reproducible builds)
@@ -41,7 +41,7 @@ android {
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = 24
-        targetSdk = 36
+        targetSdk = 37
         versionCode = flutter.versionCode
         versionName = flutter.versionName
     }