feat(example_full, lib, android): optimisation improving, current device data

android/src/main/kotlin/com/xenikii/nearby_service/NearbyServiceManager.kt

@@ -97,8 +97,9 @@ class NearbyServiceManager(private var context: Context) {
             }
         } catch (e: SecurityException) {
             if (!permissionsHandler.checkPermissions()) {
-                Logger.e("No permission to call 'discover'")
+                Logger.e("No permission to call 'getCurrentDevice'")
                 permissionsHandler.requestPermissions()
+                result.success(null)
             }
         }
     }

example_full/android/app/build.gradle

@@ -45,7 +45,7 @@ android {
         applicationId "com.example.nearby_service_example_full"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion flutter.minSdkVersion
+        minSdkVersion 24
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

example_full/android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,15 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES"
+        android:usesPermissionFlags="neverForLocation" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <application
         android:label="nearby_service_example_full"
         android:name="${applicationName}"

example_full/lib/domain/app_service.dart

@@ -45,7 +45,6 @@ class AppService extends ChangeNotifier {
       await _nearbyService.initialize(
         data: NearbyInitializeData(iosDeviceName: iosDeviceName),
       );
-      await getCurrentDeviceInfo();
       updateState(
         Platform.isAndroid ? AppState.permissions : AppState.selectClientType,
       );
@@ -86,6 +85,7 @@ class AppService extends ChangeNotifier {
     if (result ?? false) {
       updateState(AppState.readyToDiscover);
       startListeningConnectionInfo();
+      await getCurrentDeviceInfo();
       return true;
     }
     return false;

example_full/lib/presentation/app.dart

@@ -37,7 +37,21 @@ class App extends StatelessWidget {
               }),
             ],
           ),
-          body: Consumer<AppService>(builder: (context, service, _) {
+          body: const _AppBody(),
+        ),
+      ),
+    );
+  }
+}
+
+class _AppBody extends StatelessWidget {
+  const _AppBody();
+
+  @override
+  Widget build(BuildContext context) {
+    return Selector<AppService, AppState>(
+      selector: (context, service) => service.state,
+      builder: (context, state, _) {
         return Column(
           crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
@@ -51,15 +65,16 @@ class App extends StatelessWidget {
                 removeLeft: true,
                 child: Stepper(
                   controlsBuilder: (context, _) => const SizedBox.shrink(),
-                      currentStep: service.state.step,
+                  currentStep: state.step,
                   steps: [
-                        ...AppState.steps.map((e) {
+                    ...AppState.steps.map(
+                      (e) {
                         final builder = AppStepViewBuilder(state: e);
-                          final isActive = e == service.state;
+                        final isActive = e == state;
                         return Step(
                           state: isActive
                               ? StepState.indexed
-                                : e.step < service.state.step
+                              : e.step < state.step
                                   ? StepState.complete
                                   : StepState.disabled,
                           title: builder.buildTitle(),
@@ -67,16 +82,15 @@ class App extends StatelessWidget {
                           content: builder.buildContent(),
                           isActive: isActive,
                         );
-                        }),
+                      },
+                    ),
                   ],
                 ),
               ),
             ),
           ],
         );
-          }),
+      },
-        ),
-      ),
     );
   }
 }

example_full/lib/presentation/view/communication_view.dart

@@ -2,9 +2,11 @@ import 'dart:io';
 
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
+import 'package:nearby_service/nearby_service.dart';
 import 'package:nearby_service_example_full/domain/app_service.dart';
 import 'package:nearby_service_example_full/presentation/app.dart';
 import 'package:nearby_service_example_full/uikit/uikit.dart';
+import 'package:nearby_service_example_full/utils/files_saver.dart';
 import 'package:provider/provider.dart';
 
 import '../components/device_preview.dart';
@@ -22,13 +24,13 @@ class _CommunicationViewState extends State<CommunicationView> {
 
   @override
   Widget build(BuildContext context) {
-    return Consumer<AppService>(
+    return Selector<AppService, NearbyDevice?>(
-      builder: (context, service, _) {
+      selector: (context, service) => service.connectedDevice,
-        final device = service.connectedDevice;
+      builder: (context, device, _) {
         if (device == null) {
           return Center(
             child: ActionButton(
-              onTap: service.stopListeningAll,
+              onTap: context.read<AppService>().stopListeningAll,
               title: 'Restart',
             ),
           );
@@ -69,7 +71,9 @@ class _CommunicationViewState extends State<CommunicationView> {
                   Flexible(
                     child: ActionButton(
                       title: 'Send',
-                      onTap: () => service.sendTextRequest(message),
+                      onTap: () => context.read<AppService>().sendTextRequest(
+                            message,
+                          ),
                     ),
                   ),
                 ],
@@ -100,7 +104,7 @@ class _CommunicationViewState extends State<CommunicationView> {
                   Flexible(
                     child: ActionButton(
                       title: 'Send',
-                      onTap: () => service.sendFilesRequest([
+                      onTap: () => context.read<AppService>().sendFilesRequest([
                         ...files
                             .map((e) => e.path)
                             .where((element) => element != null)
@@ -122,11 +126,57 @@ class _CommunicationViewState extends State<CommunicationView> {
                 physics: const NeverScrollableScrollPhysics(),
                 children: [
                   ...files.where((element) => element.path != null).map(
-                        (e) => Image.file(
+                    (e) {
+                      return Container(
+                        decoration: BoxDecoration(
+                            border: Border.all(color: kGreenColor),
+                            borderRadius: BorderRadius.circular(12),
+                          ),
+                        child: ClipRRect(
+                          borderRadius: BorderRadius.circular(11),
+                          child: FilesSaver.isImage(e.extension)
+                                ? Image.file(
                                     File(e.path!),
                                     fit: BoxFit.cover,
+                                  )
+                                : Container(
+                                    alignment: Alignment.center,
+                                    padding: const EdgeInsets.all(8.0),
+                                    child: Text(
+                                      e.name,
+                                      style: const TextStyle(
+                                        fontSize: 8,
+                                        fontWeight: FontWeight.bold,
+                                        color: kGreenColor,
                                       ),
                                     ),
+                                  ),
+                        ),
+                      );
+                      if (FilesSaver.isImage(e.extension)) {
+                        return Image.file(
+                          File(e.path!),
+                          fit: BoxFit.cover,
+                        );
+                      } else {
+                        return Container(
+                          decoration: BoxDecoration(
+                              border: Border.all(color: kBlueColor),
+                              borderRadius: BorderRadius.circular(16)),
+                          padding: const EdgeInsets.all(8.0),
+                          alignment: Alignment.center,
+                          child: Text(
+                            e.name,
+                            style: const TextStyle(
+                              fontSize: 12,
+                              fontWeight: FontWeight.bold,
+                              color: kBlueColor,
+                            ),
+                          ),
+                        );
+                      }
+                    },
+                  ),
                 ],
               ),
             ),

example_full/lib/presentation/view/connected_view.dart

@@ -13,9 +13,16 @@ class ConnectedView extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Consumer<AppService>(
+    final device = context.select<AppService, NearbyDevice?>(
-      builder: (context, service, _) {
+      (service) => service.connectedDevice,
-        final device = service.connectedDevice;
+    );
+    final isAndroidGroupOwner = context.select<AppService, bool?>(
+      (service) => service.isAndroidGroupOwner,
+    );
+    final communicationChannelState =
+        context.select<AppService, CommunicationChannelState>(
+      (service) => service.communicationChannelState,
+    );
     return device != null
         ? Center(
             child: Column(
@@ -36,7 +43,7 @@ class ConnectedView extends StatelessWidget {
                       const Text('Connection lost'),
                       ActionButton(
                         onTap: () {
-                              service.connect(device);
+                          context.read<AppService>().connect(device);
                         },
                         title: 'Reconnect',
                       ),
@@ -45,11 +52,11 @@ class ConnectedView extends StatelessWidget {
                 else
                   DevicePreview(device: device, largeView: true),
                 const SizedBox(height: 10),
-                    if (service.communicationChannelState !=
+                if (!communicationChannelState.isLoading)
-                        CommunicationChannelState.loading)
                   ActionButton(
                     title: 'Start communicate',
-                        onTap: () => service.startCommunicationChannel(
+                    onTap: () =>
+                        context.read<AppService>().startCommunicationChannel(
                               listener: (event) => MessagesListener.call(
                                 context,
                                 event,
@@ -63,13 +70,11 @@ class ConnectedView extends StatelessWidget {
                 else
                   Text(
                     'Connecting socket.. '
-                        '${service.isAndroidGroupOwner != null ? service.isAndroidGroupOwner! ? "Waiting a client for connect" : "Waiting a server for connect" : "Waiting a connection"}',
+                    '${isAndroidGroupOwner != null ? isAndroidGroupOwner ? "Waiting a client for connect" : "Waiting a server for connect" : "Waiting a connection"}',
                   )
               ],
             ),
           )
         : const SizedBox();
-      },
-    );
   }
 }

example_full/lib/presentation/view/permissions_view.dart

@@ -8,16 +8,14 @@ class PermissionsView extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Consumer<AppService>(builder: (context, service, _) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.stretch,
       children: [
         ActionButton(
-            onTap: service.requestPermissions,
+          onTap: context.read<AppService>().requestPermissions,
           title: 'Request permissions',
         ),
       ],
     );
-    });
   }
 }

example_full/lib/presentation/view/streaming_peers_view.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:flutter/material.dart';
+import 'package:nearby_service/nearby_service.dart';
 import 'package:nearby_service_example_full/domain/app_service.dart';
 import 'package:nearby_service_example_full/uikit/uikit.dart';
 import 'package:provider/provider.dart';
@@ -32,14 +33,18 @@ class _PeersBody extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Consumer<AppService>(
+    return Selector<AppService, bool>(
-      builder: (context, service, _) {
+      selector: (context, service) => service.isIOSBrowser,
-        return (service.peers != null && service.peers!.isNotEmpty)
+      builder: (context, isIOSBrowser, _) {
+        return Selector<AppService, List<NearbyDevice>?>(
+          selector: (context, service) => service.peers,
+          builder: (context, peers, _) {
+            return (peers != null && peers.isNotEmpty)
                 ? Column(
                     mainAxisSize: MainAxisSize.min,
                     crossAxisAlignment: CrossAxisAlignment.stretch,
                     children: [
-                  ...service.peers!.map(
+                      ...peers.map(
                         (e) {
                           return Container(
                             padding: const EdgeInsets.only(bottom: 8.0),
@@ -50,12 +55,14 @@ class _PeersBody extends StatelessWidget {
                     ],
                   )
                 : Text(
-                Platform.isAndroid || service.isIOSBrowser
+                    Platform.isAndroid || isIOSBrowser
                         ? 'No one here ('
                         : "Wait until someone invites you!",
                     textAlign: TextAlign.center,
                   );
           },
         );
+      },
+    );
   }
 }

example_full/lib/utils/files_saver.dart

@@ -6,6 +6,19 @@ import 'package:path_provider/path_provider.dart';
 class FilesSaver {
   FilesSaver._();
 
+  static bool isImage(String? extension) {
+    return _imageExtensions.contains(extension?.toLowerCase());
+  }
+
+  static const _imageExtensions = [
+    'jpg',
+    'jpeg',
+    'png',
+    'gif',
+    'webp',
+    'bmp',
+  ];
+
   static Future<List<NearbyFileInfo>> savePack(
       ReceivedNearbyFilesPack pack) async {
     final files = <NearbyFileInfo>[];

lib/src/model/communication_channel_state.dart

@@ -2,4 +2,14 @@
 /// The status of the communication channel for data exchange.
 /// Use it to determine if you can send data over the communication channel or not.
 ///
-enum CommunicationChannelState { notConnected, loading, connected }
+enum CommunicationChannelState {
+  notConnected,
+  loading,
+  connected;
+
+  bool get isNotConnected => this == CommunicationChannelState.notConnected;
+
+  bool get isLoading => this == CommunicationChannelState.loading;
+
+  bool get isConnected => this == CommunicationChannelState.connected;
+}