Mobile/lib/api.dart

@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
+import 'package:mobile/models.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:http/http.dart' as http;
 import 'dart:convert';
+import 'base/variables.dart';
 
 enum ApiService {
   auth,

Mobile/lib/favorites.dart

@@ -63,7 +63,7 @@ class _FavoritesPage extends State<FavoritesPage> {
   Widget build(BuildContext context) {
     return SideMenu(
       selectedIndex: 1,
-      body: SingleChildScrollView(child: Container(
+      body: Container(
         decoration: const BoxDecoration(color: Color(0xFFF9F9F9)),
         width: MediaQuery.of(context).size.width,
         padding: const EdgeInsets.all(20.0),
@@ -106,6 +106,6 @@ class _FavoritesPage extends State<FavoritesPage> {
           )).toList(),
         ),
       ),
-    ));
+    );
   }
 }

Mobile/lib/main.dart

@@ -9,7 +9,6 @@ import 'base/sidemenu.dart';
 import 'profile.dart';
 import 'api.dart' as api;
 import 'models.dart';
-import 'package:http/http.dart' as http;
 
 void main() {
   runApp(const MyApp());
@@ -48,124 +47,23 @@ class MyHomePage extends StatefulWidget {
 class _MyHomePageState extends State<MyHomePage> {
   final GlobalKey<ScaffoldState> _scaffoldKey = GlobalKey<ScaffoldState>();
   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
   void didChangeDependencies() {
     super.didChangeDependencies();
 
-    api.isLoggedIn(context).then((isLoggedIn) {
+    api.isLoggedIn(context).then((isLoggedIn) async {
       if (!isLoggedIn || !mounted) return;
 
-      _fetchFavorites();
+      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
@@ -176,43 +74,23 @@ class _MyHomePageState extends State<MyHomePage> {
         key: _scaffoldKey,
         //drawer: navigationMenu,
         body: FlutterMap(
-          options: MapOptions(
+          options: const MapOptions(initialCenter: LatLng(55.9397, 9.5156), initialZoom: 7.0),
-            initialCenter: const LatLng(55.9397, 9.5156),
-            initialZoom: 7.0,
-            onTap: _showLocation,
-          ),
           children: [
             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) =>
               MarkerLayer(markers: [
                 Marker(
                   point: LatLng(favorite.lat, favorite.lng),
-                  width: 30,
+                  width: 60,
-                  height: 50,
+                  height: 100,
                   alignment: Alignment.center,
-                  child: const Stack(
+                  child: const Icon(
-                    children: [
+                    Icons.location_pin,
-                      Icon(Icons.location_pin, size: 30, color: Colors.yellow),
+                    size: 60,
-                      Icon(Icons.location_on_outlined, size: 30, color: Colors.black),
+                    color: Colors.yellow,
-                    ]
+                  )
-                  ),
                 )
-              ]),
+              ])
             ),
           ],
         ),
@@ -221,7 +99,7 @@ class _MyHomePageState extends State<MyHomePage> {
   }
 
   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',
-  );
+      );
 }