Commit d9e13e3

@@ -3,7 +3,7 @@ import 'dart:collection';
 import 'package:blood_pressure_app/model/blood_pressure.dart';
 import 'package:blood_pressure_app/model/export_import.dart';
 import 'package:blood_pressure_app/model/settings_store.dart';
-import 'package:file_saver/src/utils/mime_types.dart';
+import 'package:file_saver/file_saver.dart' show MimeType;
 import 'package:flutter/material.dart';
 
 class RamBloodPressureModel extends ChangeNotifier implements BloodPressureModel {
@@ -82,24 +82,22 @@ class RamBloodPressureModel extends ChangeNotifier implements BloodPressureModel
 
 class RamSettings extends ChangeNotifier implements Settings {
   MaterialColor _accentColor = Colors.pink;
-  int _age = 30;
   bool _allowManualTimeInput = true;
   int _animationSpeed = 150;
   bool _confirmDeletion = true;
   bool _darkMode = true;
   String _dateFormatString = 'yyyy-MM-dd  HH:mm';
   MaterialColor _diaColor = Colors.pink;
-  double _diaWarn = 80;
+  int _diaWarn = 80;
   DateTime? _displayDataEnd;
   DateTime? _displayDataStart;
   bool _followSystemDarkMode = true;
   double _graphLineThickness = 3;
   int _graphStepSize = TimeStep.day;
   double _iconSize = 30;
-  bool _overrideWarnValues = false;
   MaterialColor _pulColor = Colors.pink;
   MaterialColor _sysColor = Colors.pink;
-  double _sysWarn = 120;
+  int _sysWarn = 120;
   bool _useExportCompatability = false;
   bool _validateInputs = true;
   int _graphTitlesCount = 5;
@@ -124,15 +122,12 @@ class RamSettings extends ChangeNotifier implements Settings {
   }
 
   @override
-  double get diaWarn {
-    if (!overrideWarnValues) {
-      return BloodPressureWarnValues.getUpperDiaWarnValue(age).toDouble();
-    }
+  int get diaWarn {
     return _diaWarn;
   }
 
   @override
-  set diaWarn(double newWarn) {
+  set diaWarn(int newWarn) {
     _diaWarn = newWarn;
     notifyListeners();
   }
@@ -160,15 +155,12 @@ class RamSettings extends ChangeNotifier implements Settings {
   }
 
   @override
-  double get sysWarn {
-    if (!overrideWarnValues) {
-      return BloodPressureWarnValues.getUpperSysWarnValue(age).toDouble();
-    }
+  int get sysWarn {
     return _sysWarn;
   }
 
   @override
-  set sysWarn(double newWarn) {
+  set sysWarn(int newWarn) {
     _sysWarn = newWarn;
     notifyListeners();
   }
@@ -182,15 +174,6 @@ class RamSettings extends ChangeNotifier implements Settings {
     notifyListeners();
   }
 
-  @override
-  int get age => _age;
-
-  @override
-  set age(int value) {
-    _age = value;
-    notifyListeners();
-  }
-
   @override
   bool get allowManualTimeInput => _allowManualTimeInput;
 
@@ -281,15 +264,6 @@ class RamSettings extends ChangeNotifier implements Settings {
     notifyListeners();
   }
 
-  @override
-  bool get overrideWarnValues => _overrideWarnValues;
-
-  @override
-  set overrideWarnValues(bool value) {
-    _overrideWarnValues = value;
-    notifyListeners();
-  }
-
   @override
   MaterialColor get pulColor => _pulColor;
 

@@ -32,10 +32,8 @@ void main() {
       expect(s.allowManualTimeInput, true);
       expect(s.dateFormatString, 'yyyy-MM-dd  HH:mm');
       expect(s.iconSize, 30);
-      expect(s.sysWarn, 125); // depends on overrideWarnValues
-      expect(s.diaWarn, 80); // depends on overrideWarnValues
-      expect(s.age, 30);
-      expect(s.overrideWarnValues, false);
+      expect(s.sysWarn, 120);
+      expect(s.diaWarn, 80);
       expect(s.validateInputs, true);
       expect(s.graphLineThickness, 3);
       expect(s.animationSpeed, 150);
@@ -51,9 +49,6 @@ void main() {
       expect(s.exportMimeType, MimeType.csv);
       expect(s.defaultExportDir.isEmpty, true);
       expect(s.exportAfterEveryEntry, false);
-
-      s.overrideWarnValues = true;
-      expect(s.sysWarn, 120);
     });
 
     test('setting fields should save changes', () async {
@@ -82,10 +77,8 @@ void main() {
       s.allowManualTimeInput = false;
       s.dateFormatString = 'yy:dd @ H:mm.ss';
       s.iconSize = 50;
-      s.sysWarn = 314; // depends on overrideWarnValues
-      s.diaWarn = 159; // depends on overrideWarnValues
-      s.age = 26;
-      s.overrideWarnValues = true;
+      s.sysWarn = 314;
+      s.diaWarn = 159;
       s.validateInputs = false;
       s.graphLineThickness = 5;
       s.animationSpeed = 100;
@@ -113,8 +106,6 @@ void main() {
       expect(s.iconSize, 50);
       expect(s.sysWarn, 314);
       expect(s.diaWarn, 159);
-      expect(s.age, 26);
-      expect(s.overrideWarnValues, true);
       expect(s.validateInputs, false);
       expect(s.graphLineThickness, 5);
       expect(s.animationSpeed, 100);
@@ -151,10 +142,8 @@ void main() {
       s.allowManualTimeInput = false;
       s.dateFormatString = 'yy:dd @ H:mm.ss';
       s.iconSize = 10;
-      s.sysWarn = 314; // depends on overrideWarnValues
-      s.diaWarn = 159; // depends on overrideWarnValues
-      s.age = 26;
-      s.overrideWarnValues = true;
+      s.sysWarn = 314;
+      s.diaWarn = 159;
       s.validateInputs = false;
       s.graphLineThickness = 5;
       s.animationSpeed = 100;
@@ -171,7 +160,7 @@ void main() {
       s.defaultExportDir = '/storage/emulated/0/Android/data/com.derdilla.bloodPressureApp/files/file.csv';
       s.exportAfterEveryEntry = true;
 
-      expect(i, 31);
+      expect(i, 29);
     });
   });
 
@@ -197,10 +186,8 @@ void main() {
       expect(s.allowManualTimeInput, true);
       expect(s.dateFormatString, 'yyyy-MM-dd  HH:mm');
       expect(s.iconSize, 30);
-      expect(s.sysWarn, 125); // depends on overrideWarnValues
-      expect(s.diaWarn, 80); // depends on overrideWarnValues
-      expect(s.age, 30);
-      expect(s.overrideWarnValues, false);
+      expect(s.sysWarn, 120);
+      expect(s.diaWarn, 80);
       expect(s.validateInputs, true);
       expect(s.graphLineThickness, 3);
       expect(s.animationSpeed, 150);
@@ -216,9 +203,6 @@ void main() {
       expect(s.exportMimeType, MimeType.csv);
       expect(s.defaultExportDir.isEmpty, true);
       expect(s.exportAfterEveryEntry, false);
-
-      s.overrideWarnValues = true;
-      expect(s.sysWarn, 120);
     });
 
     test('setting fields should save changes', () async {
@@ -247,10 +231,8 @@ void main() {
       s.allowManualTimeInput = false;
       s.dateFormatString = 'yy:dd @ H:mm.ss';
       s.iconSize = 50;
-      s.sysWarn = 314; // depends on overrideWarnValues
-      s.diaWarn = 159; // depends on overrideWarnValues
-      s.age = 26;
-      s.overrideWarnValues = true;
+      s.sysWarn = 314;
+      s.diaWarn = 159;
       s.validateInputs = false;
       s.graphLineThickness = 5;
       s.animationSpeed = 100;
@@ -279,8 +261,6 @@ void main() {
       expect(s.iconSize, 50);
       expect(s.sysWarn, 314);
       expect(s.diaWarn, 159);
-      expect(s.age, 26);
-      expect(s.overrideWarnValues, true);
       expect(s.validateInputs, false);
       expect(s.graphLineThickness, 5);
       expect(s.animationSpeed, 100);
@@ -317,10 +297,8 @@ void main() {
       s.allowManualTimeInput = false;
       s.dateFormatString = 'yy:dd @ H:mm.ss';
       s.iconSize = 10;
-      s.sysWarn = 314; // depends on overrideWarnValues
-      s.diaWarn = 159; // depends on overrideWarnValues
-      s.age = 26;
-      s.overrideWarnValues = true;
+      s.sysWarn = 314;
+      s.diaWarn = 159;
       s.validateInputs = false;
       s.graphLineThickness = 5;
       s.animationSpeed = 100;
@@ -337,7 +315,7 @@ void main() {
       s.defaultExportDir = '/storage/emulated/0/Android/data/com.derdilla.bloodPressureApp/files/file.csv';
       s.exportAfterEveryEntry = true;
 
-      expect(i, 31);
+      expect(i, 29);
     });
   });
 }