π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Improve fading progress indicator rendering
Neeraj Gupta289e7dd2f3d3
diff --git a/mobile/apps/photos/lib/ui/tools/similar_images_page.dart b/mobile/apps/photos/lib/ui/tools/similar_images_page.dartindex c5e498fbb3..1ec788328a 100644--- a/mobile/apps/photos/lib/ui/tools/similar_images_page.dart+++ b/mobile/apps/photos/lib/ui/tools/similar_images_page.dart@@ -2,9 +2,9 @@ import "dart:async";import "package:ente_pure_utils/ente_pure_utils.dart";import "package:ente_strings/ente_strings.dart";+import "package:ente_ui/components/fading_circle_progress_indicator.dart";import "package:flutter/foundation.dart" show kDebugMode;import 'package:flutter/material.dart';-import "package:flutter_spinkit/flutter_spinkit.dart" show SpinKitFadingCircle;import "package:flutter_svg/svg.dart";import "package:intl/intl.dart";import 'package:logging/logging.dart';@@ -46,8 +46,7 @@ class SimilarImagesPage extends StatefulWidget {State<SimilarImagesPage> createState() => _SimilarImagesPageState();}-class _SimilarImagesPageState extends State<SimilarImagesPage>- with SingleTickerProviderStateMixin {+class _SimilarImagesPageState extends State<SimilarImagesPage> {static const crossAxisCount = 3;static const crossAxisSpacing = 12.0;static const double _similarThreshold = 0.02;@@ -70,7 +69,6 @@ class _SimilarImagesPageState extends State<SimilarImagesPage>final ItemScrollController _itemScrollController = ItemScrollController();final ItemPositionsListener _itemPositionsListener =ItemPositionsListener.create();- late AnimationController deleteAnimationController;List<SimilarFiles> get _filteredGroups {final filteredGroups = <SimilarFiles>[];@@ -105,10 +103,6 @@ class _SimilarImagesPageState extends State<SimilarImagesPage>super.initState();_selectedFiles = SelectedFiles();_deleteProgress = ValueNotifier("");- deleteAnimationController = AnimationController(- vsync: this,- duration: const Duration(milliseconds: 1200),- );if (!widget.debugScreen) {_findSimilarImages();@@ -120,7 +114,6 @@ class _SimilarImagesPageState extends State<SimilarImagesPage>_isDisposed = true;_selectedFiles.dispose();_deleteProgress.dispose();- deleteAnimationController.dispose();super.dispose();}@@ -179,12 +172,8 @@ class _SimilarImagesPageState extends State<SimilarImagesPage>child: Row(mainAxisSize: MainAxisSize.min,children: [- SizedBox(- child: SpinKitFadingCircle(- size: 18,- color: colorScheme.warning500,- controller: deleteAnimationController,- ),+ FadingCircleProgressIndicator(+ color: colorScheme.warning500,),const SizedBox(width: 8),Text(diff --git a/mobile/apps/photos/lib/ui/viewer/actions/smart_albums_status_widget.dart b/mobile/apps/photos/lib/ui/viewer/actions/smart_albums_status_widget.dartindex e8e2a14b68..611bebb01f 100644--- a/mobile/apps/photos/lib/ui/viewer/actions/smart_albums_status_widget.dart+++ b/mobile/apps/photos/lib/ui/viewer/actions/smart_albums_status_widget.dart@@ -1,8 +1,8 @@import "dart:async";import "package:ente_strings/ente_strings.dart";+import "package:ente_ui/components/fading_circle_progress_indicator.dart";import 'package:flutter/material.dart';-import "package:flutter_spinkit/flutter_spinkit.dart";import "package:photos/core/event_bus.dart";import "package:photos/events/smart_album_syncing_event.dart";import 'package:photos/models/collection/collection.dart';@@ -19,11 +19,9 @@ class SmartAlbumsStatusWidget extends StatefulWidget {_SmartAlbumsStatusWidgetState();}-class _SmartAlbumsStatusWidgetState extends State<SmartAlbumsStatusWidget>- with SingleTickerProviderStateMixin {+class _SmartAlbumsStatusWidgetState extends State<SmartAlbumsStatusWidget> {(int, bool)? _syncingCollection;StreamSubscription<SmartAlbumSyncingEvent>? subscription;- AnimationController? animationController;void updateData(SmartAlbumSyncingEvent event) {if (mounted) {@@ -40,10 +38,6 @@ class _SmartAlbumsStatusWidgetState extends State<SmartAlbumsStatusWidget>@overridevoid initState() {super.initState();- animationController = AnimationController(- vsync: this,- duration: const Duration(milliseconds: 1200),- );_syncingCollection = smartAlbumsService.syncingCollection;subscription = Bus.instance.on<SmartAlbumSyncingEvent>().listen(updateData);}@@ -51,7 +45,6 @@ class _SmartAlbumsStatusWidgetState extends State<SmartAlbumsStatusWidget>@overridevoid dispose() {subscription?.cancel();- animationController?.dispose();super.dispose();}@@ -85,14 +78,10 @@ class _SmartAlbumsStatusWidgetState extends State<SmartAlbumsStatusWidget>child: Row(mainAxisSize: MainAxisSize.min,children: [- SizedBox(- child: SpinKitFadingCircle(- size: 18,- color: _syncingCollection?.$2 ?? true- ? const Color(0xFF08C225)- : const Color(0xFFF78426),- controller: animationController,- ),+ FadingCircleProgressIndicator(+ color: _syncingCollection?.$2 ?? true+ ? const Color(0xFF08C225)+ : const Color(0xFFF78426),),const SizedBox(width: 8),Text(diff --git a/mobile/apps/photos/pubspec.yaml b/mobile/apps/photos/pubspec.yamlindex 9f381f61c2..6186511c7b 100644--- a/mobile/apps/photos/pubspec.yaml+++ b/mobile/apps/photos/pubspec.yaml@@ -132,7 +132,6 @@ dependencies:git:url: https://github.com/ente/flutter_sodiumref: a05d5b1bfdce64a387f8f5970160b22ce7b88282- flutter_spinkit: 5.2.1flutter_staggered_grid_view: 0.7.0flutter_svg: 2.3.0flutter_timezone: 4.1.1diff --git a/mobile/packages/ui/lib/components/fading_circle_progress_indicator.dart b/mobile/packages/ui/lib/components/fading_circle_progress_indicator.dartnew file mode 100644index 0000000000..2a34b857b8--- /dev/null+++ b/mobile/packages/ui/lib/components/fading_circle_progress_indicator.dart@@ -0,0 +1,86 @@+import "dart:math" as math;++import "package:flutter/widgets.dart";++class FadingCircleProgressIndicator extends StatefulWidget {+ const FadingCircleProgressIndicator({+ required this.color,+ this.size = 18,+ super.key,+ });++ final Color color;+ final double size;++ @override+ State<FadingCircleProgressIndicator> createState() =>+ _FadingCircleProgressIndicatorState();+}++class _FadingCircleProgressIndicatorState+ extends State<FadingCircleProgressIndicator>+ with SingleTickerProviderStateMixin {+ late final AnimationController _controller = AnimationController(+ vsync: this,+ duration: const Duration(milliseconds: 1200),+ )..repeat();++ @override+ void dispose() {+ _controller.dispose();+ super.dispose();+ }++ @override+ Widget build(BuildContext context) {+ return SizedBox.square(+ dimension: widget.size,+ child: RepaintBoundary(+ child: CustomPaint(+ painter: _FadingCirclePainter(+ color: widget.color,+ progress: _controller,+ ),+ ),+ ),+ );+ }+}++class _FadingCirclePainter extends CustomPainter {+ _FadingCirclePainter({required this.color, required this.progress})+ : super(repaint: progress);++ static const _dotCount = 12;+ static final _dotOffsets = List.generate(_dotCount, (index) {+ final angle = 2 * math.pi * index / _dotCount - math.pi / 2;+ return Offset(math.cos(angle), math.sin(angle));+ });++ final Color color;+ final Animation<double> progress;+ final Paint _paint = Paint();++ @override+ void paint(Canvas canvas, Size size) {+ final center = size.center(Offset.zero);+ final radius = size.shortestSide * 0.354;+ final dotRadius = size.shortestSide * 0.075;++ for (var index = 0; index < _dotCount; index++) {+ final delay = index / _dotCount;+ final opacity =+ (math.sin((progress.value - delay) * 2 * math.pi) + 1) / 2;+ _paint.color = color.withValues(alpha: color.a * opacity);+ canvas.drawCircle(+ center + _dotOffsets[index] * radius,+ dotRadius,+ _paint,+ );+ }+ }++ @override+ bool shouldRepaint(_FadingCirclePainter oldDelegate) =>+ oldDelegate.color != color || oldDelegate.progress != progress;+}