Reorganised the solution to reduce unnecessary fragmentation

src/lib/bootstrap.dart

@@ -0,0 +1,59 @@
+import 'package:flutter/material.dart';
+import 'package:get_it/get_it.dart';
+import 'package:logger/logger.dart';
+import 'package:fitness_machine/hardware/services/fitness_machine_command_dispatcher.dart';
+import 'package:fitness_machine/hardware/services/fitness_machine_provider.dart';
+import 'package:fitness_machine/hardware/services/fitness_machine_query_dispatcher.dart';
+import 'package:fitness_machine/hardware/widgets/pages/device_selection_screen.dart';
+import 'package:fitness_machine/layouts/main_layout.dart';
+import 'package:fitness_machine/layouts/page_definition.dart';
+import 'package:fitness_machine/layouts/page_definition_provider.dart';
+import 'package:fitness_machine/main.dart';
+import 'package:fitness_machine/treadmill_control/widgets/pages/control_page.dart';
+import 'package:fitness_machine/workout_management/widgets/pages/workout_history_page.dart';
+
+class Bootstrap {
+  static MyApp bootstrap() {
+    _setupLogging();
+    _registerPages();
+    _registerLayouts();
+    _registerHardware();
+    _registerApp();
+
+    return GetIt.I<MyApp>();
+  }
+
+  static void _setupLogging() {
+    GetIt.I.registerSingleton(Logger());
+  }
+
+  static void _registerLayouts() {
+    GetIt.I.registerLazySingleton(() => MainLayout(GetIt.I<PageDefinitionProvider>()));
+  }
+
+  static void _registerPages() {
+    GetIt.I.registerSingleton<ControlPage>(const ControlPage());
+    GetIt.I.registerSingleton<WorkoutHistoryPage>(const WorkoutHistoryPage());
+
+    GetIt.I.registerLazySingleton(() => PageDefinitionProvider({
+          PageDefinition(GetIt.I<ControlPage>(), "Control", const Icon(Icons.bluetooth), const Icon(Icons.bluetooth_outlined)),
+          PageDefinition(GetIt.I<WorkoutHistoryPage>(), "Workout History", const Icon(Icons.history), const Icon(Icons.history_outlined))
+        }));
+  }
+
+  static void _registerApp() {
+    GetIt.I.registerLazySingleton<MyApp>(() {
+      return MyApp(GetIt.I<MainLayout>());
+    });
+  }
+
+  static void _registerHardware() {
+    // Use SafeDevice if we need to inject fakes for simulator
+    WidgetsFlutterBinding.ensureInitialized();
+
+    GetIt.I.registerSingleton<FitnessMachineProvider>(FitnessMachineProvider());
+    GetIt.I.registerSingleton<FitnessMachineCommandDispatcher>((FitnessMachineCommandDispatcher()));
+    GetIt.I.registerSingleton<FitnessMachineQueryDispatcher>((FitnessMachineQueryDispatcher()));
+    GetIt.I.registerSingleton<DeviceSelectionScreen>(const DeviceSelectionScreen());
+  }
+}

src/lib/modules/hardware/bt/constants/known_commands.dart → src/lib/hardware/ble/constants/known_commands.dart

@@ -1,9 +1,9 @@
 import 'dart:typed_data';
-import 'package:fitness_machine/common/utility/number_extensions.dart';
-import 'package:fitness_machine/modules/hardware/bt/constants/known_services.dart';
-import 'package:fitness_machine/modules/hardware/bt/models/bt_command.dart';
-import 'package:fitness_machine/modules/hardware/bt/constants/known_characteristics.dart';
-import 'package:fitness_machine/modules/hardware/bt/constants/known_opcodes.dart';
+import 'package:fitness_machine/common/lib_extensions/number_extensions.dart';
+import 'package:fitness_machine/hardware/ble/constants/known_services.dart';
+import 'package:fitness_machine/hardware/ble/models/bt_command.dart';
+import 'package:fitness_machine/hardware/ble/constants/known_characteristics.dart';
+import 'package:fitness_machine/hardware/ble/constants/known_opcodes.dart';
 
 // See FTMS 4.16
 class KnownCommands {

src/lib/modules/hardware/services/fitness_machine.dart → src/lib/hardware/services/fitness_machine.dart

@@ -1,8 +1,8 @@
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
-import 'package:fitness_machine/modules/hardware/bt/constants/known_characteristics.dart';
-import 'package:fitness_machine/modules/hardware/bt/constants/known_services.dart';
-import 'package:fitness_machine/modules/hardware/bt/extensions/bluetooth_device_extensions.dart';
-import 'package:fitness_machine/modules/hardware/bt/extensions/bluetooth_service_extensions.dart';
+import 'package:fitness_machine/hardware/ble/constants/known_characteristics.dart';
+import 'package:fitness_machine/hardware/ble/constants/known_services.dart';
+import 'package:fitness_machine/hardware/ble/extensions/bluetooth_device_extensions.dart';
+import 'package:fitness_machine/hardware/ble/extensions/bluetooth_service_extensions.dart';
 
 class FitnessMachine {
   final BluetoothService fitnessMachineService;

src/lib/modules/hardware/services/fitness_machine_command_dispatcher.dart → src/lib/hardware/services/fitness_machine_command_dispatcher.dart

@@ -1,7 +1,8 @@
 import 'package:get_it/get_it.dart';
-import 'package:fitness_machine/modules/hardware/bt/constants/known_commands.dart';
-import 'package:fitness_machine/modules/hardware/services/fitness_machine.dart';
-import 'package:fitness_machine/modules/hardware/services/fitness_machine_provider.dart';
+
+import 'package:fitness_machine/hardware/ble/constants/known_commands.dart';
+import 'package:fitness_machine/hardware/services/fitness_machine.dart';
+import 'package:fitness_machine/hardware/services/fitness_machine_provider.dart';
 
 class FitnessMachineCommandDispatcher {
   final Stream<FitnessMachine?> currentMachineStream;

src/lib/modules/hardware/services/fitness_machine_provider.dart → src/lib/hardware/services/fitness_machine_provider.dart

@@ -3,7 +3,7 @@ import 'dart:async';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:get_it/get_it.dart';
 import 'package:logger/logger.dart';
-import 'package:fitness_machine/modules/hardware/services/fitness_machine.dart';
+import 'package:fitness_machine/hardware/services/fitness_machine.dart';
 
 class FitnessMachineProvider {
 

src/lib/modules/hardware/services/fitness_machine_query_dispatcher.dart → src/lib/hardware/services/fitness_machine_query_dispatcher.dart

@@ -1,9 +1,10 @@
 import 'dart:async';
 import 'package:get_it/get_it.dart';
-import 'package:fitness_machine/modules/hardware/bt/models/treadmill_data.dart';
-import 'package:fitness_machine/modules/hardware/bt/models/supported_speed_range.dart';
-import 'package:fitness_machine/modules/hardware/services/fitness_machine.dart';
-import 'package:fitness_machine/modules/hardware/services/fitness_machine_provider.dart';
+import 'package:fitness_machine/hardware/ble/models/treadmill_data.dart';
+import 'package:fitness_machine/hardware/ble/models/supported_speed_range.dart';
+import 'package:fitness_machine/hardware/services/fitness_machine.dart';
+import 'package:fitness_machine/hardware/services/fitness_machine_provider.dart';
+
 
 class FitnessMachineQueryDispatcher {
   bool get isConnected => _currentMachine != null;

src/lib/modules/hardware/widgets/barriers/ensure_bluetooth_enabled_wrapper.dart → src/lib/hardware/widgets/barriers/ensure_bluetooth_enabled_wrapper.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
-import 'package:fitness_machine/modules/hardware/widgets/cubits/bluetooth_enablement_cubit.dart';
+import 'package:fitness_machine/hardware/widgets/cubits/bluetooth_enablement_cubit.dart';
 
 class EnsureBluetoothEnabledWrapper extends StatelessWidget {
   final Widget onEnabled;

src/lib/modules/hardware/widgets/barriers/ensure_device_connected_barrier.dart → src/lib/hardware/widgets/barriers/ensure_device_connected_barrier.dart

@@ -3,8 +3,9 @@ import 'package:flutter/scheduler.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:get_it/get_it.dart';
 import 'package:logger/logger.dart';
-import 'package:fitness_machine/modules/hardware/widgets/cubits/device_connected_cubit.dart';
-import 'package:fitness_machine/modules/hardware/widgets/pages/device_selection_screen.dart';
+import 'package:fitness_machine/hardware/widgets/cubits/device_connected_cubit.dart';
+import 'package:fitness_machine/hardware/widgets/pages/device_selection_screen.dart';
+
 
 class EnsureDeviceConnectedBarrier extends StatelessWidget {
   final Widget onEnabled;

src/lib/modules/hardware/widgets/controls/bluetooth_scanning_indicator.dart → src/lib/hardware/widgets/controls/bluetooth_scanning_indicator.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:fitness_machine/modules/hardware/widgets/cubits/bluetooth_scanning_cubit.dart';
+import 'package:fitness_machine/hardware/widgets/cubits/bluetooth_scanning_cubit.dart';
 
 class BluetoothScanningIndicator extends StatelessWidget {
   const BluetoothScanningIndicator({super.key});

src/lib/modules/hardware/widgets/controls/fitness_machine_list.dart → src/lib/hardware/widgets/controls/fitness_machine_list.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:fitness_machine/modules/hardware/widgets/barriers/ensure_bluetooth_enabled_wrapper.dart';
-import 'package:fitness_machine/modules/hardware/widgets/cubits/fitness_machine_cubit.dart';
-import 'package:fitness_machine/modules/hardware/widgets/models/device_descriptor.dart';
+import 'package:fitness_machine/hardware/widgets/barriers/ensure_bluetooth_enabled_wrapper.dart';
+import 'package:fitness_machine/hardware/widgets/cubits/fitness_machine_cubit.dart';
+import 'package:fitness_machine/hardware/widgets/models/device_descriptor.dart';
 
 class FitnessMachineList extends StatelessWidget {
   const FitnessMachineList({super.key});

src/lib/modules/hardware/widgets/cubits/device_connected_cubit.dart → src/lib/hardware/widgets/cubits/device_connected_cubit.dart

@@ -2,7 +2,8 @@ import 'dart:async';
 
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:get_it/get_it.dart';
-import 'package:fitness_machine/modules/hardware/services/fitness_machine_provider.dart';
+import 'package:fitness_machine/hardware/services/fitness_machine_provider.dart';
+
 
 class DeviceConnectedCubit extends Cubit<bool> {
   final FitnessMachineProvider _fitnessMachineProvider;

src/lib/modules/hardware/widgets/cubits/fitness_machine_cubit.dart → src/lib/hardware/widgets/cubits/fitness_machine_cubit.dart

@@ -2,9 +2,9 @@ import 'dart:async';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:get_it/get_it.dart';
-import 'package:fitness_machine/modules/hardware/bt/constants/known_services.dart';
-import 'package:fitness_machine/modules/hardware/services/fitness_machine_provider.dart';
-import 'package:fitness_machine/modules/hardware/widgets/models/device_descriptor.dart';
+import 'package:fitness_machine/hardware/ble/constants/known_services.dart';
+import 'package:fitness_machine/hardware/services/fitness_machine_provider.dart';
+import 'package:fitness_machine/hardware/widgets/models/device_descriptor.dart';
 
 class FitnessMachineDiscoveryCubit extends Cubit<List<DeviceDescriptor>> {
   final FitnessMachineProvider _fitnessMachineProvider;

src/lib/modules/hardware/widgets/pages/device_selection_screen.dart → src/lib/hardware/widgets/pages/device_selection_screen.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:fitness_machine/modules/hardware/widgets/controls/bluetooth_scanning_indicator.dart';
-import 'package:fitness_machine/modules/hardware/widgets/controls/fitness_machine_list.dart';
+import 'package:fitness_machine/hardware/widgets/controls/bluetooth_scanning_indicator.dart';
+import 'package:fitness_machine/hardware/widgets/controls/fitness_machine_list.dart';
 
 class DeviceSelectionScreen extends StatelessWidget {
   const DeviceSelectionScreen({super.key});

src/lib/common/layouts/main_layout.dart → src/lib/layouts/main_layout.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:fitness_machine/common/layouts/page_definition_provider.dart';
+import 'package:fitness_machine/layouts/page_definition_provider.dart';
 
 class MainLayout extends StatefulWidget {
   final PageDefinitionProvider _pageProvider;

src/lib/common/layouts/page_definition_provider.dart → src/lib/layouts/page_definition_provider.dart

@@ -1,4 +1,4 @@
-import 'package:fitness_machine/common/layouts/page_definition.dart';
+import 'package:fitness_machine/layouts/page_definition.dart';
 
 class PageDefinitionProvider {
   final Set<PageDefinition> _pageDefinitions;

src/lib/main.dart

@@ -1,14 +1,16 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:get_it/get_it.dart';
+import 'package:logger/logger.dart';
+import 'package:fitness_machine/bootstrap.dart';
 import 'package:wakelock_plus/wakelock_plus.dart';
-import 'package:fitness_machine/common/dependency_injection/dependency_injection.dart';
-import 'package:fitness_machine/common/layouts/main_layout.dart';
+import 'package:fitness_machine/layouts/main_layout.dart';
 
 Future<void> main() async {
-  final DependencyInjection container = await DependencyInjection.bootstrap();
-  final MyApp app = container.get<MyApp>();
+  final MyApp app = Bootstrap.bootstrap();
+  Logger logger = GetIt.I<Logger>();
   if (kDebugMode) {
-    print("Enabling wakelock in debug mode");
+    logger.i("Enabling wakelock in debug mode");
     WakelockPlus.enable();
   }
   runApp(app);

src/lib/modules/demo_ctrl/widgets/controls/speed_indicator.dart → src/lib/treadmill_control/widgets/controls/speed_indicator.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:fitness_machine/modules/demo_ctrl/models/speed_state.dart';
-import 'package:fitness_machine/modules/demo_ctrl/widgets/cubits/speed_range_and_setting_cubit.dart';
+import 'package:fitness_machine/treadmill_control/models/speed_state.dart';
+import 'package:fitness_machine/treadmill_control/widgets/cubits/speed_range_and_setting_cubit.dart';
 
 class SpeedIndicator extends StatelessWidget {
   const SpeedIndicator({super.key});

src/lib/modules/demo_ctrl/widgets/controls/treadmill_controls.dart → src/lib/treadmill_control/widgets/controls/treadmill_controls.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
-import 'package:fitness_machine/modules/hardware/services/fitness_machine_command_dispatcher.dart';
+import 'package:fitness_machine/hardware/services/fitness_machine_command_dispatcher.dart';
+
 
 class TreadmillControls extends StatelessWidget {
   final FitnessMachineCommandDispatcher _fitnessMachineCommandDispatcher;

src/lib/modules/demo_ctrl/widgets/controls/workout_status_panel.dart → src/lib/treadmill_control/widgets/controls/workout_status_panel.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:fitness_machine/modules/hardware/bt/models/treadmill_data.dart';
-import 'package:fitness_machine/modules/demo_ctrl/widgets/controls/unit_quantity_card.dart';
-import 'package:fitness_machine/modules/demo_ctrl/widgets/cubits/workout_status_cubit.dart';
+import 'package:fitness_machine/hardware/ble/models/treadmill_data.dart';
+import 'package:fitness_machine/treadmill_control/widgets/controls/unit_quantity_card.dart';
+import 'package:fitness_machine/treadmill_control/widgets/cubits/workout_status_cubit.dart';
 
 class WorkoutStatusPanel extends StatelessWidget {
   const WorkoutStatusPanel({super.key});

src/lib/modules/demo_ctrl/widgets/cubits/speed_range_and_setting_cubit.dart → src/lib/treadmill_control/widgets/cubits/speed_range_and_setting_cubit.dart

@@ -1,9 +1,9 @@
 import 'dart:async';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:get_it/get_it.dart';
-import 'package:fitness_machine/modules/demo_ctrl/models/speed_state.dart';
-import 'package:fitness_machine/modules/hardware/services/fitness_machine_command_dispatcher.dart';
-import 'package:fitness_machine/modules/hardware/services/fitness_machine_query_dispatcher.dart';
+import 'package:fitness_machine/treadmill_control/models/speed_state.dart';
+import 'package:fitness_machine/hardware/services/fitness_machine_command_dispatcher.dart';
+import 'package:fitness_machine/hardware/services/fitness_machine_query_dispatcher.dart';
 
 class SpeedRangeAndSettingCubit extends Cubit<SpeedState> {
   final FitnessMachineQueryDispatcher _fitnessMachineQueryDispatcher;

src/lib/modules/demo_ctrl/widgets/cubits/workout_status_cubit.dart → src/lib/treadmill_control/widgets/cubits/workout_status_cubit.dart

@@ -2,8 +2,8 @@ import 'dart:async';
 
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:get_it/get_it.dart';
-import 'package:fitness_machine/modules/hardware/services/fitness_machine_query_dispatcher.dart';
-import 'package:fitness_machine/modules/hardware/bt/models/treadmill_data.dart';
+import 'package:fitness_machine/hardware/services/fitness_machine_query_dispatcher.dart';
+import 'package:fitness_machine/hardware/ble/models/treadmill_data.dart';
 
 class TrainingStatusCubit extends Cubit<TreadmillData> {
   final FitnessMachineQueryDispatcher _fitnessMachineQueryDispatcher;