Added the color_picker closing callback to the `BackButtonInterceptor…

…` with the proper priority
ueman · Dec 21, 2024 · d1b4f3a · d1b4f3a
1 parent 6a3ddfd
commit d1b4f3a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/feedback/lib/src/color_picker/color_picker_icon.dart b/feedback/lib/src/color_picker/color_picker_icon.dart
@@ -1,5 +1,6 @@
 import 'dart:math';
 
+import 'package:feedback/src/utilities/back_button_interceptor.dart';
 import 'package:flutter/material.dart';
 
 part 'alpha_slider.dart';
@@ -121,5 +122,8 @@ class ColorPickerIcon extends StatelessWidget {
     overlayState.insert(_entry!);
   }
 
-  void _close() => _entry?.remove();
+  bool _close() {
+    _entry?.remove();
+    return true;
+  }
 }
diff --git a/feedback/lib/src/color_picker/overlay_stack.dart b/feedback/lib/src/color_picker/overlay_stack.dart
@@ -7,7 +7,7 @@ class _OverlayStack extends StatefulWidget {
     required this.onColorChanged,
   });
 
-  final VoidCallback closeCallback;
+  final BoolCallback closeCallback;
   final Color activeColor;
   final ValueChanged<Color> onColorChanged;
 
@@ -21,6 +21,7 @@ class _OverlayStackState extends State<_OverlayStack> {
   @override
   void initState() {
     super.initState();
+    BackButtonInterceptor.add(widget.closeCallback, priority: 1);
     Future(() => setState(() => opacity = 1.0));
   }
 
@@ -33,6 +34,12 @@ class _OverlayStackState extends State<_OverlayStack> {
     );
   }
 
+  @override
+  void dispose() {
+    BackButtonInterceptor.remove(widget.closeCallback);
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) => Stack(
         alignment: Alignment.center,