Merge branch 'main-github' into feature-composite-effects

# Conflicts:
#	lib/effects/shake_effect.dart

Author: esDotDev

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.0.1] - 2022-10-30
+### Changed
+- fixed `ShakeEffect.hz` calculations and adjusted defaults
+
 ## [2.0.0] - 2022-10-23
 ### Added
 - effects now use "smart" parameters. See README: Other Effect Parameters

example/pubspec.lock

@@ -61,7 +61,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.0.0"
+    version: "2.0.1"
   flutter_lints:
     dependency: "direct dev"
     description:

lib/effects/shake_effect.dart

@@ -8,24 +8,24 @@ import '../flutter_animate.dart';
 /// The `hz` parameter indicates approximately how many times to repeat the shake
 /// per second.
 ///
-/// Defaults to a 5 degree (`pi / 36`) shake, 12 times per second — equivalent to:
+/// Defaults to a 5 degree (`pi / 36`) shake, 8 times per second — equivalent to:
 ///
 /// ```
 /// Text("Hello").animate()
-///   .shake(hz: 12, rotation: pi / 36)
+///   .shake(hz: 8, rotation: pi / 36)
 /// ```
 ///
 /// There are also shortcut extensions for applying horizontal / vertical shake.
-/// For example, this would shake 10 pixels horizontally (default is 6):
+/// For example, this would shake 10 pixels horizontally (default is 5):
 ///
 /// ```
 /// Text("Hello").animate().shakeX(amount: 10)
 /// ```
 @immutable
 class ShakeEffect extends BeginEndEffect<double> {
-  static const int defaultHz = 10;
+  static const int defaultHz = 8;
   static const double defaultRotation = pi / 36;
-  static const double defaultMove = 6;
+  static const double defaultMove = 5;
 
   const ShakeEffect({
     Duration? delay,
@@ -61,7 +61,7 @@ class ShakeEffect extends BeginEndEffect<double> {
     if (!shouldRotate && !shouldTranslate) return child;
 
     final Animation<double> animation = buildAnimation(controller, entry);
-    final int count = (entry.duration.inSeconds * hz).floor();
+    final int count = (entry.duration.inMilliseconds / 1000 * hz).round();
 
     return getOptimizedBuilder<double>(
       animation: animation,

pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_animate
 description: Add beautiful animated effects & builders in Flutter, via an easy, customizable, unified API.
-version: 2.0.0
+version: 2.0.1
 repository: https://github.com/gskinner/flutter_animate
 issue_tracker: https://github.com/gskinner/flutter_animate/issues