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

Cleaning #58

Merged
shas6395 merged 1 commits from shas6395----- into master 2022-06-01 13:12:41 +02:00
Conversation 0 Commits 1 Files Changed 29 +84 -168
29 changed files with 84 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f952e53581 - Show all commits

8
lib/BottomNavPage.dart → lib/bottom_nav_page.dart
View File

@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'Map.dart';
import 'FavoritePage.dart';
import 'SettingsPage.dart';
import 'map.dart';
import 'favorite_page.dart';
import 'settings_page.dart';
import 'globals.dart' as globals;
import 'ListViewPage.dart';
import 'list_view_page.dart';
class BottomNavPage extends StatefulWidget {
@override

6
lib/FavoritePage.dart → lib/favorite_page.dart
View File

@ -1,8 +1,8 @@
import 'package:flutter/material.dart';
import 'package:flutter_applicationdemo/venuePage.dart';
import 'Venue.dart';
import 'package:flutter_applicationdemo/venue_page.dart';
import 'venue.dart';
import 'globals.dart' as globals;
import 'login/signInPage.dart';
import 'login/sign_in_page.dart';
import 'mysql.dart';

4
lib/FeedbackPage.dart → lib/feedback_page.dart
View File

@ -1,8 +1,8 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter_applicationdemo/mysql.dart';
import 'BottomNavPage.dart';
import 'bottom_nav_page.dart';
import 'package:flutter/material.dart';
import 'Form.dart';
import 'form.dart';
Color _backgroundColor = const Color.fromARGB(255, 190, 146, 160);

0
lib/Form.dart → lib/form.dart
View File

12
lib/globals.dart
View File

@ -1,14 +1,14 @@
import 'package:flutter_applicationdemo/WeatherData.dart';
import 'package:flutter_applicationdemo/weather_data.dart';
import 'Venue.dart';
import 'package:flutter_applicationdemo/login/User.dart';
import '../login/User.dart';
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 'Venue.dart';
import 'home_page.dart';
import 'venue.dart';
import 'main.dart';
User LOGGED_IN_USER = User(0, "", "");

8
lib/HomePage.dart → lib/home_page.dart
View File

@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
import 'BottomNavPage.dart';
import 'login/CreateAccountPage.dart';
import 'login/signInPage.dart';
import 'package:flutter_applicationdemo/login/User.dart' as User;
import 'bottom_nav_page.dart';
import 'login/create_account_page.dart';
import 'login/sign_in_page.dart';
import 'package:flutter_applicationdemo/login/user.dart' as User;
import 'globals.dart' as globals;

4
lib/ListViewPage.dart → lib/list_view_page.dart
View File

@ -4,8 +4,8 @@ import 'package:google_fonts/google_fonts.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'globals.dart' as globals;
import 'package:flutter_applicationdemo/Venue.dart';
import 'VenuePage.dart';
import 'package:flutter_applicationdemo/venue.dart';
import 'venue_page.dart';
class ListViewPage extends StatefulWidget {
const ListViewPage({Key? key}) : super(key: key);

12
lib/login/CreateAccountPage.dart → lib/login/create_account_page.dart
View File

@ -1,16 +1,16 @@
// ignore_for_file: prefer_const_constructors
import 'package:flutter/material.dart';
import 'package:flutter_applicationdemo/BottomNavPage.dart';
import 'package:flutter_applicationdemo/login/EncryptData.dart';
import 'package:flutter_applicationdemo/bottom_nav_page.dart';
import 'package:flutter_applicationdemo/login/encrypt_data.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:flutter_applicationdemo/mysql.dart';
import 'package:flutter_applicationdemo/HomePage.dart';
import 'package:flutter_applicationdemo/home_page.dart';
import '../globals.dart' as globals;
import '../reusables/InputField.dart';
import 'User.dart';
import '../reusables/returnButton.dart';
import '../reusables/input_field.dart';
import 'user.dart';
import '../reusables/return_button.dart';
class CreateAccountPage extends StatefulWidget {
_CreateAccountPageState createState() => _CreateAccountPageState();

0
lib/login/EncryptData.dart → lib/login/encrypt_data.dart
View File

0
lib/login/GoogleSignInProvider.dart → lib/login/google_sign_in_provider.dart
View File

16
lib/login/signInPage.dart → lib/login/sign_in_page.dart
View File

@ -1,17 +1,17 @@
import 'dart:io';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_applicationdemo/login/EncryptData.dart';
import 'package:flutter_applicationdemo/BottomNavPage.dart';
import 'package:flutter_applicationdemo/login/encrypt_data.dart';
import 'package:flutter_applicationdemo/bottom_nav_page.dart';
import '../mysql.dart';
import '../HomePage.dart';
import '../home_page.dart';
import '../main.dart';
import 'User.dart';
import '../reusables/InputField.dart';
import '../reusables/returnButton.dart';
import 'user.dart';
import '../reusables/input_field.dart';
import '../reusables/return_button.dart';
import 'package:flutter_signin_button/flutter_signin_button.dart';
import 'GoogleSignInProvider.dart';
import 'CreateAccountPage.dart';
import 'google_sign_in_provider.dart';
import 'create_account_page.dart';
import 'package:provider/provider.dart';
import 'package:flutter_applicationdemo/globals.dart' as globals;

2
lib/login/User.dart → lib/login/user.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter_applicationdemo/Venue.dart';
import 'package:flutter_applicationdemo/venue.dart';
import 'package:flutter_applicationdemo/mysql.dart';
import 'package:flutter_applicationdemo/globals.dart' as globals;

18
lib/main.dart
View File

@ -5,20 +5,20 @@ import 'dart:io';
import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/material.dart';
import 'package:firebase_core/firebase_core.dart';
import 'package:flutter_applicationdemo/ShadowDetector.dart';
import 'package:flutter_applicationdemo/login/GoogleSignInProvider.dart';
import 'package:flutter_applicationdemo/shadow_detector.dart';
import 'package:flutter_applicationdemo/login/google_sign_in_provider.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:flutter_applicationdemo/login/GoogleSignInProvider.dart';
import 'package:flutter_applicationdemo/login/google_sign_in_provider.dart';
import 'package:provider/provider.dart';
import 'package:http/http.dart' as http;
import 'BottomNavPage.dart';
import 'Map.dart';
import 'WeatherData.dart';
import 'Venue.dart';
import 'bottom_nav_page.dart';
import 'map.dart';
import 'weather_data.dart';
import 'venue.dart';
import 'mysql.dart';
import 'package:flutter_applicationdemo/login/User.dart';
import 'login/User.dart';
import 'package:flutter_applicationdemo/login/user.dart';
import 'login/user.dart';
import 'globals.dart' as globals;
void main() async {

6
lib/ManageAccountPage.dart → lib/manage_account_page.dart
View File

@ -1,9 +1,9 @@
import 'package:flutter/material.dart';
import 'package:flutter_applicationdemo/login/EncryptData.dart';
import 'package:flutter_applicationdemo/reusables/InputField.dart';
import 'package:flutter_applicationdemo/login/encrypt_data.dart';
import 'package:flutter_applicationdemo/reusables/input_field.dart';
import 'package:flutter_applicationdemo/mysql.dart';
import 'HomePage.dart';
import 'home_page.dart';
class ManageAccountPage extends StatefulWidget {
@override

44
lib/Map.dart → lib/map.dart
View File

@ -1,23 +1,22 @@
import 'package:flutter/material.dart';
import 'package:flutter_applicationdemo/BottomNavPage.dart';
import 'package:flutter_applicationdemo/WebScraper.dart';
import 'package:flutter_applicationdemo/bottom_nav_page.dart';
import 'package:google_fonts/google_fonts.dart';
import 'dart:async';
import 'login/User.dart';
import 'login/user.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:flutter_google_places/flutter_google_places.dart';
import 'package:location/location.dart';
import 'package:flutter_applicationdemo/login/User.dart';
import 'SettingsPage.dart';
import 'venuePage.dart';
import 'Venue.dart';
import 'package:flutter_applicationdemo/login/user.dart';
import 'settings_page.dart';
import 'venue_page.dart';
import 'venue.dart';
import 'globals.dart' as globals;
import 'package:syncfusion_flutter_sliders/sliders.dart';
import 'FeedbackPage.dart';
import 'login/CreateAccountPage.dart';
import 'login/signInPage.dart';
import 'feedback_page.dart';
import 'login/create_account_page.dart';
import 'login/sign_in_page.dart';
class Map extends StatefulWidget {
@override
@ -63,25 +62,6 @@ class MapState extends State<Map> {
hiddenVenues.addAll(globals.VENUES);
}
void createBottomSheet(String venueName) async {
var webScraper = WebScraper();
await webScraper.getWebsiteData(venueName);
Scaffold.of(context).showBottomSheet<void>(((context) {
return Container(
height: 420,
color: Colors.white,
child: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Text(webScraper.openingHoursThisWeek.length.toString()),
],
)),
);
}));
}
Future<LocationData> _getLocationPermission() async {
Location location = Location();
@ -170,8 +150,6 @@ class MapState extends State<Map> {
closeBottomSheetIfOpen();
},
),
// ElevatedButton(onPressed: () {} //_handelPressButton
// ,child: const Text("Search Placses"))
],
),
floatingActionButton: Padding(
@ -362,7 +340,7 @@ class MapState extends State<Map> {
Marker marker = Marker(
markerId: MarkerId(globals.VENUES[i].venueID.toString()),
position: globals.VENUES[i].position,
onTap: () => createBottomDrawer(globals.VENUES[i]),
onTap: () => createBottomSheet(globals.VENUES[i]),
icon: globals.VENUES[i].drawIconColor());
globals.VENUES[i].isShownOnMap = true;
closeByMarkersList.add(marker);
@ -370,7 +348,7 @@ class MapState extends State<Map> {
}
}
createBottomDrawer(Venue venue) async {
createBottomSheet(Venue venue) async {
_bottomSheetIsOpen = true;
// Scaffold.of(context).showBottomSheet<void>(((context) {
showModalBottomSheet(

0
lib/ShadowMap.dart → lib/nonusables/shadow_map.dart
View File

0
lib/WebScraper.dart → lib/nonusables/web_scraper.dart
View File

0
lib/reusables/InputField.dart → lib/reusables/input_field.dart
View File

2
lib/reusables/returnButton.dart → lib/reusables/return_button.dart
View File

@ -1,6 +1,6 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_applicationdemo/HomePage.dart';
import 'package:flutter_applicationdemo/home_page.dart';
class ReturnButton extends StatelessWidget {
final onPressed;

10
lib/SettingsPage.dart → lib/settings_page.dart
View File

@ -1,14 +1,14 @@
import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_applicationdemo/BottomNavPage.dart';
import 'package:flutter_applicationdemo/login/GoogleSignInProvider.dart';
import 'package:flutter_applicationdemo/bottom_nav_page.dart';
import 'package:flutter_applicationdemo/login/google_sign_in_provider.dart';
import 'package:google_sign_in/google_sign_in.dart';
import 'package:settings_ui/settings_ui.dart';
import 'ManageAccountPage.dart';
import 'login/GoogleSignInProvider.dart';
import 'manage_account_page.dart';
import 'login/google_sign_in_provider.dart';
import 'package:provider/provider.dart';
import 'FeedbackPage.dart';
import 'feedback_page.dart';
// Standard color of app
Color _backgroundColor = const Color.fromARGB(255, 190, 146, 160);

2
lib/ShadowDetector.dart → lib/shadow_detector.dart
View File

@ -2,7 +2,7 @@
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:http/http.dart';
import 'dart:async';
import 'Venue.dart';
import 'venue.dart';
class ShadowDetector {

2
lib/Venue.dart → lib/venue.dart
View File

@ -1,6 +1,6 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_applicationdemo/ShadowDetector.dart';
import 'package:flutter_applicationdemo/shadow_detector.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
class Venue {

64
lib/VenueInfo.dart → lib/venue_info.dart
View File

@ -5,7 +5,7 @@ import 'package:html/dom.dart' as dom;
import 'package:intl/intl.dart';
import 'dart:io';
import 'Venue.dart';
import 'venue.dart';
class VenueInfo {
@ -66,55 +66,6 @@ class VenueInfo {
}
}
/*Future getVenueInfo(String venueName) async {
final fourSquareURL =
Uri.parse('https://foursquare.com/explore?mode=url&near=Stockholm%2C%20Sweden&nearGeoId=72057594040601666&q=$venueName');
final response1 = await http.get(fourSquareURL);
if(response1.statusCode == 200) {
dom.Document html = dom.Document.html(response1.body);
var fsqId = html.getElementsByClassName('card singleRecommendation hasPhoto tipWithLogging leftPhotoLayout').map((e) => e.attributes['data-id']).toList()[0];
final response2 = await http.get(
Uri.parse('https://api.foursquare.com/v3/places/$fsqId?fields=price%2Crating%2Cphotos%2Chours%2Cstats%2Ctastes'),
headers: {
HttpHeaders.authorizationHeader: 'fsq3LBbeZ8imQK8X1hov7DTb9F64Xs1fs2bojHQ99QNm4TE='
},
);
if(response2.statusCode == 200) {
Map data = jsonDecode(response2.body);
if(data['price'] != null) {
_priceClass = data['price'];
}
if(data['rating'] != null) {
_rating = data['rating'];
}
if(data['photos'][0] != null) {
_photos = data['photos'][0];
}
if(data['hours']['open now'] != null) {
_openNow = data['hours']['open_now'];
}
if(data['stats']['total_ratings'] != null) {
_totalRatings = data['stats']['total_ratings'];
}
if(data['hours']['display'] != null) {
_openHoursToday = data['hours']['display'];
}
}
else {
throw const HttpException("No connection to api.foursquare.com");
}
}
else {
throw const HttpException("No connection to foursquare.com");
}
}*/
String getPopularHoursToday() {
var today = DateFormat('EEEE').format(DateTime.now());
if(_hoursPopular.isEmpty) {
@ -189,17 +140,4 @@ class VenueInfo {
String getVenueURL () {
return 'https://api.foursquare.com$_fsqLink';
}
}
enum WeekDays {
monday,
tuesday,
wednesday,
thursday,
friday,
saturday,
sunday,
}

16
lib/venuePage.dart → lib/venue_page.dart
View File

@ -2,14 +2,14 @@ import 'dart:convert';
import 'dart:io';
import 'package:share_plus/share_plus.dart';
import 'package:flutter_applicationdemo/Venue.dart';
import 'package:flutter_applicationdemo/venue.dart';
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:http/http.dart' as http;
import 'VenueInfo.dart';
import 'WeatherData.dart';
import 'venue_info.dart';
import 'weather_data.dart';
import 'globals.dart' as globals;
import 'Venue.dart';
import 'venue.dart';
// Color _backgroundColor = const Color(0xffac7b84);
@ -38,9 +38,9 @@ class VenuePageState extends State<VenuePage> {
}
Future gatherVenueInfo() async {
VenueInfo vu = VenueInfo();
venueInfo = vu;
venueInfo = await vu.getVenueInfo(venue);
VenueInfo vi = VenueInfo();
venueInfo = vi;
venueInfo = await vi.getVenueInfo(venue);
}
Future refreshWeather() async {
@ -264,7 +264,7 @@ class LikeVenueButton extends StatelessWidget {
),
label: const Text('Like place'),
style: TextButton.styleFrom(
primary: Color(0xff4f6272),
primary: const Color(0xff4f6272),
),
));
}

0
lib/WeatherData.dart → lib/weather_data.dart
View File

4
test/ListViewPageTest.dart → test/list_view_page_test.dart
View File

@ -1,8 +1,8 @@
import 'dart:math';
import 'package:flutter_applicationdemo/ListViewPage.dart';
import 'package:flutter_applicationdemo/Venue.dart';
import 'package:flutter_applicationdemo/list_view_page.dart';
import 'package:flutter_applicationdemo/venue.dart';
import 'package:flutter_applicationdemo/globals.dart' as globals;
import 'package:google_maps_flutter/google_maps_flutter.dart';

2
test/ManageAccountPage_test.dart → test/manage_account_page_test.dart
View File

@ -1,5 +1,5 @@
import 'package:test/test.dart';
import 'package:flutter_applicationdemo/ManageAccountPage.dart';
import 'package:flutter_applicationdemo/manage_account_page.dart';
void main() {
group('ManageAccountPage', () {

4
test/venue_info_test.dart
View File

@ -1,6 +1,6 @@
import 'package:flutter_applicationdemo/Venue.dart';
import 'package:flutter_applicationdemo/venue.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_applicationdemo/VenueInfo.dart';
import 'package:flutter_applicationdemo/venue_info.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
main() {

6
test/VenuePageTest.dart → test/venue_page_test.dart
View File

@ -1,6 +1,6 @@
import 'package:flutter_applicationdemo/Venue.dart';
import 'package:flutter_applicationdemo/WeatherData.dart';
import 'package:flutter_applicationdemo/venuePage.dart';
import 'package:flutter_applicationdemo/venue.dart';
import 'package:flutter_applicationdemo/weather_data.dart';
import 'package:flutter_applicationdemo/venue_page.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:test/test.dart';