Compare commits
5 Commits
384f25ddbe
...
7b884e3167
Author | SHA1 | Date | |
---|---|---|---|
7b884e3167 | |||
a1c8a5e25e | |||
cbe1bc8abd | |||
13b7ab187a | |||
2d039a04da |
@ -1,9 +1,7 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:mobile/models.dart';
|
|
||||||
import 'package:shared_preferences/shared_preferences.dart';
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
import 'package:http/http.dart' as http;
|
import 'package:http/http.dart' as http;
|
||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
import 'base/variables.dart';
|
|
||||||
|
|
||||||
enum ApiService {
|
enum ApiService {
|
||||||
auth,
|
auth,
|
||||||
|
@ -63,7 +63,7 @@ class _FavoritesPage extends State<FavoritesPage> {
|
|||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return SideMenu(
|
return SideMenu(
|
||||||
selectedIndex: 1,
|
selectedIndex: 1,
|
||||||
body: Container(
|
body: SingleChildScrollView(child: Container(
|
||||||
decoration: const BoxDecoration(color: Color(0xFFF9F9F9)),
|
decoration: const BoxDecoration(color: Color(0xFFF9F9F9)),
|
||||||
width: MediaQuery.of(context).size.width,
|
width: MediaQuery.of(context).size.width,
|
||||||
padding: const EdgeInsets.all(20.0),
|
padding: const EdgeInsets.all(20.0),
|
||||||
@ -106,6 +106,6 @@ class _FavoritesPage extends State<FavoritesPage> {
|
|||||||
)).toList(),
|
)).toList(),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -9,6 +9,7 @@ import 'base/sidemenu.dart';
|
|||||||
import 'profile.dart';
|
import 'profile.dart';
|
||||||
import 'api.dart' as api;
|
import 'api.dart' as api;
|
||||||
import 'models.dart';
|
import 'models.dart';
|
||||||
|
import 'package:http/http.dart' as http;
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
runApp(const MyApp());
|
runApp(const MyApp());
|
||||||
@ -47,23 +48,124 @@ class MyHomePage extends StatefulWidget {
|
|||||||
class _MyHomePageState extends State<MyHomePage> {
|
class _MyHomePageState extends State<MyHomePage> {
|
||||||
final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
|
final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
|
||||||
List<Favorite> _favorites = [];
|
List<Favorite> _favorites = [];
|
||||||
|
LatLng? _selectedPoint;
|
||||||
|
|
||||||
|
void _showLocation(TapPosition _, LatLng point) async {
|
||||||
|
setState(() => _selectedPoint = point);
|
||||||
|
|
||||||
|
final dynamic location;
|
||||||
|
try {
|
||||||
|
final response = await http.get(
|
||||||
|
Uri.parse('https://nominatim.openstreetmap.org/reverse.php?lat=${point.latitude}&lon=${point.longitude}&zoom=18&format=jsonv2'),
|
||||||
|
headers: {'User-Agent': 'SkanTravels/1.0'},
|
||||||
|
);
|
||||||
|
|
||||||
|
location = jsonDecode(response.body);
|
||||||
|
} catch (_) {
|
||||||
|
if (!mounted) return;
|
||||||
|
|
||||||
|
ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Unable to fetch information about this location')));
|
||||||
|
|
||||||
|
setState(() => _selectedPoint = null);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!mounted) return;
|
||||||
|
|
||||||
|
await showModalBottomSheet(
|
||||||
|
barrierColor: Colors.black.withOpacity(0.3),
|
||||||
|
context: context,
|
||||||
|
builder: (builder) {
|
||||||
|
return StatefulBuilder(builder: (BuildContext context, StateSetter setModalState) {
|
||||||
|
return Wrap(children: [
|
||||||
|
Container(
|
||||||
|
color: Colors.white,
|
||||||
|
padding: const EdgeInsets.all(20),
|
||||||
|
width: MediaQuery.of(context).size.width,
|
||||||
|
child: Row(children: [
|
||||||
|
Expanded(child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(location['name'], style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 24)),
|
||||||
|
const SizedBox(height: 10),
|
||||||
|
Text(location['display_name']),
|
||||||
|
],
|
||||||
|
)),
|
||||||
|
Column(children: [
|
||||||
|
IconButton(
|
||||||
|
icon: const Icon(Icons.star),
|
||||||
|
iconSize: 32,
|
||||||
|
color: _favorites.where((fav) => fav.lat == point.latitude && fav.lng == point.longitude).isEmpty ? Colors.grey : Colors.yellow,
|
||||||
|
onPressed: () => _toggleFavorite(point, location['name'], location['display_name'], setModalState, context)
|
||||||
|
),
|
||||||
|
const IconButton(icon: Icon(Icons.rate_review), iconSize: 32, onPressed: null),
|
||||||
|
]),
|
||||||
|
]),
|
||||||
|
),
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
setState(() => _selectedPoint = null);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _toggleFavorite(LatLng point, String name, String description, StateSetter setModalState, BuildContext context) async {
|
||||||
|
final messenger = ScaffoldMessenger.of(context);
|
||||||
|
final navigator = Navigator.of(context);
|
||||||
|
final favorite = _favorites.where((fav) => fav.lat == point.latitude && fav.lng == point.longitude).firstOrNull;
|
||||||
|
|
||||||
|
if (!await api.isLoggedIn(context)) {
|
||||||
|
messenger.showSnackBar(const SnackBar(content: Text('You need to login to do that'), behavior: SnackBarBehavior.floating));
|
||||||
|
navigator.pop();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!context.mounted) return;
|
||||||
|
|
||||||
|
if (favorite == null) {
|
||||||
|
if (await api.request(context, api.ApiService.app, 'POST', '/favorites', {'lat': point.latitude, 'lng': point.longitude}) == null) {
|
||||||
|
navigator.pop();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_fetchFavorites();
|
||||||
|
setModalState(() {});
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (await api.request(context, api.ApiService.app, 'DELETE', '/favorites/${favorite.id}', null) == null) {
|
||||||
|
navigator.pop();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setState(() {
|
||||||
|
_favorites = _favorites.where((fav) => fav.id != favorite.id).toList();
|
||||||
|
});
|
||||||
|
setModalState(() {});
|
||||||
|
}
|
||||||
|
|
||||||
|
void _fetchFavorites() async {
|
||||||
|
final response = await api.request(context, api.ApiService.app, 'GET', '/favorites', null);
|
||||||
|
if (response == null) return;
|
||||||
|
|
||||||
|
final List<dynamic> favorites = jsonDecode(response);
|
||||||
|
setState(() {
|
||||||
|
_favorites = favorites.map((favorite) => Favorite(favorite['id'], favorite['user_id'], favorite['lat'], favorite['lng'], favorite['name'], favorite['description'])).toList();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void didChangeDependencies() {
|
void didChangeDependencies() {
|
||||||
super.didChangeDependencies();
|
super.didChangeDependencies();
|
||||||
|
|
||||||
api.isLoggedIn(context).then((isLoggedIn) async {
|
api.isLoggedIn(context).then((isLoggedIn) {
|
||||||
if (!isLoggedIn || !mounted) return;
|
if (!isLoggedIn || !mounted) return;
|
||||||
|
|
||||||
final response = await api.request(context, api.ApiService.app, 'GET', '/favorites', null);
|
_fetchFavorites();
|
||||||
if (response == null) return;
|
|
||||||
|
|
||||||
final List<dynamic> favorites = jsonDecode(response);
|
|
||||||
setState(() {
|
|
||||||
_favorites = favorites.map((favorite) => Favorite(favorite['id'], favorite['user_id'], favorite['lat'], favorite['lng'], favorite['name'], favorite['description'])).toList();
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@ -74,23 +176,43 @@ class _MyHomePageState extends State<MyHomePage> {
|
|||||||
key: _scaffoldKey,
|
key: _scaffoldKey,
|
||||||
//drawer: navigationMenu,
|
//drawer: navigationMenu,
|
||||||
body: FlutterMap(
|
body: FlutterMap(
|
||||||
options: const MapOptions(initialCenter: LatLng(55.9397, 9.5156), initialZoom: 7.0),
|
options: MapOptions(
|
||||||
|
initialCenter: const LatLng(55.9397, 9.5156),
|
||||||
|
initialZoom: 7.0,
|
||||||
|
onTap: _showLocation,
|
||||||
|
),
|
||||||
children: [
|
children: [
|
||||||
openStreetMapTileLayer,
|
openStreetMapTileLayer,
|
||||||
|
if (_selectedPoint != null)
|
||||||
|
MarkerLayer(markers: [
|
||||||
|
Marker(
|
||||||
|
point: _selectedPoint!,
|
||||||
|
width: 30,
|
||||||
|
height: 50,
|
||||||
|
alignment: Alignment.center,
|
||||||
|
child: const Stack(
|
||||||
|
children: [
|
||||||
|
Icon(Icons.location_pin, size: 30, color: Colors.red),
|
||||||
|
Icon(Icons.location_on_outlined, size: 30, color: Colors.black),
|
||||||
|
]
|
||||||
|
),
|
||||||
|
)
|
||||||
|
]),
|
||||||
..._favorites.map((favorite) =>
|
..._favorites.map((favorite) =>
|
||||||
MarkerLayer(markers: [
|
MarkerLayer(markers: [
|
||||||
Marker(
|
Marker(
|
||||||
point: LatLng(favorite.lat, favorite.lng),
|
point: LatLng(favorite.lat, favorite.lng),
|
||||||
width: 60,
|
width: 30,
|
||||||
height: 100,
|
height: 50,
|
||||||
alignment: Alignment.center,
|
alignment: Alignment.center,
|
||||||
child: const Icon(
|
child: const Stack(
|
||||||
Icons.location_pin,
|
children: [
|
||||||
size: 60,
|
Icon(Icons.location_pin, size: 30, color: Colors.yellow),
|
||||||
color: Colors.yellow,
|
Icon(Icons.location_on_outlined, size: 30, color: Colors.black),
|
||||||
)
|
]
|
||||||
|
),
|
||||||
)
|
)
|
||||||
])
|
]),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
@ -99,7 +221,7 @@ class _MyHomePageState extends State<MyHomePage> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
TileLayer get openStreetMapTileLayer => TileLayer(
|
TileLayer get openStreetMapTileLayer => TileLayer(
|
||||||
urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
|
urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
|
||||||
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
|
userAgentPackageName: 'dev.fleaflet.flutter_map.example',
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user