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

shas6395 #24

Merged
shas6395 merged 12 commits from shas6395 into master 2022-05-22 13:20:51 +02:00
Conversation 0 Commits 12 Files Changed 57 +54 -33
7 changed files with 54 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fc28c983fd - Show all commits

40
.dart_tool/package_config.json
View File

@ -9,7 +9,7 @@
},
{
"name": "args",
"rootUri": "file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/args-2.3.0",
"rootUri": "file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/args-2.3.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
@ -75,7 +75,7 @@
},
{
"name": "ffi",
"rootUri": "file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/ffi-1.1.2",
"rootUri": "file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/ffi-1.2.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
@ -225,7 +225,7 @@
},
{
"name": "google_api_headers",
"rootUri": "file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_api_headers-1.2.0+1",
"rootUri": "file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_api_headers-1.3.0",
"packageUri": "lib/",
"languageVersion": "2.12"
},
@ -273,13 +273,13 @@
},
{
"name": "google_sign_in_platform_interface",
"rootUri": "file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_platform_interface-2.1.2",
"rootUri": "file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_platform_interface-2.1.3",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "google_sign_in_web",
"rootUri": "file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_web-0.10.1+1",
"rootUri": "file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_web-0.10.1+2",
"packageUri": "lib/",
"languageVersion": "2.12"
},
@ -441,7 +441,7 @@
},
{
"name": "path_provider_platform_interface",
"rootUri": "file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_platform_interface-2.0.3",
"rootUri": "file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_platform_interface-2.0.4",
"packageUri": "lib/",
"languageVersion": "2.12"
},
@ -571,6 +571,30 @@
"packageUri": "lib/",
"languageVersion": "2.14"
},
{
"name": "webview_flutter",
"rootUri": "file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter-3.0.4",
"packageUri": "lib/",
"languageVersion": "2.14"
},
{
"name": "webview_flutter_android",
"rootUri": "file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_android-2.8.8",
"packageUri": "lib/",
"languageVersion": "2.14"
},
{
"name": "webview_flutter_platform_interface",
"rootUri": "file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_platform_interface-1.8.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "webview_flutter_wkwebview",
"rootUri": "file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_wkwebview-2.7.5",
"packageUri": "lib/",
"languageVersion": "2.14"
},
{
"name": "win32",
"rootUri": "file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/win32-2.5.2",
@ -591,7 +615,7 @@
},
{
"name": "yaml",
"rootUri": "file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/yaml-3.1.0",
"rootUri": "file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/yaml-3.1.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
@ -602,7 +626,7 @@
"languageVersion": "2.16"
}
],
"generated": "2022-05-17T07:01:31.366070Z",
"generated": "2022-05-19T09:19:56.525181Z",
"generator": "pub",
"generatorVersion": "2.16.2"
}

2
.flutter-plugins-dependencies
View File

File diff suppressed because one or more lines are too long

2
.packages
View File

@ -3,7 +3,7 @@
#
# For more info see: https://dart.dev/go/dot-packages-deprecation
#
# Generated by pub on 2022-05-19 10:35:11.260003.
# Generated by pub on 2022-05-19 11:19:56.493264.
archive:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/archive-3.3.0/lib/
args:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/args-2.3.1/lib/
async:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.8.2/lib/

2
android/app/build.gradle
View File

@ -45,7 +45,7 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.pvt74.sunchaser"
minSdkVersion 21
minSdkVersion 32
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName

1
lib/globals.dart
View File

@ -5,7 +5,6 @@ import 'dart:ui';
import 'package:flutter/material.dart';
import 'user.dart';
import 'HomePage.dart';
import 'main.dart';

15
lib/login/CreateAccountPage.dart
View File

@ -6,7 +6,7 @@ import 'package:flutter_applicationdemo/BottomNavPage.dart';
import 'package:flutter_applicationdemo/mysql.dart';
import 'package:flutter_applicationdemo/HomePage.dart';
import '../globals.dart';
import '../globals.dart' as globals;
import '../reusables/InputField.dart';
import 'user.dart';
import '../reusables/returnButton.dart';
@ -28,7 +28,7 @@ class _CreateAccountPageState extends State<CreateAccountPage> {
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
backgroundColor: pinkBackgroundColor,
backgroundColor: globals.PINKBACKGROUND,
leading: ReturnButton(
onPressed: () {
Navigator.push(
@ -39,9 +39,10 @@ class _CreateAccountPageState extends State<CreateAccountPage> {
),
),
backgroundColor: pinkBackgroundColor,
body: SafeArea(
body: Center(child: SingleChildScrollView(
child: createLoginPageContent(),
),
))
);
}
@ -129,10 +130,10 @@ class _CreateAccountPageState extends State<CreateAccountPage> {
},
child: Text(
"Create Account",
style: TextStyle(color: Colors.black, fontWeight: FontWeight.w400),
style: TextStyle(color: Colors.white, fontWeight: FontWeight.w400),
),
style: ButtonStyle(
backgroundColor: MaterialStateProperty.all(Colors.white),
backgroundColor: MaterialStateProperty.all(globals.BUTTONCOLOR),
),
);
}
@ -150,7 +151,7 @@ class _CreateAccountPageState extends State<CreateAccountPage> {
for (var row in results) {
setState(() {});
loggedInUser = new user(row[0], row[1], row[2]);
LOGGED_IN_USER.userID = loggedInUser.userID;
globals.LOGGED_IN_USER.userID = loggedInUser.userID;
}
});
});

25
lib/login/signInPage.dart
View File

@ -5,13 +5,13 @@ import '../mysql.dart';
import '../HomePage.dart';
import '../main.dart';
import 'user.dart';
import 'package:flutter_applicationdemo/globals.dart';
import '../reusables/InputField.dart';
import '../reusables/returnButton.dart';
import 'package:flutter_signin_button/flutter_signin_button.dart';
import 'GoogleSignInProvider.dart';
import 'CreateAccountPage.dart';
import 'package:provider/provider.dart';
import 'package:flutter_applicationdemo/globals.dart' as globals;
class SignInPage extends StatefulWidget {
@override
@ -19,8 +19,6 @@ class SignInPage extends StatefulWidget {
}
class _SignInPageState extends State<SignInPage> {
Color pinkBackgroundColor = const Color.fromARGB(255, 240, 229, 229);
Color textColor = const Color.fromARGB(255, 79, 98, 114);
var db = mysql();
int loggedInID = 0;
late user loggedInUser;
@ -43,10 +41,11 @@ class _SignInPageState extends State<SignInPage> {
@override
Widget build(BuildContext context) {
Size size = MediaQuery.of(context).size;
return Scaffold(
backgroundColor: globals.PINKBACKGROUND,
resizeToAvoidBottomInset: true,
appBar: AppBar(
backgroundColor: pinkBackgroundColor,
backgroundColor: globals.PINKBACKGROUND,
leading: ReturnButton(
onPressed: () {
Navigator.push(
@ -56,10 +55,7 @@ class _SignInPageState extends State<SignInPage> {
},
),
),
//resizeToAvoidBottomPadding: false,
resizeToAvoidBottomInset: false,
backgroundColor: pinkBackgroundColor,
body: SafeArea(
body: Center(child: SingleChildScrollView(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
@ -82,7 +78,8 @@ class _SignInPageState extends State<SignInPage> {
),
],
),
),
),)
// This trailing comma makes auto-formatting nicer for build methods.
);
}
@ -110,13 +107,13 @@ class _SignInPageState extends State<SignInPage> {
'Sun Chasers',
style: TextStyle(
fontSize: 50,
color: textColor,
color: globals.TEXTCOLOR,
fontFamily: 'Sacramento',
shadows: const <Shadow>[
shadows: <Shadow>[
Shadow(
offset: Offset(2, 2),
blurRadius: 10.0,
color: Color.fromARGB(255, 0, 0, 0),
color: globals.SHADOWCOLOR,
),
],
),
@ -149,7 +146,7 @@ class _SignInPageState extends State<SignInPage> {
}
await loginVerification(emailController.text, passwordController.text);
if (loggedInID != 0) {
LOGGED_IN_USER = loggedInUser;
globals.LOGGED_IN_USER = loggedInUser;
Navigator.push(
context,
MaterialPageRoute(