Commit 771a85e

@@ -62,18 +62,16 @@ class IntervalPicker extends StatelessWidget {
                 value: settings.graphStepSize,
                 isExpanded: true,
                 onChanged: (TimeStep? value) async {
-                  if (value != null) {
-                    if (value == TimeStep.custom) {
-                      settings.graphStepSize = value;
-                      final res = await showDateRangePicker(
-                          context: context,
-                          firstDate: DateTime.fromMillisecondsSinceEpoch(0),
-                          lastDate: DateTime.now());
-                      settings.displayDataStart = res?.start ?? DateTime.fromMillisecondsSinceEpoch(-1);
-                      settings.displayDataEnd = res?.end ?? DateTime.fromMillisecondsSinceEpoch(-1);
-                    } else {
-                      settings.changeStepSize(value);
-                    }
+                  if (value == TimeStep.custom) {
+                    settings.graphStepSize = value!;
+                    final res = await showDateRangePicker(
+                        context: context,
+                        firstDate: DateTime.fromMillisecondsSinceEpoch(0),
+                        lastDate: DateTime.now());
+                    settings.displayDataStart = res?.start ?? DateTime.fromMillisecondsSinceEpoch(-1);
+                    settings.displayDataEnd = res?.end ?? DateTime.fromMillisecondsSinceEpoch(-1);
+                  } else if (value != null) {
+                    settings.changeStepSize(value);
                   }
                 },
                 items: TimeStep.options.map<DropdownMenuItem<TimeStep>>((v) {

@@ -389,7 +389,6 @@ class RamSettings extends ChangeNotifier implements Settings {
     displayDataEnd = newInterval[1];
   }
 
-  // directional step either 1 or -1
   @override
   void moveDisplayDataByStep(int directionalStep) {
     final oldStart = displayDataStart;
@@ -454,7 +453,8 @@ class RamSettings extends ChangeNotifier implements Settings {
         final start = now.copyWith(day: now.day-30);
         return [start, now];
       case TimeStep.custom:
-        return [DateTime.fromMillisecondsSinceEpoch(-1), DateTime.fromMillisecondsSinceEpoch(-1)]; // TODO
+        // fallback, TimeStep will be reset by getter
+        return [DateTime.fromMillisecondsSinceEpoch(-1), DateTime.fromMillisecondsSinceEpoch(-1)];
     }
   }
 }

@@ -106,7 +106,6 @@ class Settings extends ChangeNotifier {
     displayDataEnd = newInterval[1];
   }
 
-  // directional step either 1 or -1
   void moveDisplayDataByStep(int directionalStep) {
     final oldStart = displayDataStart;
     final oldEnd = displayDataEnd;
@@ -169,7 +168,8 @@ class Settings extends ChangeNotifier {
         final start = now.copyWith(day: now.day-30);
         return [start, now];
       case TimeStep.custom:
-        return [DateTime.fromMillisecondsSinceEpoch(-1), DateTime.fromMillisecondsSinceEpoch(-1)]; // TODO
+        // fallback, TimeStep will be reset by getter
+        return [DateTime.fromMillisecondsSinceEpoch(-1), DateTime.fromMillisecondsSinceEpoch(-1)];
     }
   }