after rediense

lib/blocs/profile_bloc/profile_bloc.dart

@@ -30,15 +30,16 @@ class ProfileBloc extends Bloc<ProfileEvent, ProfileState> {
       UpdateUserInfo event, Emitter<ProfileState> emit) async {
     emit(UpdateUserInfoLoading());
     try {
-      await _userRepository.updateUserInfo(event.userId, event.picture, {
+      final userImageUrl = event.filePicture != null
-        'name': event.name,
+          ? await _userRepository.uploadPicture(
-        // 'picture': event.picture,
+              event.filePicture!, event.myUser.id)
-        'nickname': event.nickname,
+          : null;
-        'email': event.email,
+
-        'phone': event.phone,
+      final myUser = userImageUrl == null
-        'birthDate': event.birthDate,
+          ? event.myUser
-        'gender': event.gender
+          : event.myUser.copyWith(picture: userImageUrl);
-      });
+
+      await _userRepository.updateUserInfo(myUser);
       emit(const UpdateUserInfoSuccess());
     } catch (e) {
       emit(UpdateUserInfoFailure());

lib/blocs/profile_bloc/profile_event.dart

@@ -7,38 +7,15 @@ abstract class ProfileEvent extends Equatable {
   List<Object?> get props => [];
 }
 
-class UploadPicture extends ProfileEvent {
-  final String file;
-  final String userId;
-
-  const UploadPicture(this.file, this.userId);
-
-  @override
-  List<Object?> get props => [file, userId];
-}
-
 class UpdateUserInfo extends ProfileEvent {
-  final String userId;
+  final MyUser myUser;
-  final String picture;
+  final String? filePicture;
-  final String? name;
-  final String? nickname;
-  final String? email;
-  final String? phone;
-  final String? birthDate;
-  final String? gender;
 
   const UpdateUserInfo({
-    required this.userId,
+    required this.myUser,
-    required this.picture,
+    this.filePicture,
-    this.name,
-    this.nickname,
-    this.email,
-    this.phone,
-    this.birthDate,
-    this.gender,
   });
 
   @override
-  List<Object?> get props =>
+  List<Object?> get props => [myUser, filePicture];
-      [userId, name, nickname, email, phone, picture, birthDate, gender];
 }

lib/blocs/profile_bloc/profile_state.dart

@@ -9,19 +9,6 @@ abstract class ProfileState extends Equatable {
 
 class UpdateUserInfoInitial extends ProfileState {}
 
-class UploadPictureFailure extends ProfileState {}
-
-class UploadPictureLoading extends ProfileState {}
-
-class UploadPictureSuccess extends ProfileState {
-  final String userImage;
-
-  const UploadPictureSuccess(this.userImage);
-
-  @override
-  List<Object> get props => [userImage];
-}
-
 class UpdateUserInfoFailure extends ProfileState {}
 
 class UpdateUserInfoLoading extends ProfileState {}

lib/components/birthday_picker.dart

@@ -1,17 +1,17 @@
 import 'package:flutter/material.dart';
 
-class BirthDatePicker extends StatefulWidget {
+class BirthdayPicker extends StatefulWidget {
   final Function(DateTime) onDateSelected;
   final TextEditingController controller;
 
-  const BirthDatePicker(
+  const BirthdayPicker(
       {super.key, required this.onDateSelected, required this.controller});
 
   @override
-  State<BirthDatePicker> createState() => _BirthDatePickerState();
+  State<BirthdayPicker> createState() => _BirthdayPickerState();
 }
 
-class _BirthDatePickerState extends State<BirthDatePicker> {
+class _BirthdayPickerState extends State<BirthdayPicker> {
   DateTime selectedDate =
       DateTime.now().subtract(const Duration(days: 365 * 20));
 

lib/components/general_drawer_header.dart

@@ -9,6 +9,7 @@ class GeneralDrawerHeader extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final user = context.read<MyUserBloc>().state.user!;
     return ListTile(
       onTap: () {
         Navigator.pop(context);
@@ -22,46 +23,54 @@ class GeneralDrawerHeader extends StatelessWidget {
         );
       },
       title: Text(
-        context.read<MyUserBloc>().state.user!.name ?? '',
+        user.name ?? '',
         style: const TextStyle(fontWeight: FontWeight.bold),
       ),
       subtitle: Text(
-        context.read<MyUserBloc>().state.user!.email ??
+        user.drawerLabel,
-            context.read<MyUserBloc>().state.user!.phone ??
-            '',
         style: const TextStyle(fontSize: 12),
       ),
-      leading: context.read<MyUserBloc>().state.user!.picture == "" ||
+      leading: pictureWidget(user.picture, context),
-              context.read<MyUserBloc>().state.user!.picture == null
-          ? Container(
-              width: 80,
-              height: 80,
-              decoration: BoxDecoration(
-                color: Colors.grey.shade300,
-                shape: BoxShape.circle,
-              ),
-              child: Icon(
-                CupertinoIcons.person,
-                color: Colors.grey.shade400,
-                size: 35,
-              ),
-            )
-          : Container(
-              width: 60,
-              height: 60,
-              decoration: BoxDecoration(
-                color: Colors.grey,
-                shape: BoxShape.circle,
-                image: DecorationImage(
-                  image: NetworkImage(
-                    context.read<MyUserBloc>().state.user?.picture ?? '',
-                  ),
-                  fit: BoxFit.cover,
-                ),
-              ),
-            ),
       trailing: const Icon(Icons.keyboard_arrow_right, color: Colors.black),
       contentPadding: const EdgeInsets.symmetric(vertical: 10, horizontal: 15),
     );
   }
+
+  Widget pictureWidget(String? pictureUrl, BuildContext context) {
+    ImageProvider<Object>? imageProvider;
+
+    if (pictureUrl != null && pictureUrl.isNotEmpty) {
+      imageProvider = NetworkImage(pictureUrl);
+    }
+
+    return pictureContainerWidget(imageProvider);
+  }
+
+  Widget pictureContainerWidget(ImageProvider<Object>? imageProvider) {
+    final image = imageProvider == null
+        ? null
+        : DecorationImage(
+            image: imageProvider,
+            fit: BoxFit.contain,
+          );
+
+    final widget = image == null
+        ? Icon(
+            CupertinoIcons.person,
+            color: Colors.grey.shade400,
+            size: 40,
+          )
+        : null;
+
+    return Container(
+      width: 60,
+      height: 60,
+      decoration: BoxDecoration(
+        color: Colors.grey.shade300,
+        shape: BoxShape.circle,
+        image: image,
+      ),
+      child: widget,
+    );
+  }
 }

lib/screens/profile/profile_screen.dart

@@ -7,9 +7,8 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:prosappco/blocs/my_user_bloc/my_user_bloc.dart';
 import 'package:prosappco/blocs/profile_bloc/profile_bloc.dart';
-import 'package:prosappco/components/birth_date_picker.dart';
+import 'package:prosappco/components/birthday_picker.dart';
 import 'package:prosappco/components/gender_dropdown.dart';
-import 'package:prosappco/components/general_primary_button.dart';
 import 'package:prosappco/src/components/pop_appbar.dart';
 
 class ProfileScreen extends StatefulWidget {
@@ -23,16 +22,17 @@ class _ProfileScreenState extends State<ProfileScreen> {
   final TextEditingController _nameController = TextEditingController();
   final TextEditingController _emailController = TextEditingController();
   final TextEditingController _phoneController = TextEditingController();
-  final TextEditingController _birthDateController = TextEditingController();
+  final TextEditingController _birthdayController = TextEditingController();
   final TextEditingController _genderController = TextEditingController();
   XFile? _imageFile;
+  bool isLoading = false;
 
   @override
   void dispose() {
     _nameController.dispose();
     _emailController.dispose();
     _phoneController.dispose();
-    _birthDateController.dispose();
+    _birthdayController.dispose();
     _genderController.dispose();
     super.dispose();
   }
@@ -41,8 +41,25 @@ class _ProfileScreenState extends State<ProfileScreen> {
   Widget build(BuildContext context) {
     return BlocListener<ProfileBloc, ProfileState>(
       listener: (context, state) {
-        if (state is UploadPictureSuccess) {
+        if (state is UpdateUserInfoLoading) {
-          setState(() {});
+          setState(() {
+            isLoading = true;
+          });
+        } else if (state is UpdateUserInfoSuccess) {
+          // Snack bar
+          ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
+            content: Text('Información actualizada'),
+          ));
+          setState(() {
+            isLoading = false;
+          });
+        } else if (state is UpdateUserInfoFailure) {
+          ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
+            content: Text('Error al actualizar la información'),
+          ));
+          setState(() {
+            isLoading = false;
+          });
         }
       },
       child: Scaffold(
@@ -60,75 +77,12 @@ class _ProfileScreenState extends State<ProfileScreen> {
 
             return SingleChildScrollView(
               child: Padding(
-                padding: const EdgeInsets.all(20.0),
+                padding:
+                    const EdgeInsets.symmetric(horizontal: 40, vertical: 20),
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.stretch,
                   children: [
-                    GestureDetector(
+                    pictureWidget(state, context),
-                      onTap: () async {
-                        final ImagePicker picker = ImagePicker();
-                        final XFile? image = await picker.pickImage(
-                          source: ImageSource.gallery,
-                          maxHeight: 500,
-                          maxWidth: 500,
-                          imageQuality: 40,
-                        );
-
-                        if (image != null) {
-                          // context
-                          //     .read<ProfileBloc>()
-                          //     .add(UploadPicture(image.path, state.user!.id));
-                          setState(() {
-                            _imageFile = image;
-                          });
-                        }
-                      },
-                      child: state.user!.picture == "" ||
-                              state.user!.picture == null
-                          ? _imageFile != null
-                              ? Container(
-                                  width: 150,
-                                  height: 150,
-                                  decoration: BoxDecoration(
-                                    color: Colors.grey,
-                                    shape: BoxShape.circle,
-                                    image: DecorationImage(
-                                      image: FileImage(File(_imageFile!.path)),
-                                      fit: BoxFit.contain,
-                                    ),
-                                  ),
-                                )
-                              : Container(
-                                  width: 120,
-                                  height: 120,
-                                  decoration: BoxDecoration(
-                                    color: Colors.grey.shade300,
-                                    shape: BoxShape.circle,
-                                  ),
-                                  child: Icon(
-                                    CupertinoIcons.person,
-                                    color: Colors.grey.shade400,
-                                    size: 40,
-                                  ),
-                                )
-                          : Container(
-                              width: 150,
-                              height: 150,
-                              decoration: BoxDecoration(
-                                color: Colors.grey,
-                                shape: BoxShape.circle,
-                                image: DecorationImage(
-                                  image: NetworkImage(context
-                                          .read<MyUserBloc>()
-                                          .state
-                                          .user
-                                          ?.picture ??
-                                      ''),
-                                  fit: BoxFit.contain,
-                                ),
-                              ),
-                            ),
-                    ),
                     const SizedBox(height: 20.0),
                     TextFormField(
                       controller: _nameController,
@@ -193,43 +147,19 @@ class _ProfileScreenState extends State<ProfileScreen> {
                       ),
                     ),
                     const SizedBox(height: 20.0),
-                    BirthDatePicker(
+                    BirthdayPicker(
                       onDateSelected: (birthDay) {
-                        _birthDateController.text =
+                        _birthdayController.text =
                             DateFormat('dd/MM/yyyy').format(birthDay);
                       },
-                      controller: _birthDateController,
+                      controller: _birthdayController,
                     ),
                     const SizedBox(height: 20.0),
                     GenderDropdown(onChanged: (selectedGender) {
                       _genderController.text = selectedGender;
                     }),
-                    ElevatedButton(
+                    const SizedBox(height: 60.0),
-                      onPressed: () {
+                    saveButton(state, context),
-                        context.read<ProfileBloc>().add(
-                              UpdateUserInfo(
-                                userId: state.user!.id,
-                                picture: _imageFile?.path ??
-                                    state.user!.picture ??
-                                    '',
-                                name: _nameController.text.isEmpty
-                                    ? null
-                                    : _nameController.text,
-                                nickname:
-                                    _nameController.text.trim().toLowerCase(),
-                                email: _emailController.text.isEmpty
-                                    ? null
-                                    : _emailController.text,
-                                phone: _phoneController.text.isEmpty
-                                    ? null
-                                    : _phoneController.text,
-                                birthDate: _birthDateController.text,
-                                gender: _genderController.text,
-                              ),
-                            );
-                      },
-                      child: const Text('Guardar'),
-                    ),
                   ],
                 ),
               ),
@@ -241,4 +171,118 @@ class _ProfileScreenState extends State<ProfileScreen> {
       ),
     );
   }
+
+  Widget saveButton(MyUserState state, BuildContext context) {
+    return ElevatedButton(
+      onPressed: () {
+        if (isLoading) {
+          return;
+        }
+
+        final myUser = state.user!.copyWith(
+          name: _nameController.text,
+          email: _emailController.text,
+          phone: _phoneController.text,
+          birthday: _birthdayController.text,
+          gender: _genderController.text,
+          nickname: _nameController.text.trim().toLowerCase(),
+        );
+
+        context.read<ProfileBloc>().add(
+              UpdateUserInfo(
+                myUser: myUser,
+                filePicture: _imageFile?.path,
+              ),
+            );
+
+        // Navigator.pop(context);
+      },
+      style: ElevatedButton.styleFrom(
+        backgroundColor: Colors.blue, // Color de fondo
+        padding: const EdgeInsets.symmetric(vertical: 15),
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(20), // Radio de borde
+        ),
+        shadowColor: Colors.grey, // Sombra
+        elevation: 5, // Elevación
+      ),
+      child: Container(
+        constraints: const BoxConstraints(
+            maxWidth: 300.0, minHeight: 50.0), // Ajustes de tamaño
+        alignment: Alignment.center,
+        child: isLoading
+            ? const CircularProgressIndicator(
+                color: Colors.white,
+              )
+            : const Text(
+                'Actualizar',
+                style: TextStyle(
+                  color: Colors.white,
+                  fontSize: 18,
+                  fontWeight: FontWeight.bold, // Texto audaz
+                ),
+              ),
+      ),
+    );
+  }
+
+  Widget pictureWidget(MyUserState state, BuildContext context) {
+    final pictureUrl = state.user?.picture;
+    final pathImageFile = _imageFile?.path;
+
+    ImageProvider<Object>? imageProvider;
+
+    if (pathImageFile != null && pathImageFile.isNotEmpty) {
+      imageProvider = FileImage(File(pathImageFile));
+    } else if (pictureUrl != null && pictureUrl.isNotEmpty) {
+      imageProvider = NetworkImage(pictureUrl);
+    }
+
+    return GestureDetector(
+      onTap: () async {
+        final ImagePicker picker = ImagePicker();
+        final XFile? image = await picker.pickImage(
+          source: ImageSource.gallery,
+          maxHeight: 500,
+          maxWidth: 500,
+          imageQuality: 40,
+        );
+
+        if (image != null) {
+          setState(() {
+            _imageFile = image;
+          });
+        }
+      },
+      child: pictureContainerWidget(imageProvider),
+    );
+  }
+
+  Widget pictureContainerWidget(ImageProvider<Object>? imageProvider) {
+    final image = imageProvider == null
+        ? null
+        : DecorationImage(
+            image: imageProvider,
+            fit: BoxFit.contain,
+          );
+
+    final widget = image == null
+        ? Icon(
+            CupertinoIcons.person,
+            color: Colors.grey.shade400,
+            size: 40,
+          )
+        : null;
+
+    return Container(
+      width: 120,
+      height: 120,
+      decoration: BoxDecoration(
+        color: Colors.grey.shade300,
+        shape: BoxShape.circle,
+        image: image,
+      ),
+      child: widget,
+    );
+  }
 }

lib/src/authentication/authentication_repository.dart

@@ -210,16 +210,16 @@ class AuthenticationRepository extends GetxController {
   }
 
   Future<String> getBirthday(String uid) async {
-    String birthDate = '';
+    String birthday = '';
     try {
       final snapshot =
           await FirebaseFirestore.instance.collection('users').doc(uid).get();
       final Map<String, dynamic>? data = snapshot.data();
-      birthDate = data?['birth_date'] ?? '';
+      birthday = data?['birth_date'] ?? '';
     } catch (e) {
-      print('Error getting birthDate: $e');
+      print('Error getting birthday: $e');
     }
-    return birthDate;
+    return birthday;
   }
 
   Future<String> getCoordsOfCity(String uid) async {

packages/user_repository/lib/src/entities/my_user_entity.dart

@@ -7,14 +7,18 @@ class MyUserEntity extends Equatable {
   final String? name;
   final String? nickname;
   final String? picture;
+  final String? birthday;
+  final String? gender;
 
   const MyUserEntity({
     required this.id,
-    this.email,
+    required this.email,
-    this.phone,
+    required this.phone,
-    this.name,
+    required this.name,
-    this.nickname,
+    required this.nickname,
-    this.picture,
+    required this.picture,
+    required this.birthday,
+    required this.gender,
   });
 
   Map<String, Object?> toDocument() {
@@ -25,6 +29,8 @@ class MyUserEntity extends Equatable {
       'name': name,
       'nickname': name?.trim().toLowerCase(),
       'picture': picture,
+      'birthday': birthday,
+      'gender': gender,
     };
   }
 
@@ -36,11 +42,14 @@ class MyUserEntity extends Equatable {
       name: doc['name'] as String?,
       nickname: doc['nickname'] as String?,
       picture: doc['picture'] as String?,
+      birthday: doc['birthday'] as String?,
+      gender: doc['gender'] as String?,
     );
   }
 
   @override
-  List<Object?> get props => [id, email, phone, name, nickname, picture];
+  List<Object?> get props =>
+      [id, email, phone, name, nickname, picture, birthday, gender];
 
   @override
   String toString() {
@@ -51,6 +60,8 @@ class MyUserEntity extends Equatable {
       name: $name
       nickname: $nickname
       picture: $picture
+      birthday: $birthday
+      gender: $gender
     }''';
   }
 }

packages/user_repository/lib/src/models/my_user.dart

@@ -9,6 +9,8 @@ class MyUser extends Equatable {
   final String? name;
   final String? nickname;
   final String? picture;
+  final String? birthday;
+  final String? gender;
 
   const MyUser({
     required this.id,
@@ -17,8 +19,16 @@ class MyUser extends Equatable {
     this.name,
     this.nickname,
     this.picture,
+    this.birthday,
+    this.gender,
   });
 
+  get drawerLabel => email != null && email!.isNotEmpty
+      ? email!
+      : phone != null && phone!.isNotEmpty
+          ? phone!
+          : "N/A";
+
   /// Empty user which represents an unauthenticated user.
   static const empty = MyUser(
     id: '',
@@ -27,6 +37,8 @@ class MyUser extends Equatable {
     name: '',
     nickname: '',
     picture: '',
+    birthday: '',
+    gender: '',
   );
 
   /// Modify MyUser parameters
@@ -37,6 +49,8 @@ class MyUser extends Equatable {
     String? name,
     String? nickname,
     String? picture,
+    String? birthday,
+    String? gender,
   }) {
     return MyUser(
       id: id ?? this.id,
@@ -45,6 +59,8 @@ class MyUser extends Equatable {
       name: name ?? this.name,
       nickname: nickname ?? this.nickname,
       picture: picture ?? this.picture,
+      birthday: birthday ?? this.birthday,
+      gender: gender ?? this.gender,
     );
   }
 
@@ -62,6 +78,8 @@ class MyUser extends Equatable {
       name: name,
       nickname: nickname,
       picture: picture,
+      birthday: birthday,
+      gender: gender,
     );
   }
 
@@ -73,9 +91,12 @@ class MyUser extends Equatable {
       name: entity.name,
       nickname: entity.nickname,
       picture: entity.picture,
+      birthday: entity.birthday,
+      gender: entity.gender,
     );
   }
 
   @override
-  List<Object?> get props => [id, email, phone, name, nickname, picture];
+  List<Object?> get props =>
+      [id, email, phone, name, nickname, picture, birthday, gender];
 }

packages/user_repository/lib/src/repositories/firebase_user_repository.dart

@@ -218,25 +218,12 @@ class FirebaseUserRepository implements UserRepository {
   }
 
   @override
-  Future<void> updateUserInfo(
+  Future<void> updateUserInfo(MyUser myUser) async {
-      String userId, String? picture, Map<String, dynamic> data) async {
     try {
-      if (picture != null) {
+      await usersCollection
-        File imageFile = File(picture);
+          .doc(myUser.id)
-        Reference firebaseStoreRef =
+          .update(myUser.toEntity().toDocument());
-            FirebaseStorage.instance.ref().child('$userId/PP/${userId}_lead');
+      await updateFromFirebase(myUser.id);
-
-        await firebaseStoreRef.putFile(
-          imageFile,
-        );
-
-        String url = await firebaseStoreRef.getDownloadURL();
-        await usersCollection.doc(userId).update({'picture': url});
-      }
-
-      await usersCollection.doc(userId).update(data);
-
-      await updateFromFirebase(userId);
     } catch (e) {
       log(e.toString());
       rethrow;
@@ -249,11 +236,8 @@ class FirebaseUserRepository implements UserRepository {
       File imageFile = File(file);
       Reference firebaseStoreRef =
           FirebaseStorage.instance.ref().child('$userId/PP/${userId}_lead');
-      await firebaseStoreRef.putFile(
+      await firebaseStoreRef.putFile(imageFile);
-        imageFile,
-      );
       String url = await firebaseStoreRef.getDownloadURL();
-      await usersCollection.doc(userId).update({'picture': url});
       return url;
     } catch (e) {
       log(e.toString());

packages/user_repository/lib/src/repositories/user_repo.dart

@@ -22,8 +22,7 @@ abstract class UserRepository {
 
   Future<MyUser?> getMyUser(String myUserId);
 
-  Future<void> updateUserInfo(
+  Future<void> updateUserInfo(MyUser myUser);
-      String userId, String picture, Map<String, dynamic> data);
 
   Future<String> uploadPicture(String file, String userId);