Move devices to package

12 files changed, 15 insertions, 20 deletions

diff --git a/lib/control/flutter_blue_plus_scanner_controller.dart b/lib/control/flutter_blue_plus_scanner_controller.dart
index 73c1286..13c38c6 100644
--- a/lib/control/flutter_blue_plus_scanner_controller.dart
+++ b/lib/control/flutter_blue_plus_scanner_controller.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'package:uvok_epaper_badge/control/scanner_controller_impl.dart';
-import 'package:uvok_epaper_badge/model/flutter_blue_plus_device.dart';
-import 'package:uvok_epaper_badge/model/device.dart';
+import 'package:uvok_epaper_badge/model/device/flutter_blue_plus_device.dart';
+import 'package:uvok_epaper_badge/model/device/device.dart';
 import 'package:uvok_epaper_badge/control/scanner_controller.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:logger/logger.dart';
diff --git a/lib/control/mock_scanner_controller.dart b/lib/control/mock_scanner_controller.dart
index 2822b8c..3141abc 100644
--- a/lib/control/mock_scanner_controller.dart
+++ b/lib/control/mock_scanner_controller.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 
 import 'package:uvok_epaper_badge/control/scanner_controller.dart';
 import 'package:uvok_epaper_badge/control/scanner_controller_impl.dart';
-import 'package:uvok_epaper_badge/model/mock_device.dart';
+import 'package:uvok_epaper_badge/model/device/mock_device.dart';
 
 class MockScannerController extends ScannerControllerImpl {
   static final List<MockDevice> fakedDevices = [
diff --git a/lib/control/scanner_controller.dart b/lib/control/scanner_controller.dart
index d004fd9..8936e86 100644
--- a/lib/control/scanner_controller.dart
+++ b/lib/control/scanner_controller.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:uvok_epaper_badge/model/device.dart';
+import 'package:uvok_epaper_badge/model/device/device.dart';
 
 /// Represents the scan status.
 enum ScanStatus { idle, scanning, finished, error }
diff --git a/lib/control/scanner_controller_impl.dart b/lib/control/scanner_controller_impl.dart
index 7033542..427a3e8 100644
--- a/lib/control/scanner_controller_impl.dart
+++ b/lib/control/scanner_controller_impl.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 import 'package:uvok_epaper_badge/control/scanner_controller.dart';
 import 'package:meta/meta.dart';
-import 'package:uvok_epaper_badge/model/device.dart';
+import 'package:uvok_epaper_badge/model/device/device.dart';
 
 /// Helper class which provides the setStatus method.
 abstract class ScannerControllerImpl extends ScannerController {
diff --git a/lib/model/device.dart b/lib/model/device/device.dart
index 98445fa..98445fa 100644
--- a/lib/model/device.dart
+++ b/lib/model/device/device.dart
diff --git a/lib/model/flutter_blue_plus_device.dart b/lib/model/device/flutter_blue_plus_device.dart
index 101c489..e56223b 100644
--- a/lib/model/flutter_blue_plus_device.dart
+++ b/lib/model/device/flutter_blue_plus_device.dart
@@ -1,10 +1,12 @@
-import 'package:uvok_epaper_badge/model/device.dart';
+import 'package:uvok_epaper_badge/model/device/device.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:uvok_epaper_badge/utility.dart';
 
 class FlutterBluePlusDevice implements Device {
   final ScanResult scanResult;
 
+  FlutterBluePlusDevice.fromScan(this.scanResult);
+
   @override
   String? get address => scanResult.device.remoteId.str;
 
@@ -17,11 +19,4 @@ class FlutterBluePlusDevice implements Device {
 
   @override
   int? get rssi => scanResult.rssi;
-
-  FlutterBluePlusDevice._(this.scanResult);
-
-  static FlutterBluePlusDevice fromScan(ScanResult scanResult) {
-    var bleDevice = FlutterBluePlusDevice._(scanResult);
-    return bleDevice;
-  }
 }
diff --git a/lib/model/mock_device.dart b/lib/model/device/mock_device.dart
index 64558c1..78770e1 100644
--- a/lib/model/mock_device.dart
+++ b/lib/model/device/mock_device.dart
@@ -1,4 +1,4 @@
-import 'package:uvok_epaper_badge/model/device.dart';
+import 'package:uvok_epaper_badge/model/device/device.dart';
 
 class MockDevice implements Device {
   final int _id;
diff --git a/lib/model/device_connection_factory.dart b/lib/model/device_connection_factory.dart
index d73db0b..ef845fc 100644
--- a/lib/model/device_connection_factory.dart
+++ b/lib/model/device_connection_factory.dart
@@ -13,9 +13,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-import 'package:uvok_epaper_badge/model/device.dart';
+import 'package:uvok_epaper_badge/model/device/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/device/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';
 
diff --git a/lib/model/flutter_blue_plus_device_connection.dart b/lib/model/flutter_blue_plus_device_connection.dart
index 2505af5..e5c34aa 100644
--- a/lib/model/flutter_blue_plus_device_connection.dart
+++ b/lib/model/flutter_blue_plus_device_connection.dart
@@ -19,7 +19,7 @@ import 'package:flutter_blue_plus/flutter_blue_plus.dart';
 import 'package:logger/logger.dart';
 import 'package:uvok_epaper_badge/first_where_ext.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/device/flutter_blue_plus_device.dart';
 
 var logger = Logger();
 
diff --git a/lib/widgets/device_details.dart b/lib/widgets/device_details.dart
index f3754d3..81ffb1c 100644
--- a/lib/widgets/device_details.dart
+++ b/lib/widgets/device_details.dart
@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-import 'package:uvok_epaper_badge/model/device.dart';
+import 'package:uvok_epaper_badge/model/device/device.dart';
 import 'package:flutter/material.dart';
 import 'package:logger/logger.dart';
 import 'package:uvok_epaper_badge/model/device_connection.dart';
diff --git a/lib/widgets/device_scan_select.dart b/lib/widgets/device_scan_select.dart
index c89d3cf..cd65eac 100644
--- a/lib/widgets/device_scan_select.dart
+++ b/lib/widgets/device_scan_select.dart
@@ -13,7 +13,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-import 'package:uvok_epaper_badge/model/device.dart';
+import 'package:uvok_epaper_badge/model/device/device.dart';
 import 'package:flutter/material.dart';
 import 'package:uvok_epaper_badge/widgets/notifying_list_widget.dart';
 
diff --git a/lib/widgets/scan_page.dart b/lib/widgets/scan_page.dart
index 5c9c3dd..2cae748 100644
--- a/lib/widgets/scan_page.dart
+++ b/lib/widgets/scan_page.dart
@@ -16,7 +16,7 @@
 import 'package:uvok_epaper_badge/control/scanner_controller.dart';
 import 'package:uvok_epaper_badge/widgets/device_details.dart';
 import 'package:uvok_epaper_badge/widgets/device_scan_select.dart';
-import 'package:uvok_epaper_badge/model/device.dart';
+import 'package:uvok_epaper_badge/model/device/device.dart';
 import 'package:flutter/material.dart';
 import 'package:logger/logger.dart';
 import 'package:permission_handler/permission_handler.dart';