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

LoginPage #60

Merged
maen0574 merged 6 commits from LoginPage into master 2022-06-01 22:50:13 +02:00
Conversation 0 Commits 6 Files Changed 21 +96 -59
5 changed files with 96 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 049ca366e3 - Show all commits

49
lib/HomePage.dart
View File

@ -26,31 +26,23 @@ class _HomePageState extends State<HomePage> {
padding: EdgeInsets.fromLTRB(80, 80, 80, 0),
child: Text(
'Sun Chasers',
style: GoogleFonts.libreBaskerville(
fontSize: 35,
style: GoogleFonts.roboto(
fontSize: 52,
color: globals.TEXTCOLOR,
),
textAlign: TextAlign.center,
),
),
const SizedBox(height: 10),
Text(
'The #1 Sunny Spot Finder',
style: GoogleFonts.libreBaskerville(
fontSize: 20,
fontWeight: FontWeight. bold,
color: globals.TEXTCOLOR,
),
),
Container(
padding: EdgeInsets.fromLTRB(80, 40, 80, 80),
margin: EdgeInsets.fromLTRB(80, 80, 80, 80),
child: ElevatedButton(
style: ElevatedButton.styleFrom(
fixedSize: const Size(200, 200),
primary: globals.BUTTONCOLOR,
elevation: 100,
elevation: globals.elevation,
shape: const CircleBorder(),
),
onPressed: () {
@ -60,19 +52,12 @@ class _HomePageState extends State<HomePage> {
);
},
child: Text(
(globals.LOGGED_IN_USER.userID == 0 ? 'FIND SPOT BY LOCATION \n \n without signing in' : 'FIND SPOT BY LOCATION'),
(globals.LOGGED_IN_USER.userID == 0 ? '\nFIND SPOT BY LOCATION \n \n as guest' : 'FIND SPOT BY LOCATION'),
textAlign: TextAlign.center,
style: TextStyle(
fontSize: 18,
color: Colors.white,
shadows: <Shadow> [
Shadow(
offset: Offset(2, 2),
blurRadius: 10.0,
color: globals.SHADOWCOLOR,
),
]
),
),
),
@ -94,7 +79,7 @@ class _HomePageState extends State<HomePage> {
style: ElevatedButton.styleFrom(
fixedSize: const Size(200, 50),
primary: globals.BUTTONCOLOR,
elevation: 100,
elevation: globals.elevation,
),
onPressed: () {
Navigator.push(
@ -106,13 +91,7 @@ class _HomePageState extends State<HomePage> {
style: TextStyle(
fontSize: 18,
color: Colors.white,
shadows: <Shadow> [
Shadow(
offset: Offset(2, 2),
blurRadius: 10.0,
color: globals.SHADOWCOLOR,
),
])
)
),
),
Padding(padding: EdgeInsets.symmetric(horizontal: 10, vertical: 5)),
@ -120,7 +99,7 @@ class _HomePageState extends State<HomePage> {
style: ElevatedButton.styleFrom(
fixedSize: const Size(200, 50),
primary: globals.BUTTONCOLOR,
elevation: 100,
elevation: globals.elevation,
),
onPressed: () {
Navigator.push(
@ -132,13 +111,7 @@ class _HomePageState extends State<HomePage> {
style: TextStyle(
fontSize: 18,
color: Colors.white,
shadows: <Shadow> [
Shadow(
offset: Offset(2, 2),
blurRadius: 10.0,
color: Color.fromARGB(255, 0, 0, 0),
),
])
)
),
)
]
@ -151,7 +124,7 @@ class _HomePageState extends State<HomePage> {
style: ElevatedButton.styleFrom(
fixedSize: const Size(200, 50),
primary: globals.BUTTONCOLOR,
elevation: 100,
elevation: globals.elevation,
),
onPressed: () {
globals.LOGGED_IN_USER = User.User(0, "", "");

23
lib/Map.dart
View File

@ -444,20 +444,21 @@ class MapState extends State<Map> {
],
),
// columnCoveringRating(),
],
),
const SizedBox(
height: 20,
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Column(
children: const [
weatherIconRow(),
weatherStatusRow(),
],
),
],
),
const SizedBox(
height: 10,
),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
columnHandlingReadMoreButton(context, venue),
],
)
@ -487,7 +488,7 @@ class MapState extends State<Map> {
return ElevatedButton(
child: const Text(
'Read More',
style: TextStyle(fontSize: 18),
style: TextStyle(fontSize: 16),
),
onPressed: () {
Navigator.push(
@ -509,7 +510,7 @@ class MapState extends State<Map> {
textStyle: const TextStyle(
color: Colors.black87,
fontWeight: FontWeight.bold,
fontSize: 26,
fontSize: 20,
)),
),
Text(
@ -518,7 +519,7 @@ class MapState extends State<Map> {
textStyle: const TextStyle(
color: Colors.black,
fontWeight: FontWeight.w300,
fontSize: 20,
fontSize: 14,
)),
)
],

63
lib/VenueInfo.dart
View File

@ -2,13 +2,14 @@ import 'dart:convert';
import 'package:http/http.dart' as http;
import 'package:html/dom.dart' as dom;
import 'package:intl/intl.dart';
import 'dart:io';
import 'Venue.dart';
class VenueInfo {
static const photoSize = 'original'; //Can be replaced with custom size (Example Format: '300x400')
static const photoSize = '600x400'; //Can be replaced with custom size (Example Format: '300x400')
late String _photo = 'https://www.bing.com/th?id=OIP.ZSXrQuieNC-hoPC4kIv_vgAAAA&w=212&h=212&c=8&rs=1&qlt=90&o=6&dpr=1.35&pid=3.1&rm=2';
late int _priceClass = -1;
late double _rating = -1;
@ -17,6 +18,7 @@ class VenueInfo {
late String _openHoursToday = 'N/A';
late String _fsqLink;
late double _popularity = -1;
late List<dynamic> _hoursPopular = [];
VenueInfo();
@ -36,7 +38,7 @@ class VenueInfo {
if(results.isNotEmpty && data['results'][0]['link'] != null) {
_fsqLink = data['results'][0]['link'];
final response2 = await http.get(
Uri.parse('https://api.foursquare.com$_fsqLink?fields=price%2Crating%2Cphotos%2Chours%2Cstats%2Cpopularity'),
Uri.parse('https://api.foursquare.com$_fsqLink?fields=price%2Crating%2Cphotos%2Chours%2Cstats%2Cpopularity%2Chours_popular'),
headers: {
HttpHeaders.authorizationHeader: 'fsq3LBbeZ8imQK8X1hov7DTb9F64Xs1fs2bojHQ99QNm4TE=',
}
@ -51,6 +53,8 @@ class VenueInfo {
data['popularity'] != null ? _popularity = data['popularity']: null;
data['photos'][0]['prefix'] != null && data['photos'][0]['suffix'] != null ?
_photo = data['photos'][0]['prefix'] + photoSize + data['photos'][0]['suffix']: null;
_hoursPopular = data['hours_popular'] != null ? _hoursPopular = data['hours_popular']: null;
}
else {
throw const HttpException("No connection to api.foursquare.com");
@ -110,6 +114,46 @@ class VenueInfo {
}
}*/
String getPopularHoursToday() {
var today = DateFormat('EEEE').format(DateTime.now());
if(_hoursPopular.isEmpty) {
return 'N/A';
}
if(today == 'Monday') {
return findPopularHours(1);
}
if(today == 'Tuesday') {
return findPopularHours(2);
}
if(today == 'Wednesday') {
return findPopularHours(3);
}
if(today == 'Thursday') {
return findPopularHours(4);
}
if(today == 'Friday') {
return findPopularHours(5);
}
if(today == 'Saturday') {
return findPopularHours(6);
}
if(today == 'Sunday') {
return findPopularHours(7);
}
return 'N/A';
}
String findPopularHours(int dayNumber) {
String toReturn = '';
for(var h in _hoursPopular) {
if(h['day'] == dayNumber) {
toReturn += (h['open'] + '-' + h['close'] + '\n');
}
}
return toReturn;
}
String getRating() {
return _rating != -1 ? _rating.toString() + '/10': 'N/A';
}
@ -119,7 +163,7 @@ class VenueInfo {
}
String getOpenStatus() {
return _openNow ? 'Open now!': 'Closed';
return _openNow ? 'Yes': 'No';
}
String getOpeningHours() {
@ -145,4 +189,17 @@ class VenueInfo {
String getVenueURL () {
return 'https://api.foursquare.com$_fsqLink';
}
}
enum WeekDays {
monday,
tuesday,
wednesday,
thursday,
friday,
saturday,
sunday,
}

1
lib/globals.dart
View File

@ -19,6 +19,7 @@ Color PINKBACKGROUND = const Color.fromARGB(255, 240, 229, 229);
Color TEXTCOLOR = const Color.fromARGB(255, 79, 98, 114);
Color SHADOWCOLOR = const Color.fromARGB(255, 0, 0, 0);
Color TEXTWHITE = const Color.fromARGB(0, 0, 0, 0);
const double elevation = 5;
late List<Venue> VENUES = [];
late WeatherData forecast;

19
lib/venuePage.dart
View File

@ -190,14 +190,19 @@ class _AboutTheSpotTableState extends State<AboutTheSpotTable> {
label: Text('About the spot',
style: GoogleFonts.roboto(
textStyle: const TextStyle(
fontSize: 18,
fontSize: 14,
fontWeight: FontWeight.bold,
)))),
const DataColumn(label: Text('', style: TextStyle())),
],
rows: [
const DataRow(cells: [
DataCell(Text('Type of venue')),
DataCell(Text('Restaurant')),
DataRow(cells: [
DataCell(Text('Open?')),
DataCell(Text(widget.venueInfo.getOpenStatus())),
]),
DataRow(cells: [
DataCell(Text('Popularity')),
DataCell(Text(widget.venueInfo.getPopularity())),
]),
DataRow(cells: [
const DataCell(Text('Pricing')),
@ -210,9 +215,9 @@ class _AboutTheSpotTableState extends State<AboutTheSpotTable> {
widget.venueInfo.getTotalRatings().toString() +
' ratings)')),
]),
const DataRow(cells: [
DataCell(Text('Current activity')),
DataCell(Text('Moderate')),
DataRow(cells: [
DataCell(Text('Popular hours')),
DataCell(Text(widget.venueInfo.getPopularHoursToday())),
]),
DataRow(cells: [
const DataCell(Text('Opening hours')),