update

2023-11-09 11:21:54 -05:00
parent db2f965e4c
commit b3d1740649
51 changed files with 397 additions and 274 deletions
@@ -3,8 +3,8 @@ import 'package:firebase_auth/firebase_auth.dart';
 import 'package:get/get.dart';
 import 'package:google_sign_in/google_sign_in.dart';
 import 'package:prosappco/src/authentication/exceptions/register_failed.dart';
-import 'package:prosappco/src/screens/login/login.dart';
-import 'package:prosappco/src/screens/service.dart';
+import 'package:prosappco/src/presentation/screens/login/login.dart';
+import 'package:prosappco/src/presentation/screens/service.dart';

 class AuthenticationRepository extends GetxController {
  static AuthenticationRepository get instance => Get.find();
@@ -6,18 +6,18 @@ import 'package:flutter_rating_bar/flutter_rating_bar.dart';
 import 'package:prosappco/src/authentication/authentication_repository.dart';
 import 'package:prosappco/src/components/photo_view.dart';
 import 'package:prosappco/src/models/user_model.dart';
-import 'package:prosappco/src/screens/calendar.dart';
-import 'package:prosappco/src/screens/messages.dart';
-import 'package:prosappco/src/screens/my_services_pro.dart';
-import 'package:prosappco/src/screens/professional.dart';
-import 'package:prosappco/src/screens/profile.dart';
-import 'package:prosappco/src/screens/profile_pro.dart';
-import 'package:prosappco/src/screens/profile_pro_web.dart';
-import 'package:prosappco/src/screens/reputacion_pro.dart';
-import 'package:prosappco/src/screens/web_view.dart';
+import 'package:prosappco/src/presentation/screens/calendar.dart';
+import 'package:prosappco/src/presentation/screens/messages.dart';
+import 'package:prosappco/src/presentation/screens/my_services_pro.dart';
+import 'package:prosappco/src/presentation/screens/professional.dart';
+import 'package:prosappco/src/presentation/screens/profile/profile.dart';
+import 'package:prosappco/src/presentation/screens/profile/profile_pro.dart';
+import 'package:prosappco/src/presentation/screens/profile/profile_pro_web.dart';
+import 'package:prosappco/src/presentation/screens/reputacion_pro.dart';
+import 'package:prosappco/src/presentation/screens/web_view.dart';
 import '../models/scores_model.dart';
-import '../screens/configuracion.dart';
-import '../screens/support.dart';
+import '../presentation/screens/configuracion.dart';
+import '../presentation/screens/support.dart';
 import 'package:url_launcher/url_launcher.dart';

 class DrawerProfessional extends StatefulWidget {
@@ -1,6 +1,6 @@
 import 'package:get/get.dart';
 import 'package:prosappco/src/authentication/authentication_repository.dart';
-import 'package:prosappco/src/screens/service.dart';
+import 'package:prosappco/src/presentation/screens/service.dart';

 class OTPController extends GetxController {
  static OTPController get instance => Get.find();
@@ -1,6 +1,6 @@
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_storage/firebase_storage.dart';
-import 'package:prosappco/src/screens/professional.dart';
+import 'package:prosappco/src/presentation/screens/professional.dart';

 class UserModel {
  final String name;
@@ -3,7 +3,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:prosappco/src/components/pop_appbar.dart';
 import 'package:prosappco/src/models/setting_model.dart';
-import 'package:prosappco/src/screens/web_view.dart';
+import 'package:prosappco/src/presentation/screens/web_view.dart';
 import 'package:url_launcher/url_launcher.dart';

 class AboutScreen extends StatefulWidget {
@@ -6,7 +6,7 @@ import 'package:prosappco/src/authentication/authentication_repository.dart';
 import 'package:prosappco/src/components/pop_appbar.dart';
 import 'package:prosappco/src/components/primary_btn.dart';
 import 'package:prosappco/src/models/event_model.dart';
-import 'package:prosappco/src/screens/cita.dart';
+import 'package:prosappco/src/presentation/screens/cita.dart';
 import 'package:table_calendar/table_calendar.dart';
 import 'package:intl/intl.dart';

@@ -10,8 +10,8 @@ import 'package:prosappco/src/components/pop_appbar.dart';
 import 'package:prosappco/src/models/chat_model.dart';
 import 'package:prosappco/src/models/event_model.dart';
 import 'package:prosappco/src/models/user_model.dart';
-import 'package:prosappco/src/screens/professional.dart';
-import 'package:prosappco/src/screens/professional_info.dart';
+import 'package:prosappco/src/presentation/screens/professional.dart';
+import 'package:prosappco/src/presentation/screens/professional_info.dart';
 import 'package:http/http.dart' as http;

 class ChatScreen extends StatefulWidget {
@@ -13,8 +13,8 @@ import 'package:prosappco/src/models/event_model.dart';
 import 'package:prosappco/src/models/scores_model.dart';
 import 'package:prosappco/src/models/setting_model.dart';
 import 'package:prosappco/src/models/user_model.dart';
-import 'package:prosappco/src/screens/chat.dart';
-import 'package:prosappco/src/screens/score.dart';
+import 'package:prosappco/src/presentation/screens/chat.dart';
+import 'package:prosappco/src/presentation/screens/score.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:community_material_icon/community_material_icon.dart';
 import 'package:http/http.dart' as http;
@@ -4,7 +4,7 @@ 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';
+import 'package:prosappco/src/presentation/screens/about.dart';

 class ConfiguracionScreen extends StatefulWidget {
  const ConfiguracionScreen({super.key});
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:prosappco/src/authentication/authentication_repository.dart';
 import 'package:prosappco/src/components/pop_appbar.dart';
 import 'package:prosappco/src/components/primary_btn.dart';
-import '../components/schedule_picker.dart';
+import '../../components/schedule_picker.dart';

 class HorarioScreen extends StatelessWidget {
  Map<String, Schedule> horarios;
@@ -9,8 +9,8 @@ import 'package:prosappco/src/components/primary_btn.dart';
 import 'package:prosappco/src/controllers/phone_auth_controller.dart';
 import 'package:prosappco/src/models/setting_model.dart';
 import 'package:prosappco/src/providers/user_provider.dart';
-import 'package:prosappco/src/screens/code_validation.dart';
-import 'package:prosappco/src/screens/web_view.dart';
+import 'package:prosappco/src/presentation/screens/code_validation.dart';
+import 'package:prosappco/src/presentation/screens/web_view.dart';
 import 'package:provider/provider.dart';
 import 'package:responsive_builder/responsive_builder.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -6,7 +6,7 @@ import 'package:prosappco/src/components/photo_view.dart';
 import 'package:prosappco/src/components/pop_appbar.dart';
 import 'package:prosappco/src/models/chat_model.dart';
 import 'package:prosappco/src/models/event_model.dart';
-import 'package:prosappco/src/screens/chat.dart';
+import 'package:prosappco/src/presentation/screens/chat.dart';

 class MessagesScreen extends StatefulWidget {
  const MessagesScreen({super.key});
@@ -7,7 +7,7 @@ import 'package:prosappco/src/components/photo_view.dart';
 import 'package:prosappco/src/components/pop_appbar.dart';
 import 'package:prosappco/src/models/chat_model.dart';
 import 'package:prosappco/src/models/event_model.dart';
-import 'package:prosappco/src/screens/chat.dart';
+import 'package:prosappco/src/presentation/screens/chat.dart';

 class MessagesUserScreen extends StatefulWidget {
  const MessagesUserScreen({super.key});
@@ -8,7 +8,7 @@ import 'package:prosappco/src/components/drawer_professional.dart';
 import 'package:prosappco/src/components/pop_appbar.dart';
 import 'package:prosappco/src/models/event_model.dart';
 import 'package:prosappco/src/models/scores_model.dart';
-import 'package:prosappco/src/screens/cita.dart';
+import 'package:prosappco/src/presentation/screens/cita.dart';

 class MyServicesScreen extends StatelessWidget {
  MyServicesScreen({super.key});
@@ -8,7 +8,7 @@ import 'package:prosappco/src/components/drawer_professional.dart';
 import 'package:prosappco/src/components/pop_appbar.dart';
 import 'package:prosappco/src/models/event_model.dart';
 import 'package:prosappco/src/models/scores_model.dart';
-import 'package:prosappco/src/screens/cita.dart';
+import 'package:prosappco/src/presentation/screens/cita.dart';

 class MyServicesProScreen extends StatelessWidget {
  MyServicesProScreen({super.key});
@@ -11,7 +11,7 @@ class NewNumberValidationScreen extends StatefulWidget {
 }

 class _NewNumberValidationScreenState extends State<NewNumberValidationScreen> {
-  var otp;
+  dynamic otp;
  @override
  Widget build(BuildContext context) {
    return SafeArea(
@@ -4,7 +4,7 @@ import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
 import 'package:prosappco/src/authentication/authentication_repository.dart';
 import 'package:prosappco/src/components/pop_appbar.dart';
-import 'package:prosappco/src/screens/support.dart';
+import 'package:prosappco/src/presentation/screens/support.dart';

 final CollectionReference professionsCollection =
    FirebaseFirestore.instance.collection('professions');
@@ -9,8 +9,8 @@ import 'package:prosappco/src/components/photo_view.dart';
 import 'package:prosappco/src/components/pop_appbar.dart';
 import 'package:prosappco/src/models/setting_model.dart';
 import 'package:prosappco/src/models/user_model.dart';
-import 'package:prosappco/src/screens/professional_info.dart';
-import '../models/scores_model.dart';
+import 'package:prosappco/src/presentation/screens/professional_info.dart';
+import '../../models/scores_model.dart';

 class ProfessionalScreen extends StatefulWidget {
  final String profession;
@@ -5,10 +5,10 @@ import 'package:intl/intl.dart';
 import 'package:prosappco/src/components/photo_view.dart';
 import 'package:prosappco/src/components/pop_appbar.dart';
 import 'package:prosappco/src/models/setting_model.dart';
-import 'package:prosappco/src/screens/professional.dart';
-import 'package:prosappco/src/screens/reputation.dart';
+import 'package:prosappco/src/presentation/screens/professional.dart';
+import 'package:prosappco/src/presentation/screens/reputation.dart';

-import '../models/scores_model.dart';
+import '../../models/scores_model.dart';

 class ProfessionalInfoScreen extends StatefulWidget {
  Professional professional;
@@ -9,13 +9,14 @@ 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/presentation/widgets/profile/birth_date_picker.dart';
+import 'package:prosappco/src/presentation/screens/city.dart';
+import 'package:prosappco/src/presentation/screens/new_number.dart';
+import 'package:prosappco/src/presentation/screens/new_password.dart';
 import 'package:prosappco/src/services/select_image_profile.dart';
-import 'package:provider/provider.dart';
-import '../components/photo_view.dart';
+import 'package:prosappco/src/presentation/widgets/profile/gender_dropdown.dart';
+import 'package:prosappco/src/presentation/widgets/shared/primary_button.dart';
+import '../../../components/photo_view.dart';

 class ProfileScreen extends StatefulWidget {
  const ProfileScreen({Key? key}) : super(key: key);
@@ -26,7 +27,7 @@ class ProfileScreen extends StatefulWidget {

 class _ProfileScreenState extends State<ProfileScreen> {
  File? imagen_to_upload;
-
+  final DateFormat formatter = DateFormat('dd/MM/yyyy');
  final uid = AuthenticationRepository.instance.getCurrentUserUid();
  bool _obscureText = true;
  final _formKey = GlobalKey<FormState>();
@@ -41,6 +42,8 @@ class _ProfileScreenState extends State<ProfileScreen> {
  var _ciudad = '...';
  var _photo = '...';
  String? _email = '';
+  String gender = '';
+  DateTime? birthDate;

  @override
  void initState() {
@@ -484,7 +487,6 @@ class _ProfileScreenState extends State<ProfileScreen> {

  @override
  Widget build(BuildContext context) {
-    // final userProvider = Provider.of<UserProvider>(context);
    String city = _ciudad.toString();

    return Scaffold(
@@ -503,7 +505,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
                  _showChoiceDialog(context);
                },
                child: Container(
-                    margin: const EdgeInsets.symmetric(vertical: 50),
+                    margin: const EdgeInsets.symmetric(vertical: 20),
                    child: (imagen_to_upload != null)
                        ? LocalPhoto(file: imagen_to_upload!)
                        : ReferencePhoto(ref: storage.ref().child(_photo))),
@@ -512,135 +514,159 @@ class _ProfileScreenState extends State<ProfileScreen> {
                width: 300,
                padding: const EdgeInsets.only(top: 0),
                child: Form(
-                    key: _formKey,
-                    child: Column(
-                      children: [
-                        TextFormField(
-                          controller: _nameController,
-                          maxLength: 50,
-                          validator: (value) {
-                            if (value == null || value.isEmpty) {
-                              return 'Porfavor ingrese un nombre.';
-                            }
-                            if (value.length < 5) {
-                              return 'Debe tener al menos 5 caracteres.';
-                            }
-                            return null;
-                          },
-                          decoration: const InputDecoration(
-                              prefixIcon: Icon(Icons.person_outline),
-                              hintText: 'Nombre (Obligatorio)'),
-                        ),
-                        const SizedBox(height: 0),
-                        _email != null
-                            ? TextFormField(
-                                onTap: () {
-                                  _showEmailUpdateDialog(context);
-                                },
-                                readOnly: true,
-                                controller: _emailController,
-                                decoration: const InputDecoration(
-                                    prefixIcon: Icon(Icons.email_outlined),
-                                    hintText: 'Email (Obligatorio)'),
-                              )
-                            : TextFormField(
-                                controller: _emailController,
-                                validator: (String? value) {
-                                  if (value == null || value.isEmpty) {
-                                    return 'Por favor ingrese un email';
-                                  }
-                                  final RegExp emailRegExp = RegExp(
-                                      r'^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$');
-                                  if (!emailRegExp.hasMatch(value)) {
-                                    return 'Por favor ingrese un email válido';
-                                  }
-                                  return null;
-                                },
-                                decoration: const InputDecoration(
-                                    prefixIcon: Icon(Icons.email_outlined),
-                                    hintText: 'Email (Obligatorio)'),
-                              ),
-                        const SizedBox(height: 20.0),
-                        _email != null
-                            ? const SizedBox.shrink()
-                            : TextFormField(
-                                controller: _passwordController,
-                                obscureText: _obscureText,
-                                validator: (value) {
-                                  if (value == null || value.isEmpty) {
-                                    return 'Porfavor ingrese una contraseña.';
-                                  }
-                                  if (value.length < 5) {
-                                    return 'Debe tener al menos 5 caracteres.';
-                                  }
-                                  return null;
-                                },
-                                decoration: InputDecoration(
-                                    prefixIcon: const Icon(Icons.lock_outline),
-                                    suffixIcon: IconButton(
-                                      icon: Icon(
-                                        _obscureText
-                                            ? Icons.visibility
-                                            : Icons.visibility_off,
-                                        color: Colors.grey,
-                                      ),
-                                      onPressed: () {
-                                        setState(() {
-                                          _obscureText = !_obscureText;
-                                        });
-                                      },
+                  key: _formKey,
+                  child: Column(
+                    children: [
+                      TextFormField(
+                        controller: _nameController,
+                        maxLength: 50,
+                        validator: (value) {
+                          if (value == null || value.isEmpty) {
+                            return 'Porfavor ingrese un nombre.';
+                          }
+                          if (value.length < 5) {
+                            return 'Debe tener al menos 5 caracteres.';
+                          }
+                          return null;
+                        },
+                        decoration: const InputDecoration(
+                            prefixIcon: Icon(Icons.person_outline),
+                            hintText: 'Nombre (Obligatorio)'),
+                      ),
+                      const SizedBox(height: 0),
+                      _email != null
+                          ? TextFormField(
+                              onTap: () {
+                                _showEmailUpdateDialog(context);
+                              },
+                              readOnly: true,
+                              controller: _emailController,
+                              decoration: const InputDecoration(
+                                  prefixIcon: Icon(Icons.email_outlined),
+                                  hintText: 'Email (Obligatorio)'),
+                            )
+                          : TextFormField(
+                              controller: _emailController,
+                              validator: (String? value) {
+                                if (value == null || value.isEmpty) {
+                                  return 'Por favor ingrese un email';
+                                }
+                                final RegExp emailRegExp =
+                                    RegExp(r'^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$');
+                                if (!emailRegExp.hasMatch(value)) {
+                                  return 'Por favor ingrese un email válido';
+                                }
+                                return null;
+                              },
+                              decoration: const InputDecoration(
+                                  prefixIcon: Icon(Icons.email_outlined),
+                                  hintText: 'Email (Obligatorio)'),
+                            ),
+                      const SizedBox(height: 20.0),
+                      _email != null
+                          ? const SizedBox.shrink()
+                          : TextFormField(
+                              controller: _passwordController,
+                              obscureText: _obscureText,
+                              validator: (value) {
+                                if (value == null || value.isEmpty) {
+                                  return 'Porfavor ingrese una contraseña.';
+                                }
+                                if (value.length < 5) {
+                                  return 'Debe tener al menos 5 caracteres.';
+                                }
+                                return null;
+                              },
+                              decoration: InputDecoration(
+                                  prefixIcon: const Icon(Icons.lock_outline),
+                                  suffixIcon: IconButton(
+                                    icon: Icon(
+                                      _obscureText
+                                          ? Icons.visibility
+                                          : Icons.visibility_off,
+                                      color: Colors.grey,
                                    ),
-                                    hintText: 'Contraseña (Obligatorio)'),
-                              ),
-                        _email != null
-                            ? const SizedBox.shrink()
-                            : const SizedBox(height: 20.0),
-                        TextFormField(
-                          readOnly: true,
-                          onTap: () async {
-                            final String? ciudad = await Navigator.push(
-                              context,
-                              CupertinoPageRoute(
-                                builder: (BuildContext context) {
-                                  return const CityScreen();
-                                },
-                              ),
-                            ) as String?;
+                                    onPressed: () {
+                                      setState(() {
+                                        _obscureText = !_obscureText;
+                                      });
+                                    },
+                                  ),
+                                  hintText: 'Contraseña (Obligatorio)'),
+                            ),
+                      _email != null
+                          ? const SizedBox.shrink()
+                          : const SizedBox(height: 20.0),
+                      TextFormField(
+                        readOnly: true,
+                        onTap: () async {
+                          final String? ciudad = await Navigator.push(
+                            context,
+                            CupertinoPageRoute(
+                              builder: (BuildContext context) {
+                                return const CityScreen();
+                              },
+                            ),
+                          ) as String?;

-                            if (ciudad != null) {
-                              setState(() {
-                                _ciudad = ciudad;
-                              });
-                            }
-                          },
-                          decoration: InputDecoration(
-                              prefixIcon: const Icon(Icons.near_me),
-                              suffixIcon: const Icon(Icons.arrow_drop_down),
-                              hintStyle: city == ''
-                                  ? const TextStyle()
-                                  : const TextStyle(color: Colors.black87),
-                              hintText: city == '' ? 'Ciudad' : city),
+                          if (ciudad != null) {
+                            setState(() {
+                              _ciudad = ciudad;
+                            });
+                          }
+                        },
+                        decoration: InputDecoration(
+                          prefixIcon: const Icon(Icons.near_me),
+                          suffixIcon: const Icon(Icons.arrow_drop_down),
+                          hintStyle: city == ''
+                              ? const TextStyle()
+                              : const TextStyle(color: Colors.black87),
+                          hintText: city == '' ? 'Ciudad' : city,
                        ),
-                        const SizedBox(height: 20.0),
-                        TextFormField(
-                          controller: _phoneNumberController,
-                          readOnly: true,
-                          onTap: () {
-                            Navigator.of(context).push(
-                              CupertinoPageRoute(
-                                builder: (BuildContext context) {
-                                  return const NewNumberScreen();
-                                },
-                              ),
-                            );
-                          },
-                          decoration: const InputDecoration(
-                              prefixIcon: Icon(Icons.phone_android),
-                              suffixIcon: Icon(Icons.edit_outlined),
-                              hintText: '+57'),
+                      ),
+                      const SizedBox(height: 20.0),
+                      TextFormField(
+                        controller: _phoneNumberController,
+                        readOnly: true,
+                        onTap: () {
+                          Navigator.of(context).push(
+                            CupertinoPageRoute(
+                              builder: (BuildContext context) {
+                                return const NewNumberScreen();
+                              },
+                            ),
+                          );
+                        },
+                        decoration: const InputDecoration(
+                          prefixIcon: Icon(Icons.phone_android),
+                          suffixIcon: Icon(Icons.edit_outlined),
+                          hintText: '+57',
                        ),
-                      ],
-                    )),
+                      ),
+                      const SizedBox(height: 20.0),
+                      GenderDropdown(
+                        onChanged: (selectedGender) {
+                          setState(() {
+                            gender = selectedGender;
+                          });
+                        },
+                      ),
+                      const SizedBox(height: 20.0),
+                      BirthDatePicker(
+                        onDateSelected: (birthDay) {
+                          setState(() {
+                            birthDate = birthDay;
+                          });
+                        },
+                        controller: TextEditingController(
+                          text: birthDate == null
+                              ? ''
+                              : formatter.format(birthDate!),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
              ),
              Container(
                alignment: Alignment.bottomCenter,
@@ -649,7 +675,7 @@ class _ProfileScreenState extends State<ProfileScreen> {
                child: Column(
                  children: [
                    _email != null
-                        ? ElevatedButton(
+                        ? PrimaryButton(
                            onPressed: () {
                              Navigator.push(
                                context,
@@ -660,47 +686,19 @@ class _ProfileScreenState extends State<ProfileScreen> {
                                ),
                              );
                            },
-                            style: ElevatedButton.styleFrom(
-                              backgroundColor: const Color(0xFF2BA4EC),
-                              shape: RoundedRectangleBorder(
-                                borderRadius: BorderRadius.circular(50),
-                              ),
-                              elevation: 0,
-                              minimumSize: const Size(300, 45),
-                            ),
-                            child: const Text(
-                              'Cambiar Contraseña',
-                              style: TextStyle(
-                                color: Colors.white,
-                                fontWeight: FontWeight.bold,
-                                fontSize: 17,
-                              ),
-                            ),
+                            text: 'Cambiar Contraseña',
+                            minWidth: 300,
+                            minHeight: 45,
                          )
                        : const SizedBox(height: 20),
                    const SizedBox(height: 60),
-                    ElevatedButton(
+                    PrimaryButton(
                      onPressed: () async {
                        if (_formKey.currentState!.validate()) {
                          await updateInfo();
                        }
                      },
-                      style: ElevatedButton.styleFrom(
-                        backgroundColor: const Color(0xFF2BA4EC),
-                        shape: RoundedRectangleBorder(
-                          borderRadius: BorderRadius.circular(50),
-                        ),
-                        elevation: 0,
-                        minimumSize: const Size(200, 50),
-                      ),
-                      child: const Text(
-                        'Guardar',
-                        style: TextStyle(
-                          color: Colors.white,
-                          fontWeight: FontWeight.bold,
-                          fontSize: 17,
-                        ),
-                      ),
+                      text: 'Guardar',
                    ),
                  ],
                ),
@@ -12,9 +12,9 @@ import 'package:prosappco/src/components/pop_appbar.dart';
 import 'package:prosappco/src/components/primary_btn.dart';
 import 'package:prosappco/src/components/schedule_picker.dart';
 import 'package:prosappco/src/models/setting_model.dart';
-import 'package:prosappco/src/screens/horario.dart';
-import 'package:prosappco/src/screens/professional.dart';
-import 'package:prosappco/src/screens/professional_direccion.dart';
+import 'package:prosappco/src/presentation/screens/horario.dart';
+import 'package:prosappco/src/presentation/screens/professional.dart';
+import 'package:prosappco/src/presentation/screens/professional_direccion.dart';
 import 'package:prosappco/src/services/select_image_profile.dart';

 class ProfileProScreen extends StatefulWidget {
@@ -11,9 +11,9 @@ import 'package:prosappco/src/components/pop_appbar.dart';
 import 'package:prosappco/src/components/primary_btn.dart';
 import 'package:prosappco/src/components/schedule_picker.dart';
 import 'package:prosappco/src/models/setting_model.dart';
-import 'package:prosappco/src/screens/horario.dart';
-import 'package:prosappco/src/screens/professional.dart';
-import 'package:prosappco/src/screens/ubicacion.dart';
+import 'package:prosappco/src/presentation/screens/horario.dart';
+import 'package:prosappco/src/presentation/screens/professional.dart';
+import 'package:prosappco/src/presentation/screens/ubicacion.dart';

 class ProfileProWebScreen extends StatefulWidget {
  const ProfileProWebScreen({super.key});
@@ -11,9 +11,9 @@ import 'package:image_picker/image_picker.dart';
 import 'package:prosappco/src/authentication/authentication_repository.dart';
 import 'package:prosappco/src/components/photo_view_web.dart';
 import 'package:prosappco/src/components/pop_appbar.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/presentation/screens/city.dart';
+import 'package:prosappco/src/presentation/screens/new_number.dart';
+import 'package:prosappco/src/presentation/screens/new_password.dart';
 import 'package:universal_html/html.dart' as html;

 class ProfileWebScreen extends StatefulWidget {
@@ -10,8 +10,8 @@ import 'package:prosappco/src/components/primary_btn.dart';
 import 'package:prosappco/src/controllers/register_controller.dart';
 import 'package:prosappco/src/models/setting_model.dart';
 import 'package:prosappco/src/providers/user_provider.dart';
-import 'package:prosappco/src/screens/login/login.dart';
-import 'package:prosappco/src/screens/web_view.dart';
+import 'package:prosappco/src/presentation/screens/login/login.dart';
+import 'package:prosappco/src/presentation/screens/web_view.dart';
 import 'package:provider/provider.dart';
 import 'package:responsive_builder/responsive_builder.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -12,17 +12,17 @@ import 'package:get/get.dart';
 import 'package:google_maps_flutter/google_maps_flutter.dart';
 import 'package:flutter_polyline_points/flutter_polyline_points.dart';
 import 'package:prosappco/src/authentication/authentication_repository.dart';
-import 'package:prosappco/src/components/drawer_menu.dart';
+import 'package:prosappco/src/presentation/widgets/shared/drawer_menu.dart';
 import 'package:prosappco/src/models/event_model.dart';
 import 'package:prosappco/src/models/setting_model.dart';
 import 'package:prosappco/src/models/user_model.dart';
-import 'package:prosappco/src/screens/professional.dart';
+import 'package:prosappco/src/presentation/screens/professional.dart';
 import 'package:intl/intl.dart';
-import 'package:prosappco/src/screens/profile.dart';
-import 'package:prosappco/src/screens/profile_web.dart';
-import 'package:prosappco/src/screens/service_after.dart';
-import 'package:prosappco/src/screens/service_type.dart';
-import 'package:prosappco/src/screens/ubicacion.dart';
+import 'package:prosappco/src/presentation/screens/profile/profile.dart';
+import 'package:prosappco/src/presentation/screens/profile/profile_web.dart';
+import 'package:prosappco/src/presentation/screens/service_after.dart';
+import 'package:prosappco/src/presentation/screens/service_type.dart';
+import 'package:prosappco/src/presentation/screens/ubicacion.dart';
 import 'package:http/http.dart' as http;
 import 'package:prosappco/src/components/network_utility.dart';
 import 'package:package_info_plus/package_info_plus.dart';
@@ -62,7 +62,7 @@ class _ServiceScreenState extends State<ServiceScreen> {
  //   PolylinePoints polylinePoints = PolylinePoints();

  //   PolylineResult result = await polylinePoints.getRouteBetweenCoordinates(
-  //     'AIzaSyBp7vsJvD6oXz0FORBLEeIELwId4a2onHQ',
+  //     'AIzaSyCW_og6qQ8W8G-5_BxIS4sBnl8cLkjL95s',
  //     PointLatLng(startLat, startLng),
  //     PointLatLng(endLat, endLng),
  //   );
@@ -738,6 +738,7 @@ class _ServiceScreenState extends State<ServiceScreen> {
                  height: MediaQuery.of(context).size.height * 0.5,
                  child: GoogleMap(
                    myLocationEnabled: true,
+                    myLocationButtonEnabled: false,
                    mapType: MapType.normal,
                    initialCameraPosition: initialCameraPosition,
                    markers: markers,
@@ -8,7 +8,7 @@ import 'package:prosappco/src/models/event_model.dart';
 import 'package:prosappco/src/models/scores_model.dart';
 import 'package:prosappco/src/models/setting_model.dart';
 import 'package:prosappco/src/models/user_model.dart';
-import 'package:prosappco/src/screens/service.dart';
+import 'package:prosappco/src/presentation/screens/service.dart';

 class ServiceAfterScreen extends StatefulWidget {
  var eventoId;
@@ -1,7 +1,7 @@
 import 'package:diacritic/diacritic.dart';
 import 'package:flutter/material.dart';
 import 'package:prosappco/src/components/pop_appbar.dart';
-import 'package:prosappco/src/screens/profession.dart';
+import 'package:prosappco/src/presentation/screens/profession.dart';

 class ServiceTypeScreen extends StatefulWidget {
  const ServiceTypeScreen({super.key});
@@ -6,7 +6,7 @@ import 'package:intl/intl.dart';
 import 'package:prosappco/src/components/drawer_professional.dart';
 import 'package:prosappco/src/models/event_model.dart';
 import 'package:prosappco/src/models/scores_model.dart';
-import 'package:prosappco/src/screens/cita.dart';
+import 'package:prosappco/src/presentation/screens/cita.dart';

 class SolicitudScreen extends StatelessWidget {
  SolicitudScreen({super.key});
@@ -3,7 +3,7 @@ import 'dart:convert';
 import 'package:prosappco/src/components/network_utility.dart';
 import 'package:prosappco/src/components/pop_appbar.dart';

-import '../authentication/authentication_repository.dart';
+import '../../authentication/authentication_repository.dart';

 class UbicacionScreen extends StatefulWidget {
  const UbicacionScreen({super.key});
@@ -0,0 +1,50 @@
+import 'package:flutter/material.dart';
+
+class BirthDatePicker extends StatefulWidget {
+  final Function(DateTime) onDateSelected;
+  final TextEditingController controller;
+
+  const BirthDatePicker(
+      {Key? key, required this.onDateSelected, required this.controller})
+      : super(key: key);
+
+  @override
+  _BirthDatePickerState createState() => _BirthDatePickerState();
+}
+
+class _BirthDatePickerState extends State<BirthDatePicker> {
+  DateTime selectedDate =
+      DateTime.now().subtract(const Duration(days: 365 * 20));
+
+  Future<void> _selectDate(BuildContext context) async {
+    final DateTime? picked = await showDatePicker(
+      context: context,
+      initialDate: selectedDate,
+      firstDate: DateTime.now().subtract(const Duration(days: 365 * 120)),
+      lastDate: DateTime.now(),
+    );
+
+    if (picked != null && picked != selectedDate) {
+      setState(() {
+        selectedDate = picked;
+        widget.onDateSelected(selectedDate);
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return TextFormField(
+      onTap: () {
+        _selectDate(context);
+      },
+      readOnly: true,
+      decoration: const InputDecoration(
+        prefixIcon: Icon(Icons.calendar_month),
+        suffixIcon: Icon(Icons.arrow_drop_down),
+        hintText: 'Fecha de nacimiento',
+      ),
+      controller: widget.controller,
+    );
+  }
+}
@@ -0,0 +1,45 @@
+import 'package:flutter/material.dart';
+
+class GenderDropdown extends StatefulWidget {
+  final Function(String) onChanged;
+
+  const GenderDropdown({Key? key, required this.onChanged}) : super(key: key);
+
+  @override
+  _GenderDropdownState createState() => _GenderDropdownState();
+}
+
+class _GenderDropdownState extends State<GenderDropdown> {
+  String? selectedGender;
+
+  @override
+  Widget build(BuildContext context) {
+    return InputDecorator(
+      decoration: const InputDecoration(
+        border: UnderlineInputBorder(),
+        prefixIcon: Icon(Icons.people_outline),
+        contentPadding: EdgeInsets.symmetric(horizontal: 8.0),
+      ),
+      child: DropdownButtonHideUnderline(
+        child: DropdownButton<String>(
+          isExpanded: true,
+          value: selectedGender,
+          hint: const Text('Selecciona tu género'),
+          onChanged: (String? newValue) {
+            setState(() {
+              selectedGender = newValue;
+              widget.onChanged(selectedGender!);
+            });
+          },
+          items: ['Masculino', 'Femenino', 'Otro']
+              .map<DropdownMenuItem<String>>((String value) {
+            return DropdownMenuItem<String>(
+              value: value,
+              child: Text(value),
+            );
+          }).toList(),
+        ),
+      ),
+    );
+  }
+}
@@ -7,14 +7,14 @@ 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';
-import 'package:prosappco/src/screens/profile.dart';
-import 'package:prosappco/src/screens/profile_web.dart';
-import 'package:prosappco/src/screens/reputation.dart';
-import 'package:prosappco/src/screens/support.dart';
-import 'package:prosappco/src/screens/web_view.dart';
+import 'package:prosappco/src/presentation/screens/configuracion.dart';
+import 'package:prosappco/src/presentation/screens/messages_user.dart';
+import 'package:prosappco/src/presentation/screens/professional_profile_web.dart';
+import 'package:prosappco/src/presentation/screens/profile/profile.dart';
+import 'package:prosappco/src/presentation/screens/profile/profile_web.dart';
+import 'package:prosappco/src/presentation/screens/reputation.dart';
+import 'package:prosappco/src/presentation/screens/support.dart';
+import 'package:prosappco/src/presentation/screens/web_view.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
@@ -0,0 +1,37 @@
+import 'package:flutter/material.dart';
+
+class PrimaryButton extends StatelessWidget {
+  final VoidCallback onPressed;
+  final String text;
+  final double? minWidth;
+  final double? minHeight;
+
+  const PrimaryButton(
+      {super.key,
+      required this.onPressed,
+      required this.text,
+      this.minWidth = 200,
+      this.minHeight = 50});
+
+  @override
+  Widget build(BuildContext context) {
+    return ElevatedButton(
+        onPressed: onPressed,
+        style: ElevatedButton.styleFrom(
+          backgroundColor: const Color(0xFF2BA4EC),
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(50),
+          ),
+          elevation: 0,
+          minimumSize: Size(minWidth!, minHeight!),
+        ),
+        child: Text(
+          text,
+          style: const TextStyle(
+            color: Colors.white,
+            fontWeight: FontWeight.bold,
+            fontSize: 17,
+          ),
+        ));
+  }
+}