From eaf322f1ddcb1703198a75a21739197b787cb887 Mon Sep 17 00:00:00 2001
From: uvok
Date: Wed, 30 Jul 2025 20:54:50 +0200
Subject: Push scanner selection to main
---
lib/main.dart | 5 ++++-
lib/model/device_connection_factory.dart | 6 ++++++
lib/widgets/badge_app.dart | 8 ++++----
3 files changed, 14 insertions(+), 5 deletions(-)
(limited to 'lib')
diff --git a/lib/main.dart b/lib/main.dart
index 3e6c8cd..40a7641 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -13,6 +13,8 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
+import 'package:uvok_epaper_badge/control/mock_scanner_controller.dart';
+import 'package:uvok_epaper_badge/control/scanner_controller.dart';
import 'package:uvok_epaper_badge/widgets/badge_app.dart';
import 'package:flutter/material.dart';
@@ -21,5 +23,6 @@ import 'package:logger/logger.dart';
var logger = Logger();
void main() {
- runApp(const BadgeApp());
+ final ScannerController scanner = MockScannerController();
+ runApp(BadgeApp(selectedScanner: scanner));
}
diff --git a/lib/model/device_connection_factory.dart b/lib/model/device_connection_factory.dart
index 23a186e..d73db0b 100644
--- a/lib/model/device_connection_factory.dart
+++ b/lib/model/device_connection_factory.dart
@@ -15,10 +15,16 @@
import 'package:uvok_epaper_badge/model/device.dart';
import 'package:uvok_epaper_badge/model/device_connection.dart';
+import 'package:uvok_epaper_badge/model/flutter_blue_plus_device.dart';
+import 'package:uvok_epaper_badge/model/flutter_blue_plus_device_connection.dart';
import 'package:uvok_epaper_badge/model/mock_device_connection.dart';
class DeviceConnectionFactory {
static DeviceConnection createConnection(Device device) {
+ if (device is FlutterBluePlusDevice) {
+ return FlutterBluePlusDeviceConnection(device: device);
+ }
+
// switch (device.type) {
// case DeviceType.ble:
// return BleDeviceConnection(device);
diff --git a/lib/widgets/badge_app.dart b/lib/widgets/badge_app.dart
index 68cfce9..f4d1fcd 100644
--- a/lib/widgets/badge_app.dart
+++ b/lib/widgets/badge_app.dart
@@ -13,17 +13,17 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-import 'package:uvok_epaper_badge/control/mock_scanner_controller.dart';
+import 'package:uvok_epaper_badge/control/scanner_controller.dart';
import 'package:uvok_epaper_badge/widgets/scan_page.dart';
import 'package:flutter/material.dart';
class BadgeApp extends StatelessWidget {
- const BadgeApp({super.key});
+ final ScannerController selectedScanner;
+
+ const BadgeApp({super.key, required this.selectedScanner});
@override
Widget build(BuildContext context) {
- final selectedScanner = MockScannerController();
-
return MaterialApp(
title: 'Scanner',
theme: ThemeData(
--
cgit v1.2.3