diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 2457a29f..22e18d8d 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -12,6 +12,9 @@
+
+
+
@@ -79,6 +82,22 @@
android:scheme="https" />
+
+
+
+
+
+
+
+
+
() {
+ if (!registry.hasPlugin("BackgroundLocatorPlugin")) {
+ GeneratedPluginRegistrant.register(with: registry)
+ }
+}
@UIApplicationMain
@objc class AppDelegate: FlutterAppDelegate {
@@ -8,6 +15,7 @@ import Flutter
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
) -> Bool {
GeneratedPluginRegistrant.register(with: self)
+ BackgroundLocatorPlugin.setPluginRegistrantCallback(registerPlugins)
return super.application(application, didFinishLaunchingWithOptions: launchOptions)
}
}
diff --git a/lib/App.dart b/lib/App.dart
index fdc0ffab..e540f0df 100644
--- a/lib/App.dart
+++ b/lib/App.dart
@@ -6,7 +6,7 @@ import 'package:locus/constants/colors.dart';
import 'package:locus/screens/BiometricsRequiredStartupScreen.dart';
import 'package:locus/screens/LocationsOverviewScreen.dart';
import 'package:locus/screens/WelcomeScreen.dart';
-import 'package:locus/services/settings_service.dart';
+import 'package:locus/services/settings_service/index.dart';
import 'package:locus/utils/PageRoute.dart';
import 'package:locus/utils/color.dart';
import 'package:locus/widgets/DismissKeyboard.dart';
diff --git a/lib/api/get-locations.dart b/lib/api/get-locations.dart
deleted file mode 100644
index 1ec9b8a9..00000000
--- a/lib/api/get-locations.dart
+++ /dev/null
@@ -1,103 +0,0 @@
-import 'dart:async';
-
-import 'package:cryptography/cryptography.dart';
-import 'package:flutter/animation.dart';
-import 'package:flutter_logs/flutter_logs.dart';
-import 'package:locus/constants/values.dart';
-import 'package:locus/services/location_point_service.dart';
-import 'package:nostr/nostr.dart';
-
-import 'nostr-fetch.dart';
-
-VoidCallback getLocations({
- required final String nostrPublicKey,
- required final SecretKey encryptionPassword,
- required final List relays,
- required void Function(LocationPointService) onLocationFetched,
- required void Function() onEnd,
- final VoidCallback? onEmptyEnd,
- int? limit,
- DateTime? from,
- DateTime? until,
-}) {
- final request = Request(generate64RandomHexChars(), [
- Filter(
- kinds: [1000],
- authors: [nostrPublicKey],
- limit: limit,
- until:
- until == null ? null : (until.millisecondsSinceEpoch / 1000).floor(),
- since: from == null ? null : (from.millisecondsSinceEpoch / 1000).floor(),
- ),
- ]);
-
- final nostrFetch = NostrFetch(
- relays: relays,
- request: request,
- );
-
- return nostrFetch.fetchEvents(
- onEvent: (message, _) async {
- FlutterLogs.logInfo(
- LOG_TAG,
- "GetLocations",
- "New message. Decrypting...",
- );
-
- try {
- final location = await LocationPointService.fromEncrypted(
- message.message.content,
- encryptionPassword,
- );
-
- FlutterLogs.logInfo(
- LOG_TAG,
- "GetLocations",
- "New message. Decrypting... Done!",
- );
-
- onLocationFetched(location);
- } catch (error) {
- FlutterLogs.logError(
- LOG_TAG,
- "GetLocations",
- "Error decrypting message: $error",
- );
-
- return;
- }
- },
- onEnd: onEnd,
- onEmptyEnd: onEmptyEnd,
- );
-}
-
-Future> getLocationsAsFuture({
- required final String nostrPublicKey,
- required final SecretKey encryptionPassword,
- required final List relays,
- int? limit,
- DateTime? from,
- DateTime? until,
-}) async {
- final completer = Completer>();
-
- final List locations = [];
-
- getLocations(
- nostrPublicKey: nostrPublicKey,
- encryptionPassword: encryptionPassword,
- relays: relays,
- limit: limit,
- from: from,
- until: until,
- onLocationFetched: (final LocationPointService location) {
- locations.add(location);
- },
- onEnd: () {
- completer.complete(locations);
- },
- );
-
- return completer.future;
-}
diff --git a/lib/api/get-relays-meta.dart b/lib/api/get-relays-meta.dart
new file mode 100644
index 00000000..c1881157
--- /dev/null
+++ b/lib/api/get-relays-meta.dart
@@ -0,0 +1,185 @@
+import 'dart:convert';
+
+import 'package:collection/collection.dart';
+import 'package:flutter_animate/flutter_animate.dart';
+import 'package:locus/utils/access-deeply-nested-key.dart';
+import 'package:locus/utils/nostr_fetcher/BasicNostrFetchSocket.dart';
+import 'package:locus/utils/nostr_fetcher/NostrSocket.dart';
+import 'package:nostr/nostr.dart';
+
+const MIN_LENGTH = 5000;
+
+class RelaysMetaFetcher extends BasicNostrFetchSocket {
+ List meta = [];
+
+ RelaysMetaFetcher({
+ required super.relay,
+ super.timeout,
+ });
+
+ @override
+ void onEndOfStream() {
+ closeConnection();
+ }
+
+ @override
+ void onNostrEvent(final Message message) {
+ // Relay URL, canWrite and canRead are in message.tags
+ // Latencies are saved in content, separated per region
+ // with the following schema:
+ // [
+ // [],
+ // [],
+ // [],
+ // ]
+ final event = message.message as Event;
+
+ final relayMeta = RelayMeta.fromFetchedContent(
+ canWrite: event.tags[1][1] == "true",
+ canRead: event.tags[2][1] == "true",
+ relay: event.tags[0][1],
+ content: jsonDecode(event.content),
+ worldRegion: "eu-west",
+ );
+
+ meta.add(relayMeta);
+ }
+
+ @override
+ void onError(error) {
+ closeConnection();
+ }
+}
+
+class RelayMeta {
+ final String relay;
+ final bool canWrite;
+ final bool canRead;
+ final String contactInfo;
+ final String description;
+ final String name;
+
+ final List connectionLatencies;
+ final List readLatencies;
+ final List writeLatencies;
+
+ final int maxMessageLength;
+ final int maxContentLength;
+
+ final int minPowDifficulty;
+ final bool requiresPayment;
+
+ const RelayMeta({
+ required this.relay,
+ required this.canWrite,
+ required this.canRead,
+ required this.contactInfo,
+ required this.description,
+ required this.name,
+ required this.connectionLatencies,
+ required this.readLatencies,
+ required this.writeLatencies,
+ required this.maxMessageLength,
+ required this.maxContentLength,
+ required this.minPowDifficulty,
+ required this.requiresPayment,
+ });
+
+ factory RelayMeta.fromFetchedContent({
+ required final Map content,
+ required final String relay,
+ required final bool canRead,
+ required final bool canWrite,
+ required final String worldRegion,
+ }) =>
+ RelayMeta(
+ relay: relay,
+ canRead: canRead,
+ canWrite: canWrite,
+ name: adnk(content, "info.name") ?? relay,
+ contactInfo: adnk(content, "info.contact") ?? "",
+ description: adnk(content, "info.description") ?? "",
+ connectionLatencies: List.from(
+ adnk(content, "latency.$worldRegion.0") ?? [])
+ .where((value) => value != null)
+ .toList()
+ .cast(),
+ readLatencies:
+ List.from(adnk(content, "latency.$worldRegion.1") ?? [])
+ .where((value) => value != null)
+ .toList()
+ .cast(),
+ writeLatencies:
+ List.from(adnk(content, "latency.$worldRegion.2") ?? [])
+ .where((value) => value != null)
+ .toList()
+ .cast(),
+ maxContentLength:
+ adnk(content, "info.limitations.max_content_length") ??
+ MIN_LENGTH,
+ maxMessageLength:
+ adnk(content, "info.limitations.max_message_length") ??
+ MIN_LENGTH,
+ requiresPayment:
+ adnk(content, "info.limitations.payment_required") ??
+ false,
+ minPowDifficulty:
+ adnk(content, "info.limitations.min_pow_difficulty") ??
+ 0);
+
+ bool get isSuitable =>
+ canWrite &&
+ canRead &&
+ !requiresPayment &&
+ minPowDifficulty == 0 &&
+ maxContentLength >= MIN_LENGTH;
+
+ // Calculate average latency, we use the average as we want extreme highs
+ // to be taken into account.
+ double get score {
+ if (connectionLatencies.isEmpty ||
+ readLatencies.isEmpty ||
+ writeLatencies.isEmpty) {
+ // If there is no data available, we don't know if the relay is fully intact
+ return double.infinity;
+ }
+
+ // Each latency has it's own factor to give each of them a different weight
+ // Lower latency = better - Because of this
+ // a factor closer to 0 resembles a HIGHER weight
+ // We prioritize read latency as we want to be able to provide a fast app
+ // Lower score = better
+ return (connectionLatencies.average * 0.9 +
+ readLatencies.average * 0.5 +
+ writeLatencies.average) +
+ (maxContentLength - MIN_LENGTH) * 0.0001;
+ }
+}
+
+// Values taken from https://github.com/dskvr/nostr-watch/blob/develop/src/components/relays/jobs/LoadSeed.vue#L91
+final REQUEST_DATA = NostrSocket.createNostrRequestData(
+ kinds: [30304],
+ limit: 1000,
+ from: DateTime.now().subtract(2.hours),
+ authors: ["b3b0d247f66bf40c4c9f4ce721abfe1fd3b7529fbc1ea5e64d5f0f8df3a4b6e6"],
+);
+
+Future>> fetchRelaysMeta() async {
+ final fetcher = RelaysMetaFetcher(
+ relay: "wss://history.nostr.watch",
+ );
+ await fetcher.connect();
+ fetcher.addData(
+ Request(
+ generate64RandomHexChars(),
+ [
+ REQUEST_DATA,
+ ],
+ ).serialize(),
+ );
+ await fetcher.onComplete;
+
+ return {
+ "meta": fetcher.meta,
+ };
+}
diff --git a/lib/api/nostr-events.dart b/lib/api/nostr-events.dart
index 5ae1b1e1..dfa88cf4 100644
--- a/lib/api/nostr-events.dart
+++ b/lib/api/nostr-events.dart
@@ -2,10 +2,9 @@ import 'dart:io';
import 'package:flutter_logs/flutter_logs.dart';
import 'package:locus/constants/values.dart';
+import 'package:locus/services/task_service/index.dart';
import 'package:nostr/nostr.dart';
-import '../services/task_service.dart';
-
class NostrEventsManager {
final List relays;
final String _privateKey;
@@ -15,8 +14,7 @@ class NostrEventsManager {
required this.relays,
required String privateKey,
WebSocket? socket,
- })
- : _privateKey = privateKey,
+ }) : _privateKey = privateKey,
_socket = socket;
static NostrEventsManager fromTask(final Task task) {
@@ -48,10 +46,7 @@ class NostrEventsManager {
);
FlutterLogs.logInfo(
- LOG_TAG,
- "NostrEventsManager",
- "publishMessage: Publishing new event."
- );
+ LOG_TAG, "NostrEventsManager", "publishMessage: Publishing new event.");
var failedRelaysNumber = 0;
diff --git a/lib/api/nostr-fetch.dart b/lib/api/nostr-fetch.dart
index dd368cb8..c9d71d8e 100644
--- a/lib/api/nostr-fetch.dart
+++ b/lib/api/nostr-fetch.dart
@@ -1,6 +1,7 @@
import 'dart:io';
import 'dart:ui';
+import 'package:flutter_animate/flutter_animate.dart';
import 'package:flutter_logs/flutter_logs.dart';
import 'package:nostr/nostr.dart';
@@ -15,6 +16,7 @@ class NostrFetch {
required this.request,
});
+ // TODO: Refactor all of nostr fetching logic
Future _connectToRelay({
required final String relay,
required final Future Function(Message message, String relay) onEvent,
@@ -98,6 +100,20 @@ class NostrFetch {
}
});
+ socket.timeout(
+ 3.seconds,
+ onTimeout: (event) {
+ FlutterLogs.logError(
+ LOG_TAG,
+ "Nostr Socket $relay",
+ "Socket timed out.",
+ );
+
+ socket.close();
+ onEmptyEnd?.call();
+ },
+ );
+
return socket;
}
@@ -105,6 +121,7 @@ class NostrFetch {
required final Future Function(Message message, String relay) onEvent,
required final void Function() onEnd,
final void Function()? onEmptyEnd,
+ final VoidCallback? onError,
}) {
final List sockets = [];
@@ -136,6 +153,8 @@ class NostrFetch {
"Nostr Socket",
"Error for socket: $error",
);
+
+ onError?.call();
});
}
diff --git a/lib/constants/notifications.dart b/lib/constants/notifications.dart
index f79417d7..8f2a9940 100644
--- a/lib/constants/notifications.dart
+++ b/lib/constants/notifications.dart
@@ -1,7 +1,9 @@
enum AndroidChannelIDs {
locationAlarms,
+ appIssues,
}
enum NotificationActionType {
openTaskView,
+ openPermissionsSettings,
}
diff --git a/lib/constants/values.dart b/lib/constants/values.dart
index eaa19f53..8d9f838a 100644
--- a/lib/constants/values.dart
+++ b/lib/constants/values.dart
@@ -5,7 +5,7 @@ const TRANSLATION_HELP_URL = "https://github.com/Myzel394/locus";
const DONATION_URL = "https://github.com/Myzel394/locus";
const APK_RELEASES_URL = "https://github.com/Myzel394/locus/releases";
-const BACKGROUND_LOCATION_UPDATES_MINIMUM_DISTANCE_FILTER = 25;
+const BACKGROUND_LOCATION_UPDATES_MINIMUM_DISTANCE_FILTER = 50;
const LOCATION_FETCH_TIME_LIMIT = Duration(minutes: 5);
const LOCATION_INTERVAL = Duration(minutes: 1);
@@ -13,7 +13,7 @@ const LOCATION_INTERVAL = Duration(minutes: 1);
const TRANSFER_DATA_USERNAME = "locus_transfer";
final TRANSFER_SUCCESS_MESSAGE = Uint8List.fromList([1, 2, 3, 4]);
-const CURRENT_APP_VERSION = "0.14.3";
+const CURRENT_APP_VERSION = "0.15.0";
const LOG_TAG = "LocusLog";
@@ -31,3 +31,5 @@ const LOCATION_MERGE_DISTANCE_THRESHOLD = 75.0;
const LOCATION_FETCH_TIMEOUT_DURATION = Duration(minutes: 1);
const FALLBACK_LOCATION_ZOOM_LEVEL = 5.0;
const INITIAL_LOCATION_FETCHED_ZOOM_LEVEL = 14.0;
+
+const LOCATION_PUBLISH_MAX_TRIES = 3;
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index e76eba52..45c99ed1 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -110,6 +110,8 @@
}
},
"relaySelectSheet_selectRandomRelays": "Select {count} random Nostr Relays",
+ "relaySelectSheet_loadingRelaysMeta": "Loading Nostr Relays information...",
+ "relaySelectSheet_hint": "Relays are sorted from best to worst in ascending order. The best relays are at the top.",
"taskAction_start": "Start Task",
"taskAction_started_title": "Task started",
"taskAction_started_description": "Task started at {date}",
@@ -167,6 +169,7 @@
"taskAction_generateLink_process_publishing": "Publishing encrypted data...",
"taskAction_generateLink_process_creatingURI": "Creating link...",
"taskAction_generateLink_shareTextSubject": "Here's the link to see my location",
+ "taskAction_showDetails": "Show Details",
"tasks_action_stopAll": "Stop tasks",
"tasks_action_startAll": "Start tasks",
"tasks_examples_weekend": "Weekend Getaway",
@@ -253,10 +256,10 @@
"sharesOverviewScreen_importTask_importLabel": "Import",
"locationsOverview_viewSelection_all": "Show all locations",
"locationsOverview_activeShares_amount": "{count, plural, =0{No active shares} =1{One share active} other{{count} shares active}}",
- "locationsOverview_mapAction_goToCurrentPosition": "Go to current position",
- "locationsOverview_mapAction_alignNorth": "Align North",
"locationsOverview_mapAction_detailedLocations_show": "Show detailed locations",
"locationsOverview_mapAction_detailedLocations_hide": "Merge nearby locations",
+ "mapAction_goToCurrentPosition": "Go to current position",
+ "mapAction_alignNorth": "Align North",
"createTask_title": "Define a name for your Share",
"createTask_fields_name_label": "Name",
"createTask_sameTaskNameAlreadyExists": "A Share with this name already exists. You can create the Share, but you will have two Shares with the same name.",
@@ -439,6 +442,11 @@
"settingsScreen_settings_mapProvider_label": "Map Provider",
"settingsScreen_settings_mapProvider_apple": "Apple Maps",
"settingsScreen_settings_mapProvider_openStreetMap": "OpenStreetMap",
+ "settingsScreen_settings_useRealtimeUpdates_label": "Update in real-time",
+ "settingsScreen_settings_useRealtimeUpdates_description": "If enabled, Locus will always update your location in real-time. This means that your location will be updated even if you don't have the app open. This will use more battery. However, as a location sharing app, this is strongly recommended. Setting this off, Locus will only occasionally update your location in the background. This setting is only recommended for people who regularly share their location, experience battery drain and only need to know occasional location updates.",
+ "settingsScreen_settings_useRealtimeUpdates_dialog_title": "Are you sure you want to disable real-time updates?",
+ "settingsScreen_settings_useRealtimeUpdates_dialog_message": "It is strongly recommended to keep this setting enabled! Your location will only be occasionally updated if you disable real-time updates!",
+ "settingsScreen_settings_useRealtimeUpdates_dialog_confirm": "Disable",
"settingsScreen_settings_showHints_label": "Show Hints",
"settingsScreen_settings_showHints_description": "Show occasional hints on how to get the most out of Locus",
"settingsScreen_settings_relays_label": "Default Relays",
@@ -550,6 +558,9 @@
"@backgroundLocationFetch_text": {
"description": "Keep this very short"
},
+ "backgroundLocator_title": "Updating location in real-time",
+ "backgroundLocator_text": "Locus is updating your location in real-time.",
+ "backgroundLocator_channelName": "Location Updater",
"logs_createdAt": "{date}",
"@logs_createdAt": {
"placeholders": {
@@ -621,8 +632,6 @@
"logs_title": "Locus automatically creates logs",
"logs_description": "Logs are kept for 7 days and are automatically deleted afterwards.",
"locationPointsScreen_title": "Location Points",
- "bunny_unavailable": "Sorry, but it seems as if your friend is as lost as this song.",
- "bunny_unavailable_action": "What's this song?",
"locationAlarm_radiusBasedRegion_notificationTitle_whenEnter": "{name} entered zone {zone}",
"@locationAlarm_radiusBasedRegion_notificationTitle_whenEnter": {
"description": "Notification title when entering a zone; Try to keep this short, will be truncated to 80 characters",
@@ -659,12 +668,38 @@
}
}
},
+ "locationAlarm_proximityLocation_notificationTitle_whenEnter": "{name} is within {proximity}m",
+ "@locationAlarm_proximityLocation_notificationTitle_whenEnter": {
+ "description": "Notification title when entering a proximity location; Try to keep this short, will be truncated to 80 characters",
+ "placeholders": {
+ "name": {
+ "type": "String"
+ },
+ "proximity": {
+ "type": "int"
+ }
+ }
+ },
+ "locationAlarm_proximityLocation_notificationTitle_whenLeave": "{name} is outside of {proximity}m",
+ "@locationAlarm_proximityLocation_notificationTitle_whenLeave": {
+ "description": "Notification title when leaving a proximity location; Try to keep this short, will be truncated to 80 characters",
+ "placeholders": {
+ "name": {
+ "type": "String"
+ },
+ "proximity": {
+ "type": "int"
+ }
+ }
+ },
"locationAlarm_notification_description": "Tap for more information",
"androidNotificationChannel_locationAlarms_name": "Location Alarms",
"androidNotificationChannel_locationAlarms_description": "Receive notifications for location alarms",
+ "androidNotificationChannel_appIssues_name": "Important Issues",
+ "androidNotificationChannel_appIssues_description": "Receive notifications for important issues about Locus (when a task is not updating, location can't be updated, etc.)",
"location_manageAlarms_title": "Manage Alarms",
"location_manageAlarms_empty_title": "No Alarms",
- "location_manageAlarms_empty_description": "Add alarms to be notified when certain conditions are met (e.g. when this person enters a certain area).",
+ "location_manageAlarms_empty_description": "Add alarms to be notified when certain conditions are met",
"location_manageAlarms_addNewAlarm_actionLabel": "Add Alarm",
"location_manageAlarms_lastCheck_description": "Last checked at {date}",
"@location_manageAlarms_lastCheck_description": {
@@ -676,18 +711,42 @@
}
}
},
- "location_addAlarm_radiusBased_title": "Add radius-based Alarm",
+ "location_addAlarm_geo_title": "Add geo-based alarm",
+ "location_addAlarm_geo_description": "Define a region and get notified when your friend enters or leaves this region",
+ "location_addAlarm_geo_name_description": "Please enter a name for this region",
+ "location_addAlarm_geo_help_tapDescription": "Tap on the map to mark the center of your region",
+ "location_addAlarm_proximity_title": "Add proximity alarm",
+ "location_addAlarm_proximity_description": "Get notified when your friend is within a certain distance of you",
+ "location_addAlarm_radiusBased_radius_meters": "Radius: {value} meters",
+ "location_removeAlarm_title": "Remove Alarm",
+ "location_removeAlarm_description": "Are you sure you want to remove this alarm?",
+ "location_removeAlarm_confirm": "Remove",
+ "@location_addAlarm_radiusBased_radius_meters": {
+ "placeholders": {
+ "value": {
+ "type": "int"
+ }
+ }
+ },
+ "location_addAlarm_radiusBased_radius_kilometers": "Radius: {value} km",
+ "@location_addAlarm_radiusBased_radius_kilometers": {
+ "placeholders": {
+ "value": {
+ "type": "double"
+ }
+ }
+ },
"location_addAlarm_radiusBased_isInScaleMode": "You can now scale the radius by pinching and zooming into the map. Tap on the screen to go back to normal mode.",
"location_addAlarm_radiusBased_addLabel": "Select region",
"location_addAlarm_radiusBased_help_title": "Radius-based Alarms",
"location_addAlarm_radiusBased_help_description": "Radius-based alarms are triggered either when leaving or entering a region. After defining your region, you can decide when your alarm should trigger.",
- "location_addAlarm_radiusBased_help_tapDescription": "Tap on the map to mark the center of your region",
"location_addAlarm_radiusBased_help_pinchDescription": "Press and hold to enter into scale mode. You can then change the radius by pinching and zooming into the map.",
"location_addAlarm_radiusBased_trigger_title": "When should your alarm trigger?",
"location_addAlarm_radiusBased_trigger_whenEnter": "Trigger when entering",
"location_addAlarm_radiusBased_trigger_whenLeave": "Trigger when leaving",
- "location_addAlarm_radiusBased_name_description": "Please enter a name for this region",
"location_addAlarm_actionLabel": "Add Alarm",
+ "location_addAlarm_selectType_title": "Select Alarm Type",
+ "location_addAlarm_selectType_description": "What kind of alarm do you want to add?",
"permissions_openSettings_label": "Open settings",
"permissions_openSettings_failed_title": "Settings could not be opened",
"permissions_location_askPermission_title": "Grant access to your location",
@@ -758,6 +817,15 @@
"locations_values_lastLocation_description": "Last location update",
"locations_values_distance_description": "Distance",
"locations_values_distance_permissionRequired": "Grant permission",
+ "locations_values_distance_nearby": "<10 m",
+ "locations_values_distance_m": "{distance} m",
+ "@locations_values_distance_m": {
+ "placeholders": {
+ "distance": {
+ "type": "String"
+ }
+ }
+ },
"locations_values_distance_km": "{distance, select, 0 {<1 km} 1 {one km} other {{distance} km}}",
"@locations_values_distance_km": {
"placeholders": {
@@ -785,5 +853,7 @@
}
},
"locations_values_batteryState_description": "Battery state",
- "locations_values_batteryState_value": "{state, select, full {full} charging {charging} discharging {discharging} other {unknown}}"
+ "locations_values_batteryState_value": "{state, select, full {full} charging {charging} discharging {discharging} other {unknown}}",
+ "permissionsMissing_title": "Permissions missing",
+ "permissionsMissing_message": "Please allow access to your location in the background"
}
\ No newline at end of file
diff --git a/lib/main.dart b/lib/main.dart
index 5d33974e..cb007505 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -7,19 +7,21 @@ import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import 'package:flutter_logs/flutter_logs.dart';
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:locus/App.dart';
+import 'package:locus/api/get-relays-meta.dart';
+import 'package:locus/screens/locations_overview_screen_widgets/LocationFetchers.dart';
import 'package:locus/services/app_update_service.dart';
+import 'package:locus/services/current_location_service.dart';
import 'package:locus/services/log_service.dart';
-import 'package:locus/services/manager_service.dart';
-import 'package:locus/services/settings_service.dart';
-import 'package:locus/services/task_service.dart';
-import 'package:locus/services/view_service.dart';
+import 'package:locus/services/manager_service/background_fetch.dart';
+import 'package:locus/services/settings_service/index.dart';
+import 'package:locus/services/task_service/index.dart';
+import 'package:locus/services/view_service/index.dart';
import 'package:provider/provider.dart';
const storage = FlutterSecureStorage();
-final StreamController<
- NotificationResponse> selectedNotificationsStream = StreamController
- .broadcast();
+final StreamController selectedNotificationsStream =
+ StreamController.broadcast();
void main() async {
WidgetsFlutterBinding.ensureInitialized();
@@ -46,7 +48,8 @@ void main() async {
isDebuggable: kDebugMode,
);
- FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
+ FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
+ FlutterLocalNotificationsPlugin();
const initializationSettings = InitializationSettings(
android: AndroidInitializationSettings("ic_launcher_foreground"),
iOS: DarwinInitializationSettings(),
@@ -84,10 +87,12 @@ void main() async {
ChangeNotifierProvider(create: (_) => logService),
ChangeNotifierProvider(
create: (_) => appUpdateService),
+ ChangeNotifierProvider(
+ create: (_) => LocationFetchers(viewService.views)),
+ ChangeNotifierProvider(
+ create: (_) => CurrentLocationService()),
],
child: const App(),
),
);
-
- registerBackgroundFetch();
}
diff --git a/lib/models/log.dart b/lib/models/log.dart
index 9036539d..66cd79f8 100644
--- a/lib/models/log.dart
+++ b/lib/models/log.dart
@@ -2,8 +2,8 @@ import 'dart:convert';
import 'package:flutter/widgets.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:locus/services/location_alarm_service.dart';
-import 'package:locus/services/task_service.dart';
+import 'package:locus/services/location_alarm_service/enums.dart';
+import 'package:locus/services/task_service/index.dart';
import 'package:uuid/uuid.dart';
const uuid = Uuid();
@@ -226,8 +226,7 @@ class Log {
return CreateAlarmData.fromJSON(jsonDecode(payload));
}
- factory Log.fromJSON(Map json) =>
- Log(
+ factory Log.fromJSON(Map json) => Log(
id: json["i"],
createdAt: DateTime.parse(json["c"]),
type: LogType.values[json["t"]],
@@ -235,8 +234,7 @@ class Log {
payload: json["p"],
);
- Map toJSON() =>
- {
+ Map toJSON() => {
"i": id,
"c": createdAt.toIso8601String(),
"t": type.index,
@@ -275,24 +273,21 @@ class UpdateLocationData {
accuracy: json["c"],
tasks: List.from(
List>.from(json["t"]).map(
- (task) =>
- UpdatedTaskData(
- id: task["i"]!,
- name: task["n"]!,
- ),
+ (task) => UpdatedTaskData(
+ id: task["i"]!,
+ name: task["n"]!,
+ ),
),
),
);
- Map toJSON() =>
- {
+ Map toJSON() => {
"o": latitude,
"a": longitude,
"c": accuracy,
"t": List>.from(
tasks.map(
- (task) =>
- {
+ (task) => {
"i": task.id,
"n": task.name,
},
@@ -317,15 +312,13 @@ class CreateTaskData {
required this.creationContext,
});
- factory CreateTaskData.fromJSON(Map json) =>
- CreateTaskData(
+ factory CreateTaskData.fromJSON(Map json) => CreateTaskData(
id: json["i"],
name: json["n"],
creationContext: TaskCreationContext.values[json["c"]],
);
- Map toJSON() =>
- {
+ Map toJSON() => {
"i": id,
"n": name,
"c": creationContext.index,
@@ -341,13 +334,11 @@ class DeleteTaskData {
required this.name,
});
- factory DeleteTaskData.fromJSON(Map json) =>
- DeleteTaskData(
+ factory DeleteTaskData.fromJSON(Map json) => DeleteTaskData(
name: json["n"],
);
- Map toJSON() =>
- {
+ Map toJSON() => {
"n": name,
};
}
@@ -370,8 +361,7 @@ class TaskStatusChangeData {
active: json["s"],
);
- Map toJSON() =>
- {
+ Map toJSON() => {
"i": id,
"n": name,
"s": active,
@@ -389,14 +379,12 @@ class StopTaskData {
required this.name,
});
- factory StopTaskData.fromJSON(Map json) =>
- StopTaskData(
+ factory StopTaskData.fromJSON(Map json) => StopTaskData(
id: json["i"],
name: json["n"],
);
- Map toJSON() =>
- {
+ Map toJSON() => {
"i": id,
"n": name,
};
@@ -425,8 +413,7 @@ class CreateAlarmData {
viewName: json["n"],
);
- Map toJSON() =>
- {
+ Map toJSON() => {
"i": id,
"v": viewID,
"t": type.index,
@@ -449,8 +436,7 @@ class DeleteAlarmData {
viewName: json["n"],
);
- Map toJSON() =>
- {
+ Map toJSON() => {
"v": viewID,
"n": viewName,
};
diff --git a/lib/screens/CheckLocationScreen.dart b/lib/screens/CheckLocationScreen.dart
index af9b8b16..80d7835b 100644
--- a/lib/screens/CheckLocationScreen.dart
+++ b/lib/screens/CheckLocationScreen.dart
@@ -8,7 +8,7 @@ import 'package:geolocator/geolocator.dart';
import 'package:locus/constants/app.dart';
import 'package:locus/constants/spacing.dart';
import 'package:locus/constants/values.dart';
-import 'package:locus/services/settings_service.dart';
+import 'package:locus/services/settings_service/index.dart';
import 'package:locus/utils/helper_sheet.dart';
import 'package:locus/utils/load_status.dart';
import 'package:locus/utils/location/index.dart';
diff --git a/lib/screens/CreateTaskScreen.dart b/lib/screens/CreateTaskScreen.dart
index 40127348..e2eee72e 100644
--- a/lib/screens/CreateTaskScreen.dart
+++ b/lib/screens/CreateTaskScreen.dart
@@ -9,7 +9,8 @@ import 'package:flutter_platform_widgets/flutter_platform_widgets.dart'
hide PlatformListTile;
import 'package:locus/constants/spacing.dart';
import 'package:locus/screens/create_task_screen_widgets/ExampleTasksRoulette.dart';
-import 'package:locus/services/task_service.dart';
+import 'package:locus/services/settings_service/index.dart';
+import 'package:locus/services/task_service/index.dart';
import 'package:locus/utils/theme.dart';
import 'package:locus/widgets/MIUISelectField.dart';
import 'package:locus/widgets/RelaySelectSheet.dart';
@@ -21,7 +22,6 @@ import 'package:provider/provider.dart';
import '../models/log.dart';
import '../services/log_service.dart';
-import '../services/settings_service.dart';
import '../widgets/PlatformListTile.dart';
import '../widgets/WarningText.dart';
@@ -237,269 +237,255 @@ class _CreateTaskScreenState extends State
final l10n = AppLocalizations.of(context);
final settings = context.read();
- return PlatformScaffold(
- appBar: PlatformAppBar(
- title: Text(l10n.sharesOverviewScreen_createTask),
- material: (_, __) => MaterialAppBarData(
- centerTitle: true,
- ),
- ),
- material: (_, __) => MaterialScaffoldData(
- backgroundColor: Theme.of(context).scaffoldBackgroundColor,
- ),
- body: SafeArea(
- child: Padding(
- padding: const EdgeInsets.all(MEDIUM_SPACE),
- child: Center(
- child: Form(
- key: _formKey,
- child: Column(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- crossAxisAlignment: CrossAxisAlignment.stretch,
- children: [
- SingleChildScrollView(
- child: Column(
- children: [
- Column(
- children: [
- const SizedBox(height: SMALL_SPACE),
- Text(
- l10n.createTask_title,
- style: getSubTitleTextStyle(context),
- ),
- ],
- ),
- const SizedBox(height: LARGE_SPACE),
- Column(
- children: [
- Focus(
- onFocusChange: (hasFocus) {
- if (!hasFocus) {
- return;
+ return SafeArea(
+ child: Padding(
+ padding: const EdgeInsets.all(MEDIUM_SPACE),
+ child: Center(
+ child: Form(
+ key: _formKey,
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ crossAxisAlignment: CrossAxisAlignment.stretch,
+ children: [
+ SingleChildScrollView(
+ child: Column(
+ children: [
+ Column(
+ children: [
+ const SizedBox(height: SMALL_SPACE),
+ Text(
+ l10n.createTask_title,
+ style: getSubTitleTextStyle(context),
+ ),
+ ],
+ ),
+ const SizedBox(height: LARGE_SPACE),
+ Column(
+ children: [
+ Focus(
+ onFocusChange: (hasFocus) {
+ if (!hasFocus) {
+ return;
+ }
+
+ setState(() {
+ showExamples = true;
+ });
+ },
+ child: PlatformTextFormField(
+ controller: _nameController,
+ textInputAction: TextInputAction.next,
+ validator: (value) {
+ if (value == null || value.isEmpty) {
+ return l10n.fields_errors_isEmpty;
}
- setState(() {
- showExamples = true;
- });
+ if (!StringUtils.isAscii(value)) {
+ return l10n.fields_errors_invalidCharacters;
+ }
+
+ return null;
},
- child: PlatformTextFormField(
- controller: _nameController,
- textInputAction: TextInputAction.next,
- validator: (value) {
- if (value == null || value.isEmpty) {
- return l10n.fields_errors_isEmpty;
- }
-
- if (!StringUtils.isAscii(value)) {
- return l10n.fields_errors_invalidCharacters;
- }
-
- return null;
- },
- keyboardType: TextInputType.name,
- autofillHints: const [AutofillHints.name],
- material: (_, __) => MaterialTextFormFieldData(
- decoration: InputDecoration(
- labelText:
- l10n.createTask_fields_name_label,
- prefixIcon: Icon(context.platformIcons.tag),
- ),
+ keyboardType: TextInputType.name,
+ autofillHints: const [AutofillHints.name],
+ material: (_, __) => MaterialTextFormFieldData(
+ decoration: InputDecoration(
+ labelText: l10n.createTask_fields_name_label,
+ prefixIcon: Icon(context.platformIcons.tag),
),
- cupertino: (_, __) =>
- CupertinoTextFormFieldData(
- placeholder:
- l10n.createTask_fields_name_label,
- prefix: Icon(context.platformIcons.tag),
+ ),
+ cupertino: (_, __) => CupertinoTextFormFieldData(
+ placeholder: l10n.createTask_fields_name_label,
+ prefix: Icon(context.platformIcons.tag),
+ ),
+ )
+ .animate()
+ .slide(
+ duration: IN_DURATION,
+ curve: Curves.easeOut,
+ begin: const Offset(0, 0.2),
+ )
+ .fadeIn(
+ delay: IN_DELAY,
+ duration: IN_DURATION,
+ curve: Curves.easeOut,
),
- )
- .animate()
- .slide(
- duration: IN_DURATION,
- curve: Curves.easeOut,
- begin: const Offset(0, 0.2),
- )
- .fadeIn(
- delay: IN_DELAY,
- duration: IN_DURATION,
- curve: Curves.easeOut,
- ),
+ ),
+ if (showExamples)
+ ExampleTasksRoulette(
+ onSelected: (example) {
+ FocusManager.instance.primaryFocus?.unfocus();
+
+ _nameController.text = example.name;
+ _timersController
+ ..clear()
+ ..addAll(example.timers);
+ },
+ ),
+ if (anotherTaskAlreadyExists) ...[
+ const SizedBox(height: MEDIUM_SPACE),
+ WarningText(
+ l10n.createTask_sameTaskNameAlreadyExists,
),
- if (showExamples)
- ExampleTasksRoulette(
- onSelected: (example) {
- FocusManager.instance.primaryFocus?.unfocus();
-
- _nameController.text = example.name;
- _timersController
- ..clear()
- ..addAll(example.timers);
- },
+ ],
+ const SizedBox(height: MEDIUM_SPACE),
+ if (settings.isMIUI()) ...[
+ MIUISelectField(
+ label: l10n.createTask_fields_relays_label,
+ actionText:
+ l10n.createTask_fields_relays_selectLabel(
+ _relaysController.relays.length,
),
- if (anotherTaskAlreadyExists) ...[
- const SizedBox(height: MEDIUM_SPACE),
- WarningText(
- l10n.createTask_sameTaskNameAlreadyExists,
+ icon: const Icon(Icons.dns_rounded),
+ onPressed: showRelaysSheet,
+ ).animate().then(delay: IN_DELAY * 4).fadeIn(
+ delay: IN_DELAY,
+ duration: IN_DURATION,
+ curve: Curves.easeOut,
+ ),
+ MIUISelectField(
+ label: l10n.createTask_fields_timers_label,
+ actionText:
+ l10n.createTask_fields_timers_selectLabel(
+ _timersController.timers.length,
),
- ],
- const SizedBox(height: MEDIUM_SPACE),
- if (settings.isMIUI()) ...[
- MIUISelectField(
- label: l10n.createTask_fields_relays_label,
- actionText:
- l10n.createTask_fields_relays_selectLabel(
- _relaysController.relays.length,
+ icon: const Icon(Icons.timer_rounded),
+ onPressed: showTimersSheet,
+ ).animate().then(delay: IN_DELAY * 4).fadeIn(
+ delay: IN_DELAY,
+ duration: IN_DURATION,
+ curve: Curves.easeOut,
),
- icon: const Icon(Icons.dns_rounded),
- onPressed: showRelaysSheet,
- ).animate().then(delay: IN_DELAY * 4).fadeIn(
- delay: IN_DELAY,
- duration: IN_DURATION,
- curve: Curves.easeOut,
+ ] else
+ Wrap(
+ alignment: WrapAlignment.spaceEvenly,
+ spacing: SMALL_SPACE,
+ crossAxisAlignment: WrapCrossAlignment.center,
+ direction: Axis.horizontal,
+ children: [
+ PlatformElevatedButton(
+ material: (_, __) =>
+ MaterialElevatedButtonData(
+ icon: PlatformWidget(
+ material: (_, __) =>
+ const Icon(Icons.dns_rounded),
+ cupertino: (_, __) => const Icon(
+ CupertinoIcons.list_bullet),
+ ),
),
- MIUISelectField(
- label: l10n.createTask_fields_timers_label,
- actionText:
- l10n.createTask_fields_timers_selectLabel(
- _timersController.timers.length,
- ),
- icon: const Icon(Icons.timer_rounded),
- onPressed: showTimersSheet,
- ).animate().then(delay: IN_DELAY * 4).fadeIn(
- delay: IN_DELAY,
- duration: IN_DURATION,
- curve: Curves.easeOut,
+ cupertino: (_, __) =>
+ CupertinoElevatedButtonData(
+ padding: getSmallButtonPadding(context),
),
- ] else
- Wrap(
- alignment: WrapAlignment.spaceEvenly,
- spacing: SMALL_SPACE,
- crossAxisAlignment: WrapCrossAlignment.center,
- direction: Axis.horizontal,
- children: [
- PlatformElevatedButton(
- material: (_, __) =>
- MaterialElevatedButtonData(
- icon: PlatformWidget(
- material: (_, __) =>
- const Icon(Icons.dns_rounded),
- cupertino: (_, __) => const Icon(
- CupertinoIcons.list_bullet),
- ),
- ),
- cupertino: (_, __) =>
- CupertinoElevatedButtonData(
- padding: getSmallButtonPadding(context),
- ),
- onPressed: showRelaysSheet,
- child: Text(
- l10n.createTask_fields_relays_selectLabel(
- _relaysController.relays.length,
- ),
+ onPressed: showRelaysSheet,
+ child: Text(
+ l10n.createTask_fields_relays_selectLabel(
+ _relaysController.relays.length,
),
- )
- .animate()
- .then(delay: IN_DELAY * 4)
- .slide(
- duration: IN_DURATION,
- curve: Curves.easeOut,
- begin: const Offset(0.2, 0),
- )
- .fadeIn(
- delay: IN_DELAY,
- duration: IN_DURATION,
- curve: Curves.easeOut,
- ),
- PlatformElevatedButton(
- material: (_, __) =>
- MaterialElevatedButtonData(
- icon: const Icon(Icons.timer_rounded),
+ ),
+ )
+ .animate()
+ .then(delay: IN_DELAY * 4)
+ .slide(
+ duration: IN_DURATION,
+ curve: Curves.easeOut,
+ begin: const Offset(0.2, 0),
+ )
+ .fadeIn(
+ delay: IN_DELAY,
+ duration: IN_DURATION,
+ curve: Curves.easeOut,
),
- cupertino: (_, __) =>
- CupertinoElevatedButtonData(
- padding: getSmallButtonPadding(context),
+ PlatformElevatedButton(
+ material: (_, __) =>
+ MaterialElevatedButtonData(
+ icon: const Icon(Icons.timer_rounded),
+ ),
+ cupertino: (_, __) =>
+ CupertinoElevatedButtonData(
+ padding: getSmallButtonPadding(context),
+ ),
+ onPressed: showTimersSheet,
+ child: Text(
+ l10n.createTask_fields_timers_selectLabel(
+ _timersController.timers.length,
),
- onPressed: showTimersSheet,
- child: Text(
- l10n.createTask_fields_timers_selectLabel(
- _timersController.timers.length,
- ),
+ ),
+ )
+ .animate()
+ .then(delay: IN_DELAY * 5)
+ .slide(
+ duration: IN_DURATION,
+ curve: Curves.easeOut,
+ begin: const Offset(-0.2, 0),
+ )
+ .fadeIn(
+ delay: IN_DELAY,
+ duration: IN_DURATION,
+ curve: Curves.easeOut,
),
- )
- .animate()
- .then(delay: IN_DELAY * 5)
- .slide(
- duration: IN_DURATION,
- curve: Curves.easeOut,
- begin: const Offset(-0.2, 0),
- )
- .fadeIn(
- delay: IN_DELAY,
- duration: IN_DURATION,
- curve: Curves.easeOut,
- ),
- ],
- ),
- const SizedBox(height: MEDIUM_SPACE),
- getScheduleNowWidget(),
- ],
- ),
- ],
+ ],
+ ),
+ const SizedBox(height: MEDIUM_SPACE),
+ getScheduleNowWidget(),
+ ],
+ ),
+ ],
+ ),
+ ),
+ if (errorMessage != null) ...[
+ Text(
+ errorMessage!,
+ textAlign: TextAlign.center,
+ style: getBodyTextTextStyle(context).copyWith(
+ color: getErrorColor(context),
),
),
- if (errorMessage != null) ...[
- Text(
- errorMessage!,
- textAlign: TextAlign.center,
- style: getBodyTextTextStyle(context).copyWith(
- color: getErrorColor(context),
- ),
+ const SizedBox(height: MEDIUM_SPACE),
+ ],
+ if (_isError) ...[
+ Text(
+ l10n.unknownError,
+ style: getBodyTextTextStyle(context).copyWith(
+ color: getErrorColor(context),
),
- const SizedBox(height: MEDIUM_SPACE),
- ],
- if (_isError) ...[
- Text(
- l10n.unknownError,
- style: getBodyTextTextStyle(context).copyWith(
- color: getErrorColor(context),
- ),
+ ),
+ ],
+ PlatformElevatedButton(
+ padding: const EdgeInsets.all(MEDIUM_SPACE),
+ onPressed: () {
+ if (!_formKey.currentState!.validate()) {
+ return;
+ }
+
+ if (_relaysController.relays.isEmpty) {
+ setState(() {
+ errorMessage = l10n.createTask_errors_emptyRelays;
+ });
+ return;
+ }
+
+ createTask();
+ },
+ child: Text(
+ l10n.createTask_createLabel,
+ style: TextStyle(
+ fontSize: getActionButtonSize(context),
),
- ],
- PlatformElevatedButton(
- padding: const EdgeInsets.all(MEDIUM_SPACE),
- onPressed: () {
- if (!_formKey.currentState!.validate()) {
- return;
- }
-
- if (_relaysController.relays.isEmpty) {
- setState(() {
- errorMessage = l10n.createTask_errors_emptyRelays;
- });
- return;
- }
-
- createTask();
- },
- child: Text(
- l10n.createTask_createLabel,
- style: TextStyle(
- fontSize: getActionButtonSize(context),
- ),
+ ),
+ )
+ .animate()
+ .then(delay: IN_DELAY * 8)
+ .slide(
+ duration: 500.ms,
+ curve: Curves.easeOut,
+ begin: const Offset(0, 1.3),
+ )
+ .fadeIn(
+ duration: 500.ms,
+ curve: Curves.easeOut,
),
- )
- .animate()
- .then(delay: IN_DELAY * 8)
- .slide(
- duration: 500.ms,
- curve: Curves.easeOut,
- begin: const Offset(0, 1.3),
- )
- .fadeIn(
- duration: 500.ms,
- curve: Curves.easeOut,
- ),
- ],
- ),
+ ],
),
),
),
diff --git a/lib/screens/ImportTaskSheet.dart b/lib/screens/ImportTaskSheet.dart
index 146a829a..563b842c 100644
--- a/lib/screens/ImportTaskSheet.dart
+++ b/lib/screens/ImportTaskSheet.dart
@@ -12,12 +12,12 @@ import 'package:locus/screens/import_task_sheet_widgets/ImportSuccess.dart';
import 'package:locus/screens/import_task_sheet_widgets/NameForm.dart';
import 'package:locus/screens/import_task_sheet_widgets/URLForm.dart';
import 'package:locus/screens/import_task_sheet_widgets/ViewImportOverview.dart';
-import 'package:locus/services/view_service.dart';
+import 'package:locus/services/view_service/index.dart';
import 'package:locus/utils/theme.dart';
import 'package:locus/widgets/ModalSheetContent.dart';
import 'package:provider/provider.dart';
-import '../services/task_service.dart';
+import '../services/task_service/index.dart';
import '../widgets/ModalSheet.dart';
import 'import_task_sheet_widgets/ReceiveViewByBluetooth.dart';
diff --git a/lib/screens/LocationsOverviewScreen.dart b/lib/screens/LocationsOverviewScreen.dart
index 411f0fbe..d41315ae 100644
--- a/lib/screens/LocationsOverviewScreen.dart
+++ b/lib/screens/LocationsOverviewScreen.dart
@@ -1,6 +1,8 @@
import 'dart:async';
import 'dart:convert';
+import 'dart:core';
import 'dart:io';
+import 'dart:math';
import "package:apple_maps_flutter/apple_maps_flutter.dart" as apple_maps;
import 'package:collection/collection.dart';
@@ -17,17 +19,23 @@ import 'package:flutter_map_marker_popup/flutter_map_marker_popup.dart';
import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
import 'package:geolocator/geolocator.dart';
import 'package:latlong2/latlong.dart';
+import 'package:locus/api/get-relays-meta.dart';
import 'package:locus/constants/spacing.dart';
import 'package:locus/screens/ImportTaskSheet.dart';
import 'package:locus/screens/SettingsScreen.dart';
import 'package:locus/screens/SharesOverviewScreen.dart';
import 'package:locus/screens/locations_overview_screen_widgets/ActiveSharesSheet.dart';
+import 'package:locus/screens/locations_overview_screen_widgets/LocationFetchers.dart';
import 'package:locus/screens/locations_overview_screen_widgets/OutOfBoundMarker.dart';
import 'package:locus/screens/locations_overview_screen_widgets/ShareLocationSheet.dart';
import 'package:locus/screens/locations_overview_screen_widgets/ViewLocationPopup.dart';
-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/services/current_location_service.dart';
+import 'package:locus/services/manager_service/background_locator.dart';
+import 'package:locus/services/manager_service/helpers.dart';
+import 'package:locus/services/settings_service/SettingsMapLocation.dart';
+import 'package:locus/services/settings_service/index.dart';
+import 'package:locus/services/task_service/index.dart';
+import 'package:locus/services/view_service/index.dart';
import 'package:locus/utils/location/get-fallback-location.dart';
import 'package:locus/utils/location/index.dart';
import 'package:locus/utils/navigation.dart';
@@ -35,13 +43,16 @@ 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/CompassMapAction.dart';
import 'package:locus/widgets/FABOpenContainer.dart';
+import 'package:locus/widgets/GoToMyLocationMapAction.dart';
import 'package:locus/widgets/LocationsMap.dart';
import 'package:locus/widgets/LocusFlutterMap.dart';
+import 'package:locus/widgets/MapActionsContainer.dart';
import 'package:locus/widgets/Paper.dart';
-import 'package:locus/widgets/PlatformFlavorWidget.dart';
import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
+import 'package:permission_handler/permission_handler.dart';
import 'package:provider/provider.dart';
import 'package:uni_links/uni_links.dart';
@@ -52,15 +63,13 @@ import '../main.dart';
import '../services/app_update_service.dart';
import '../services/location_point_service.dart';
import '../services/log_service.dart';
-import '../services/manager_service.dart';
-import '../services/settings_service.dart';
+import '../services/manager_service/background_fetch.dart';
import '../utils/PageRoute.dart';
import '../utils/color.dart';
import '../utils/platform.dart';
import '../utils/theme.dart';
-import 'ViewDetailScreen.dart';
+import 'ViewDetailsScreen.dart';
import 'locations_overview_screen_widgets/ViewDetailsSheet.dart';
-import 'locations_overview_screen_widgets/constants.dart';
// After this threshold, locations will not be merged together anymore
const LOCATION_DETAILS_ZOOM_THRESHOLD = 17;
@@ -84,14 +93,10 @@ class _LocationsOverviewScreenState extends State
AutomaticKeepAliveClientMixin,
WidgetsBindingObserver,
TickerProviderStateMixin {
- late final ViewLocationFetcher _fetchers;
MapController? flutterMapController;
PopupController? flutterMapPopupController;
apple_maps.AppleMapController? appleMapController;
- late final AnimationController rotationController;
- late Animation rotationAnimation;
-
bool showFAB = true;
bool isNorth = true;
@@ -103,12 +108,7 @@ class _LocationsOverviewScreenState extends State
// Dummy stream to trigger updates to out of bound markers
StreamController mapEventStream = StreamController.broadcast();
- // Since we already listen to the latest position, we will pass it
- // manually to `current_location_layer` to avoid it also registering
- // extra listeners.
- final StreamController
- _currentLocationPositionStream =
- StreamController.broadcast();
+ LocationPointService? visibleLocation;
Position? lastPosition;
StreamSubscription? _uniLinksStream;
@@ -118,10 +118,6 @@ class _LocationsOverviewScreenState extends State
// Null = all views
String? selectedViewID;
- bool _hasGoneToInitialPosition = false;
-
- final Map> _cachedMergedLocations = {};
-
TaskView? get selectedView {
if (selectedViewID == null) {
return null;
@@ -137,55 +133,54 @@ class _LocationsOverviewScreenState extends State
void initState() {
super.initState();
- _createLocationFetcher();
+ final taskService = context.read();
+ final viewService = context.read();
+ final logService = context.read();
+ final settings = context.read();
+ final appUpdateService = context.read();
+ final locationFetchers = context.read();
+
+ _handleViewAlarmChecker();
+ _handleNotifications();
+
+ locationFetchers.addAll(viewService.views);
+
+ settings.addListener(_updateBackgroundListeners);
+ taskService.addListener(_updateBackgroundListeners);
+ locationFetchers.addLocationUpdatesListener(_rebuild);
WidgetsBinding.instance
..addObserver(this)
- ..addPostFrameCallback((_) async {
+ ..addPostFrameCallback((_) {
_setLocationFromSettings();
- configureBackgroundFetch();
-
- final taskService = context.read();
- final viewService = context.read();
- final logService = context.read();
- final appUpdateService = context.read();
- _fetchers.addListener(_rebuild);
- appUpdateService.addListener(_rebuild);
-
initQuickActions(context);
_initUniLinks();
_updateLocaleToSettings();
+ _updateBackgroundListeners();
_showUpdateDialogIfRequired();
+ _initLiveLocationUpdate();
+ locationFetchers.fetchPreviewLocations();
taskService.checkup(logService);
- hasGrantedLocationPermission().then((hasGranted) {
- if (hasGranted) {
- _initLiveLocationUpdate();
+ appUpdateService.addListener(_rebuild);
+ viewService.addListener(_handleViewServiceChange);
+
+ Geolocator.checkPermission().then((status) {
+ if ({LocationPermission.always, LocationPermission.whileInUse}
+ .contains(status)) {
+ updateCurrentPosition(
+ askPermissions: false,
+ showErrorMessage: false,
+ goToPosition: true,
+ );
}
});
-
- viewService.addListener(_handleViewServiceChange);
});
- _handleViewAlarmChecker();
- _handleNotifications();
-
- final settings = context.read();
if (settings.getMapProvider() == MapProvider.openStreetMap) {
flutterMapController = MapController();
flutterMapController!.mapEventStream.listen((event) {
- if (event is MapEventRotate) {
- rotationController.animateTo(
- ((event.targetRotation % 360) / 360),
- duration: Duration.zero,
- );
-
- setState(() {
- isNorth = (event.targetRotation % 360).abs() < 1;
- });
- }
-
if (event is MapEventWithMove ||
event is MapEventDoubleTapZoom ||
event is MapEventScrollWheelZoom) {
@@ -200,32 +195,25 @@ class _LocationsOverviewScreenState extends State
flutterMapPopupController = PopupController();
}
-
- rotationController =
- AnimationController(vsync: this, duration: Duration.zero);
- rotationAnimation = Tween(
- begin: 0,
- end: 2 * pi,
- ).animate(rotationController);
}
@override
dispose() {
+ final appUpdateService = context.read();
+ final locationFetchers = context.read();
+
flutterMapController?.dispose();
- _fetchers.dispose();
- _positionStream?.drain();
_viewsAlarmCheckerTimer?.cancel();
_uniLinksStream?.cancel();
- _positionStream?.drain();
mapEventStream.close();
_removeLiveLocationUpdate();
WidgetsBinding.instance.removeObserver(this);
- final appUpdateService = context.read();
appUpdateService.removeListener(_rebuild);
+ locationFetchers.removeLocationUpdatesListener(_rebuild);
super.dispose();
}
@@ -235,22 +223,30 @@ class _LocationsOverviewScreenState extends State
super.didChangeAppLifecycleState(state);
if (state == AppLifecycleState.resumed) {
- goToCurrentPosition(showErrorMessage: false);
+ updateCurrentPosition(
+ askPermissions: false,
+ goToPosition: false,
+ showErrorMessage: false,
+ );
}
}
void _handleViewServiceChange() {
final viewService = context.read();
+ final locationFetchers = context.read();
+
final newView = viewService.views.last;
- _fetchers.addView(newView);
+ locationFetchers.add(newView);
+ locationFetchers.fetchPreviewLocations();
}
void _setLocationFromSettings() async {
final settings = context.read();
- final position = settings.getLastMapLocation();
+ final rawPosition = settings.getLastMapLocation();
+ final currentLocation = context.read();
- if (position == null) {
+ if (rawPosition == null) {
return;
}
@@ -258,26 +254,32 @@ class _LocationsOverviewScreenState extends State
locationStatus = LocationStatus.stale;
});
- _currentLocationPositionStream.add(
- LocationMarkerPosition(
- latitude: position.latitude,
- longitude: position.longitude,
- accuracy: position.accuracy,
- ),
+ final position = Position(
+ latitude: rawPosition.latitude,
+ longitude: rawPosition.longitude,
+ accuracy: rawPosition.accuracy,
+ altitudeAccuracy: 0.0,
+ headingAccuracy: 0.0,
+ timestamp: DateTime.now(),
+ altitude: 0,
+ heading: 0,
+ speed: 0,
+ speedAccuracy: 0,
);
+
+ await _animateToPosition(position);
+ currentLocation.updateCurrentPosition(position);
}
List mergeLocationsIfRequired(
- final TaskView view,
+ final List locations,
) {
- final locations = _fetchers.locations[view] ?? [];
-
- if (showDetailedLocations && !disableShowDetailedLocations) {
+ if (locations.isEmpty) {
return locations;
}
- if (_cachedMergedLocations.containsKey(selectedView)) {
- return _cachedMergedLocations[selectedView]!;
+ if (showDetailedLocations && !disableShowDetailedLocations) {
+ return locations;
}
final mergedLocations = mergeLocations(
@@ -285,17 +287,9 @@ class _LocationsOverviewScreenState extends State
distanceThreshold: LOCATION_MERGE_DISTANCE_THRESHOLD,
);
- _cachedMergedLocations[view] = mergedLocations;
-
return mergedLocations;
}
- void _createLocationFetcher() {
- final viewService = context.read();
-
- _fetchers = ViewLocationFetcher(viewService.views)..fetchLocations();
- }
-
void _rebuild() {
if (!mounted) {
return;
@@ -351,6 +345,41 @@ class _LocationsOverviewScreenState extends State
await settings.save();
}
+ void _updateBackgroundListeners() async {
+ final settings = context.read();
+ final taskService = context.read();
+
+ if (settings.useRealtimeUpdates &&
+ ((await taskService.hasRunningTasks()) ||
+ (await taskService.hasScheduledTasks()))) {
+ removeBackgroundFetch();
+
+ await configureBackgroundLocator();
+ await initializeBackgroundLocator(context);
+ } else {
+ await configureBackgroundFetch();
+ registerBackgroundFetch();
+ }
+ }
+
+ void _checkViewAlarms(
+ final Position position,
+ ) async {
+ final l10n = AppLocalizations.of(context);
+ final viewService = context.read();
+ final userLocation = await LocationPointService.fromPosition(position);
+
+ if (!mounted) {
+ return;
+ }
+
+ checkViewAlarms(
+ l10n: l10n,
+ viewService: viewService,
+ userLocation: userLocation,
+ );
+ }
+
void _initLiveLocationUpdate() {
if (_positionStream != null) {
return;
@@ -361,50 +390,19 @@ class _LocationsOverviewScreenState extends State
);
_positionStream!.listen((position) async {
- _currentLocationPositionStream.add(
- LocationMarkerPosition(
- latitude: position.latitude,
- longitude: position.longitude,
- accuracy: position.accuracy,
- ),
- );
-
- _updateLocationToSettings(position);
+ final taskService = context.read();
+ final currentLocation = context.read();
- if (!_hasGoneToInitialPosition) {
- if (flutterMapController != null) {
- flutterMapController!.move(
- LatLng(position.latitude, position.longitude),
- INITIAL_LOCATION_FETCHED_ZOOM_LEVEL,
- );
- }
+ currentLocation.updateCurrentPosition(position);
- // Print statement is required to work
- print(appleMapController);
- if (appleMapController != null) {
- if (_hasGoneToInitialPosition) {
- appleMapController!.animateCamera(
- apple_maps.CameraUpdate.newLatLng(
- apple_maps.LatLng(position.latitude, position.longitude),
- ),
- );
- } else {
- appleMapController!.moveCamera(
- apple_maps.CameraUpdate.newLatLng(
- apple_maps.LatLng(position.latitude, position.longitude),
- ),
- );
- }
- }
- _hasGoneToInitialPosition = true;
- }
+ _checkViewAlarms(position);
+ _updateLocationToSettings(position);
setState(() {
lastPosition = position;
locationStatus = LocationStatus.active;
});
- final taskService = context.read();
final runningTasks = await taskService.getRunningTasks().toList();
if (runningTasks.isEmpty) {
@@ -414,7 +412,8 @@ class _LocationsOverviewScreenState extends State
final locationData = await LocationPointService.fromPosition(position);
for (final task in runningTasks) {
- await task.publishLocation(
+ await task.publisher.publishOutstandingPositions();
+ await task.publisher.publishLocation(
locationData.copyWithDifferentId(),
);
}
@@ -484,17 +483,10 @@ class _LocationsOverviewScreenState extends State
const Duration(minutes: 1),
(_) {
final viewService = context.read();
- final l10n = AppLocalizations.of(context);
if (viewService.viewsWithAlarms.isEmpty) {
return;
}
-
- checkViewAlarms(
- l10n: l10n,
- views: viewService.viewsWithAlarms,
- viewService: viewService,
- );
},
);
}
@@ -518,19 +510,22 @@ class _LocationsOverviewScreenState extends State
Navigator.of(context).push(
NativePageRoute(
context: context,
- builder: (_) => ViewDetailScreen(
+ builder: (_) => ViewDetailsScreen(
view: viewService.getViewById(data["taskViewID"]),
),
),
);
+ break;
+ case NotificationActionType.openPermissionsSettings:
+ openAppSettings();
+
break;
}
} catch (error) {
- FlutterLogs.logErrorTrace(
+ FlutterLogs.logError(
LOG_TAG,
"Notification",
- "Error handling notification.",
- error as Error,
+ "Error handling notification: $error",
);
}
});
@@ -592,10 +587,47 @@ class _LocationsOverviewScreenState extends State
}
}
- void goToCurrentPosition({
- final bool askPermissions = false,
- final bool showErrorMessage = true,
+ Future _animateToPosition(
+ final Position position,
+ ) async {
+ if (flutterMapController != null) {
+ final zoom = max(15, flutterMapController!.zoom).toDouble();
+
+ flutterMapController?.move(
+ LatLng(
+ position.latitude,
+ position.longitude,
+ ),
+ zoom,
+ );
+ }
+
+ if (appleMapController != null) {
+ final zoom = max(
+ 15,
+ (await appleMapController!.getZoomLevel())!,
+ ).toDouble();
+
+ appleMapController?.animateCamera(
+ apple_maps.CameraUpdate.newCameraPosition(
+ apple_maps.CameraPosition(
+ target: apple_maps.LatLng(
+ position.latitude,
+ position.longitude,
+ ),
+ zoom: zoom,
+ ),
+ ),
+ );
+ }
+ }
+
+ void updateCurrentPosition({
+ required final bool askPermissions,
+ required final bool goToPosition,
+ required final bool showErrorMessage,
}) async {
+ final currentLocation = context.read();
final previousValue = locationStatus;
setState(() {
@@ -620,29 +652,6 @@ class _LocationsOverviewScreenState extends State
return;
}
- _initLiveLocationUpdate();
-
- if (lastPosition != null) {
- if (flutterMapController != null) {
- flutterMapController?.move(
- LatLng(lastPosition!.latitude, lastPosition!.longitude),
- 13,
- );
- }
-
- if (appleMapController != null) {
- appleMapController?.animateCamera(
- apple_maps.CameraUpdate.newCameraPosition(
- apple_maps.CameraPosition(
- target: apple_maps.LatLng(
- lastPosition!.latitude, lastPosition!.longitude),
- zoom: 13,
- ),
- ),
- );
- }
- }
-
FlutterLogs.logInfo(
LOG_TAG,
"LocationOverviewScreen",
@@ -652,13 +661,11 @@ class _LocationsOverviewScreenState extends State
try {
final latestPosition = await getCurrentPosition();
- _currentLocationPositionStream.add(
- LocationMarkerPosition(
- latitude: latestPosition.latitude,
- longitude: latestPosition.longitude,
- accuracy: latestPosition.accuracy,
- ),
- );
+ currentLocation.updateCurrentPosition(latestPosition);
+
+ if (goToPosition) {
+ _animateToPosition(latestPosition);
+ }
setState(() {
lastPosition = latestPosition;
@@ -681,12 +688,13 @@ class _LocationsOverviewScreenState extends State
final l10n = AppLocalizations.of(context);
- showMessage(
- context,
- l10n.unknownError,
- type: MessageType.error,
- );
- return;
+ if (showErrorMessage) {
+ showMessage(
+ context,
+ l10n.unknownError,
+ type: MessageType.error,
+ );
+ }
}
}
@@ -704,8 +712,9 @@ class _LocationsOverviewScreenState extends State
}[locationStatus]!;
return CurrentLocationLayer(
- positionStream: _currentLocationPositionStream.stream,
- followOnLocationUpdate: FollowOnLocationUpdate.always,
+ positionStream:
+ context.read().locationMarkerStream,
+ followOnLocationUpdate: FollowOnLocationUpdate.never,
style: LocationMarkerStyle(
marker: DefaultLocationMarker(
color: color,
@@ -719,6 +728,24 @@ class _LocationsOverviewScreenState extends State
Widget buildMap() {
final settings = context.read();
final viewService = context.read();
+ final locationFetchers = context.read();
+
+ final Iterable<(TaskView, LocationPointService)> circleLocations =
+ selectedViewID == null
+ ? locationFetchers.fetchers
+ .where((fetcher) => fetcher.sortedLocations.isNotEmpty)
+ .map((fetcher) => (fetcher.view, fetcher.sortedLocations.last))
+ : viewService.views
+ .map(
+ (view) => mergeLocationsIfRequired(
+ locationFetchers
+ .getLocations(view)
+ .whereNot((location) => location == visibleLocation)
+ .toList(),
+ ),
+ )
+ .expand((element) => element)
+ .map((location) => (selectedView!, location));
if (settings.getMapProvider() == MapProvider.apple) {
return apple_maps.AppleMap(
@@ -741,53 +768,42 @@ class _LocationsOverviewScreenState extends State
appleMapController = controller;
if (lastPosition != null) {
- appleMapController?.moveCamera(
- apple_maps.CameraUpdate.newCameraPosition(
- apple_maps.CameraPosition(
- target: apple_maps.LatLng(
- lastPosition!.latitude,
- lastPosition!.longitude,
- ),
- zoom: 13,
- ),
- ),
- );
-
- _hasGoneToInitialPosition = true;
+ _animateToPosition(lastPosition!);
}
},
circles: viewService.views
.where(
(view) => selectedViewID == null || view.id == selectedViewID)
.map(
- (view) => mergeLocationsIfRequired(view)
- .map(
- (location) => apple_maps.Circle(
- circleId: apple_maps.CircleId(location.id),
- center: apple_maps.LatLng(
- location.latitude,
- location.longitude,
- ),
- radius: location.accuracy,
- fillColor: view.color.withOpacity(0.2),
- strokeColor: view.color,
- strokeWidth: location.accuracy < 10 ? 1 : 3),
- )
- .toList(),
+ (view) =>
+ mergeLocationsIfRequired(locationFetchers.getLocations(view))
+ .map(
+ (location) => apple_maps.Circle(
+ circleId: apple_maps.CircleId(location.id),
+ center: apple_maps.LatLng(
+ location.latitude,
+ location.longitude,
+ ),
+ radius: location.accuracy,
+ fillColor: view.color.withOpacity(0.2),
+ strokeColor: view.color,
+ strokeWidth: location.accuracy < 10 ? 1 : 3),
+ )
+ .toList(),
)
.expand((element) => element)
.toSet(),
polylines: Set.from(
- _fetchers.locations.entries
- .where((entry) =>
- selectedViewID == null || entry.key.id == selectedViewID)
+ locationFetchers.fetchers
+ .where((fetcher) =>
+ selectedViewID == null || fetcher.view.id == selectedViewID)
.map(
- (entry) {
- final view = entry.key;
+ (fetcher) {
+ final view = fetcher.view;
return apple_maps.Polyline(
polylineId: apple_maps.PolylineId(view.id),
- color: entry.key.color.withOpacity(0.9),
+ color: view.color.withOpacity(0.9),
width: 10,
jointType: apple_maps.JointType.round,
polylineCap: apple_maps.Cap.roundCap,
@@ -798,7 +814,9 @@ class _LocationsOverviewScreenState extends State
selectedViewID = view.id;
});
},
- points: mergeLocationsIfRequired(entry.key)
+ // TODO
+ points: mergeLocationsIfRequired(
+ locationFetchers.getLocations(view))
.reversed
.map(
(location) => apple_maps.LatLng(
@@ -814,39 +832,62 @@ class _LocationsOverviewScreenState extends State
);
}
+ final lastCenter = settings.getLastMapLocation()?.toLatLng();
+ final colorOpacityMultiplier = selectedViewID == null ? 1.0 : .1;
return LocusFlutterMap(
- mapController: flutterMapController,
- children: [
+ flutterMapController: flutterMapController,
+ flutterMapOptions: MapOptions(
+ maxZoom: 18,
+ minZoom: 2,
+ center: lastCenter ?? getFallbackLocation(context),
+ zoom: lastCenter == null ? FALLBACK_LOCATION_ZOOM_LEVEL : 13,
+ ),
+ flutterChildren: [
CircleLayer(
- circles: viewService.views.reversed
- .where(
- (view) => selectedViewID == null || view.id == selectedViewID)
- .map(
- (view) => mergeLocationsIfRequired(view)
- .mapIndexed(
- (index, location) => CircleMarker(
- radius: location.accuracy,
- useRadiusInMeter: true,
- point: LatLng(location.latitude, location.longitude),
- borderStrokeWidth: 1,
- color: view.color.withOpacity(.1),
- borderColor: view.color,
- ),
- )
- .toList(),
- )
- .expand((element) => element)
- .toList(),
+ circles: circleLocations
+ .map((data) {
+ final view = data.$1;
+ final location = data.$2;
+
+ return CircleMarker(
+ radius: location.accuracy,
+ useRadiusInMeter: true,
+ point: LatLng(location.latitude, location.longitude),
+ borderStrokeWidth: 1,
+ color: view.color.withOpacity(.1 * colorOpacityMultiplier),
+ borderColor: view.color.withOpacity(colorOpacityMultiplier),
+ );
+ })
+ .toList()
+ .cast(),
),
+ if (visibleLocation != null)
+ CircleLayer(
+ circles: [
+ CircleMarker(
+ radius: visibleLocation!.accuracy,
+ useRadiusInMeter: true,
+ point: LatLng(
+ visibleLocation!.latitude,
+ visibleLocation!.longitude,
+ ),
+ borderStrokeWidth: 5,
+ color: selectedView!.color.withOpacity(.2),
+ borderColor: selectedView!.color,
+ )
+ ],
+ ),
PolylineLayer(
polylines: List.from(
- _fetchers.locations.entries
- .where((entry) =>
- selectedViewID == null || entry.key.id == selectedViewID)
+ locationFetchers.fetchers
+ .where((fetcher) =>
+ selectedViewID == null || fetcher.view.id == selectedViewID)
.map(
- (entry) {
- final view = entry.key;
- final locations = mergeLocationsIfRequired(entry.key);
+ (fetcher) {
+ final view = fetcher.view;
+ final locations = mergeLocationsIfRequired(
+ locationFetchers.getLocations(view),
+ );
return Polyline(
color: view.color.withOpacity(0.9),
@@ -896,9 +937,9 @@ class _LocationsOverviewScreenState extends State
markers: viewService.views
.where((view) =>
(selectedViewID == null || view.id == selectedViewID) &&
- _fetchers.locations[view]?.last != null)
+ locationFetchers.getLocations(view).isNotEmpty)
.map((view) {
- final latestLocation = _fetchers.locations[view]!.last;
+ final latestLocation = locationFetchers.getLocations(view).last;
return Marker(
key: Key(view.id),
@@ -928,18 +969,20 @@ class _LocationsOverviewScreenState extends State
}
Widget buildOutOfBoundsMarkers() {
+ final locationFetchers = context.read();
+
return Stack(
- children: _fetchers.views
- .where((view) =>
- (_fetchers.locations[view]?.isNotEmpty ?? false) &&
- (selectedViewID == null || selectedViewID == view.id))
+ children: locationFetchers.fetchers
+ .where((fetcher) =>
+ (selectedViewID == null || fetcher.view.id == selectedViewID) &&
+ fetcher.sortedLocations.isNotEmpty)
.map(
- (view) => OutOfBoundMarker(
- lastViewLocation: _fetchers.locations[view]!.last,
+ (fetcher) => OutOfBoundMarker(
+ lastViewLocation: fetcher.sortedLocations.last,
onTap: () {
- showViewLocations(view);
+ showViewLocations(fetcher.view);
},
- view: view,
+ view: fetcher.view,
updateStream: mapEventStream.stream,
appleMapController: appleMapController,
flutterMapController: flutterMapController,
@@ -949,8 +992,12 @@ class _LocationsOverviewScreenState extends State
);
}
- void showViewLocations(final TaskView view,
- {final bool jumpToLatestLocation = true}) async {
+ void showViewLocations(
+ final TaskView view, {
+ final bool jumpToLatestLocation = true,
+ }) async {
+ final locationFetchers = context.read();
+
setState(() {
showFAB = false;
selectedViewID = view.id;
@@ -960,12 +1007,13 @@ class _LocationsOverviewScreenState extends State
return;
}
- final latestLocation = _fetchers.locations[view]?.last;
+ final locations = locationFetchers.getLocations(view);
- if (latestLocation == null) {
+ if (locations.isEmpty) {
return;
}
+ final latestLocation = locations.last;
if (flutterMapController != null) {
flutterMapController!.move(
LatLng(latestLocation.latitude, latestLocation.longitude),
@@ -980,7 +1028,7 @@ class _LocationsOverviewScreenState extends State
latestLocation.latitude,
latestLocation.longitude,
),
- zoom: (await appleMapController!.getZoomLevel()) ?? 13.0,
+ zoom: (await appleMapController!.getZoomLevel()) ?? 15.0,
),
),
);
@@ -1060,6 +1108,7 @@ class _LocationsOverviewScreenState extends State
Navigator.pop(context);
setState(() {
selectedViewID = null;
+ visibleLocation = null;
});
},
)
@@ -1118,6 +1167,7 @@ class _LocationsOverviewScreenState extends State
setState(() {
showFAB = true;
selectedViewID = null;
+ visibleLocation = null;
});
return;
}
@@ -1166,6 +1216,7 @@ class _LocationsOverviewScreenState extends State
Navigator.pop(context);
setState(() {
selectedViewID = null;
+ visibleLocation = null;
});
},
)
@@ -1199,19 +1250,18 @@ class _LocationsOverviewScreenState extends State
}
LocationPointService? get lastLocation {
- if (selectedView == null) {
- return null;
- }
+ final locationFetchers = context.read();
- if (_fetchers.locations[selectedView!] == null) {
+ if (selectedView == null) {
return null;
}
- if (_fetchers.locations[selectedView!]!.isEmpty) {
+ final locations = locationFetchers.getLocations(selectedView!);
+ if (locations.isEmpty) {
return null;
}
- return _fetchers.locations[selectedView!]!.last;
+ return locations.last;
}
void importLocation() {
@@ -1244,7 +1294,8 @@ class _LocationsOverviewScreenState extends State
}
final settings = context.read();
- final link = await (task as Task).generateLink(settings.getServerHost());
+ final link =
+ await (task as Task).publisher.generateLink(settings.getServerHost());
// Copy to clipboard
await Clipboard.setData(ClipboardData(text: link));
@@ -1263,148 +1314,68 @@ class _LocationsOverviewScreenState extends State
Widget buildMapActions() {
const margin = 10.0;
const dimension = 50.0;
- const diff = FAB_SIZE - dimension;
final l10n = AppLocalizations.of(context);
final settings = context.watch();
final shades = getPrimaryColorShades(context);
if (settings.getMapProvider() == MapProvider.openStreetMap) {
- return Positioned(
- // Add half the difference to center the button
- right: FAB_MARGIN + diff / 2,
- bottom: FAB_SIZE +
- FAB_MARGIN +
- (isCupertino(context) ? LARGE_SPACE : SMALL_SPACE),
- child: Column(
- children: [
- AnimatedScale(
- scale: showDetailedLocations ? 1 : 0,
- duration:
- showDetailedLocations ? 1200.milliseconds : 100.milliseconds,
- curve: showDetailedLocations ? Curves.elasticOut : Curves.easeIn,
- child: Tooltip(
- message: disableShowDetailedLocations
- ? l10n.locationsOverview_mapAction_detailedLocations_show
- : l10n.locationsOverview_mapAction_detailedLocations_hide,
- preferBelow: false,
- margin: const EdgeInsets.only(bottom: margin),
- child: SizedBox.square(
- dimension: dimension,
- child: Center(
- child: Paper(
- width: null,
- borderRadius: BorderRadius.circular(HUGE_SPACE),
- padding: EdgeInsets.zero,
- child: IconButton(
- color: shades[400],
- icon: Icon(disableShowDetailedLocations
- ? MdiIcons.mapMarkerMultipleOutline
- : MdiIcons.mapMarkerMultiple),
- onPressed: () {
- setState(() {
- disableShowDetailedLocations =
- !disableShowDetailedLocations;
- });
- },
- ),
- ),
- ),
- ),
- ),
- ),
- const SizedBox(height: SMALL_SPACE),
- Tooltip(
- message: l10n.locationsOverview_mapAction_alignNorth,
+ return MapActionsContainer(
+ children: [
+ AnimatedScale(
+ scale: showDetailedLocations ? 1 : 0,
+ duration:
+ showDetailedLocations ? 1200.milliseconds : 100.milliseconds,
+ curve: showDetailedLocations ? Curves.elasticOut : Curves.easeIn,
+ child: Tooltip(
+ message: disableShowDetailedLocations
+ ? l10n.locationsOverview_mapAction_detailedLocations_show
+ : l10n.locationsOverview_mapAction_detailedLocations_hide,
preferBelow: false,
margin: const EdgeInsets.only(bottom: margin),
child: SizedBox.square(
dimension: dimension,
child: Center(
- child: PlatformWidget(
- material: (context, _) => Paper(
- width: null,
- borderRadius: BorderRadius.circular(HUGE_SPACE),
- padding: EdgeInsets.zero,
- child: IconButton(
- color: isNorth ? shades[200] : shades[400],
- icon: AnimatedBuilder(
- animation: rotationAnimation,
- builder: (context, child) => Transform.rotate(
- angle: rotationAnimation.value,
- child: child,
- ),
- child: PlatformFlavorWidget(
- material: (context, _) => Transform.rotate(
- angle: -pi / 4,
- child: const Icon(MdiIcons.compass),
- ),
- cupertino: (context, _) =>
- const Icon(CupertinoIcons.location_north_fill),
- ),
- ),
- onPressed: () {
- if (flutterMapController != null) {
- flutterMapController!.rotate(0);
- }
- },
- ),
- ),
- cupertino: (context, _) => CupertinoButton(
- color: isNorth ? shades[200] : shades[400],
- padding: EdgeInsets.zero,
- borderRadius: BorderRadius.circular(HUGE_SPACE),
+ child: Paper(
+ width: null,
+ borderRadius: BorderRadius.circular(HUGE_SPACE),
+ padding: EdgeInsets.zero,
+ child: PlatformIconButton(
+ color: shades[400],
+ icon: Icon(disableShowDetailedLocations
+ ? MdiIcons.mapMarkerMultipleOutline
+ : MdiIcons.mapMarkerMultiple),
onPressed: () {
- if (flutterMapController != null) {
- flutterMapController!.rotate(0);
- }
+ setState(() {
+ disableShowDetailedLocations =
+ !disableShowDetailedLocations;
+ });
},
- child: AnimatedBuilder(
- animation: rotationAnimation,
- builder: (context, child) => Transform.rotate(
- angle: rotationAnimation.value,
- child: child,
- ),
- child: const Icon(CupertinoIcons.location_north_fill),
- ),
),
),
),
),
),
- const SizedBox(height: SMALL_SPACE),
- Tooltip(
- message: l10n.locationsOverview_mapAction_goToCurrentPosition,
- preferBelow: false,
- margin: const EdgeInsets.only(bottom: margin),
- child: SizedBox.square(
- dimension: dimension,
- child: Center(
- child: PlatformWidget(
- material: (context, _) => Paper(
- width: null,
- borderRadius: BorderRadius.circular(HUGE_SPACE),
- padding: EdgeInsets.zero,
- child: IconButton(
- color: shades[400],
- icon: const Icon(Icons.my_location),
- onPressed: () =>
- goToCurrentPosition(askPermissions: true),
- ),
- ),
- cupertino: (context, _) => CupertinoButton(
- color: shades[400],
- padding: EdgeInsets.zero,
- onPressed: () =>
- goToCurrentPosition(askPermissions: true),
- child: const Icon(Icons.my_location),
- ),
- ),
- ),
- ),
- ),
- ],
- ),
+ ),
+ const SizedBox(height: SMALL_SPACE),
+ CompassMapAction(
+ onAlignNorth: () {
+ flutterMapController!.rotate(0);
+ },
+ mapController: flutterMapController!,
+ ),
+ const SizedBox(height: SMALL_SPACE),
+ GoToMyLocationMapAction(
+ animate: locationStatus == LocationStatus.fetching,
+ onGoToMyLocation: () {
+ updateCurrentPosition(
+ askPermissions: true,
+ goToPosition: true,
+ showErrorMessage: true,
+ );
+ },
+ ),
+ ],
);
}
@@ -1416,6 +1387,7 @@ class _LocationsOverviewScreenState extends State
super.build(context);
final settings = context.watch();
+ final locationFetchers = context.watch();
final l10n = AppLocalizations.of(context);
return PlatformScaffold(
@@ -1500,11 +1472,16 @@ class _LocationsOverviewScreenState extends State
buildMapActions(),
ViewDetailsSheet(
view: selectedView,
- locations: _fetchers.locations[selectedView],
+ locations: selectedViewID == null
+ ? []
+ : locationFetchers.getLocations(selectedView!),
onGoToPosition: (position) {
if (flutterMapController != null) {
- flutterMapController!
- .move(position, flutterMapController!.zoom);
+ // Get zoom based of accuracy
+ final radius = position.accuracy / 200;
+ final zoom = (16 - log(radius) / log(2)).toDouble();
+
+ flutterMapController!.move(position.asLatLng(), zoom);
}
if (appleMapController != null) {
@@ -1518,6 +1495,11 @@ class _LocationsOverviewScreenState extends State
);
}
},
+ onVisibleLocationChange: (location) {
+ setState(() {
+ visibleLocation = location;
+ });
+ },
),
ActiveSharesSheet(
visible: selectedViewID == null,
@@ -1536,6 +1518,7 @@ class _LocationsOverviewScreenState extends State
setState(() {
showFAB = true;
selectedViewID = null;
+ visibleLocation = null;
});
createNewQuickLocationShare();
diff --git a/lib/screens/SettingsScreen.dart b/lib/screens/SettingsScreen.dart
index e66cf74b..c7c6782d 100644
--- a/lib/screens/SettingsScreen.dart
+++ b/lib/screens/SettingsScreen.dart
@@ -18,7 +18,9 @@ import 'package:locus/screens/settings_screen_widgets/ImportSheet.dart';
import 'package:locus/screens/settings_screen_widgets/MentionTile.dart';
import 'package:locus/screens/settings_screen_widgets/ServerOriginSheet.dart';
import 'package:locus/screens/settings_screen_widgets/TransferSenderScreen.dart';
-import 'package:locus/services/task_service.dart';
+import 'package:locus/screens/settings_screen_widgets/UseRealtimeUpdatesTile.dart';
+import 'package:locus/services/manager_service/task.dart';
+import 'package:locus/services/task_service/index.dart';
import 'package:locus/utils/PageRoute.dart';
import 'package:locus/utils/import_export_handler.dart';
import 'package:locus/utils/theme.dart';
@@ -35,14 +37,15 @@ import 'package:settings_ui/settings_ui.dart';
import 'package:share_plus/share_plus.dart';
import 'package:url_launcher/url_launcher.dart';
-import '../services/settings_service.dart';
-import '../services/view_service.dart';
+import 'package:locus/services/settings_service/index.dart';
+import '../services/view_service/index.dart';
import '../utils/file.dart';
import '../utils/platform.dart';
import '../widgets/PlatformListTile.dart';
import '../widgets/RelaySelectSheet.dart';
const storage = FlutterSecureStorage();
+const OFF_OPACITY = 0.4;
class SettingsScreen extends StatefulWidget {
const SettingsScreen({
@@ -146,12 +149,14 @@ class _SettingsScreenState extends State {
),
settingsSectionBackground: platformThemeData(
context,
- material: (data) => settings.isMIUI()
+ material: (data) =>
+ settings.isMIUI()
? data.scaffoldBackgroundColor
: data.dialogBackgroundColor,
- cupertino: (data) => HSLColor.fromColor(data.barBackgroundColor)
- .withLightness(.2)
- .toColor(),
+ cupertino: (data) =>
+ HSLColor.fromColor(data.barBackgroundColor)
+ .withLightness(.2)
+ .toColor(),
),
titleTextColor: platformThemeData(
context,
@@ -164,7 +169,7 @@ class _SettingsScreenState extends State {
cupertino: (data) => data.textTheme.navTitleTextStyle.color,
),
tileDescriptionTextColor:
- settings.isMIUI() ? const Color(0xFF808080) : null,
+ settings.isMIUI() ? const Color(0xFF808080) : null,
);
}
@@ -192,452 +197,475 @@ class _SettingsScreenState extends State {
child: Column(
children: [
SettingsList(
- shrinkWrap: true,
- physics: const NeverScrollableScrollPhysics(),
- lightTheme: getTheme(),
- darkTheme: getTheme(),
- sections: [
- SettingsSection(
- title: Text(l10n.settingsScreen_section_design),
- tiles: [
- SettingsColorPicker(
- title: l10n.settingsScreen_setting_primaryColor_label,
- value: settings.primaryColor,
- leading: PlatformWidget(
- material: (_, __) =>
- const Icon(Icons.color_lens_rounded),
- cupertino: (_, __) =>
- const Icon(CupertinoIcons.color_filter),
- ),
- onUpdate: (value) {
- settings.setPrimaryColor(value);
- settings.save();
- },
+ shrinkWrap: true,
+ physics: const NeverScrollableScrollPhysics(),
+ lightTheme: getTheme(),
+ darkTheme: getTheme(),
+ sections: [
+ SettingsSection(
+ title: Text(l10n.settingsScreen_section_design),
+ tiles: [
+ SettingsColorPicker(
+ title: l10n.settingsScreen_setting_primaryColor_label,
+ value: settings.primaryColor,
+ leading: PlatformWidget(
+ material: (_, __) =>
+ const Icon(Icons.color_lens_rounded),
+ cupertino: (_, __) =>
+ const Icon(CupertinoIcons.color_filter),
),
- if (Platform.isAndroid)
- SettingsDropdownTile(
- title: Text(
- l10n.settingsScreen_settings_androidTheme_label,
- ),
- values: AndroidTheme.values,
- value: settings.androidTheme,
- leading: const Icon(Icons.design_services_rounded),
- textMapping: {
- AndroidTheme.materialYou: l10n
- .settingsScreen_settings_androidTheme_materialYou,
- AndroidTheme.miui: l10n
- .settingsScreen_settings_androidTheme_miui,
- },
- onUpdate: (newValue) {
- settings.setAndroidTheme(newValue);
- settings.save();
- },
+ onUpdate: (value) {
+ settings.setPrimaryColor(value);
+ settings.save();
+ },
+ ),
+ if (Platform.isAndroid)
+ SettingsDropdownTile(
+ title: Text(
+ l10n.settingsScreen_settings_androidTheme_label,
),
- ],
- ),
- SettingsSection(
- title: Text(l10n.settingsScreen_section_privacy),
- tiles: [
- SettingsTile.switchTile(
- initialValue: settings.automaticallyLookupAddresses,
- onToggle: (newValue) {
- settings.setAutomaticallyLookupAddresses(newValue);
+ values: AndroidTheme.values,
+ value: settings.androidTheme,
+ leading: const Icon(Icons.design_services_rounded),
+ textMapping: {
+ AndroidTheme.materialYou: l10n
+ .settingsScreen_settings_androidTheme_materialYou,
+ AndroidTheme.miui:
+ l10n.settingsScreen_settings_androidTheme_miui,
+ },
+ onUpdate: (newValue) {
+ settings.setAndroidTheme(newValue);
settings.save();
},
- title: Text(l10n
- .settingsScreen_setting_lookupAddresses_label),
- description: Text(l10n
- .settingsScreen_setting_lookupAddresses_description),
),
+ ],
+ ),
+ SettingsSection(
+ title: Text(l10n.settingsScreen_section_privacy),
+ tiles: [
+ SettingsTile.switchTile(
+ initialValue: settings.automaticallyLookupAddresses,
+ onToggle: (newValue) {
+ settings.setAutomaticallyLookupAddresses(newValue);
+ settings.save();
+ },
+ title: Text(
+ l10n.settingsScreen_setting_lookupAddresses_label),
+ description: Text(l10n
+ .settingsScreen_setting_lookupAddresses_description),
+ ),
+ SettingsDropdownTile(
+ title: Text(
+ l10n.settingsScreen_settings_geocoderProvider_label,
+ ),
+ values: SettingsService.isSystemGeocoderAvailable()
+ ? GeocoderProvider.values
+ : GeocoderProvider.values
+ .where((element) =>
+ element != GeocoderProvider.system)
+ .toList(),
+ textMapping: {
+ GeocoderProvider.system: l10n
+ .settingsScreen_settings_geocoderProvider_system,
+ GeocoderProvider.geocodeMapsCo: l10n
+ .settingsScreen_settings_geocoderProvider_geocodeMapsCo,
+ GeocoderProvider.nominatim: l10n
+ .settingsScreen_settings_geocoderProvider_nominatim,
+ },
+ value: settings.geocoderProvider,
+ leading: Icon(context.platformIcons.search),
+ onUpdate: (newValue) {
+ settings.setGeocoderProvider(newValue);
+ settings.save();
+ },
+ ),
+ if (isPlatformApple())
SettingsDropdownTile(
title: Text(
- l10n.settingsScreen_settings_geocoderProvider_label,
+ l10n.settingsScreen_settings_mapProvider_label,
),
- values: SettingsService.isSystemGeocoderAvailable()
- ? GeocoderProvider.values
- : GeocoderProvider.values
- .where((element) =>
- element != GeocoderProvider.system)
- .toList(),
+ values: MapProvider.values,
textMapping: {
- GeocoderProvider.system: l10n
- .settingsScreen_settings_geocoderProvider_system,
- GeocoderProvider.geocodeMapsCo: l10n
- .settingsScreen_settings_geocoderProvider_geocodeMapsCo,
- GeocoderProvider.nominatim: l10n
- .settingsScreen_settings_geocoderProvider_nominatim,
+ MapProvider.apple:
+ l10n.settingsScreen_settings_mapProvider_apple,
+ MapProvider.openStreetMap: l10n
+ .settingsScreen_settings_mapProvider_openStreetMap,
},
- value: settings.geocoderProvider,
- leading: Icon(context.platformIcons.search),
+ leading: PlatformFlavorWidget(
+ material: (_, __) => const Icon(Icons.map_rounded),
+ cupertino: (_, __) =>
+ const Icon(CupertinoIcons.map),
+ ),
+ value: settings.mapProvider,
onUpdate: (newValue) {
- settings.setGeocoderProvider(newValue);
+ settings.setMapProvider(newValue);
settings.save();
},
),
- if (isPlatformApple())
- SettingsDropdownTile(
- title: Text(
- l10n.settingsScreen_settings_mapProvider_label,
- ),
- values: MapProvider.values,
- textMapping: {
- MapProvider.apple: l10n
- .settingsScreen_settings_mapProvider_apple,
- MapProvider.openStreetMap: l10n
- .settingsScreen_settings_mapProvider_openStreetMap,
- },
- leading: PlatformFlavorWidget(
- material: (_, __) =>
- const Icon(Icons.map_rounded),
- cupertino: (_, __) =>
- const Icon(CupertinoIcons.map),
- ),
- value: settings.mapProvider,
- onUpdate: (newValue) {
- settings.setMapProvider(newValue);
- settings.save();
- },
- ),
- if (hasBiometricsAvailable)
- SettingsTile.switchTile(
- initialValue:
- settings.requireBiometricAuthenticationOnStart,
- onToggle: (newValue) async {
- final auth = LocalAuthentication();
-
- try {
- final hasAuthenticated =
- await auth.authenticate(
- localizedReason: l10n
- .settingsScreen_setting_requireBiometricAuth_requireNowReason,
- options: const AuthenticationOptions(
- stickyAuth: true,
- biometricOnly: true,
- ),
- );
+ if (hasBiometricsAvailable)
+ SettingsTile.switchTile(
+ initialValue:
+ settings.requireBiometricAuthenticationOnStart,
+ onToggle: (newValue) async {
+ final auth = LocalAuthentication();
+
+ try {
+ final hasAuthenticated = await auth.authenticate(
+ localizedReason: l10n
+ .settingsScreen_setting_requireBiometricAuth_requireNowReason,
+ options: const AuthenticationOptions(
+ stickyAuth: true,
+ biometricOnly: true,
+ ),
+ );
- if (!hasAuthenticated) {
- throw Exception(
- "Authenticated failed.",
- );
- }
-
- settings
- .setRequireBiometricAuthenticationOnStart(
- newValue);
- await settings.save();
- } catch (error) {
- FlutterLogs.logInfo(
- LOG_TAG,
- "Settings",
- "Error while authenticating biometrics: $error",
+ if (!hasAuthenticated) {
+ throw Exception(
+ "Authenticated failed.",
);
+ }
- if (!mounted) {
- return;
- }
+ settings.setRequireBiometricAuthenticationOnStart(
+ newValue);
+ await settings.save();
+ } catch (error) {
+ FlutterLogs.logInfo(
+ LOG_TAG,
+ "Settings",
+ "Error while authenticating biometrics: $error",
+ );
- showMessage(
- context,
- l10n.unknownError,
- type: MessageType.error,
- );
+ if (!mounted) {
+ return;
}
- },
- title: Text(l10n
- .settingsScreen_setting_requireBiometricAuth_label),
- description: Text(l10n
- .settingsScreen_setting_requireBiometricAuth_description),
- leading: PlatformFlavorWidget(
- material: (_, __) =>
- const Icon(Icons.fingerprint_rounded),
- cupertino: (_, __) => const Icon(
- CupertinoIcons.shield_lefthalf_fill),
- ),
- )
- ],
- ),
- SettingsSection(
- title: Text(l10n.settingsScreen_section_defaults),
- tiles: [
- SettingsTile(
- title:
- Text(l10n.settingsScreen_settings_relays_label),
- trailing: PlatformTextButton(
- child: Text(
- l10n.settingsScreen_settings_relays_selectLabel(
- _relayController.relays.length,
- ),
- ),
- material: (_, __) => MaterialTextButtonData(
- icon: const Icon(Icons.dns_rounded),
- ),
- onPressed: () async {
- await showPlatformModalSheet(
- context: context,
- material: MaterialModalSheetData(
- isScrollControlled: true,
- isDismissible: true,
- backgroundColor: Colors.transparent,
- ),
- builder: (_) => RelaySelectSheet(
- controller: _relayController,
- ),
+
+ showMessage(
+ context,
+ l10n.unknownError,
+ type: MessageType.error,
);
- },
- ),
- ),
- SettingsTile(
- title: Text(
- l10n.settingsScreen_settings_serverOrigin_label,
+ }
+ },
+ title: Text(l10n
+ .settingsScreen_setting_requireBiometricAuth_label),
+ description: Text(l10n
+ .settingsScreen_setting_requireBiometricAuth_description),
+ leading: PlatformFlavorWidget(
+ material: (_, __) =>
+ const Icon(Icons.fingerprint_rounded),
+ cupertino: (_, __) =>
+ const Icon(CupertinoIcons.shield_lefthalf_fill),
),
- description: Text(
- l10n.settingsScreen_settings_serverOrigin_description,
+ )
+ ],
+ ),
+ SettingsSection(
+ title: Text(l10n.settingsScreen_section_defaults),
+ tiles: [
+ SettingsTile(
+ title: Text(l10n.settingsScreen_settings_relays_label),
+ trailing: PlatformTextButton(
+ child: Text(
+ l10n.settingsScreen_settings_relays_selectLabel(
+ _relayController.relays.length,
+ ),
),
- trailing: Text(settings.serverOrigin),
- onPressed: (_) async {
- final newHostName = await showPlatformModalSheet(
+ material: (_, __) =>
+ MaterialTextButtonData(
+ icon: const Icon(Icons.dns_rounded),
+ ),
+ onPressed: () async {
+ await showPlatformModalSheet(
context: context,
material: MaterialModalSheetData(
isScrollControlled: true,
isDismissible: true,
backgroundColor: Colors.transparent,
),
- builder: (_) => const ServerOriginSheet(),
+ builder: (_) =>
+ RelaySelectSheet(
+ controller: _relayController,
+ ),
);
-
- if (newHostName != null) {
- settings.serverServerOrigin(newHostName);
- settings.save();
- }
- },
- )
- ],
- ),
- SettingsSection(
- title: Text(l10n.settingsScreen_sections_misc),
- tiles: [
- SettingsTile.switchTile(
- initialValue: settings.showHints,
- onToggle: (newValue) {
- settings.setShowHints(newValue);
- settings.save();
},
- title: Text(
- l10n.settingsScreen_settings_showHints_label,
- ),
- description: Text(
- l10n.settingsScreen_settings_showHints_description,
- ),
- leading: Icon(context.platformIcons.info),
),
- SettingsTile.switchTile(
- initialValue: settings.alwaysUseBatterySaveMode,
- onToggle: (newValue) {
- settings.setAlwaysUseBatterySaveMode(newValue);
+ ),
+ SettingsTile(
+ title: Text(
+ l10n.settingsScreen_settings_serverOrigin_label,
+ ),
+ description: Text(
+ l10n.settingsScreen_settings_serverOrigin_description,
+ ),
+ trailing: Text(settings.serverOrigin),
+ onPressed: (_) async {
+ final newHostName = await showPlatformModalSheet(
+ context: context,
+ material: MaterialModalSheetData(
+ isScrollControlled: true,
+ isDismissible: true,
+ backgroundColor: Colors.transparent,
+ ),
+ builder: (_) => const ServerOriginSheet(),
+ );
+
+ if (newHostName != null) {
+ settings.serverServerOrigin(newHostName);
settings.save();
- },
- title: Text(
- l10n.settingsScreen_settings_alwaysUseBatterySaveMode_label,
- ),
- description: Text(
- l10n.settingsScreen_settings_alwaysUseBatterySaveMode_description,
- ),
+ }
+ },
+ )
+ ],
+ ),
+ SettingsSection(
+ title: Text(l10n.settingsScreen_sections_misc),
+ tiles: [
+ SettingsTile.switchTile(
+ initialValue: settings.showHints,
+ onToggle: (newValue) {
+ settings.setShowHints(newValue);
+ settings.save();
+ },
+ title: Text(
+ l10n.settingsScreen_settings_showHints_label,
),
- SettingsTile.navigation(
- title: Text(
- l10n.settingsScreen_settings_importExport_exportFile,
+ description: Text(
+ l10n.settingsScreen_settings_showHints_description,
+ ),
+ leading: Icon(context.platformIcons.info),
+ ),
+ const UseRealtimeUpdatesTile(),
+ SettingsTile.switchTile(
+ initialValue: settings.alwaysUseBatterySaveMode,
+ onToggle: settings.useRealtimeUpdates
+ ? null
+ : (newValue) {
+ settings.setAlwaysUseBatterySaveMode(newValue);
+ settings.save();
+ },
+ title: Opacity(
+ opacity:
+ settings.useRealtimeUpdates ? OFF_OPACITY : 1,
+ child: Text(
+ l10n
+ .settingsScreen_settings_alwaysUseBatterySaveMode_label,
),
- leading: PlatformWidget(
- material: (_, __) => const Icon(Icons.file_open),
- cupertino: (_, __) =>
- const Icon(CupertinoIcons.doc),
+ ),
+ description: Opacity(
+ opacity:
+ settings.useRealtimeUpdates ? OFF_OPACITY : 1,
+ child: Text(
+ l10n
+ .settingsScreen_settings_alwaysUseBatterySaveMode_description,
),
- trailing: const SettingsCaretIcon(),
- onPressed: (_) async {
- final taskService = context.read();
- final viewService = context.read();
- final settings = context.read();
-
- final shouldSave = await showPlatformDialog(
- context: context,
- builder: (context) => PlatformAlertDialog(
- title: Text(l10n
- .settingsScreen_settings_importExport_exportFile),
- content: Text(l10n
- .settingsScreen_settings_importExport_exportFile_description),
- actions: createCancellableDialogActions(
- context,
- [
- PlatformDialogAction(
- material: (_, __) =>
- MaterialDialogActionData(
- icon: const Icon(Icons.save),
+ ),
+ ),
+ SettingsTile.navigation(
+ title: Text(
+ l10n.settingsScreen_settings_importExport_exportFile,
+ ),
+ leading: PlatformWidget(
+ material: (_, __) => const Icon(Icons.file_open),
+ cupertino: (_, __) => const Icon(CupertinoIcons.doc),
+ ),
+ trailing: const SettingsCaretIcon(),
+ onPressed: (_) async {
+ final taskService = context.read();
+ final viewService = context.read();
+ final settings = context.read();
+
+ final shouldSave = await showPlatformDialog(
+ context: context,
+ builder: (context) =>
+ PlatformAlertDialog(
+ title: Text(l10n
+ .settingsScreen_settings_importExport_exportFile),
+ content: Text(l10n
+ .settingsScreen_settings_importExport_exportFile_description),
+ actions: createCancellableDialogActions(
+ context,
+ [
+ PlatformDialogAction(
+ material: (_, __) =>
+ MaterialDialogActionData(
+ icon: const Icon(Icons.save),
+ ),
+ onPressed: () {
+ Navigator.pop(context, true);
+ },
+ child: Text(l10n
+ .settingsScreen_settings_importExport_exportFile_save),
),
- onPressed: () {
- Navigator.pop(context, true);
- },
- child: Text(l10n
- .settingsScreen_settings_importExport_exportFile_save),
- ),
- ],
+ ],
+ ),
),
- ),
- );
+ );
- if (shouldSave) {
- final rawData = jsonEncode(
- await exportToJSON(
- taskService, viewService, settings),
- );
+ if (shouldSave) {
+ final rawData = jsonEncode(
+ await exportToJSON(
+ taskService, viewService, settings),
+ );
- final file = XFile(
- (await createTempFile(
- const Utf8Encoder().convert(rawData),
- name: "export.locus.json",
- ))
- .path,
- );
+ final file = XFile(
+ (await createTempFile(
+ const Utf8Encoder().convert(rawData),
+ name: "export.locus.json",
+ ))
+ .path,
+ );
- await Share.shareXFiles(
- [file],
- text: "Locus view key",
- subject:
- l10n.shareLocation_actions_shareFile_text,
- );
- }
- },
- ),
- if (Platform.isAndroid && isGMSFlavor)
- SettingsTile.navigation(
- title: Text(l10n
- .settingsScreen_settings_importExport_transfer),
- leading: PlatformWidget(
- material: (_, __) =>
- const Icon(Icons.phonelink_setup_rounded),
- cupertino: (_, __) => const Icon(
- CupertinoIcons.device_phone_portrait),
- ),
- trailing: const SettingsCaretIcon(),
- onPressed: (_) {
- Navigator.push(
- context,
- NativePageRoute(
- context: context,
- builder: (context) =>
- const TransferSenderScreen(),
- ),
- );
- },
- ),
+ await Share.shareXFiles(
+ [file],
+ text: "Locus view key",
+ subject:
+ l10n.shareLocation_actions_shareFile_text,
+ );
+ }
+ },
+ ),
+ if (Platform.isAndroid && isGMSFlavor)
SettingsTile.navigation(
title: Text(l10n
- .settingsScreen_settings_importExport_importLabel),
+ .settingsScreen_settings_importExport_transfer),
leading: PlatformWidget(
material: (_, __) =>
- const Icon(Icons.file_download),
+ const Icon(Icons.phonelink_setup_rounded),
cupertino: (_, __) =>
- const Icon(CupertinoIcons.tray_arrow_down_fill),
+ const Icon(
+ CupertinoIcons.device_phone_portrait),
),
trailing: const SettingsCaretIcon(),
- onPressed: (_) async {
- final shouldPopContext =
- await showPlatformModalSheet(
- context: context,
- material: MaterialModalSheetData(
- backgroundColor: Colors.transparent,
- ),
- builder: (context) => ImportSheet(
- onImport: (
- final taskService,
- final viewService,
- final settings,
- ) async {
- await Future.wait([
- taskService.save(),
- viewService.save(),
- settings.save(),
- ]);
-
- if (context.mounted) {
- final shouldClose =
- await showPlatformDialog(
- context: context,
- barrierDismissible: !Platform.isAndroid,
- builder: (context) => PlatformAlertDialog(
- title: Text(l10n
- .settingsScreen_import_restart_title),
- content: Text(l10n
- .settingsScreen_import_restart_description),
- actions: [
- PlatformDialogAction(
- child: Text(l10n.closeApp),
- onPressed: () => Navigator.pop(
- context, Platform.isAndroid),
- ),
- ],
- ),
- );
-
- if (!mounted) {
- return;
- }
-
- if (shouldClose != true) {
- Navigator.pop(context);
- return;
- }
-
- exit(0);
- }
- },
- ),
- );
-
- if (shouldPopContext && mounted) {
- Navigator.pop(context);
- }
- },
- ),
- SettingsTile.navigation(
- title: Text(l10n.checkLocation_title),
- description:
- Text(l10n.checkLocation_shortDescription),
- trailing: const SettingsCaretIcon(),
- leading: PlatformFlavorWidget(
- material: (_, __) =>
- const Icon(Icons.edit_location_alt),
- cupertino: (_, __) =>
- const Icon(CupertinoIcons.location_fill),
- ),
onPressed: (_) {
Navigator.push(
context,
NativePageRoute(
context: context,
builder: (context) =>
- const CheckLocationScreen(),
+ const TransferSenderScreen(),
),
);
},
+ ),
+ SettingsTile.navigation(
+ title: Text(l10n
+ .settingsScreen_settings_importExport_importLabel),
+ leading: PlatformWidget(
+ material: (_, __) => const Icon(Icons.file_download),
+ cupertino: (_, __) =>
+ const Icon(CupertinoIcons.tray_arrow_down_fill),
+ ),
+ trailing: const SettingsCaretIcon(),
+ onPressed: (_) async {
+ final shouldPopContext = await showPlatformModalSheet(
+ context: context,
+ material: MaterialModalSheetData(
+ backgroundColor: Colors.transparent,
+ ),
+ builder: (context) =>
+ ImportSheet(
+ onImport: (final taskService,
+ final viewService,
+ final settings,) async {
+ await Future.wait([
+ taskService.save(),
+ viewService.save(),
+ settings.save(),
+ ]);
+
+ if (context.mounted) {
+ final shouldClose = await showPlatformDialog(
+ context: context,
+ barrierDismissible: !Platform.isAndroid,
+ builder: (context) =>
+ PlatformAlertDialog(
+ title: Text(l10n
+ .settingsScreen_import_restart_title),
+ content: Text(l10n
+ .settingsScreen_import_restart_description),
+ actions: [
+ PlatformDialogAction(
+ child: Text(l10n.closeApp),
+ onPressed: () =>
+ Navigator.pop(
+ context,
+ Platform.isAndroid),
+ ),
+ ],
+ ),
+ );
+
+ if (!mounted) {
+ return;
+ }
+
+ if (shouldClose != true) {
+ Navigator.pop(context);
+ return;
+ }
+
+ exit(0);
+ }
+ },
+ ),
+ );
+
+ if (shouldPopContext && mounted) {
+ Navigator.pop(context);
+ }
+ },
+ ),
+ SettingsTile.navigation(
+ title: Text(l10n.checkLocation_title),
+ description: Text(l10n.checkLocation_shortDescription),
+ trailing: const SettingsCaretIcon(),
+ leading: PlatformFlavorWidget(
+ material: (_, __) =>
+ const Icon(Icons.edit_location_alt),
+ cupertino: (_, __) =>
+ const Icon(CupertinoIcons.location_fill),
+ ),
+ onPressed: (_) {
+ Navigator.push(
+ context,
+ NativePageRoute(
+ context: context,
+ builder: (context) => const CheckLocationScreen(),
+ ),
+ );
+ },
+ )
+ ],
+ ),
+ if (kDebugMode)
+ SettingsSection(
+ title: const Text("Debug"),
+ tiles: [
+ SettingsTile(
+ title: const Text("Reset App"),
+ onPressed: (_) async {
+ storage.deleteAll();
+
+ exit(0);
+ },
+ ),
+ SettingsTile(
+ title: const Text("Run Background Location Task"),
+ onPressed: (_) async {
+ await runBackgroundTask();
+ },
+ ),
+ SettingsTile(
+ title: const Text(
+ "Run Background Location Task - Forced"),
+ onPressed: (_) async {
+ await runBackgroundTask(force: true);
+ },
)
],
),
- if (kDebugMode)
- SettingsSection(
- title: const Text("Debug"),
- tiles: [
- SettingsTile(
- title: const Text("Reset App"),
- onPressed: (_) async {
- storage.deleteAll();
-
- exit(0);
- },
- )
- ],
- ),
- ]),
+ ],
+ ),
const SizedBox(height: MEDIUM_SPACE),
Padding(
padding: const EdgeInsets.all(MEDIUM_SPACE),
@@ -667,7 +695,7 @@ class _SettingsScreenState extends State {
leading: const Icon(Icons.code),
title: Text(l10n.support_options_develop),
subtitle:
- Text(l10n.support_options_develop_description),
+ Text(l10n.support_options_develop_description),
onTap: () {
launchUrl(
Uri.parse(REPOSITORY_URL),
@@ -679,7 +707,7 @@ class _SettingsScreenState extends State {
leading: const Icon(Icons.translate_rounded),
title: Text(l10n.support_options_translate),
subtitle:
- Text(l10n.support_options_translate_description),
+ Text(l10n.support_options_translate_description),
onTap: () {
launchUrl(
Uri.parse(TRANSLATION_HELP_URL),
@@ -690,13 +718,13 @@ class _SettingsScreenState extends State {
PlatformListTile(
leading: PlatformWidget(
material: (_, __) =>
- const Icon(Icons.attach_money_rounded),
+ const Icon(Icons.attach_money_rounded),
cupertino: (_, __) =>
- const Icon(CupertinoIcons.money_euro),
+ const Icon(CupertinoIcons.money_euro),
),
title: Text(l10n.support_options_donate),
subtitle:
- Text(l10n.support_options_donate_description),
+ Text(l10n.support_options_donate_description),
onTap: () {
launchUrl(
Uri.parse(DONATION_URL),
@@ -756,14 +784,14 @@ class _SettingsScreenState extends State {
MentionTile(
title: l10n.honorableMentions_values_session,
description:
- l10n.honorableMentions_values_session_description,
+ l10n.honorableMentions_values_session_description,
iconName: "session.png",
url: "https://getsession.org/",
),
MentionTile(
title: l10n.honorableMentions_values_odysee,
description:
- l10n.honorableMentions_values_odysee_description,
+ l10n.honorableMentions_values_odysee_description,
iconName: "odysee.png",
url: "https://odysee.com/",
),
diff --git a/lib/screens/SharesOverviewScreen.dart b/lib/screens/SharesOverviewScreen.dart
index 9cdb9484..fa4fb5ac 100644
--- a/lib/screens/SharesOverviewScreen.dart
+++ b/lib/screens/SharesOverviewScreen.dart
@@ -6,12 +6,12 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
import 'package:locus/screens/shares_overview_screen_widgets/screens/EmptyScreen.dart';
import 'package:locus/screens/shares_overview_screen_widgets/screens/TasksOverviewScreen.dart';
-import 'package:locus/services/task_service.dart';
-import 'package:locus/services/view_service.dart';
+import 'package:locus/services/settings_service/index.dart';
+import 'package:locus/services/task_service/index.dart';
+import 'package:locus/services/view_service/index.dart';
import 'package:locus/utils/theme.dart';
import 'package:provider/provider.dart';
-import '../services/settings_service.dart';
import 'CreateTaskScreen.dart';
import 'shares_overview_screen_widgets/values.dart';
@@ -26,22 +26,9 @@ class SharesOverviewScreen extends StatefulWidget {
class _SharesOverviewScreenState extends State {
final listViewKey = GlobalKey();
- final PageController _tabController = PageController();
late final TaskService taskService;
int activeTab = 0;
- void _changeTab(final int newTab) {
- setState(() {
- activeTab = newTab;
- });
-
- _tabController.animateToPage(
- newTab,
- duration: getTransitionDuration(context),
- curve: Curves.easeInOut,
- );
- }
-
PlatformAppBar? getAppBar() {
final l10n = AppLocalizations.of(context);
@@ -118,11 +105,11 @@ class _SharesOverviewScreenState extends State {
// Settings bottomNavBar via cupertino data class does not work
bottomNavBar: isCupertino(context)
? PlatformNavBar(
- material: (_, __) => MaterialNavBarData(
- backgroundColor: Theme.of(context).dialogBackgroundColor,
- elevation: 0,
- padding: const EdgeInsets.all(0)),
- itemChanged: _changeTab,
+ itemChanged: (index) {
+ setState(() {
+ activeTab = index;
+ });
+ },
currentIndex: activeTab,
items: [
BottomNavigationBarItem(
@@ -136,19 +123,15 @@ class _SharesOverviewScreenState extends State {
],
)
: null,
- body: PageView(
- controller: _tabController,
- physics: const NeverScrollableScrollPhysics(),
- children: [
- const TasksOverviewScreen(),
- if (isCupertino(context))
- CreateTaskScreen(
+ body: activeTab == 0
+ ? const TasksOverviewScreen()
+ : CreateTaskScreen(
onCreated: () {
- _changeTab(0);
+ setState(() {
+ activeTab = 0;
+ });
},
),
- ],
- ),
);
}
}
diff --git a/lib/screens/ShortcutScreen.dart b/lib/screens/ShortcutScreen.dart
index a64cc562..3fb8ee3a 100644
--- a/lib/screens/ShortcutScreen.dart
+++ b/lib/screens/ShortcutScreen.dart
@@ -4,7 +4,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
import 'package:locus/constants/spacing.dart';
import 'package:locus/init_quick_actions.dart';
-import 'package:locus/services/task_service.dart';
+import 'package:locus/services/task_service/index.dart';
import 'package:locus/services/timers_service.dart';
import 'package:locus/utils/location/index.dart';
import 'package:locus/utils/platform.dart';
@@ -14,7 +14,7 @@ import 'package:provider/provider.dart';
import '../models/log.dart';
import '../services/location_point_service.dart';
import '../services/log_service.dart';
-import '../services/settings_service.dart';
+import 'package:locus/services/settings_service/index.dart';
import '../utils/theme.dart';
class ShortcutScreen extends StatefulWidget {
@@ -76,7 +76,7 @@ class _ShortcutScreenState extends State {
await task.startSchedule(startNowIfNextRunIsUnknown: true);
- final locationPoint = await task.publishCurrentPosition();
+ final locationPoint = await task.publisher.publishCurrentPosition();
await logService.addLog(
Log.updateLocation(
@@ -102,7 +102,7 @@ class _ShortcutScreenState extends State {
);
await Future.wait(
tasks.map(
- (task) => task.publishLocation(
+ (task) => task.publisher.publishLocation(
locationPoint.copyWithDifferentId(),
),
),
diff --git a/lib/screens/TaskDetailScreen.dart b/lib/screens/TaskDetailScreen.dart
index c8b5e658..4cce6104 100644
--- a/lib/screens/TaskDetailScreen.dart
+++ b/lib/screens/TaskDetailScreen.dart
@@ -1,27 +1,15 @@
-import 'package:easy_debounce/easy_throttle.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
import 'package:locus/screens/task_detail_screen_widgets/Details.dart';
-import 'package:locus/services/location_fetch_controller.dart';
-import 'package:locus/services/task_service.dart';
-import 'package:locus/utils/bunny.dart';
-import 'package:locus/widgets/EmptyLocationsThresholdScreen.dart';
-import 'package:locus/widgets/LocationFetchError.dart';
-import 'package:locus/widgets/LocationStillFetchingBanner.dart';
-import 'package:locus/widgets/LocationsLoadingScreen.dart';
-import 'package:locus/widgets/LocationsMap.dart';
-import 'package:map_launcher/map_launcher.dart';
+import 'package:locus/services/task_service/index.dart';
import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
import 'package:provider/provider.dart';
import '../constants/spacing.dart';
-import '../services/settings_service.dart';
+import 'package:locus/services/settings_service/index.dart';
import '../utils/helper_sheet.dart';
import '../utils/theme.dart';
-import '../widgets/LocationFetchEmpty.dart';
-import '../widgets/OpenInMaps.dart';
-import '../widgets/PlatformPopup.dart';
const DEBOUNCE_DURATION = Duration(seconds: 2);
const DEFAULT_LOCATION_LIMIT = 50;
@@ -39,52 +27,10 @@ class TaskDetailScreen extends StatefulWidget {
}
class _TaskDetailScreenState extends State {
- final PageController _pageController = PageController();
- late final LocationFetcher _locationFetcher;
- bool _isError = false;
- bool _isShowingDetails = false;
-
@override
void initState() {
super.initState();
- emptyLocationsCount++;
-
- _locationFetcher = widget.task.createLocationFetcher(
- onLocationFetched: (final location) {
- emptyLocationsCount = 0;
- // Only update partially to avoid lag
- EasyThrottle.throttle(
- "${widget.task.id}:location-fetch",
- DEBOUNCE_DURATION,
- () {
- if (!mounted) {
- return;
- }
- setState(() {});
- },
- );
- },
- );
-
- _locationFetcher.fetchMore(
- onEnd: () {
- setState(() {});
- },
- );
-
- _pageController.addListener(() {
- if (_pageController.page == 0) {
- setState(() {
- _isShowingDetails = false;
- });
- } else {
- setState(() {
- _isShowingDetails = true;
- });
- }
- });
-
WidgetsBinding.instance.addPostFrameCallback((_) async {
final settings = context.read();
@@ -144,23 +90,11 @@ class _TaskDetailScreenState extends State {
);
}
- @override
- void dispose() {
- _pageController.dispose();
- _locationFetcher.dispose();
-
- super.dispose();
- }
-
@override
Widget build(BuildContext context) {
- final l10n = AppLocalizations.of(context);
-
return PlatformScaffold(
appBar: PlatformAppBar(
- title: Text(
- _isShowingDetails ? l10n.taskDetails_title : widget.task.name,
- ),
+ title: Text(widget.task.name),
material: (_, __) => MaterialAppBarData(
centerTitle: true,
),
@@ -168,19 +102,6 @@ class _TaskDetailScreenState extends State {
backgroundColor: getCupertinoAppBarColorForMapScreen(context),
),
trailingActions: [
- if (_locationFetcher.controller.locations.isNotEmpty &&
- !_isShowingDetails)
- PlatformIconButton(
- cupertino: (_, __) => CupertinoIconButtonData(
- padding: EdgeInsets.zero,
- ),
- icon: const Icon(Icons.my_location_rounded),
- onPressed: () {
- // No need to check for location permission, as the user must enable it to create locations
- // in the first place
- _locationFetcher.controller.goToUserLocation();
- },
- ),
PlatformIconButton(
cupertino: (_, __) => CupertinoIconButtonData(
padding: EdgeInsets.zero,
@@ -188,146 +109,15 @@ class _TaskDetailScreenState extends State {
icon: Icon(context.platformIcons.help),
onPressed: showHelp,
),
- Padding(
- padding: isMaterial(context)
- ? const EdgeInsets.all(SMALL_SPACE)
- : EdgeInsets.zero,
- child: PlatformPopup(
- type: PlatformPopupType.tap,
- cupertinoButtonPadding: EdgeInsets.zero,
- items: [
- PlatformPopupMenuItem(
- label: PlatformListTile(
- leading: Icon(context.platformIcons.location),
- trailing: const SizedBox.shrink(),
- title: Text(l10n.viewDetails_actions_openLatestLocation),
- ),
- onPressed: () async {
- await showPlatformModalSheet(
- context: context,
- material: MaterialModalSheetData(
- backgroundColor: Colors.transparent,
- ),
- builder: (context) => OpenInMaps(
- destination: Coords(
- _locationFetcher.controller.locations.last.latitude,
- _locationFetcher.controller.locations.last.longitude,
- ),
- ),
- );
- },
- ),
- // If the fetched locations are less than the limit,
- // there are definitely no more locations to fetch
- if (_locationFetcher.canFetchMore)
- PlatformPopupMenuItem(
- label: PlatformListTile(
- leading: Icon(context.platformIcons.refresh),
- trailing: const SizedBox.shrink(),
- title: Text(l10n.locationFetcher_actions_fetchMore),
- ),
- onPressed: () {
- _locationFetcher.fetchMore(onEnd: () {
- setState(() {});
- });
- },
- ),
- ],
- ),
- ),
],
),
- body: _isError
- ? const LocationFetchError()
- : PageView(
- physics: const NeverScrollableScrollPhysics(),
- scrollDirection: Axis.vertical,
- controller: _pageController,
- children: [
- Column(
- crossAxisAlignment: CrossAxisAlignment.stretch,
- children: [
- Expanded(
- flex: 9,
- child: (() {
- if (_locationFetcher.controller.locations.isNotEmpty) {
- return Stack(
- children: [
- LocationsMap(
- controller: _locationFetcher.controller,
- ),
- if (_locationFetcher.isLoading)
- const LocationStillFetchingBanner(),
- ],
- );
- }
-
- if (_locationFetcher.isLoading) {
- return SafeArea(
- child: Padding(
- padding: const EdgeInsets.all(MEDIUM_SPACE),
- child: LocationsLoadingScreen(
- locations:
- _locationFetcher.controller.locations,
- onTimeout: () {
- setState(() {
- _isError = true;
- });
- },
- ),
- ),
- );
- }
-
- if (emptyLocationsCount > EMPTY_LOCATION_THRESHOLD) {
- return const EmptyLocationsThresholdScreen();
- }
-
- return const LocationFetchEmpty();
- })(),
- ),
- Expanded(
- flex: 1,
- child: PlatformTextButton(
- material: (_, __) => MaterialTextButtonData(
- style: ButtonStyle(
- // Not rounded, but square
- shape: MaterialStateProperty.all(
- const RoundedRectangleBorder(
- borderRadius: BorderRadius.zero,
- ),
- ),
- ),
- ),
- child: Text(l10n.taskDetails_goToDetails),
- onPressed: () {
- _pageController.animateToPage(
- 1,
- duration: const Duration(milliseconds: 500),
- curve: Curves.easeInOut,
- );
- },
- ),
- ),
- ],
- ),
- SafeArea(
- child: SingleChildScrollView(
- child: Details(
- locations: _locationFetcher.controller.locations,
- task: widget.task,
- onGoBack: () {
- _pageController.animateToPage(
- 0,
- duration: const Duration(milliseconds: 500),
- curve: Curves.easeInOut,
- );
- },
- ),
- ),
- ),
- ],
- ),
+ body: SafeArea(
+ child: SingleChildScrollView(
+ child: Details(
+ task: widget.task,
+ ),
+ ),
+ ),
);
}
}
diff --git a/lib/screens/ViewDetailScreen.dart b/lib/screens/ViewDetailScreen.dart
deleted file mode 100644
index 2aeabde4..00000000
--- a/lib/screens/ViewDetailScreen.dart
+++ /dev/null
@@ -1,482 +0,0 @@
-import 'dart:async';
-
-import 'package:easy_debounce/easy_throttle.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-import 'package:flutter_platform_widgets/flutter_platform_widgets.dart'
- hide PlatformListTile;
-import 'package:geolocator/geolocator.dart';
-import 'package:locus/screens/view_alarm_screen_widgets/ViewAlarmScreen.dart';
-import 'package:locus/screens/view_details_screen_widgets/ViewLocationPointsScreen.dart';
-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';
-import 'package:locus/widgets/LocationsMap.dart';
-import 'package:locus/widgets/OpenInMaps.dart';
-import 'package:locus/widgets/PlatformFlavorWidget.dart';
-import 'package:locus/widgets/PlatformPopup.dart';
-import 'package:map_launcher/map_launcher.dart';
-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/theme.dart';
-import '../widgets/LocationFetchError.dart';
-import '../widgets/LocationStillFetchingBanner.dart';
-import '../widgets/LocationsLoadingScreen.dart';
-import '../widgets/PlatformListTile.dart';
-
-const DEBOUNCE_DURATION = Duration(seconds: 2);
-
-class LineSliderTickMarkShape extends SliderTickMarkShape {
- final double tickWidth;
-
- const LineSliderTickMarkShape({
- this.tickWidth = 1.0,
- }) : super();
-
- @override
- Size getPreferredSize(
- {required SliderThemeData sliderTheme, required bool isEnabled}) {
- // We don't need this
- return Size.zero;
- }
-
- @override
- void paint(
- PaintingContext context,
- Offset center, {
- required RenderBox parentBox,
- required SliderThemeData sliderTheme,
- required Animation enableAnimation,
- required Offset thumbCenter,
- required bool isEnabled,
- required TextDirection textDirection,
- }) {
- // This block is just copied from `slider_theme`
- final bool isTickMarkRightOfThumb = center.dx > thumbCenter.dx;
- final begin = isTickMarkRightOfThumb
- ? sliderTheme.disabledInactiveTickMarkColor
- : sliderTheme.disabledActiveTickMarkColor;
- final end = isTickMarkRightOfThumb
- ? sliderTheme.inactiveTickMarkColor
- : sliderTheme.activeTickMarkColor;
- final Paint paint = Paint()
- ..color = ColorTween(begin: begin, end: end).evaluate(enableAnimation)!;
-
- final trackHeight = sliderTheme.trackHeight!;
-
- final rect = Rect.fromCenter(
- center: center,
- width: tickWidth,
- height: trackHeight,
- );
-
- context.canvas.drawRect(rect, paint);
- }
-}
-
-class ViewDetailScreen extends StatefulWidget {
- final TaskView view;
-
- const ViewDetailScreen({
- required this.view,
- Key? key,
- }) : super(key: key);
-
- @override
- State createState() => _ViewDetailScreenState();
-}
-
-class _ViewDetailScreenState extends State {
- // `_controller` is used to control the actively shown locations on the map
- final LocationsMapController _controller = LocationsMapController();
-
- // `_locationFetcher.controller` is used to control ALL locations
- late final LocationFetcher _locationFetcher;
- StreamSubscription? _positionUpdateStream;
-
- bool _isError = false;
-
- bool showAlarms = true;
-
- double? distanceToLatestLocation;
-
- @override
- void initState() {
- super.initState();
-
- emptyLocationsCount++;
-
- _locationFetcher = widget.view.createLocationFetcher(
- onLocationFetched: (final location) {
- emptyLocationsCount = 0;
-
- _controller.add(location);
- // Only update partially to avoid lag
- EasyThrottle.throttle(
- "${widget.view.id}:location-fetch",
- DEBOUNCE_DURATION,
- () {
- if (!mounted) {
- return;
- }
- setState(() {});
- },
- );
- },
- );
-
- _locationFetcher.fetchMore(
- onEnd: () {
- _updateDistanceToLocation();
- setState(() {});
- },
- );
-
- // Update UI when for example alarms are added or removed
- widget.view.addListener(updateView);
- }
-
- void _updateDistanceToLocation() async {
- if (_locationFetcher.controller.locations.isEmpty ||
- _positionUpdateStream != null ||
- !(await hasGrantedLocationPermission())) {
- return;
- }
-
- _positionUpdateStream = Geolocator.getPositionStream().listen((position) {
- if (!mounted) {
- return;
- }
-
- setState(() {
- distanceToLatestLocation = Geolocator.distanceBetween(
- position.latitude,
- position.longitude,
- _locationFetcher.controller.locations.last.latitude,
- _locationFetcher.controller.locations.last.longitude,
- );
- });
- });
- }
-
- void updateView() {
- setState(() {});
- }
-
- @override
- void dispose() {
- _locationFetcher.dispose();
- _controller.dispose();
- _positionUpdateStream?.cancel();
- widget.view.removeListener(updateView);
-
- super.dispose();
- }
-
- VoidCallback handleTapOnDate(final Iterable locations) {
- return () {
- _controller.clear();
-
- if (locations.isNotEmpty) {
- _controller.addAll(locations);
- _controller.goTo(locations.last);
- }
-
- setState(() {});
- };
- }
-
- Widget buildDateSelectButton(
- final List locations,
- final int hour,
- final int maxLocations,
- ) {
- final shades = getPrimaryColorShades(context);
-
- return FillUpPaint(
- color: shades[0]!,
- fillPercentage:
- maxLocations == 0 ? 0 : (locations.length.toDouble() / maxLocations),
- size: Size(
- MediaQuery.of(context).size.width / 24,
- MediaQuery.of(context).size.height * (1 / 12),
- ),
- );
- }
-
- @override
- Widget build(BuildContext context) {
- final l10n = AppLocalizations.of(context);
- final locationsPerHour = _locationFetcher.controller.getLocationsPerHour();
- final maxLocations = locationsPerHour.values.isEmpty
- ? 0
- : locationsPerHour.values.fold(
- 0,
- (value, element) =>
- value > element.length ? value : element.length);
-
- return PlatformScaffold(
- appBar: PlatformAppBar(
- title: Text(l10n.viewDetails_title),
- trailingActions: [
- if (_locationFetcher.controller.locations.isNotEmpty)
- PlatformIconButton(
- cupertino: (_, __) => CupertinoIconButtonData(
- padding: EdgeInsets.zero,
- ),
- icon: const Icon(Icons.my_location_rounded),
- onPressed: () async {
- final hasGrantedLocation =
- await requestBasicLocationPermission();
-
- if (hasGrantedLocation) {
- _controller.goToUserLocation();
- }
- },
- ),
- if (widget.view.alarms.isNotEmpty && _controller.locations.isNotEmpty)
- Tooltip(
- message: showAlarms
- ? l10n.viewDetails_actions_showAlarms_hide
- : l10n.viewDetails_actions_showAlarms_show,
- child: PlatformTextButton(
- cupertino: (_, __) => CupertinoTextButtonData(
- padding: EdgeInsets.zero,
- ),
- onPressed: () {
- setState(() {
- showAlarms = !showAlarms;
- });
- },
- child: PlatformFlavorWidget(
- material: (_, __) => showAlarms
- ? const Icon(Icons.alarm_rounded)
- : const Icon(Icons.alarm_off_rounded),
- cupertino: (_, __) => showAlarms
- ? const Icon(CupertinoIcons.alarm)
- : const Icon(Icons.alarm_off_rounded),
- ),
- ),
- ),
- Padding(
- padding: isMaterial(context)
- ? const EdgeInsets.all(SMALL_SPACE)
- : EdgeInsets.zero,
- child: PlatformPopup(
- cupertinoButtonPadding: EdgeInsets.zero,
- type: PlatformPopupType.tap,
- items: [
- PlatformPopupMenuItem(
- label: PlatformListTile(
- leading: PlatformFlavorWidget(
- cupertino: (_, __) => const Icon(CupertinoIcons.alarm),
- material: (_, __) => const Icon(Icons.alarm_rounded),
- ),
- title: Text(l10n.location_manageAlarms_title),
- trailing: const SizedBox.shrink(),
- ),
- onPressed: () {
- if (isCupertino(context)) {
- Navigator.of(context).push(
- MaterialWithModalsPageRoute(
- builder: (_) => ViewAlarmScreen(view: widget.view),
- ),
- );
- } else {
- Navigator.of(context).push(
- NativePageRoute(
- context: context,
- builder: (_) => ViewAlarmScreen(view: widget.view),
- ),
- );
- }
- }),
- if (_locationFetcher.controller.locations.isNotEmpty)
- PlatformPopupMenuItem(
- label: PlatformListTile(
- leading: Icon(context.platformIcons.location),
- trailing: const SizedBox.shrink(),
- title: Text(l10n.viewDetails_actions_openLatestLocation),
- ),
- onPressed: () => showPlatformModalSheet(
- context: context,
- material: MaterialModalSheetData(),
- builder: (context) => OpenInMaps(
- destination: Coords(
- _locationFetcher.controller.locations.last.latitude,
- _locationFetcher.controller.locations.last.longitude,
- ),
- ),
- ),
- ),
- if (_locationFetcher.controller.locations.isNotEmpty)
- PlatformPopupMenuItem(
- label: PlatformListTile(
- leading: PlatformFlavorWidget(
- material: (_, __) => const Icon(Icons.list_rounded),
- cupertino: (_, __) =>
- const Icon(CupertinoIcons.list_bullet),
- ),
- trailing: const SizedBox.shrink(),
- title: Text(l10n.viewDetails_actions_showLocationList),
- ),
- onPressed: () {
- Navigator.push(
- context,
- NativePageRoute(
- context: context,
- builder: (context) => ViewLocationPointsScreen(
- locationFetcher: _locationFetcher,
- ),
- ),
- );
- },
- ),
- ],
- ),
- ),
- ],
- material: (_, __) => MaterialAppBarData(
- centerTitle: true,
- ),
- cupertino: (_, __) => CupertinoNavigationBarData(
- backgroundColor: getCupertinoAppBarColorForMapScreen(context),
- ),
- ),
- body: (() {
- if (_isError) {
- return const LocationFetchError();
- }
-
- if (_locationFetcher.controller.locations.isNotEmpty) {
- return PageView(
- physics: const NeverScrollableScrollPhysics(),
- children: [
- Column(
- children: [
- Expanded(
- flex: 11,
- child: Stack(
- children: [
- LocationsMap(
- controller: _controller,
- showCircles: showAlarms,
- circles: List.from(
- List.from(
- widget.view.alarms)
- .map(
- (final alarm) => LocationsMapCircle(
- id: alarm.id,
- center: alarm.center,
- radius: alarm.radius,
- color: Colors.red.withOpacity(.3),
- strokeColor: Colors.red,
- ),
- ),
- )),
- if (_locationFetcher.isLoading)
- const LocationStillFetchingBanner(),
- if (distanceToLatestLocation != null)
- Positioned(
- bottom: 0,
- left: 0,
- right: 0,
- child: Padding(
- padding: const EdgeInsets.only(bottom: 8),
- child: Row(
- mainAxisSize: MainAxisSize.min,
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- Text(
- l10n.viewDetails_distanceToLatestLocation_label(
- distanceToLatestLocation!.round(),
- ),
- style: TextStyle(
- color: getIsDarkMode(context)
- ? Colors.white
- : isCupertino(context)
- ? CupertinoColors.secondaryLabel
- : Colors.black87,
- fontSize: 14,
- fontWeight: FontWeight.bold,
- ),
- ),
- ],
- ),
- ),
- )
- ],
- ),
- ),
- Expanded(
- flex: 1,
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceEvenly,
- children:
- List.generate(24, (index) => 23 - index).map((hour) {
- final date =
- DateTime.now().subtract(Duration(hours: hour));
- final normalizedDate =
- LocationsMapController.normalizeDateTime(date);
- final locations =
- locationsPerHour[normalizedDate] ?? [];
- final child = buildDateSelectButton(
- locations,
- hour,
- maxLocations,
- );
-
- return PlatformWidget(
- material: (_, __) => InkWell(
- onTap: handleTapOnDate(locations),
- child: child,
- ),
- cupertino: (_, __) => GestureDetector(
- onTap: handleTapOnDate(locations),
- child: child,
- ),
- );
- }).toList(),
- ),
- ),
- ],
- ),
- ],
- );
- }
-
- if (_locationFetcher.isLoading) {
- return SafeArea(
- child: Padding(
- padding: const EdgeInsets.all(MEDIUM_SPACE),
- child: LocationsLoadingScreen(
- locations: _locationFetcher.controller.locations,
- onTimeout: () {
- setState(() {
- _isError = true;
- });
- },
- ),
- ),
- );
- }
-
- if (emptyLocationsCount > EMPTY_LOCATION_THRESHOLD) {
- return const EmptyLocationsThresholdScreen();
- }
-
- return const LocationFetchEmpty();
- })(),
- );
- }
-}
diff --git a/lib/screens/ViewDetailsScreen.dart b/lib/screens/ViewDetailsScreen.dart
new file mode 100644
index 00000000..33132316
--- /dev/null
+++ b/lib/screens/ViewDetailsScreen.dart
@@ -0,0 +1,95 @@
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:flutter_platform_widgets/flutter_platform_widgets.dart'
+ hide PlatformListTile;
+import 'package:locus/screens/view_alarm_screen_widgets/ViewAlarmScreen.dart';
+import 'package:locus/screens/view_details_screen_widgets/LocationPointsList.dart';
+import 'package:locus/services/view_service/index.dart';
+import 'package:locus/utils/PageRoute.dart';
+import 'package:locus/widgets/Paper.dart';
+import 'package:locus/widgets/PlatformFlavorWidget.dart';
+import 'package:locus/widgets/PlatformPopup.dart';
+import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
+
+import '../constants/spacing.dart';
+import '../utils/theme.dart';
+import '../widgets/PlatformListTile.dart';
+
+class ViewDetailsScreen extends StatelessWidget {
+ final TaskView view;
+
+ const ViewDetailsScreen({
+ super.key,
+ required this.view,
+ });
+
+ @override
+ Widget build(BuildContext context) {
+ final l10n = AppLocalizations.of(context);
+
+ return PlatformScaffold(
+ appBar: PlatformAppBar(
+ title: Text(l10n.viewDetails_title),
+ trailingActions: [
+ Padding(
+ padding: isMaterial(context)
+ ? const EdgeInsets.all(SMALL_SPACE)
+ : EdgeInsets.zero,
+ child: PlatformPopup(
+ cupertinoButtonPadding: EdgeInsets.zero,
+ type: PlatformPopupType.tap,
+ items: [
+ PlatformPopupMenuItem(
+ label: PlatformListTile(
+ leading: PlatformFlavorWidget(
+ cupertino: (_, __) => const Icon(CupertinoIcons.alarm),
+ material: (_, __) => const Icon(Icons.alarm_rounded),
+ ),
+ title: Text(l10n.location_manageAlarms_title),
+ trailing: const SizedBox.shrink(),
+ ),
+ onPressed: () {
+ if (isCupertino(context)) {
+ Navigator.of(context).push(
+ MaterialWithModalsPageRoute(
+ builder: (_) => ViewAlarmScreen(view: view),
+ ),
+ );
+ } else {
+ Navigator.of(context).push(
+ NativePageRoute(
+ context: context,
+ builder: (_) => ViewAlarmScreen(view: view),
+ ),
+ );
+ }
+ }),
+ ],
+ ),
+ ),
+ ],
+ material: (_, __) => MaterialAppBarData(
+ centerTitle: true,
+ ),
+ cupertino: (_, __) => CupertinoNavigationBarData(
+ backgroundColor: getCupertinoAppBarColorForMapScreen(context),
+ ),
+ ),
+ body: SafeArea(
+ child: SingleChildScrollView(
+ padding: const EdgeInsets.all(MEDIUM_SPACE),
+ child: Column(
+ children: [
+ Paper(
+ child: LocationPointsList(
+ view: view,
+ ),
+ ),
+ ],
+ ),
+ ),
+ ),
+ );
+ }
+}
diff --git a/lib/screens/WelcomeScreen.dart b/lib/screens/WelcomeScreen.dart
index 1c89885b..2c575851 100644
--- a/lib/screens/WelcomeScreen.dart
+++ b/lib/screens/WelcomeScreen.dart
@@ -9,7 +9,7 @@ import 'package:locus/constants/spacing.dart';
import 'package:locus/init_quick_actions.dart';
import 'package:locus/screens/LocationsOverviewScreen.dart';
import 'package:locus/screens/welcome_screen_widgets/SimpleContinuePage.dart';
-import 'package:locus/services/settings_service.dart';
+import 'package:locus/services/settings_service/index.dart';
import 'package:locus/utils/PageRoute.dart';
import 'package:lottie/lottie.dart';
import 'package:provider/provider.dart';
diff --git a/lib/screens/create_task_screen_widgets/ExampleTasksRoulette.dart b/lib/screens/create_task_screen_widgets/ExampleTasksRoulette.dart
index 732ba90d..2212e689 100644
--- a/lib/screens/create_task_screen_widgets/ExampleTasksRoulette.dart
+++ b/lib/screens/create_task_screen_widgets/ExampleTasksRoulette.dart
@@ -3,11 +3,10 @@ import 'package:flutter/material.dart';
import 'package:flutter_animate/flutter_animate.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
+import 'package:locus/services/task_service/index.dart';
import 'package:locus/services/timers_service.dart';
import 'package:locus/utils/theme.dart';
-import '../../services/task_service.dart';
-
List getExamples(final BuildContext context) {
final l10n = AppLocalizations.of(context);
diff --git a/lib/screens/import_task_sheet_widgets/NameForm.dart b/lib/screens/import_task_sheet_widgets/NameForm.dart
index 3043a557..bdc2bf0a 100644
--- a/lib/screens/import_task_sheet_widgets/NameForm.dart
+++ b/lib/screens/import_task_sheet_widgets/NameForm.dart
@@ -8,7 +8,7 @@ import 'package:locus/utils/color.dart';
import 'package:provider/provider.dart';
import '../../constants/spacing.dart';
-import '../../services/view_service.dart';
+import '../../services/view_service/index.dart';
import '../../utils/theme.dart';
import '../../widgets/ModalSheetContent.dart';
@@ -72,25 +72,28 @@ class _NameFormState extends State {
}
if (viewService.views.any(
- (element) => element.name.toLowerCase() == lowerCasedName)) {
+ (element) =>
+ element.name.toLowerCase() == lowerCasedName)) {
return l10n
.sharesOverviewScreen_importTask_action_name_errors_sameNameAlreadyExists;
}
return null;
},
- material: (_, __) => MaterialTextFormFieldData(
- decoration: InputDecoration(
- labelText:
+ material: (_, __) =>
+ MaterialTextFormFieldData(
+ decoration: InputDecoration(
+ labelText:
l10n.sharesOverviewScreen_importTask_action_name_label,
- icon: const Icon(Icons.text_fields_rounded),
- ),
- ),
- cupertino: (_, __) => CupertinoTextFormFieldData(
- placeholder:
+ icon: const Icon(Icons.text_fields_rounded),
+ ),
+ ),
+ cupertino: (_, __) =>
+ CupertinoTextFormFieldData(
+ placeholder:
l10n.sharesOverviewScreen_importTask_action_name_label,
- prefix: const Icon(CupertinoIcons.textformat),
- ),
+ prefix: const Icon(CupertinoIcons.textformat),
+ ),
),
const SizedBox(height: MEDIUM_SPACE),
Text(
@@ -116,7 +119,7 @@ class _NameFormState extends State {
for (final color in Colors.primaries)
Padding(
padding:
- const EdgeInsets.symmetric(horizontal: SMALL_SPACE),
+ const EdgeInsets.symmetric(horizontal: SMALL_SPACE),
child: GestureDetector(
onTap: () {
setState(() {
diff --git a/lib/screens/import_task_sheet_widgets/ReceiveViewByBluetooth.dart b/lib/screens/import_task_sheet_widgets/ReceiveViewByBluetooth.dart
index ac64c37e..30fd1861 100644
--- a/lib/screens/import_task_sheet_widgets/ReceiveViewByBluetooth.dart
+++ b/lib/screens/import_task_sheet_widgets/ReceiveViewByBluetooth.dart
@@ -14,7 +14,7 @@ import 'package:locus/widgets/Paper.dart';
import 'package:lottie/lottie.dart';
import 'package:nearby_connections/nearby_connections.dart';
-import '../../services/view_service.dart';
+import '../../services/view_service/index.dart';
import '../../utils/import_export_handler.dart';
class ReceiveViewByBluetooth extends StatefulWidget {
@@ -79,28 +79,32 @@ class _ReceiveViewByBluetoothState extends State
final acceptConnection = await showPlatformDialog(
context: context,
barrierDismissible: false,
- builder: (context) => PlatformAlertDialog(
- title: Text(l10n.importTask_bluetooth_receive_request_title),
- content:
+ builder: (context) =>
+ PlatformAlertDialog(
+ title: Text(l10n.importTask_bluetooth_receive_request_title),
+ content:
Text(l10n.importTask_bluetooth_receive_request_description),
- actions: [
- PlatformDialogAction(
- onPressed: () => Navigator.of(context).pop(false),
- material: (_, __) => MaterialDialogActionData(
- icon: const Icon(Icons.close),
- ),
- child:
+ actions: [
+ PlatformDialogAction(
+ onPressed: () => Navigator.of(context).pop(false),
+ material: (_, __) =>
+ MaterialDialogActionData(
+ icon: const Icon(Icons.close),
+ ),
+ child:
Text(l10n.importTask_bluetooth_receive_request_decline),
+ ),
+ PlatformDialogAction(
+ onPressed: () => Navigator.of(context).pop(true),
+ material: (_, __) =>
+ MaterialDialogActionData(
+ icon: const Icon(Icons.check),
+ ),
+ child: Text(
+ l10n.importTask_bluetooth_receive_request_accept),
+ ),
+ ],
),
- PlatformDialogAction(
- onPressed: () => Navigator.of(context).pop(true),
- material: (_, __) => MaterialDialogActionData(
- icon: const Icon(Icons.check),
- ),
- child: Text(l10n.importTask_bluetooth_receive_request_accept),
- ),
- ],
- ),
);
if (acceptConnection) {
@@ -123,8 +127,7 @@ class _ReceiveViewByBluetoothState extends State
} else {
Nearby().rejectConnection(id);
}
- } catch (_) {
- } finally {
+ } catch (_) {} finally {
setState(() {
isConfirmingRequest = false;
});
diff --git a/lib/screens/import_task_sheet_widgets/ViewImportOverview.dart b/lib/screens/import_task_sheet_widgets/ViewImportOverview.dart
index 903429c1..108f8bf1 100644
--- a/lib/screens/import_task_sheet_widgets/ViewImportOverview.dart
+++ b/lib/screens/import_task_sheet_widgets/ViewImportOverview.dart
@@ -2,10 +2,11 @@ import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:flutter_platform_widgets/flutter_platform_widgets.dart'
hide PlatformListTile;
-import 'package:locus/services/view_service.dart';
+import 'package:locus/screens/locations_overview_screen_widgets/LocationFetchers.dart';
+import 'package:locus/services/view_service/index.dart';
+import 'package:provider/provider.dart';
import '../../constants/spacing.dart';
-import '../../services/location_point_service.dart';
import '../../utils/theme.dart';
import '../../widgets/LocationsMap.dart';
import '../../widgets/PlatformListTile.dart';
@@ -25,9 +26,7 @@ class ViewImportOverview extends StatefulWidget {
}
class _ViewImportOverviewState extends State {
- void Function()? _unsubscribeGetLocations;
final LocationsMapController _controller = LocationsMapController();
- bool _isLoading = true;
final bool _isError = false;
double timeOffset = 0;
@@ -36,40 +35,21 @@ class _ViewImportOverviewState extends State {
void initState() {
super.initState();
- addListener();
+ final fetchers = context.read();
+ final lastLocation = fetchers.getLocations(widget.view).lastOrNull;
+
+ if (lastLocation != null) {
+ _controller.add(lastLocation);
+ }
}
@override
void dispose() {
- _unsubscribeGetLocations?.call();
_controller.dispose();
super.dispose();
}
- addListener() async {
- _unsubscribeGetLocations = widget.view.getLocations(
- limit: 1,
- onLocationFetched: (final LocationPointService location) {
- if (!mounted) {
- return;
- }
-
- _controller.add(location);
- setState(() {});
- },
- onEnd: () {
- if (!mounted) {
- return;
- }
-
- setState(() {
- _isLoading = false;
- });
- },
- );
- }
-
@override
Widget build(BuildContext context) {
final l10n = AppLocalizations.of(context);
@@ -99,14 +79,7 @@ class _ViewImportOverviewState extends State {
),
],
),
- if (_isLoading)
- const Padding(
- padding: EdgeInsets.all(MEDIUM_SPACE),
- child: Center(
- child: CircularProgressIndicator(),
- ),
- )
- else if (_isError)
+ if (_isError)
Text(
l10n.locationsLoadingError,
style: TextStyle(
diff --git a/lib/screens/locations_overview_screen_widgets/ActiveSharesSheet.dart b/lib/screens/locations_overview_screen_widgets/ActiveSharesSheet.dart
index 395b148f..b43590ed 100644
--- a/lib/screens/locations_overview_screen_widgets/ActiveSharesSheet.dart
+++ b/lib/screens/locations_overview_screen_widgets/ActiveSharesSheet.dart
@@ -7,6 +7,7 @@ import 'package:flutter_logs/flutter_logs.dart';
import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
import 'package:locus/constants/values.dart';
import 'package:locus/services/location_point_service.dart';
+import 'package:locus/services/task_service/index.dart';
import 'package:locus/utils/location/index.dart';
import 'package:locus/widgets/PlatformFlavorWidget.dart';
import 'package:lottie/lottie.dart';
@@ -15,7 +16,6 @@ import 'package:visibility_detector/visibility_detector.dart';
import './TaskTile.dart';
import '../../constants/spacing.dart';
-import '../../services/task_service.dart';
import '../../utils/theme.dart';
import '../../widgets/ModalSheet.dart';
@@ -160,13 +160,12 @@ class _ActiveSharesSheetState extends State
Iterable get quickShareTasks {
final taskService = context.read();
- return taskService.tasks
- .where((task) => task.deleteAfterRun && task.timers.length <= 1);
+ return taskService.tasks.where((task) => task.isQuickShare);
}
Future getAreSomeTasksRunning() async {
final tasksRunning =
- await Future.wait(quickShareTasks.map((task) => task.isRunning()));
+ await Future.wait(quickShareTasks.map((task) => task.isRunning()));
return tasksRunning.any((isRunning) => isRunning);
}
@@ -188,10 +187,9 @@ class _ActiveSharesSheetState extends State
await Future.wait(
quickShareTasks.map(
- (task) =>
- task.publishLocation(
- locationData.copyWithDifferentId(),
- ),
+ (task) => task.publisher.publishLocation(
+ locationData.copyWithDifferentId(),
+ ),
),
);
@@ -204,8 +202,7 @@ class _ActiveSharesSheetState extends State
FlutterLogs.logError(
LOG_TAG,
"ActiveSharesSheet",
- "Error while updating location for ${quickShareTasks
- .length} tasks: $error",
+ "Error while updating location for ${quickShareTasks.length} tasks: $error",
);
} finally {
setState(() {
@@ -263,15 +260,9 @@ class _ActiveSharesSheetState extends State
final shades = getPrimaryColorShades(context);
return SizedBox(
- height: MediaQuery
- .of(context)
- .size
- .height -
+ height: MediaQuery.of(context).size.height -
kToolbarHeight -
- MediaQuery
- .of(context)
- .viewPadding
- .top,
+ MediaQuery.of(context).viewPadding.top,
child: Column(
key: wrapperKey,
mainAxisSize: MainAxisSize.max,
@@ -323,10 +314,9 @@ class _ActiveSharesSheetState extends State
],
),
PlatformElevatedButton(
- material: (_, __) =>
- MaterialElevatedButtonData(
- icon: const Icon(Icons.share_location_rounded),
- ),
+ material: (_, __) => MaterialElevatedButtonData(
+ icon: const Icon(Icons.share_location_rounded),
+ ),
onPressed: () {
sheetController.animateTo(
MIN_SIZE,
@@ -371,13 +361,11 @@ class _ActiveSharesSheetState extends State
if (someTasksRunning) {
return [
PlatformFlavorWidget(
- material: (_, __) =>
- const Icon(
+ material: (_, __) => const Icon(
Icons.stop_circle_rounded,
size: 42,
),
- cupertino: (_, __) =>
- const Icon(
+ cupertino: (_, __) => const Icon(
CupertinoIcons.stop_circle_fill,
size: 42,
),
@@ -392,13 +380,11 @@ class _ActiveSharesSheetState extends State
return [
PlatformFlavorWidget(
- material: (_, __) =>
- const Icon(
+ material: (_, __) => const Icon(
Icons.play_circle_rounded,
size: 42,
),
- cupertino: (_, __) =>
- const Icon(
+ cupertino: (_, __) => const Icon(
CupertinoIcons.play_circle_fill,
size: 42,
),
@@ -436,13 +422,11 @@ class _ActiveSharesSheetState extends State
if (!allTasksRunning) {
return PlatformFlavorWidget(
- material: (_, __) =>
- const Icon(
+ material: (_, __) => const Icon(
Icons.location_disabled_rounded,
size: 42,
),
- cupertino: (_, __) =>
- const Icon(
+ cupertino: (_, __) => const Icon(
CupertinoIcons.location_slash_fill,
size: 42,
),
@@ -476,7 +460,7 @@ class _ActiveSharesSheetState extends State
child: SizedBox.square(),
),
Expanded(
- flex: 8,
+ flex: 6,
child: Center(
child: Text(
l10n.locationsOverview_activeShares_amount(
@@ -554,64 +538,58 @@ class _ActiveSharesSheetState extends State
return Opacity(
opacity: isInitializing ? 0 : 1,
child: PlatformWidget(
- material: (context, _) =>
- AnimatedBuilder(
- animation: offsetProgress,
- builder: (context, child) =>
- Transform.translate(
- offset: Offset(-_xOffset * (1 - offsetProgress.value), 0),
- child: child,
- ),
- child: DraggableScrollableSheet(
- snap: true,
- snapSizes: const [MIN_SIZE, 1],
- minChildSize: 0.0,
- initialChildSize: MIN_SIZE,
- controller: sheetController,
- builder: (context, controller) =>
- ModalSheet(
- miuiIsGapless: true,
- child: SingleChildScrollView(
- controller: controller,
- child: quickShareTasks.isEmpty
- ? buildEmptyState()
- : buildActiveSharesList(),
- ),
- ),
+ material: (context, _) => AnimatedBuilder(
+ animation: offsetProgress,
+ builder: (context, child) => Transform.translate(
+ offset: Offset(-_xOffset * (1 - offsetProgress.value), 0),
+ child: child,
+ ),
+ child: DraggableScrollableSheet(
+ snap: true,
+ snapSizes: const [MIN_SIZE, 1],
+ minChildSize: 0.0,
+ initialChildSize: MIN_SIZE,
+ controller: sheetController,
+ builder: (context, controller) => ModalSheet(
+ miuiIsGapless: true,
+ child: SingleChildScrollView(
+ controller: controller,
+ child: quickShareTasks.isEmpty
+ ? buildEmptyState()
+ : buildActiveSharesList(),
),
),
- cupertino: (context, _) =>
- DraggableScrollableSheet(
- snap: true,
- snapSizes: const [MIN_SIZE, 1],
- minChildSize: 0.0,
- initialChildSize: MIN_SIZE,
- controller: sheetController,
- builder: (context, controller) =>
- AnimatedBuilder(
- animation: offsetProgress,
- child: SingleChildScrollView(
- controller: controller,
- child: quickShareTasks.isEmpty
- ? buildEmptyState()
- : buildActiveSharesList(),
- ),
- builder: (context, child) =>
- ModalSheet(
- cupertinoPadding: EdgeInsets.only(
- top: lerpDouble(
- MEDIUM_SPACE,
- HUGE_SPACE,
- offsetProgress.value,
- ) ??
- 0,
- left: MEDIUM_SPACE,
- right: MEDIUM_SPACE,
- ),
- child: child ?? const SizedBox.shrink(),
- ),
- ),
+ ),
+ ),
+ cupertino: (context, _) => DraggableScrollableSheet(
+ snap: true,
+ snapSizes: const [MIN_SIZE, 1],
+ minChildSize: 0.0,
+ initialChildSize: MIN_SIZE,
+ controller: sheetController,
+ builder: (context, controller) => AnimatedBuilder(
+ animation: offsetProgress,
+ child: SingleChildScrollView(
+ controller: controller,
+ child: quickShareTasks.isEmpty
+ ? buildEmptyState()
+ : buildActiveSharesList(),
),
+ builder: (context, child) => ModalSheet(
+ cupertinoPadding: EdgeInsets.only(
+ top: lerpDouble(
+ MEDIUM_SPACE,
+ HUGE_SPACE,
+ offsetProgress.value,
+ ) ??
+ 0,
+ left: MEDIUM_SPACE,
+ right: MEDIUM_SPACE,
+ ),
+ child: child ?? const SizedBox.shrink(),
+ ),
+ ),
+ ),
),
);
}
diff --git a/lib/screens/locations_overview_screen_widgets/LocationFetchers.dart b/lib/screens/locations_overview_screen_widgets/LocationFetchers.dart
new file mode 100644
index 00000000..8891de89
--- /dev/null
+++ b/lib/screens/locations_overview_screen_widgets/LocationFetchers.dart
@@ -0,0 +1,74 @@
+import 'package:collection/collection.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_logs/flutter_logs.dart';
+import 'package:locus/constants/values.dart';
+import 'package:locus/services/location_fetcher_service/Fetcher.dart';
+import 'package:locus/services/location_point_service.dart';
+import 'package:locus/services/view_service/index.dart';
+
+class LocationFetchers extends ChangeNotifier {
+ final Set _fetchers = {};
+
+ UnmodifiableSetView get fetchers => UnmodifiableSetView(_fetchers);
+
+ LocationFetchers(final List views,) {
+ addAll(views);
+ }
+
+ void addLocationUpdatesListener(final VoidCallback callback,) {
+ for (final fetcher in _fetchers) {
+ fetcher.addListener(callback);
+ }
+ }
+
+ void removeLocationUpdatesListener(final VoidCallback callback,) {
+ for (final fetcher in _fetchers) {
+ fetcher.removeListener(callback);
+ }
+ }
+
+ void add(final TaskView view) {
+ if (_fetchers.any((fetcher) => fetcher.view == view)) {
+ return;
+ }
+
+ _fetchers.add(Fetcher(view));
+ }
+
+ void remove(final TaskView view) {
+ final fetcher = findFetcher(view);
+
+ if (fetcher != null) {
+ fetcher.dispose();
+ _fetchers.remove(fetcher);
+ }
+ }
+
+ void addAll(final List views) {
+ for (final view in views) {
+ add(view);
+ }
+ }
+
+ void fetchPreviewLocations() {
+ FlutterLogs.logInfo(
+ LOG_TAG,
+ "Location Fetchers",
+ "Fetching preview locations for ${_fetchers.length} tasks...",
+ );
+
+ for (final fetcher in _fetchers) {
+ if (!fetcher.hasFetchedPreviewLocations) {
+ fetcher.fetchPreviewLocations();
+ }
+ }
+ }
+
+ Fetcher? findFetcher(final TaskView view) {
+ return _fetchers.firstWhereOrNull((fetcher) => fetcher.view == view);
+ }
+
+ List getLocations(final TaskView view) {
+ return findFetcher(view)?.sortedLocations ?? [];
+ }
+}
diff --git a/lib/screens/locations_overview_screen_widgets/OutOfBoundMarker.dart b/lib/screens/locations_overview_screen_widgets/OutOfBoundMarker.dart
index 38dc6acd..4a7a0422 100644
--- a/lib/screens/locations_overview_screen_widgets/OutOfBoundMarker.dart
+++ b/lib/screens/locations_overview_screen_widgets/OutOfBoundMarker.dart
@@ -11,8 +11,8 @@ import 'package:geolocator/geolocator.dart';
import "package:latlong2/latlong.dart";
import 'package:locus/constants/spacing.dart';
import 'package:locus/services/location_point_service.dart';
-import 'package:locus/services/settings_service.dart';
-import 'package:locus/services/view_service.dart';
+import 'package:locus/services/settings_service/index.dart';
+import 'package:locus/services/view_service/index.dart';
import 'package:provider/provider.dart';
import 'package:simple_shadow/simple_shadow.dart';
@@ -111,7 +111,9 @@ class _OutOfBoundMarkerState extends State
}
void _updateSizes() {
- final size = MediaQuery.of(context).size;
+ final size = MediaQuery
+ .of(context)
+ .size;
setState(() {
this.size = size;
@@ -145,11 +147,11 @@ class _OutOfBoundMarkerState extends State
}
final xPercentage =
- ((widget.lastViewLocation.longitude - west) / (east - west))
- .clamp(1 - xAvailablePercentage, xAvailablePercentage);
+ ((widget.lastViewLocation.longitude - west) / (east - west))
+ .clamp(1 - xAvailablePercentage, xAvailablePercentage);
final yPercentage =
- ((widget.lastViewLocation.latitude - north) / (south - north))
- .clamp(yAvailablePercentageStart, yAvailablePercentageEnd);
+ ((widget.lastViewLocation.latitude - north) / (south - north))
+ .clamp(yAvailablePercentageStart, yAvailablePercentageEnd);
// Calculate the rotation between marker and last location
final markerLongitude = west + xPercentage * (east - west);
@@ -171,8 +173,8 @@ class _OutOfBoundMarkerState extends State
final width =
size.width - OUT_OF_BOUND_MARKER_X_PADDING - OUT_OF_BOUND_MARKER_SIZE;
final height = usesOpenStreetMap &&
- (xPercentage * size.width > bottomRightMapActionsHeight &&
- yPercentage > 0.5)
+ (xPercentage * size.width > bottomRightMapActionsHeight &&
+ yPercentage > 0.5)
? size.height - (FAB_SIZE + FAB_MARGIN) * 2
: size.height;
diff --git a/lib/screens/locations_overview_screen_widgets/ShareLocationSheet.dart b/lib/screens/locations_overview_screen_widgets/ShareLocationSheet.dart
index 7f4cabff..75a24131 100644
--- a/lib/screens/locations_overview_screen_widgets/ShareLocationSheet.dart
+++ b/lib/screens/locations_overview_screen_widgets/ShareLocationSheet.dart
@@ -6,6 +6,7 @@ import 'package:flutter_logs/flutter_logs.dart';
import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
import 'package:intl/intl.dart';
import 'package:locus/constants/values.dart';
+import 'package:locus/services/settings_service/index.dart';
import 'package:locus/services/timers_service.dart';
import 'package:locus/utils/date.dart';
import 'package:locus/utils/theme.dart';
@@ -15,10 +16,11 @@ import 'package:locus/widgets/ModalSheet.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:locus/widgets/ModalSheetContent.dart';
import 'package:locus/widgets/PlatformRadioTile.dart';
+import 'package:locus/widgets/RequestBatteryOptimizationsDisabledMixin.dart';
+import 'package:locus/widgets/RequestLocationPermissionMixin.dart';
import 'package:provider/provider.dart';
-import '../../services/settings_service.dart';
-import '../../services/task_service.dart';
+import '../../services/task_service/index.dart';
enum ShareType {
untilTurnOff,
@@ -32,7 +34,10 @@ class ShareLocationSheet extends StatefulWidget {
State createState() => _ShareLocationSheetState();
}
-class _ShareLocationSheetState extends State {
+class _ShareLocationSheetState extends State
+ with
+ RequestLocationPermissionMixin,
+ RequestBatteryOptimizationsDisabledMixin {
final hoursFormKey = GlobalKey();
final hoursController = TextEditingController(text: "1");
@@ -66,6 +71,34 @@ class _ShareLocationSheetState extends State {
isLoading = true;
});
+ FlutterLogs.logInfo(
+ LOG_TAG,
+ "Quick Location Share",
+ "Checking permission",
+ );
+
+ if (!await showLocationPermissionDialog(askForAlways: true)) {
+ FlutterLogs.logInfo(
+ LOG_TAG,
+ "Quick Location Share",
+ "Permission not granted. Aborting.",
+ );
+
+ setState(() {
+ isLoading = false;
+ });
+
+ return;
+ }
+
+ FlutterLogs.logInfo(
+ LOG_TAG,
+ "Quick Location Share",
+ "Checking battery saver",
+ );
+
+ await showDisableBatteryOptimizationsDialog();
+
FlutterLogs.logInfo(
LOG_TAG,
"Quick Location Share",
diff --git a/lib/screens/locations_overview_screen_widgets/TaskTile.dart b/lib/screens/locations_overview_screen_widgets/TaskTile.dart
index 3874223b..6b674cb2 100644
--- a/lib/screens/locations_overview_screen_widgets/TaskTile.dart
+++ b/lib/screens/locations_overview_screen_widgets/TaskTile.dart
@@ -3,7 +3,7 @@ import 'package:flutter_platform_widgets/flutter_platform_widgets.dart'
hide PlatformListTile;
import 'package:intl/intl.dart';
import 'package:locus/screens/TaskDetailScreen.dart';
-import 'package:locus/services/task_service.dart';
+import 'package:locus/services/task_service/index.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:locus/services/timers_service.dart';
import 'package:locus/utils/date.dart';
@@ -76,8 +76,7 @@ class _TaskTileState extends State with TaskLinkGenerationMixin {
return PlatformListTile(
title: Text(widget.task.name),
- subtitle: widget.task.timers.length == 1 &&
- widget.task.timers[0] is DurationTimer &&
+ subtitle: widget.task.isFiniteQuickShare &&
(widget.task.timers[0] as DurationTimer).startDate != null
? Text(
formatStartDate(
@@ -96,6 +95,20 @@ class _TaskTileState extends State