From a12160da8c2f0c88f56bd3d866e1fd395e947c47 Mon Sep 17 00:00:00 2001 From: Alex Melnyk Date: Sun, 3 Apr 2022 16:18:59 +0300 Subject: [PATCH 1/2] Drag end stuck fix. --- example/ios/Flutter/AppFrameworkInfo.plist | 2 +- example/ios/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- example/pubspec.lock | 17 ++++++++++++----- lib/src/controller.dart | 2 ++ lib/src/widget.dart | 10 ++++------ pubspec.lock | 15 +++++++++++---- 7 files changed, 32 insertions(+), 18 deletions(-) diff --git a/example/ios/Flutter/AppFrameworkInfo.plist b/example/ios/Flutter/AppFrameworkInfo.plist index 6b4c0f7..f2872cf 100644 --- a/example/ios/Flutter/AppFrameworkInfo.plist +++ b/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 8.0 + 9.0 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 58d40ca..69fe238 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -154,7 +154,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a28140c..3db53b6 100644 --- a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ =2.12.0 <3.0.0" + dart: ">=2.14.0 <3.0.0" diff --git a/lib/src/controller.dart b/lib/src/controller.dart index 3cce23e..39c6c42 100644 --- a/lib/src/controller.dart +++ b/lib/src/controller.dart @@ -9,11 +9,13 @@ class AdvancedDrawerController extends ValueNotifier { /// Shows drawer. void showDrawer() { value = AdvancedDrawerValue.visible(); + notifyListeners(); } /// Hides drawer. void hideDrawer() { value = AdvancedDrawerValue.hidden(); + notifyListeners(); } /// Toggles drawer. diff --git a/lib/src/widget.dart b/lib/src/widget.dart index 410d717..b343d3e 100644 --- a/lib/src/widget.dart +++ b/lib/src/widget.dart @@ -69,15 +69,15 @@ class _AdvancedDrawerState extends State late final Animation _childDecorationAnimation; late double _offsetValue; late Offset _freshPosition; - Offset? _startPosition; bool _captured = false; + Offset? _startPosition; @override void initState() { super.initState(); _controller = widget.controller ?? AdvancedDrawerController(); - _controller.addListener(handleControllerChanged); + _controller.addListener(_handleControllerChanged); _animationController = widget.animationController ?? AnimationController( @@ -131,7 +131,6 @@ class _AdvancedDrawerState extends State color: Colors.transparent, child: Stack( children: [ - // -------- DRAWER Align( alignment: widget.rtlOpening ? Alignment.centerRight @@ -147,7 +146,6 @@ class _AdvancedDrawerState extends State ), ), ), - // -------- CHILD SlideTransition( position: _childSlideAnimation, textDirection: @@ -212,7 +210,7 @@ class _AdvancedDrawerState extends State ); } - void handleControllerChanged() { + void _handleControllerChanged() { _controller.value.visible ? _animationController.forward() : _animationController.reverse(); @@ -264,7 +262,7 @@ class _AdvancedDrawerState extends State @override void dispose() { - _controller.removeListener(handleControllerChanged); + _controller.removeListener(_handleControllerChanged); if (widget.controller == null) { _controller.dispose(); diff --git a/pubspec.lock b/pubspec.lock index a22483c..0ec6d8c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.0" collection: dependency: transitive description: @@ -20,13 +20,20 @@ packages: description: flutter source: sdk version: "0.0.0" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.7.0" sky_engine: dependency: transitive description: flutter @@ -45,6 +52,6 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" sdks: - dart: ">=2.12.0 <3.0.0" + dart: ">=2.14.0 <3.0.0" From 0b685ee834f2a7d0dd2af041de112c42c29c7f13 Mon Sep 17 00:00:00 2001 From: Alex Melnyk Date: Sun, 3 Apr 2022 19:02:54 +0300 Subject: [PATCH 2/2] Drawer stuck on back drag fixed. --- CHANGELOG.md | 4 ++++ example/pubspec.lock | 2 +- pubspec.lock | 14 ++++++++++++++ pubspec.yaml | 2 +- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a5e6cd..958a390 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.3.2 + +* Drawer stuck on back drag fixed. + ## 1.3.1 * The openScale parameter added to manage child scale. diff --git a/example/pubspec.lock b/example/pubspec.lock index 2e88e1f..71f22b3 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -26,7 +26,7 @@ packages: path: ".." relative: true source: path - version: "1.3.0" + version: "1.3.2" material_color_utilities: dependency: transitive description: diff --git a/pubspec.lock b/pubspec.lock index 0ec6d8c..9fa4249 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -20,6 +20,20 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_lints: + dependency: "direct dev" + description: + name: flutter_lints + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.4" + lints: + dependency: transitive + description: + name: lints + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" material_color_utilities: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index a264ed8..9f5ac0a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: flutter_advanced_drawer description: An advanced drawer widget, that can be fully customized with size, text, color, radius of corners. -version: 1.3.1 +version: 1.3.2 homepage: https://github.com/alex-melnyk/flutter_advanced_drawer repository: https://github.com/alex-melnyk/flutter_advanced_drawer issue_tracker: https://github.com/alex-melnyk/flutter_advanced_drawer/issues