diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/control/flutter_blue_plus_scanner_controller.dart | 2 | ||||
| -rw-r--r-- | lib/control/mock_scanner_controller.dart | 1 | ||||
| -rw-r--r-- | lib/model/device_connection.dart | 2 | ||||
| -rw-r--r-- | lib/model/flutter_blue_plus_device_connection.dart | 1 | ||||
| -rw-r--r-- | lib/widgets/scan_page.dart | 24 |
5 files changed, 12 insertions, 18 deletions
diff --git a/lib/control/flutter_blue_plus_scanner_controller.dart b/lib/control/flutter_blue_plus_scanner_controller.dart index fc570b2..73c1286 100644 --- a/lib/control/flutter_blue_plus_scanner_controller.dart +++ b/lib/control/flutter_blue_plus_scanner_controller.dart @@ -54,7 +54,7 @@ class FlutterBluePlusScannerController extends ScannerControllerImpl { super.dispose(); } - List<ScanResult> _scanResults = []; + final List<ScanResult> _scanResults = []; bool _deviceInResults(ScanResult incomingDev) => _scanResults.any( (existingDev) => existingDev.device.remoteId == incomingDev.device.remoteId, ); diff --git a/lib/control/mock_scanner_controller.dart b/lib/control/mock_scanner_controller.dart index ec893cd..2822b8c 100644 --- a/lib/control/mock_scanner_controller.dart +++ b/lib/control/mock_scanner_controller.dart @@ -2,7 +2,6 @@ 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/device.dart'; import 'package:uvok_epaper_badge/model/mock_device.dart'; class MockScannerController extends ScannerControllerImpl { diff --git a/lib/model/device_connection.dart b/lib/model/device_connection.dart index 6d5c248..81bcbfd 100644 --- a/lib/model/device_connection.dart +++ b/lib/model/device_connection.dart @@ -13,8 +13,6 @@ // 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/mock_device_connection.dart'; enum ConnectionStatus { disconnected, connected, error } diff --git a/lib/model/flutter_blue_plus_device_connection.dart b/lib/model/flutter_blue_plus_device_connection.dart index 2919556..2505af5 100644 --- a/lib/model/flutter_blue_plus_device_connection.dart +++ b/lib/model/flutter_blue_plus_device_connection.dart @@ -18,7 +18,6 @@ import 'dart:async'; 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.dart'; import 'package:uvok_epaper_badge/model/device_connection.dart'; import 'package:uvok_epaper_badge/model/flutter_blue_plus_device.dart'; diff --git a/lib/widgets/scan_page.dart b/lib/widgets/scan_page.dart index c557657..5c9c3dd 100644 --- a/lib/widgets/scan_page.dart +++ b/lib/widgets/scan_page.dart @@ -118,19 +118,17 @@ class _ScanPageState extends State<ScanPage> { ), ], ), - Expanded( - child: StreamBuilder( - stream: widget.deviceScanner.scanResultsStream, - initialData: <Device>[], - builder: (context, asyncSnapshot) { - return DeviceScanSelection( - items: asyncSnapshot.data ?? [], - onItemSelected: (item) { - setState(() => selectedDevice = item); - }, - ); - }, - ), + StreamBuilder( + stream: widget.deviceScanner.scanResultsStream, + initialData: <Device>[], + builder: (context, asyncSnapshot) { + return DeviceScanSelection( + items: asyncSnapshot.data ?? [], + onItemSelected: (item) { + setState(() => selectedDevice = item); + }, + ); + }, ), ], ), |