frontend/lib/layout.dart

@@ -1,6 +1,3 @@
-import 'package:anyway/main.dart';
-import 'package:anyway/modules/help_dialog.dart';
-import 'package:anyway/pages/current_trip.dart';
 import 'package:anyway/pages/settings.dart';
 import 'package:flutter/material.dart';
 
@@ -11,24 +8,22 @@ import 'package:anyway/modules/trips_saved_list.dart';
 import 'package:anyway/utils/load_trips.dart';
 
 import 'package:anyway/pages/new_trip_location.dart';
+import 'package:anyway/pages/current_trip.dart';
 import 'package:anyway/pages/onboarding.dart';
 
 
 
 
-// BasePage is the scaffold that holds a child page and a side drawer
+// BasePage is the scaffold that holds all other pages
-// The side drawer is the main way to switch between pages
+// A side drawer is used to switch between pages
-
 class BasePage extends StatefulWidget {
-  final Widget mainScreen;
+  final String mainScreen;
-  final Widget title;
+  final Trip? trip;
-  final List<String> helpTexts;
 
   const BasePage({
     super.key,
     required this.mainScreen,
-    this.title = const Text(APP_NAME),
+    this.trip,
-    this.helpTexts = const [],
   });
 
   @override
@@ -39,25 +34,53 @@ class _BasePageState extends State<BasePage> {
 
   @override
   Widget build(BuildContext context) {
-    savedTrips.loadTrips();
+    Widget currentView = const Text("loading...");
+    Future<List<Trip>> trips = loadTrips();
     
     
+    if (widget.mainScreen == "map") {
+      if (widget.trip != null) {
+        currentView = TripPage(trip: widget.trip!);
+      } else {
+        currentView = FutureBuilder(
+          future: trips,
+          builder: (context, snapshot) {
+            if (snapshot.hasData) {
+              List<Trip> availableTrips = snapshot.data!;
+              if (availableTrips.isNotEmpty) {
+                return TripPage(trip: availableTrips[0]);
+              } else {
+                return Scaffold(
+                  body: Center(
+                    child: Text("Wow, so empty!"),
+                  ),
+                  floatingActionButton: FloatingActionButton.extended(
+                    onPressed: () {
+                      Navigator.of(context).push(
+                        MaterialPageRoute(
+                          builder: (context) => const NewTripPage()
+                        )
+                      );
+                    },
+                    label: Text("Plan a trip"),
+                  ),
+                );
+              }
+            } else {
+              return const Text("loading...");
+            }
+          },
+        );
+      }
+    } else if (widget.mainScreen == "tutorial") {
+      currentView = OnboardingPage();
+    } else if (widget.mainScreen == "settings") {
+      currentView = SettingsPage();
+    }
+
     return Scaffold(
-      appBar: AppBar(
+      appBar: AppBar(title: Text(APP_NAME)),
-        title: widget.title,
+      body: Center(child: currentView),
-        actions: [
-          IconButton(
-            icon: const Icon(Icons.help),
-            tooltip: 'Help',
-            onPressed: () {
-              if (widget.helpTexts.isNotEmpty) {
-                helpDialog(context, widget.helpTexts[0], widget.helpTexts[1]);
-              }
-            }
-          ),
-        ],
-      ),
-      body: Center(child: widget.mainScreen),
       drawer: Drawer(
         child: Column(
           children: [
@@ -81,8 +104,7 @@ class _BasePageState extends State<BasePage> {
             ListTile(
               title: const Text('Your Trips'),
               leading: const Icon(Icons.map),
-              // TODO: this is not working!
+              selected: widget.mainScreen == "map",
-              selected: widget.mainScreen is TripPage,
               onTap: () {},
               trailing: ElevatedButton(
                 onPressed: () {
@@ -100,11 +122,11 @@ class _BasePageState extends State<BasePage> {
             // through the options in the drawer if there isn't enough vertical
             // space to fit everything.
             Expanded(
-              child: TripsOverview(trips: savedTrips),
+              child: TripsOverview(trips: trips),
             ),
             ElevatedButton(
               onPressed: () async {
-                savedTrips.clearTrips();
+                removeAllTripsFromPrefs();
               },
               child: const Text('Clear trips'),
             ),
@@ -112,12 +134,11 @@ class _BasePageState extends State<BasePage> {
             ListTile(
               title: const Text('How to use'),
               leading: Icon(Icons.help),
-              // TODO: this is not working!
+              selected: widget.mainScreen == "tutorial",
-              selected: widget.mainScreen is OnboardingPage,
               onTap: () {
                 Navigator.of(context).push(
                   MaterialPageRoute(
-                    builder: (context) => OnboardingPage()
+                    builder: (context) => BasePage(mainScreen: "tutorial")
                   )
                 );
               },
@@ -127,12 +148,11 @@ class _BasePageState extends State<BasePage> {
             ListTile(
               title: const Text('Settings'),
               leading: const Icon(Icons.settings),
-              // TODO: this is not working!
+              selected: widget.mainScreen == "settings",
-              selected: widget.mainScreen is SettingsPage,
               onTap: () {
                 Navigator.of(context).push(
                   MaterialPageRoute(
-                    builder: (context) => SettingsPage()
+                    builder: (context) => BasePage(mainScreen: "settings")
                   )
                 );
               },

frontend/lib/main.dart

@@ -1,12 +1,10 @@
-import 'package:anyway/utils/get_first_page.dart';
-import 'package:anyway/utils/load_trips.dart';
 import 'package:flutter/material.dart';
 import 'package:anyway/constants.dart';
+import 'package:anyway/layout.dart';
 
 void main() => runApp(const App());
 
 final GlobalKey<ScaffoldMessengerState> rootScaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
-final SavedTrips savedTrips = SavedTrips();
 
 class App extends StatelessWidget {
   const App({super.key});
@@ -16,7 +14,7 @@ class App extends StatelessWidget {
   Widget build(BuildContext context) {
     return MaterialApp(
       title: APP_NAME,
-      home: getFirstPage(),
+      home: BasePage(mainScreen: "map"),
       theme: APP_THEME,
       scaffoldMessengerKey: rootScaffoldMessengerKey
     );

frontend/lib/modules/current_trip_landmarks_list.dart

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:anyway/modules/landmark_card.dart';
 import 'package:anyway/structs/landmark.dart';
 import 'package:anyway/structs/trip.dart';
+import 'package:anyway/main.dart';
 
 
 
@@ -24,7 +25,30 @@ List<Widget> landmarksList(Trip trip) {
 
   for (Landmark landmark in trip.landmarks) {
     children.add(
-      LandmarkCard(landmark, trip),
+      Dismissible(
+        key: ValueKey<int>(landmark.hashCode),
+        child: LandmarkCard(landmark),
+        dismissThresholds: {DismissDirection.endToStart: 0.95, DismissDirection.startToEnd: 0.95},
+        onDismissed: (direction) {
+          log('Removing ${landmark.name}');
+          trip.removeLandmark(landmark);
+
+          rootScaffoldMessengerKey.currentState!.showSnackBar(
+            SnackBar(content: Text("We won't show ${landmark.name} again"))
+          );
+        },
+
+        background: Container(color: Colors.red),
+        secondaryBackground: Container(
+          color: Colors.red,
+          child: Icon(
+            Icons.delete,
+            color: Colors.white,
+          ),
+          padding: EdgeInsets.all(15),
+          alignment: Alignment.centerRight,
+        ),
+      )
     );
 
     if (landmark.next != null) {

frontend/lib/modules/current_trip_loading_indicator.dart

@@ -1,20 +1,9 @@
-import 'package:anyway/constants.dart';
 import 'package:flutter/material.dart';
 import 'package:auto_size_text/auto_size_text.dart';
 
 import 'package:anyway/structs/trip.dart';
 import 'package:anyway/pages/current_trip.dart';
 
-
-final List<String> statusTexts = [
-  'Parsing your preferences...',
-  'Finding the best places...',
-  'Crunching the numbers...',
-  'Calculating the best route...',
-  'Making sure you have a great time...',
-];
-
-
 class CurrentTripLoadingIndicator extends StatefulWidget {
   final Trip trip;
   const CurrentTripLoadingIndicator({
@@ -26,137 +15,46 @@ class CurrentTripLoadingIndicator extends StatefulWidget {
   State<CurrentTripLoadingIndicator> createState() => _CurrentTripLoadingIndicatorState();
 }
 
-
 class _CurrentTripLoadingIndicatorState extends State<CurrentTripLoadingIndicator> {
   @override
-  Widget build(BuildContext context) => Stack(
+  Widget build(BuildContext context) => Center(
-    fit: StackFit.expand,
+    child: FutureBuilder(
-    children: [
+      future: widget.trip.cityName,
-      // In the very center of the panel, show the greeter which tells the user that the trip is being generated
-      Center(child: loadingText(widget.trip)),
-      // As a gimmick, and a way to show that the app is still working, show a few loading dots
-      Align(
-        alignment: Alignment.bottomCenter,
-        child: statusText(),
-      )
-    ],
-  );
-}
-
-// automatically cycle through the greeter texts
-class statusText extends StatefulWidget {
-  const statusText({Key? key}) : super(key: key);
-
-  @override
-  _statusTextState createState() => _statusTextState();
-}
-
-class _statusTextState extends State<statusText> {
-  int statusIndex = 0;
-
-  @override
-  void initState() {
-    super.initState();
-    Future.delayed(Duration(seconds: 5), () {
-      setState(() {
-        statusIndex = (statusIndex + 1) % statusTexts.length;
-      });
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AutoSizeText(
-      statusTexts[statusIndex],
-      style: Theme.of(context).textTheme.labelSmall,
-    );
-  }
-}
-
-
-
-Widget loadingText(Trip trip) => FutureBuilder(
-  future: trip.cityName,
       builder: (BuildContext context, AsyncSnapshot<String> snapshot) {
         Widget greeter;
+        Widget loadingIndicator = const Padding(
+          padding: EdgeInsets.only(top: 10),
+          child: CircularProgressIndicator()
+        );
 
         if (snapshot.hasData) {
-      greeter = AnimatedGradientText(
+          greeter = AutoSizeText(
-        text: 'Creating your trip to ${snapshot.data}...',
+            maxLines: 1,
+            'Generating your trip to ${snapshot.data}...',
             style: greeterStyle,
           );
         } else if (snapshot.hasError) {
           // the exact error is shown in the central part of the trip overview. No need to show it here
-      greeter = AnimatedGradientText(
+          greeter = AutoSizeText(
-        text: 'Error while loading trip.',
+            maxLines: 1,
+            'Error while loading trip.',
             style: greeterStyle,
             );
         } else {
-      greeter = AnimatedGradientText(
+          greeter = AutoSizeText(
-        text: 'Creating your trip...',
+            maxLines: 1,
+            'Generating your trip...',
             style: greeterStyle,
             );
         }
-    return greeter;
+        return Column(
-  }
+          mainAxisAlignment: MainAxisAlignment.center,
-);
+          children: [
-
+            greeter,
-class AnimatedGradientText extends StatefulWidget {
+            loadingIndicator,
-  final String text;
-  final TextStyle style;
-
-  const AnimatedGradientText({
-    Key? key,
-    required this.text,
-    required this.style,
-  }) : super(key: key);
-
-  @override
-  _AnimatedGradientTextState createState() => _AnimatedGradientTextState();
-}
-
-class _AnimatedGradientTextState extends State<AnimatedGradientText> with SingleTickerProviderStateMixin {
-  late AnimationController _controller;
-
-  @override
-  void initState() {
-    super.initState();
-    _controller = AnimationController(
-      duration: const Duration(seconds: 1),
-      vsync: this,
-    )..repeat();
-  }
-
-  @override
-  void dispose() {
-    _controller.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AnimatedBuilder(
-      animation: _controller,
-      builder: (context, child) {
-        return ShaderMask(
-          shaderCallback: (bounds) {
-            return LinearGradient(
-              colors: [GRADIENT_START, GRADIENT_END, GRADIENT_START],
-              stops: [
-                _controller.value - 1.0,
-                _controller.value,
-                _controller.value + 1.0,
           ],
-              tileMode: TileMode.mirror,
-            ).createShader(bounds);
-          },
-          child: Text(
-            widget.text,
-            style: widget.style,
-          ),
-        );
-      },
         );
       }
+    )
+  );
 }
-

frontend/lib/modules/current_trip_panel.dart

@@ -36,7 +36,7 @@ class _CurrentTripPanelState extends State<CurrentTripPanel> {
               child: SizedBox(
                 // reuse the exact same height as the panel has when collapsed
                 // this way the greeter will be centered when the panel is collapsed
-                height: MediaQuery.of(context).size.height * TRIP_PANEL_MIN_HEIGHT,
+                height: MediaQuery.of(context).size.height * TRIP_PANEL_MIN_HEIGHT - 20,
                 child: CurrentTripErrorMessage(trip: widget.trip)
               ),
             );
@@ -46,20 +46,19 @@ class _CurrentTripPanelState extends State<CurrentTripPanel> {
               child: SizedBox(
                 // reuse the exact same height as the panel has when collapsed
                 // this way the greeter will be centered when the panel is collapsed
-                height: MediaQuery.of(context).size.height * TRIP_PANEL_MIN_HEIGHT,
+                height: MediaQuery.of(context).size.height * TRIP_PANEL_MIN_HEIGHT - 20,
                 child: CurrentTripLoadingIndicator(trip: widget.trip),
               ),
             );
         } else {
           return ListView(
             controller: widget.controller,
-            padding: const EdgeInsets.only(top: 10, left: 10, right: 10, bottom: 30),
+            padding: const EdgeInsets.only(bottom: 30),
             children: [
               SizedBox(
                 // reuse the exact same height as the panel has when collapsed
                 // this way the greeter will be centered when the panel is collapsed
-                // note that we need to account for the padding above
+                height: MediaQuery.of(context).size.height * TRIP_PANEL_MIN_HEIGHT - 20,
-                height: MediaQuery.of(context).size.height * TRIP_PANEL_MIN_HEIGHT - 10,
                 child: CurrentTripGreeter(trip: widget.trip),
               ),
 
@@ -73,7 +72,7 @@ class _CurrentTripPanelState extends State<CurrentTripPanel> {
 
               const Padding(padding: EdgeInsets.only(top: 10)),
 
-              Center(child: saveButton(trip: widget.trip)),
+              Center(child: saveButton(widget.trip)),
             ],
           );
         }

frontend/lib/modules/current_trip_save_button.dart

@@ -3,24 +3,12 @@ import 'package:anyway/main.dart';
 import 'package:anyway/structs/trip.dart';
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:flutter/material.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
-
+Widget saveButton(Trip trip) => ElevatedButton(
-class saveButton extends StatefulWidget {
-  Trip trip;
-  saveButton({super.key, required this.trip});
-
-  @override
-  State<saveButton> createState() => _saveButtonState();
-}
-
-class _saveButtonState extends State<saveButton> {
-  @override
-  Widget build(BuildContext context) {
-    return ElevatedButton(
   onPressed: () async {
-        savedTrips.addTrip(widget.trip);
+    SharedPreferences prefs = await SharedPreferences.getInstance();
-        // SharedPreferences prefs = await SharedPreferences.getInstance();
+    trip.toPrefs(prefs);
-        // setState(() => widget.trip.toPrefs(prefs));
     rootScaffoldMessengerKey.currentState!.showSnackBar(
       SnackBar(
         content: Text('Trip saved'),
@@ -49,7 +37,5 @@ class _saveButtonState extends State<saveButton> {
       ],
     ),
   )
-    );
+);
-  }
-}
 

frontend/lib/modules/help_dialog.dart

@@ -1,25 +0,0 @@
-
-import 'package:flutter/material.dart';
-
-Future<void> helpDialog(BuildContext context, String title, String content) {
-  return showDialog<void>(
-    context: context,
-    builder: (BuildContext context) {
-      return AlertDialog(
-        title: Text(title),
-        content: Text(content),
-        actions: <Widget>[
-          TextButton(
-            style: TextButton.styleFrom(
-              textStyle: Theme.of(context).textTheme.labelLarge,
-            ),
-            child: const Text('Got it!'),
-            onPressed: () {
-              Navigator.of(context).pop();
-            },
-          ),
-        ],
-      );
-    },
-  );
-}

frontend/lib/modules/landmark_card.dart

@@ -1,5 +1,3 @@
-import 'package:anyway/main.dart';
-import 'package:anyway/structs/trip.dart';
 import 'package:flutter/material.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -8,12 +6,8 @@ import 'package:anyway/structs/landmark.dart';
 
 class LandmarkCard extends StatefulWidget {
   final Landmark landmark;
-  final Trip parentTrip;
   
-  LandmarkCard(
+  LandmarkCard(this.landmark);
-    this.landmark,
-    this.parentTrip,
-    );
   
   @override
   _LandmarkCardState createState() => _LandmarkCardState();
@@ -23,54 +17,34 @@ class LandmarkCard extends StatefulWidget {
 class _LandmarkCardState extends State<LandmarkCard> {
   @override
   Widget build(BuildContext context) {
-    if (widget.landmark.type == typeStart || widget.landmark.type == typeFinish) {
+    ThemeData theme = Theme.of(context);
-      return TextButton.icon(
-        onPressed: () {},
-        icon: widget.landmark.type.icon,
-        label: Text(widget.landmark.name),
-      );
-
-    }
-    // else:
     return Container(
+      height: 160,
       child: Card(
         shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(15.0),
         ),
         elevation: 5,
         clipBehavior: Clip.antiAliasWithSaveLayer,
-        // if the image is available, display it on the left side of the card, otherwise only display the text
+        child: Row(
-        child: widget.landmark.imageURL != null ? splitLayout() : textLayout(),
-      ),
-    );
-  }
-
-  Widget splitLayout() {
-    // If an image is available, display it on the left side of the card
-    return Row(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-        Container(
+            Container( // the image on the left
-          // the image on the left
+              // inherit the height of the parent container
+              height: double.infinity,
+              // force a fixed width
               width: 160,
-          height: 160,
-
               child: CachedNetworkImage(
                 imageUrl: widget.landmark.imageURL ?? '',
                 placeholder: (context, url) => Center(child: CircularProgressIndicator()),
                 errorWidget: (context, error, stackTrace) => Icon(Icons.question_mark_outlined),
+                // TODO: make this a switch statement to load a placeholder if null
+                // cover the whole container meaning the image will be cropped
                 fit: BoxFit.cover,
               ),
             ),
             Flexible(
-          child: textLayout(),
+              child: Padding(
-        ),
-      ],
-    );
-  }
-
-  Widget textLayout() {
-    return Padding(
                 padding: EdgeInsets.all(10),
                 child: Column(
                   children: [
@@ -102,10 +76,7 @@ class _LandmarkCardState extends State<LandmarkCard> {
                           )
                         ],
                       ),
-          Padding(padding: EdgeInsets.only(top: 10)),
+                    SingleChildScrollView(
-          Align(
-            alignment: Alignment.centerLeft,
-            child: SingleChildScrollView(
                       // allows the buttons to be scrolled
                       scrollDirection: Axis.horizontal,
                       child: Wrap(
@@ -132,41 +103,25 @@ class _LandmarkCardState extends State<LandmarkCard> {
                               icon: Icon(Icons.link),
                               label: Text('Website'),
                             ),
-                  PopupMenuButton(
+                          if (widget.landmark.wikipediaURL != null)
-                    icon: Icon(Icons.settings),
+                            TextButton.icon(
-                    style: TextButtonTheme.of(context).style,
+                              onPressed: () async {
-                    itemBuilder: (context) => [
+                                // open a browser with the wikipedia link
-                      PopupMenuItem(
+                                await launchUrl(Uri.parse(widget.landmark.wikipediaURL!));
-                        child: ListTile(
-                          leading: Icon(Icons.delete),
-                          title: Text('Delete'),
-                          onTap: () async {
-                            widget.parentTrip.removeLandmark(widget.landmark);
-                            rootScaffoldMessengerKey.currentState!.showSnackBar(
-                              SnackBar(content: Text("We won't show ${widget.landmark.name} again"))
-                            );
                               },
-                        ),
+                              icon: Icon(Icons.book),
-                      ),
+                            label: Text('Wikipedia'),
-                      PopupMenuItem(
-                        child: ListTile(
-                          leading: Icon(Icons.star),
-                          title: Text('Favorite'),
-                          onTap: () async {
-                            // delete the landmark
-                            // await deleteLandmark(widget.landmark);
-                          },
-                        ),
                           ),
                         ],
-                  )
+                      ),
-                    
+                    ),
                   ],
                 ),
               ),
             ),
           ],
         ),
+      ),
     );
   }
 }

frontend/lib/modules/new_trip_button.dart

@@ -1,5 +1,5 @@
+import 'package:anyway/layout.dart';
 import 'package:anyway/main.dart';
-import 'package:anyway/pages/current_trip.dart';
 import 'package:anyway/structs/preferences.dart';
 import 'package:anyway/structs/trip.dart';
 import 'package:anyway/utils/fetch_trip.dart';
@@ -57,7 +57,7 @@ class _NewTripButtonState extends State<NewTripButton> {
       fetchTrip(trip, widget.preferences);
       Navigator.of(context).push(
         MaterialPageRoute(
-          builder: (context) => TripPage(trip: trip)
+          builder: (context) => BasePage(mainScreen: "map", trip: trip)
         )
       );
     }

frontend/lib/modules/new_trip_location_search.dart

@@ -9,15 +9,6 @@ import 'package:flutter/material.dart';
 import 'package:geolocator/geolocator.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
-const Map<String, List> debugLocations = {
-  'paris': [48.8575, 2.3514],
-  'london': [51.5074, -0.1278],
-  'new york': [40.7128, -74.0060],
-  'tokyo': [35.6895, 139.6917],
-};
-
-
-
 class NewTripLocationSearch extends StatefulWidget {
   Future<SharedPreferences> prefs = SharedPreferences.getInstance();
   Trip trip;
@@ -36,35 +27,26 @@ class _NewTripLocationSearchState extends State<NewTripLocationSearch> {
 
   setTripLocation (String query) async {
     List<Location> locations = [];
-    Location startLocation;
     log('Searching for: $query');
-    if (GeocodingPlatform.instance != null) {
+    
-      locations.addAll(await locationFromAddress(query));
+    try{
+      locations = await locationFromAddress(query);
+    } catch (e) {
+      log('No results found for: $query : $e');
     }
 
     if (locations.isNotEmpty) {
-      startLocation = locations.first;
+      Location location = locations.first;
-    } else {
-      log('No results found for: $query. Is geocoding available?');
-      log('Setting Fallback location');
-      List coordinates = debugLocations[query.toLowerCase()] ?? [48.8575, 2.3514];
-      startLocation = Location(
-        latitude: coordinates[0],
-        longitude: coordinates[1],
-        timestamp: DateTime.now(),
-      );
-    }
-
       widget.trip.landmarks.clear();
       widget.trip.addLandmark(
         Landmark(
           uuid: 'pending',
           name: query,
-        location: [startLocation.latitude, startLocation.longitude],
+          location: [location.latitude, location.longitude],
           type: typeStart
         )
       );
-
+    }
   }
 
   late Widget locationSearchBar = SearchBar(

frontend/lib/modules/new_trip_map.dart

@@ -26,7 +26,7 @@ class _NewTripMapState extends State<NewTripMap> {
     target: LatLng(48.8566, 2.3522),
     zoom: 11.0,
   );
-  GoogleMapController? _mapController;
+  late GoogleMapController _mapController;
   final Set<Marker> _markers = <Marker>{};
 
   _onLongPress(LatLng location) {
@@ -56,15 +56,11 @@ class _NewTripMapState extends State<NewTripMap> {
           ),
         )
       );
-      // check if the controller is ready
+      _mapController.moveCamera(
-
-      if (_mapController != null) {
-        _mapController!.animateCamera(
         CameraUpdate.newLatLng(
           LatLng(landmark.location[0], landmark.location[1])
         )
       );
-      }
       setState(() {});
     }
   }

frontend/lib/modules/onboarding_card.dart

@@ -2,11 +2,13 @@ import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 
 class OnboardingCard extends StatelessWidget {
-  final String title;
+  int index;
-  final String description;
+  String title;
-  final String imagePath;
+  String description;
+  String imagePath;
 
-  const OnboardingCard({
+  OnboardingCard({
+    required this.index,
     required this.title,
     required this.description,
     required this.imagePath,
@@ -14,8 +16,13 @@ class OnboardingCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    
+    Color baseColor = Theme.of(context).colorScheme.secondary;
-    return Padding(
+    // have a different color for each card, incrementing the hue
+    Color currentColor = baseColor.withAlpha(baseColor.alpha - index * 30);
+    return Container(
+      color: currentColor,
+      alignment: Alignment.center,
+      child: Padding(
         padding: EdgeInsets.all(20),
         child: Column(
           mainAxisAlignment: MainAxisAlignment.center,
@@ -43,6 +50,7 @@ class OnboardingCard extends StatelessWidget {
 
           ]
         ),
+      )
     );
   }
 }

frontend/lib/modules/trips_saved_list.dart

@@ -1,12 +1,11 @@
-import 'package:anyway/pages/current_trip.dart';
-import 'package:anyway/utils/load_trips.dart';
 import 'package:flutter/material.dart';
 
+import 'package:anyway/layout.dart';
 import 'package:anyway/structs/trip.dart';
 
 
 class TripsOverview extends StatefulWidget {
-  final SavedTrips trips;
+  final Future<List<Trip>> trips;
   const TripsOverview({
     super.key,
     required this.trips,
@@ -17,11 +16,12 @@ class TripsOverview extends StatefulWidget {
 }
 
 class _TripsOverviewState extends State<TripsOverview> {
-  Widget listBuild (BuildContext context, SavedTrips trips) {
+
+  Widget listBuild (BuildContext context, AsyncSnapshot<List<Trip>> snapshot) {
     List<Widget> children;
-    List<Trip> items = trips.trips;
+    if (snapshot.hasData) {
-    children = List<Widget>.generate(items.length, (index) {
+      children = List<Widget>.generate(snapshot.data!.length, (index) {
-      Trip trip = items[index];
+        Trip trip = snapshot.data![index];
         return ListTile(
           title: FutureBuilder(
             future: trip.cityName,
@@ -39,12 +39,27 @@ class _TripsOverviewState extends State<TripsOverview> {
           onTap: () {
             Navigator.of(context).push(
               MaterialPageRoute(
-              builder: (context) => TripPage(trip: trip)
+                builder: (context) => BasePage(mainScreen: "map", trip: trip)
               )
             );
           },
         );
       });
+    } else if (snapshot.hasError) {
+      children = [
+        const Icon(
+          Icons.error_outline,
+          color: Colors.red,
+          size: 60,
+        ),
+        Padding(
+          padding: const EdgeInsets.only(top: 16),
+          child: Text('Error: ${snapshot.error}'),
+        ),
+      ];
+    } else {
+      children = [Center(child: CircularProgressIndicator())];
+    }
 
     return ListView(
       children: children,
@@ -54,11 +69,9 @@ class _TripsOverviewState extends State<TripsOverview> {
 
   @override
   Widget build(BuildContext context) {
-    return ListenableBuilder(
+    return FutureBuilder(
-      listenable: widget.trips,
+      future: widget.trips,
-      builder: (BuildContext context, Widget? child) {
+      builder: listBuild,
-        return listBuild(context, widget.trips);
-      }
     );
   }
 }

frontend/lib/pages/current_trip.dart

@@ -1,5 +1,4 @@
 import 'package:anyway/constants.dart';
-import 'package:anyway/pages/base_page.dart';
 import 'package:flutter/material.dart';
 import 'package:sliding_up_panel/sliding_up_panel.dart';
 
@@ -11,7 +10,7 @@ final Shader textGradient = APP_GRADIENT.createShader(Rect.fromLTWH(0.0, 0.0, 20
 TextStyle greeterStyle = TextStyle(
   foreground: Paint()..shader = textGradient,
   fontWeight: FontWeight.bold,
-  fontSize: 25
+  fontSize: 26
 );
 
 
@@ -32,8 +31,7 @@ class _TripPageState extends State<TripPage> {
 
   @override
   Widget build(BuildContext context) {
-    return BasePage(
+    return SlidingUpPanel(
-      mainScreen: SlidingUpPanel(
         // use panelBuilder instead of panel so that we can reuse the scrollcontroller for the listview
         panelBuilder: (scrollcontroller) => CurrentTripPanel(controller: scrollcontroller, trip: widget.trip),
         // using collapsed and panelBuilder seems to show both at the same time, so we include the greeter in the panelBuilder
@@ -43,7 +41,7 @@ class _TripPageState extends State<TripPage> {
         maxHeight: MediaQuery.of(context).size.height * TRIP_PANEL_MAX_HEIGHT,
         // padding in this context is annoying: it offsets the notion of vertical alignment.
         // children that want to be centered vertically need to have their size adjusted by 2x the padding
-        // padding: const EdgeInsets.all(10.0),
+        padding: const EdgeInsets.all(10.0),
         // Panel snapping should not be disabled because it significantly improves the user experience
         // panelSnapping: false
         borderRadius: const BorderRadius.only(topLeft: Radius.circular(25), topRight: Radius.circular(25)),
@@ -54,13 +52,6 @@ class _TripPageState extends State<TripPage> {
             color: Colors.black,
           )
         ],
-      ),
-      title: FutureBuilder(
-        future: widget.trip.cityName,
-        builder: (context, snapshot) => Text(
-          'Your trip to ${snapshot.hasData ? snapshot.data! : "..."}',
-        )
-      ),
     );
   }
 }

frontend/lib/pages/new_trip_location.dart

@@ -1,5 +1,5 @@
+import 'package:anyway/modules/new_trip_button.dart';
 import 'package:anyway/modules/new_trip_options_button.dart';
-import 'package:anyway/pages/base_page.dart';
 import 'package:flutter/material.dart';
 
 import "package:anyway/structs/trip.dart";
@@ -19,12 +19,13 @@ class _NewTripPageState extends State<NewTripPage> {
   final TextEditingController lonController = TextEditingController();
   Trip trip = Trip();
 
-
   @override
   Widget build(BuildContext context) {
     // floating search bar and map as a background
-    return BasePage(
+    return Scaffold(
-      mainScreen: Scaffold(
+      appBar: AppBar(
+        title: const Text('New Trip'),
+      ),
       body: Stack(
         children: [
           NewTripMap(trip),
@@ -35,12 +36,6 @@ class _NewTripPageState extends State<NewTripPage> {
         ],
       ),
       floatingActionButton: NewTripOptionsButton(trip: trip),
-      ),
-      title: Text("New Trip"),
-      helpTexts: [
-        "Setting the start location",
-        "To set the starting point, type a city name in the search bar. You can also navigate the map like you're used to and long press anywhere to set a starting point."
-      ],
     );
   }
 }

frontend/lib/pages/new_trip_preferences.dart

@@ -1,5 +1,4 @@
 import 'package:anyway/modules/new_trip_button.dart';
-import 'package:anyway/pages/base_page.dart';
 import 'package:anyway/structs/preferences.dart';
 import 'package:anyway/structs/trip.dart';
 import 'package:flutter/cupertino.dart';
@@ -20,8 +19,7 @@ class _NewTripPreferencesPageState extends State<NewTripPreferencesPage> {
 
   @override
   Widget build(BuildContext context) {
-    return BasePage(
+    return Scaffold(
-      mainScreen: Scaffold(
       body: ListView(
         children: [
           // Center(
@@ -30,16 +28,16 @@ class _NewTripPreferencesPageState extends State<NewTripPreferencesPage> {
           //     child: Icon(Icons.person, size: 100),
           //   )
           // ),
-            // Padding(padding: EdgeInsets.only(top: 30)),
+          Padding(padding: EdgeInsets.only(top: 30)),
-            // Center(
+          Center(
-            //   child: FutureBuilder(
+            child: FutureBuilder(
-            //     future: widget.trip.cityName,
+              future: widget.trip.cityName,
-            //     builder: (context, snapshot) => Text(
+              builder: (context, snapshot) => Text(
-            //       'Your trip to ${snapshot.hasData ? snapshot.data! : "..."}',
+                'Your trip to ${snapshot.hasData ? snapshot.data! : "..."}',
-            //       style: TextStyle(fontSize: 24, fontWeight: FontWeight.bold)
+                style: TextStyle(fontSize: 24, fontWeight: FontWeight.bold)
-            //     )
+              )
-            //   )
+            )
-            // ),
+          ),
 
           Center(
             child: Padding(
@@ -56,18 +54,6 @@ class _NewTripPreferencesPageState extends State<NewTripPreferencesPage> {
         ]
       ),
       floatingActionButton: NewTripButton(trip: widget.trip, preferences: preferences),
-      ),
-      
-      title: FutureBuilder(
-        future: widget.trip.cityName,
-        builder: (context, snapshot) => Text(
-          'Your trip to ${snapshot.hasData ? snapshot.data! : "..."}',
-        )
-      ),
-      helpTexts: [
-        'Trip preferences',
-        'Set your preferences for this trip. These will be used to generate a custom itinerary.'
-      ],
     );
   }
 

frontend/lib/pages/onboarding.dart

@@ -1,33 +1,7 @@
-import 'dart:ui';
-
-import 'package:anyway/constants.dart';
 import 'package:anyway/modules/onboarding_card.dart';
 import 'package:anyway/pages/new_trip_location.dart';
 import 'package:flutter/material.dart';
 
-const List<Widget> onboardingCards = [
-  OnboardingCard(
-    title: "Welcome to anyway!",
-    description: "Anyway helps you plan a city trip that suits your wishes.",
-    imagePath: "assets/city.svg"
-  ),
-  OnboardingCard(
-    title: "Find your way",
-    description: "Bored by churches? No problem! Hate shopping? No worries! Instead of suggesting the generic trips that bore you, anyway will try to give you recommendations that really suit you.",
-    imagePath: "assets/plan.svg"
-  ),
-  OnboardingCard(
-    title: "Change your mind",
-    description: "Feet get sore, the weather changes. Anyway understands that! Move or remove destinations, visit hidden gems along your journey, do your own thing. Anyway adapts to your spontaneous decisions.",
-    imagePath: "assets/cat.svg"
-  ),
-  OnboardingCard(
-    title: "Feeling lost?",
-    description: "Whenever you are confused or need help with the app, look out for the question mark in the top right corner. Help is just a tap away!",
-    imagePath: "assets/confused.svg"
-  ),
-];
-
 class OnboardingPage extends StatefulWidget {
   const OnboardingPage({super.key});
 
@@ -36,58 +10,27 @@ class OnboardingPage extends StatefulWidget {
 }
 
 class _OnboardingPageState extends State<OnboardingPage> {
-  final PageController _controller = PageController();
-
   @override
   Widget build(BuildContext context) {
+    final PageController _controller = PageController();
     return Scaffold(
       body: Stack(
         children: [
-          AnimatedBuilder(
-            animation: _controller,
-            builder: (context, child) {
-              return Stack(
-                children: [
-                  Container(
-                    decoration: BoxDecoration(
-                      gradient: LinearGradient(
-                        begin: Alignment.topLeft,
-                        end: Alignment.bottomRight,
-                        colors: APP_GRADIENT.colors,
-                        stops: [
-                          (_controller.hasClients ? _controller.page ?? _controller.initialPage : _controller.initialPage) / onboardingCards.length,
-                          (_controller.hasClients ? _controller.page ?? _controller.initialPage + 1 : _controller.initialPage + 1) / onboardingCards.length,
-                        ],
-                      ),
-                    ),
-                  ),
-                  BackdropFilter(
-                    filter: ImageFilter.blur(sigmaX: 100, sigmaY: 100),
-                    child: Container(
-                      color: Colors.black.withOpacity(0),
-                    ),
-                  ),
-                ],
-              );
-            },
-          ),
           PageView(
+            // horizontally scrollable list of pages
             controller: _controller,
-            children: List.generate(
+            
-              onboardingCards.length,
+            children: [
-              (index) {
+              OnboardingCard(index: 1, title: "Welcome to anyway!", description: "Anyway helps you plan a city trip that suits your wishes.", imagePath: "assets/city.svg"),
-                return Container(
+              OnboardingCard(index: 2, title: "Find your way", description: "Bored by churches? No problem! Hate shopping? No worries! More than showing you the typical 'must-sees' of a city, anyway will try to give you recommendations that really suit you.", imagePath: "assets/plan.svg"),
-                  alignment: Alignment.center,
+              OnboardingCard(index: 3, title: "Change your mind", description: "Life happens when you're busy making plans. Anyway understands that! Move or remove destinations, visit hidden gems along your journey, do your own thing. Anyway adapts to your spontaneous decisions.", imagePath: "assets/cat.svg"),
-                  child: onboardingCards[index],
+            ],
-                );
-              }
-            ),
           ),
         ],
       ),
-      floatingActionButton: FloatingActionButton.extended(
+      floatingActionButton: FloatingActionButton(
          onPressed: () {
-          if (_controller.page == onboardingCards.length - 1) {
+            if (_controller.page == 2) {
               Navigator.of(context).push(
                 MaterialPageRoute(
                   builder: (context) => const NewTripPage()
@@ -97,22 +40,7 @@ class _OnboardingPageState extends State<OnboardingPage> {
               _controller.nextPage(duration: Duration(milliseconds: 500), curve: Curves.ease);
             }
           },
-        label: AnimatedBuilder(
+          child: Icon(Icons.arrow_forward),
-          animation: _controller,
-          builder: (context, child) {
-            if ((_controller.page ?? _controller.initialPage) == onboardingCards.length - 1) {
-              return Row(
-                children: [
-                  const Text("Start planning!"),
-                  Padding(padding: const EdgeInsets.only(right: 8.0)),
-                  const Icon(Icons.map_outlined)
-                ],
-              );
-            } else {
-              return const Icon(Icons.arrow_forward);
-            }
-          }
-        )
       ),
     );
   }

frontend/lib/pages/settings.dart

@@ -1,6 +1,5 @@
 import 'package:anyway/constants.dart';
 import 'package:anyway/main.dart';
-import 'package:anyway/pages/base_page.dart';
 import 'package:flutter/material.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -17,8 +16,7 @@ class SettingsPage extends StatefulWidget {
 class _SettingsPageState extends State<SettingsPage> {
   @override
   Widget build(BuildContext context) {
-    return BasePage(
+    return ListView(
-      mainScreen: ListView(
       padding: EdgeInsets.all(15),
       children: [
         // First a round, centered image
@@ -42,12 +40,6 @@ class _SettingsPageState extends State<SettingsPage> {
 
         privacyInfo(),
       ]
-      ),
-      title: Text('Settings'),
-      helpTexts: [
-        'Settings',
-        'Preferences set in this page are global and will affect the entire application.'
-      ],
     );
   }
 
@@ -177,9 +169,7 @@ class _SettingsPageState extends State<SettingsPage> {
     return Center(
       child: Column(
         children: [
-          Text('AnyWay does not collect or store any of the data that is submitted via the app. The location of your trip is not stored. The location feature is only used to show your current location on the map, it is not transmitted to our servers.', textAlign: TextAlign.center),
+          Text('Our privacy policy is available under:'),
-          Padding(padding: EdgeInsets.only(top: 3)),
-          Text('Our full privacy policy is available under:', textAlign: TextAlign.center),
           
           TextButton.icon(
             icon: Icon(Icons.info),

frontend/lib/structs/landmark.dart

@@ -24,7 +24,8 @@ final class Landmark extends LinkedListEntry<Landmark>{
   // description to be shown in the overview
   final String? nameEN;
   final String? websiteURL;
-  String? imageURL; // not final because it can be patched
+  final String? wikipediaURL;
+  final String? imageURL;
   final String? description;
   final Duration? duration;
   final bool? visited;
@@ -43,6 +44,7 @@ final class Landmark extends LinkedListEntry<Landmark>{
 
     this.nameEN,
     this.websiteURL,
+    this.wikipediaURL,
     this.imageURL,
     this.description,
     this.duration,
@@ -68,6 +70,7 @@ final class Landmark extends LinkedListEntry<Landmark>{
       final isSecondary = json['is_secondary'] as bool?;
       final nameEN = json['name_en'] as String?;
       final websiteURL = json['website_url'] as String?;
+      final wikipediaURL = json['wikipedia_url'] as String?;
       final imageURL = json['image_url'] as String?;
       final description = json['description'] as String?;
       var duration = Duration(minutes: json['duration'] ?? 0) as Duration?;
@@ -82,6 +85,7 @@ final class Landmark extends LinkedListEntry<Landmark>{
         isSecondary: isSecondary,
         nameEN: nameEN,
         websiteURL: websiteURL,
+        wikipediaURL: wikipediaURL,
         imageURL: imageURL,
         description: description,
         duration: duration,
@@ -108,6 +112,7 @@ final class Landmark extends LinkedListEntry<Landmark>{
     'is_secondary': isSecondary,
     'name_en': nameEN,
     'website_url': websiteURL,
+    'wikipedia_url': wikipediaURL,
     'image_url': imageURL,
     'description': description,
     'duration': duration?.inMinutes,
@@ -125,7 +130,7 @@ class LandmarkType {
   LandmarkType({required this.name, this.icon = const Icon(Icons.location_on)}) {
     switch (name) {
       case 'sightseeing':
-        icon = const Icon(Icons.castle);
+        icon = const Icon(Icons.church);
         break;
       case 'nature':
         icon = const Icon(Icons.eco);

frontend/lib/structs/trip.dart

@@ -113,3 +113,10 @@ LinkedList<Landmark> readLandmarks(SharedPreferences prefs, String? firstUUID) {
   }
   return landmarks;
 }
+
+
+
+void removeAllTripsFromPrefs () async {
+  SharedPreferences prefs = await SharedPreferences.getInstance();
+  prefs.clear();
+}

frontend/lib/utils/fetch_trip.dart

@@ -1,6 +1,5 @@
 import "dart:convert";
 import "dart:developer";
-import "package:anyway/utils/load_landmark_image.dart";
 import 'package:dio/dio.dart';
 
 import 'package:anyway/constants.dart';
@@ -86,20 +85,6 @@ fetchTrip(
 }
 
 
-patchLandmarkImage(Landmark landmark) async {
-  // patch the landmark to include an image from an external source
-  if (landmark.imageURL == null) {
-    String? newUrl = await getImageUrlFromName(landmark.name);
-    if (newUrl != null) {
-      landmark.imageURL = newUrl;
-    }
-  } else if (landmark.imageURL!.contains("photos.app.goo.gl")) {
-    // the image is a google photos link, we should get the image behind the link
-    String? newUrl = await getImageUrlFromGooglePhotos(landmark.imageURL!);
-    // also set the new url if it is null
-    landmark.imageURL = newUrl; 
-  }
-}
 
 Future<(Landmark, String?)> fetchLandmark(String uuid) async {
   final response = await dio.get(
@@ -116,7 +101,5 @@ Future<(Landmark, String?)> fetchLandmark(String uuid) async {
   log(response.data.toString());
   Map<String, dynamic> json = response.data;
   String? nextUUID = json["next_uuid"];
-  Landmark landmark = Landmark.fromJson(json);
+  return (Landmark.fromJson(json), nextUUID);
-  patchLandmarkImage(landmark);
-  return (landmark, nextUUID);
 }

frontend/lib/utils/get_first_page.dart

@@ -1,41 +0,0 @@
-import 'package:anyway/pages/current_trip.dart';
-import 'package:anyway/pages/onboarding.dart';
-import 'package:anyway/structs/trip.dart';
-import 'package:anyway/utils/load_trips.dart';
-import 'package:flutter/material.dart';
-
-Widget getFirstPage() {
-  SavedTrips trips = SavedTrips();
-  trips.loadTrips();
-
-  return ListenableBuilder(
-    listenable: trips,
-    builder: (BuildContext context, Widget? child) {
-      List<Trip> items = trips.trips;
-      if (items.isNotEmpty) {
-        return TripPage(trip: items[0]);
-      } else {
-        return OnboardingPage();
-      }
-    }
-  );
-  // Future<List<Trip>> trips = loadTrips();
-  // // test if there are any active trips
-  // // if there are, return the trip list
-  // // if there are not, return the onboarding page
-  // return FutureBuilder(
-  //   future: trips,
-  //   builder: (context, snapshot) {
-  //     if (snapshot.hasData) {
-  //       List<Trip> availableTrips = snapshot.data!;
-  //       if (availableTrips.isNotEmpty) {
-  //         return TripPage(trip: availableTrips[0]);
-  //       } else {
-  //         return OnboardingPage();
-  //       }
-  //     } else {
-  //       return CircularProgressIndicator();
-  //     }
-  //   }
-  // );
-}

frontend/lib/utils/load_landmark_image.dart

@@ -1,71 +0,0 @@
-import 'dart:developer';
-
-import 'package:dio/dio.dart';
-import 'package:fuzzywuzzy/fuzzywuzzy.dart';
-import 'dart:convert';
-
-import 'package:fuzzywuzzy/model/extracted_result.dart';
-
-const String baseUrl = "https://en.wikipedia.org/w/api.php";
-final Dio dio = Dio();
-
-Future<int?> bestPageMatch(String title) async {
-    final response = await dio.get(baseUrl, queryParameters: {
-        "action": "query",
-        "format": "json",
-        "list": "prefixsearch",
-        "pssearch": title,
-    });
-
-    final data = jsonDecode(response.toString());
-    log(data.toString());
-    final List<dynamic> results = data["query"]["prefixsearch"] ?? {};
-    final Map<String, int> titlesAndIds = {
-        for (var d in results) d["title"]: d["pageid"]
-    };
-    if (titlesAndIds.isEmpty) {
-        log("No pages found for $title");
-        return null;
-    }
-
-    // after the empty check, we can safely assume that there is a best match
-    final ExtractedResult<String> bestMatch = extractOne(
-      query: title,
-      choices: titlesAndIds.keys.toList(),
-      cutoff: 70,
-    );
-    return titlesAndIds[bestMatch.choice];
-}
-
-Future<String?> getImageUrl(int pageId) async {
-    final response = await dio.get(baseUrl, queryParameters: {
-        "action": "query",
-        "format": "json",
-        "prop": "pageimages",
-        "pageids": pageId,
-        "pithumbsize": 500,
-    });
-
-    final data = jsonDecode(response.toString());
-    final pageData = data["query"]["pages"][pageId.toString()];
-    return pageData["thumbnail"]?["source"];
-}
-
-Future<String?> getImageUrlFromName(String title) async {
-    int? pageId = await bestPageMatch(title);
-    if (pageId == null) {
-        return null;
-    }
-    return await getImageUrl(pageId);
-}
-
-
-Future<String?> getImageUrlFromGooglePhotos(String url) async {
-    // this is a very simple implementation that just gets the image behind the link
-    // it is not guaranteed to work for all google photos links
-    final response = await dio.get(url);
-    final data = response.toString();
-    final int start = data.indexOf("https://lh3.googleusercontent.com");
-    final int end = data.indexOf('"', start);
-    return data.substring(start, end);
-}

frontend/lib/utils/load_trips.dart

@@ -1,14 +1,10 @@
+import 'dart:collection';
+
 import 'package:anyway/structs/trip.dart';
+import 'package:anyway/structs/landmark.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
-import 'package:flutter/foundation.dart';
+Future<List<Trip>> loadTrips() async {
-
-class SavedTrips extends ChangeNotifier {
-  List<Trip> _trips = [];
-
-  List<Trip> get trips => _trips;
-
-  void loadTrips() async {
   SharedPreferences prefs = await SharedPreferences.getInstance();
 
   List<Trip> trips = [];
@@ -19,21 +15,5 @@ class SavedTrips extends ChangeNotifier {
       trips.add(Trip.fromPrefs(prefs, uuid));
     }
   }
-    _trips = trips;
+  return trips;
-    notifyListeners();
-  }
-
-  void addTrip(Trip trip) async {
-    SharedPreferences prefs = await SharedPreferences.getInstance();
-    trip.toPrefs(prefs);
-    _trips.add(trip);
-    notifyListeners();
-  }
-
-  void clearTrips () async {
-    SharedPreferences prefs = await SharedPreferences.getInstance();
-    prefs.clear();
-    _trips = [];
-    notifyListeners();
-  }
 }

frontend/pubspec.lock

@@ -101,10 +101,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.19.0"
+    version: "1.18.0"
   crypto:
     dependency: transitive
     description:
@@ -232,14 +232,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  fuzzywuzzy:
-    dependency: "direct main"
-    description:
-      name: fuzzywuzzy
-      sha256: "3004379ffd6e7f476a0c2091f38f16588dc45f67de7adf7c41aa85dec06b432c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.0"
   geocoding:
     dependency: "direct main"
     description:
@@ -412,18 +404,18 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.7"
+    version: "10.0.5"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.8"
+    version: "3.0.5"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -708,7 +700,7 @@ packages:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.0"
+    version: "0.0.99"
   sliding_up_panel:
     dependency: "direct main"
     description:
@@ -753,10 +745,10 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.0"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
@@ -777,10 +769,10 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.2.0"
   synchronized:
     dependency: transitive
     description:
@@ -801,10 +793,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.3"
+    version: "0.7.2"
   typed_data:
     dependency: transitive
     description:
@@ -921,10 +913,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
       url: "https://pub.dev"
     source: hosted
-    version: "14.3.0"
+    version: "14.2.5"
   web:
     dependency: transitive
     description:

frontend/pubspec.yaml

@@ -51,7 +51,6 @@ dependencies:
   flutter_launcher_icons: ^0.13.1
   permission_handler: ^11.3.1
   geolocator: ^13.0.1
-  fuzzywuzzy: ^1.2.0
 
 dev_dependencies:
   flutter_test:

frontend/test/widget_test.dart

@@ -0,0 +1,30 @@
+// This is a basic Flutter widget test.
+//
+// To perform an interaction with a widget in your test, use the WidgetTester
+// utility in the flutter_test package. For example, you can send tap and scroll
+// gestures. You can also use WidgetTester to find child widgets in the widget
+// tree, read text, and verify that the values of widget properties are correct.
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+// import 'package:anyway/main.dart';
+import 'package:anyway/layout.dart';
+
+void main() {
+  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
+    // Build our app and trigger a frame.
+    await tester.pumpWidget(BasePage(mainScreen: "map",));
+
+    // Verfiy that the title is displayed
+    expect(find.text('City Nav'), findsOneWidget);
+
+    // Tap the '+' icon and trigger a frame.
+    await tester.tap(find.byIcon(Icons.add));
+    await tester.pump();
+
+    // Verify that our counter has incremented.
+    expect(find.text('0'), findsNothing);
+    expect(find.text('1'), findsOneWidget);
+  });
+}