From 4ee27ec85bae26c3b69d754d13bf48a036a32407 Mon Sep 17 00:00:00 2001 From: Miguel Yurivilca Date: Fri, 22 Nov 2024 12:28:28 -0500 Subject: [PATCH 1/5] refactor: replace onPopPage with onDidRemovePage in Navigator --- lib/flow_builder.dart | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/flow_builder.dart b/lib/flow_builder.dart index c79a6ec..5dcb9fc 100644 --- a/lib/flow_builder.dart +++ b/lib/flow_builder.dart @@ -184,7 +184,7 @@ class _FlowBuilderState extends State> { pages: _pages, observers: widget.observers, clipBehavior: widget.clipBehavior, - onPopPage: (route, dynamic result) { + onDidRemovePage: (page) { if (_history.length > 1) { _history.removeLast(); _didPop = true; @@ -194,8 +194,7 @@ class _FlowBuilderState extends State> { _pages.removeLast(); } setState(() {}); - route.onPopInvoked(true); - return route.didPop(result); + page.onPopInvoked(true, null); }, ), ), From cd1306fc3a54721bbcbe904787d0d25c615aa93b Mon Sep 17 00:00:00 2001 From: Miguel Yurivilca Date: Fri, 22 Nov 2024 12:54:04 -0500 Subject: [PATCH 2/5] chore(deps): bump very_good_analysis from 5.1.0 to 6.0.0 --- analysis_options.yaml | 2 +- example/analysis_options.yaml | 2 +- example/pubspec.yaml | 2 +- pubspec.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index 799268d..bb72091 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1 +1 @@ -include: package:very_good_analysis/analysis_options.5.1.0.yaml +include: package:very_good_analysis/analysis_options.6.0.0.yaml diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml index fa798a8..3a6b5d4 100644 --- a/example/analysis_options.yaml +++ b/example/analysis_options.yaml @@ -1,4 +1,4 @@ -include: package:very_good_analysis/analysis_options.5.1.0.yaml +include: package:very_good_analysis/analysis_options.6.0.0.yaml linter: rules: public_member_api_docs: false diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 4075a48..9d2389e 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -16,7 +16,7 @@ dependencies: flutter_bloc: ^8.0.0 dev_dependencies: - very_good_analysis: ^5.1.0 + very_good_analysis: ^6.0.0 flutter: uses-material-design: true diff --git a/pubspec.yaml b/pubspec.yaml index 9c03f42..05b2a23 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -18,4 +18,4 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - very_good_analysis: ^5.1.0 + very_good_analysis: ^6.0.0 From a8116a06ad8612cb0a2db80434e3297d6e3be0a6 Mon Sep 17 00:00:00 2001 From: Miguel Yurivilca Date: Fri, 22 Nov 2024 12:56:28 -0500 Subject: [PATCH 3/5] chore: update to Flutter 3.24 and Dart 3.5 --- example/pubspec.yaml | 4 ++-- pubspec.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 9d2389e..278d69c 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -4,8 +4,8 @@ version: 1.0.0+1 publish_to: none environment: - sdk: ">=3.2.0 <4.0.0" - flutter: ">=3.16.0" + sdk: ">=3.5.0 <4.0.0" + flutter: ">=3.24.0" dependencies: bloc: ^8.0.0 diff --git a/pubspec.yaml b/pubspec.yaml index 05b2a23..4bb80dd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,8 +8,8 @@ funding: [https://github.com/sponsors/felangel] version: 0.1.0 environment: - sdk: ">=3.2.0 <4.0.0" - flutter: ">=3.16.0" + sdk: ">=3.5.0 <4.0.0" + flutter: ">=3.24.0" dependencies: flutter: From c594ca5585d8441f34f718dcb461417748cc205b Mon Sep 17 00:00:00 2001 From: Miguel Yurivilca Date: Thu, 28 Nov 2024 17:22:09 -0500 Subject: [PATCH 4/5] ci: upgrade flutter version to 3.24.0 --- .github/workflows/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 2bde541..e4a3a46 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -17,7 +17,7 @@ jobs: uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/flutter_package.yml@v1 with: flutter_channel: stable - flutter_version: 3.19.5 + flutter_version: 3.24.0 pana: uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/pana.yml@v1 From ed12133cd5840d8ff4aafc902af8d70f1175c381 Mon Sep 17 00:00:00 2001 From: Miguel Yurivilca Date: Thu, 28 Nov 2024 17:35:13 -0500 Subject: [PATCH 5/5] test: replace onPopInvoked with onPopInvokedWithResult in PopScope --- test/flow_builder_test.dart | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/test/flow_builder_test.dart b/test/flow_builder_test.dart index 230f626..3f5502c 100644 --- a/test/flow_builder_test.dart +++ b/test/flow_builder_test.dart @@ -1389,7 +1389,7 @@ void main() { child: Builder( builder: (context) => PopScope( canPop: false, - onPopInvoked: (_) => onPopCallCount++, + onPopInvokedWithResult: (_, __) => onPopCallCount++, child: TextButton( key: targetKey, onPressed: () { @@ -1440,9 +1440,7 @@ void main() { MaterialPage( child: Builder( builder: (context) => PopScope( - onPopInvoked: (_) { - onPopCallCount++; - }, + onPopInvokedWithResult: (_, __) => onPopCallCount++, child: TextButton( key: targetKey, onPressed: () {