update y uso de provider

lib/main.dart

@@ -3,6 +3,7 @@ import 'package:flutter/services.dart';
 import 'package:get/get.dart';
 import 'package:intl/date_symbol_data_local.dart';
 import 'package:prosappco/src/authentication/authentication_repository.dart';
+import 'package:prosappco/src/providers/user_provider.dart';
 import 'package:prosappco/src/screens/calendar.dart';
 import 'package:prosappco/src/screens/city.dart';
 import 'package:prosappco/src/screens/login.dart';
@@ -25,6 +26,7 @@ import 'package:prosappco/src/services/local_notifications.dart';
 import 'firebase_options.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart' show kIsWeb;
+import 'package:provider/provider.dart';
 
 Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
   await Firebase.initializeApp();
@@ -79,34 +81,38 @@ class MyApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return GetMaterialApp(
+    return MultiProvider(
-      theme: ThemeData(fontFamily: 'Poppins'),
+      providers: [ChangeNotifierProvider(create: (_) => UserProvider())],
-      debugShowCheckedModeBanner: false,
+      child: GetMaterialApp(
-      title: 'ProsApp',
+        theme: ThemeData(fontFamily: 'Poppins'),
-      initialRoute: '/',
+        debugShowCheckedModeBanner: false,
-      routes: {
+        title: 'ProsApp',
-        '/': (context) => const LoginScreen(),
+        initialRoute: '/',
-        '/splash': (context) => const SplashScreen(),
+        routes: {
-        '/login': (context) => const LoginEmailScreen(),
+          '/': (context) => const LoginScreen(),
-        '/profile': (context) => const ProfileScreen(),
+          '/splash': (context) => const SplashScreen(),
-        '/register': (context) => const RegisterScreen(),
+          '/login': (context) => const LoginEmailScreen(),
-        '/city': (context) => const CityScreen(),
+          '/profile': (context) => const ProfileScreen(),
-        '/profession': (context) => const ProfessionScreen(),
+          '/register': (context) => const RegisterScreen(),
-        '/newNumber': (context) => const NewNumberScreen(),
+          '/city': (context) => const CityScreen(),
-        '/profesionalRevision': (context) => const ProfessionalRevisionScreen(),
+          '/profession': (context) => const ProfessionScreen(),
-        '/profesionalProfile': (context) => const ProfessionalProfileScreen(),
+          '/newNumber': (context) => const NewNumberScreen(),
-        '/solicitudEnviada': (context) => const RequestSentScreen(),
+          '/profesionalRevision': (context) =>
-        '/nuevaPassword': (context) => NewPasswordScreen(),
+              const ProfessionalRevisionScreen(),
-        '/servicio': (context) => const ServiceScreen(),
+          '/profesionalProfile': (context) => const ProfessionalProfileScreen(),
-        '/profilePro': (context) => const ProfileProScreen(),
+          '/solicitudEnviada': (context) => const RequestSentScreen(),
-        '/calendar': (context) => const CalendarScreen(),
+          '/nuevaPassword': (context) => NewPasswordScreen(),
-        '/solicitud': (context) => SolicitudScreen(),
+          '/servicio': (context) => const ServiceScreen(),
-        '/misserviciospro': (context) => const MyServicesProScreen(),
+          '/profilePro': (context) => const ProfileProScreen(),
-        '/misservicios': (context) => MyServicesScreen(),
+          '/calendar': (context) => const CalendarScreen(),
-      },
+          '/solicitud': (context) => SolicitudScreen(),
-      onGenerateRoute: (settings) {
+          '/misserviciospro': (context) => const MyServicesProScreen(),
-        throw Exception('Ruta desconocida: ${settings.name}');
+          '/misservicios': (context) => MyServicesScreen(),
-      },
+        },
+        onGenerateRoute: (settings) {
+          throw Exception('Ruta desconocida: ${settings.name}');
+        },
+      ),
     );
   }
 }

lib/src/components/drawer_menu.dart

@@ -7,6 +7,7 @@ import 'package:prosappco/src/authentication/authentication_repository.dart';
 import 'package:prosappco/src/components/photo_view.dart';
 import 'package:prosappco/src/models/scores_model.dart';
 import 'package:prosappco/src/models/user_model.dart';
+import 'package:prosappco/src/providers/user_provider.dart';
 import 'package:prosappco/src/screens/configuracion.dart';
 import 'package:prosappco/src/screens/messages_user.dart';
 import 'package:prosappco/src/screens/professional_profile_web.dart';
@@ -17,6 +18,7 @@ import 'package:prosappco/src/screens/support.dart';
 import 'package:prosappco/src/screens/web_view.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:get/get.dart';
+import 'package:provider/provider.dart';
 
 class DrawerMenu extends StatefulWidget {
   @override
@@ -31,13 +33,6 @@ class _DrawerMenuState extends State<DrawerMenu> {
   @override
   void initState() {
     super.initState();
-
-    if (user == null) {
-      UserModel.getUser(uid.toString()).then(
-        (UserModel s) => setState(() => user = s),
-      );
-    }
-
     if (scoresModel == null) {
       ScoresModel.scoreTo(uid.toString(), false, false).then(
         (ScoresModel s) => setState(() => scoresModel = s),
@@ -57,7 +52,9 @@ class _DrawerMenuState extends State<DrawerMenu> {
 
   @override
   Widget build(BuildContext context) {
-    final User? currentUser = FirebaseAuth.instance.currentUser;
+    final userProvider = Provider.of<UserProvider>(context);
+
+    // final UserModel? user = userProvider.user;
 
     return Drawer(
       child: Column(
@@ -66,52 +63,18 @@ class _DrawerMenuState extends State<DrawerMenu> {
             color: Colors.white,
             child: Column(
               children: [
-                ListTile(
+                StreamBuilder<UserModel>(
-                  onTap: () {
+                  stream: userProvider.itemsStream,
-                    if (kIsWeb) {
+                  builder: (BuildContext context,
-                      Navigator.push(
+                      AsyncSnapshot<UserModel> snapshot) {
-                        context,
+                    if (snapshot.connectionState == ConnectionState.waiting) {
-                        CupertinoPageRoute(
+                      return Center(child: CircularProgressIndicator());
-                          builder: (BuildContext context) {
+                    } else if (snapshot.hasError) {
-                            return const ProfileWebScreen();
+                      return Center(child: Text('Error: ${snapshot.error}'));
-                          },
-                        ),
-                      );
                     } else {
-                      Navigator.push(
+                      return infoUser(context, snapshot.data);
-                        context,
-                        CupertinoPageRoute(
-                          builder: (BuildContext context) {
-                            return const ProfileScreen();
-                          },
-                        ),
-                      );
                     }
                   },
-                  title: Text(user?.name ?? '',
-                      style: const TextStyle(fontWeight: FontWeight.bold)),
-                  subtitle: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Text(
-                        currentUser?.phoneNumber ?? '',
-                        style: const TextStyle(fontSize: 12),
-                      ),
-                      Text(
-                        user?.city ?? '',
-                        style: const TextStyle(fontSize: 12),
-                      ),
-                    ],
-                  ),
-                  leading: ReferencePhoto(
-                    ref: user?.photo,
-                    size: 55,
-                    sizeCircle: 60,
-                  ),
-                  trailing: const Icon(Icons.keyboard_arrow_right,
-                      color: Colors.black),
-                  contentPadding:
-                      const EdgeInsets.symmetric(vertical: 20, horizontal: 16),
                 ),
               ], //
             ),
@@ -392,7 +355,7 @@ class _DrawerMenuState extends State<DrawerMenu> {
                       snackPosition: SnackPosition.BOTTOM,
                     );
                   } else {
-                    if (currentUser?.phoneNumber != user?.phoneNumber) {
+                    if (user?.phoneNumber != user?.phoneNumber) {
                       Get.snackbar(
                         'Tu número de teléfono sigue sin cambios.',
                         'Para guardar esta información, dirígete a tu perfil y selecciona la opción Guardar',
@@ -461,4 +424,52 @@ class _DrawerMenuState extends State<DrawerMenu> {
       ),
     );
   }
+
+  ListTile infoUser(BuildContext context, UserModel? user) {
+    return ListTile(
+      onTap: () {
+        if (kIsWeb) {
+          Navigator.push(
+            context,
+            CupertinoPageRoute(
+              builder: (BuildContext context) {
+                return const ProfileWebScreen();
+              },
+            ),
+          );
+        } else {
+          Navigator.push(
+            context,
+            CupertinoPageRoute(
+              builder: (BuildContext context) {
+                return const ProfileScreen();
+              },
+            ),
+          );
+        }
+      },
+      title: Text(user?.name ?? '',
+          style: const TextStyle(fontWeight: FontWeight.bold)),
+      subtitle: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            user?.phoneNumber ?? '',
+            style: const TextStyle(fontSize: 12),
+          ),
+          Text(
+            user?.city ?? '',
+            style: const TextStyle(fontSize: 12),
+          ),
+        ],
+      ),
+      leading: ReferencePhoto(
+        ref: user?.photo,
+        size: 55,
+        sizeCircle: 60,
+      ),
+      trailing: const Icon(Icons.keyboard_arrow_right, color: Colors.black),
+      contentPadding: const EdgeInsets.symmetric(vertical: 20, horizontal: 16),
+    );
+  }
 }

lib/src/models/user_model.dart

@@ -37,6 +37,30 @@ class UserModel {
     }
   }
 
+  @override
+  String toString() {
+    return 'UserModel(name: $name, city: $city, profession: $profession, state: $state, tarifa: $tarifa, phoneNumber: $phoneNumber, token: $token)';
+  }
+
+  static UserModel fromFirestore(Map<String, dynamic> firestoreMap) {
+    try {
+      String? avatar = firestoreMap['photo'];
+      return UserModel(
+        firestoreMap['name'] ?? 'Sin nombre',
+        firestoreMap['city'] ?? 'Sin ciudad',
+        firestoreMap['profesion'],
+        firestoreMap['estado'],
+        avatar != null ? storage.ref().child(avatar) : null,
+        firestoreMap['tarifa'] ?? 0,
+        firestoreMap['phoneNumber'] ?? 'Sin numero',
+        firestoreMap['token'],
+      );
+    } catch (e) {
+      print('DesdeProvider $e');
+      return UserModel('', '', '', null, null, 0, '', '');
+    }
+  }
+
   static Future<UserModel> getUser(String uid) async {
     try {
       final snapshot =

lib/src/providers/user_provider.dart

@@ -0,0 +1,23 @@
+import 'package:cloud_firestore/cloud_firestore.dart';
+import 'package:flutter/material.dart';
+import 'package:firebase_auth/firebase_auth.dart';
+import 'package:prosappco/src/models/user_model.dart';
+
+class UserProvider extends ChangeNotifier {
+  final FirebaseFirestore _firestore = FirebaseFirestore.instance;
+  Stream<UserModel>? _itemsStream;
+
+  UserProvider() {
+    _itemsStream = _firestore
+        .collection('users')
+        .doc(FirebaseAuth.instance.currentUser?.uid)
+        .snapshots()
+        .map((event) {
+      final data = event.data() as Map<String, dynamic>;
+
+      return UserModel.fromFirestore(data);
+    });
+  }
+
+  Stream<UserModel>? get itemsStream => _itemsStream;
+}

lib/src/screens/configuracion.dart

@@ -1,11 +1,88 @@
+import 'package:cloud_firestore/cloud_firestore.dart';
+import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
+import 'package:get/get.dart';
 import 'package:prosappco/src/components/pop_appbar.dart';
 import 'package:prosappco/src/screens/about.dart';
 
-class ConfiguracionScreen extends StatelessWidget {
+class ConfiguracionScreen extends StatefulWidget {
   const ConfiguracionScreen({super.key});
 
+  @override
+  State<ConfiguracionScreen> createState() => _ConfiguracionScreenState();
+}
+
+class _ConfiguracionScreenState extends State<ConfiguracionScreen> {
+  late final FirebaseAuth _auth;
+
+  @override
+  void initState() {
+    super.initState();
+    _auth = FirebaseAuth.instance;
+  }
+
+  Future<void> deleteAccount() async {
+    try {
+      final currentUser = _auth.currentUser;
+
+      if (currentUser != null) {
+        final uid = currentUser.uid;
+
+        await FirebaseFirestore.instance.collection('users').doc(uid).delete();
+
+        await currentUser.delete();
+
+        await _auth.signOut();
+
+        Get.snackbar(
+          'Cuenta Eliminada',
+          'Tu cuenta ha sido eliminada con éxito.',
+          snackPosition: SnackPosition.BOTTOM,
+        );
+      }
+    } catch (e) {
+      Get.snackbar(
+        'Error al Eliminar Cuenta',
+        'Hubo un error al eliminar tu cuenta. Por favor, inténtalo de nuevo más tarde.',
+        snackPosition: SnackPosition.BOTTOM,
+      );
+    }
+  }
+
+  Future<void> _showDeleteAccountConfirmationDialog(
+      BuildContext context) async {
+    return showDialog(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertDialog(
+          title: const Text('Eliminar Cuenta'),
+          content: const Text(
+              '¿Estás seguro de que deseas eliminar tu cuenta? Esta acción no se puede deshacer.'),
+          actions: [
+            TextButton(
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+              child: const Text('Cancelar'),
+            ),
+            TextButton(
+              onPressed: () {
+                deleteAccount();
+                Navigator.of(context).pop();
+              },
+              child: const Text(
+                'Eliminar',
+                style:
+                    TextStyle(color: Colors.red, fontWeight: FontWeight.w600),
+              ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -14,22 +91,35 @@ class ConfiguracionScreen extends StatelessWidget {
             Navigator.pop(context);
           },
           label: 'Configuración'),
-      body: ListTile(
+      body: ListView(
-        onTap: () {
+        children: [
-          Navigator.push(
+          ListTile(
-            context,
+            onTap: () {
-            CupertinoPageRoute(
+              Navigator.push(
-              builder: (BuildContext context) {
+                context,
-                return const AboutScreen();
+                CupertinoPageRoute(
-              },
+                  builder: (BuildContext context) {
+                    return const AboutScreen();
+                  },
+                ),
+              );
+            },
+            title: const Text('Acerca de la aplicación'),
+            trailing: const Icon(
+              Icons.keyboard_arrow_right,
+              color: Colors.black,
             ),
-          );
+          ),
-        },
+          ListTile(
-        title: const Text('Acerca de la aplicación'),
+            onTap: () {
-        trailing: const Icon(
+              _showDeleteAccountConfirmationDialog(context);
-          Icons.keyboard_arrow_right,
+            },
-          color: Colors.black,
+            title: const Text(
-        ),
+              'Eliminar cuenta',
+              style: TextStyle(color: Colors.red),
+            ),
+          ),
+        ],
       ),
     );
   }

lib/src/screens/profile.dart

@@ -9,11 +9,12 @@ import 'package:intl/intl.dart';
 import 'package:prosappco/src/authentication/authentication_repository.dart';
 import 'package:prosappco/src/components/pop_appbar.dart';
 import 'package:prosappco/src/controllers/add_name_email_city.dart';
+import 'package:prosappco/src/providers/user_provider.dart';
 import 'package:prosappco/src/screens/city.dart';
 import 'package:prosappco/src/screens/new_number.dart';
 import 'package:prosappco/src/screens/new_password.dart';
 import 'package:prosappco/src/services/select_image_profile.dart';
-
+import 'package:provider/provider.dart';
 import '../components/photo_view.dart';
 
 class ProfileScreen extends StatefulWidget {
@@ -293,6 +294,8 @@ class _ProfileScreenState extends State<ProfileScreen> {
     } catch (e) {
       print('Error al actualizar la imagen de perfil $e');
     }
+
+    // notifyListeners();
   }
 
   Future<void> _updateEmail(String newEmail) async {
@@ -376,67 +379,6 @@ class _ProfileScreenState extends State<ProfileScreen> {
     }
   }
 
-  Future<void> deleteAccount() async {
-    try {
-      final currentUser = _auth.currentUser;
-
-      if (currentUser != null) {
-        final uid = currentUser.uid;
-
-        await FirebaseFirestore.instance.collection('users').doc(uid).delete();
-
-        await currentUser.delete();
-
-        await _auth.signOut();
-
-        Get.snackbar(
-          'Cuenta Eliminada',
-          'Tu cuenta ha sido eliminada con éxito.',
-          snackPosition: SnackPosition.BOTTOM,
-        );
-      }
-    } catch (e) {
-      Get.snackbar(
-        'Error al Eliminar Cuenta',
-        'Hubo un error al eliminar tu cuenta. Por favor, inténtalo de nuevo más tarde.',
-        snackPosition: SnackPosition.BOTTOM,
-      );
-    }
-  }
-
-  Future<void> _showDeleteAccountConfirmationDialog(
-      BuildContext context) async {
-    return showDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return AlertDialog(
-          title: const Text('Eliminar Cuenta'),
-          content: const Text(
-              '¿Estás seguro de que deseas eliminar tu cuenta? Esta acción no se puede deshacer.'),
-          actions: [
-            TextButton(
-              onPressed: () {
-                Navigator.of(context).pop();
-              },
-              child: const Text('Cancelar'),
-            ),
-            TextButton(
-              onPressed: () {
-                deleteAccount();
-                Navigator.of(context).pop();
-              },
-              child: const Text(
-                'Eliminar',
-                style:
-                    TextStyle(color: Colors.red, fontWeight: FontWeight.w600),
-              ),
-            ),
-          ],
-        );
-      },
-    );
-  }
-
   Future<void> _showChoiceDialog(BuildContext context) async {
     return showDialog(
       context: context,
@@ -484,6 +426,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
 
   @override
   Widget build(BuildContext context) {
+    final userProvider = Provider.of<UserProvider>(context);
     String city = _ciudad.toString();
 
     return Scaffold(
@@ -675,30 +618,6 @@ class _ProfileScreenState extends State<ProfileScreen> {
                         ),
                       ),
                     ),
-                    const SizedBox(height: 15),
-                    ElevatedButton(
-                      onPressed: () {
-                        _showDeleteAccountConfirmationDialog(context);
-                      },
-                      style: ElevatedButton.styleFrom(
-                        backgroundColor:
-                            Colors.red, // Puedes elegir un color adecuado
-                        shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(50),
-                        ),
-                        elevation: 0,
-                        minimumSize: const Size(300, 45),
-                      ),
-                      child: const Text(
-                        'Eliminar Cuenta',
-                        style: TextStyle(
-                          color: Colors.white,
-                          fontWeight: FontWeight.bold,
-                          fontSize: 17,
-                        ),
-                      ),
-                    ),
-                    const SizedBox(height: 40),
                     ElevatedButton(
                       onPressed: () async {
                         if (_formKey.currentState!.validate()) {

lib/src/screens/service.dart

@@ -252,7 +252,7 @@ class _ServiceScreenState extends State<ServiceScreen> {
 
     setState(() {
       appVersion = version;
-      print('Version de app $appVersion - version de firebase $settings');
+      // print('Version de app $appVersion - version de firebase $settings');
     });
 
     if (settings != null) {