- fix: CupertinoActivityIndicator renamed to avoid conflicts.

xuelongqy · Jan 11, 2023 · c0dc8b5 · c0dc8b5
1 parent cb8a0ff
commit c0dc8b5
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 3.2.2+1
+- fix: CupertinoActivityIndicator renamed to avoid conflicts.
+
 ## 3.2.2
 - fix: Compatible with Flutter2.8.1 and below [#619](https://github.com/xuelongqy/flutter_easy_refresh/issues/619).
 - perf: Pub scores.

diff --git a/lib/easy_refresh.dart b/lib/easy_refresh.dart
@@ -3,7 +3,7 @@ library easy_refresh;
 import 'dart:math' as math;
 import 'dart:async';
 
-import 'package:flutter/cupertino.dart' hide CupertinoActivityIndicator;
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';

diff --git a/lib/src/styles/cupertino/cupertino_activity_indicator.dart b/lib/src/styles/cupertino/cupertino_activity_indicator.dart
@@ -13,17 +13,17 @@ const Color _kActiveTickColor = CupertinoDynamicColor.withBrightness(
 /// {@youtube 560 315 https://www.youtube.com/watch?v=AENVH-ZqKDQ}
 ///
 /// {@tool dartpad}
-/// This example shows how [CupertinoActivityIndicator] can be customized.
+/// This example shows how [_CupertinoActivityIndicator] can be customized.
 ///
 /// ** See code in examples/api/lib/cupertino/activity_indicator/cupertino_activity_indicator.0.dart **
 /// {@end-tool}
 ///
 /// See also:
 ///
 ///  * <https://developer.apple.com/ios/human-interface-guidelines/controls/progress-indicators/#activity-indicators>
-class CupertinoActivityIndicator extends StatefulWidget {
+class _CupertinoActivityIndicator extends StatefulWidget {
   /// Creates an iOS-style activity indicator that spins clockwise.
-  const CupertinoActivityIndicator({
+  const _CupertinoActivityIndicator({
     Key? key,
     this.color,
     this.animating = true,
@@ -38,7 +38,7 @@ class CupertinoActivityIndicator extends StatefulWidget {
   /// When provided, the value of [progress] must be between 0.0 (zero ticks
   /// will be shown) and 1.0 (all ticks will be shown) inclusive. Defaults
   /// to 1.0.
-  const CupertinoActivityIndicator.partiallyRevealed({
+  const _CupertinoActivityIndicator.partiallyRevealed({
     Key? key,
     this.color,
     this.radius = _kDefaultIndicatorRadius,
@@ -73,11 +73,12 @@ class CupertinoActivityIndicator extends StatefulWidget {
   final double progress;
 
   @override
-  State<CupertinoActivityIndicator> createState() =>
+  State<_CupertinoActivityIndicator> createState() =>
       _CupertinoActivityIndicatorState();
 }
 
-class _CupertinoActivityIndicatorState extends State<CupertinoActivityIndicator>
+class _CupertinoActivityIndicatorState
+    extends State<_CupertinoActivityIndicator>
     with SingleTickerProviderStateMixin {
   late AnimationController _controller;
 
@@ -95,7 +96,7 @@ class _CupertinoActivityIndicatorState extends State<CupertinoActivityIndicator>
   }
 
   @override
-  void didUpdateWidget(CupertinoActivityIndicator oldWidget) {
+  void didUpdateWidget(_CupertinoActivityIndicator oldWidget) {
     super.didUpdateWidget(oldWidget);
     if (widget.animating != oldWidget.animating) {
       if (widget.animating) {

diff --git a/lib/src/styles/cupertino/cupertino_indicator.dart b/lib/src/styles/cupertino/cupertino_indicator.dart
@@ -108,7 +108,7 @@ class _CupertinoIndicatorState extends State<_CupertinoIndicator>
         indicator = Opacity(
           key: const ValueKey('indicator'),
           opacity: opacityCurve.transform(scale),
-          child: CupertinoActivityIndicator.partiallyRevealed(
+          child: _CupertinoActivityIndicator.partiallyRevealed(
             radius: _radius,
             progress: scale,
             color: widget.foregroundColor,
@@ -118,17 +118,19 @@ class _CupertinoIndicatorState extends State<_CupertinoIndicator>
       case IndicatorMode.ready:
       case IndicatorMode.processing:
       case IndicatorMode.processed:
-        indicator = CupertinoActivityIndicator(
+        indicator = _CupertinoActivityIndicator(
           key: const ValueKey('indicator'),
           radius: _radius,
           color: widget.foregroundColor,
+          animating: true,
         );
         break;
       case IndicatorMode.done:
-        indicator = CupertinoActivityIndicator(
+        indicator = _CupertinoActivityIndicator(
           key: const ValueKey('indicator'),
           radius: _radius * scale,
           color: widget.foregroundColor,
+          animating: true,
         );
         break;
       default:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: easy_refresh
 description: A flutter widget that provides pull-down refresh and pull-up load.
-version: 3.2.2
+version: 3.2.2+1
 homepage: https://xuelongqy.github.io/flutter_easy_refresh
 repository: https://github.com/xuelongqy/flutter_easy_refresh
 issue_tracker: https://github.com/xuelongqy/flutter_easy_refresh/issues