Commit 998ee3c

@@ -0,0 +1,90 @@
+
+import 'package:flutter/material.dart';
+
+/// Utility class for converting dynamic values to concrete data types.
+///
+/// Mainly used for PDF conversion. There is no guarantee that the internal logic will be useful anywhere else.
+class ConvertUtil {
+  /// Parses all forms of a boolean someone might put in a a boolean.
+  static bool? parseBool(dynamic value) {
+    if (value is bool) return value;
+    if (value == 'true' || value == 1) return true;
+    if (value == 'false' || value == 0) return false;
+    return null;
+  }
+
+  static int? parseInt(dynamic value) {
+    if (value is int || value is int?) return value;
+    if (value is String) return int.tryParse(value);
+    return null;
+  }
+
+  static double? parseDouble(dynamic value) {
+    if (value is double) return value;
+    if (value is String) return double.tryParse(value);
+    return null;
+  }
+
+  static String? parseString(dynamic value) {
+    if (value is String) return value;
+    if (value is int || value is double || value is bool) return value.toString();
+    return null;
+  }
+
+  static String serializeLocale(Locale? value) {
+    if (value == null) return 'NULL';
+    return value.languageCode;
+  }
+
+  static Locale? parseLocale(dynamic value) {
+    if (value == 'NULL') return null;
+    return Locale(value);
+  }
+
+  static MaterialColor? parseMaterialColor(dynamic value) {
+    if (value is MaterialColor) return value;
+    if (value == null) return null;
+
+    late final Color color;
+    if (value is Color) {
+      color = value;
+    } else if (value is int) {
+      color = Color(value);
+    } else if (value is String) {
+      final int? parsedValue = int.tryParse(value);
+      if (parsedValue == null) return null;
+      color = Color(parsedValue);
+    } else {
+      assert(false);
+      return null;
+    }
+
+    List strengths = <double>[.05];
+    Map<int, Color> swatch = {};
+    final int r = color.red, g = color.green, b = color.blue;
+
+    for (int i = 1; i < 10; i++) {
+      strengths.add(0.1 * i);
+    }
+    for (var strength in strengths) {
+      final double ds = 0.5 - strength;
+      swatch[(strength * 1000).round()] = Color.fromRGBO(
+        r + ((ds < 0 ? r : (255 - r)) * ds).round(),
+        g + ((ds < 0 ? g : (255 - g)) * ds).round(),
+        b + ((ds < 0 ? b : (255 - b)) * ds).round(),
+        1,
+      );
+    }
+    return MaterialColor(value, swatch);
+  }
+
+  static DateTimeRange? parseRange(dynamic start, dynamic end) {
+    final startTimestamp = parseInt(start);
+    final endTimestamp = parseInt(end);
+    if (startTimestamp == null || endTimestamp == null) return null;
+    return DateTimeRange(
+        start: DateTime.fromMillisecondsSinceEpoch(startTimestamp),
+        end: DateTime.fromMillisecondsSinceEpoch(endTimestamp)
+    );
+  }
+}
\ No newline at end of file

@@ -1,5 +1,6 @@
 import 'dart:convert';
 
+import 'package:blood_pressure_app/model/storage/convert_util.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
@@ -15,7 +16,7 @@ class IntervallStorage extends ChangeNotifier {
 
   factory IntervallStorage.fromMap(Map<String, dynamic> map) => IntervallStorage(
     stepSize: TimeStep.deserialize(map['stepSize']),
-    range: _parseRange(map['start'], map['end']),
+    range: ConvertUtil.parseRange(map['start'], map['end']),
   );
 
   factory IntervallStorage.fromJson(String json) {
@@ -202,7 +203,7 @@ enum TimeStep {
   }
 
   factory TimeStep.deserialize(dynamic value) {
-    int? intValue = _parseInt(value);
+    int? intValue = ConvertUtil.parseInt(value);
     if (value == null || intValue == null) return TimeStep.last7Days;
 
     switch (intValue) {
@@ -227,24 +228,4 @@ enum TimeStep {
         return TimeStep.last7Days;
     }
   }
-}
-
-DateTimeRange? _parseRange(dynamic start, dynamic end) {
-  final startTimestamp = _parseInt(start);
-  final endTimestamp = _parseInt(end);
-  if (startTimestamp == null || endTimestamp == null) return null;
-  return DateTimeRange(
-      start: DateTime.fromMillisecondsSinceEpoch(startTimestamp),
-      end: DateTime.fromMillisecondsSinceEpoch(endTimestamp)
-  );
-}
-
-int? _parseInt(dynamic value) {
-  if (value is int || value is int?) {
-    return value;
-  }
-  if (value is String) {
-    return int.tryParse(value);
-  }
-  return null;
 }
\ No newline at end of file

@@ -1,5 +1,6 @@
 import 'dart:convert';
 
+import 'package:blood_pressure_app/model/storage/convert_util.dart';
 import 'package:flutter/material.dart';
 
 /// Stores settings that are directly controllable by the user through the Settings screen.
@@ -61,25 +62,25 @@ class Settings extends ChangeNotifier {
   }
 
   factory Settings.fromMap(Map<String, dynamic> map) => Settings(
-    accentColor: _parseMaterialColor(map['accentColor']),
-    sysColor: _parseMaterialColor(map['sysColor']),
-    diaColor: _parseMaterialColor(map['diaColor']),
-    pulColor: _parseMaterialColor(map['pulColor']),
-    allowManualTimeInput: _parseBool(map['allowManualTimeInput']),
-    confirmDeletion: _parseBool(map['confirmDeletion']),
-    darkMode: _parseBool(map['darkMode']),
-    dateFormatString: _parseString(map['dateFormatString']),
-    animationSpeed: _parseInt(map['animationSpeed']),
-    sysWarn: _parseInt(map['sysWarn']),
-    diaWarn: _parseInt(map['diaWarn']),
-    graphLineThickness: _parseDouble(map['graphLineThickness']),
-    followSystemDarkMode: _parseBool(map['followSystemDarkMode']),
-    validateInputs: _parseBool(map['validateInputs']),
-    allowMissingValues: _parseBool(map['allowMissingValues']),
-    drawRegressionLines: _parseBool(map['drawRegressionLines']),
-    startWithAddMeasurementPage: _parseBool(map['startWithAddMeasurementPage']),
-    useLegacyList: _parseBool(map['useLegacyList']),
-    language: _parseLocale(map['language'])
+    accentColor: ConvertUtil.parseMaterialColor(map['accentColor']),
+    sysColor: ConvertUtil.parseMaterialColor(map['sysColor']),
+    diaColor: ConvertUtil.parseMaterialColor(map['diaColor']),
+    pulColor: ConvertUtil.parseMaterialColor(map['pulColor']),
+    allowManualTimeInput: ConvertUtil.parseBool(map['allowManualTimeInput']),
+    confirmDeletion: ConvertUtil.parseBool(map['confirmDeletion']),
+    darkMode: ConvertUtil.parseBool(map['darkMode']),
+    dateFormatString: ConvertUtil.parseString(map['dateFormatString']),
+    animationSpeed: ConvertUtil.parseInt(map['animationSpeed']),
+    sysWarn: ConvertUtil.parseInt(map['sysWarn']),
+    diaWarn: ConvertUtil.parseInt(map['diaWarn']),
+    graphLineThickness: ConvertUtil.parseDouble(map['graphLineThickness']),
+    followSystemDarkMode: ConvertUtil.parseBool(map['followSystemDarkMode']),
+    validateInputs: ConvertUtil.parseBool(map['validateInputs']),
+    allowMissingValues: ConvertUtil.parseBool(map['allowMissingValues']),
+    drawRegressionLines: ConvertUtil.parseBool(map['drawRegressionLines']),
+    startWithAddMeasurementPage: ConvertUtil.parseBool(map['startWithAddMeasurementPage']),
+    useLegacyList: ConvertUtil.parseBool(map['useLegacyList']),
+    language: ConvertUtil.parseLocale(map['language'])
   );
       
   factory Settings.fromJson(String json) => Settings.fromMap(jsonDecode(json));
@@ -102,7 +103,7 @@ class Settings extends ChangeNotifier {
       'drawRegressionLines': drawRegressionLines,
       'startWithAddMeasurementPage': startWithAddMeasurementPage,
       'useLegacyList': useLegacyList,
-      'language': _serializeLocale(language),
+      'language': ConvertUtil.serializeLocale(language),
     };
 
   String toJson() => jsonEncode(toMap());
@@ -245,77 +246,4 @@ class Settings extends ChangeNotifier {
 // When adding fields notice the checklist at the top.
 }
 
-MaterialColor? _parseMaterialColor(dynamic value) {
-  if (value is MaterialColor) return value;
-  if (value == null) return null;
-  
-  late final Color color;
-  if (value is Color) {
-    color = value;
-  } else if (value is int) {
-    color = Color(value);
-  } else if (value is String) {
-    final int? parsedValue = int.tryParse(value);
-    if (parsedValue == null) return null;
-    color = Color(parsedValue);
-  } else {
-    assert(false);
-    return null;
-  }
-  
-  List strengths = <double>[.05];
-  Map<int, Color> swatch = {};
-  final int r = color.red, g = color.green, b = color.blue;
-
-  for (int i = 1; i < 10; i++) {
-    strengths.add(0.1 * i);
-  }
-  for (var strength in strengths) {
-    final double ds = 0.5 - strength;
-    swatch[(strength * 1000).round()] = Color.fromRGBO(
-      r + ((ds < 0 ? r : (255 - r)) * ds).round(),
-      g + ((ds < 0 ? g : (255 - g)) * ds).round(),
-      b + ((ds < 0 ? b : (255 - b)) * ds).round(),
-      1,
-    );
-  }
-  return MaterialColor(value, swatch);
-}
-
-/// Parses all forms of a boolean someone might put in a a boolean.
-bool? _parseBool(dynamic value) {
-  if (value is bool) return value;
-  if (value == 'true' || value == 1) return true;
-  if (value == 'false' || value == 0) return false;
-  return null;
-}
-
-int? _parseInt(dynamic value) {
-  if (value is int) return value;
-  if (value is String) return int.tryParse(value);
-  return null;
-}
-
-double? _parseDouble(dynamic value) {
-  if (value is double) return value;
-  if (value is String) return double.tryParse(value);
-  return null;
-}
-
-String? _parseString(dynamic value) {
-  if (value is String) return value;
-  if (value is int || value is double || value is bool) return value.toString();
-  return null;
-}
-
-String _serializeLocale(Locale? value) {
-  if (value == null) return 'NULL';
-  return value.languageCode;
-}
-
-Locale? _parseLocale(dynamic value) {
-  if (value == 'NULL') return null;
-  return Locale(value);
-}
-