covas_mobile/lib/classes/MyDrawer.dart

@@ -3,7 +3,6 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:http/http.dart' as http;
 import 'dart:io';
 import '../pages/EditProfile.dart';
-import '../pages/EditSettings.dart';
 import '../pages/ListItemMenu.dart';
 import 'alert.dart';
 
@@ -106,10 +105,7 @@ class MyDrawer extends StatelessWidget with ShowAlertDialog {
             leading: Icon(Icons.settings),
             title: Text('Settings'),
             onTap: () {
-              Navigator.pushReplacement(
+              Navigator.pop(context); // Close the drawer
-                  context,
-                  MaterialPageRoute(
-                      builder: (_) => EditSettings())); // Close the drawer
             },
           ),
           ListTile(

covas_mobile/lib/pages/EditProfile.dart

@@ -7,6 +7,7 @@ import 'package:intl/intl.dart';
 import 'dart:convert';
 import 'dart:io';
 
+import '../classes/events.dart';
 import '../classes/MyDrawer.dart';
 import '../main.dart';
 
@@ -20,6 +21,8 @@ void main() {
 }
 
 class MyApp extends StatelessWidget {
+  Events? events;
+
   @override
   Widget build(BuildContext context) {
     return MaterialApp(

covas_mobile/lib/pages/EditSettings.dart

@@ -5,6 +5,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'dart:convert';
 import 'dart:io';
 
+import '../classes/events.dart';
 import '../classes/MyDrawer.dart';
 
 import '../classes/alert.dart';
@@ -15,6 +16,8 @@ void main() {
 }
 
 class MyApp extends StatelessWidget {
+  Events? events;
+
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
@@ -34,27 +37,10 @@ class EditSettings extends StatefulWidget {
 class _EditProfileState extends State<EditSettings>
     with ShowAlertDialog, ShowEventDialog {
   TextEditingController inputUserName = TextEditingController();
-  int? kilometer;
-
-  Future<void> getParameter() async {
-    SharedPreferences prefs = await SharedPreferences.getInstance();
-    setState(() {
-      var kilometer = prefs.getDouble("kilometer")?.toInt() ?? null;
-    });
-  }
-
-  Future<void> setParameter() async {
-    SharedPreferences prefs = await SharedPreferences.getInstance();
-    if (kilometer != null) {
-      prefs.setDouble("kilometer", kilometer?.toDouble() ?? 50);
-      showAlertDialog(context, "Update", "Mise à jour des paramètres");
-    }
-  }
 
   @override
   void initState() {
     super.initState();
-    getParameter();
   }
 
   @override
@@ -73,44 +59,14 @@ class _EditProfileState extends State<EditSettings>
               children: <Widget>[
                 Padding(
                   padding: const EdgeInsets.only(
-                    left: 15.0,
+                      left: 15.0, right: 15.0, top: 15, bottom: 0),
-                    right: 15.0,
+                  //padding: EdgeInsets.symmetric(horizontal: 15),
-                    top: 15.0,
+                  child: TextFormField(
-                    bottom: 0.0,
+                    controller: inputUserName,
-                  ),
-                  child: DropdownButtonFormField<int>(
                     decoration: InputDecoration(
-                      border: OutlineInputBorder(),
+                        border: OutlineInputBorder(),
-                      labelText: 'Define kilometer',
+                        labelText: 'Pseudo',
-                    ),
+                        hintText: 'Modifier le pseudo'),
-                    value:
-                        kilometer, // Set the initial selected value here, or leave as `null` if unselected.
-                    items: [
-                      DropdownMenuItem(
-                        value: 5,
-                        child: Text('5km'),
-                      ),
-                      DropdownMenuItem(
-                        value: 25,
-                        child: Text('25km'),
-                      ),
-                      DropdownMenuItem(
-                        value: 50,
-                        child: Text('50km'),
-                      ),
-                      DropdownMenuItem(
-                        value: 75,
-                        child: Text('75km'),
-                      ),
-                      DropdownMenuItem(
-                        value: 100,
-                        child: Text('100km'),
-                      ),
-                    ],
-                    onChanged: (int? newValue) {
-                      // Handle selection
-                      kilometer = newValue;
-                    },
                   ),
                 ),
                 SizedBox(

covas_mobile/lib/pages/ListItemMenu.dart

@@ -93,11 +93,9 @@ class _MyHomePageState extends State<ListItemMenu> {
           print('No last known position available.');
         }
       }
-      SharedPreferences prefs = await SharedPreferences.getInstance();
-
       if (position != null) {
         // Calculate the boundaries
-        double radiusInKm = prefs.getDouble("kilometer") ?? 50;
+        double radiusInKm = 50;
         double latDistance = radiusInKm / 111.0;
         double lonDistance =
             radiusInKm / (111.0 * cos(position.latitude * pi / 180));
@@ -111,7 +109,7 @@ class _MyHomePageState extends State<ListItemMenu> {
             "?min_lat=$minLat&max_lat=$maxLat"
             "&min_lon=$minLon&max_lon=$maxLon&current_datetime=${currentDatetime.toString()}");
       }
-
+      SharedPreferences prefs = await SharedPreferences.getInstance();
       var accessToken = prefs.getString("access_token") ?? "";
 
       if (accessToken.isNotEmpty) {