From b3c21cbdde777b6822ffc700a21a681824b892d0 Mon Sep 17 00:00:00 2001
From: Thibault Deckers <thibault.deckers@gmail.com>
Date: Tue, 26 Jul 2022 00:18:39 +0200
Subject: [PATCH] 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.
 
 ## <a id="unreleased"></a>[Unreleased]
 
-## <a id="v1.6.10"></a>[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
 
+## <a id="v1.6.10"></a>[v1.6.10] - 2022-07-24 [YANKED]
+
 ## <a id="v1.6.9"></a>[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(<double>[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: