refactor: Rename to UpdateLocationHistory.dart

Myzel394 · Oct 12, 2023 · 1feb7ad · 1feb7ad
1 parent efb029e
commit 1feb7ad
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 25 deletions.
diff --git a/lib/app_wrappers/LocationHistoryUpdater.dart → lib/app_wrappers/UpdateLocationHistory.dart b/lib/app_wrappers/LocationHistoryUpdater.dart → lib/app_wrappers/UpdateLocationHistory.dart
@@ -3,19 +3,18 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:locus/services/current_location_service.dart';
 import 'package:locus/services/location_history_service/index.dart';
-import 'package:locus/services/location_point_service.dart';
 import 'package:provider/provider.dart';
 
 /// Makes sure that the [LocationHistory] is updated with the current location
 /// from the [CurrentLocationService].
-class LocationHistoryUpdater extends StatefulWidget {
-  const LocationHistoryUpdater({super.key});
+class UpdateLocationHistory extends StatefulWidget {
+  const UpdateLocationHistory({super.key});
 
   @override
-  State<LocationHistoryUpdater> createState() => _LocationHistoryUpdaterState();
+  State<UpdateLocationHistory> createState() => _UpdateLocationHistoryState();
 }
 
-class _LocationHistoryUpdaterState extends State<LocationHistoryUpdater> {
+class _UpdateLocationHistoryState extends State<UpdateLocationHistory> {
   late final CurrentLocationService _currentLocation;
   late final StreamSubscription _subscription;
   late final LocationHistory _locationHistory;
@@ -25,11 +24,7 @@ class _LocationHistoryUpdaterState extends State<LocationHistoryUpdater> {
     super.initState();
 
     _currentLocation = context.read<CurrentLocationService>();
-    _subscription = _currentLocation.stream.listen((position) async {
-      final location = await LocationPointService.fromPosition(position);
-
-      _locationHistory.add(location);
-    });
+    _subscription = _currentLocation.stream.listen(_locationHistory.add);
   }
 
   @override

diff --git a/lib/main.dart b/lib/main.dart
@@ -10,7 +10,7 @@ import 'package:locus/App.dart';
 import 'package:locus/app_wrappers/CheckViewAlarmsLive.dart';
 import 'package:locus/app_wrappers/HandleNotifications.dart';
 import 'package:locus/app_wrappers/InitCurrentLocationFromSettings.dart';
-import 'package:locus/app_wrappers/LocationHistoryUpdater.dart';
+import 'package:locus/app_wrappers/UpdateLocationHistory.dart';
 import 'package:locus/app_wrappers/PublishTaskPositionsOnUpdate.dart';
 import 'package:locus/app_wrappers/RegisterBackgroundListeners.dart';
 import 'package:locus/app_wrappers/ManageQuickActions.dart';
@@ -31,7 +31,7 @@ import 'package:provider/provider.dart';
 const storage = FlutterSecureStorage();
 
 final StreamController<NotificationResponse> selectedNotificationsStream =
-    StreamController.broadcast();
+StreamController.broadcast();
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -59,7 +59,7 @@ void main() async {
   );
 
   FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
-      FlutterLocalNotificationsPlugin();
+  FlutterLocalNotificationsPlugin();
   const initializationSettings = InitializationSettings(
     android: AndroidInitializationSettings("ic_launcher_foreground"),
     iOS: DarwinInitializationSettings(),
@@ -107,7 +107,7 @@ void main() async {
       ],
       child: const Stack(
         children: [
-          LocationHistoryUpdater(),
+          UpdateLocationHistory(),
           UniLinksHandler(),
           UpdateLastLocationToSettings(),
           RegisterBackgroundListeners(),

diff --git a/lib/services/location_history_service/location_history.dart b/lib/services/location_history_service/location_history.dart
@@ -1,21 +1,23 @@
 import 'package:flutter/cupertino.dart';
+import 'package:geolocator/geolocator.dart';
 
 import "./constants.dart";
 import '../location_point_service.dart';
 
 class LocationHistory extends ChangeNotifier {
-  late final List<LocationPointService> locations;
+  late final List<Position> locations;
 
   LocationHistory(
-    final List<LocationPointService>? locations,
+    final List<Position>? locations,
   ) : locations = locations ?? [];
 
   factory LocationHistory.fromJSON(final Map<String, dynamic> data) =>
       LocationHistory(
         data["locations"] != null
-            ? List<LocationPointService>.from(
+            ? List<Position>.from(
                 data["locations"].map(
-                  (location) => LocationPointService.fromJSON(location),
+                  (location) =>
+                      Position.fromMap(location as Map<String, dynamic>),
                 ),
               )
             : null,
@@ -33,24 +35,28 @@ class LocationHistory extends ChangeNotifier {
 
   // To avoid too many crumbled locations, we only save locations that are at
   // least one minute apart
-  bool _canAdd(final LocationPointService location) {
+  bool _canAdd(final Position position) {
+    if (position.timestamp == null) {
+      return false;
+    }
+
     if (locations.isEmpty) {
       return true;
     }
 
-    return locations.last.createdAt
-            .difference(location.createdAt)
+    return locations.last.timestamp!
+            .difference(position.timestamp!)
             .inMinutes
             .abs() >
         1;
   }
 
-  void add(final LocationPointService location) {
-    if (!_canAdd(location)) {
+  void add(final Position position) {
+    if (!_canAdd(position)) {
       return;
     }
 
-    locations.add(location);
+    locations.add(position);
     notifyListeners();
   }
 
@@ -60,6 +66,6 @@ class LocationHistory extends ChangeNotifier {
   }
 
   void toJSON() => {
-        "locations": locations.map((location) => location.toJSON()).toList(),
+        "locations": locations.map((location) => location.toJson()).toList(),
       };
 }