From cf018efcc1ac6fbacc457d1874f03b5c3e31e6d0 Mon Sep 17 00:00:00 2001
From: ildeberto <ildeberto34@gmail.com>
Date: Wed, 9 Oct 2024 11:59:43 +0100
Subject: [PATCH 1/2] add support for later versions of AGP

---
 example/android/app/build.gradle                         | 1 +
 example/android/app/src/debug/AndroidManifest.xml        | 3 +--
 example/android/app/src/main/AndroidManifest.xml         | 3 +--
 example/android/app/src/profile/AndroidManifest.xml      | 3 +--
 example/android/build.gradle                             | 6 +++---
 example/android/gradle.properties                        | 3 +++
 example/android/gradle/wrapper/gradle-wrapper.properties | 2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 97378942..3129035e 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -60,6 +60,7 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    namespace 'com.letsar.slidable.example'
 }
 
 flutter {
diff --git a/example/android/app/src/debug/AndroidManifest.xml b/example/android/app/src/debug/AndroidManifest.xml
index dc58e2da..399f6981 100644
--- a/example/android/app/src/debug/AndroidManifest.xml
+++ b/example/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.letsar.slidable.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index ec07e62d..e76d500d 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.letsar.slidable.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
    <application
         android:label="example"
         android:name="${applicationName}"
diff --git a/example/android/app/src/profile/AndroidManifest.xml b/example/android/app/src/profile/AndroidManifest.xml
index dc58e2da..399f6981 100644
--- a/example/android/app/src/profile/AndroidManifest.xml
+++ b/example/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.letsar.slidable.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/example/android/build.gradle b/example/android/build.gradle
index 83ae2200..602aa04f 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.8.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:8.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
index 94adc3a3..b9a9a246 100644
--- a/example/android/gradle.properties
+++ b/example/android/gradle.properties
@@ -1,3 +1,6 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
index cc5527d7..7aeeb11c 100644
--- a/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip

From 4738315326d781504fb58c499c98c91928bb22eb Mon Sep 17 00:00:00 2001
From: ildeberto <ildeberto34@gmail.com>
Date: Wed, 9 Oct 2024 12:08:46 +0100
Subject: [PATCH 2/2] replace old slidable notifications sender

---
 lib/flutter_slidable.dart        |   6 +-
 lib/src/notifications_old.dart   | 259 -------------------------
 lib/src/slidable.dart            |   5 +-
 test/old_notifications_test.dart | 315 -------------------------------
 4 files changed, 3 insertions(+), 582 deletions(-)
 delete mode 100644 lib/src/notifications_old.dart
 delete mode 100644 test/old_notifications_test.dart

diff --git a/lib/flutter_slidable.dart b/lib/flutter_slidable.dart
index 7665b262..432f5eab 100644
--- a/lib/flutter_slidable.dart
+++ b/lib/flutter_slidable.dart
@@ -9,9 +9,5 @@ export 'src/controller.dart'
 export 'src/dismissible_pane.dart';
 export 'src/dismissible_pane_motions.dart';
 export 'src/notifications.dart';
-export 'src/notifications_old.dart'
-    show
-        SlidableNotification,
-        SlidableRatioNotification,
-        SlidableNotificationListener;
+
 export 'src/slidable.dart';
diff --git a/lib/src/notifications_old.dart b/lib/src/notifications_old.dart
deleted file mode 100644
index 0d798cc9..00000000
--- a/lib/src/notifications_old.dart
+++ /dev/null
@@ -1,259 +0,0 @@
-import 'package:flutter/widgets.dart';
-
-import 'controller.dart';
-
-/// Signature for [SlidableNotification] listeners.
-///
-/// Used by [SlidableNotificationListener.onNotification].
-typedef SlidableNotificationCallback = void Function(
-  SlidableNotification notification,
-);
-
-/// A [Slidable] notification that can bubble up the widget tree.
-///
-/// You can determine the type of a notification using the `is` operator to
-/// check the [runtimeType] of the notification.
-///
-/// To listen for notifications in a subtree, use a
-/// [SlidableNotificationListener].
-///
-/// To send a notification, call [dispatch] on the notification you wish to
-/// send. The notification will be delivered to the closest
-/// [SlidableNotificationListener] widget.
-@Deprecated('Use SlidableAutoCloseNotification instead')
-@immutable
-class SlidableNotification {
-  /// Abstract const constructor. This constructor enables subclasses to provide
-  /// const constructors so that they can be used in const expressions.
-  const SlidableNotification({
-    required this.tag,
-  });
-
-  /// A tag representing the [Slidable] from which the notification is sent.
-  final Object? tag;
-
-  /// Start bubbling this notification at the given build context.
-  ///
-  /// The notification will be delivered to the closest
-  /// [SlidableNotificationListener] widget.
-  /// If the [BuildContext] is null, the notification is not dispatched.
-  void dispatch(BuildContext context, SlidableController controller) {
-    final scope = context
-        .getElementForInheritedWidgetOfExactType<
-            _SlidableNotificationListenerScope>()
-        ?.widget as _SlidableNotificationListenerScope?;
-
-    scope?.state.acceptNotification(controller, this);
-  }
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) {
-      return true;
-    }
-    if (other.runtimeType != runtimeType) {
-      return false;
-    }
-    return other is SlidableNotification && other.tag == tag;
-  }
-
-  @override
-  int get hashCode => tag.hashCode;
-
-  @override
-  String toString() => 'SlidableNotification(tag: $tag)';
-}
-
-/// A specific [SlidableNotification] which holds the current ratio value.
-@immutable
-@Deprecated('Use SlidableAutoCloseNotification instead')
-class SlidableRatioNotification extends SlidableNotification {
-  /// Creates a [SlidableRatioNotification].
-  const SlidableRatioNotification({
-    required Object? tag,
-    required this.ratio,
-  }) : super(tag: tag);
-
-  /// The ratio value of the [SlidableController].
-  final double ratio;
-
-  @override
-  bool operator ==(Object other) {
-    return super == other &&
-        other is SlidableRatioNotification &&
-        other.ratio == ratio;
-  }
-
-  @override
-  int get hashCode => Object.hash(tag, ratio);
-
-  @override
-  String toString() => 'SlidableRatioNotification(tag: $tag, ratio: $ratio)';
-}
-
-/// A widget that listens for [SlidableNotification]s bubbling up the tree.
-///
-/// To dispatch notifications, use the [SlidableNotification.dispatch] method.
-@Deprecated('Use SlidableAutoCloseBehavior instead')
-class SlidableNotificationListener extends StatefulWidget {
-  /// Creates a [SlidableNotificationListener].
-  const SlidableNotificationListener({
-    super.key,
-    this.onNotification,
-    this.autoClose = true,
-    required this.child,
-  }) : assert(
-          autoClose || onNotification != null,
-          'Either autoClose or onNotification must be set.',
-        );
-
-  /// The widget directly below this widget in the tree.
-  ///
-  /// This is not necessarily the widget that dispatched the notification.
-  ///
-  /// {@macro flutter.widgets.child}
-  final Widget child;
-
-  /// Called when a notification of the appropriate arrives at this location in
-  /// the tree.
-  final SlidableNotificationCallback? onNotification;
-
-  /// Whether to automatically close any [Slidable] with a given tag when
-  /// another [Slidable] with the same tag opens.
-  final bool autoClose;
-
-  @override
-  _SlidableNotificationListenerState createState() =>
-      _SlidableNotificationListenerState();
-}
-
-class _SlidableNotificationListenerState
-    extends State<SlidableNotificationListener> {
-  final Map<Object?, SlidableController> openControllers =
-      <Object?, SlidableController>{};
-
-  void acceptNotification(
-    SlidableController controller,
-    SlidableNotification notification,
-  ) {
-    handleNotification(controller, notification);
-    widget.onNotification?.call(notification);
-  }
-
-  void handleNotification(
-    SlidableController controller,
-    SlidableNotification notification,
-  ) {
-    if (widget.autoClose && !controller.closing) {
-      // Automatically close the last controller saved with the same tag.
-      final lastOpenController = openControllers[notification.tag];
-      if (lastOpenController != null && lastOpenController != controller) {
-        lastOpenController.close();
-      }
-      openControllers[notification.tag] = controller;
-    }
-  }
-
-  void clearController(SlidableController controller, Object? tag) {
-    final lastOpenController = openControllers[tag];
-    if (lastOpenController == controller) {
-      openControllers.remove(tag);
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return _SlidableNotificationListenerScope(
-      state: this,
-      child: widget.child,
-    );
-  }
-}
-
-class _SlidableNotificationListenerScope extends InheritedWidget {
-  const _SlidableNotificationListenerScope({
-    required this.state,
-    required super.child,
-  });
-
-  final _SlidableNotificationListenerState state;
-
-  @override
-  bool updateShouldNotify(
-      covariant _SlidableNotificationListenerScope oldWidget) {
-    return oldWidget.state != state;
-  }
-}
-
-// Internal use.
-// ignore_for_file: public_member_api_docs
-@Deprecated('Use SlidableAutoCloseNotificationSender instead')
-class SlidableNotificationSender extends StatefulWidget {
-  const SlidableNotificationSender({
-    super.key,
-    required this.tag,
-    required this.controller,
-    required this.child,
-  });
-
-  final Object? tag;
-  final SlidableController controller;
-  final Widget child;
-
-  @override
-  _SlidableNotificationSenderState createState() =>
-      _SlidableNotificationSenderState();
-}
-
-class _SlidableNotificationSenderState
-    extends State<SlidableNotificationSender> {
-  _SlidableNotificationListenerState? listenerState;
-
-  @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    final state = context
-        .dependOnInheritedWidgetOfExactType<
-            _SlidableNotificationListenerScope>()
-        ?.state;
-    if (state != listenerState) {
-      if (state == null) {
-        removeListeners();
-      } else if (listenerState == null) {
-        addListeners();
-      }
-      listenerState = state;
-    }
-  }
-
-  @override
-  void dispose() {
-    if (listenerState != null) {
-      removeListeners();
-      listenerState!.clearController(widget.controller, widget.tag);
-    }
-    super.dispose();
-  }
-
-  void addListeners() {
-    widget.controller.animation.addListener(handleRatioChanged);
-  }
-
-  void removeListeners() {
-    widget.controller.animation.removeListener(handleRatioChanged);
-  }
-
-  void handleRatioChanged() {
-    final controller = widget.controller;
-    final notification = SlidableRatioNotification(
-      tag: widget.tag,
-      ratio: controller.ratio,
-    );
-    listenerState!.acceptNotification(controller, notification);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return widget.child;
-  }
-}
diff --git a/lib/src/slidable.dart b/lib/src/slidable.dart
index a0a38045..0dd87420 100644
--- a/lib/src/slidable.dart
+++ b/lib/src/slidable.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/gestures.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_slidable/src/auto_close_behavior.dart';
-import 'package:flutter_slidable/src/notifications_old.dart';
 
 import 'action_pane_configuration.dart';
 import 'controller.dart';
@@ -274,8 +273,8 @@ class _SlidableState extends State<Slidable>
       controller: controller,
       direction: widget.direction,
       dragStartBehavior: widget.dragStartBehavior,
-      child: SlidableNotificationSender(
-        tag: widget.groupTag,
+      child: SlidableAutoCloseNotificationSender(
+        groupTag: widget.groupTag,
         controller: controller,
         child: SlidableScrollingBehavior(
           controller: controller,
diff --git a/test/old_notifications_test.dart b/test/old_notifications_test.dart
deleted file mode 100644
index 4107cfe5..00000000
--- a/test/old_notifications_test.dart
+++ /dev/null
@@ -1,315 +0,0 @@
-import 'package:flutter/widgets.dart';
-import 'package:flutter_slidable/src/controller.dart';
-import 'package:flutter_slidable/src/notifications_old.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-void main() {
-  group('SlidableNotificationSender -', () {
-    testWidgets(
-      'should build outside of a SlidableNotificationListener',
-      (tester) async {
-        await tester.pumpWidget(
-          SlidableNotificationSender(
-            tag: null,
-            controller: SlidableController(const TestVSync()),
-            child: const SizedBox(),
-          ),
-        );
-      },
-    );
-  });
-
-  group('SlidableNotificationListener & SlidableNotificationSender -', () {
-    testWidgets(
-      'notifications are sent to SlidableNotificationListener',
-      (tester) async {
-        final notifications = <SlidableNotification>[];
-        void handleNotification(SlidableNotification notification) {
-          notifications.add(notification);
-        }
-
-        final controller = SlidableController(const TestVSync());
-
-        await tester.pumpWidget(
-          SlidableNotificationListener(
-            onNotification: handleNotification,
-            child: SlidableNotificationSender(
-              tag: 'tag',
-              controller: controller,
-              child: const SizedBox(),
-            ),
-          ),
-        );
-
-        expect(notifications, <SlidableNotification>[]);
-
-        controller.ratio = 0.2;
-        expect(notifications, <SlidableNotification>[
-          const SlidableRatioNotification(tag: 'tag', ratio: 0.2),
-        ]);
-
-        controller.ratio = 0.2;
-        expect(notifications, <SlidableNotification>[
-          const SlidableRatioNotification(tag: 'tag', ratio: 0.2),
-        ]);
-
-        controller.ratio = 0.1;
-        expect(notifications, <SlidableNotification>[
-          const SlidableRatioNotification(tag: 'tag', ratio: 0.2),
-          const SlidableRatioNotification(tag: 'tag', ratio: 0.1),
-        ]);
-      },
-    );
-
-    testWidgets(
-      'notifications are still sent to SlidableNotificationListener when widget tree changed',
-      (tester) async {
-        final notifications = <SlidableNotification>[];
-        void handleNotification(SlidableNotification notification) {
-          notifications.add(notification);
-        }
-
-        final controller = SlidableController(const TestVSync());
-
-        await tester.pumpWidget(
-          SlidableNotificationListener(
-            onNotification: handleNotification,
-            autoClose: false,
-            child: SlidableNotificationSender(
-              tag: 'tag',
-              controller: controller,
-              child: const SizedBox(),
-            ),
-          ),
-        );
-
-        expect(notifications, <SlidableNotification>[]);
-
-        controller.ratio = 0.2;
-        expect(notifications, <SlidableNotification>[
-          const SlidableRatioNotification(tag: 'tag', ratio: 0.2),
-        ]);
-
-        controller.ratio = 0.2;
-        expect(notifications, <SlidableNotification>[
-          const SlidableRatioNotification(tag: 'tag', ratio: 0.2),
-        ]);
-
-        await tester.pumpWidget(
-          SlidableNotificationListener(
-            onNotification: handleNotification,
-            autoClose: false,
-            child: Builder(builder: (context) {
-              return SlidableNotificationSender(
-                tag: 'tag',
-                controller: controller,
-                child: const SizedBox(),
-              );
-            }),
-          ),
-        );
-
-        controller.ratio = 0.1;
-        expect(notifications, <SlidableNotification>[
-          const SlidableRatioNotification(tag: 'tag', ratio: 0.2),
-          const SlidableRatioNotification(tag: 'tag', ratio: 0.1),
-        ]);
-
-        await tester.pumpWidget(
-          SlidableNotificationSender(
-            tag: 'tag',
-            controller: controller,
-            child: const SizedBox(),
-          ),
-        );
-
-        controller.ratio = 0.2;
-        expect(notifications, <SlidableNotification>[
-          const SlidableRatioNotification(tag: 'tag', ratio: 0.2),
-          const SlidableRatioNotification(tag: 'tag', ratio: 0.1),
-        ]);
-
-        await tester.pumpWidget(
-          SlidableNotificationListener(
-            onNotification: handleNotification,
-            autoClose: false,
-            child: SlidableNotificationSender(
-              tag: 'tag',
-              controller: controller,
-              child: const SizedBox(),
-            ),
-          ),
-        );
-
-        controller.ratio = 0.3;
-        expect(notifications, <SlidableNotification>[
-          const SlidableRatioNotification(tag: 'tag', ratio: 0.2),
-          const SlidableRatioNotification(tag: 'tag', ratio: 0.1),
-          const SlidableRatioNotification(tag: 'tag', ratio: 0.3),
-        ]);
-
-        await tester.pumpWidget(
-          SlidableNotificationListener(
-            onNotification: handleNotification,
-            autoClose: false,
-            child: const SizedBox(),
-          ),
-        );
-
-        controller.ratio = 0.2;
-        expect(notifications, <SlidableNotification>[
-          const SlidableRatioNotification(tag: 'tag', ratio: 0.2),
-          const SlidableRatioNotification(tag: 'tag', ratio: 0.1),
-          const SlidableRatioNotification(tag: 'tag', ratio: 0.3),
-        ]);
-      },
-    );
-
-    testWidgets('can automatically close controllers', (tester) async {
-      final controllers = List.generate(
-        4,
-        (index) => SlidableController(const TestVSync()),
-      );
-
-      await tester.pumpWidget(
-        SlidableNotificationListener(
-          child: Column(
-            children: [
-              ...controllers.map(
-                (controller) => SlidableNotificationSender(
-                  tag: 'tag',
-                  controller: controller,
-                  child: const SizedBox(),
-                ),
-              ),
-            ],
-          ),
-        ),
-      );
-
-      const duration = Duration(milliseconds: 100);
-
-      controllers[0].openTo(0.5, duration: duration);
-      await tester.pumpAndSettle();
-
-      expect(controllers[0].ratio, 0.5);
-
-      controllers[1].openTo(0.5, duration: duration);
-      await tester.pumpAndSettle();
-
-      expect(controllers[0].ratio, 0);
-      expect(controllers[1].ratio, 0.5);
-
-      controllers[0].openTo(0.5, duration: duration);
-      await tester.pumpAndSettle();
-
-      expect(controllers[0].ratio, 0.5);
-      expect(controllers[1].ratio, 0);
-    });
-
-    testWidgets(
-        'when opening more than one slidables at the same time, only the last one stays open',
-        (tester) async {
-      final controllers = List.generate(
-        4,
-        (index) => SlidableController(const TestVSync()),
-      );
-
-      await tester.pumpWidget(
-        SlidableNotificationListener(
-          child: Column(
-            children: [
-              ...controllers.map(
-                (controller) => SlidableNotificationSender(
-                  tag: 'tag',
-                  controller: controller,
-                  child: const SizedBox(),
-                ),
-              ),
-            ],
-          ),
-        ),
-      );
-
-      const duration = Duration(milliseconds: 100);
-
-      controllers[0].openTo(0.5, duration: duration);
-      controllers[1].openTo(0.5, duration: duration);
-      controllers[2].openTo(0.5, duration: duration);
-      controllers[3].openTo(0.5, duration: duration);
-      await tester.pumpAndSettle();
-
-      expect(controllers[0].ratio, 0);
-      expect(controllers[1].ratio, 0);
-      expect(controllers[2].ratio, 0);
-      expect(controllers[3].ratio, 0.5);
-    });
-
-    testWidgets('can have more than one group', (tester) async {
-      final controllers = List.generate(
-        4,
-        (index) => SlidableController(const TestVSync()),
-      );
-
-      await tester.pumpWidget(
-        SlidableNotificationListener(
-          child: Column(
-            children: [
-              for (int i = 0; i < 4; i++)
-                SlidableNotificationSender(
-                  tag: i.isEven ? 'even' : 'odd',
-                  controller: controllers[i],
-                  child: const SizedBox(),
-                ),
-            ],
-          ),
-        ),
-      );
-
-      const duration = Duration(milliseconds: 100);
-
-      controllers[0].openTo(0.5, duration: duration);
-      controllers[1].openTo(0.5, duration: duration);
-      controllers[2].openTo(0.5, duration: duration);
-      controllers[3].openTo(0.5, duration: duration);
-      await tester.pumpAndSettle();
-
-      expect(controllers[0].ratio, 0);
-      expect(controllers[1].ratio, 0);
-      expect(controllers[2].ratio, 0.5);
-      expect(controllers[3].ratio, 0.5);
-    });
-
-    testWidgets('prevent to reopen a closing slidable', (tester) async {
-      final controllers = List.generate(
-        4,
-        (index) => SlidableController(const TestVSync()),
-      );
-
-      await tester.pumpWidget(
-        SlidableNotificationListener(
-          child: Column(
-            children: [
-              for (int i = 0; i < 4; i++)
-                SlidableNotificationSender(
-                  tag: 'tag',
-                  controller: controllers[i],
-                  child: const SizedBox(),
-                ),
-            ],
-          ),
-        ),
-      );
-
-      const duration = Duration(milliseconds: 100);
-
-      controllers[0].openTo(0.5, duration: duration);
-      controllers[1].openTo(0.5, duration: duration);
-      controllers[0].ratio = 0.5;
-      await tester.pumpAndSettle();
-
-      expect(controllers[0].ratio, 0);
-      expect(controllers[1].ratio, 0.5);
-    });
-  });
-}