Commit Graph

102 Commits

Author SHA1 Message Date
Nikolina Sandstedt
7ebb64a08f hamburgarmenyn hade försvunnit, så lade till den igen 2022-05-28 05:29:15 +02:00
Nikolina Sandstedt
26beaa855c fixade så att användare navigeras direkt till kartan 2022-05-28 04:49:56 +02:00
Nikolina Sandstedt
51fe8f7eb2 ändrade så att användaren tas direkt till kartan istället för hemskärmen 2022-05-28 04:41:58 +02:00
475e036c7f VenuInfo blabla 2022-05-27 11:30:28 +02:00
Shakir
992b4be7d0 VenueInfo 2022-05-26 20:51:03 +02:00
Adam Sundberg
9f359b944e Fixes for conflicts 2022-05-26 11:21:45 +02:00
Adam Sundberg
c5455eb2aa Merge branch 'master' into venue-page
# Conflicts:
#	lib/ListViewPage.dart
#	lib/Map.dart
#	lib/main.dart
2022-05-26 10:59:59 +02:00
Adam Sundberg
0c0600c493 Added list view 2022-05-26 10:39:45 +02:00
4aa63a77ae complete ManageAccountPage 2022-05-25 22:15:41 +02:00
b5de86173e update ManageAccountPage 2022-05-25 21:53:51 +02:00
adamlindroth
9260520cb8 Fixade konflikter 2022-05-25 15:27:42 +02:00
adamlindroth
c65e9e24a1 Strul 2022-05-25 15:21:02 +02:00
adamlindroth
2c186f202b Färdigställt filterrutan 2022-05-25 15:06:45 +02:00
Adam Sundberg
d41908c203 Added functionality for navigation in the app 2022-05-25 14:03:24 +02:00
Nikolina Sandstedt
e872f91013 ändrade font i create login 2022-05-25 12:34:36 +02:00
Nikolina Sandstedt
929eba0d70 fixade knapp i feedback 2022-05-25 12:16:13 +02:00
Nikolina Sandstedt
bc9172d75a fixade problem med merge 2022-05-25 12:02:58 +02:00
adamlindroth
b51ee4156b Mergade med master 2022-05-25 11:55:49 +02:00
adamlindroth
7165a96a2e Lade till en filterknapp i appbar 2022-05-25 11:45:08 +02:00
Nikolina Sandstedt
6493f99658 la till 2022-05-25 11:44:43 +02:00
Nikolina Sandstedt
9509d7565d la till hamburgarmeny 2022-05-25 11:18:03 +02:00
Adam Sundberg
66efb8117a Added support to creating VenueObjects from data 2022-05-25 10:44:56 +02:00
d86af8d2ae implement ManageAccountPage 2022-05-24 21:40:46 +02:00
adamlindroth
6593498f2c gitignore fuckar 2022-05-24 16:47:34 +02:00
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
04ef9f58f9 Completed signin with gmail 2022-05-24 12:50:45 +02:00
3d1884bbc5 Implemented FavoritePage, users can now see favorites and remove them 2022-05-24 12:04:40 +02:00
Shakir
866ee5398b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.flutter-plugins-dependencies
2022-05-23 19:39:41 +02:00
Shakir
6821e0520d * Integrated ShadowDetector with markers. 2022-05-23 19:34:23 +02:00
Nikolina Sandstedt
eb54c855f1 fixade feedback 2022-05-23 15:03:56 +02:00
Nikolina Sandstedt
89ba4c746e lade till filterknapp på karta 2022-05-23 13:15:45 +02:00
Nikolina Sandstedt
96fb318685 la till text 2022-05-23 11:44:32 +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
Shakir
2d614cfdb7 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.dart_tool/package_config.json
#	.dart_tool/package_config_subset
#	.flutter-plugins
#	.flutter-plugins-dependencies
#	.packages
#	lib/HomePage.dart
#	lib/Map.dart
2022-05-20 16:58:17 +02:00
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
Shakir
210fa0f058 Merge remote-tracking branch 'origin/LoginPage'
# Conflicts:
#	.dart_tool/package_config.json
#	.dart_tool/package_config_subset
#	.flutter-plugins
#	.flutter-plugins-dependencies
#	.packages
2022-05-19 20:39:12 +02:00
85695256fe reorganize and global colors introduced 2022-05-19 13:50:06 +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
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
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