From 6d3399640e752a3d255006e976e5adace5f15172 Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Sat, 10 Aug 2024 17:14:56 +0200 Subject: [PATCH] use more fitting floating action button, cleanup --- frontend/lib/layout.dart | 2 +- ...greeter.dart => current_trip_greeter.dart} | 0 ....dart => current_trip_landmarks_list.dart} | 0 .../{map.dart => current_trip_map.dart} | 3 + ...ton.dart => current_trip_save_button.dart} | 0 frontend/lib/modules/new_trip_button.dart | 74 ++++++++----------- frontend/lib/modules/new_trip_map.dart | 1 + .../pages/{trip.dart => current_trip.dart} | 8 +- frontend/lib/pages/new_trip.dart | 8 +- 9 files changed, 40 insertions(+), 56 deletions(-) rename frontend/lib/modules/{greeter.dart => current_trip_greeter.dart} (100%) rename frontend/lib/modules/{landmarks_list.dart => current_trip_landmarks_list.dart} (100%) rename frontend/lib/modules/{map.dart => current_trip_map.dart} (97%) rename frontend/lib/modules/{save_button.dart => current_trip_save_button.dart} (100%) rename frontend/lib/pages/{trip.dart => current_trip.dart} (89%) diff --git a/frontend/lib/layout.dart b/frontend/lib/layout.dart index 5979e0e..1369ca2 100644 --- a/frontend/lib/layout.dart +++ b/frontend/lib/layout.dart @@ -11,7 +11,7 @@ import 'package:anyway/utils/load_trips.dart'; import 'package:anyway/pages/new_trip.dart'; import 'package:anyway/pages/tutorial.dart'; -import 'package:anyway/pages/trip.dart'; +import 'package:anyway/pages/current_trip.dart'; import 'package:anyway/pages/profile.dart'; diff --git a/frontend/lib/modules/greeter.dart b/frontend/lib/modules/current_trip_greeter.dart similarity index 100% rename from frontend/lib/modules/greeter.dart rename to frontend/lib/modules/current_trip_greeter.dart diff --git a/frontend/lib/modules/landmarks_list.dart b/frontend/lib/modules/current_trip_landmarks_list.dart similarity index 100% rename from frontend/lib/modules/landmarks_list.dart rename to frontend/lib/modules/current_trip_landmarks_list.dart diff --git a/frontend/lib/modules/map.dart b/frontend/lib/modules/current_trip_map.dart similarity index 97% rename from frontend/lib/modules/map.dart rename to frontend/lib/modules/current_trip_map.dart index 205eabd..dfd174a 100644 --- a/frontend/lib/modules/map.dart +++ b/frontend/lib/modules/current_trip_map.dart @@ -77,6 +77,9 @@ class _MapWidgetState extends State { // onLongPress: , markers: mapMarkers, cloudMapId: MAP_ID, + mapToolbarEnabled: false, + zoomControlsEnabled: false, + ); } } diff --git a/frontend/lib/modules/save_button.dart b/frontend/lib/modules/current_trip_save_button.dart similarity index 100% rename from frontend/lib/modules/save_button.dart rename to frontend/lib/modules/current_trip_save_button.dart diff --git a/frontend/lib/modules/new_trip_button.dart b/frontend/lib/modules/new_trip_button.dart index 0d1a479..99491f2 100644 --- a/frontend/lib/modules/new_trip_button.dart +++ b/frontend/lib/modules/new_trip_button.dart @@ -25,52 +25,38 @@ class _NewTripButtonState extends State { if (widget.trip.landmarks.isEmpty){ return Container(); } - return SizedBox( - width: 200, - child: ElevatedButton( - onPressed: () async { - Future preferences = loadUserPreferences(); - Trip trip = widget.trip; - fetchTrip(trip, preferences); - Navigator.of(context).push( - MaterialPageRoute( - builder: (context) => BasePage(mainScreen: "map", trip: trip) - ) - ); + return FloatingActionButton.extended( + onPressed: () async { + Future preferences = loadUserPreferences(); + Trip trip = widget.trip; + fetchTrip(trip, preferences); + Navigator.of(context).push( + MaterialPageRoute( + builder: (context) => BasePage(mainScreen: "map", trip: trip) + ) + ); + }, + icon: Icon(Icons.add), + label: FutureBuilder( + future: widget.trip.cityName, + builder: (context, snapshot) { + if (snapshot.connectionState == ConnectionState.done) { + return AutoSizeText( + 'New trip to ${snapshot.data.toString()}', + style: TextStyle(fontSize: 18), + maxLines: 2, + ); + } else { + return AutoSizeText( + 'New trip to ...', + style: TextStyle(fontSize: 18), + maxLines: 2, + ); + } }, - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - Icons.add, - ), - Expanded( - child: Padding( - padding: EdgeInsets.only(left: 10, top: 5, bottom: 5, right: 5), - child: FutureBuilder( - future: widget.trip.cityName, - builder: (context, snapshot) { - if (snapshot.connectionState == ConnectionState.done) { - return AutoSizeText( - 'New trip to ${snapshot.data.toString()}', - style: TextStyle(fontSize: 18), - maxLines: 2, - ); - } else { - return AutoSizeText( - 'New trip to ...', - style: TextStyle(fontSize: 18), - maxLines: 2, - ); - } - }, - ) - ) - ) - ], - ), - ), + ) ); + } ); } diff --git a/frontend/lib/modules/new_trip_map.dart b/frontend/lib/modules/new_trip_map.dart index d8232e8..fc0a8c2 100644 --- a/frontend/lib/modules/new_trip_map.dart +++ b/frontend/lib/modules/new_trip_map.dart @@ -81,6 +81,7 @@ class _NewTripMapState extends State { markers: _markers, cloudMapId: MAP_ID, mapToolbarEnabled: false, + zoomControlsEnabled: false, ); } } \ No newline at end of file diff --git a/frontend/lib/pages/trip.dart b/frontend/lib/pages/current_trip.dart similarity index 89% rename from frontend/lib/pages/trip.dart rename to frontend/lib/pages/current_trip.dart index 2d6e58e..793f22f 100644 --- a/frontend/lib/pages/trip.dart +++ b/frontend/lib/pages/current_trip.dart @@ -1,11 +1,11 @@ -import 'package:anyway/modules/save_button.dart'; +import 'package:anyway/modules/current_trip_save_button.dart'; import 'package:flutter/material.dart'; import 'package:sliding_up_panel/sliding_up_panel.dart'; import 'package:anyway/structs/trip.dart'; -import 'package:anyway/modules/landmarks_list.dart'; -import 'package:anyway/modules/greeter.dart'; -import 'package:anyway/modules/map.dart'; +import 'package:anyway/modules/current_trip_landmarks_list.dart'; +import 'package:anyway/modules/current_trip_greeter.dart'; +import 'package:anyway/modules/current_trip_map.dart'; diff --git a/frontend/lib/pages/new_trip.dart b/frontend/lib/pages/new_trip.dart index 78d6cef..741b4dc 100644 --- a/frontend/lib/pages/new_trip.dart +++ b/frontend/lib/pages/new_trip.dart @@ -38,15 +38,9 @@ class _NewTripPageState extends State { padding: EdgeInsets.all(15), child: NewTripLocationSearch(trip), ), - Align( - alignment: Alignment.bottomRight, - child: Padding( - padding: EdgeInsets.all(15), - child: NewTripButton(trip: trip) - ), - ), ], ), + floatingActionButton: NewTripButton(trip: trip), ); } }