Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

update plugin

AmanRajSinghMouryaf8268599aac4
diff --git a/mobile/packages/ente_screen_brightness/ios/Classes/EnteScreenBrightnessPlugin.swift b/mobile/packages/ente_screen_brightness/ios/Classes/EnteScreenBrightnessPlugin.swift
index 7181eb26e9..c501e12ea2 100644
--- a/mobile/packages/ente_screen_brightness/ios/Classes/EnteScreenBrightnessPlugin.swift
+++ b/mobile/packages/ente_screen_brightness/ios/Classes/EnteScreenBrightnessPlugin.swift
@@ -1,11 +1,13 @@
import Flutter
import UIKit
-public class EnteScreenBrightnessPlugin: NSObject, FlutterPlugin {
+public final class EnteScreenBrightnessPlugin: NSObject, FlutterPlugin, FlutterSceneLifeCycleDelegate {
+ private weak var registrar: FlutterPluginRegistrar?
private var capturedScreen: UIScreen?
private var capturedBrightness: CGFloat?
- override init() {
+ private init(registrar: FlutterPluginRegistrar) {
+ self.registrar = registrar
super.init()
NotificationCenter.default.addObserver(
self,
@@ -26,8 +28,9 @@ public class EnteScreenBrightnessPlugin: NSObject, FlutterPlugin {
name: "io.ente.screen_brightness",
binaryMessenger: registrar.messenger()
)
- let instance = EnteScreenBrightnessPlugin()
+ let instance = EnteScreenBrightnessPlugin(registrar: registrar)
registrar.addMethodCallDelegate(instance, channel: channel)
+ registrar.addSceneDelegate(instance)
}
public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
@@ -52,26 +55,34 @@ public class EnteScreenBrightnessPlugin: NSObject, FlutterPlugin {
return
}
- guard UIApplication.shared.applicationState == .active else {
+ guard let screen = activeScreen() else {
result(false)
return
}
- guard let screen = activeScreen() else {
- result(FlutterError(
- code: "SCREEN_UNAVAILABLE",
- message: "No active iOS screen is available.",
- details: nil
- ))
+ if let capturedScreen, capturedScreen !== screen {
+ result(false)
+ return
+ }
+
+ let currentBrightness = screen.brightness
+ guard currentBrightness > brightness else {
+ result(false)
return
}
- if capturedBrightness == nil {
+ let startedSession = capturedBrightness == nil
+ if startedSession {
capturedScreen = screen
- capturedBrightness = screen.brightness
+ capturedBrightness = currentBrightness
}
- screen.brightness = min(screen.brightness, brightness)
- result(true)
+ screen.brightness = brightness
+ let didDim = screen.brightness < currentBrightness
+ if !didDim && startedSession {
+ capturedScreen = nil
+ capturedBrightness = nil
+ }
+ result(didDim)
case "restoreBrightness":
restoreCapturedBrightness()
@@ -83,16 +94,27 @@ public class EnteScreenBrightnessPlugin: NSObject, FlutterPlugin {
}
private func activeScreen() -> UIScreen? {
- return UIApplication.shared.connectedScenes
- .compactMap { $0 as? UIWindowScene }
- .first { $0.activationState == .foregroundActive }?
- .screen
+ guard let window = registrar?.viewController?.viewIfLoaded?.window else {
+ return nil
+ }
+ if let scene = window.windowScene {
+ return scene.activationState == .foregroundActive ? scene.screen : nil
+ }
+ return UIApplication.shared.applicationState == .active ? window.screen : nil
}
@objc private func restoreForAppDeactivation(_ notification: Notification) {
restoreCapturedBrightness()
}
+ public func sceneWillResignActive(_ scene: UIScene) {
+ restoreCapturedBrightness()
+ }
+
+ public func sceneDidDisconnect(_ scene: UIScene) {
+ restoreCapturedBrightness()
+ }
+
private func restoreCapturedBrightness() {
guard let screen = capturedScreen,
let brightness = capturedBrightness else { return }
diff --git a/mobile/packages/ente_screen_brightness/lib/ente_screen_brightness.dart b/mobile/packages/ente_screen_brightness/lib/ente_screen_brightness.dart
index 332773ca08..8bf36cce4d 100644
--- a/mobile/packages/ente_screen_brightness/lib/ente_screen_brightness.dart
+++ b/mobile/packages/ente_screen_brightness/lib/ente_screen_brightness.dart
@@ -2,11 +2,6 @@ import "dart:io";
import "package:flutter/services.dart";
-/// Temporarily controls the iOS display brightness for the current app.
-///
-/// iOS exposes display brightness through `UIScreen`, not as a true per-app
-/// value. The native plugin captures the brightness before the first change
-/// and [restore] returns the display to that value.
class EnteScreenBrightness {
EnteScreenBrightness._();
@@ -14,17 +9,6 @@ class EnteScreenBrightness {
"io.ente.screen_brightness",
);
- /// Dims the iOS display to at most a normalized [value] from 0 to 1.
- ///
- /// If the display is already dimmer than [value], its brightness is left
- /// unchanged so this API never makes the user's screen brighter.
- ///
- /// The first call captures the current brightness. Later calls do not
- /// replace that captured value, so [restore] always returns to the
- /// brightness from before this dimming session.
- ///
- /// Returns whether the brightness was applied. This is a no-op on non-iOS
- /// platforms and while the iOS app is not active.
static Future<bool> setBrightness(double value) async {
if (!value.isFinite || value < 0 || value > 1) {
throw RangeError.range(value, 0, 1, "value");
@@ -35,10 +19,6 @@ class EnteScreenBrightness {
return await _channel.invokeMethod<bool>("setBrightness", value) ?? false;
}
- /// Restores the brightness captured by the first [setBrightness] call.
- ///
- /// Calling this without an active dimming session has no effect. This is a
- /// no-op on non-iOS platforms.
static Future<void> restore() async {
if (!Platform.isIOS) {
return;
diff --git a/mobile/packages/ente_screen_brightness/pubspec.yaml b/mobile/packages/ente_screen_brightness/pubspec.yaml
index b0fc08680e..9c92a1028c 100644
--- a/mobile/packages/ente_screen_brightness/pubspec.yaml
+++ b/mobile/packages/ente_screen_brightness/pubspec.yaml
@@ -4,6 +4,7 @@ description: iOS screen brightness control for Ente Flutter apps
resolution: workspace
environment:
sdk: ">=3.10.0 <4.0.0"
+ flutter: ">=3.38.0"
dependencies:
flutter: