maze6343/pvt-project-google-maps
Template
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

LastFeedbackBranch #48

Merged
nisa9769 merged 4 commits from LastFeedbackBranch into master 2022-05-28 05:33:08 +02:00
Conversation 0 Commits 4 Files Changed 13 +11 -9
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 51fe8f7eb2 - Show all commits

2
.flutter-plugins-dependencies
View File

File diff suppressed because one or more lines are too long

3
lib/Map.dart
View File

@ -1,5 +1,6 @@
import 'dart:convert'; import 'dart:convert';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_applicationdemo/BottomNavPage.dart';
import 'package:flutter_applicationdemo/WebScraper.dart'; import 'package:flutter_applicationdemo/WebScraper.dart';
import 'package:flutter_applicationdemo/HomePage.dart'; import 'package:flutter_applicationdemo/HomePage.dart';
import 'dart:async'; import 'dart:async';
@ -313,7 +314,7 @@ Widget buildDrawerSignedIn(BuildContext context){
globals.LOGGED_IN_USER = User(0, "", ""); globals.LOGGED_IN_USER = User(0, "", "");
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => HomePage()), //Replace Container() with call to Map-page. MaterialPageRoute(builder: (context) => BottomNavPage()), //Replace Container() with call to Map-page.
); );
}, },
), ),

4
lib/login/CreateAccountPage.dart
View File

@ -33,7 +33,7 @@ class _CreateAccountPageState extends State<CreateAccountPage> {
onPressed: () { onPressed: () {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => HomePage()), MaterialPageRoute(builder: (context) => BottomNavPage()),
); );
}, },
), ),
@ -116,7 +116,7 @@ class _CreateAccountPageState extends State<CreateAccountPage> {
passwordController.text); passwordController.text);
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => HomePage()), MaterialPageRoute(builder: (context) => BottomNavPage()),
); );
} else { } else {
createUserError(userInput.errorMessage); createUserError(userInput.errorMessage);

7
lib/login/signInPage.dart
View File

@ -1,6 +1,7 @@
import 'dart:io'; import 'dart:io';
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 '../mysql.dart'; import '../mysql.dart';
import '../HomePage.dart'; import '../HomePage.dart';
import '../main.dart'; import '../main.dart';
@ -49,7 +50,7 @@ class _SignInPageState extends State<SignInPage> {
onPressed: () { onPressed: () {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => HomePage()), MaterialPageRoute(builder: (context) => BottomNavPage()),
); );
}, },
), ),
@ -151,7 +152,7 @@ class _SignInPageState extends State<SignInPage> {
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => builder: (context) =>
HomePage()), //Replace Container() with call to account-page. BottomNavPage()), //Replace Container() with call to account-page.
); );
} else { } else {
print(globals.LOGGED_IN_USER.userID); print(globals.LOGGED_IN_USER.userID);
@ -190,7 +191,7 @@ class _SignInPageState extends State<SignInPage> {
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => builder: (context) =>
HomePage()), //Replace Container() with call to Map-page. BottomNavPage()), //Replace Container() with call to Map-page.
); );
} }
}); });

4
lib/main.dart
View File

@ -9,8 +9,8 @@ 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';
import 'BottomNavPage.dart';
import 'Map.dart'; import 'Map.dart';
import 'HomePage.dart';
import 'Venue.dart'; import 'Venue.dart';
import 'mysql.dart'; import 'mysql.dart';
import 'package:flutter_applicationdemo/login/User.dart'; import 'package:flutter_applicationdemo/login/User.dart';
@ -35,7 +35,7 @@ class MyApp extends StatelessWidget {
primarySwatch: Colors.blue, primarySwatch: Colors.blue,
), ),
title: 'Flutter Google Maps Demo', title: 'Flutter Google Maps Demo',
home: HomePage(), home: BottomNavPage(),
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
), ),
); );