Feature/betterdatepicker

App/lib/helpers/date.dart

@@ -1,10 +1,11 @@
 import 'package:flutter/material.dart';
+import 'package:helse/ui/common/date_range_picker.dart';
 import 'package:intl/intl.dart';
 
 class DateHelper {
   static DateTimeRange now() {
     var now = DateTime.now();
-    return DateTimeRange(start: DateTime(now.year, now.month, now.day), end: DateTime(now.year, now.month, now.day, 23, 59, 59));
+    return DateTimeRange(start: DateTime(now.year, now.month, now.day), end: DateTime(now.year, now.month, now.day + 1));
   }
 
   static String format(DateTime? date, {bool? second, required BuildContext context}) {
@@ -21,17 +22,63 @@ class DateHelper {
   }
 
   static String formatDate(DateTime? date, {required BuildContext context}) {
-  if (date == null) return "";
+    if (date == null) return "";
     var tag = Localizations.maybeLocaleOf(context)?.toLanguageTag();
     DateFormat dateTimeFormat = DateFormat.yMMMMd(tag);
     return dateTimeFormat.format(date);
   }
 
   static String formatTime(DateTime? date, {required BuildContext context}) {
-  if (date == null) return "";
+    if (date == null) return "";
     var tag = Localizations.maybeLocaleOf(context)?.toLanguageTag();
 
     DateFormat dateTimeFormat = DateFormat.jms(tag);
     return dateTimeFormat.format(date);
   }
+
+  static DateTimeRange getRange(DatePreset value) {
+    switch (value) {
+      case DatePreset.today:
+        return now();
+      case DatePreset.week:
+        return currentWeek();
+      case DatePreset.month:
+        return currentMonths();
+      case DatePreset.trimestre:
+        return currentMonths(count: 3);
+      case DatePreset.halfYear:
+        return currentMonths(count: 6);
+      case DatePreset.year:
+        return currentWeek(count: 365);
+      case DatePreset.yearToDate:
+      return yearToDate();
+    }
+  }
+
+  static DateTimeRange currentWeek({int count = 7}) {
+    var now = DateTime.now();
+
+    var end = now;
+    var start = end.add(Duration(days: -1 * count));
+
+    return DateTimeRange(start: start, end: end);
+  }
+
+  static DateTimeRange currentMonths({int count = 1}) {
+    var now = DateTime.now();
+
+    var end = now;
+    var start = end.add(Duration(days: 30 * -1 * count));
+
+    return DateTimeRange(start: start, end: end);
+  }
+
+  static DateTimeRange yearToDate() {
+       var now = DateTime.now();
+
+    var start = DateTime(now.year, 1, 1);
+    var end = now;
+
+    return DateTimeRange(start: start, end: end);
+  }
 }

App/lib/helpers/translation.dart

@@ -0,0 +1,22 @@
+import 'package:helse/ui/common/date_range_picker.dart';
+
+class Translation {
+  static String get(DatePreset value) {
+    switch (value) {
+      case DatePreset.today:
+        return 'Today';
+      case DatePreset.week:
+        return '7 days';
+      case DatePreset.month:
+        return 'Month';
+      case DatePreset.trimestre:
+        return '3 Months';
+      case DatePreset.halfYear:
+        return '6 Months';
+      case DatePreset.year:
+        return '1 Year';
+      case DatePreset.yearToDate:
+        return 'Year to date';
+    }
+  }
+}

App/lib/logic/fit/fit_logic.dart

@@ -5,7 +5,7 @@ import 'package:flutter/foundation.dart';
 import 'package:health/health.dart';
 import 'package:helse/logic/settings/settings_logic.dart';
 import 'package:helse/services/account.dart';
-import 'package:helse/ui/theme/notification.dart';
+import 'package:helse/ui/common/notification.dart';
 
 import '../../services/swagger/generated_code/swagger.swagger.dart';
 import '../d_i.dart';

App/lib/logic/fit/task_bloc.dart

@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:bloc/bloc.dart';
 
-import '../../ui/theme/notification.dart';
+import '../../ui/common/notification.dart';
 import '../event.dart';
 
 class Execution {

App/lib/ui/blocs/administration/events/event_add.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:helse/logic/d_i.dart';
-import 'package:helse/ui/theme/square_dialog.dart';
+import 'package:helse/ui/common/square_dialog.dart';
 
 import '../../../../services/swagger/generated_code/swagger.swagger.dart';
-import '../../../theme/notification.dart';
+import '../../../common/notification.dart';
 import 'event_form.dart';
 
 class EventTypeAdd extends StatefulWidget {

App/lib/ui/blocs/administration/events/event_form.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-import '../../../theme/square_text_field.dart';
+import '../../../common/square_text_field.dart';
 
 class EventAddForm extends StatefulWidget {
   final TextEditingController controllerDescription;

App/lib/ui/blocs/administration/events/event_settings.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:helse/services/swagger/generated_code/swagger.swagger.dart';
-import 'package:helse/ui/theme/notification.dart';
+import 'package:helse/ui/common/notification.dart';
 
-import '../../../theme/loader.dart';
+import '../../../common/loader.dart';
 
 class EventSettingsView extends StatefulWidget {
   const EventSettingsView({super.key});

App/lib/ui/blocs/administration/events/event_type.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:helse/logic/d_i.dart';
-import 'package:helse/ui/theme/notification.dart';
+import 'package:helse/ui/common/notification.dart';
 
 import '../../../../services/swagger/generated_code/swagger.swagger.dart';
-import '../../../theme/loader.dart';
+import '../../../common/loader.dart';
 import 'event_add.dart';
 
 class EventTypeView extends StatefulWidget {

App/lib/ui/blocs/administration/metrics/metric_add.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:helse/logic/d_i.dart';
-import 'package:helse/ui/theme/square_dialog.dart';
+import 'package:helse/ui/common/square_dialog.dart';
 
 import '../../../../services/swagger/generated_code/swagger.swagger.dart';
-import '../../../theme/notification.dart';
+import '../../../common/notification.dart';
 import 'metric_form.dart';
 
 class MetricTypeAdd extends StatefulWidget {

App/lib/ui/blocs/administration/metrics/metric_form.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:helse/services/swagger/generated_code/swagger.swagger.dart';
-import 'package:helse/ui/theme/square_text_field.dart';
+import 'package:helse/ui/common/square_text_field.dart';
 
-import '../../../theme/type_input.dart';
+import '../../../common/type_input.dart';
 
 class MetricAddForm extends StatefulWidget {
   final TextEditingController controllerUnit;

App/lib/ui/blocs/administration/metrics/metrics_settings.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:helse/services/swagger/generated_code/swagger.swagger.dart';
-import 'package:helse/ui/theme/notification.dart';
+import 'package:helse/ui/common/notification.dart';
 
-import '../../../theme/loader.dart';
+import '../../../common/loader.dart';
 
 class MetricSettingsView extends StatefulWidget {
   const MetricSettingsView({super.key});

App/lib/ui/blocs/administration/metrics/metrics_type.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:helse/logic/d_i.dart';
-import 'package:helse/ui/theme/notification.dart';
+import 'package:helse/ui/common/notification.dart';
 
 import '../../../../services/swagger/generated_code/swagger.swagger.dart';
-import '../../../theme/loader.dart';
+import '../../../common/loader.dart';
 import 'metric_add.dart';
 
 class MetricTypeView extends StatefulWidget {

App/lib/ui/blocs/administration/settings/oauth.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:helse/logic/d_i.dart';
-import 'package:helse/ui/theme/notification.dart';
+import 'package:helse/ui/common/notification.dart';
 
 import '../../../../services/swagger/generated_code/swagger.swagger.dart';
-import '../../../theme/custom_switch.dart';
-import '../../../theme/square_text_field.dart';
-import '../../../theme/loader.dart';
+import '../../../common/custom_switch.dart';
+import '../../../common/square_text_field.dart';
+import '../../../common/loader.dart';
 
 class OauthView extends StatefulWidget {
   const OauthView({super.key});

App/lib/ui/blocs/administration/settings/proxy.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:helse/logic/d_i.dart';
-import 'package:helse/ui/theme/custom_switch.dart';
-import 'package:helse/ui/theme/notification.dart';
+import 'package:helse/ui/common/custom_switch.dart';
+import 'package:helse/ui/common/notification.dart';
 
 import '../../../../services/swagger/generated_code/swagger.swagger.dart';
-import '../../../theme/square_text_field.dart';
-import '../../../theme/loader.dart';
+import '../../../common/square_text_field.dart';
+import '../../../common/loader.dart';
 
 class ProxyView extends StatefulWidget {
   const ProxyView({super.key});

App/lib/ui/blocs/administration/users/user_add.dart

@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:helse/logic/d_i.dart';
-import 'package:helse/ui/theme/type_input.dart';
-import 'package:helse/ui/theme/square_dialog.dart';
+import 'package:helse/ui/common/type_input.dart';
+import 'package:helse/ui/common/square_dialog.dart';
 
 import '../../../../services/swagger/generated_code/swagger.swagger.dart';
-import '../../../theme/notification.dart';
+import '../../../common/notification.dart';
 import 'user_form.dart';
 
 class UserAdd extends StatefulWidget {

App/lib/ui/blocs/administration/users/user_change_role.dart

@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:helse/logic/d_i.dart';
 import 'package:helse/services/swagger/generated_code/swagger.swagger.dart';
-import 'package:helse/ui/theme/square_dialog.dart';
+import 'package:helse/ui/common/square_dialog.dart';
 
 import '../../../../services/swagger/generated_code/swagger.enums.swagger.dart';
-import '../../../theme/notification.dart';
-import '../../../theme/type_input.dart';
+import '../../../common/notification.dart';
+import '../../../common/type_input.dart';
 
 class ChangeRole extends StatefulWidget {
   final void Function() callback;

App/lib/ui/blocs/administration/users/user_form.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:helse/ui/theme/password_input.dart';
+import 'package:helse/ui/common/password_input.dart';
 
 import '../../../../services/swagger/generated_code/swagger.enums.swagger.dart';
-import '../../../theme/square_text_field.dart';
+import '../../../common/square_text_field.dart';
 
 class UserForm extends StatefulWidget {
   final UserType? type;

App/lib/ui/blocs/administration/users/users.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:helse/logic/d_i.dart';
 
 import '../../../../services/swagger/generated_code/swagger.swagger.dart';
-import '../../../theme/loader.dart';
+import '../../../common/loader.dart';
 import 'user_add.dart';
 import 'user_change_role.dart';
 

App/lib/ui/blocs/care/agenda.dart

@@ -3,7 +3,7 @@ import 'package:helse/logic/d_i.dart';
 
 import '../../../services/swagger/generated_code/swagger.swagger.dart';
 import '../events/events_graph.dart';
-import '../../theme/loader.dart';
+import '../../common/loader.dart';
 
 class Agenda extends StatefulWidget {
   final DateTimeRange date;

App/lib/ui/blocs/care/patient_add.dart

@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:helse/logic/d_i.dart';
-import 'package:helse/ui/theme/notification.dart';
-import 'package:helse/ui/theme/square_dialog.dart';
+import 'package:helse/ui/common/notification.dart';
+import 'package:helse/ui/common/square_dialog.dart';
 
 import '../../../logic/event.dart';
 import '../../../services/swagger/generated_code/swagger.swagger.dart';
 import '../administration/users/user_form.dart';
-import '../../theme/loader.dart';
+import '../../common/loader.dart';
 
 class PatientAdd extends StatefulWidget {
   final void Function() callback;

App/lib/ui/blocs/care/patient_dashboard.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import '../../../helpers/date.dart';
 import '../../../services/swagger/generated_code/swagger.swagger.dart';
 import '../../dashboard.dart';
-import '../common/date_range_input.dart';
+import '../../common/date_range_input.dart';
 
 class PatientDashboard extends StatefulWidget {
   final Person person;

App/lib/ui/blocs/care/patients.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:helse/logic/d_i.dart';
 
 import '../../../services/swagger/generated_code/swagger.swagger.dart';
-import '../../theme/loader.dart';
+import '../../common/loader.dart';
 import 'patient_add.dart';
 import 'patient_dashboard.dart';
 

App/lib/ui/blocs/events/events_add.dart

@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:helse/logic/d_i.dart';
-import 'package:helse/ui/theme/notification.dart';
-import 'package:helse/ui/theme/square_dialog.dart';
+import 'package:helse/ui/common/notification.dart';
+import 'package:helse/ui/common/square_dialog.dart';
 
 import '../../../logic/event.dart';
 import '../../../services/swagger/generated_code/swagger.swagger.dart';
-import '../common/date_input.dart';
-import '../common/text_input.dart';
-import '../../theme/loader.dart';
+import '../../common/date_input.dart';
+import '../../common/text_input.dart';
+import '../../common/loader.dart';
 
 class EventAdd extends StatefulWidget {
   final void Function() callback;

App/lib/ui/blocs/events/events_grid.dart

@@ -1,13 +1,13 @@
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:helse/ui/theme/loader.dart';
+import 'package:helse/ui/common/loader.dart';
 
 import '../../../logic/d_i.dart';
 import '../../../logic/settings/ordered_item.dart';
 import '../../../logic/settings/settings_logic.dart';
 import '../../../services/swagger/generated_code/swagger.swagger.dart';
-import '../../theme/notification.dart';
+import '../../common/notification.dart';
 import 'events_widget.dart';
 
 class EventsGrid extends StatefulWidget {

App/lib/ui/blocs/events/events_widget.dart

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:helse/logic/d_i.dart';
 
 import '../../../services/swagger/generated_code/swagger.swagger.dart';
-import '../../theme/loader.dart';
-import '../../theme/notification.dart';
+import '../../common/loader.dart';
+import '../../common/notification.dart';
 import 'events_add.dart';
 import 'events_graph.dart';
 

App/lib/ui/blocs/imports/file_import.dart

@@ -1,13 +1,13 @@
 import 'package:file_selector/file_selector.dart';
 import 'package:flutter/material.dart';
 import 'package:helse/logic/d_i.dart';
-import 'package:helse/ui/theme/square_dialog.dart';
+import 'package:helse/ui/common/square_dialog.dart';
 
 import '../../../logic/event.dart';
 import '../../../services/swagger/generated_code/swagger.swagger.dart';
-import '../common/file_input.dart';
-import '../../theme/loader.dart';
-import '../../theme/notification.dart';
+import '../../common/file_input.dart';
+import '../../common/loader.dart';
+import '../../common/notification.dart';
 
 class FileImport extends StatefulWidget {
   const FileImport({super.key});