diff options
| -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 | ||||
| -rw-r--r-- | test/widget_test.dart | 22 |
6 files changed, 24 insertions, 28 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); + }, + ); + }, ), ], ), diff --git a/test/widget_test.dart b/test/widget_test.dart index 5779cd8..5fe0b7f 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -5,6 +5,7 @@ // gestures. You can also use WidgetTester to find child widgets in the widget // tree, read text, and verify that the values of widget properties are correct. +import 'package:uvok_epaper_badge/control/mock_scanner_controller.dart'; import 'package:uvok_epaper_badge/widgets/badge_app.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -12,18 +13,19 @@ import 'package:flutter_test/flutter_test.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { // Build our app and trigger a frame. - await tester.pumpWidget(const BadgeApp()); + MockScannerController msc = MockScannerController(); + await tester.pumpWidget(BadgeApp(selectedScanner: msc)); - // Verify that our counter starts at 0. - expect(find.text('0'), findsOneWidget); - expect(find.text('1'), findsNothing); + // // Verify that our counter starts at 0. + // expect(find.text('0'), findsOneWidget); + // expect(find.text('1'), findsNothing); - // Tap the '+' icon and trigger a frame. - await tester.tap(find.byIcon(Icons.add)); - await tester.pump(); + // // Tap the '+' icon and trigger a frame. + // await tester.tap(find.byIcon(Icons.add)); + // await tester.pump(); - // Verify that our counter has incremented. - expect(find.text('0'), findsNothing); - expect(find.text('1'), findsOneWidget); + // // Verify that our counter has incremented. + // expect(find.text('0'), findsNothing); + // expect(find.text('1'), findsOneWidget); }); } |