Repository cleanup

.fvmrc

@@ -0,0 +1,3 @@
+{
+  "flutter": "3.19.6"
+}

.gitignore

@@ -1,20 +1,59 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
 .DS_Store
 .atom/
-.idea
+.buildlog/
+.history
+.svn/
+.gradle/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
 .packages
+.pub-cache/
 .pub/
+/build/
+*.g.dart
+
+# Web related
+lib/generated_plugin_registrant.dart
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Exceptions to above rules.
+!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+/ios/Flutter/.last_build_id
+/ios/build/
+
+
+# FVM Version Cache
+.fvm/
+
+# Previously included from original FlutterBleLib
 build/
 ios/.generated/
 packages
-pubspec.lock
-*.iml
 example/android/res/values/strings_en.arb
 res/values/strings_en.arb
 lib/generated/
 example/lib/generated/
 example/.flutter-plugins-dependencies
-.dart_tool/
-example/ios/Podfile.lock
 .vscode/settings.json
 org.eclipse.buildship.core.prefs
 .project

analysis_options.yaml

@@ -1,10 +1,8 @@
-include: package:pedantic/analysis_options.yaml
+include: package:flutter_lints/flutter.yaml
 
 analyzer:
-  exclude: [test/**]
-
+  exclude:
+    - "**.mocks.dart"
 linter:
   rules:
-    prefer_single_quotes: false
-    omit_local_variable_types: false
-    unawaited_futures: false
+    constant_identifier_names: false

android/.gitignore

@@ -1,8 +1,7 @@
-*.iml
-.gradle
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
+GeneratedPluginRegistrant.java

android/build.gradle

@@ -36,5 +36,5 @@ android {
 
 dependencies {
     implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'com.github.Polidea:MultiPlatformBleAdapter:0.1.8'
+    implementation 'com.github.dotintent:MultiPlatformBleAdapter:0.1.8'
 }

example/lib/device_details/device_detail_view.dart

@@ -60,14 +60,12 @@ class DeviceDetailsViewState extends State<DeviceDetailsView> {
   @override
   Widget build(BuildContext context) {
     final deviceDetailsBloc = _deviceDetailsBloc;
-    return WillPopScope(
-      onWillPop: () {
-        if (deviceDetailsBloc == null) {
-          return Future<bool>.value(true);
+    return PopScope(
+      canPop: deviceDetailsBloc == null,
+      onPopInvoked: (didPop) {
+        if (deviceDetailsBloc != null) {
+          deviceDetailsBloc.disconnect();
         }
-        return deviceDetailsBloc.disconnect().then((_) {
-          return false;
-        });
       },
       child: DefaultTabController(
         length: 2,

example/lib/device_details/device_details_bloc.dart

@@ -7,9 +7,6 @@ import 'package:flutter_ble_lib_example/repository/device_repository.dart';
 import 'package:flutter_ble_lib_example/test_scenarios/test_scenarios.dart';
 import 'package:rxdart/rxdart.dart';
 
-import '../model/ble_device.dart';
-import '../repository/device_repository.dart';
-
 class DeviceDetailsBloc {
   final BleManager _bleManager;
   final DeviceRepository _deviceRepository;
@@ -25,7 +22,7 @@ class DeviceDetailsBloc {
 
   Stream<List<DebugLog>> get logs => _logsController.stream;
 
-  Stream<Null?> get disconnectedDevice => _deviceRepository.pickedDevice
+  Stream<Null> get disconnectedDevice => _deviceRepository.pickedDevice
       .skipWhile((bleDevice) => bleDevice != null).cast<Null>();
 
   List<DebugLog> _logs = [];

example/lib/device_details/view/button_view.dart

@@ -11,9 +11,11 @@ class ButtonView extends StatelessWidget {
     return Expanded(
       child: Padding(
         padding: const EdgeInsets.all(2.0),
-        child: RaisedButton(
-          color: Colors.blue,
-          textColor: Colors.white,
+        child: ElevatedButton(
+          style: ButtonStyle(
+            backgroundColor: MaterialStateProperty.all(Colors.blue),
+            foregroundColor: MaterialStateProperty.all(Colors.white),
+          ),
           child: Text(_text),
           onPressed: action,
         ),

example/lib/devices_list/devices_list_view.dart

@@ -142,7 +142,7 @@ class DevicesList extends ListView {
               padding: const EdgeInsets.all(8.0),
               child: Image.asset('assets/ti_logo.png'),
             ),
-            backgroundColor: Theme.of(context).accentColor);
+            backgroundColor: Theme.of(context).colorScheme.secondary);
       case DeviceCategory.hex:
         return CircleAvatar(
             child: CustomPaint(painter: HexPainter(), size: Size(20, 24)),

example/lib/main.dart

@@ -20,7 +20,7 @@ class MyApp extends StatelessWidget {
       title: 'FlutterBleLib example',
       theme: new ThemeData(
         primaryColor: new Color(0xFF0A3D91),
-        accentColor: new Color(0xFFCC0000),
+        colorScheme: ColorScheme.fromSwatch().copyWith(secondary: new Color(0xFFCC0000)),
       ),
       initialRoute: "/",
       routes: <String, WidgetBuilder>{