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

polished classes #55

Merged
maen0574 merged 1 commits from LoginPage into master 2022-05-30 17:37:41 +02:00
Conversation 0 Commits 1 Files Changed 8 +5 -48
8 changed files with 5 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5d1039d28b - Show all commits

10
lib/BottomNavPage.dart
View File

@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:google_maps_flutter_platform_interface/src/types/camera.dart';
import 'Map.dart';
import 'FavoritePage.dart';
import 'SettingsPage.dart';
@ -15,9 +14,8 @@ class BottomNavPageState extends State<BottomNavPage> {
int currentIndex = 0;
final screens = [
Map(),
ListViewPage(),
FavoritePage(),
SettingsPage(),
const ListViewPage(),
const FavoritePage(),
];
@override
Widget build(BuildContext context) {
@ -42,10 +40,6 @@ class BottomNavPageState extends State<BottomNavPage> {
icon: Icon(Icons.favorite),
label: "Liked",
),
BottomNavigationBarItem(
icon: Icon(Icons.settings),
label: "Settings",
),
]),
);
}

32
lib/FavoritePage.dart
View File

@ -1,36 +1,11 @@
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/Map.dart';
import 'package:flutter_applicationdemo/venuePage.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:google_sign_in/google_sign_in.dart';
import 'package:settings_ui/settings_ui.dart';
import 'ManageAccountPage.dart';
import 'package:provider/provider.dart';
import 'Venue.dart';
import 'globals.dart' as globals;
import 'Map.dart';
import 'package:flutter_applicationdemo/login/User.dart';
import 'HomePage.dart';
import 'Venue.dart';
import 'login/signInPage.dart';
import 'mysql.dart';
import 'globals.dart' as globals;
// Standard color of app
Color _backgroundColor = const Color.fromARGB(255, 190, 146, 160);
// Color status of priceRange
Color _colorContainerLow = Colors.yellow;
Color _colorContainerMedium = _backgroundColor;
Color _colorContainerHigh = _backgroundColor;
// Standard
@override
class FavoritePage extends StatefulWidget {
const FavoritePage({Key? key}) : super(key: key);
@ -47,6 +22,7 @@ class _FavoritePageState extends State<FavoritePage> {
length: 2,
child: Scaffold(
appBar: AppBar(
automaticallyImplyLeading: false,
title: Text("Liked"),
backgroundColor: globals.BACKGROUNDCOLOR,
),
@ -184,11 +160,7 @@ class _FavoritePageState extends State<FavoritePage> {
db.getConnection().then((conn){
String sql =
"DELETE from maen0574.userFavorites where user_id = '${globals.LOGGED_IN_USER.userID}' and venue_id = '${likedVenue.venueID}'";
conn.query(sql).then((results) {
for (var row in results) {
}
});
conn.query(sql).then((results) {});
});
}
}

1
lib/HomePage.dart
View File

@ -5,7 +5,6 @@ import 'login/CreateAccountPage.dart';
import 'login/signInPage.dart';
import 'package:flutter_applicationdemo/login/User.dart' as User;
import 'globals.dart' as globals;
import 'ManageAccountPage.dart';
class HomePage extends StatefulWidget {

1
lib/ListViewPage.dart
View File

@ -21,6 +21,7 @@ class _ListViewPageState extends State<ListViewPage> {
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
automaticallyImplyLeading: false,
title: const Text('Venues near you',),
backgroundColor: globals.BACKGROUNDCOLOR,
),

2
lib/Map.dart
View File

@ -392,7 +392,6 @@ class MapState extends State<Map> {
if(marker.position.longitude - _currentCameraPosition.target.longitude > 0.02 || marker.position.latitude - _currentCameraPosition.target.latitude > 0.02){
closeByMarkersList.remove(marker);
globals.getVenueByID(int.parse(marker.markerId.value))?.isShownOnMap = false;
//print(globals.getVenueByID(int.parse(marker.markerId.value))!.venueName + " " + globals.getVenueByID(int.parse(marker.markerId.value))!.venueID.toString());
i--;
}
}
@ -400,7 +399,6 @@ class MapState extends State<Map> {
void addMarkersInRange() {
for(int i = 0; i< globals.VENUES.length; i++){
print(hiddenVenues[i].venueName + " " + hiddenVenues[i].venueID.toString());
if(!globals.VENUES[i].isShownOnMap && (globals.VENUES[i].position.longitude - _currentCameraPosition.target.longitude < 0.02 && globals.VENUES[i].position.latitude - _currentCameraPosition.target.latitude < 0.02)){
Marker marker = Marker(
markerId: MarkerId(globals.VENUES[i].venueID.toString()),

1
lib/ShadowDetector.dart
View File

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

4
lib/VenueInfo.dart
View File

@ -1,9 +1,5 @@
import 'dart:collection';
import 'dart:convert';
import 'dart:ffi';
import 'package:flutter/material.dart';
import 'package:google_maps_flutter/google_maps_flutter.dart';
import 'package:http/http.dart' as http;
import 'package:html/dom.dart' as dom;
import 'dart:io';

2
lib/venuePage.dart
View File

@ -3,8 +3,6 @@ import 'dart:io';
import 'package:share_plus/share_plus.dart';
import 'package:flutter_applicationdemo/Venue.dart';
import 'package:flutter_applicationdemo/venuePage.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:http/http.dart' as http;