refoactor: chang the code formatting

Author: gonuit

CHANGELOG.md

@@ -1,12 +1,16 @@
-## 2.3.0
-- The controller now extends the *Animation<double>*.
-- New *ClampedAnimation* class for constraining the *IndicatorController* animation value within a specific range using the *clamp* method.
-- Drag interaction details are now available, enabling pointer-position-based animations.
-- Example app:
+## 3.0.0
+- **CustomRefreshIndicator**:
+  - Deprecated *indicatorFinalizeDuration*, *indicatorSettleDuration* and *indicatorCancelDuration* parameters in favor of *finalizeDuration*, *settleDuration* and *cancelDuration*.
+  - The indicator widget will now be rebuilt every time *state* changes, even if the *autoRebuilt* parameter is set to false. This will make managing the state of the indicator widget simpler.
+- **IndicatorController**:
+  - The controller now extends *Animation<double>*. This allows it to be used directly with *Transition* widgets to further improve animation performance.
+  - New *ClampedAnimation* class for constraining the *IndicatorController* animation value within a specific range using the *clamp* method.
+  - Drag interaction details are now available, enabling pointer-position-based animations.
+- **Example app**:
   - The checkmark indicator example has been simplified.
   - Minor corrections to the envelope indicator.
-  - Removed unused code.
   - Added image precaching.
+  - Removed unused code.
 ## 2.2.1
 - Fixed typos in documentation
 ## 2.2.0

example/lib/indicators/check_mark_indicator.dart

@@ -23,8 +23,7 @@ class CheckMarkStyle {
 
   static const defaultStyle = CheckMarkStyle(
     loading: CheckMarkColors(content: Colors.white, background: Colors.black),
-    completed:
-        CheckMarkColors(content: Colors.white, background: Colors.greenAccent),
+    completed: CheckMarkColors(content: Colors.white, background: Colors.greenAccent),
   );
 }
 
@@ -42,8 +41,7 @@ class CheckMarkIndicator extends StatefulWidget {
   State<CheckMarkIndicator> createState() => _CheckMarkIndicatorState();
 }
 
-class _CheckMarkIndicatorState extends State<CheckMarkIndicator>
-    with SingleTickerProviderStateMixin {
+class _CheckMarkIndicatorState extends State<CheckMarkIndicator> with SingleTickerProviderStateMixin {
   /// Whether to render check mark instead of spinner
   bool _renderCompleteState = false;
 
@@ -74,9 +72,7 @@ class _CheckMarkIndicatorState extends State<CheckMarkIndicator>
           BuildContext context,
           IndicatorController controller,
         ) {
-          final style = _renderCompleteState
-              ? widget.style.completed
-              : widget.style.loading;
+          final style = _renderCompleteState ? widget.style.completed : widget.style.loading;
           return AnimatedContainer(
             duration: const Duration(milliseconds: 150),
             alignment: Alignment.center,
@@ -95,9 +91,7 @@ class _CheckMarkIndicatorState extends State<CheckMarkIndicator>
                     child: CircularProgressIndicator(
                       strokeWidth: 2,
                       color: style.content,
-                      value: controller.isDragging || controller.isArmed
-                          ? controller.value.clamp(0.0, 1.0)
-                          : null,
+                      value: controller.isDragging || controller.isArmed ? controller.value.clamp(0.0, 1.0) : null,
                     ),
                   ),
           );

example/lib/indicators/envelope_indicator.dart

@@ -11,9 +11,7 @@ class EnvelopRefreshIndicator extends StatelessWidget {
   static const _circleSize = 70.0;
 
   static const _blurRadius = 10.0;
-  static const _defaultShadow = [
-    BoxShadow(blurRadius: _blurRadius, color: Colors.black26)
-  ];
+  static const _defaultShadow = [BoxShadow(blurRadius: _blurRadius, color: Colors.black26)];
 
   const EnvelopRefreshIndicator({
     super.key,
@@ -29,20 +27,16 @@ class EnvelopRefreshIndicator extends StatelessWidget {
     return CustomRefreshIndicator(
       leadingScrollIndicatorVisible: leadingScrollIndicatorVisible,
       trailingScrollIndicatorVisible: trailingScrollIndicatorVisible,
-      builder: (context, child, controller) =>
-          LayoutBuilder(builder: (context, constraints) {
+      builder: (context, child, controller) => LayoutBuilder(builder: (context, constraints) {
         final widgetWidth = constraints.maxWidth;
         final widgetHeight = constraints.maxHeight;
         final letterTopWidth = (widgetWidth / 2) + 50;
 
-        final leftValue = (widgetWidth +
-                _blurRadius -
-                ((letterTopWidth + _blurRadius) * controller.value / 1))
+        final leftValue = (widgetWidth + _blurRadius - ((letterTopWidth + _blurRadius) * controller.value / 1))
             .clamp(letterTopWidth - 100, double.infinity);
 
         final rightShift = widgetWidth + _blurRadius;
-        final rightValue = (rightShift - (rightShift * controller.value / 1))
-            .clamp(0.0, double.infinity);
+        final rightValue = (rightShift - (rightShift * controller.value / 1)).clamp(0.0, double.infinity);
 
         final opacity = (controller.value - 1).clamp(0, 0.5) / 0.5;
 
@@ -85,27 +79,23 @@ class EnvelopRefreshIndicator extends StatelessWidget {
                 child: Transform.scale(
                   scale: controller.value,
                   child: Opacity(
-                    opacity: controller.isLoading || controller.state.isSettling
-                        ? 1
-                        : opacity,
+                    opacity: controller.isLoading || controller.state.isSettling ? 1 : opacity,
                     child: Align(
                       alignment: Alignment.center,
                       child: Container(
                         width: _circleSize,
                         height: _circleSize,
                         decoration: BoxDecoration(
                           boxShadow: _defaultShadow,
-                          color:
-                              accent ?? Theme.of(context).colorScheme.primary,
+                          color: accent ?? Theme.of(context).colorScheme.primary,
                           shape: BoxShape.circle,
                         ),
                         child: Stack(
                           fit: StackFit.expand,
                           alignment: Alignment.center,
                           children: <Widget>[
                             CircularProgressIndicator(
-                              valueColor:
-                                  const AlwaysStoppedAnimation(Colors.black),
+                              valueColor: const AlwaysStoppedAnimation(Colors.black),
                               value: controller.isLoading ? null : 0,
                             ),
                             const Icon(
@@ -138,10 +128,7 @@ class TrianglePainter extends CustomPainter {
     return radius * 0.57735 + 0.5;
   }
 
-  TrianglePainter(
-      {this.strokeColor = Colors.black,
-      this.strokeWidth = 3,
-      this.paintingStyle = PaintingStyle.stroke});
+  TrianglePainter({this.strokeColor = Colors.black, this.strokeWidth = 3, this.paintingStyle = PaintingStyle.stroke});
 
   @override
   void paint(Canvas canvas, Size size) {
@@ -152,8 +139,7 @@ class TrianglePainter extends CustomPainter {
     final path = getTrianglePath(size.width, size.height);
     final shadowPaint = Paint()
       ..color = Colors.black.withAlpha(50)
-      ..maskFilter =
-          MaskFilter.blur(BlurStyle.normal, convertRadiusToSigma(10));
+      ..maskFilter = MaskFilter.blur(BlurStyle.normal, convertRadiusToSigma(10));
     canvas.drawPath(path, shadowPaint);
 
     canvas.drawPath(path, paint);

example/lib/indicators/swipe_action.dart

@@ -29,8 +29,7 @@ class FetchMoreIndicator extends StatelessWidget {
         return AnimatedBuilder(
             animation: controller,
             builder: (context, _) {
-              final dy = controller.value.clamp(0.0, 1.25) *
-                  -(height - (height * 0.25));
+              final dy = controller.value.clamp(0.0, 1.25) * -(height - (height * 0.25));
               return Stack(
                 children: [
                   Transform.translate(
@@ -64,9 +63,7 @@ class FetchMoreIndicator extends StatelessWidget {
                               color: appContentColor,
                             ),
                           Text(
-                            controller.isLoading
-                                ? "Fetching..."
-                                : "Pull to fetch more",
+                            controller.isLoading ? "Fetching..." : "Pull to fetch more",
                             style: const TextStyle(
                               color: appContentColor,
                             ),

example/lib/indicators/warp_indicator.dart

@@ -40,8 +40,7 @@ class WarpIndicator extends StatefulWidget {
   State<WarpIndicator> createState() => _WarpIndicatorState();
 }
 
-class _WarpIndicatorState extends State<WarpIndicator>
-    with SingleTickerProviderStateMixin {
+class _WarpIndicatorState extends State<WarpIndicator> with SingleTickerProviderStateMixin {
   static const _indicatorSize = 150.0;
   final _random = Random();
   WarpAnimationState _state = WarpAnimationState.stopped;
@@ -145,8 +144,7 @@ class _WarpIndicatorState extends State<WarpIndicator>
                 animation: shakeController,
                 builder: (_, __) {
                   return LayoutBuilder(
-                    builder:
-                        (BuildContext context, BoxConstraints constraints) {
+                    builder: (BuildContext context, BoxConstraints constraints) {
                       return CustomPaint(
                         painter: Sky(
                           stars: stars,
@@ -163,10 +161,8 @@ class _WarpIndicatorState extends State<WarpIndicator>
                 return Transform.scale(
                   scale: _scaleTween.transform(controller.value),
                   child: Builder(builder: (context) {
-                    if (shakeController.value == 1.0 &&
-                        _state == WarpAnimationState.playing) {
-                      SchedulerBinding.instance
-                          .addPostFrameCallback((_) => _resetShakeAnimation());
+                    if (shakeController.value == 1.0 && _state == WarpAnimationState.playing) {
+                      SchedulerBinding.instance.addPostFrameCallback((_) => _resetShakeAnimation());
                     }
                     return Transform.rotate(
                       angle: _angleTween.transform(shakeController.value),
@@ -220,8 +216,7 @@ class Star {
     speed = Offset(cos(angle), sin(angle));
     const minSpeedScale = 20;
     const maxSpeedScale = 35;
-    final speedScale = minSpeedScale +
-        random.nextInt(maxSpeedScale - minSpeedScale).toDouble();
+    final speedScale = minSpeedScale + random.nextInt(maxSpeedScale - minSpeedScale).toDouble();
     speed = speed.scale(
       speedScale,
       speedScale,
@@ -244,8 +239,7 @@ class Star {
 
     final startShiftAngle = angle + (pi / 2);
     final startShift = Offset(cos(startShiftAngle), sin(startShiftAngle));
-    final shiftedStartPosition =
-        startPosition + (startShift * (0.75 + value * 0.01));
+    final shiftedStartPosition = startPosition + (startShift * (0.75 + value * 0.01));
 
     final endShiftAngle = angle + (pi / 2);
     final endShift = Offset(cos(endShiftAngle), sin(endShiftAngle));

example/lib/main.dart

@@ -38,8 +38,7 @@ class MyApp extends StatelessWidget {
         '/envelope': (context) => const EnvelopIndicatorScreen(),
         '/fetch-more': (context) => const FetchMoreScreen(),
         '/horizontal': (context) => const HorizontalScreen(),
-        '/programmatically-controlled': (context) =>
-            const ProgrammaticallyControlled(),
+        '/programmatically-controlled': (context) => const ProgrammaticallyControlled(),
       },
     );
   }
@@ -86,8 +85,7 @@ class MainScreen extends StatelessWidget {
               child: Container(
                 height: 50,
                 alignment: Alignment.center,
-                child:
-                    const Text("Custom material indicator with list opacity"),
+                child: const Text("Custom material indicator with list opacity"),
               ),
               onPressed: () => Navigator.pushNamed(
                 context,

example/lib/screens/check_mark_indicator_screen.dart

@@ -7,8 +7,7 @@ class CheckMarkIndicatorScreen extends StatefulWidget {
   const CheckMarkIndicatorScreen({super.key});
 
   @override
-  State<CheckMarkIndicatorScreen> createState() =>
-      _CheckMarkIndicatorScreenState();
+  State<CheckMarkIndicatorScreen> createState() => _CheckMarkIndicatorScreenState();
 }
 
 class _CheckMarkIndicatorScreenState extends State<CheckMarkIndicatorScreen> {

example/lib/screens/horizontal_screen.dart

@@ -26,9 +26,7 @@ class _HorizontalScreenState extends State<HorizontalScreen> {
                 _isHorizontal = !_isHorizontal;
               });
             },
-            icon: _isHorizontal
-                ? const Icon(Icons.swap_horizontal_circle)
-                : const Icon(Icons.swap_vert_circle),
+            icon: _isHorizontal ? const Icon(Icons.swap_horizontal_circle) : const Icon(Icons.swap_vert_circle),
           )
         ],
       ),

example/lib/screens/ice_cream_indicator_screen.dart

@@ -7,8 +7,7 @@ class IceCreamIndicatorScreen extends StatefulWidget {
   const IceCreamIndicatorScreen({super.key});
 
   @override
-  State<IceCreamIndicatorScreen> createState() =>
-      _IceCreamIndicatorScreenState();
+  State<IceCreamIndicatorScreen> createState() => _IceCreamIndicatorScreenState();
 }
 
 class _IceCreamIndicatorScreenState extends State<IceCreamIndicatorScreen> {

example/lib/screens/presentation_screen.dart

@@ -20,19 +20,18 @@ class _PresentationScreenState extends State<PresentationScreen> {
       body: SafeArea(
         child: CustomRefreshIndicator(
           trigger: IndicatorTrigger.bothEdges,
-          indicatorFinalizeDuration: const Duration(seconds: 1),
-          indicatorSettleDuration: const Duration(seconds: 1),
-          indicatorCancelDuration: const Duration(seconds: 1),
+          finalizeDuration: const Duration(seconds: 1),
+          settleDuration: const Duration(seconds: 1),
+          cancelDuration: const Duration(seconds: 1),
           leadingScrollIndicatorVisible: false,
           trailingScrollIndicatorVisible: false,
           offsetToArmed: 100.0,
           controller: _controller,
           onRefresh: () => Future.delayed(const Duration(seconds: 2)),
           child: DecoratedBox(
-            decoration:
-                const BoxDecoration(color: appBackgroundColor, boxShadow: [
-              BoxShadow(color: Colors.black26, blurRadius: 8, spreadRadius: 4)
-            ]),
+            decoration: const BoxDecoration(
+                color: appBackgroundColor,
+                boxShadow: [BoxShadow(color: Colors.black26, blurRadius: 8, spreadRadius: 4)]),
             child: CustomScrollView(
               physics: const AlwaysScrollableScrollPhysics(
                 parent: ClampingScrollPhysics(),
@@ -55,8 +54,7 @@ class _PresentationScreenState extends State<PresentationScreen> {
                             width: double.infinity,
                             decoration: const BoxDecoration(
                               color: Colors.white,
-                              borderRadius:
-                                  BorderRadius.all(Radius.circular(20)),
+                              borderRadius: BorderRadius.all(Radius.circular(20)),
                               boxShadow: [
                                 BoxShadow(
                                   color: Colors.black12,
@@ -146,25 +144,19 @@ class _PresentationScreenState extends State<PresentationScreen> {
                                     const Spacer(),
                                     ElevatedButton(
                                       style: ButtonStyle(
-                                        backgroundColor:
-                                            MaterialStateProperty.all(
-                                          _controller.isRefreshEnabled
-                                              ? Colors.red
-                                              : Colors.lightGreen,
+                                        backgroundColor: MaterialStateProperty.all(
+                                          _controller.isRefreshEnabled ? Colors.red : Colors.lightGreen,
                                         ),
                                       ),
                                       child: Text(
-                                        _controller.isRefreshEnabled
-                                            ? "DISABLE"
-                                            : "ENABLE",
+                                        _controller.isRefreshEnabled ? "DISABLE" : "ENABLE",
                                         style: const TextStyle(
                                           color: Colors.white,
                                         ),
                                       ),
-                                      onPressed: () =>
-                                          _controller.isRefreshEnabled
-                                              ? _controller.disableRefresh()
-                                              : _controller.enableRefresh(),
+                                      onPressed: () => _controller.isRefreshEnabled
+                                          ? _controller.disableRefresh()
+                                          : _controller.enableRefresh(),
                                     ),
                                   ],
                                 ),
@@ -187,9 +179,7 @@ class _PresentationScreenState extends State<PresentationScreen> {
             return AnimatedBuilder(
               animation: _controller,
               builder: (context, _) => Stack(
-                alignment: _controller.side.isBottom
-                    ? AlignmentDirectional.bottomStart
-                    : AlignmentDirectional.topStart,
+                alignment: _controller.side.isBottom ? AlignmentDirectional.bottomStart : AlignmentDirectional.topStart,
                 children: <Widget>[
                   Container(
                     height: 100,
@@ -206,9 +196,8 @@ class _PresentationScreenState extends State<PresentationScreen> {
                     ),
                   ),
                   Container(
-                    margin: controller.side.isBottom
-                        ? const EdgeInsets.only(bottom: 100)
-                        : const EdgeInsets.only(top: 100),
+                    margin:
+                        controller.side.isBottom ? const EdgeInsets.only(bottom: 100) : const EdgeInsets.only(top: 100),
                     width: double.infinity,
                     height: 50,
                     color: Colors.greenAccent,
@@ -226,8 +215,7 @@ class _PresentationScreenState extends State<PresentationScreen> {
                   Transform.translate(
                     offset: Offset(
                       0.0,
-                      (_controller.side.isBottom ? -100 : 100) *
-                          _controller.value,
+                      (_controller.side.isBottom ? -100 : 100) * _controller.value,
                     ),
                     child: child,
                   ),