From 9509d7565d653afac21b54db3eb380e197677fb2 Mon Sep 17 00:00:00 2001 From: Nikolina Sandstedt Date: Wed, 25 May 2022 11:18:03 +0200 Subject: [PATCH 1/2] la till hamburgarmeny --- .flutter-plugins-dependencies | 2 +- lib/Map.dart | 166 +++++++++++++++++++++++++++++++--- 2 files changed, 152 insertions(+), 16 deletions(-) diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies index 3d6b98a..39e8a93 100644 --- a/.flutter-plugins-dependencies +++ b/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"firebase_auth","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-1.4.1\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-1.17.0\\\\","dependencies":[]},{"name":"flutter_native_splash","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_native_splash-2.1.6\\\\","dependencies":[]},{"name":"geocoding","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geocoding-2.0.4\\\\","dependencies":[]},{"name":"geolocator_apple","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_apple-2.1.3\\\\","dependencies":[]},{"name":"google_maps_flutter","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_maps_flutter-2.1.5\\\\","dependencies":[]},{"name":"google_sign_in_ios","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_ios-5.3.1\\\\","dependencies":[]},{"name":"location","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location-4.4.0\\\\","dependencies":[]},{"name":"package_info_plus","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-1.4.2\\\\","dependencies":[]},{"name":"path_provider_ios","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_ios-2.0.9\\\\","dependencies":[]},{"name":"webview_flutter_wkwebview","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\webview_flutter_wkwebview-2.7.5\\\\","dependencies":[]}],"android":[{"name":"firebase_auth","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-1.4.1\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-1.17.0\\\\","dependencies":[]},{"name":"flutter_native_splash","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_native_splash-2.1.6\\\\","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_plugin_android_lifecycle-2.0.6\\\\","dependencies":[]},{"name":"geocoding","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geocoding-2.0.4\\\\","dependencies":[]},{"name":"geolocator_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_android-3.1.8\\\\","dependencies":[]},{"name":"google_api_headers","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_api_headers-1.3.0\\\\","dependencies":["package_info_plus"]},{"name":"google_maps_flutter","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_maps_flutter-2.1.5\\\\","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"google_sign_in_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_android-5.2.8\\\\","dependencies":[]},{"name":"location","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location-4.4.0\\\\","dependencies":[]},{"name":"package_info_plus","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-1.4.2\\\\","dependencies":[]},{"name":"path_provider_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_android-2.0.14\\\\","dependencies":[]},{"name":"webview_flutter_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\webview_flutter_android-2.8.8\\\\","dependencies":[]}],"macos":[{"name":"firebase_auth","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-1.4.1\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-1.17.0\\\\","dependencies":[]},{"name":"geolocator_apple","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_apple-2.1.3\\\\","dependencies":[]},{"name":"location","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location-4.4.0\\\\","dependencies":[]},{"name":"package_info_plus_macos","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_macos-1.3.0\\\\","dependencies":[]},{"name":"path_provider_macos","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-2.0.6\\\\","dependencies":[]}],"linux":[{"name":"package_info_plus_linux","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_linux-1.0.5\\\\","dependencies":[]},{"name":"path_provider_linux","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-2.1.6\\\\","dependencies":[]}],"windows":[{"name":"geolocator_windows","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_windows-0.1.1\\\\","dependencies":[]},{"name":"package_info_plus_windows","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_windows-1.0.5\\\\","dependencies":[]},{"name":"path_provider_windows","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_windows-2.0.6\\\\","dependencies":[]}],"web":[{"name":"firebase_auth_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth_web-1.3.1\\\\","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core_web-1.6.4\\\\","dependencies":[]},{"name":"flutter_native_splash","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_native_splash-2.1.6\\\\","dependencies":[]},{"name":"geolocator_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_web-2.1.5\\\\","dependencies":[]},{"name":"google_sign_in_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_web-0.10.1+2\\\\","dependencies":[]},{"name":"location_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location_web-3.1.1\\\\","dependencies":[]},{"name":"package_info_plus_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_web-1.0.5\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"firebase_auth","dependencies":["firebase_auth_web","firebase_core"]},{"name":"firebase_auth_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"flutter_native_splash","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"geocoding","dependencies":[]},{"name":"geolocator","dependencies":["geolocator_android","geolocator_apple","geolocator_web","geolocator_windows"]},{"name":"geolocator_android","dependencies":[]},{"name":"geolocator_apple","dependencies":[]},{"name":"geolocator_web","dependencies":[]},{"name":"geolocator_windows","dependencies":[]},{"name":"google_api_headers","dependencies":["package_info_plus"]},{"name":"google_maps_flutter","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"google_sign_in","dependencies":["google_sign_in_android","google_sign_in_ios","google_sign_in_web"]},{"name":"google_sign_in_android","dependencies":[]},{"name":"google_sign_in_ios","dependencies":[]},{"name":"google_sign_in_web","dependencies":[]},{"name":"location","dependencies":["location_web"]},{"name":"location_web","dependencies":[]},{"name":"package_info_plus","dependencies":["package_info_plus_linux","package_info_plus_macos","package_info_plus_windows","package_info_plus_web"]},{"name":"package_info_plus_linux","dependencies":[]},{"name":"package_info_plus_macos","dependencies":[]},{"name":"package_info_plus_web","dependencies":[]},{"name":"package_info_plus_windows","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_ios","path_provider_linux","path_provider_macos","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_ios","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2022-05-23 13:51:54.190623","version":"2.10.5"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"firebase_auth","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-1.4.1\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-1.17.0\\\\","dependencies":[]},{"name":"flutter_native_splash","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_native_splash-2.1.6\\\\","dependencies":[]},{"name":"geocoding","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geocoding-2.0.4\\\\","dependencies":[]},{"name":"geolocator_apple","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_apple-2.1.3\\\\","dependencies":[]},{"name":"google_maps_flutter","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_maps_flutter-2.1.5\\\\","dependencies":[]},{"name":"google_sign_in_ios","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_ios-5.3.1\\\\","dependencies":[]},{"name":"location","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location-4.4.0\\\\","dependencies":[]},{"name":"package_info_plus","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-1.4.2\\\\","dependencies":[]},{"name":"path_provider_ios","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_ios-2.0.9\\\\","dependencies":[]},{"name":"webview_flutter_wkwebview","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\webview_flutter_wkwebview-2.7.5\\\\","dependencies":[]}],"android":[{"name":"firebase_auth","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-1.4.1\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-1.17.0\\\\","dependencies":[]},{"name":"flutter_native_splash","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_native_splash-2.1.6\\\\","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_plugin_android_lifecycle-2.0.6\\\\","dependencies":[]},{"name":"geocoding","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geocoding-2.0.4\\\\","dependencies":[]},{"name":"geolocator_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_android-3.1.8\\\\","dependencies":[]},{"name":"google_api_headers","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_api_headers-1.3.0\\\\","dependencies":["package_info_plus"]},{"name":"google_maps_flutter","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_maps_flutter-2.1.5\\\\","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"google_sign_in_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_android-5.2.8\\\\","dependencies":[]},{"name":"location","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location-4.4.0\\\\","dependencies":[]},{"name":"package_info_plus","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus-1.4.2\\\\","dependencies":[]},{"name":"path_provider_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_android-2.0.14\\\\","dependencies":[]},{"name":"webview_flutter_android","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\webview_flutter_android-2.8.8\\\\","dependencies":[]}],"macos":[{"name":"firebase_auth","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-1.4.1\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-1.17.0\\\\","dependencies":[]},{"name":"geolocator_apple","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_apple-2.1.3\\\\","dependencies":[]},{"name":"location","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location-4.4.0\\\\","dependencies":[]},{"name":"package_info_plus_macos","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_macos-1.3.0\\\\","dependencies":[]},{"name":"path_provider_macos","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_macos-2.0.6\\\\","dependencies":[]}],"linux":[{"name":"package_info_plus_linux","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_linux-1.0.5\\\\","dependencies":[]},{"name":"path_provider_linux","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-2.1.6\\\\","dependencies":[]}],"windows":[{"name":"geolocator_windows","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_windows-0.1.1\\\\","dependencies":[]},{"name":"package_info_plus_windows","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_windows-1.0.5\\\\","dependencies":[]},{"name":"path_provider_windows","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_windows-2.0.6\\\\","dependencies":[]}],"web":[{"name":"firebase_auth_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth_web-1.3.1\\\\","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core_web-1.6.4\\\\","dependencies":[]},{"name":"flutter_native_splash","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_native_splash-2.1.6\\\\","dependencies":[]},{"name":"geolocator_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_web-2.1.5\\\\","dependencies":[]},{"name":"google_sign_in_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in_web-0.10.1+2\\\\","dependencies":[]},{"name":"location_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\location_web-3.1.1\\\\","dependencies":[]},{"name":"package_info_plus_web","path":"C:\\\\src\\\\flutter_windows_2.10.5-stable\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\package_info_plus_web-1.0.5\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"firebase_auth","dependencies":["firebase_auth_web","firebase_core"]},{"name":"firebase_auth_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"flutter_native_splash","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"geocoding","dependencies":[]},{"name":"geolocator","dependencies":["geolocator_android","geolocator_apple","geolocator_web","geolocator_windows"]},{"name":"geolocator_android","dependencies":[]},{"name":"geolocator_apple","dependencies":[]},{"name":"geolocator_web","dependencies":[]},{"name":"geolocator_windows","dependencies":[]},{"name":"google_api_headers","dependencies":["package_info_plus"]},{"name":"google_maps_flutter","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"google_sign_in","dependencies":["google_sign_in_android","google_sign_in_ios","google_sign_in_web"]},{"name":"google_sign_in_android","dependencies":[]},{"name":"google_sign_in_ios","dependencies":[]},{"name":"google_sign_in_web","dependencies":[]},{"name":"location","dependencies":["location_web"]},{"name":"location_web","dependencies":[]},{"name":"package_info_plus","dependencies":["package_info_plus_linux","package_info_plus_macos","package_info_plus_windows","package_info_plus_web"]},{"name":"package_info_plus_linux","dependencies":[]},{"name":"package_info_plus_macos","dependencies":[]},{"name":"package_info_plus_web","dependencies":[]},{"name":"package_info_plus_windows","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_ios","path_provider_linux","path_provider_macos","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_ios","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"webview_flutter","dependencies":["webview_flutter_android","webview_flutter_wkwebview"]},{"name":"webview_flutter_android","dependencies":[]},{"name":"webview_flutter_wkwebview","dependencies":[]}],"date_created":"2022-05-25 11:14:43.312991","version":"2.10.5"} \ No newline at end of file diff --git a/lib/Map.dart b/lib/Map.dart index 3cd98e1..319c79e 100644 --- a/lib/Map.dart +++ b/lib/Map.dart @@ -1,6 +1,8 @@ import 'dart:convert'; import 'package:flutter/material.dart'; +import 'package:flutter_applicationdemo/Form.dart'; +import 'package:flutter_applicationdemo/HomePage.dart'; import 'dart:async'; import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:flutter_google_places/flutter_google_places.dart'; @@ -9,7 +11,12 @@ import 'package:google_api_headers/google_api_headers.dart'; import 'package:http/http.dart' as http; import 'package:location/location.dart'; import 'package:geolocator/geolocator.dart'; +import 'FeedbackPage.dart'; import 'SettingsPage.dart'; +import 'globals.dart' as globals; +import 'login/CreateAccountPage.dart'; +import 'login/signInPage.dart'; +import 'login/user.dart'; class Map extends StatefulWidget { @@ -313,26 +320,22 @@ class MapState extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( + centerTitle: true, + title: const Text("Sun chasers"), key: homeSacffoldKey, - //leading: IconButton(icon: Icon(Icons.search), onPressed:() {},), - actions: [ - IconButton(icon: const Icon(Icons.search), onPressed:() { - },), - ], - title: TextFormField( - controller: _searchController, - textCapitalization: TextCapitalization.words, - decoration: const InputDecoration(hintText: 'Find your place'), - onChanged: (value) { - print(value); - }, - ), backgroundColor: const Color.fromARGB(255, 190, 146, 160), ), + drawer : Drawer( + child: Container( + child: globals.LOGGED_IN_USER.userID == 0 ? buildDrawerSignedOut(context) : buildDrawerSignedIn(context), + ), + ), + body: Stack ( children: [ GoogleMap( - mapType: MapType.normal, + + mapType: MapType.normal, initialCameraPosition: _kGooglePlex, markers: markersList.map((e) => e).toSet(), onMapCreated: (GoogleMapController controller) { @@ -390,7 +393,7 @@ class MapState extends State { MaterialPageRoute( builder: (context) => const SettingsPage())); }, - backgroundColor: Colors.purple, + backgroundColor: Colors.blueAccent, child: const Icon(Icons.filter_alt), ), ), @@ -490,6 +493,139 @@ class MapState extends State { }*/ } +Widget buildDrawerSignedIn(BuildContext context){ + return Drawer( + child: ListView( + padding: EdgeInsets.zero, + children: [ + DrawerHeader( + decoration: const BoxDecoration(color: Color.fromARGB(255, 190, 146, 160)), + child: Column(children: const [ + Text('Sun Chaser', + style :TextStyle(fontSize: 32), + ), + + SizedBox(height: 30), + Icon(Icons.account_box_rounded), + + ], + + ), + + ), + + ListTile( + leading: Icon(Icons.logout), + title: Text('Sign out'), + onTap:(){ + globals.LOGGED_IN_USER = user(0, "", ""); + Navigator.push( + context, + MaterialPageRoute(builder: (context) => HomePage()), //Replace Container() with call to Map-page. + ); + }, + ), + ListTile( + leading: Icon(Icons.thumb_up_alt), + title: Text('Give feedback'), + onTap:(){ + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => FormForFeedback(), + ), + ); + }, + + ), + ListTile( + leading: Icon(Icons.settings), + title: Text('Settings'), + onTap:(){ + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => SettingsPage(), + ), + ); + }, + ), + + ], + ), + ); +} + +Widget buildDrawerSignedOut(BuildContext context){ + return Drawer( + child: ListView( + padding: EdgeInsets.zero, + children: [ + DrawerHeader( + decoration: const BoxDecoration(color: Color.fromARGB(255, 190, 146, 160)), + child: Column(children: const [ + Text('Sun Chaser', + style :TextStyle(fontSize: 32), + ), + + SizedBox(height: 30), + ], + ), + ), + + ListTile( + leading: Icon(Icons.account_box_rounded), + title: Text('Create account'), + onTap:(){ + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => CreateAccountPage(), + ), + ); + }, + ), + ListTile( + leading: Icon(Icons.login), + title: Text('Sign in'), + onTap:(){ + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => SignInPage(), + ), + ); + },), + ListTile( + leading: Icon(Icons.thumb_up_alt), + title: Text('Give feedback'), + onTap:(){ + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => FormForFeedback(), + ), + ); + }, + ), + ListTile( + leading: Icon(Icons.settings), + title: Text('Settings'), + onTap:(){ + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => SettingsPage(), + ), + ); + }, + ), + ], + ), + ); +} + + class _Marker { var Plats_1; -- 2.39.5 From 6493f9965849cd0e528c268608a9f181f62c7e96 Mon Sep 17 00:00:00 2001 From: Nikolina Sandstedt Date: Wed, 25 May 2022 11:44:43 +0200 Subject: [PATCH 2/2] la till --- lib/Map.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/Map.dart b/lib/Map.dart index 319c79e..7d18b86 100644 --- a/lib/Map.dart +++ b/lib/Map.dart @@ -1,5 +1,4 @@ import 'dart:convert'; - import 'package:flutter/material.dart'; import 'package:flutter_applicationdemo/Form.dart'; import 'package:flutter_applicationdemo/HomePage.dart'; -- 2.39.5