Commit Graph

57 Commits

Author SHA1 Message Date
ecc446d44d Completed signin with gmail 2022-05-24 13:13:25 +02:00
87159d7532 Merge branch 'master' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into LoginPage
 Conflicts:
	.dart_tool/package_config.json
	.flutter-plugins-dependencies
	.packages
	build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/App
	lib/HomePage.dart
	lib/Map.dart
2022-05-24 12:59:37 +02:00
3d1884bbc5 Implemented FavoritePage, users can now see favorites and remove them 2022-05-24 12:04:40 +02:00
Shakir
6821e0520d * Integrated ShadowDetector with markers. 2022-05-23 19:34:23 +02:00
Nikolina Sandstedt
89ba4c746e lade till filterknapp på karta 2022-05-23 13:15:45 +02:00
Nikolina Sandstedt
31faf12df7 ändrade home knappen 2022-05-23 11:38:23 +02:00
Shakir
e2bab36392 * Modified ShadowDetector to be able to take a list of venues, and return a list with the shade status for venues.
* Added WebScraper class.
2022-05-22 13:10:30 +02:00
66f79dcdb7 push some changes 2022-05-20 13:44:44 +02:00
423ec364f2 merge to master 2022-05-20 13:40:17 +02:00
8f25b58f51 added boxes for markers 2022-05-20 13:37:51 +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
85695256fe reorganize and global colors introduced 2022-05-19 13:50:06 +02:00
Nikolina Sandstedt
5ab4b66ae2 checkout 2022-05-19 13:22:20 +02:00
Nikolina Sandstedt
278ed1c94d la till navigation för setting 2022-05-19 12:32:22 +02:00
b794c29bfd Merge branch 'shas6395-ShadowMap' of gitea.dsv.su.se:maze6343/pvt-project-google-maps into LoginPage
 Conflicts:
	lib/Map.dart
	lib/main.dart
2022-05-19 12:32:14 +02:00
fc28c983fd reorganize and global colors introduced 2022-05-19 12:28:09 +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
07233db4cd Added ShadowDetector 2022-05-19 11:53:53 +02:00
d47021c361 Added ShadowDetector 2022-05-19 11:49:59 +02:00
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
1eff7a91fa reorganize 2022-05-19 11:15:21 +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
50a3d59445 Added favoritepage - not yet fullt working,
venue-class
2022-05-18 14:33:39 +02:00
1c0e250036 push google_markers 2022-05-18 13:46:18 +02:00
3ec8f99248 added some changes 2022-05-18 13:43:21 +02:00
Adam Sundberg
5d07a72d45 minor change 2022-05-18 13:37:21 +02:00
96f31fa1df fix some problem 2022-05-17 12:11:50 +02:00
8044ca4ca5 added som plugins and get user location function 2022-05-17 11:02:21 +02:00
d272d8a32b connected feedback to database 2022-05-17 10:15:35 +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
83e14e1d5b google_markers (#6)
Reviewed-on: #6
2022-05-16 11:36:25 +02:00
3fb16f52ff get data from json file 2022-05-12 20:09:08 +02:00
adamlindroth
f04b853eed Untracked files 2022-05-12 11:44:52 +02:00
3cf3a4bef3 create new branch markers 2022-05-11 10:16:31 +02:00
ddfa92c557 added filerna för att göra git pull 2022-05-10 12:32:09 +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
1726da3504 pull from master to fix gitignore 2022-05-05 21:03:52 +02:00
7e4b3665b5 10 filer kvar 2022-05-05 21:02:47 +02:00
cc32f18f7c pull from master to fix gitignore 2022-05-05 16:29:28 +02:00
5666bc9185 gitignore 2022-05-05 16:18:33 +02:00
5d4779a4a2 update serach button 2022-05-05 15:35:41 +02:00
1c09deaf73 local 2022-05-04 21:48:56 +02:00
f06f883325 added search icon 2022-05-04 13:27:37 +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
c315640691 add some changes 2022-04-29 21:53:49 +02:00