Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow deleting added weights #433

Merged
merged 4 commits into from
Sep 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions app/lib/features/measurement_list/weight_list.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'package:blood_pressure_app/components/confirm_deletion_dialoge.dart';
import 'package:blood_pressure_app/data_util/repository_builder.dart';
import 'package:blood_pressure_app/model/storage/storage.dart';
import 'package:flutter/material.dart';
Expand All @@ -24,12 +25,21 @@ class WeightList extends StatelessWidget {
itemCount: records.length,
itemBuilder: (context, idx) => ListTile(
title: Text(_buildWeightText(records[idx].weight)),
subtitle: Text(format.format(records[idx].time))
subtitle: Text(format.format(records[idx].time)),
trailing: IconButton(
icon: const Icon(Icons.delete),
onPressed: () async {
final repo = context.read<BodyweightRepository>();
if ((!context.read<Settings>().confirmDeletion) || await showConfirmDeletionDialoge(context)) {
await repo.remove(records[idx]);
}
}
),
),
);
},
);
}// TODO: delete
}

String _buildWeightText(Weight w) {
String weightStr = w.kg.toStringAsFixed(2);
Expand Down
60 changes: 60 additions & 0 deletions app/test/features/measurement_list/weight_list_test.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import 'package:blood_pressure_app/features/measurement_list/weight_list.dart';
import 'package:blood_pressure_app/model/storage/interval_store.dart';
import 'package:blood_pressure_app/model/storage/settings_store.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:health_data_store/health_data_store.dart';

Expand Down Expand Up @@ -42,4 +44,62 @@ void main() {
lessThan(tester.getCenter(find.textContaining('2000')).dy),
);
});
testWidgets('deletes elements from repo', (tester) async {
final interval = IntervalStorage();
interval.changeStepSize(TimeStep.lifetime);
final repo = MockBodyweightRepository();
await repo.add(BodyweightRecord(time: DateTime(2001), weight: Weight.kg(123.0)));

await tester.pumpWidget(appBase(
weightRepo: repo,
intervallStoreManager: IntervalStoreManager(interval, IntervalStorage(), IntervalStorage()),
const WeightList(rangeType: IntervalStoreManagerLocation.mainPage),
));
final localizations = await AppLocalizations.delegate.load(const Locale('en'))!;
await tester.pumpAndSettle();

expect(find.text('123 kg'), findsOneWidget);
expect(find.byIcon(Icons.delete), findsOneWidget);
expect(find.text(localizations.confirmDelete), findsNothing);
expect(find.text(localizations.btnConfirm), findsNothing);

await tester.tap(find.byIcon(Icons.delete));
await tester.pumpAndSettle();

expect(find.text(localizations.confirmDelete), findsOneWidget);
expect(find.text(localizations.btnConfirm), findsOneWidget);

await tester.tap(find.text(localizations.btnConfirm));
await tester.pumpAndSettle();
await tester.pumpAndSettle();
await tester.pumpAndSettle();
await tester.pumpAndSettle();

expect(find.text('123 kg'), findsNothing);
expect(repo.data, isEmpty);
});
testWidgets('respects confirm deletion setting', (tester) async {
final interval = IntervalStorage();
interval.changeStepSize(TimeStep.lifetime);
final repo = MockBodyweightRepository();
await repo.add(BodyweightRecord(time: DateTime(2001), weight: Weight.kg(123.0)));

await tester.pumpWidget(appBase(
weightRepo: repo,
intervallStoreManager: IntervalStoreManager(interval, IntervalStorage(), IntervalStorage()),
settings: Settings(confirmDeletion: false),
const WeightList(rangeType: IntervalStoreManagerLocation.mainPage),
));
final localizations = await AppLocalizations.delegate.load(const Locale('en'))!;
await tester.pumpAndSettle();

expect(find.text('123 kg'), findsOneWidget);
expect(find.text(localizations.confirmDelete), findsNothing);

await tester.tap(find.byIcon(Icons.delete));
await tester.pumpAndSettle();

expect(find.text(localizations.confirmDelete), findsNothing);
expect(find.text('123 kg'), findsNothing);
});
}
13 changes: 10 additions & 3 deletions app/test/util.dart
Original file line number Diff line number Diff line change
Expand Up @@ -230,18 +230,25 @@ class MockHealthDataSore implements HealthDataStore {

class _MockRepo<T> extends Repository<T> {
List<T> data = [];
final contr = StreamController.broadcast();

@override
Future<void> add(T value) async => data.add(value);
Future<void> add(T value) async {
data.add(value);
contr.sink.add(null);
}

@override
Future<List<T>> get(DateRange range) async => data;

@override
Future<void> remove(T value) async => data.remove(value);
Future<void> remove(T value) async {
data.remove(value);
contr.sink.add(null);
}

@override
Stream subscribe() => const Stream.empty(); // FIXME
Stream subscribe() => contr.stream;

@override
dynamic noSuchMethod(Invocation invocation) => throw Exception('unexpected call: $invocation');
Expand Down
Loading