reorganize and global colors introduced

Merge branch 'shas6395-ShadowMap' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into LoginPage
Conflicts: .dart_tool/package_config.json .packages lib/globals.dart
2022-05-19 12:28:09 +02:00 · 2022-05-19 11:17:44 +02:00 · 2022-05-19 11:01:51 +02:00 · 2022-05-17 18:07:41 +02:00
14 changed files with 196 additions and 60 deletions
--- a/.dart_tool/package_config.json
+++ b/.dart_tool/package_config.json
@ -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-17T08:24:36.005738Z",
+  "generated": "2022-05-19T09:19:56.525181Z",
  "generator": "pub",
  "generatorVersion": "2.16.2"
 }
--- a/.dart_tool/package_config_subset
+++ b/.dart_tool/package_config_subset
@ -366,6 +366,22 @@ vector_math
 2.14
 file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.1/
 file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.1/lib/
+webview_flutter
+2.14
+file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter-3.0.4/
+file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter-3.0.4/lib/
+webview_flutter_android
+2.14
+file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_android-2.8.8/
+file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_android-2.8.8/lib/
+webview_flutter_platform_interface
+2.12
+file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_platform_interface-1.8.1/
+file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_platform_interface-1.8.1/lib/
+webview_flutter_wkwebview
+2.14
+file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_wkwebview-2.7.5/
+file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_wkwebview-2.7.5/lib/
 win32
 2.15
 file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/win32-2.5.2/
--- a/.flutter-plugins
+++ b/.flutter-plugins
@ -10,12 +10,12 @@ geolocator_android=C:\\Users\\morte\\OneDrive\\Documents\\flutter\\.pub-cache\\h
 geolocator_apple=C:\\Users\\morte\\OneDrive\\Documents\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\geolocator_apple-2.1.3\\
 geolocator_web=C:\\Users\\morte\\OneDrive\\Documents\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\geolocator_web-2.1.5\\
 geolocator_windows=C:\\Users\\morte\\OneDrive\\Documents\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\geolocator_windows-0.1.1\\
-google_api_headers=C:\\Users\\morte\\OneDrive\\Documents\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_api_headers-1.2.0+1\\
+google_api_headers=C:\\Users\\morte\\OneDrive\\Documents\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_api_headers-1.3.0\\
 google_maps_flutter=C:\\Users\\morte\\OneDrive\\Documents\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_maps_flutter-2.1.5\\
 google_sign_in=C:\\Users\\morte\\OneDrive\\Documents\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_sign_in-5.3.1\\
 google_sign_in_android=C:\\Users\\morte\\OneDrive\\Documents\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_sign_in_android-5.2.7\\
 google_sign_in_ios=C:\\Users\\morte\\OneDrive\\Documents\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_sign_in_ios-5.2.7\\
-google_sign_in_web=C:\\Users\\morte\\OneDrive\\Documents\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_sign_in_web-0.10.1+1\\
+google_sign_in_web=C:\\Users\\morte\\OneDrive\\Documents\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_sign_in_web-0.10.1+2\\
 package_info_plus=C:\\Users\\morte\\OneDrive\\Documents\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\package_info_plus-1.4.2\\
 package_info_plus_linux=C:\\Users\\morte\\OneDrive\\Documents\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\package_info_plus_linux-1.0.5\\
 package_info_plus_macos=C:\\Users\\morte\\OneDrive\\Documents\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\package_info_plus_macos-1.3.0\\
@ -27,3 +27,6 @@ path_provider_ios=C:\\Users\\morte\\OneDrive\\Documents\\flutter\\.pub-cache\\ho
 path_provider_linux=C:\\Users\\morte\\OneDrive\\Documents\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\path_provider_linux-2.1.6\\
 path_provider_macos=C:\\Users\\morte\\OneDrive\\Documents\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\path_provider_macos-2.0.6\\
 path_provider_windows=C:\\Users\\morte\\OneDrive\\Documents\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\path_provider_windows-2.0.6\\
+webview_flutter=C:\\Users\\morte\\OneDrive\\Documents\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\webview_flutter-3.0.4\\
+webview_flutter_android=C:\\Users\\morte\\OneDrive\\Documents\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\webview_flutter_android-2.8.8\\
+webview_flutter_wkwebview=C:\\Users\\morte\\OneDrive\\Documents\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\webview_flutter_wkwebview-2.7.5\\
--- a/.flutter-plugins-dependencies
+++ b/.flutter-plugins-dependencies
--- a/.packages
+++ b/.packages
@ -3,9 +3,9 @@
 # 
 # For more info see: https://dart.dev/go/dot-packages-deprecation
 # 
-# Generated by pub on 2022-05-17 10:24:35.878079.
+# 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.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/
 boolean_selector:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0/lib/
 characters:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.2.0/lib/
@ -16,7 +16,7 @@ crypto:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.d
 cupertino_icons:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-1.0.4/lib/
 dio:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/dio-4.0.6/lib/
 fake_async:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0/lib/
-ffi:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/ffi-1.1.2/lib/
+ffi:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/ffi-1.2.1/lib/
 file:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/file-6.1.2/lib/
 firebase_auth:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/firebase_auth-1.4.1/lib/
 firebase_auth_platform_interface:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/firebase_auth_platform_interface-4.3.1/lib/
@ -41,7 +41,7 @@ geolocator_platform_interface:file:///C:/Users/morte/OneDrive/Documents/flutter/
 geolocator_web:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/geolocator_web-2.1.5/lib/
 geolocator_windows:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/geolocator_windows-0.1.1/lib/
 get:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/get-4.6.3/lib/
-google_api_headers:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_api_headers-1.2.0+1/lib/
+google_api_headers:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_api_headers-1.3.0/lib/
 google_fonts:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_fonts-2.3.2/lib/
 google_maps_flutter:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter-2.1.5/lib/
 google_maps_flutter_platform_interface:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter_platform_interface-2.1.5/lib/
@ -49,8 +49,8 @@ google_maps_webservice:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-ca
 google_sign_in:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in-5.3.1/lib/
 google_sign_in_android:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_android-5.2.7/lib/
 google_sign_in_ios: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:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_platform_interface-2.1.2/lib/
-google_sign_in_web:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_web-0.10.1+1/lib/
+google_sign_in_platform_interface: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:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_web-0.10.1+2/lib/
 http:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.13.4/lib/
 http_parser:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/http_parser-4.0.0/lib/
 image:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/image-3.1.3/lib/
@ -77,7 +77,7 @@ path_provider_android:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cac
 path_provider_ios:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_ios-2.0.9/lib/
 path_provider_linux:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-2.1.6/lib/
 path_provider_macos:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-2.0.6/lib/
-path_provider_platform_interface:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_platform_interface-2.0.3/lib/
+path_provider_platform_interface:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_platform_interface-2.0.4/lib/
 path_provider_windows:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-2.0.6/lib/
 petitparser:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/petitparser-4.4.0/lib/
 platform:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/platform-3.1.0/lib/
@ -99,8 +99,12 @@ test_api:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub
 typed_data:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0/lib/
 universal_io:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/universal_io-2.0.4/lib/
 vector_math:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.1/lib/
+webview_flutter:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter-3.0.4/lib/
+webview_flutter_android:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_android-2.8.8/lib/
+webview_flutter_platform_interface:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_platform_interface-1.8.1/lib/
+webview_flutter_wkwebview:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/webview_flutter_wkwebview-2.7.5/lib/
 win32:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/win32-2.5.2/lib/
 xdg_directories:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/xdg_directories-0.2.0+1/lib/
 xml:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/xml-5.3.1/lib/
-yaml:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/yaml-3.1.0/lib/
+yaml:file:///C:/Users/morte/OneDrive/Documents/flutter/.pub-cache/hosted/pub.dartlang.org/yaml-3.1.1/lib/
 flutter_applicationdemo:lib/
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -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
--- a/lib/BottomNavPage.dart
+++ b/lib/BottomNavPage.dart
@ -3,6 +3,7 @@ import 'package:google_maps_flutter_platform_interface/src/types/camera.dart';
 import 'Map.dart';
 import 'FavoritePage.dart';
 import 'SettingsPage.dart';
+import 'globals.dart' as globals;


 class BottomNavPage extends StatefulWidget {
@ -24,8 +25,8 @@ class BottomNavPageState extends State<BottomNavPage> {
    return Scaffold(
      body: screens[currentIndex],
      bottomNavigationBar: BottomNavigationBar(
-        backgroundColor: Color.fromARGB(255, 190, 146, 160),
-        selectedItemColor: Colors.black,
+        backgroundColor: globals.BACKGROUNDCOLOR,
+        selectedItemColor: globals.ITEMCOLOR,
        currentIndex: currentIndex,
        onTap: (index) => setState( () => currentIndex = index),
        items: const[
--- a/lib/HomePage.dart
+++ b/lib/HomePage.dart
@ -11,6 +11,7 @@ import 'mysql.dart';
 import 'package:flutter_applicationdemo/login/user.dart';
 import 'globals.dart' as globals;

+
 class HomePage extends StatefulWidget {
  const HomePage({Key? key}) : super(key: key);

@ -19,13 +20,10 @@ class HomePage extends StatefulWidget {
 }

 class _HomePageState extends State<HomePage> {
-  Color buttonColor = const Color.fromARGB(204, 172, 123, 132);
-  Color pinkBackgroundColor = const Color.fromARGB(255, 240, 229, 229);
-  Color textColor = const Color.fromARGB(255, 79, 98, 114);
  @override
  Widget build(BuildContext context) {
    return Scaffold(
-      backgroundColor: pinkBackgroundColor,
+      backgroundColor: globals.PINKBACKGROUND,
      body: SafeArea(
        child: Center(
          child: Column(children: <Widget>[
@ -35,7 +33,7 @@ class _HomePageState extends State<HomePage> {
                'Sun Chasers',
                style: TextStyle(
                  fontSize: 50,
-                  color: textColor,
+                  color: globals.TEXTCOLOR,
                  fontFamily: 'Sacramento',
                  shadows: <Shadow>[
                    Shadow(
@ -52,12 +50,12 @@ class _HomePageState extends State<HomePage> {
              style: TextStyle(
                  fontSize: 32,
                  fontFamily: 'Sacramento',
-                  color: textColor,
+                  color: globals.TEXTCOLOR,
                  shadows: <Shadow>[
                    Shadow(
                      offset: Offset(2, 2),
                      blurRadius: 12.5,
-                      color: Color.fromARGB(255, 0, 0, 0),
+                      color: globals.SHADOWCOLOR,
                    ),
                  ]
              ),
@ -67,7 +65,7 @@ class _HomePageState extends State<HomePage> {
              child: ElevatedButton(
                style: ElevatedButton.styleFrom(
                  fixedSize: const Size(200, 200),
-                  primary: buttonColor,
+                  primary: globals.BUTTONCOLOR,
                  elevation: 100,
                  shape: const CircleBorder(),
                ),
@ -77,7 +75,7 @@ class _HomePageState extends State<HomePage> {
                    MaterialPageRoute(builder: (context) => BottomNavPage()), //Replace Container() with call to account-page.
                  );
                },
-                child: const Text(
+                child: Text(
                  'FIND SPOT BY LOCATION',
                  textAlign: TextAlign.center,
                  style: TextStyle(
@ -87,7 +85,7 @@ class _HomePageState extends State<HomePage> {
                        Shadow(
                          offset: Offset(2, 2),
                          blurRadius: 10.0,
-                          color: Color.fromARGB(255, 0, 0, 0),
+                          color: globals.SHADOWCOLOR,
                        ),
                      ]
                  ),
@ -110,7 +108,7 @@ class _HomePageState extends State<HomePage> {
            ElevatedButton(
        style: ElevatedButton.styleFrom(
          fixedSize: const Size(200, 50),
-          primary: buttonColor,
+          primary: globals.BUTTONCOLOR,
          elevation: 100,
        ),
        onPressed: () {
@ -119,7 +117,7 @@ class _HomePageState extends State<HomePage> {
            MaterialPageRoute(builder: (context) => SignInPage()), //Replace Container() with call to Map-page.
          );
        },
-        child: const Text('Sign in',
+        child: Text('Sign in',
            style: TextStyle(
                fontSize: 18,
                color: Colors.white,
@ -127,7 +125,7 @@ class _HomePageState extends State<HomePage> {
                  Shadow(
                    offset: Offset(2, 2),
                    blurRadius: 10.0,
-                    color: Color.fromARGB(255, 0, 0, 0),
+                    color: globals.SHADOWCOLOR,
                  ),
                ])
        ),
@ -136,7 +134,7 @@ class _HomePageState extends State<HomePage> {
        ElevatedButton(
          style: ElevatedButton.styleFrom(
            fixedSize: const Size(200, 50),
-            primary: buttonColor,
+            primary: globals.BUTTONCOLOR,
            elevation: 100,
          ),
          onPressed: () {
@ -167,7 +165,7 @@ class _HomePageState extends State<HomePage> {
    return ElevatedButton(
      style: ElevatedButton.styleFrom(
        fixedSize: const Size(200, 50),
-        primary: buttonColor,
+        primary: globals.BUTTONCOLOR,
        elevation: 100,
      ),
      onPressed: () {
@ -177,7 +175,7 @@ class _HomePageState extends State<HomePage> {
          MaterialPageRoute(builder: (context) => HomePage()), //Replace Container() with call to Map-page.
        );
      },
-      child: const Text('Log out',
+      child: Text('Log out',
          style: TextStyle(
              fontSize: 18,
              color: Colors.white,
@ -185,7 +183,7 @@ class _HomePageState extends State<HomePage> {
                Shadow(
                  offset: Offset(2, 2),
                  blurRadius: 10.0,
-                  color: Color.fromARGB(255, 0, 0, 0),
+                  color: globals.SHADOWCOLOR,
                ),
              ])
      ),
--- a/lib/ShadowMap.dart
+++ b/lib/ShadowMap.dart
@ -0,0 +1,52 @@
+import 'package:webview_flutter/webview_flutter.dart';
+import 'package:flutter/material.dart';
+
+//This widget can be called like: ShadowMap(latitude: 59.27439, longitude: 18.03250);
+
+class ShadowMap extends StatefulWidget {
+  final double latitude;
+  final double longitude;
+
+  const ShadowMap({
+    Key? key,
+    required this.latitude,
+    required this.longitude,
+  }) : super(key: key);
+
+  @override
+  State<ShadowMap> createState() => _ShadowMapState();
+}
+
+class _ShadowMapState extends State<ShadowMap> {
+  @override
+  Widget build(BuildContext context) {
+    var lat = widget.latitude;
+    var lng = widget.longitude;
+    var dateInMilliseconds = DateTime.now().millisecondsSinceEpoch.toString();
+    return Scaffold(
+     appBar: AppBar(
+       centerTitle: true,
+       backgroundColor: const Color.fromARGB(204, 172, 123, 132),
+       title: Text(
+         'Sun Chasers',
+         style: TextStyle(
+           fontSize: 42,
+           color: const Color.fromARGB(255, 79, 98, 114),
+           fontFamily: 'Sacramento',
+           shadows: <Shadow>[
+             Shadow(
+               offset: Offset(2, 2),
+               blurRadius: 10.0,
+               color: Color.fromARGB(255, 0, 0, 0),
+             ),
+           ],
+         ),
+       ),
+     ),
+     body: WebView(
+       initialUrl: 'https://app.shadowmap.org/?lat=$lat&lng=$lng&zoom=17&basemap=map&time=$dateInMilliseconds&vq=2',
+       javascriptMode: JavascriptMode.unrestricted,
+     )
+    );
+  }
+}
--- a/lib/globals.dart
+++ b/lib/globals.dart
@ -1,8 +1,19 @@
 import 'Venue.dart';
 import 'package:flutter_applicationdemo/login/user.dart';
 import '../login/user.dart';
+import 'dart:ui';
+
+import 'package:flutter/material.dart';
+
 import 'HomePage.dart';
 import 'main.dart';

 user LOGGED_IN_USER = user(0, "", "");
+Color BACKGROUNDCOLOR = const Color.fromARGB(255, 190, 146, 160);
+Color ITEMCOLOR = const Color.fromARGB(255, 0, 0, 0);
+Color BUTTONCOLOR = const Color.fromARGB(204, 172, 123, 132);
+Color PINKBACKGROUND = const Color.fromARGB(255, 240, 229, 229);
+Color TEXTCOLOR = const Color.fromARGB(255, 79, 98, 114);
+Color SHADOWCOLOR = const Color.fromARGB(255, 0, 0, 0);
+Color TEXTWHITE = const Color.fromARGB(0, 0, 0, 0);
 late List<Venue> VENUES;
--- a/lib/login/CreateAccountPage.dart
+++ b/lib/login/CreateAccountPage.dart
@ -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;
        }
      });
    });
--- a/lib/login/signInPage.dart
+++ b/lib/login/signInPage.dart
@ -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(
--- a/pubspec.lock
+++ b/pubspec.lock
@ -658,6 +658,34 @@ packages:
      url: "https://pub.dartlang.org"
    source: hosted
    version: "2.1.1"
+  webview_flutter:
+    dependency: "direct main"
+    description:
+      name: webview_flutter
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.4"
+  webview_flutter_android:
+    dependency: transitive
+    description:
+      name: webview_flutter_android
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.8.8"
+  webview_flutter_platform_interface:
+    dependency: transitive
+    description:
+      name: webview_flutter_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.8.1"
+  webview_flutter_wkwebview:
+    dependency: transitive
+    description:
+      name: webview_flutter_wkwebview
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.7.5"
  win32:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -45,6 +45,7 @@ dependencies:
  google_fonts: ^2.3.2
  flutter_signin_button: ^2.0.0
  provider: ^5.0.0
+  webview_flutter: ^3.0.0

  #Google Sign-in
  firebase_auth: ^1.1.4
Author	SHA1	Message	Date
stjertnylle	fc28c983fd	reorganize and global colors introduced	2022-05-19 12:28:09 +02:00
stjertnylle	910e48dfba	Merge branch 'shas6395-ShadowMap' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into LoginPage Conflicts: .dart_tool/package_config.json .packages lib/globals.dart	2022-05-19 11:17:44 +02:00
stjertnylle	dd5d716275	added global colors to ease changes in colorschemes	2022-05-19 11:01:51 +02:00
Shakir	48a1fbc766	Added ShadowMap widget	2022-05-17 18:07:41 +02:00