Merge pull request #25 from Myzel394/add-bluetooth-share

Add bluetooth share

Author: Myzel394

lib/extensions/string.dart

@@ -0,0 +1,5 @@
+extension StringExtensions on String {
+  String capitalize() {
+    return "${this[0].toUpperCase()}${substring(1)}";
+  }
+}

lib/l10n/app_en.arb

@@ -181,6 +181,15 @@
   "transferScreen_send_startTransfer": "Transfer",
   "transferScreen_receive_connect_description": "Received a transfer request. This is the PIN. Make sure the PIN matches the one on your old device. If it does, tap \"Connect\".",
   "transferScreen_receive_connected_label": "Please start the transfer on your old device now.",
+  "importTask_bluetooth_receive_title": "Receive View Key",
+  "importTask_bluetooth_receive_description": "Receive a view key from another device via Bluetooth. Ask the other person to open a task. Then go to details, tap on share location and select Bluetooth. Make sure you have Bluetooth enabled.",
+  "importTask_bluetooth_receive_id_description": "This is your name visible to others:",
+  "importTask_bluetooth_send_title": "Share location via Bluetooth",
+  "importTask_bluetooth_send_description": "Make sure you have Bluetooth enabled. Looking for devices...",
+  "importTask_bluetooth_receive_request_title": "Do you want to accept the request?",
+  "importTask_bluetooth_receive_request_description": "A connect request to share a location has been made. We can't tell what location is being shared until you accept the connection. If you expected this connection, you can connect. Otherwise, the request will be rejected.",
+  "importTask_bluetooth_receive_request_decline": "Decline",
+  "importTask_bluetooth_receive_request_accept": "Accept",
   "mainScreen_overview": "Overview",
   "mainScreen_createTask": "Create Task",
   "mainScreen_logs": "Logs",
@@ -199,6 +208,7 @@
   "mainScreen_importTask_action_importMethod_url": "Import URL",
   "mainScreen_importTask_action_importMethod_url_title": "Enter the URL of the task",
   "mainScreen_importTask_action_importMethod_file": "Import file",
+  "mainScreen_importTask_action_importMethod_bluetooth": "Receive via Bluetooth",
   "mainScreen_importTask_action_importMethod_file_selectFile": "Select a ViewKey file to import",
   "mainScreen_importTask_action_import_isLoading": "Importing...",
   "mainScreen_importTask_action_name_title": "Enter a name for this view",
@@ -318,6 +328,7 @@
   "shareLocation_actions_shareFile_text": "Here's my Locus View Key to see my location",
   "shareLocation_actions_shareLink": "Share Link",
   "shareLocation_actions_shareLink_text": "Here's my Locus link to see my location",
+  "shareLocation_actions_shareBluetooth": "Share via Bluetooth",
   "shareLocation_scanToImport": "Scan this QR Code to import task {task}",
   "@shareLocation_scanToImport": {
     "placeholders": {

lib/screens/ImportTaskSheet.dart

@@ -16,12 +16,14 @@ import 'package:provider/provider.dart';
 
 import '../services/task_service.dart';
 import '../widgets/ModalSheet.dart';
+import 'import_task_sheet_widgets/ReceiveViewByBluetooth.dart';
 
 enum ImportScreen {
   ask,
   importFile,
   askURL,
   askName,
+  bluetoothReceive,
   present,
   error,
   done,
@@ -43,8 +45,7 @@ class ImportTaskSheet extends StatefulWidget {
   State<ImportTaskSheet> createState() => _ImportTaskSheetState();
 }
 
-class _ImportTaskSheetState extends State<ImportTaskSheet>
-    with TickerProviderStateMixin {
+class _ImportTaskSheetState extends State<ImportTaskSheet> with TickerProviderStateMixin {
   final _nameController = TextEditingController();
   final _urlController = TextEditingController();
   ImportScreen _screen = ImportScreen.ask;
@@ -111,11 +112,40 @@ class _ImportTaskSheetState extends State<ImportTaskSheet>
     super.dispose();
   }
 
-  void _importFile() async {
+  void parseViewData(final TaskView taskView) async {
     final l10n = AppLocalizations.of(context);
     final taskService = context.read<TaskService>();
     final viewService = context.read<ViewService>();
 
+    try {
+      final errorMessage = await taskView.validate(
+        taskService: taskService,
+        viewService: viewService,
+      );
+
+      if (errorMessage != null) {
+        setState(() {
+          this.errorMessage = errorMessage;
+        });
+
+        return;
+      } else {
+        setState(() {
+          _taskView = taskView;
+          _screen = ImportScreen.present;
+        });
+      }
+    } catch (_) {
+      setState(() {
+        errorMessage = l10n.unknownError;
+        _screen = ImportScreen.error;
+      });
+    }
+  }
+
+  void _importFile() async {
+    final l10n = AppLocalizations.of(context);
+
     FilePickerResult? result;
 
     setState(() {
@@ -128,8 +158,7 @@ class _ImportTaskSheetState extends State<ImportTaskSheet>
       result = await FilePicker.platform.pickFiles(
         type: FileType.custom,
         allowedExtensions: ["json"],
-        dialogTitle:
-            l10n.mainScreen_importTask_action_importMethod_file_selectFile,
+        dialogTitle: l10n.mainScreen_importTask_action_importMethod_file_selectFile,
         withData: true,
       );
     } catch (_) {
@@ -143,31 +172,9 @@ class _ImportTaskSheetState extends State<ImportTaskSheet>
         reset();
       } else {
         final rawData = const Utf8Decoder().convert(result.files[0].bytes!);
-        final data = jsonDecode(rawData);
+        final taskView = TaskView.fromJSON(jsonDecode(rawData));
 
-        final taskView = TaskView(
-          relays: List<String>.from(data["relays"]),
-          nostrPublicKey: data["nostrPublicKey"],
-          encryptionPassword: data["encryptionPassword"],
-        );
-
-        final errorMessage = await taskView.validate(
-          taskService: taskService,
-          viewService: viewService,
-        );
-
-        if (errorMessage != null) {
-          setState(() {
-            this.errorMessage = errorMessage;
-          });
-
-          return;
-        } else {
-          setState(() {
-            _taskView = taskView;
-            _screen = ImportScreen.present;
-          });
-        }
+        parseViewData(taskView);
       }
     } catch (_) {
     } finally {
@@ -180,8 +187,6 @@ class _ImportTaskSheetState extends State<ImportTaskSheet>
   Future<void> _importURL() async {
     final url = _urlController.text;
     final l10n = AppLocalizations.of(context);
-    final taskService = context.read<TaskService>();
-    final viewService = context.read<ViewService>();
 
     try {
       setState(() {
@@ -191,22 +196,8 @@ class _ImportTaskSheetState extends State<ImportTaskSheet>
 
       final parameters = TaskView.parseLink(url);
       final taskView = await TaskView.fetchFromNostr(parameters);
-      final errorMessage = await taskView.validate(
-        taskService: taskService,
-        viewService: viewService,
-      );
 
-      if (errorMessage == null) {
-        setState(() {
-          _taskView = taskView;
-          _screen = ImportScreen.present;
-        });
-      } else {
-        setState(() {
-          this.errorMessage = errorMessage;
-          _screen = ImportScreen.error;
-        });
-      }
+      parseViewData(taskView);
     } catch (_) {
       setState(() {
         errorMessage = l10n.unknownError;
@@ -247,6 +238,11 @@ class _ImportTaskSheetState extends State<ImportTaskSheet>
                             _screen = ImportScreen.askURL;
                           });
                           break;
+                        case ImportSelectionType.bluetooth:
+                          setState(() {
+                            _screen = ImportScreen.bluetoothReceive;
+                          });
+                          break;
                       }
                     },
                   )
@@ -278,11 +274,14 @@ class _ImportTaskSheetState extends State<ImportTaskSheet>
                       else if (errorMessage != null)
                         Text(
                           errorMessage!,
-                          style: getBodyTextTextStyle(context)
-                              .copyWith(color: getErrorColor(context)),
+                          style: getBodyTextTextStyle(context).copyWith(color: getErrorColor(context)),
                         ),
                     ],
                   )
+                else if (_screen == ImportScreen.bluetoothReceive)
+                  ReceiveViewByBluetooth(
+                    onImport: parseViewData,
+                  )
                 else if (_screen == ImportScreen.present)
                   ViewImportOverview(
                     view: _taskView!,
@@ -305,8 +304,7 @@ class _ImportTaskSheetState extends State<ImportTaskSheet>
                 else if (_screen == ImportScreen.error)
                   Column(
                     children: <Widget>[
-                      Icon(context.platformIcons.error,
-                          size: 64, color: getErrorColor(context)),
+                      Icon(context.platformIcons.error, size: 64, color: getErrorColor(context)),
                       const SizedBox(height: MEDIUM_SPACE),
                       Text(
                         l10n.taskImportError,
@@ -315,8 +313,7 @@ class _ImportTaskSheetState extends State<ImportTaskSheet>
                       const SizedBox(height: SMALL_SPACE),
                       Text(
                         errorMessage!,
-                        style: getBodyTextTextStyle(context)
-                            .copyWith(color: getErrorColor(context)),
+                        style: getBodyTextTextStyle(context).copyWith(color: getErrorColor(context)),
                       ),
                       const SizedBox(height: LARGE_SPACE),
                       PlatformElevatedButton(

lib/screens/import_task_sheet_widgets/ImportSelection.dart

@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
@@ -8,6 +10,7 @@ import '../../utils/theme.dart';
 enum ImportSelectionType {
   url,
   file,
+  bluetooth,
 }
 
 class ImportSelection extends StatefulWidget {
@@ -44,8 +47,7 @@ class _ImportSelectionState extends State<ImportSelection> {
         if (errorMessage != null) ...[
           Text(
             errorMessage!,
-            style: getBodyTextTextStyle(context)
-                .copyWith(color: getErrorColor(context)),
+            style: getBodyTextTextStyle(context).copyWith(color: getErrorColor(context)),
           ),
           const SizedBox(height: MEDIUM_SPACE),
         ],
@@ -74,6 +76,17 @@ class _ImportSelectionState extends State<ImportSelection> {
               },
               child: Text(l10n.mainScreen_importTask_action_importMethod_file),
             ),
+            if (Platform.isAndroid)
+              PlatformElevatedButton(
+                padding: const EdgeInsets.all(MEDIUM_SPACE),
+                material: (_, __) => MaterialElevatedButtonData(
+                  icon: const Icon(Icons.bluetooth_audio_rounded),
+                ),
+                onPressed: () async {
+                  widget.onSelect(ImportSelectionType.bluetooth);
+                },
+                child: Text(l10n.mainScreen_importTask_action_importMethod_bluetooth),
+              )
           ],
         ),
       ],