Moving existing Floor presistence code into it's own directory, prepa…

…ring for Isar #269
TrackMyIndoorWorkout · Oct 31, 2022 · 6fdbb52 · 6fdbb52
1 parent 1123fee
commit 6fdbb52
Show file tree

Hide file tree

Showing 104 changed files with 195 additions and 152 deletions.
diff --git a/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java
@@ -55,6 +55,11 @@ public static void registerWith(@NonNull FlutterEngine flutterEngine) {
     } catch(Exception e) {
       Log.e(TAG, "Error registering plugin integration_test, dev.flutter.plugins.integration_test.IntegrationTestPlugin", e);
     }
+    try {
+      flutterEngine.getPlugins().add(new dev.isar.isar_flutter_libs.IsarFlutterLibsPlugin());
+    } catch(Exception e) {
+      Log.e(TAG, "Error registering plugin isar_flutter_libs, dev.isar.isar_flutter_libs.IsarFlutterLibsPlugin", e);
+    }
     try {
       flutterEngine.getPlugins().add(new dev.fluttercommunity.plus.packageinfo.PackageInfoPlugin());
     } catch(Exception e) {

diff --git a/lib/devices/bluetooth_device_ex.dart b/lib/devices/bluetooth_device_ex.dart
@@ -1,7 +1,7 @@
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:get/get.dart';
 import 'package:tuple/tuple.dart';
-import '../persistence/database.dart';
+import '../persistence/floor/database.dart';
 import '../utils/guid_ex.dart';
 
 extension BluetoothDeviceEx on BluetoothDevice {

diff --git a/lib/devices/device_descriptors/concept2_rower.dart b/lib/devices/device_descriptors/concept2_rower.dart
@@ -3,7 +3,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 
 import '../../export/fit/fit_manufacturer.dart';
-import '../../persistence/models/record.dart';
+import '../../persistence/floor/models/record.dart';
 import '../../preferences/log_level.dart';
 import '../../utils/constants.dart';
 import '../../utils/guid_ex.dart';

diff --git a/lib/devices/device_descriptors/cross_trainer_device_descriptor.dart b/lib/devices/device_descriptors/cross_trainer_device_descriptor.dart
@@ -1,4 +1,4 @@
-import '../../persistence/models/record.dart';
+import '../../persistence/floor/models/record.dart';
 import '../../utils/constants.dart';
 import '../gatt/ftms.dart';
 import 'fitness_machine_descriptor.dart';

diff --git a/lib/devices/device_descriptors/cycling_sensor_descriptor.dart b/lib/devices/device_descriptors/cycling_sensor_descriptor.dart
@@ -1,7 +1,7 @@
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
-import '../../persistence/models/record.dart';
+import '../../persistence/floor/models/record.dart';
 import '../../preferences/log_level.dart';
 import '../../utils/constants.dart';
 import '../../utils/guid_ex.dart';

diff --git a/lib/devices/device_descriptors/data_handler.dart b/lib/devices/device_descriptors/data_handler.dart
@@ -1,4 +1,4 @@
-import '../../persistence/models/record.dart';
+import '../../persistence/floor/models/record.dart';
 import '../../utils/constants.dart';
 import '../metric_descriptors/metric_descriptor.dart';
 

diff --git a/lib/devices/device_descriptors/fixed_layout_device_descriptor.dart b/lib/devices/device_descriptors/fixed_layout_device_descriptor.dart
@@ -1,4 +1,4 @@
-import '../../persistence/models/record.dart';
+import '../../persistence/floor/models/record.dart';
 import 'device_descriptor.dart';
 
 abstract class FixedLayoutDeviceDescriptor extends DeviceDescriptor {

diff --git a/lib/devices/device_descriptors/indoor_bike_device_descriptor.dart b/lib/devices/device_descriptors/indoor_bike_device_descriptor.dart
@@ -1,4 +1,4 @@
-import '../../persistence/models/record.dart';
+import '../../persistence/floor/models/record.dart';
 import '../../utils/constants.dart';
 import '../gatt/ftms.dart';
 import 'fitness_machine_descriptor.dart';

diff --git a/lib/devices/device_descriptors/rower_device_descriptor.dart b/lib/devices/device_descriptors/rower_device_descriptor.dart
@@ -3,7 +3,7 @@ import 'dart:collection';
 import 'package:get/get.dart';
 import 'package:pref/pref.dart';
 
-import '../../persistence/models/record.dart';
+import '../../persistence/floor/models/record.dart';
 import '../../preferences/stroke_rate_smoothing.dart';
 import '../../utils/constants.dart';
 import '../gatt/ftms.dart';

diff --git a/lib/devices/device_descriptors/schwinn_ac_performance_plus.dart b/lib/devices/device_descriptors/schwinn_ac_performance_plus.dart
@@ -5,7 +5,7 @@ import 'package:pref/pref.dart';
 
 import '../../export/fit/fit_manufacturer.dart';
 import '../../preferences/log_level.dart';
-import '../../persistence/models/record.dart';
+import '../../persistence/floor/models/record.dart';
 import '../../utils/constants.dart';
 import '../../utils/logging.dart';
 import '../device_fourcc.dart';

diff --git a/lib/devices/device_descriptors/schwinn_x70.dart b/lib/devices/device_descriptors/schwinn_x70.dart
@@ -7,7 +7,7 @@ import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 
 import '../../export/fit/fit_manufacturer.dart';
 import '../../preferences/log_level.dart';
-import '../../persistence/models/record.dart';
+import '../../persistence/floor/models/record.dart';
 import '../../utils/constants.dart';
 import '../../utils/guid_ex.dart';
 import '../../utils/logging.dart';

diff --git a/lib/devices/device_descriptors/treadmill_device_descriptor.dart b/lib/devices/device_descriptors/treadmill_device_descriptor.dart
@@ -1,7 +1,7 @@
 import 'package:collection/collection.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 
-import '../../persistence/models/record.dart';
+import '../../persistence/floor/models/record.dart';
 import '../../utils/constants.dart';
 import '../../utils/guid_ex.dart';
 import '../gadgets/complex_sensor.dart';

diff --git a/lib/devices/gadgets/c2_additional_status1.dart b/lib/devices/gadgets/c2_additional_status1.dart
@@ -1,4 +1,4 @@
-import '../../persistence/models/record.dart';
+import '../../persistence/floor/models/record.dart';
 import '../../utils/constants.dart';
 import '../device_descriptors/device_descriptor.dart';
 import '../gatt/concept2.dart';

diff --git a/lib/devices/gadgets/c2_additional_status2.dart b/lib/devices/gadgets/c2_additional_status2.dart
@@ -1,4 +1,4 @@
-import '../../persistence/models/record.dart';
+import '../../persistence/floor/models/record.dart';
 import '../../utils/constants.dart';
 import '../gatt/concept2.dart';
 import '../metric_descriptors/metric_descriptor.dart';

diff --git a/lib/devices/gadgets/c2_additional_stroke_data.dart b/lib/devices/gadgets/c2_additional_stroke_data.dart
@@ -1,4 +1,4 @@
-import '../../persistence/models/record.dart';
+import '../../persistence/floor/models/record.dart';
 import '../../utils/constants.dart';
 import '../gatt/concept2.dart';
 import '../metric_descriptors/metric_descriptor.dart';

diff --git a/lib/devices/gadgets/complex_sensor.dart b/lib/devices/gadgets/complex_sensor.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:rxdart/rxdart.dart';
-import '../../persistence/models/record.dart';
+import '../../persistence/floor/models/record.dart';
 import '../../utils/constants.dart';
 import '../../utils/delays.dart';
 import 'sensor_base.dart';

diff --git a/lib/devices/gadgets/cycling_power_meter_sensor.dart b/lib/devices/gadgets/cycling_power_meter_sensor.dart
@@ -1,6 +1,6 @@
 import 'dart:math';
 
-import '../../persistence/models/record.dart';
+import '../../persistence/floor/models/record.dart';
 import '../../utils/constants.dart';
 import '../gatt/power_meter.dart';
 import '../metric_descriptors/long_metric_descriptor.dart';

diff --git a/lib/devices/gadgets/cycling_speed_and_cadence_sensor.dart b/lib/devices/gadgets/cycling_speed_and_cadence_sensor.dart
@@ -1,6 +1,6 @@
 import 'dart:math';
 
-import '../../persistence/models/record.dart';
+import '../../persistence/floor/models/record.dart';
 import '../../utils/constants.dart';
 import '../gatt/csc.dart';
 import '../metric_descriptors/long_metric_descriptor.dart';

diff --git a/lib/devices/gadgets/fitness_equipment.dart b/lib/devices/gadgets/fitness_equipment.dart
@@ -13,14 +13,14 @@ import '../../preferences/athlete_gender.dart';
 import '../../preferences/athlete_vo2max.dart';
 import '../../preferences/block_signal_start_stop.dart';
 import '../../preferences/cadence_data_gap_workaround.dart';
-import '../../persistence/database.dart';
+import '../../persistence/floor/database.dart';
 import '../../preferences/extend_tuning.dart';
 import '../../preferences/enable_asserts.dart';
 import '../../preferences/heart_rate_gap_workaround.dart';
 import '../../preferences/heart_rate_limiting.dart';
 import '../../preferences/log_level.dart';
-import '../../persistence/models/activity.dart';
-import '../../persistence/models/record.dart';
+import '../../persistence/floor/models/activity.dart';
+import '../../persistence/floor/models/record.dart';
 import '../../preferences/use_heart_rate_based_calorie_counting.dart';
 import '../../preferences/use_hr_monitor_reported_calories.dart';
 import '../../utils/constants.dart';

diff --git a/lib/devices/gadgets/heart_rate_monitor.dart b/lib/devices/gadgets/heart_rate_monitor.dart
@@ -1,4 +1,4 @@
-import '../../persistence/models/record.dart';
+import '../../persistence/floor/models/record.dart';
 import '../../utils/constants.dart';
 import '../gatt/hrm.dart';
 import '../metric_descriptors/byte_metric_descriptor.dart';

diff --git a/lib/devices/gadgets/running_speed_and_cadence_sensor.dart b/lib/devices/gadgets/running_speed_and_cadence_sensor.dart
@@ -1,4 +1,4 @@
-import '../../persistence/models/record.dart';
+import '../../persistence/floor/models/record.dart';
 import '../../utils/constants.dart';
 import '../device_descriptors/device_descriptor.dart';
 import '../gatt/rsc.dart';

diff --git a/lib/devices/gadgets/schwinn_x70_hr_sensor.dart b/lib/devices/gadgets/schwinn_x70_hr_sensor.dart
@@ -1,4 +1,4 @@
-import '../../persistence/models/record.dart';
+import '../../persistence/floor/models/record.dart';
 import '../../utils/constants.dart';
 import '../gatt/schwinn_x70.dart';
 import 'complex_sensor.dart';

diff --git a/lib/export/activity_export.dart b/lib/export/activity_export.dart
@@ -6,8 +6,8 @@ import 'package:intl/intl.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:pref/pref.dart';
 import '../devices/device_descriptors/device_descriptor.dart';
-import '../persistence/models/activity.dart';
-import '../persistence/models/record.dart';
+import '../persistence/floor/models/activity.dart';
+import '../persistence/floor/models/record.dart';
 import '../preferences/cadence_data_gap_workaround.dart';
 import '../preferences/heart_rate_gap_workaround.dart';
 import '../preferences/heart_rate_limiting.dart';

diff --git a/lib/export/export_model.dart b/lib/export/export_model.dart
@@ -1,6 +1,6 @@
 import '../devices/device_descriptors/device_descriptor.dart';
 import '../export/export_target.dart';
-import '../persistence/models/activity.dart';
+import '../persistence/floor/models/activity.dart';
 import '../utils/constants.dart';
 import '../utils/statistics_accumulator.dart';
 import 'export_record.dart';

diff --git a/lib/export/export_record.dart b/lib/export/export_record.dart
@@ -1,5 +1,5 @@
-import '../persistence/models/activity.dart';
-import '../persistence/models/record.dart';
+import '../persistence/floor/models/activity.dart';
+import '../persistence/floor/models/record.dart';
 
 class ExportRecord {
   Record record;

diff --git a/lib/import/csv_importer.dart b/lib/import/csv_importer.dart
@@ -6,9 +6,9 @@ import '../devices/device_descriptors/device_descriptor.dart';
 import '../devices/device_descriptors/schwinn_ac_performance_plus.dart';
 import '../devices/device_fourcc.dart';
 import '../devices/device_map.dart';
-import '../persistence/models/activity.dart';
-import '../persistence/models/record.dart';
-import '../persistence/database.dart';
+import '../persistence/floor/models/activity.dart';
+import '../persistence/floor/models/record.dart';
+import '../persistence/floor/database.dart';
 import '../preferences/athlete_age.dart';
 import '../preferences/athlete_body_weight.dart';
 import '../preferences/athlete_gender.dart';

diff --git a/lib/persistence/dao/activity_dao.dart → lib/persistence/floor/dao/activity_dao.dart b/lib/persistence/dao/activity_dao.dart → lib/persistence/floor/dao/activity_dao.dart
diff --git a/lib/persistence/dao/calorie_tune_dao.dart → ...rsistence/floor/dao/calorie_tune_dao.dart b/lib/persistence/dao/calorie_tune_dao.dart → ...rsistence/floor/dao/calorie_tune_dao.dart
diff --git a/lib/persistence/dao/device_usage_dao.dart → ...rsistence/floor/dao/device_usage_dao.dart b/lib/persistence/dao/device_usage_dao.dart → ...rsistence/floor/dao/device_usage_dao.dart
diff --git a/lib/persistence/dao/power_tune_dao.dart → ...persistence/floor/dao/power_tune_dao.dart b/lib/persistence/dao/power_tune_dao.dart → ...persistence/floor/dao/power_tune_dao.dart
diff --git a/lib/persistence/dao/record_dao.dart → lib/persistence/floor/dao/record_dao.dart b/lib/persistence/dao/record_dao.dart → lib/persistence/floor/dao/record_dao.dart
diff --git a/lib/persistence/dao/workout_summary_dao.dart → ...stence/floor/dao/workout_summary_dao.dart b/lib/persistence/dao/workout_summary_dao.dart → ...stence/floor/dao/workout_summary_dao.dart
diff --git a/lib/persistence/database.dart → lib/persistence/floor/database.dart b/lib/persistence/database.dart → lib/persistence/floor/database.dart
@@ -5,11 +5,11 @@ import 'package:get/get.dart';
 import 'package:pref/pref.dart';
 import 'package:sqflite/sqflite.dart' as sqflite;
 import 'package:tuple/tuple.dart';
-import '../devices/device_descriptors/device_descriptor.dart';
-import '../devices/device_fourcc.dart';
-import '../preferences/use_heart_rate_based_calorie_counting.dart';
-import '../utils/constants.dart';
-import '../utils/time_zone.dart';
+import '../../devices/device_descriptors/device_descriptor.dart';
+import '../../devices/device_fourcc.dart';
+import '../../preferences/use_heart_rate_based_calorie_counting.dart';
+import '../../utils/constants.dart';
+import '../../utils/time_zone.dart';
 import 'dao/activity_dao.dart';
 import 'dao/calorie_tune_dao.dart';
 import 'dao/device_usage_dao.dart';

diff --git a/lib/persistence/database.g.dart → lib/persistence/floor/database.g.dart b/lib/persistence/database.g.dart → lib/persistence/floor/database.g.dart
diff --git a/lib/persistence/models/activity.dart → lib/persistence/floor/models/activity.dart b/lib/persistence/models/activity.dart → lib/persistence/floor/models/activity.dart
@@ -1,12 +1,12 @@
 import 'package:floor/floor.dart';
-import '../../devices/device_descriptors/device_descriptor.dart';
-import '../../devices/device_map.dart';
-import '../../preferences/generic.dart';
-import '../../upload/constants.dart';
-import '../../upload/strava/constants.dart';
-import '../../upload/training_peaks/constants.dart';
-import '../../upload/under_armour/constants.dart';
-import '../../utils/display.dart' as display;
+import '../../../devices/device_descriptors/device_descriptor.dart';
+import '../../../devices/device_map.dart';
+import '../../../preferences/generic.dart';
+import '../../../upload/constants.dart';
+import '../../../upload/strava/constants.dart';
+import '../../../upload/training_peaks/constants.dart';
+import '../../../upload/under_armour/constants.dart';
+import '../../../utils/display.dart' as display;
 import 'workout_summary.dart';
 
 const activitiesTableName = 'activities';

diff --git a/lib/persistence/models/calorie_tune.dart → ...ersistence/floor/models/calorie_tune.dart b/lib/persistence/models/calorie_tune.dart → ...ersistence/floor/models/calorie_tune.dart
diff --git a/lib/persistence/models/device_usage.dart → ...ersistence/floor/models/device_usage.dart b/lib/persistence/models/device_usage.dart → ...ersistence/floor/models/device_usage.dart
diff --git a/lib/persistence/models/power_tune.dart → lib/persistence/floor/models/power_tune.dart b/lib/persistence/models/power_tune.dart → lib/persistence/floor/models/power_tune.dart
diff --git a/lib/persistence/models/record.dart → lib/persistence/floor/models/record.dart b/lib/persistence/models/record.dart → lib/persistence/floor/models/record.dart
@@ -2,11 +2,11 @@ import 'dart:math';
 
 import 'package:floor/floor.dart';
 import 'package:flutter/foundation.dart';
-import '../../preferences/log_level.dart';
-import '../../ui/models/display_record.dart';
-import '../../utils/constants.dart';
-import '../../utils/display.dart';
-import '../../utils/logging.dart';
+import '../../../preferences/log_level.dart';
+import '../../../ui/models/display_record.dart';
+import '../../../utils/constants.dart';
+import '../../../utils/display.dart';
+import '../../../utils/logging.dart';
 import 'activity.dart';
 
 const recordsTableName = 'records';

diff --git a/lib/persistence/models/workout_summary.dart → ...istence/floor/models/workout_summary.dart b/lib/persistence/models/workout_summary.dart → ...istence/floor/models/workout_summary.dart
@@ -1,10 +1,10 @@
 import 'dart:math';
 
 import 'package:floor/floor.dart';
-import '../../devices/device_descriptors/device_descriptor.dart';
-import '../../preferences/generic.dart';
-import '../../utils/constants.dart';
-import '../../utils/display.dart';
+import '../../../devices/device_descriptors/device_descriptor.dart';
+import '../../../preferences/generic.dart';
+import '../../../utils/constants.dart';
+import '../../../utils/display.dart';
 
 const workoutSummariesTableName = 'workout_summary';
 const pacerIdentifier = "Pacer";

diff --git a/lib/ui/activities.dart b/lib/ui/activities.dart
@@ -16,8 +16,8 @@ import '../export/export_target.dart';
 import '../export/fit/fit_export.dart';
 import '../export/json/json_export.dart';
 import '../export/tcx/tcx_export.dart';
-import '../persistence/models/activity.dart';
-import '../persistence/database.dart';
+import '../persistence/floor/models/activity.dart';
+import '../persistence/floor/database.dart';
 import '../preferences/calculate_gps.dart';
 import '../preferences/distance_resolution.dart';
 import '../preferences/leaderboard_and_rank.dart';

diff --git a/lib/ui/calorie_tunes.dart b/lib/ui/calorie_tunes.dart
@@ -4,8 +4,8 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:intl/intl.dart';
 import 'package:listview_utils/listview_utils.dart';
-import '../persistence/models/calorie_tune.dart';
-import '../persistence/database.dart';
+import '../persistence/floor/models/calorie_tune.dart';
+import '../persistence/floor/database.dart';
 import '../utils/theme_manager.dart';
 import 'parts/calorie_factor_tune.dart';
 

diff --git a/lib/ui/details/activity_details.dart b/lib/ui/details/activity_details.dart
@@ -9,12 +9,12 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:listview_utils/listview_utils.dart';
 import 'package:pref/pref.dart';
-import '../../persistence/database.dart';
+import '../../persistence/floor/database.dart';
 import '../../preferences/distance_resolution.dart';
 import '../../preferences/measurement_font_size_adjust.dart';
 import '../../preferences/metric_spec.dart';
-import '../../persistence/models/activity.dart';
-import '../../persistence/models/record.dart';
+import '../../persistence/floor/models/activity.dart';
+import '../../persistence/floor/models/record.dart';
 import '../../preferences/palette_spec.dart';
 import '../../preferences/unit_system.dart';
 import '../../utils/constants.dart';

diff --git a/lib/ui/device_usages.dart b/lib/ui/device_usages.dart
@@ -4,8 +4,8 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:intl/intl.dart';
 import 'package:listview_utils/listview_utils.dart';
-import '../persistence/models/device_usage.dart';
-import '../persistence/database.dart';
+import '../persistence/floor/models/device_usage.dart';
+import '../persistence/floor/database.dart';
 import '../utils/constants.dart';
 import '../utils/display.dart';
 import '../utils/theme_manager.dart';

diff --git a/lib/ui/find_devices.dart b/lib/ui/find_devices.dart
@@ -23,12 +23,12 @@ import '../devices/gatt/precor.dart';
 import '../devices/gatt/schwinn_x70.dart';
 import '../devices/gatt_maps.dart';
 import '../preferences/auto_connect.dart';
-import '../persistence/database.dart';
+import '../persistence/floor/database.dart';
 import '../preferences/device_filtering.dart';
 import '../preferences/instant_scan.dart';
 import '../preferences/last_equipment_id.dart';
 import '../preferences/log_level.dart';
-import '../persistence/models/device_usage.dart';
+import '../persistence/floor/models/device_usage.dart';
 import '../preferences/multi_sport_device_support.dart';
 import '../preferences/scan_duration.dart';
 import '../preferences/sport_spec.dart';
@@ -104,6 +104,7 @@ class FindDevicesState extends State<FindDevicesScreen> {
   }
 
   Future<void> _openDatabase() async {
+    // TODO
     final database = await $FloorAppDatabase.databaseBuilder('app_database.db').addMigrations([
       migration1to2,
       migration2to3,

diff --git a/lib/ui/import_form.dart b/lib/ui/import_form.dart
@@ -8,7 +8,7 @@ import 'package:intl/intl.dart';
 import 'package:loading_overlay/loading_overlay.dart';
 import 'package:pref/pref.dart';
 import '../import/csv_importer.dart';
-import '../persistence/database.dart';
+import '../persistence/floor/database.dart';
 import '../preferences/leaderboard_and_rank.dart';
 
 typedef SetProgress = void Function(double progress);

diff --git a/lib/ui/leaderboards/device_leaderboard.dart b/lib/ui/leaderboards/device_leaderboard.dart
@@ -6,8 +6,8 @@ import 'package:intl/intl.dart';
 import 'package:listview_utils/listview_utils.dart';
 import 'package:pref/pref.dart';
 import 'package:tuple/tuple.dart';
-import '../../persistence/database.dart';
-import '../../persistence/models/workout_summary.dart';
+import '../../persistence/floor/database.dart';
+import '../../persistence/floor/models/workout_summary.dart';
 import '../../preferences/distance_resolution.dart';
 import '../../preferences/generic.dart';
 import '../../preferences/speed_spec.dart';

diff --git a/lib/ui/leaderboards/leaderboard_type_picker.dart b/lib/ui/leaderboards/leaderboard_type_picker.dart
@@ -1,7 +1,7 @@
 import 'package:assorted_layout_widgets/assorted_layout_widgets.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import '../../persistence/database.dart';
+import '../../persistence/floor/database.dart';
 import '../../utils/constants.dart';
 import '../../utils/theme_manager.dart';
 import 'device_leaderboard.dart';