Commit b514dc6
Changed files (4)
lib/components/consistent_future_builder.dart
@@ -30,47 +30,4 @@ class ConsistentFutureBuilder<T> extends StatelessWidget {
}
});
}
-}
-
-class ConsistentAnimatedFutureBuilder<T> extends StatelessWidget {
- final Future<T> future;
- final Widget Function(BuildContext context, T result) onData;
-
- final Widget? onNotStarted;
- final Widget? onWaiting;
- final Widget? Function(BuildContext context, String errorMsg)? onError;
-
- final Duration duration;
-
- const ConsistentAnimatedFutureBuilder({super.key, required this.future, this.onNotStarted, this.onWaiting, this.onError,
- required this.onData, this.duration = const Duration(milliseconds: 300)});
-
- @override
- Widget build(BuildContext context) {
- return FutureBuilder<T>(
- future: future,
- builder: (BuildContext context, AsyncSnapshot<T> snapshot) {
- Widget child;
- if (snapshot.hasError) {
- child = Text(AppLocalizations.of(context)!.error(snapshot.error.toString()));
- } else {
- switch (snapshot.connectionState) {
- case ConnectionState.none:
- child = onNotStarted ?? Text(AppLocalizations.of(context)!.errNotStarted);
- break;
- case ConnectionState.waiting:
- case ConnectionState.active:
- child = onWaiting ?? Text(AppLocalizations.of(context)!.loading);
- break;
- case ConnectionState.done:
- child = onData(context, snapshot.data as T);
- }
- }
- return AnimatedSwitcher(
- duration: duration,
- child: child,
- );
-
- });
- }
}
\ No newline at end of file
lib/components/measurement_graph.dart
@@ -235,23 +235,6 @@ class MeasurementGraph extends StatelessWidget {
}
}
-double _determineMedian(Iterable<num> data) {
- final clonedList = [];
- clonedList.addAll(data);
-
- clonedList.sort((a, b) => a.compareTo(b));
- double median;
-
- int middle = clonedList.length ~/ 2;
- if (clonedList.length % 2 == 1) {
- median = clonedList[middle];
- } else {
- median = ((clonedList[middle - 1] + clonedList[middle]) / 2.0);
- }
-
- return median;
-}
-
extension Sum<T> on List<T> {
double sum(num Function(T value) f) {
return fold<double>(0, (prev, e) => prev + f(e).toDouble());
lib/components/settings_widgets.dart
@@ -254,7 +254,7 @@ class _SliderSettingsTileState extends State<SliderSettingsTile> {
min: widget.start,
max: widget.end,
divisions: (widget.end - widget.start) ~/ widget.stepSize,
- ))
+ )),
],
),
),
lib/main.dart
@@ -36,8 +36,12 @@ class AppRoot extends StatelessWidget {
return MaterialApp(
title: 'Blood Pressure App',
onGenerateTitle: (context) => AppLocalizations.of(context)!.title,
- theme: ThemeData(primaryColor: settings.accentColor),
+ theme: ThemeData(
+ primaryColor: settings.accentColor,
+ // useMaterial3: true TODO
+ ),
darkTheme: ThemeData(
+ // useMaterial3: true, TODO
brightness: Brightness.dark,
canvasColor: Colors.black,
primaryColor: settings.accentColor.shade400,