diff --git a/android/app/build.gradle b/android/app/build.gradle index 4fbc11e49..eb8171a4a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -36,7 +36,7 @@ android { namespace 'deckers.thibault.aves' compileSdk 35 // cf https://developer.android.com/studio/projects/install-ndk#default-ndk-per-agp - ndkVersion '26.1.10909125' + ndkVersion '27.0.12077973' defaultConfig { applicationId packageName diff --git a/lib/widgets/aves_app.dart b/lib/widgets/aves_app.dart index c0c6903c9..68998f00c 100644 --- a/lib/widgets/aves_app.dart +++ b/lib/widgets/aves_app.dart @@ -564,9 +564,9 @@ class _AvesAppState extends State with WidgetsBindingObserver { switch (settings.maxBrightness) { case MaxBrightness.never: case MaxBrightness.viewerOnly: - AvesApp.screenBrightness?.resetScreenBrightness(); + AvesApp.screenBrightness?.resetApplicationScreenBrightness(); case MaxBrightness.always: - AvesApp.screenBrightness?.setScreenBrightness(1); + AvesApp.screenBrightness?.setApplicationScreenBrightness(1); } } diff --git a/lib/widgets/viewer/entry_vertical_pager.dart b/lib/widgets/viewer/entry_vertical_pager.dart index 9d7df2ad0..b1ae4454e 100644 --- a/lib/widgets/viewer/entry_vertical_pager.dart +++ b/lib/widgets/viewer/entry_vertical_pager.dart @@ -331,7 +331,7 @@ class _ViewerVerticalPageViewState extends State { if (settings.maxBrightness == MaxBrightness.viewerOnly) { _systemBrightness?.then((system) { final value = lerpDouble(maximumBrightness, system, ((1 - page).abs() * 2).clamp(0, 1))!; - AvesApp.screenBrightness?.setScreenBrightness(value); + AvesApp.screenBrightness?.setApplicationScreenBrightness(value); }); } diff --git a/lib/widgets/viewer/entry_viewer_stack.dart b/lib/widgets/viewer/entry_viewer_stack.dart index e56eee0fd..1ecf6f3c2 100644 --- a/lib/widgets/viewer/entry_viewer_stack.dart +++ b/lib/widgets/viewer/entry_viewer_stack.dart @@ -104,7 +104,7 @@ class _EntryViewerStackState extends State with EntryViewContr void initState() { super.initState(); if (settings.maxBrightness == MaxBrightness.viewerOnly) { - AvesApp.screenBrightness?.setScreenBrightness(1); + AvesApp.screenBrightness?.setApplicationScreenBrightness(1); } if (settings.keepScreenOn == KeepScreenOn.viewerOnly) { windowService.keepScreenOn(true); @@ -915,9 +915,9 @@ class _EntryViewerStackState extends State with EntryViewContr switch (settings.maxBrightness) { case MaxBrightness.never: case MaxBrightness.viewerOnly: - await AvesApp.screenBrightness?.resetScreenBrightness(); + await AvesApp.screenBrightness?.resetApplicationScreenBrightness(); case MaxBrightness.always: - await AvesApp.screenBrightness?.setScreenBrightness(1); + await AvesApp.screenBrightness?.setApplicationScreenBrightness(1); } if (settings.keepScreenOn == KeepScreenOn.viewerOnly) { await windowService.keepScreenOn(false); diff --git a/lib/widgets/viewer/visual/video/swipe_action.dart b/lib/widgets/viewer/visual/video/swipe_action.dart index 435f3da34..61be12b1d 100644 --- a/lib/widgets/viewer/visual/video/swipe_action.dart +++ b/lib/widgets/viewer/visual/video/swipe_action.dart @@ -12,7 +12,7 @@ extension ExtraSwipeAction on SwipeAction { Future get() { switch (this) { case SwipeAction.brightness: - return AvesApp.screenBrightness?.current ?? Future.value(1); + return AvesApp.screenBrightness?.application ?? Future.value(1); case SwipeAction.volume: return VolumeController().getVolume(); } @@ -21,7 +21,7 @@ extension ExtraSwipeAction on SwipeAction { Future set(double value) async { switch (this) { case SwipeAction.brightness: - await AvesApp.screenBrightness?.setScreenBrightness(value); + await AvesApp.screenBrightness?.setApplicationScreenBrightness(value); case SwipeAction.volume: VolumeController().setVolume(value, showSystemUI: false); } diff --git a/lib/widgets/wallpaper_page.dart b/lib/widgets/wallpaper_page.dart index 7184edff7..e86aa3e4a 100644 --- a/lib/widgets/wallpaper_page.dart +++ b/lib/widgets/wallpaper_page.dart @@ -88,7 +88,7 @@ class _EntryEditorState extends State with EntryViewControllerMixin void initState() { super.initState(); if (settings.maxBrightness == MaxBrightness.viewerOnly) { - AvesApp.screenBrightness?.setScreenBrightness(1); + AvesApp.screenBrightness?.setApplicationScreenBrightness(1); } if (settings.keepScreenOn == KeepScreenOn.viewerOnly) { windowService.keepScreenOn(true); diff --git a/plugins/aves_services_google/pubspec.lock b/plugins/aves_services_google/pubspec.lock index f61433ca1..9d2131190 100644 --- a/plugins/aves_services_google/pubspec.lock +++ b/plugins/aves_services_google/pubspec.lock @@ -89,10 +89,10 @@ packages: dependency: "direct main" description: name: device_info_plus - sha256: a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074 + sha256: db03b2d2a3fa466a4627709e1db58692c3f7f658e36a5942d342d86efedc4091 url: "https://pub.dev" source: hosted - version: "10.1.2" + version: "11.0.0" device_info_plus_platform_interface: dependency: transitive description: @@ -211,18 +211,18 @@ packages: dependency: "direct main" description: name: google_maps_flutter_android - sha256: a591ff8d0816436e6a4d9f32bbdf10ebb30bb26f72f6db2a51ddb2426ff7d9ec + sha256: "6caec25edb8014ec7d503babc597794de2d4c1baf3e3d20b57c41bd3e439b916" url: "https://pub.dev" source: hosted - version: "2.14.8" + version: "2.14.10" google_maps_flutter_ios: dependency: transitive description: name: google_maps_flutter_ios - sha256: "3a484846fc56f15e47e3de1f5ea80a7ff2b31721d2faa88f390f3b3cf580c953" + sha256: "753ebf6a2bc24c5eba8e714c901345d858abd9694b1f878c43614fd3f06b8060" url: "https://pub.dev" source: hosted - version: "2.13.0" + version: "2.13.1" google_maps_flutter_platform_interface: dependency: "direct main" description: @@ -456,10 +456,10 @@ packages: dependency: transitive description: name: win32 - sha256: "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec" + sha256: e5c39a90447e7c81cfec14b041cdbd0d0916bd9ebbc7fe02ab69568be703b9bd url: "https://pub.dev" source: hosted - version: "5.5.5" + version: "5.6.0" win32_registry: dependency: transitive description: diff --git a/plugins/aves_video_mpv/pubspec.lock b/plugins/aves_video_mpv/pubspec.lock index 47b08e192..58ce42bb4 100644 --- a/plugins/aves_video_mpv/pubspec.lock +++ b/plugins/aves_video_mpv/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: args - sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.6.0" async: dependency: transitive description: @@ -220,10 +220,10 @@ packages: dependency: transitive description: name: package_info_plus - sha256: a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918 + sha256: "894f37107424311bdae3e476552229476777b8752c5a2a2369c0cb9a2d5442ef" url: "https://pub.dev" source: hosted - version: "8.0.2" + version: "8.0.3" package_info_plus_platform_interface: dependency: transitive description: @@ -433,10 +433,10 @@ packages: dependency: transitive description: name: win32 - sha256: "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec" + sha256: e5c39a90447e7c81cfec14b041cdbd0d0916bd9ebbc7fe02ab69568be703b9bd url: "https://pub.dev" source: hosted - version: "5.5.5" + version: "5.6.0" xml: dependency: transitive description: diff --git a/pubspec.lock b/pubspec.lock index f2531dd8a..5962e4c13 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -42,10 +42,10 @@ packages: dependency: transitive description: name: args - sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" + sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.6.0" async: dependency: transitive description: @@ -303,10 +303,10 @@ packages: dependency: "direct main" description: name: device_info_plus - sha256: a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074 + sha256: db03b2d2a3fa466a4627709e1db58692c3f7f658e36a5942d342d86efedc4091 url: "https://pub.dev" source: hosted - version: "10.1.2" + version: "11.0.0" device_info_plus_platform_interface: dependency: transitive description: @@ -553,10 +553,10 @@ packages: dependency: "direct main" description: name: flutter_markdown - sha256: e17575ca576a34b46c58c91f9948891117a1bd97815d2e661813c7f90c647a78 + sha256: bd9c475d9aae256369edacafc29d1e74c81f78a10cdcdacbbbc9e3c43d009e4a url: "https://pub.dev" source: hosted - version: "0.7.3+2" + version: "0.7.4" flutter_plugin_android_lifecycle: dependency: transitive description: @@ -656,18 +656,18 @@ packages: dependency: transitive description: name: google_maps_flutter_android - sha256: a591ff8d0816436e6a4d9f32bbdf10ebb30bb26f72f6db2a51ddb2426ff7d9ec + sha256: "6caec25edb8014ec7d503babc597794de2d4c1baf3e3d20b57c41bd3e439b916" url: "https://pub.dev" source: hosted - version: "2.14.8" + version: "2.14.10" google_maps_flutter_ios: dependency: transitive description: name: google_maps_flutter_ios - sha256: "3a484846fc56f15e47e3de1f5ea80a7ff2b31721d2faa88f390f3b3cf580c953" + sha256: "753ebf6a2bc24c5eba8e714c901345d858abd9694b1f878c43614fd3f06b8060" url: "https://pub.dev" source: hosted - version: "2.13.0" + version: "2.13.1" google_maps_flutter_platform_interface: dependency: transitive description: @@ -977,10 +977,10 @@ packages: dependency: "direct main" description: name: network_info_plus - sha256: "6a31fa47c1f6e240f1b60de0a57d65a092ac1af7515247660f03643576984eb8" + sha256: "158fa0c29c97e2513b3f5b2b7706ca637687e97a318a42a934d89c8cb47d4b74" url: "https://pub.dev" source: hosted - version: "6.0.1" + version: "6.0.2" network_info_plus_platform_interface: dependency: transitive description: @@ -1025,10 +1025,10 @@ packages: dependency: "direct main" description: name: package_info_plus - sha256: a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918 + sha256: "894f37107424311bdae3e476552229476777b8752c5a2a2369c0cb9a2d5442ef" url: "https://pub.dev" source: hosted - version: "8.0.2" + version: "8.0.3" package_info_plus_platform_interface: dependency: transitive description: @@ -1322,50 +1322,50 @@ packages: dependency: "direct main" description: name: screen_brightness - sha256: "7d4ac84ae26b37c01d6f5db7123a72db7933e1f2a2a8c369a51e08f81b3178d8" + sha256: "970d1cc68f8ed7bf3a539924a3cd51c06af138bbf345b6daa4af8ce4e8527ebf" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.0.0+1" screen_brightness_android: dependency: transitive description: name: screen_brightness_android - sha256: "8c69d3ac475e4d625e7fa682a3a51a69ff59abe5b4a9e57f6ec7d830a6c69bd6" + sha256: "74455f9901ab8a1a45c9097b83855dbbb7498110cc2bc249cb5a86570dd1cf7c" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.0.0" screen_brightness_ios: dependency: transitive description: name: screen_brightness_ios - sha256: f08f70ca1ac3e30719764b5cfb8b3fe1e28163065018a41b3e6f243ab146c2f1 + sha256: caee02b34e0089b138a7aee35c461bd2d7c78446dd417f07613def192598ca08 url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.0.0" screen_brightness_macos: dependency: transitive description: name: screen_brightness_macos - sha256: "70c2efa4534e22b927e82693488f127dd4a0f008469fccf4f0eefe9061bbdd6a" + sha256: "84fc8ffcbcf19c03d76b7673b0f2c2a2663c09aa2bc37c76ea83ab049294a97a" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.0.0" screen_brightness_platform_interface: dependency: transitive description: name: screen_brightness_platform_interface - sha256: "9f3ebf7f22d5487e7676fe9ddaf3fc55b6ff8057707cf6dc0121c7dfda346a16" + sha256: "321e9455b0057e3647fd37700931e063739d94a8aa1b094f98133c01cb56c27b" url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.0.0" screen_brightness_windows: dependency: transitive description: name: screen_brightness_windows - sha256: c8e12a91cf6dd912a48bd41fcf749282a51afa17f536c3460d8d05702fb89ffa + sha256: fa97ae838c42f762f04d2d70adb3d957350d6a84e3598ec800e269e7c466eedd url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "2.0.0" shared_preferences: dependency: "direct main" description: @@ -1856,10 +1856,10 @@ packages: dependency: transitive description: name: win32 - sha256: "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec" + sha256: e5c39a90447e7c81cfec14b041cdbd0d0916bd9ebbc7fe02ab69568be703b9bd url: "https://pub.dev" source: hosted - version: "5.5.5" + version: "5.6.0" win32_registry: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 1d8cd945c..37e1db18c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -121,7 +121,7 @@ dependencies: dependency_overrides: # media_kit_video v1.2.4 depends on a specific old version of screen_brightness media_kit_video: ^1.0.0 - screen_brightness: ^1.0.0 + screen_brightness: ^2.0.0 dev_dependencies: flutter_test: