refactor: Improve code layout

Myzel394 · Aug 29, 2023 · 445013d · 445013d
1 parent 7e51d3c
commit 445013d
Show file tree

Hide file tree

Showing 37 changed files with 314 additions and 314 deletions.
diff --git a/lib/screens/CheckLocationScreen.dart b/lib/screens/CheckLocationScreen.dart
@@ -12,8 +12,9 @@ import 'package:locus/services/settings_service.dart';
 import 'package:locus/utils/helper_sheet.dart';
 import 'package:locus/utils/load_status.dart';
 import 'package:locus/utils/location/index.dart';
-import 'package:locus/utils/show_message.dart';
 import 'package:locus/utils/theme.dart';
+import 'package:locus/utils/ui-message/enums.dart';
+import 'package:locus/utils/ui-message/show-message.dart';
 import 'package:locus/widgets/RequestLocationPermissionMixin.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:lottie/lottie.dart';

diff --git a/lib/screens/LocationsOverviewScreen.dart b/lib/screens/LocationsOverviewScreen.dart
@@ -28,11 +28,13 @@ import 'package:locus/screens/locations_overview_screen_widgets/ViewLocationPopu
 import 'package:locus/screens/locations_overview_screen_widgets/view_location_fetcher.dart';
 import 'package:locus/services/task_service.dart';
 import 'package:locus/services/view_service.dart';
-import 'package:locus/utils/helpers.dart';
 import 'package:locus/utils/location/get-fallback-location.dart';
 import 'package:locus/utils/location/index.dart';
 import 'package:locus/utils/navigation.dart';
-import 'package:locus/utils/show_message.dart';
+import 'package:locus/utils/permissions/has-granted.dart';
+import 'package:locus/utils/permissions/request.dart';
+import 'package:locus/utils/ui-message/enums.dart';
+import 'package:locus/utils/ui-message/show-message.dart';
 import 'package:locus/widgets/FABOpenContainer.dart';
 import 'package:locus/widgets/LocationsMap.dart';
 import 'package:locus/widgets/LocusFlutterMap.dart';
@@ -54,7 +56,6 @@ import '../services/manager_service.dart';
 import '../services/settings_service.dart';
 import '../utils/PageRoute.dart';
 import '../utils/color.dart';
-import '../utils/permission.dart';
 import '../utils/platform.dart';
 import '../utils/theme.dart';
 import 'ViewDetailScreen.dart';

diff --git a/lib/screens/SettingsScreen.dart b/lib/screens/SettingsScreen.dart
@@ -21,8 +21,9 @@ import 'package:locus/screens/settings_screen_widgets/TransferSenderScreen.dart'
 import 'package:locus/services/task_service.dart';
 import 'package:locus/utils/PageRoute.dart';
 import 'package:locus/utils/import_export_handler.dart';
-import 'package:locus/utils/show_message.dart';
 import 'package:locus/utils/theme.dart';
+import 'package:locus/utils/ui-message/enums.dart';
+import 'package:locus/utils/ui-message/show-message.dart';
 import 'package:locus/widgets/Paper.dart';
 import 'package:locus/widgets/PlatformFlavorWidget.dart';
 import 'package:locus/widgets/SettingsCaretIcon.dart';

diff --git a/lib/screens/ViewDetailScreen.dart b/lib/screens/ViewDetailScreen.dart
@@ -13,6 +13,8 @@ import 'package:locus/services/location_alarm_service.dart';
 import 'package:locus/services/view_service.dart';
 import 'package:locus/utils/PageRoute.dart';
 import 'package:locus/utils/bunny.dart';
+import 'package:locus/utils/permissions/has-granted.dart';
+import 'package:locus/utils/permissions/request.dart';
 import 'package:locus/widgets/EmptyLocationsThresholdScreen.dart';
 import 'package:locus/widgets/FillUpPaint.dart';
 import 'package:locus/widgets/LocationFetchEmpty.dart';
@@ -26,7 +28,6 @@ import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
 import '../constants/spacing.dart';
 import '../services/location_fetch_controller.dart';
 import '../services/location_point_service.dart';
-import '../utils/permission.dart';
 import '../utils/theme.dart';
 import '../widgets/LocationFetchError.dart';
 import '../widgets/LocationStillFetchingBanner.dart';

diff --git a/lib/screens/import_task_sheet_widgets/ReceiveViewByBluetooth.dart b/lib/screens/import_task_sheet_widgets/ReceiveViewByBluetooth.dart
@@ -6,7 +6,7 @@ import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
 import 'package:locus/constants/spacing.dart';
 import 'package:locus/constants/values.dart';
 import 'package:locus/extensions/string.dart';
-import 'package:locus/utils/bluetooth.dart';
+import 'package:locus/utils/permissions/mixins.dart';
 import 'package:locus/utils/theme.dart';
 import 'package:locus/widgets/BluetoothPermissionRequiredScreen.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@@ -29,7 +29,8 @@ class ReceiveViewByBluetooth extends StatefulWidget {
   State<ReceiveViewByBluetooth> createState() => _ReceiveViewByBluetoothState();
 }
 
-class _ReceiveViewByBluetoothState extends State<ReceiveViewByBluetooth> with BluetoothPermissionMixin {
+class _ReceiveViewByBluetoothState extends State<ReceiveViewByBluetooth>
+    with BluetoothPermissionMixin {
   final String id = createIdentifier();
   String? connectionID;
 
@@ -80,14 +81,16 @@ class _ReceiveViewByBluetoothState extends State<ReceiveViewByBluetooth> with Bl
             barrierDismissible: false,
             builder: (context) => PlatformAlertDialog(
               title: Text(l10n.importTask_bluetooth_receive_request_title),
-              content: Text(l10n.importTask_bluetooth_receive_request_description),
+              content:
+                  Text(l10n.importTask_bluetooth_receive_request_description),
               actions: [
                 PlatformDialogAction(
                   onPressed: () => Navigator.of(context).pop(false),
                   material: (_, __) => MaterialDialogActionData(
                     icon: const Icon(Icons.close),
                   ),
-                  child: Text(l10n.importTask_bluetooth_receive_request_decline),
+                  child:
+                      Text(l10n.importTask_bluetooth_receive_request_decline),
                 ),
                 PlatformDialogAction(
                   onPressed: () => Navigator.of(context).pop(true),
@@ -111,7 +114,8 @@ class _ReceiveViewByBluetoothState extends State<ReceiveViewByBluetooth> with Bl
                 final rawData = const Utf8Decoder().convert(payload.bytes!);
                 final view = TaskView.fromJSON(jsonDecode(rawData));
 
-                await Nearby().sendBytesPayload(endPointID, TRANSFER_SUCCESS_MESSAGE);
+                await Nearby()
+                    .sendBytesPayload(endPointID, TRANSFER_SUCCESS_MESSAGE);
 
                 widget.onImport(view);
               },
@@ -141,7 +145,8 @@ class _ReceiveViewByBluetoothState extends State<ReceiveViewByBluetooth> with Bl
     final l10n = AppLocalizations.of(context);
 
     if (!hasGrantedBluetoothPermission) {
-      return BluetoothPermissionRequiredScreen(onRequest: checkBluetoothPermission);
+      return BluetoothPermissionRequiredScreen(
+          onRequest: checkBluetoothPermission);
     }
 
     if (connectionID == null) {

diff --git a/lib/screens/locations_overview_screen_widgets/ShareLocationSheet.dart b/lib/screens/locations_overview_screen_widgets/ShareLocationSheet.dart
@@ -8,8 +8,9 @@ import 'package:intl/intl.dart';
 import 'package:locus/constants/values.dart';
 import 'package:locus/services/timers_service.dart';
 import 'package:locus/utils/date.dart';
-import 'package:locus/utils/show_message.dart';
 import 'package:locus/utils/theme.dart';
+import 'package:locus/utils/ui-message/enums.dart';
+import 'package:locus/utils/ui-message/show-message.dart';
 import 'package:locus/widgets/ModalSheet.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:locus/widgets/ModalSheetContent.dart';

diff --git a/lib/screens/locations_overview_screen_widgets/ViewDetails.dart b/lib/screens/locations_overview_screen_widgets/ViewDetails.dart
@@ -12,10 +12,11 @@ import 'package:locus/utils/navigation.dart';
 import 'package:latlong2/latlong.dart';
 
 import 'package:locus/utils/location/index.dart';
+import 'package:locus/utils/permissions/has-granted.dart';
+import 'package:locus/utils/permissions/request.dart';
 import '../../constants/spacing.dart';
 import '../../services/location_point_service.dart';
 import '../../utils/icon.dart';
-import '../../utils/permission.dart';
 import '../../utils/theme.dart';
 import '../../widgets/BentoGridElement.dart';
 import '../../widgets/LocusFlutterMap.dart';

diff --git a/lib/screens/settings_screen_widgets/TransferSenderScreen.dart b/lib/screens/settings_screen_widgets/TransferSenderScreen.dart
@@ -10,8 +10,8 @@ import 'package:locus/constants/spacing.dart';
 import 'package:locus/constants/values.dart';
 import 'package:locus/services/settings_service.dart';
 import 'package:locus/services/task_service.dart';
-import 'package:locus/utils/bluetooth.dart';
 import 'package:locus/utils/import_export_handler.dart';
+import 'package:locus/utils/permissions/mixins.dart';
 import 'package:locus/utils/theme.dart';
 import 'package:locus/widgets/BluetoothPermissionRequiredScreen.dart';
 import 'package:locus/widgets/PINView.dart';
@@ -29,7 +29,8 @@ class TransferSenderScreen extends StatefulWidget {
   State<TransferSenderScreen> createState() => _TransferSenderScreenState();
 }
 
-class _TransferSenderScreenState extends State<TransferSenderScreen> with BluetoothPermissionMixin {
+class _TransferSenderScreenState extends State<TransferSenderScreen>
+    with BluetoothPermissionMixin {
   final pin = Random().nextInt(90000) + 10000;
   String? connectionID;
   bool connectionEstablished = false;
@@ -147,7 +148,8 @@ class _TransferSenderScreenState extends State<TransferSenderScreen> with Blueto
           child: Center(
             child: (() {
               if (!hasGrantedBluetoothPermission) {
-                return BluetoothPermissionRequiredScreen(onRequest: checkBluetoothPermission);
+                return BluetoothPermissionRequiredScreen(
+                    onRequest: checkBluetoothPermission);
               }
 
               if (connectionEstablished) {

diff --git a/lib/screens/task_detail_screen_widgets/LocationDetails.dart b/lib/screens/task_detail_screen_widgets/LocationDetails.dart
@@ -8,8 +8,8 @@ import 'package:flutter_platform_widgets/flutter_platform_widgets.dart'
 import 'package:locus/constants/spacing.dart';
 import 'package:locus/services/location_point_service.dart';
 import 'package:locus/utils/icon.dart';
-import 'package:locus/utils/show_message.dart';
 import 'package:locus/utils/theme.dart';
+import 'package:locus/utils/ui-message/show-message.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:provider/provider.dart';
 

diff --git a/lib/screens/task_detail_screen_widgets/SendViewByBluetooth.dart b/lib/screens/task_detail_screen_widgets/SendViewByBluetooth.dart
@@ -6,8 +6,8 @@ import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
 import 'package:locus/constants/spacing.dart';
 import 'package:locus/constants/values.dart';
 import 'package:locus/models/log.dart';
-import 'package:locus/utils/bluetooth.dart';
 import 'package:locus/utils/import_export_handler.dart';
+import 'package:locus/utils/permissions/mixins.dart';
 import 'package:locus/utils/theme.dart';
 import 'package:locus/widgets/BluetoothPermissionRequiredScreen.dart';
 import 'package:lottie/lottie.dart';

diff --git a/lib/screens/view_alarm_screen_widgets/ViewAlarmSelectRadiusRegionScreen.dart b/lib/screens/view_alarm_screen_widgets/ViewAlarmSelectRadiusRegionScreen.dart
@@ -15,7 +15,8 @@ import 'package:locus/services/settings_service.dart';
 import 'package:locus/utils/helper_sheet.dart';
 import 'package:locus/utils/location/get-fallback-location.dart';
 import 'package:locus/utils/location/index.dart';
-import 'package:locus/utils/permission.dart';
+import 'package:locus/utils/permissions/has-granted.dart';
+import 'package:locus/utils/permissions/request.dart';
 import 'package:locus/utils/theme.dart';
 import 'package:locus/widgets/LocationsMap.dart';
 import 'package:locus/widgets/RequestNotificationPermissionMixin.dart';

diff --git a/lib/screens/welcome_screen_widgets/TransferReceiverScreen.dart b/lib/screens/welcome_screen_widgets/TransferReceiverScreen.dart
@@ -3,7 +3,8 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
 import 'package:locus/constants/spacing.dart';
-import 'package:locus/utils/bluetooth.dart';
+import 'package:locus/utils/permissions/has-granted.dart';
+import 'package:locus/utils/permissions/mixins.dart';
 import 'package:locus/utils/theme.dart';
 import 'package:locus/widgets/PINView.dart';
 import 'package:lottie/lottie.dart';
@@ -57,7 +58,7 @@ class _TransferReceiverScreenState extends State<TransferReceiverScreen>
   startAdvertising() async {
     final serviceID = await getBluetoothServiceID();
 
-    final hasGranted = await checkIfHasBluetoothPermission();
+    final hasGranted = await hasGrantedAllBluetoothPermissions();
 
     if (!hasGranted) {
       return;
@@ -94,8 +95,8 @@ class _TransferReceiverScreenState extends State<TransferReceiverScreen>
     Nearby().acceptConnection(
       connectionID!,
       onPayLoadRecieved: (_, payload) async {
-        await Nearby().sendBytesPayload(
-            connectionID!, TRANSFER_SUCCESS_MESSAGE);
+        await Nearby()
+            .sendBytesPayload(connectionID!, TRANSFER_SUCCESS_MESSAGE);
 
         widget.onContentReceived(
           const Utf8Decoder().convert(payload.bytes!),

diff --git a/lib/services/location_point_service.dart b/lib/services/location_point_service.dart
@@ -5,10 +5,9 @@ import 'package:battery_plus/battery_plus.dart';
 import 'package:cryptography/cryptography.dart';
 import 'package:flutter/services.dart';
 import 'package:geolocator/geolocator.dart';
+import 'package:locus/utils/cryptography/decrypt.dart';
 import 'package:uuid/uuid.dart';
 
-import '../utils/cryptography.dart';
-
 const uuid = Uuid();
 
 class LocationPointService {
@@ -40,8 +39,7 @@ class LocationPointService {
     double? batteryLevel,
     this.isCopy = false,
     this.batteryState,
-  })
-      : altitude = altitude == 0.0 ? null : altitude,
+  })  : altitude = altitude == 0.0 ? null : altitude,
         speed = speed == 0.0 ? null : speed,
         speedAccuracy = speedAccuracy == 0.0 ? null : speedAccuracy,
         heading = heading == 0.0 ? null : heading,
@@ -52,7 +50,7 @@ class LocationPointService {
       "${latitude.toStringAsFixed(5)}, ${longitude.toStringAsFixed(5)}";
 
   factory LocationPointService.dummyFromLatLng(final LatLng latLng,
-      {final double accuracy = 10.0}) =>
+          {final double accuracy = 10.0}) =>
       LocationPointService(
         id: uuid.v4(),
         createdAt: DateTime.now(),
@@ -77,8 +75,8 @@ class LocationPointService {
       batteryState: json["batteryState"] == null
           ? null
           : BatteryState.values.firstWhere(
-            (value) => value.name == json["batteryState"],
-      ),
+              (value) => value.name == json["batteryState"],
+            ),
     );
   }
 
@@ -100,7 +98,8 @@ class LocationPointService {
   }
 
   static Future<LocationPointService> fromPosition(
-      final Position position,) async {
+    final Position position,
+  ) async {
     double? batteryLevel;
     BatteryState? batteryState;
 
@@ -134,8 +133,7 @@ class LocationPointService {
 
   /// Copies `current` with a new id - mainly used in conjunction with `createUsingCurrentLocation`
   /// in background fetch to avoid fetching the location multiple times.
-  LocationPointService copyWithDifferentId() =>
-      LocationPointService(
+  LocationPointService copyWithDifferentId() => LocationPointService(
         id: uuid.v4(),
         createdAt: DateTime.now(),
         latitude: latitude,
@@ -149,8 +147,10 @@ class LocationPointService {
         batteryState: batteryState,
       );
 
-  static Future<LocationPointService> fromEncrypted(final String cipherText,
-      final SecretKey encryptionPassword,) async {
+  static Future<LocationPointService> fromEncrypted(
+    final String cipherText,
+    final SecretKey encryptionPassword,
+  ) async {
     final message = await decryptUsingAES(
       cipherText,
       encryptionPassword,
@@ -159,8 +159,7 @@ class LocationPointService {
     return LocationPointService.fromJSON(jsonDecode(message));
   }
 
-  Position asPosition() =>
-      Position(
+  Position asPosition() => Position(
         latitude: latitude,
         longitude: longitude,
         altitude: altitude ?? 0.0,

diff --git a/lib/services/task_service.dart b/lib/services/task_service.dart
@@ -10,7 +10,8 @@ import 'package:locus/constants/values.dart';
 import 'package:locus/models/log.dart';
 import 'package:locus/services/location_base.dart';
 import 'package:locus/services/log_service.dart';
-import 'package:locus/utils/cryptography.dart';
+import 'package:locus/utils/cryptography/encrypt.dart';
+import 'package:locus/utils/cryptography/utils.dart';
 import 'package:locus/utils/location/index.dart';
 import 'package:nostr/nostr.dart';
 import 'package:uuid/uuid.dart';

diff --git a/lib/services/view_service.dart b/lib/services/view_service.dart
@@ -9,7 +9,7 @@ import 'package:flutter_logs/flutter_logs.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:locus/api/nostr-fetch.dart';
 import 'package:locus/services/task_service.dart';
-import 'package:locus/utils/cryptography.dart';
+import 'package:locus/utils/cryptography/decrypt.dart';
 import 'package:nostr/nostr.dart';
 import 'package:uuid/uuid.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';