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

ändrade fonts #20

Merged
nisa9769 merged 1 commits from newFeedbackBranch into master 2022-05-20 10:34:30 +02:00
Conversation 0 Commits 1 Files Changed 8 +32 -60
8 changed files with 32 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.dart_tool/package_config.json
View File

@ -243,7 +243,7 @@
}, },
{ {
"name": "google_fonts", "name": "google_fonts",
"rootUri": "file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_fonts-2.3.2", "rootUri": "file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_fonts-2.3.3",
"packageUri": "lib/", "packageUri": "lib/",
"languageVersion": "2.12" "languageVersion": "2.12"
}, },
@ -255,7 +255,7 @@
}, },
{ {
"name": "google_maps_flutter_platform_interface", "name": "google_maps_flutter_platform_interface",
"rootUri": "file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter_platform_interface-2.1.5", "rootUri": "file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter_platform_interface-2.1.6",
"packageUri": "lib/", "packageUri": "lib/",
"languageVersion": "2.12" "languageVersion": "2.12"
}, },
@ -279,7 +279,7 @@
}, },
{ {
"name": "google_sign_in_ios", "name": "google_sign_in_ios",
"rootUri": "file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_ios-5.2.7", "rootUri": "file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_ios-5.3.1",
"packageUri": "lib/", "packageUri": "lib/",
"languageVersion": "2.14" "languageVersion": "2.14"
}, },
@ -656,7 +656,7 @@
"languageVersion": "2.16" "languageVersion": "2.16"
} }
], ],
"generated": "2022-05-19T11:16:41.835067Z", "generated": "2022-05-20T08:15:04.120257Z",
"generator": "pub", "generator": "pub",
"generatorVersion": "2.16.2" "generatorVersion": "2.16.2"
} }

12
.dart_tool/package_config_subset
View File

@ -152,16 +152,16 @@ file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartl
file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_api_headers-1.3.0/lib/ file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_api_headers-1.3.0/lib/
google_fonts google_fonts
2.12 2.12
file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_fonts-2.3.2/ file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_fonts-2.3.3/
file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_fonts-2.3.2/lib/ file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_fonts-2.3.3/lib/
google_maps_flutter google_maps_flutter
2.14 2.14
file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter-2.1.5/ file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter-2.1.5/
file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter-2.1.5/lib/ file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter-2.1.5/lib/
google_maps_flutter_platform_interface google_maps_flutter_platform_interface
2.12 2.12
file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter_platform_interface-2.1.5/ file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter_platform_interface-2.1.6/
file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter_platform_interface-2.1.5/lib/ file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter_platform_interface-2.1.6/lib/
google_maps_webservice google_maps_webservice
2.12 2.12
file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_webservice-0.0.20-nullsafety.5/ file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_webservice-0.0.20-nullsafety.5/
@ -176,8 +176,8 @@ file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartl
file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_android-5.2.7/lib/ file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_android-5.2.7/lib/
google_sign_in_ios google_sign_in_ios
2.14 2.14
file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_ios-5.2.7/ file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_ios-5.3.1/
file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_ios-5.2.7/lib/ file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_ios-5.3.1/lib/
google_sign_in_platform_interface google_sign_in_platform_interface
2.12 2.12
file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_platform_interface-2.1.3/ file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_platform_interface-2.1.3/

2
.flutter-plugins
View File

@ -15,7 +15,7 @@ google_api_headers=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\
google_maps_flutter=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_maps_flutter-2.1.5\\ google_maps_flutter=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_maps_flutter-2.1.5\\
google_sign_in=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_sign_in-5.3.1\\ google_sign_in=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_sign_in-5.3.1\\
google_sign_in_android=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_sign_in_android-5.2.7\\ google_sign_in_android=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_sign_in_android-5.2.7\\
google_sign_in_ios=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_sign_in_ios-5.2.7\\ google_sign_in_ios=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_sign_in_ios-5.3.1\\
google_sign_in_web=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_sign_in_web-0.10.1+2\\ google_sign_in_web=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\google_sign_in_web-0.10.1+2\\
location=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\location-4.4.0\\ location=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\location-4.4.0\\
location_web=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\location_web-3.1.1\\ location_web=C:\\src\\flutter_windows_2.10.5-stable\\flutter\\.pub-cache\\hosted\\pub.dartlang.org\\location_web-3.1.1\\

2
.flutter-plugins-dependencies
View File

File diff suppressed because one or more lines are too long

8
.packages
View File

@ -3,7 +3,7 @@
# #
# For more info see: https://dart.dev/go/dot-packages-deprecation # For more info see: https://dart.dev/go/dot-packages-deprecation
# #
# Generated by pub on 2022-05-19 13:16:41.821064. # Generated by pub on 2022-05-20 10:15:04.107254.
archive:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/archive-3.3.0/lib/ archive:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/archive-3.3.0/lib/
args:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/args-2.3.1/lib/ args:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/args-2.3.1/lib/
async:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.8.2/lib/ async:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.8.2/lib/
@ -44,13 +44,13 @@ geolocator_web:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/h
geolocator_windows:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/geolocator_windows-0.1.1/lib/ geolocator_windows:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/geolocator_windows-0.1.1/lib/
get:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/get-4.6.3/lib/ get:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/get-4.6.3/lib/
google_api_headers:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_api_headers-1.3.0/lib/ google_api_headers:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_api_headers-1.3.0/lib/
google_fonts:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_fonts-2.3.2/lib/ google_fonts:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_fonts-2.3.3/lib/
google_maps_flutter:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter-2.1.5/lib/ google_maps_flutter:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter-2.1.5/lib/
google_maps_flutter_platform_interface:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter_platform_interface-2.1.5/lib/ google_maps_flutter_platform_interface:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_flutter_platform_interface-2.1.6/lib/
google_maps_webservice:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_webservice-0.0.20-nullsafety.5/lib/ google_maps_webservice:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_maps_webservice-0.0.20-nullsafety.5/lib/
google_sign_in:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in-5.3.1/lib/ google_sign_in:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in-5.3.1/lib/
google_sign_in_android:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_android-5.2.7/lib/ google_sign_in_android:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_android-5.2.7/lib/
google_sign_in_ios:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_ios-5.2.7/lib/ google_sign_in_ios:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_ios-5.3.1/lib/
google_sign_in_platform_interface:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_platform_interface-2.1.3/lib/ google_sign_in_platform_interface:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_platform_interface-2.1.3/lib/
google_sign_in_web:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_web-0.10.1+2/lib/ google_sign_in_web:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in_web-0.10.1+2/lib/
http:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.13.4/lib/ http:file:///C:/src/flutter_windows_2.10.5-stable/flutter/.pub-cache/hosted/pub.dartlang.org/http-0.13.4/lib/

30
lib/HomePage.dart
View File

@ -1,4 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
import 'BottomNavPage.dart'; import 'BottomNavPage.dart';
import 'package:flutter_applicationdemo/CreateAccountPage.dart'; import 'package:flutter_applicationdemo/CreateAccountPage.dart';
import 'globals.dart'; import 'globals.dart';
@ -26,36 +27,25 @@ class _HomePageState extends State<HomePage> {
padding: EdgeInsets.fromLTRB(80, 80, 80, 0), padding: EdgeInsets.fromLTRB(80, 80, 80, 0),
child: Text( child: Text(
'Sun Chasers', 'Sun Chasers',
style: TextStyle( style: GoogleFonts.libreBaskerville(
fontSize: 40, fontSize: 35,
color: globals.TEXTCOLOR, color: globals.TEXTCOLOR,
shadows: <Shadow>[
Shadow(
offset: Offset(2, 2),
blurRadius: 10.0,
color: Color.fromARGB(255, 0, 0, 0),
),
],
), ),
), ),
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
Text( Text(
'The #1 Sunny Spot Finder', 'The #1 Sunny Spot Finder',
style: TextStyle( style: GoogleFonts.libreBaskerville(
fontSize: 25, fontSize: 20,
color: globals.TEXTCOLOR, fontWeight: FontWeight. bold,
shadows: <Shadow>[ color: globals.TEXTCOLOR,
Shadow(
offset: Offset(2, 2),
blurRadius: 12.5,
color: globals.SHADOWCOLOR,
),
]
), ),
), ),
Container( Container(
padding: EdgeInsets.fromLTRB(80, 40, 80, 80), padding: EdgeInsets.fromLTRB(80, 40, 80, 80),
child: ElevatedButton( child: ElevatedButton(

24
lib/SettingsPage.dart
View File

@ -240,14 +240,8 @@ class _SettingsPageState extends State<SettingsPage> {
'Manage account', 'Manage account',
style: TextStyle( style: TextStyle(
fontSize: 20, fontSize: 20,
fontWeight: FontWeight. bold,
color: Colors.black, color: Colors.black,
shadows: <Shadow>[
Shadow(
offset: Offset(2, 2),
blurRadius: 12.5,
color: Color.fromARGB(255, 0, 0, 0),
),
],
), ),
), ),
), ),
@ -271,14 +265,8 @@ class _SettingsPageState extends State<SettingsPage> {
'Leave feedback', 'Leave feedback',
style: TextStyle( style: TextStyle(
fontSize: 20, fontSize: 20,
fontWeight: FontWeight. bold,
color: Colors.black, color: Colors.black,
shadows: <Shadow>[
Shadow(
offset: Offset(2, 2),
blurRadius: 12.5,
color: Color.fromARGB(255, 0, 0, 0),
),
],
), ),
), ),
), ),
@ -302,14 +290,8 @@ class _SettingsPageState extends State<SettingsPage> {
'Log out', 'Log out',
style: TextStyle( style: TextStyle(
fontSize: 20, fontSize: 20,
fontWeight: FontWeight. bold,
color: Colors.black, color: Colors.black,
shadows: <Shadow>[
Shadow(
offset: Offset(2, 2),
blurRadius: 12.5,
color: Color.fromARGB(255, 0, 0, 0),
),
],
), ),
), ),
), ),

6
pubspec.lock
View File

@ -281,7 +281,7 @@ packages:
name: google_fonts name: google_fonts
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.3.2" version: "2.3.3"
google_maps_flutter: google_maps_flutter:
dependency: "direct main" dependency: "direct main"
description: description:
@ -295,7 +295,7 @@ packages:
name: google_maps_flutter_platform_interface name: google_maps_flutter_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.5" version: "2.1.6"
google_maps_webservice: google_maps_webservice:
dependency: transitive dependency: transitive
description: description:
@ -323,7 +323,7 @@ packages:
name: google_sign_in_ios name: google_sign_in_ios
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "5.2.7" version: "5.3.1"
google_sign_in_platform_interface: google_sign_in_platform_interface:
dependency: transitive dependency: transitive
description: description: