From 600b5a9635bce92bd216d763205dfc9bb070aa18 Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Mon, 25 Jul 2022 10:45:09 +0200 Subject: [PATCH 1/5] yanking 1.6.10 (perf regression, stuck service) --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a1ce5e9a..e64d34a00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. ## [Unreleased] -## [v1.6.10] - 2022-07-24 +## [v1.6.10] - 2022-07-24 [YANKED] ### Added From c14b68f045d4642a6c12d9a594e9eab308be83d3 Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Mon, 25 Jul 2022 15:47:54 +0200 Subject: [PATCH 2/5] fixed analysis/search entrypoints treeshaken in release mode --- lib/main_huawei.dart | 1 + lib/main_izzy.dart | 1 + lib/main_play.dart | 1 + lib/services/analysis_service.dart | 2 ++ lib/services/global_search.dart | 2 ++ pubspec.lock | 18 +++++++++--------- pubspec.yaml | 4 +++- 7 files changed, 19 insertions(+), 10 deletions(-) diff --git a/lib/main_huawei.dart b/lib/main_huawei.dart index 962c7317a..2cd615f8d 100644 --- a/lib/main_huawei.dart +++ b/lib/main_huawei.dart @@ -4,6 +4,7 @@ import 'package:aves/widget_common.dart'; const _flavor = AppFlavor.huawei; +@pragma('vm:entry-point') void main() => mainCommon(_flavor); @pragma('vm:entry-point') diff --git a/lib/main_izzy.dart b/lib/main_izzy.dart index bfb24afaf..5cd552966 100644 --- a/lib/main_izzy.dart +++ b/lib/main_izzy.dart @@ -4,6 +4,7 @@ import 'package:aves/widget_common.dart'; const _flavor = AppFlavor.izzy; +@pragma('vm:entry-point') void main() => mainCommon(_flavor); @pragma('vm:entry-point') diff --git a/lib/main_play.dart b/lib/main_play.dart index d4e6779e0..42ce7ccd3 100644 --- a/lib/main_play.dart +++ b/lib/main_play.dart @@ -4,6 +4,7 @@ import 'package:aves/widget_common.dart'; const _flavor = AppFlavor.play; +@pragma('vm:entry-point') void main() => mainCommon(_flavor); @pragma('vm:entry-point') diff --git a/lib/services/analysis_service.dart b/lib/services/analysis_service.dart index 706e24090..10f916ad9 100644 --- a/lib/services/analysis_service.dart +++ b/lib/services/analysis_service.dart @@ -19,6 +19,7 @@ class AnalysisService { static Future registerCallback() async { try { await _platform.invokeMethod('registerCallback', { + // callback needs to be annotated with `@pragma('vm:entry-point')` to work in release mode 'callbackHandle': PluginUtilities.getCallbackHandle(_init)?.toRawHandle(), }); } on PlatformException catch (e, stack) { @@ -40,6 +41,7 @@ class AnalysisService { const _channel = MethodChannel('deckers.thibault/aves/analysis_service_background'); +@pragma('vm:entry-point') Future _init() async { WidgetsFlutterBinding.ensureInitialized(); initPlatformServices(); diff --git a/lib/services/global_search.dart b/lib/services/global_search.dart index ee71345f5..9df1b3835 100644 --- a/lib/services/global_search.dart +++ b/lib/services/global_search.dart @@ -12,6 +12,7 @@ class GlobalSearch { static Future registerCallback() async { try { await _platform.invokeMethod('registerCallback', { + // callback needs to be annotated with `@pragma('vm:entry-point')` to work in release mode 'callbackHandle': PluginUtilities.getCallbackHandle(_init)?.toRawHandle(), }); } on PlatformException catch (e, stack) { @@ -20,6 +21,7 @@ class GlobalSearch { } } +@pragma('vm:entry-point') Future _init() async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/pubspec.lock b/pubspec.lock index 4f17f9100..307a21a61 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -210,7 +210,7 @@ packages: name: dbus url: "https://pub.dartlang.org" source: hosted - version: "0.7.4" + version: "0.7.7" decorated_icon: dependency: "direct main" description: @@ -224,7 +224,7 @@ packages: name: device_info_plus url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.0.1" device_info_plus_linux: dependency: transitive description: @@ -259,7 +259,7 @@ packages: name: device_info_plus_windows url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "3.0.1" dynamic_color: dependency: "direct main" description: @@ -298,12 +298,12 @@ packages: source: hosted version: "1.3.1" ffi: - dependency: transitive + dependency: "direct overridden" description: name: ffi url: "https://pub.dartlang.org" source: hosted - version: "1.2.1" + version: "2.0.1" fijkplayer: dependency: "direct main" description: @@ -678,7 +678,7 @@ packages: name: package_info_plus url: "https://pub.dartlang.org" source: hosted - version: "1.4.2" + version: "1.4.3" package_info_plus_linux: dependency: transitive description: @@ -713,7 +713,7 @@ packages: name: package_info_plus_windows url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "2.0.0" palette_generator: dependency: "direct main" description: @@ -764,7 +764,7 @@ packages: name: path_provider_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.7" + version: "2.1.0" pdf: dependency: "direct main" description: @@ -1277,7 +1277,7 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.6.1" + version: "2.7.0" wkt_parser: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 0f7291474..c25d35709 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -70,7 +70,7 @@ dependencies: pdf: percent_indicator: permission_handler: - printing: 5.9.1 + printing: proj4dart: provider: screen_brightness: @@ -90,6 +90,8 @@ dependency_overrides: git: url: https://github.com/deckerst/flutter-permission-handler path: permission_handler_android + # TODO TLAD remove override when this is fixed: https://github.com/DavBfr/dart_pdf/issues/1104 + ffi: ">=1.1.0 <3.0.0" dev_dependencies: flutter_test: From 14fd7e7137225a8adbac84d3ec5c30eb676605e4 Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Mon, 25 Jul 2022 16:17:44 +0200 Subject: [PATCH 3/5] fixed home widget shape selector rendering --- lib/widgets/settings/home_widget_settings_page.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/widgets/settings/home_widget_settings_page.dart b/lib/widgets/settings/home_widget_settings_page.dart index 3d18b18ea..409c95878 100644 --- a/lib/widgets/settings/home_widget_settings_page.dart +++ b/lib/widgets/settings/home_widget_settings_page.dart @@ -118,7 +118,8 @@ class _HomeWidgetSettingsPageState extends State { onTap: () => setState(() => _shape = shape), child: AnimatedOpacity( duration: duration, - opacity: selected ? 1.0 : .4, + // as of Flutter beta v3.3.0-0.0.pre, decoration rendering is at the wrong position if opacity is > .998 + opacity: selected ? .998 : .4, child: AnimatedContainer( duration: duration, width: 96, From b3c21cbdde777b6822ffc700a21a681824b892d0 Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Tue, 26 Jul 2022 00:18:39 +0200 Subject: [PATCH 4/5] fixed BackdropFilter related performance issue --- CHANGELOG.md | 4 ++-- lib/widgets/common/fx/blurred.dart | 4 +++- plugins/aves_platform_meta/pubspec.yaml | 2 +- pubspec.lock | 8 ++++---- pubspec.yaml | 2 -- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e64d34a00..572538037 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,6 @@ All notable changes to this project will be documented in this file. ## [Unreleased] -## [v1.6.10] - 2022-07-24 [YANKED] - ### Added - Search: `on this day` and month filters in date filter section @@ -23,6 +21,8 @@ All notable changes to this project will be documented in this file. - analysis service stuck when storage has ambiguous directories +## [v1.6.10] - 2022-07-24 [YANKED] + ## [v1.6.9] - 2022-06-18 ### Added diff --git a/lib/widgets/common/fx/blurred.dart b/lib/widgets/common/fx/blurred.dart index 8e33a34b4..27831fdd4 100644 --- a/lib/widgets/common/fx/blurred.dart +++ b/lib/widgets/common/fx/blurred.dart @@ -3,7 +3,9 @@ import 'dart:ui'; import 'package:flutter/material.dart'; final _filter = ImageFilter.blur(sigmaX: 4, sigmaY: 4); -const _identity = ColorFilter.matrix([1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0]); +// do not use `ColorFilter.matrix` for identity, +// as it yields performance issues when there are other layers on top +final _identity = ImageFilter.matrix(Matrix4.identity().storage); class BlurredRect extends StatelessWidget { final bool enabled; diff --git a/plugins/aves_platform_meta/pubspec.yaml b/plugins/aves_platform_meta/pubspec.yaml index a604afe86..2cce968e6 100644 --- a/plugins/aves_platform_meta/pubspec.yaml +++ b/plugins/aves_platform_meta/pubspec.yaml @@ -3,7 +3,7 @@ version: 0.0.1 publish_to: none environment: - sdk: ">=2.17.5 <3.0.0" + sdk: ">=2.17.0 <3.0.0" dependencies: flutter: diff --git a/pubspec.lock b/pubspec.lock index 307a21a61..0ed23c240 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -298,7 +298,7 @@ packages: source: hosted version: "1.3.1" ffi: - dependency: "direct overridden" + dependency: transitive description: name: ffi url: "https://pub.dartlang.org" @@ -418,7 +418,7 @@ packages: name: flutter_map url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" flutter_markdown: dependency: "direct main" description: @@ -771,7 +771,7 @@ packages: name: pdf url: "https://pub.dartlang.org" source: hosted - version: "3.8.1" + version: "3.8.2" percent_indicator: dependency: "direct main" description: @@ -864,7 +864,7 @@ packages: name: printing url: "https://pub.dartlang.org" source: hosted - version: "5.9.1" + version: "5.9.2" process: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index c25d35709..66716895f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -90,8 +90,6 @@ dependency_overrides: git: url: https://github.com/deckerst/flutter-permission-handler path: permission_handler_android - # TODO TLAD remove override when this is fixed: https://github.com/DavBfr/dart_pdf/issues/1104 - ffi: ">=1.1.0 <3.0.0" dev_dependencies: flutter_test: From 800f20d846ffe7d5db48ce256a299a1379cb2762 Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Tue, 26 Jul 2022 00:21:07 +0200 Subject: [PATCH 5/5] version bump --- CHANGELOG.md | 2 ++ fastlane/metadata/android/en-US/changelogs/1077.txt | 5 +++++ pubspec.yaml | 2 +- whatsnew/whatsnew-en-US | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/1077.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 572538037..ed35c5db5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [v1.6.11] - 2022-07-26 + ### Added - Search: `on this day` and month filters in date filter section diff --git a/fastlane/metadata/android/en-US/changelogs/1077.txt b/fastlane/metadata/android/en-US/changelogs/1077.txt new file mode 100644 index 000000000..546d1be97 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/1077.txt @@ -0,0 +1,5 @@ +In v1.6.11: +- add the photo frame widget to your home +- use your photos as screen saver +- search photos taken "on this day" +Full changelog available on GitHub diff --git a/pubspec.yaml b/pubspec.yaml index 66716895f..565c69c7b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/deckerst/aves # - github changelog: /CHANGELOG.md # - play changelog: /whatsnew/whatsnew-en-US # - izzy changelog: /fastlane/metadata/android/en-US/changelogs/1XXX.txt -version: 1.6.10+76 +version: 1.6.11+77 publish_to: none environment: diff --git a/whatsnew/whatsnew-en-US b/whatsnew/whatsnew-en-US index 2f40fd87a..6584f2016 100644 --- a/whatsnew/whatsnew-en-US +++ b/whatsnew/whatsnew-en-US @@ -1,4 +1,4 @@ -In v1.6.10: +In v1.6.11: - add the photo frame widget to your home - use your photos as screen saver - search photos taken "on this day"