Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

auth-1 #21

Open
wants to merge 302 commits into
base: Auth-1
Choose a base branch
from
Open
Changes from 3 commits
Commits
Show all changes
302 commits
Select commit Hold shift + click to select a range
c54ac1d
Estiliza la sección de pictogramas, permite la autoselección de categ…
emiof Jun 14, 2023
b197a66
Cambia el tamaño del boton de bloqueo
emiof Jun 14, 2023
72112f7
Merge pull request #16 from davidmartinezhi/PictogramSectionMods2
emiof Jun 14, 2023
c956ba3
Optimized design and functionality
davidmartinezhi Jun 14, 2023
a212b18
Removido botón de registro
davidmartinezhi Jun 14, 2023
12080e8
Incorpora el doble comunciador, cambia las dimensiones de los botons …
emiof Jun 14, 2023
218e785
Merge pull request #17 from davidmartinezhi/PictogramSectionMods2
emiof Jun 14, 2023
ded1e8a
add app icon
Jun 14, 2023
e0df963
Corrige problema en la edición de pictogramas y categorias
emiof Jun 14, 2023
9eda6d5
Merge pull request #18 from davidmartinezhi/PictogramSectionMods2
emiof Jun 14, 2023
1107871
Añade una ventana de confirmación en la eliminación de pictogamas
emiof Jun 14, 2023
b982ac8
Merge pull request #19 from davidmartinezhi/PictogramSectionMods2
emiof Jun 14, 2023
2664c1f
Cambia el fondo de los comunicadores
emiof Jun 14, 2023
36a9890
Merge pull request #20 from davidmartinezhi/PictogramSectionMods2
emiof Jun 14, 2023
3754a05
New layout
davidmartinezhi Jun 14, 2023
e749c06
Merge remote-tracking branch 'refs/remotes/origin/main'
davidmartinezhi Jun 14, 2023
1e46bc4
fixed repeated submissions
davidmartinezhi Jun 14, 2023
5ea5dd0
Added icon and name of app
davidmartinezhi Jun 15, 2023
34706f4
auth integrado
A01384318 Jun 15, 2023
2a6d913
Bloquea los botones de guardar de la sección de pictogramas durante o…
emiof Jun 15, 2023
db1b69c
Merge pull request #22 from davidmartinezhi/PictogramSectionMods2
emiof Jun 15, 2023
6e5a7e7
Bloquea el botón de regreo al bloquear la pantalla del comunicador
emiof Jun 15, 2023
441f0f3
Merge pull request #23 from davidmartinezhi/PictogramSectionMods2
emiof Jun 15, 2023
e749113
Merge pull request #24 from davidmartinezhi/Auth
A01384318 Jun 15, 2023
5c531b7
Merge remote-tracking branch 'refs/remotes/origin/main'
davidmartinezhi Jun 15, 2023
6e57b09
Added style
davidmartinezhi Jun 15, 2023
49ac79f
Create README.md
davidmartinezhi Jun 17, 2023
a9ecd24
Update README.md
davidmartinezhi Jun 17, 2023
f6de656
Inicia el desarrollo del álbum de comunicación
emiof Jul 22, 2023
fd26b56
Cambia la apariencia del álbum
emiof Jul 23, 2023
d41e8af
Añade el mecanismo de bloqueo, modifica la apariencia de la vista But…
emiof Jul 28, 2023
3b1f2bb
Otorga a la vista TextFieldView un opcional máximo número de caracter…
emiof Aug 7, 2023
fca9e92
Modifica BoardCache, disminuye el número de actualizaciones que incit…
emiof Aug 9, 2023
dcdbef6
Elimina los archivos CategoryCache y PictogramCache, su funcionalidad…
emiof Aug 9, 2023
96d45d8
Merge pull request #25 from davidmartinezhi/AlbumComm
emiof Aug 9, 2023
86692df
errores resueltos de botón de guardar deshabilitado en admin
Maria-Ontiveros Aug 16, 2023
7a6f16f
Merge pull request #26 from davidmartinezhi/ProblemsAdminTextfields
Maria-Ontiveros Aug 16, 2023
afe4cdf
cambio a un textfield de nota
Maria-Ontiveros Aug 16, 2023
a1caf32
Merge pull request #27 from davidmartinezhi/ProblemsAdminTextfields
Maria-Ontiveros Aug 16, 2023
62b80ea
Modifica la apariencia del la ventana destinada a la confirmación de …
emiof Aug 18, 2023
6f7171a
Hace imposible la creación de pictogramas sin imagenes, añade placeho…
emiof Aug 18, 2023
d295817
Special chars and numbers are not accepted as input in name
davidmartinezhi Aug 18, 2023
6e72c3d
Agregada verificación de nombres y selección de cumpleaños
davidmartinezhi Aug 18, 2023
524b401
Agregadas validaciones de fecha de nacimiento y nombre
davidmartinezhi Aug 18, 2023
03f1690
Agregados comentarios al código
davidmartinezhi Aug 18, 2023
4aca871
Merge pull request #28 from davidmartinezhi/fix-Pefil
davidmartinezhi Aug 18, 2023
f312773
Evita la interacción con el menú del usuario cuando el comunicador es…
emiof Aug 18, 2023
193857d
Merge pull request #29 from davidmartinezhi/ProblemasComunicador
emiof Aug 18, 2023
b7f0d35
Actualización de usuario después de ingresar a su perfil por medio de…
davidmartinezhi Aug 18, 2023
a674864
Actualizado mensaje de error al ingresar nombre/apellido incorrecto
davidmartinezhi Aug 18, 2023
edac31c
Merge pull request #30 from davidmartinezhi/fix-Pefil
davidmartinezhi Aug 18, 2023
4b8f1be
Correction de errores con foto de perfil en niño y admin, ahora foto …
joseart9 Aug 18, 2023
b5c55b8
Correction de errores
joseart9 Aug 18, 2023
81a8095
Correction de errores
joseart9 Aug 18, 2023
15995bc
Correction de errores
joseart9 Aug 18, 2023
c6ff601
Permite que la voz sintética sea probada durante su configuración
emiof Aug 18, 2023
a75b91c
Merge pull request #31 from davidmartinezhi/ProblemasComunicador
emiof Aug 18, 2023
5b9de9f
Reorder de botón para agregar notas a expediente
davidmartinezhi Aug 19, 2023
2eed72b
agregado texto de expediente, agregado divisor entre títulos y notas
davidmartinezhi Aug 19, 2023
a388d3c
Navbar desaparece al salir de pantalla administrativa
davidmartinezhi Aug 19, 2023
306d766
Merge branch 'main' into fix-Pefil
davidmartinezhi Aug 19, 2023
8369fba
Merge pull request #32 from davidmartinezhi/fix-Pefil
davidmartinezhi Aug 19, 2023
f2ad0a9
Mejora la selección del color de un texto según su color de fondo par…
emiof Aug 19, 2023
2366dae
Crea el modificador de vistas ScrollOffset
emiof Aug 21, 2023
d56e590
Merge pull request #33 from davidmartinezhi/ProblemasComunicador
emiof Aug 21, 2023
1ae62c9
Merge pull request #33 from davidmartinezhi/ProblemasComunicador
rodirgordzdl Aug 21, 2023
391d3be
Merge remote-tracking branch 'refs/remotes/origin/ProblemasLogin-Regi…
rodirgordzdl Aug 21, 2023
bb44c63
Merge remote-tracking branch 'refs/remotes/origin/ProblemasLogin-Regi…
rodirgordzdl Aug 21, 2023
5a71dc9
Merge remote-tracking branch 'refs/remotes/origin/ProblemasLogin-Regi…
rodirgordzdl Aug 21, 2023
2c9ea09
Merge remote-tracking branch 'refs/remotes/origin/ProblemasLogin-Regi…
rodirgordzdl Aug 21, 2023
9b85eb2
Agregadas validaciones a formularios de notas y usuarios
davidmartinezhi Aug 22, 2023
be80160
After deleting a patient, we return to admin view
davidmartinezhi Aug 22, 2023
fac3088
Crea NavigationPathWrapper, hace de la instancia que controla la nave…
emiof Aug 22, 2023
6a27bba
Permite la navegación programática al comunicador personal y al edito…
emiof Aug 22, 2023
3d37fb7
Permite la navegación programática al comunicador base y al editor de…
emiof Aug 23, 2023
a19c1ef
Modifica NavigationPathWrapper, y la estructura NavigationDestination
emiof Aug 23, 2023
979b293
Removido opción de álbum
davidmartinezhi Aug 23, 2023
d857684
Merge pull request #35 from davidmartinezhi/fix-Pefil-Emilio
davidmartinezhi Aug 23, 2023
665f006
Crea la vista MarkedScrollView y la incorpora al comunciador y editor…
emiof Aug 23, 2023
bb28974
Merge pull request #36 from davidmartinezhi/MarkedScrollView
emiof Aug 23, 2023
fe9d746
Elimina el archivo ScrollOffset
emiof Aug 23, 2023
cd512ea
Merge remote-tracking branch 'refs/remotes/origin/ProblemasLogin-Regi…
rodirgordzdl Aug 21, 2023
419738c
Simplifica los constructores de las vistas relacionadas al comunicador
emiof Aug 23, 2023
49954e0
quick access feature tested and ready to use
davidmartinezhi Aug 23, 2023
1bc2804
Merge pull request #37 from davidmartinezhi/feature-quickAccessCommun…
davidmartinezhi Aug 23, 2023
4f7176b
Añade al comunicador personal y al editor personal de pictogramas el …
emiof Aug 23, 2023
4bed1cb
Merge pull request #38 from davidmartinezhi/FixCommunicator
emiof Aug 23, 2023
95f590d
Corrige error en la navegación al comunicador desde AdminView
emiof Aug 24, 2023
2cc9615
Merge pull request #39 from davidmartinezhi/FixCommunicator
emiof Aug 24, 2023
86d50c4
Ajustado estilo navbar y menu de herramientas
davidmartinezhi Aug 25, 2023
20c555b
Merge pull request #41 from davidmartinezhi/filters-rework
davidmartinezhi Aug 25, 2023
f02eb74
Removido botón "resetear" y cambiado estilo de botones de filtrado
davidmartinezhi Aug 25, 2023
44a23ae
Definido estilo para botones de filtros
davidmartinezhi Aug 25, 2023
ba91442
Formateado titulo de cognición en botones de filtros
davidmartinezhi Aug 25, 2023
2f6f4f0
Ajustada anchura del botón para filtrado de comunicación
davidmartinezhi Aug 25, 2023
1b90516
Update LoginView.swift
Maria-Ontiveros Aug 25, 2023
6fe751b
Update LoginView.swift
Maria-Ontiveros Aug 25, 2023
63ae743
Reset filters when adding new patient
davidmartinezhi Aug 26, 2023
43bc704
Merge pull request #42 from davidmartinezhi/filters-rework
davidmartinezhi Aug 26, 2023
96496b4
Elimina el registro del archivo Filters
emiof Aug 26, 2023
dbc1d09
Incorpora a AdminView la vista SearchBarView, modifica la apariencia …
emiof Aug 27, 2023
d1c0854
Corrección en notas, se agrego tamaño dinámico. Corrección de manejo …
joseart9 Aug 27, 2023
463d326
Correccion de imagen default no mostrada en la creación de nuevo usuario
joseart9 Aug 27, 2023
68615a4
Añade a las secciones del comunicador el buscador por categoría
emiof Aug 28, 2023
0360382
Elimina el filtro de búsqueda por texto cuando se crea una categoría …
emiof Aug 28, 2023
9b3024c
Merge pull request #43 from davidmartinezhi/FixCommunicator
emiof Aug 28, 2023
b0c3d20
Impide que a una categoría se le asigne un color ya presente en el ac…
emiof Aug 28, 2023
b619056
Hace más ostensibles a los botones de navegación del comunicador cuan…
emiof Aug 28, 2023
13fb45d
Merge pull request #44 from davidmartinezhi/FixCommunicator
emiof Aug 28, 2023
52d3760
Cambiada terminología de "niño" a "paciente"
davidmartinezhi Aug 29, 2023
52280b9
Merge remote-tracking branch 'refs/remotes/origin/main'
davidmartinezhi Aug 29, 2023
262e342
Cambiada terminología "niño" a "paciente"
davidmartinezhi Aug 29, 2023
492741f
Auto-scroll cuando el titulo de la nota es seleccionado
davidmartinezhi Aug 29, 2023
319011b
Ajustado padding superior
davidmartinezhi Aug 29, 2023
4149eaf
Barra lateral con títulos, se actualiza en el instante que se cambia …
davidmartinezhi Aug 29, 2023
7314149
Auto scroll al presionar titulo de nota
davidmartinezhi Aug 29, 2023
b714978
Invertido order de las notas
davidmartinezhi Aug 30, 2023
1bb8cb7
Eliminados whitespace al final del string
davidmartinezhi Aug 30, 2023
b488448
Invertido el orden de notas y eliminado texto en blanco sobrante de i…
davidmartinezhi Aug 30, 2023
118e246
Mostrado icono de lápiz de edición posible
davidmartinezhi Aug 30, 2023
cd813e8
Merge pull request #47 from davidmartinezhi/featurepatients-notes-scroll
davidmartinezhi Aug 30, 2023
d90b9ce
Merge pull request #48 from davidmartinezhi/ProblemasLogin-Registro
A01384318 Aug 30, 2023
bc8b88c
Merge pull request #48 from davidmartinezhi/ProblemasLogin-Registro
rodirgordzdl Aug 30, 2023
e247443
added tag to model of note
davidmartinezhi Aug 30, 2023
6683de0
Adaptado viewModel para poder modelo de notas con tags
davidmartinezhi Aug 30, 2023
a6cfeac
Reposiciona el botón 'Agregar Pictograma' del editor de pictogramas
emiof Aug 31, 2023
e7006ae
Merge pull request #49 from davidmartinezhi/FixCommunicator
emiof Aug 31, 2023
6ff22f4
Reposiciona el botón 'Eliminar Pictograma' del editor de pictogramas
emiof Sep 3, 2023
4c641a2
Permite la eliminación de categorías aun cuando contiene pictogramas
emiof Sep 3, 2023
cbb1028
Merge pull request #50 from davidmartinezhi/FixCommunicator
emiof Sep 3, 2023
cba80f8
Modifica la apariencia del seleccionador de categorías del comunicador
emiof Sep 4, 2023
a7f4987
Merge pull request #51 from davidmartinezhi/FixCommunicator
emiof Sep 4, 2023
3a2e2e4
Actualizado texto de pantalla principal
davidmartinezhi Sep 6, 2023
57e7740
edit, add, delete, auto scroll enabled with filter of notes
davidmartinezhi Sep 6, 2023
1384c3a
Merge pull request #48 from davidmartinezhi/ProblemasLogin-Registro
rodirgordzdl Aug 30, 2023
1a06006
Merge remote-tracking branch 'refs/remotes/origin/main'
rodirgordzdl Sep 6, 2023
d3ce58d
Merge remote-tracking branch 'refs/remotes/origin/ProblemasLogin-Regi…
rodirgordzdl Sep 6, 2023
f95b0fb
Merge remote-tracking branch 'refs/remotes/origin/ProblemasLogin-Regi…
rodirgordzdl Sep 6, 2023
dbe0fa7
Merge remote-tracking branch 'refs/remotes/origin/ProblemasLogin-Regi…
rodirgordzdl Sep 6, 2023
b3e3966
show password added to other sections
Maria-Ontiveros Sep 6, 2023
18060e9
new moveNote method approach created
davidmartinezhi Sep 6, 2023
6fa0e5b
Merge branch 'main' into ShowPassword
Maria-Ontiveros Sep 7, 2023
d0fa7e6
Merge pull request #52 from davidmartinezhi/ShowPassword
Maria-Ontiveros Sep 7, 2023
7d9ae81
Merge remote-tracking branch 'refs/remotes/origin/ProblemasLogin-Regi…
KrakenDominguezz Sep 7, 2023
d5b051b
Merge pull request #53 from davidmartinezhi/ProblemasLogin-Registro
A01384318 Sep 7, 2023
6410378
New layout for user profile image
davidmartinezhi Sep 8, 2023
9c01680
Merge pull request #54 from davidmartinezhi/admin-dashboard
davidmartinezhi Sep 8, 2023
a115bc4
Agregado estilo
davidmartinezhi Sep 8, 2023
5c84540
Estandarizado estilo
davidmartinezhi Sep 8, 2023
7689f68
Agregado estilo
davidmartinezhi Sep 8, 2023
940a327
Merge pull request #55 from davidmartinezhi/admin-dashboard
davidmartinezhi Sep 8, 2023
6e9136e
Actualiza el método moveNote, para el reordenamiento de notas
emiof Sep 8, 2023
5ec1875
removed unnecessary moveNote functions
davidmartinezhi Sep 8, 2023
48e5722
Merge remote-tracking branch 'refs/remotes/origin/main'
davidmartinezhi Sep 8, 2023
fb81906
Actualizado edit notes
davidmartinezhi Sep 8, 2023
e839ec6
Merge pull request #57 from davidmartinezhi/merge_main_and_patient-no…
davidmartinezhi Sep 8, 2023
f6fe00d
patients displayed in alphabetical order
davidmartinezhi Sep 19, 2023
4b152c3
fixed note selection
davidmartinezhi Sep 19, 2023
6397d73
Merge pull request #59 from davidmartinezhi/rework/patients
davidmartinezhi Sep 19, 2023
83918f6
Merge pull request #60 from davidmartinezhi/FIxedImageHandling
joseart9 Sep 20, 2023
19d0256
Agregado borrar foto de perfil al momento de agregar un nuevo niño
joseart9 Sep 21, 2023
eb4afd9
Se agrego verificación de email al admin
joseart9 Sep 21, 2023
caac557
Modifica AuthViewModel, crea UserViewModel, corrige error de navegaci…
emiof Sep 26, 2023
3e4f365
Merge pull request #61 from davidmartinezhi/fix-logout-navigation
emiof Sep 26, 2023
cedf997
Added tags
davidmartinezhi Sep 29, 2023
98f708d
Added tag selection on notes edition
davidmartinezhi Sep 29, 2023
af14284
Added tag layout to note
davidmartinezhi Sep 29, 2023
a7a3cde
Filters without notes display empty notes message
davidmartinezhi Sep 29, 2023
3a0685a
Added style to tags
davidmartinezhi Sep 29, 2023
93c22cc
Added style to tag on note
davidmartinezhi Sep 29, 2023
13bc057
Merge pull request #62 from davidmartinezhi/rework/patients
davidmartinezhi Sep 29, 2023
671bec5
se arreglo el error donde no se actualizaba el perfil del paciente al…
Sep 29, 2023
3bd6452
Merge pull request #63 from davidmartinezhi/ErrorPatient
Maria-Ontiveros Sep 29, 2023
1498d6a
Inicia el desarrollo de la interfaz para la gestión de usuarios
emiof Oct 4, 2023
97b0082
Merge pull request #64 from davidmartinezhi/UserManagement
emiof Oct 4, 2023
9e5009d
Added functionality to filter notes by tag
davidmartinezhi Oct 4, 2023
a10059b
Estiliza UserManagement, añade filtrado por tipo de usuario
emiof Oct 5, 2023
27b976c
Merge pull request #65 from davidmartinezhi/UserManagement
emiof Oct 5, 2023
ae889b1
Crea el modelo VoiceSetting y la clase VoiceSettingViewModel
emiof Oct 5, 2023
96795cd
Completa el crear y guardar configuraciones de voz de pacientes
emiof Oct 5, 2023
a9909e9
Merge pull request #66 from davidmartinezhi/PatientVoiceConfig
emiof Oct 5, 2023
133c1c0
Evita guardar innecesariamente configuraciones de voz cuando no han o…
emiof Oct 6, 2023
9c6206f
Merge pull request #67 from davidmartinezhi/PatientVoiceConfig
emiof Oct 6, 2023
4ad46ca
Merge pull request #68 from davidmartinezhi/rework/patients
davidmartinezhi Oct 6, 2023
546918a
Funcionalidad para filtrar por tags
davidmartinezhi Oct 6, 2023
aff3ffe
Merge pull request #69 from davidmartinezhi/rework/patients
davidmartinezhi Oct 6, 2023
be33a18
Actualizado mecanismo de actualización de filtros
davidmartinezhi Oct 6, 2023
8807698
added color to notes index
davidmartinezhi Oct 6, 2023
6dda4de
adjusted size of add pictogram logo
davidmartinezhi Oct 6, 2023
e9d3c57
Adjusted text
davidmartinezhi Oct 6, 2023
8c55269
Merge pull request #70 from davidmartinezhi/rework/patients
davidmartinezhi Oct 7, 2023
04066f1
Modifica la forma en la que el usuario ingresa su contraseña dentro d…
emiof Oct 8, 2023
99522e2
Correciones de ortografía a vistas y alertas
Oct 9, 2023
ad17cf4
Merge pull request #72 from davidmartinezhi/CorrecionesOrtografia
Maria-Ontiveros Oct 9, 2023
eac80cb
Permite la carga de imagenes y su asignación a perfiles de usuario, e…
emiof Oct 10, 2023
4ceea29
Merge de main a UserManagement
emiof Oct 10, 2023
0cb5cc0
Añade padding a ImagePlaceholderView en PatientView
emiof Oct 10, 2023
9b810e5
Correciones de ortografía en UserView
emiof Oct 10, 2023
5bb40a1
Permite que el usuario defina la contraseña del nuevo usuario que crea
emiof Oct 11, 2023
4bedec3
Merge pull request #73 from davidmartinezhi/UserManagement
emiof Oct 11, 2023
18f3b2b
reworked size of tag colors
davidmartinezhi Oct 11, 2023
b7c27c6
Styled voice settings view
davidmartinezhi Oct 11, 2023
4be0d92
fixed image placeholder
davidmartinezhi Oct 11, 2023
acbdd8d
updated style of image place holder
davidmartinezhi Oct 11, 2023
c9d102d
Merge pull request #74 from davidmartinezhi/rework/patients
davidmartinezhi Oct 11, 2023
40b5a42
Removed voice speed option for infant voice
davidmartinezhi Oct 12, 2023
06674bb
Changed buttons for communicators for users that are not admin
davidmartinezhi Oct 12, 2023
52c9f49
Merge pull request #75 from davidmartinezhi/rework/patients
davidmartinezhi Oct 12, 2023
775ce78
Removed Register User option from navbar
davidmartinezhi Oct 12, 2023
758c589
Added style to users management view
davidmartinezhi Oct 12, 2023
930d5cf
Merge pull request #76 from davidmartinezhi/rework/patients
davidmartinezhi Oct 12, 2023
70df456
Changed order of buttons
davidmartinezhi Oct 12, 2023
b5e56fc
Merge remote-tracking branch 'refs/remotes/origin/main'
davidmartinezhi Oct 12, 2023
287872a
Merge pull request #77 from davidmartinezhi/rework/patients
davidmartinezhi Oct 12, 2023
1ba40b7
Correcion de errores AdminMenuView
A01384318 Oct 13, 2023
8a43bfd
Correcion
A01384318 Oct 13, 2023
533f7c6
Correcion de validacion de correo
A01384318 Oct 13, 2023
e2415ff
correcion de alerta
A01384318 Oct 13, 2023
b9065c3
Merge pull request #78 from davidmartinezhi/errors-userMenu
A01384318 Oct 13, 2023
f5a0eb9
Fixed admin menu
davidmartinezhi Oct 13, 2023
e224616
updated buttons style
davidmartinezhi Oct 13, 2023
5ed579e
styled button
davidmartinezhi Oct 13, 2023
aaf33a6
filter works with letters that have accent
davidmartinezhi Oct 13, 2023
5377be6
fixed filter to work with letters that have accent
davidmartinezhi Oct 13, 2023
3a30d0a
filter works with words that have accent
davidmartinezhi Oct 13, 2023
72eeff5
Modifica la apariencia del selector de categorías
emiof Oct 15, 2023
f6fe746
Modifica la apariencia de los pictogramas al momento de ser presionados
emiof Oct 15, 2023
312fee8
Merge pull request #79 from davidmartinezhi/CategoryPickerRework
emiof Oct 15, 2023
cd4f18e
Modifica la edición de imagenes en UserManagement, y la validación de…
emiof Oct 16, 2023
609acd3
Merge pull request #80 from davidmartinezhi/UserManagementMerger
emiof Oct 16, 2023
1a9deb3
Corrige error en la edición de notas dentro de PatientView
emiof Oct 16, 2023
0a28564
Merge pull request #81 from davidmartinezhi/NoteUpdateFix
emiof Oct 16, 2023
767a141
Ajuste de auth enAdminMenuView
rodirgordzdl Oct 17, 2023
f0ec5fd
Ajuste AdminMenuView
rodirgordzdl Oct 17, 2023
ad9d5c6
ajuste seleción de imagen Admin
A01384318 Oct 17, 2023
5a89822
Merge remote-tracking branch 'origin/errors-userMenu' into main
rodirgordzdl Oct 17, 2023
5a0aea1
added spacing to add note button
davidmartinezhi Oct 17, 2023
c39a261
Modifica la edición de imagenes de usuario en UserManagement
emiof Oct 18, 2023
dc1647c
Corrige error en la actualización de la imagén de un usuario tras su …
emiof Oct 19, 2023
0830a9a
Crea archivo .gitignore para ignorar archivos .DS_Store
emiof Oct 19, 2023
d414b8c
Elimina el archivo .DS_Store
emiof Oct 19, 2023
7d01087
Crea un archivo .gitignore para ignorar achivos .DS_Store
emiof Oct 19, 2023
459b15d
Elimina archivo .DS_Store
emiof Oct 19, 2023
eada853
Merge pull request #82 from davidmartinezhi/UserManagementFixes
emiof Oct 19, 2023
593a28e
Implementa un indicador de progreso, y una ventana de retroalimentaci…
emiof Oct 20, 2023
36da085
Merge pull request #83 from davidmartinezhi/UserManagementFixes
emiof Oct 20, 2023
a3bddf9
Corrige error producido por el acceso a Mi Perfil cuando el usuario a…
emiof Oct 20, 2023
8885041
Merge pull request #84 from davidmartinezhi/UserProfileFix
emiof Oct 20, 2023
83dd665
Correción de ortografía
Maria-Ontiveros Oct 20, 2023
bccc54e
reworked style of form
davidmartinezhi Oct 20, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -103,26 +103,25 @@ struct PictogramPickerView: View {
}
}

private func buildPictoViewButtons(_ pictoModels: [PictogramModel]) -> [Button<PictogramView>] {
var pictoButtons: [Button<PictogramView>] = []
private func buildPictoViewButtons(_ pictoModels: [PictogramModel]) -> [PictogramView] {
var pictoButtons: [PictogramView] = []

for pictoModel in pictoModels {
pictoButtons.append(
Button(action: {
if pickedPictos[pictoModel.id!] == nil {
pickedPictos[pictoModel.id!] = PictogramInPage(pictoId: pictoModel.id!, isBasePicto: onLeftOfSwitch)
} else {
pickedPictos.removeValue(forKey: pictoModel.id!)
}
}, label: {
PictogramView(pictoModel: pictoModel,
catModel: catVM.getCat(catId: pictoModel.categoryId)!,
displayName: true,
displayCatColor: false,
overlayImage: pickedPictos[pictoModel.id!] != nil ? Image(systemName: "checkmark.circle") : nil,
overlayImageColor: .blue,
overlyImageOpacity: 0.8)
})
PictogramView(pictoModel: pictoModel,
catModel: catVM.getCat(catId: pictoModel.categoryId)!,
displayName: true,
displayCatColor: false,
overlayImage: pickedPictos[pictoModel.id!] != nil ? Image(systemName: "checkmark.circle") : nil,
overlayImageColor: .blue,
overlyImageOpacity: 0.8,
clickAction: {
if self.pickedPictos[pictoModel.id!] == nil {
self.pickedPictos[pictoModel.id!] = PictogramInPage(pictoId: pictoModel.id!, isBasePicto: self.onLeftOfSwitch)
} else {
self.pickedPictos.removeValue(forKey: pictoModel.id!)
}
})
)
}
return pictoButtons
Original file line number Diff line number Diff line change
@@ -131,35 +131,34 @@ struct Communicator: View {
.navigationBarBackButtonHidden(appLock.isLocked)
}

private func buildPictoViewButtons(_ pictoModels: [PictogramModel]) -> [Button<PictogramView>] {
var pictoButtons: [Button<PictogramView>] = []
private func buildPictoViewButtons(_ pictoModels: [PictogramModel]) -> [PictogramView] {
var pictoButtons: [PictogramView] = []

for pictoModel in pictoModels {
pictoButtons.append(
Button(action: {
//text to speech
let utterance = AVSpeechUtterance(string: pictoModel.name)
PictogramView(pictoModel: pictoModel,
catModel: catVM.getCat(catId: pictoModel.categoryId)!,
displayName: true,
displayCatColor: false,
overlayImage: Image(systemName: "speaker.wave.3.fill"),
overlayImageColor: .gray,
overlyImageOpacity: 0.2,
clickAction: {
//text to speech
let utterance = AVSpeechUtterance(string: pictoModel.name)

if (voiceSetting.voiceAge == "Infantil") {
utterance.voice = AVSpeechSynthesisVoice(language: "es-MX")
utterance.rate = 0.5
utterance.pitchMultiplier = 1.5
} else {
utterance.voice = voiceSetting.voiceGender == "Masculina" ? AVSpeechSynthesisVoice(identifier: "com.apple.eloquence.es-MX.Reed") : AVSpeechSynthesisVoice(language: "es-MX")

utterance.rate = voiceSetting.talkingSpeed == "Normal" ? 0.5 : voiceSetting.talkingSpeed == "Lenta" ? 0.3 : 0.7
}
if (self.voiceSetting.voiceAge == "Infantil") {
utterance.voice = AVSpeechSynthesisVoice(language: "es-MX")
utterance.rate = 0.5
utterance.pitchMultiplier = 1.5
} else {
utterance.voice = self.voiceSetting.voiceGender == "Masculina" ? AVSpeechSynthesisVoice(identifier: "com.apple.eloquence.es-MX.Reed") : AVSpeechSynthesisVoice(language: "es-MX")
utterance.rate = self.voiceSetting.talkingSpeed == "Normal" ? 0.5 : self.voiceSetting.talkingSpeed == "Lenta" ? 0.3 : 0.7
}

synthesizer.speak(utterance)
}, label: {
PictogramView(pictoModel: pictoModel,
catModel: catVM.getCat(catId: pictoModel.categoryId)!,
displayName: true,
displayCatColor: false,
overlayImage: Image(systemName: "speaker.wave.3.fill"),
overlayImageColor: .gray,
overlyImageOpacity: 0.2)
})
self.synthesizer.speak(utterance)
})
)
}
return pictoButtons
Original file line number Diff line number Diff line change
@@ -146,24 +146,23 @@ struct PictogramEditor: View {
}

// Función que construye los botones de los pictogramas
private func buildPictoViewButtons(_ pictoModels: [PictogramModel]) -> [Button<PictogramView>] {
var pictoButtons: [Button<PictogramView>] = []
private func buildPictoViewButtons(_ pictoModels: [PictogramModel]) -> [PictogramView] {
var pictoButtons: [PictogramView] = []

for pictoModel in pictoModels {
pictoButtons.append(
Button(action: {
pictoBeingEdited = pictoModel
isEditingPicto = true
}, label: {
PictogramView(pictoModel: pictoModel,
catModel: catVM.getCat(catId: pictoModel.categoryId)!,
displayName: true,
displayCatColor: false,
overlayImage: Image(systemName: "pencil"),
overlayImageWidth: 0.2,
overlayImageColor: .gray,
overlyImageOpacity: 0.2)
})
PictogramView(pictoModel: pictoModel,
catModel: catVM.getCat(catId: pictoModel.categoryId)!,
displayName: true,
displayCatColor: false,
overlayImage: Image(systemName: "pencil"),
overlayImageWidth: 0.2,
overlayImageColor: .gray,
overlyImageOpacity: 0.2,
clickAction: {
self.pictoBeingEdited = pictoModel
self.isEditingPicto = true
})
)
}
return pictoButtons
Original file line number Diff line number Diff line change
@@ -10,23 +10,19 @@ import SwiftUI

struct ColorMaker {
static func buildforegroundTextColor(r: Double, g: Double, b: Double) -> Color {
let colorLuminance: Double = (r * 0.2126) + (g * 0.7152) + (b * 0.0722)
// let contrastWithBlack: Double = (colorLuminance + 0.05) / 0.05
// let contrastWithWhite: Double = (1 + 0.05) / (colorLuminance + 0.05)

// return contrastWithWhite >= (contrastWithBlack * 0.9) ? .white : .black

return colorLuminance < 0.6 ? .white : .black
return ColorMaker.colorLuminance(r: r, g: g, b: b) < 0.6 ? .white : .black
}

static func buildforegroundTextColor(catColor: CategoryColor) -> Color {
let colorLuminance: Double = (catColor.r * 0.2126) + (catColor.g * 0.7152) + (catColor.b * 0.0722)
// let contrastWithBlack: Double = (colorLuminance + 0.05) / 0.05
// let contrastWithWhite: Double = (1 + 0.05) / (colorLuminance + 0.05)

// return contrastWithWhite >= (contrastWithBlack * 0.9) ? .white : .black

return colorLuminance < 0.6 ? .white : .black
return ColorMaker.colorLuminance(catColor: catColor) < 0.6 ? .white : .black
}

static func colorLuminance(r: Double, g: Double, b: Double) -> Double {
return (r * 0.2126) + (g * 0.7152) + (b * 0.0722)
}

static func colorLuminance(catColor: CategoryColor) -> Double {
return (catColor.r * 0.2126) + (catColor.g * 0.7152) + (catColor.b * 0.0722)
}

static func getBasicColors() -> [(r: Double, g: Double, b: Double)] {
Original file line number Diff line number Diff line change
@@ -126,6 +126,10 @@ struct CategoryColor: Codable {
return true
}

func isBright() -> Bool {
return ColorMaker.colorLuminance(catColor: self) >= 0.6
}

static func normalizeColorValue(_ colorValue: Double) -> Double {
return colorValue > 1 ? 1 : (colorValue < 0 ? 0 : colorValue)
}
Original file line number Diff line number Diff line change
@@ -11,34 +11,36 @@ struct CategoryPickerView: View {
var categoryModels: [CategoryModel]
@Binding var pickedCategoryId: String
@Binding var userHasChosenCat: Bool

var body: some View {
MarkedScrollView(scrollDirection: .horizontal) {
HStack(spacing: 11){
ForEach(categoryModels) { catModel in
Button {
ZStack {
let catIsSelected: Bool = catModel.id! == pickedCategoryId

CategoryButtonTextView(catName: catModel.name, foregroundColor: Color.clear, background: catModel.buildColor())
.clipShape(RoundedRectangle(cornerRadius: 10))
.scaleEffect(y: catIsSelected ? 2 : 1, anchor: .top)

CategoryButtonTextView(catName: catModel.name, foregroundColor: ColorMaker.buildforegroundTextColor(catColor: catModel.color), background: catModel.buildColor())
.overlay(alignment: .top) {
Rectangle()
.foregroundColor(catModel.buildColor(colorShift: catModel.color.isBright() ? -0.15 : 0.15))
.frame(height: 5)
.opacity(catIsSelected ? 1 : 0)
}
.clipShape(RoundedRectangle(cornerRadius: 10))
.onAppear {
print(catModel.color.isBright())
}
}
.onTapGesture {
pickedCategoryId = catModel.id!

if !userHasChosenCat {
userHasChosenCat = true
}
} label: {
ZStack(alignment: .top) {
Text(catModel.name)
.frame(minWidth: 60)
.padding()
.bold()
.foregroundColor(ColorMaker.buildforegroundTextColor(catColor: catModel.color))
.background(catModel.buildColor())
.overlay(alignment: .top) {
Rectangle()
.foregroundColor(catModel.buildColor(colorShift: -0.15))
.frame(height: 4)
.opacity(catModel.id! == pickedCategoryId ? 1 : 0)
}
.clipShape(RoundedRectangle(cornerRadius: 10))
}
.offset(y: catModel.id! == pickedCategoryId ? 20 : 0)
}
}
}
@@ -52,3 +54,18 @@ struct CategoryPickerView: View {
}
}
}

struct CategoryButtonTextView: View {
let catName: String
let foregroundColor: Color
let background: Color

var body: some View {
Text(catName)
.frame(minWidth: 60)
.padding()
.bold()
.foregroundColor(foregroundColor)
.background(background)
}
}
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@
import SwiftUI

struct PictogramGridView: View {
let pictograms: [Button<PictogramView>]
let pictograms: [PictogramView]
let pictoWidth: CGFloat
let pictoHeight: CGFloat
var handlePictogramAddition: (() -> Void)? = nil
Loading