Skip to content

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

Swap health card metrics in one tap

InlitX9c566e2adc85
diff --git a/lib/state/health_state.dart b/lib/state/health_state.dart
index 58c1274..b5c4ac6 100644
--- a/lib/state/health_state.dart
+++ b/lib/state/health_state.dart
@@ -179,7 +179,8 @@ mixin HealthState on FitCore {
..addAll(current);
if (healthPinned.contains(m)) {
if (healthPinned.length > 1) healthPinned.remove(m);
- } else if (healthPinned.length < 3) {
+ } else {
+ if (healthPinned.length >= 3) healthPinned.removeAt(0);
healthPinned.add(m);
}
_persist();
diff --git a/lib/widgets/health_cards.dart b/lib/widgets/health_cards.dart
index 11f1d60..dd7166d 100644
--- a/lib/widgets/health_cards.dart
+++ b/lib/widgets/health_cards.dart
@@ -326,7 +326,10 @@ void showHealthPins(BuildContext context) {
style: AppTheme.f(12.5, weight: FontWeight.w500, color: gc.textSecondary, height: 1.4)),
const SizedBox(height: 16),
Flexible(
- child: SingleChildScrollView(
+ child: FloatingActions(
+ actions: PrimaryButton(label: t.done, onTap: () => Navigator.of(sheet).pop()),
+ child: SingleChildScrollView(
+ padding: const EdgeInsets.only(bottom: 84),
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 14),
decoration: BoxDecoration(color: gc.bgRaised2, borderRadius: BorderRadius.circular(18)),
@@ -362,9 +365,8 @@ void showHealthPins(BuildContext context) {
]),
),
),
+ ),
),
- const SizedBox(height: 16),
- PrimaryButton(label: t.done, onTap: () => Navigator.of(sheet).pop()),
],
),
),
diff --git a/test/health_test.dart b/test/health_test.dart
index 38062ef..8b5c28a 100644
--- a/test/health_test.dart
+++ b/test/health_test.dart
@@ -99,6 +99,18 @@ void main() {
expect(last.values, [97]);
expect(HealthMetrics.dayKey(last.day), key(1));
});
+ test('con 3 en la tarjeta, tocar otra cambia la más antigua', () {
+ fit.healthShown
+ ..clear()
+ ..addAll([HealthMetric.restingHr, HealthMetric.sleep, HealthMetric.activeKcal, HealthMetric.spo2]);
+ fit.healthPinned.clear();
+ fit.toggleHealthPin(HealthMetric.restingHr);
+ expect(fit.healthTop, [HealthMetric.sleep, HealthMetric.activeKcal]);
+ fit.toggleHealthPin(HealthMetric.restingHr);
+ expect(fit.healthTop, [HealthMetric.sleep, HealthMetric.activeKcal, HealthMetric.restingHr]);
+ fit.toggleHealthPin(HealthMetric.spo2);
+ expect(fit.healthTop, [HealthMetric.activeKcal, HealthMetric.restingHr, HealthMetric.spo2]);
+ });
});
group('#281 cómo se enseñan', () {