Skip to content

armgit / ente

Public Imported from GitHub
0

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

update plugin

AmanRajSinghMouryaffcb0c40a135
diff --git a/mobile/packages/ente_screen_brightness/ios/Classes/EnteScreenBrightnessPlugin.swift b/mobile/packages/ente_screen_brightness/ios/Classes/EnteScreenBrightnessPlugin.swift
index c501e12ea2..ef80b17824 100644
--- a/mobile/packages/ente_screen_brightness/ios/Classes/EnteScreenBrightnessPlugin.swift
+++ b/mobile/packages/ente_screen_brightness/ios/Classes/EnteScreenBrightnessPlugin.swift
@@ -1,24 +1,17 @@
import Flutter
import UIKit
-public final class EnteScreenBrightnessPlugin: NSObject, FlutterPlugin, FlutterSceneLifeCycleDelegate {
+public final class EnteScreenBrightnessPlugin: NSObject, FlutterPlugin {
private weak var registrar: FlutterPluginRegistrar?
- private var capturedScreen: UIScreen?
- private var capturedBrightness: CGFloat?
+ private var dimmingView: UIView?
private init(registrar: FlutterPluginRegistrar) {
self.registrar = registrar
super.init()
NotificationCenter.default.addObserver(
self,
- selector: #selector(restoreForAppDeactivation(_:)),
- name: UIApplication.willResignActiveNotification,
- object: nil
- )
- NotificationCenter.default.addObserver(
- self,
- selector: #selector(restoreForAppDeactivation(_:)),
- name: UIApplication.willTerminateNotification,
+ selector: #selector(applicationDidEnterBackground(_:)),
+ name: UIApplication.didEnterBackgroundNotification,
object: nil
)
}
@@ -30,62 +23,32 @@ public final class EnteScreenBrightnessPlugin: NSObject, FlutterPlugin, FlutterS
)
let instance = EnteScreenBrightnessPlugin(registrar: registrar)
registrar.addMethodCallDelegate(instance, channel: channel)
- registrar.addSceneDelegate(instance)
}
public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
switch call.method {
- case "setBrightness":
+ case "setApplicationBrightness":
guard let number = call.arguments as? NSNumber else {
- result(FlutterError(
- code: "INVALID_BRIGHTNESS",
- message: "Brightness must be a number from 0 to 1.",
- details: nil
- ))
+ result(invalidBrightnessError())
return
}
let brightness = CGFloat(number.doubleValue)
guard brightness.isFinite, (0...1).contains(brightness) else {
- result(FlutterError(
- code: "INVALID_BRIGHTNESS",
- message: "Brightness must be a number from 0 to 1.",
- details: nil
- ))
+ result(invalidBrightnessError())
return
}
-
- guard let screen = activeScreen() else {
+ guard UIApplication.shared.applicationState == .active,
+ let view = registrar?.viewController?.viewIfLoaded else {
result(false)
return
}
- if let capturedScreen, capturedScreen !== screen {
- result(false)
- return
- }
+ setApplicationBrightness(brightness, in: view)
+ result(true)
- let currentBrightness = screen.brightness
- guard currentBrightness > brightness else {
- result(false)
- return
- }
-
- let startedSession = capturedBrightness == nil
- if startedSession {
- capturedScreen = screen
- capturedBrightness = currentBrightness
- }
- screen.brightness = brightness
- let didDim = screen.brightness < currentBrightness
- if !didDim && startedSession {
- capturedScreen = nil
- capturedBrightness = nil
- }
- result(didDim)
-
- case "restoreBrightness":
- restoreCapturedBrightness()
+ case "resetApplicationBrightness":
+ resetApplicationBrightness()
result(nil)
default:
@@ -93,38 +56,56 @@ public final class EnteScreenBrightnessPlugin: NSObject, FlutterPlugin, FlutterS
}
}
- private func activeScreen() -> UIScreen? {
- guard let window = registrar?.viewController?.viewIfLoaded?.window else {
- return nil
+ private func setApplicationBrightness(_ brightness: CGFloat, in view: UIView) {
+ if brightness == 1 {
+ resetApplicationBrightness()
+ return
}
- if let scene = window.windowScene {
- return scene.activationState == .foregroundActive ? scene.screen : nil
+
+ let overlay: UIView
+ if let dimmingView, dimmingView.superview === view {
+ overlay = dimmingView
+ } else {
+ resetApplicationBrightness()
+ overlay = UIView(frame: view.bounds)
+ overlay.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+ overlay.backgroundColor = .black
+ overlay.isAccessibilityElement = false
+ overlay.isUserInteractionEnabled = false
+ overlay.alpha = 0
+ view.addSubview(overlay)
+ dimmingView = overlay
}
- return UIApplication.shared.applicationState == .active ? window.screen : nil
- }
- @objc private func restoreForAppDeactivation(_ notification: Notification) {
- restoreCapturedBrightness()
+ UIView.animate(
+ withDuration: 0.5,
+ delay: 0,
+ options: [.allowUserInteraction, .beginFromCurrentState]
+ ) {
+ overlay.alpha = 1 - brightness
+ }
}
- public func sceneWillResignActive(_ scene: UIScene) {
- restoreCapturedBrightness()
+ private func resetApplicationBrightness() {
+ dimmingView?.layer.removeAllAnimations()
+ dimmingView?.removeFromSuperview()
+ dimmingView = nil
}
- public func sceneDidDisconnect(_ scene: UIScene) {
- restoreCapturedBrightness()
+ private func invalidBrightnessError() -> FlutterError {
+ FlutterError(
+ code: "INVALID_BRIGHTNESS",
+ message: "Application brightness must be a number from 0 to 1.",
+ details: nil
+ )
}
- private func restoreCapturedBrightness() {
- guard let screen = capturedScreen,
- let brightness = capturedBrightness else { return }
- screen.brightness = brightness
- capturedScreen = nil
- capturedBrightness = nil
+ @objc private func applicationDidEnterBackground(_ notification: Notification) {
+ resetApplicationBrightness()
}
deinit {
- restoreCapturedBrightness()
+ resetApplicationBrightness()
NotificationCenter.default.removeObserver(self)
}
}
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 8bf36cce4d..1c7bc83fb5 100644
--- a/mobile/packages/ente_screen_brightness/lib/ente_screen_brightness.dart
+++ b/mobile/packages/ente_screen_brightness/lib/ente_screen_brightness.dart
@@ -9,20 +9,24 @@ class EnteScreenBrightness {
"io.ente.screen_brightness",
);
- static Future<bool> setBrightness(double value) async {
+ static Future<bool> setApplicationBrightness(double value) async {
if (!value.isFinite || value < 0 || value > 1) {
throw RangeError.range(value, 0, 1, "value");
}
if (!Platform.isIOS) {
return false;
}
- return await _channel.invokeMethod<bool>("setBrightness", value) ?? false;
+ return await _channel.invokeMethod<bool>(
+ "setApplicationBrightness",
+ value,
+ ) ??
+ false;
}
- static Future<void> restore() async {
+ static Future<void> resetApplicationBrightness() async {
if (!Platform.isIOS) {
return;
}
- await _channel.invokeMethod<void>("restoreBrightness");
+ await _channel.invokeMethod<void>("resetApplicationBrightness");
}
}
diff --git a/mobile/packages/ente_screen_brightness/pubspec.yaml b/mobile/packages/ente_screen_brightness/pubspec.yaml
index 9c92a1028c..30c795e56d 100644
--- a/mobile/packages/ente_screen_brightness/pubspec.yaml
+++ b/mobile/packages/ente_screen_brightness/pubspec.yaml
@@ -1,5 +1,5 @@
name: ente_screen_brightness
-description: iOS screen brightness control for Ente Flutter apps
+description: Application-level screen dimming for Ente Flutter apps
resolution: workspace
environment: