updated shake detector

Author: Volodymyr Oliinyk

.flutter-plugins

@@ -1,2 +1,2 @@
 # This is a generated file; do not edit or check into version control.
-sensors=/Users/volodymyroliinyk/.pub-cache/hosted/pub.dartlang.org/sensors-0.4.2+6/
+sensors_plus=/Users/volodymyroliinyk/.pub-cache/hosted/pub.dartlang.org/sensors_plus-2.0.1/

.flutter-plugins-dependencies

@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sensors","path":"/Users/volodymyroliinyk/.pub-cache/hosted/pub.dartlang.org/sensors-0.4.2+6/","native_build":true,"dependencies":[]}],"android":[{"name":"sensors","path":"/Users/volodymyroliinyk/.pub-cache/hosted/pub.dartlang.org/sensors-0.4.2+6/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"sensors","dependencies":[]}],"date_created":"2022-11-28 17:02:23.593622","version":"3.3.9"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sensors_plus","path":"/Users/volodymyroliinyk/.pub-cache/hosted/pub.dartlang.org/sensors_plus-2.0.1/","native_build":true,"dependencies":[]}],"android":[{"name":"sensors_plus","path":"/Users/volodymyroliinyk/.pub-cache/hosted/pub.dartlang.org/sensors_plus-2.0.1/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[{"name":"sensors_plus","path":"/Users/volodymyroliinyk/.pub-cache/hosted/pub.dartlang.org/sensors_plus-2.0.1/","dependencies":[]}]},"dependencyGraph":[{"name":"sensors_plus","dependencies":[]}],"date_created":"2022-11-28 17:07:22.023896","version":"3.3.9"}

example/.flutter-plugins-dependencies

@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sensors","path":"/Users/volodymyroliinyk/.pub-cache/hosted/pub.dartlang.org/sensors-0.4.2+6/","native_build":true,"dependencies":[]}],"android":[{"name":"sensors","path":"/Users/volodymyroliinyk/.pub-cache/hosted/pub.dartlang.org/sensors-0.4.2+6/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"sensors","dependencies":[]}],"date_created":"2022-11-28 17:02:24.205567","version":"3.3.9"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sensors_plus","path":"/Users/volodymyroliinyk/.pub-cache/hosted/pub.dartlang.org/sensors_plus-2.0.1/","native_build":true,"dependencies":[]}],"android":[{"name":"sensors_plus","path":"/Users/volodymyroliinyk/.pub-cache/hosted/pub.dartlang.org/sensors_plus-2.0.1/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[{"name":"sensors_plus","path":"/Users/volodymyroliinyk/.pub-cache/hosted/pub.dartlang.org/sensors_plus-2.0.1/","dependencies":[]}]},"dependencyGraph":[{"name":"sensors_plus","dependencies":[]}],"date_created":"2022-11-28 17:07:22.978430","version":"3.3.9"}

lib/src/shake_detector.dart

@@ -2,67 +2,63 @@ import 'dart:async';
 import 'dart:math';
 
 import 'package:flutter/material.dart';
-import 'package:sensors/sensors.dart';
+import 'package:sensors_plus/sensors_plus.dart';
 
 class ShakeDetector {
-  final VoidCallback? onPhoneShake;
-
-  final double shakeThresholdGravity;
-
-  final int minTimeBetweenShakes;
-
-  final int shakeCountResetTime;
-
-  final int minShakeCount;
-
-  int shakeCount = 0;
-
-  int lastShakeTimestamp = DateTime.now().millisecondsSinceEpoch;
-
-  StreamSubscription? streamSubscription;
-
   ShakeDetector({
-    this.onPhoneShake,
+    required this.onPhoneShake,
     this.shakeThresholdGravity = 1.25,
     this.minTimeBetweenShakes = 160,
     this.shakeCountResetTime = 1500,
     this.minShakeCount = 2,
   });
 
+  final VoidCallback onPhoneShake;
+
+  final double shakeThresholdGravity;
+  final int minTimeBetweenShakes;
+  final int shakeCountResetTime;
+  final int minShakeCount;
+
+  int _shakeCount = 0;
+  int _lastShakeTimestamp = DateTime.now().millisecondsSinceEpoch;
+  StreamSubscription? _streamSubscription;
+
   /// Starts listening to accerelometer events
   void startListening() {
-    streamSubscription = accelerometerEvents.listen((event) {
-      var gX = event.x / 9.81;
-      var gY = event.y / 9.81;
-      var gZ = event.z / 9.81;
+    _streamSubscription = accelerometerEvents
+        .map((event) {
+          final gX = event.x / 9.81;
+          final gY = event.y / 9.81;
+          final gZ = event.z / 9.81;
+
+          // gForce will be close to 1 when there is no movement.
+          final gForce = sqrt(gX * gX + gY * gY + gZ * gZ);
 
-      // gForce will be close to 1 when there is no movement.
-      var gForce = sqrt(gX * gX + gY * gY + gZ * gZ);
-      if (gForce > shakeThresholdGravity) {
-        var now = DateTime.now().millisecondsSinceEpoch;
-        // ignore shake events too close to each other
-        if (lastShakeTimestamp + minTimeBetweenShakes > now) {
-          return;
-        }
+          return gForce;
+        })
+        .where((gForce) => gForce > shakeThresholdGravity)
+        .where((_) {
+          var now = DateTime.now().millisecondsSinceEpoch;
+          // ignore shake events too close to each other
+          return _lastShakeTimestamp + minTimeBetweenShakes < now;
+        })
+        .map((_) => _lastShakeTimestamp)
+        .map((lastShakeTimestamp) {
+          var now = DateTime.now().millisecondsSinceEpoch;
 
-        // reset the shake count after 1.5 seconds of no shakes
-        if (lastShakeTimestamp + shakeCountResetTime < now) {
-          shakeCount = 0;
-        }
+          _shakeCount = lastShakeTimestamp + shakeCountResetTime < now ? 0 : _shakeCount + 1;
+          _lastShakeTimestamp = now;
 
-        lastShakeTimestamp = now;
-        if (++shakeCount >= minShakeCount) {
-          shakeCount = 0;
-          onPhoneShake?.call();
-        }
-      }
-    });
+          return _shakeCount;
+        })
+        .where((shakeCount) => shakeCount >= minShakeCount)
+        .listen((event) => onPhoneShake());
   }
 
   /// Stops listening to accelerometer events
   void stopListening() {
-    if (streamSubscription != null) {
-      streamSubscription?.cancel();
-    }
+    _streamSubscription?.cancel();
+    _streamSubscription = null;
   }
 }

pubspec.yaml

@@ -12,4 +12,4 @@ dependencies:
     sdk: flutter
 
   logger: "0.7.0"
-  sensors: ^0.4.0+1
+  sensors_plus: ^2.0.1