Skip to content

Offline gym log for Android. No account, no ads, no internet.

Smoother entrance and rolling number animations

InlitX46a44e694d5f
diff --git a/lib/widgets/entrance.dart b/lib/widgets/entrance.dart
index 9ea1019..d443d62 100644
--- a/lib/widgets/entrance.dart
+++ b/lib/widgets/entrance.dart
@@ -211,9 +211,16 @@ class _RollInState extends State<RollIn> with SingleTickerProviderStateMixin {
}
final low = pos.floor();
final frac = pos - low;
- Widget digit(int v, double dy) => Transform.translate(
- offset: Offset(0, dy),
- child: Text('${v % 10}', style: widget.style, textHeightBehavior: _tight),
+ final rush = math.sin(frac * math.pi);
+ Widget digit(int v, double dy) => Opacity(
+ opacity: (1 - (dy / line).abs()).clamp(0.0, 1.0),
+ child: Transform.translate(
+ offset: Offset(0, dy),
+ child: Transform.scale(
+ scaleY: 1 + 0.12 * rush,
+ child: Text('${v % 10}', style: widget.style, textHeightBehavior: _tight),
+ ),
+ ),
);
return Opacity(
opacity: place == 0 ? 1 : scaled.clamp(0.0, 1.0),
diff --git a/lib/widgets/rolling_text.dart b/lib/widgets/rolling_text.dart
index cde4a18..edebbec 100644
--- a/lib/widgets/rolling_text.dart
+++ b/lib/widgets/rolling_text.dart
@@ -1,3 +1,5 @@
+import 'dart:math' as math;
+
import 'package:flutter/material.dart';
final _digitCells = <(TextStyle, double), double>{};
@@ -153,9 +155,13 @@ class _RollingChar extends StatelessWidget {
child: child,
builder: (_, kid) {
final t = animation.value;
+ final rush = math.sin(t.clamp(0.0, 1.0) * math.pi);
return Opacity(
- opacity: t.clamp(0.0, 1.0),
- child: Transform.translate(offset: Offset(0, from * line * (1 - t)), child: kid),
+ opacity: (t * t).clamp(0.0, 1.0),
+ child: Transform.translate(
+ offset: Offset(0, from * line * (1 - t)),
+ child: Transform.scale(scaleX: 1 - 0.04 * rush, scaleY: 1 + 0.14 * rush, child: kid),
+ ),
);
},
);