Commit Graph

56 Commits

Author SHA1 Message Date
423ec364f2 merge to master 2022-05-20 13:40:17 +02:00
Nikolina Sandstedt
783e1913af lade till snackbar 2022-05-20 12:12:27 +02:00
Nikolina Sandstedt
ab8bb89d9e ändrade fonts 2022-05-20 10:33:22 +02:00
4b8d37867f added merkers info window 2022-05-20 09:29:20 +02:00
Nikolina Sandstedt
6ebfe8d7fd made som changes with user feedback 2022-05-20 07:53:23 +02:00
Nikolina Sandstedt
278ed1c94d la till navigation för setting 2022-05-19 12:32:22 +02:00
45a00b6db8 Merge remote-tracking branch 'origin/shas6395-ShadowMap'
# Conflicts:
#	.dart_tool/package_config.json
#	.dart_tool/package_config_subset
#	.flutter-plugins
#	.flutter-plugins-dependencies
#	.packages
#	lib/HomePage.dart
2022-05-19 11:55:25 +02:00
f772e0c8e5 Merge remote-tracking branch 'origin/shas6395-ShadowMap' 2022-05-19 11:50:55 +02:00
d47021c361 Added ShadowDetector 2022-05-19 11:49:59 +02:00
dd5d716275 added global colors to ease changes in colorschemes 2022-05-19 11:01:51 +02:00
c0419bca8b added information on bottom sheet 2022-05-18 20:53:07 +02:00
1c0e250036 push google_markers 2022-05-18 13:46:18 +02:00
Adam Sundberg
1dbf5befed Fixed conflict 'pubspec.yaml' 2022-05-18 12:56:17 +02:00
Adam Sundberg
555e509a2b Design with dedicated FA-icons and text status 2022-05-18 12:41:38 +02:00
Shakir
48a1fbc766 Added ShadowMap widget 2022-05-17 18:07:41 +02:00
8044ca4ca5 added som plugins and get user location function 2022-05-17 11:02:21 +02:00
8f6ac6273c Merge branch 'master' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into LoginPage
 Conflicts:
	.dart_tool/flutter_build/135902ccfd9441c8b100a2259407ace7/.filecache
	.dart_tool/flutter_build/135902ccfd9441c8b100a2259407ace7/app.dill
	.dart_tool/flutter_build/135902ccfd9441c8b100a2259407ace7/debug_ios_bundle_flutter_assets.stamp
	.dart_tool/flutter_build/135902ccfd9441c8b100a2259407ace7/flutter_assets.d
	.dart_tool/flutter_build/135902ccfd9441c8b100a2259407ace7/kernel_snapshot.d
	.dart_tool/flutter_build/135902ccfd9441c8b100a2259407ace7/kernel_snapshot.stamp
	.dart_tool/flutter_build/135902ccfd9441c8b100a2259407ace7/outputs.json
	.dart_tool/package_config.json
	.dart_tool/package_config_subset
	.flutter-plugins
	.flutter-plugins-dependencies
	.packages
	build/ios/Debug-iphonesimulator/App.framework/App
	build/ios/Debug-iphonesimulator/App.framework/_CodeSignature/CodeResources
	build/ios/Debug-iphonesimulator/App.framework/flutter_assets/AssetManifest.json
	build/ios/Debug-iphonesimulator/App.framework/flutter_assets/NOTICES.Z
	build/ios/Debug-iphonesimulator/App.framework/flutter_assets/kernel_blob.bin
	build/ios/Debug-iphonesimulator/Pods_Runner.framework/Pods_Runner
	build/ios/Debug-iphonesimulator/Pods_Runner.framework/_CodeSignature/CodeDirectory
	build/ios/Debug-iphonesimulator/Pods_Runner.framework/_CodeSignature/CodeRequirements-1
	build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/App
	build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources
	build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/AssetManifest.json
	build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/NOTICES.Z
	build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/kernel_blob.bin
	build/ios/Debug-iphonesimulator/Runner.app/Runner
	build/ios/Debug-iphonesimulator/Runner.app/_CodeSignature/CodeResources
	build/ios/Debug-iphonesimulator/Runner.swiftmodule/x86_64-apple-ios-simulator.swiftmodule
	build/ios/Debug-iphonesimulator/google_maps_flutter/google_maps_flutter.framework/_CodeSignature/CodeDirectory
	build/ios/Debug-iphonesimulator/google_maps_flutter/google_maps_flutter.framework/_CodeSignature/CodeRequirements-1
	build/ios/Debug-iphonesimulator/google_maps_flutter/google_maps_flutter.framework/google_maps_flutter
	build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/App
	build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources
	build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/AssetManifest.json
	build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/NOTICES.Z
	build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/kernel_blob.bin
	build/ios/iphonesimulator/Runner.app/Runner
	build/ios/iphonesimulator/Runner.app/_CodeSignature/CodeResources
	ios/Podfile.lock
	pubspec.lock
2022-05-17 08:59:36 +02:00
3e0abe57b4 Merge branch 'master' into venue-page 2022-05-16 17:30:40 +02:00
Adam Sundberg
acb80a6d33 minor change for conflict 2022-05-16 17:28:01 +02:00
Adam Sundberg
bd41f97e13 Added support for fetching current weather 2022-05-16 17:14:37 +02:00
83e14e1d5b google_markers (#6)
Reviewed-on: #6
2022-05-16 11:36:25 +02:00
fb4fa23ce6 do merge 2022-05-16 11:34:33 +02:00
f033c16bd7 Merge branch 'master' into map-page 2022-05-16 11:29:26 +02:00
d6b1c31a2e added create account functionality, users will be added to database 2022-05-13 13:46:31 +02:00
3fb16f52ff get data from json file 2022-05-12 20:09:08 +02:00
adamlindroth
19ab7e6c60 Lägger till CreateAccountPage 2022-05-12 13:43:28 +02:00
adamlindroth
15fc0bc7eb Merge med mårtens branch 2022-05-12 13:30:20 +02:00
adamlindroth
f04b853eed Untracked files 2022-05-12 11:44:52 +02:00
5cf8d57a3d added class user, updated loginpage 2022-05-12 11:05:14 +02:00
adamlindroth
5559a07af8 lade till google sign-in 2022-05-12 11:00:11 +02:00
34827a36a9 Update 'lib/FeedbackPage.dart' 2022-05-11 16:51:13 +02:00
3e28e9022a added class user, updated loginpage 2022-05-11 15:35:46 +02:00
3cf3a4bef3 create new branch markers 2022-05-11 10:16:31 +02:00
adamlindroth
c66ef6020f Fixade onPressed på sign in knappen 2022-05-09 14:17:47 +02:00
adamlindroth
a49fae40d8 Skapade LoginPage 2022-05-09 14:14:33 +02:00
df342d5b14 added login functionality 2022-05-09 10:26:21 +02:00
8343e823cf göra merge för att få hjälp med google search places från Adam S 2022-05-06 10:18:36 +02:00
82d8d72877 add all file to fix gitignore 2022-05-05 21:04:54 +02:00
5d4779a4a2 update serach button 2022-05-05 15:35:41 +02:00
Adam Sundberg
9e0bb82511 First edition venuePage 2022-05-05 12:56:34 +02:00
f06f883325 added search icon 2022-05-04 13:27:37 +02:00
Adam Sundberg
298518ad7d Basic setup of VenuePage 2022-05-04 09:40:10 +02:00
Ceasarna
d190b23b81 SettingsPage. Design klar 2022-05-04 08:27:14 +02:00
Ceasarna
df9dc9ab3d SettingsPage, en början 2022-05-03 10:36:52 +02:00
2b92ae49c2 added new files and new changes to the project 2022-05-01 11:36:13 +02:00
1755304e49 add some changes to map page 2022-04-29 22:50:03 +02:00
Shakir
b3a31fa6a9 made some changes to homepage design 2022-04-29 14:59:02 +02:00
Shakir
3c0ecb1199 made some changes to homepage design 2022-04-29 14:55:04 +02:00
Shakir
4a46632d56 made some changes to homepage design 2022-04-29 14:52:30 +02:00
Shakir
8b255972ae Connected HomePage to MapPage 2022-04-29 14:02:13 +02:00