shas6395 #24

Merged
shas6395 merged 12 commits from shas6395 into master 2022-05-22 13:20:51 +02:00
8 changed files with 24 additions and 27 deletions
Showing only changes of commit 1eff7a91fa - Show all commits

View File

@ -8,8 +8,8 @@ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/archive-3.3.0/lib/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/archive-3.3.0/lib/
args args
2.12 2.12
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/args-2.3.0/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/args-2.3.1/
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/args-2.3.0/lib/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/args-2.3.1/lib/
async async
2.12 2.12
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.8.2/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.8.2/
@ -52,8 +52,8 @@ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/
ffi ffi
2.12 2.12
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/ffi-1.1.2/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/ffi-1.2.1/
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/ffi-1.1.2/lib/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/ffi-1.2.1/lib/
file file
2.12 2.12
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/file-6.1.2/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/file-6.1.2/
@ -140,8 +140,8 @@ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/get-4.6.3/lib/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/get-4.6.3/lib/
google_api_headers google_api_headers
2.12 2.12
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_api_headers-1.2.0+1/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_api_headers-1.3.0/
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_api_headers-1.2.0+1/lib/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_api_headers-1.3.0/lib/
google_fonts google_fonts
2.12 2.12
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_fonts-2.3.2/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_fonts-2.3.2/
@ -172,12 +172,12 @@ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_ios-5.2.7/lib/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_ios-5.2.7/lib/
google_sign_in_platform_interface google_sign_in_platform_interface
2.12 2.12
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_platform_interface-2.1.2/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_platform_interface-2.1.3/
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_platform_interface-2.1.2/lib/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_platform_interface-2.1.3/lib/
google_sign_in_web google_sign_in_web
2.12 2.12
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_web-0.10.1+1/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_web-0.10.1+2/
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_web-0.10.1+1/lib/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_web-0.10.1+2/lib/
http http
2.14 2.14
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.13.4/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.13.4/
@ -284,8 +284,8 @@ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-2.0.6/lib/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-2.0.6/lib/
path_provider_platform_interface path_provider_platform_interface
2.12 2.12
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_platform_interface-2.0.3/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_platform_interface-2.0.4/
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_platform_interface-2.0.3/lib/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_platform_interface-2.0.4/lib/
path_provider_windows path_provider_windows
2.12 2.12
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-2.0.6/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-2.0.6/
@ -380,8 +380,8 @@ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/xml-5.3.1/lib/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/xml-5.3.1/lib/
yaml yaml
2.12 2.12
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/yaml-3.1.0/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/yaml-3.1.1/
file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/yaml-3.1.0/lib/ file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/yaml-3.1.1/lib/
sky_engine sky_engine
2.12 2.12
file:///C:/Users/morte/OneDrive/Documents/flutter/bin/cache/pkg/sky_engine/ file:///C:/Users/morte/OneDrive/Documents/flutter/bin/cache/pkg/sky_engine/

View File

@ -2,7 +2,7 @@ import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_applicationdemo/BottomNavPage.dart'; import 'package:flutter_applicationdemo/BottomNavPage.dart';
import 'package:flutter_applicationdemo/GoogleSignInProvider.dart'; import 'package:flutter_applicationdemo/login/GoogleSignInProvider.dart';
import 'package:flutter_applicationdemo/Map.dart'; import 'package:flutter_applicationdemo/Map.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
@ -10,12 +10,11 @@ import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:google_sign_in/google_sign_in.dart'; import 'package:google_sign_in/google_sign_in.dart';
import 'package:settings_ui/settings_ui.dart'; import 'package:settings_ui/settings_ui.dart';
import 'ManageAccountPage.dart'; import 'ManageAccountPage.dart';
import 'GoogleSignInProvider.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'Venue.dart'; import 'Venue.dart';
import 'globals.dart'; import 'globals.dart';
import 'Map.dart'; import 'Map.dart';
import 'user.dart'; import 'package:flutter_applicationdemo/login/user.dart';
import 'HomePage.dart'; import 'HomePage.dart';
// Standard color of app // Standard color of app

View File

@ -2,14 +2,13 @@ import 'package:flutter/material.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'BottomNavPage.dart'; import 'BottomNavPage.dart';
import 'package:flutter_applicationdemo/login/CreateAccountPage.dart'; import 'package:flutter_applicationdemo/login/CreateAccountPage.dart';
import 'package:flutter_applicationdemo/CreateAccountPage.dart'; import 'package:flutter_applicationdemo/login/CreateAccountPage.dart';
import 'Venue.dart'; import 'Venue.dart';
import 'globals.dart'; import 'globals.dart';
import 'login/signInPage.dart'; import 'login/signInPage.dart';
import '../login/user.dart'; import '../login/user.dart';
import 'mysql.dart'; import 'mysql.dart';
import 'signInPage.dart'; import 'package:flutter_applicationdemo/login/user.dart';
import 'user.dart';
import 'globals.dart' as globals; import 'globals.dart' as globals;
class HomePage extends StatefulWidget { class HomePage extends StatefulWidget {

View File

@ -7,7 +7,7 @@ import 'package:flutter_google_places/flutter_google_places.dart';
import 'package:google_maps_webservice/places.dart'; import 'package:google_maps_webservice/places.dart';
import 'package:google_api_headers/google_api_headers.dart'; import 'package:google_api_headers/google_api_headers.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'user.dart'; import 'package:flutter_applicationdemo/login/user.dart';
import 'Venue.dart'; import 'Venue.dart';

View File

@ -1,5 +1,5 @@
import 'Venue.dart'; import 'Venue.dart';
import 'user.dart'; import 'package:flutter_applicationdemo/login/user.dart';
import '../login/user.dart'; import '../login/user.dart';
import 'HomePage.dart'; import 'HomePage.dart';
import 'main.dart'; import 'main.dart';

View File

@ -1,7 +1,6 @@
import 'package:flutter_applicationdemo/user.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'Venue.dart'; import 'package:flutter_applicationdemo/Venue.dart';
import 'mysql.dart'; import 'package:flutter_applicationdemo/mysql.dart';
class user{ class user{
late int userID; late int userID;

View File

@ -3,7 +3,7 @@ import 'dart:async';
import 'package:firebase_auth/firebase_auth.dart'; import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_core/firebase_core.dart';
import 'package:flutter_applicationdemo/GoogleSignInProvider.dart'; import 'package:flutter_applicationdemo/login/GoogleSignInProvider.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:flutter_applicationdemo/login/GoogleSignInProvider.dart'; import 'package:flutter_applicationdemo/login/GoogleSignInProvider.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -12,7 +12,7 @@ import 'Map.dart';
import 'HomePage.dart'; import 'HomePage.dart';
import 'Venue.dart'; import 'Venue.dart';
import 'mysql.dart'; import 'mysql.dart';
import 'user.dart'; import 'package:flutter_applicationdemo/login/user.dart';
import 'login/user.dart'; import 'login/user.dart';
import 'globals.dart'; import 'globals.dart';

View File