Haroon6138
/
HMG_Patient_App_New
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Compare commits

base: Haroon6138:17c47d093c844c6c38e56c5c153ab60b6f96d366
Branches Tags
Haroon6138:dev_aamir
Haroon6138:haroon_dev
Haroon6138:faiz_dev
Haroon6138:master
Haroon6138:dev_sultan
Haroon6138:ambulance_ui
Haroon6138:dev_sikander
Haroon6138:main
..
compare: Haroon6138:2b7656d83a10e5304f3c275b2047af804665f9cc
Branches Tags
Haroon6138:dev_aamir
Haroon6138:haroon_dev
Haroon6138:faiz_dev
Haroon6138:master
Haroon6138:dev_sultan
Haroon6138:ambulance_ui
Haroon6138:dev_sikander
Haroon6138:main

No commits in common. '17c47d093c844c6c38e56c5c153ab60b6f96d366' and '2b7656d83a10e5304f3c275b2047af804665f9cc' have entirely different histories.
17c47d093c ... 2b7656d83a

42 changed files with 661 additions and 1091 deletions
Show Stats

4
assets/images/svg/accessibility.svg
Unescape Escape View File

@ -1,4 +0,0 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M9.32002 9.29609C9.86002 9.17609 10.43 9.08613 11 9.03613L11 14.9961H10.67C10.11 14.9961 9.67002 15.4461 9.67002 15.9961C9.67002 16.5461 10.11 16.9961 10.67 16.9961L13.33 16.9961C13.89 16.9961 14.33 16.5461 14.33 15.9961C14.33 15.4461 13.89 14.9961 13.33 14.9961H13L13 9.03613C13.57 9.08613 14.14 9.17609 14.68 9.29609C14.7282 9.30924 14.7706 9.32047 14.809 9.33062C14.8582 9.34363 14.9007 9.35488 14.94 9.36611C14.95 9.36611 14.96 9.3686 14.97 9.37109C14.98 9.37358 14.99 9.37607 15 9.37607V9.77607C15 10.3261 15.45 10.7761 16 10.7761C16.55 10.7761 17 10.3261 17 9.77607V9.73613C17 9.52613 17 9.30615 16.98 9.10615C16.96 8.87615 16.9 8.61609 16.75 8.34609C16.66 8.18609 16.53 8.02615 16.4 7.90615C16.02 7.55615 15.55 7.44607 15.22 7.37607C15.19 7.36607 15.16 7.35615 15.13 7.35615C14.13 7.11615 13.08 6.99609 12 6.99609C10.92 6.99609 9.87002 7.11615 8.87002 7.35615C8.84002 7.35615 8.80998 7.36607 8.77998 7.37607C8.44998 7.44607 7.98 7.55615 7.6 7.90615C7.47 8.02615 7.34 8.18609 7.25 8.34609C7.1 8.61609 7.04002 8.87615 7.02002 9.10615C7.00002 9.30615 7 9.52613 7 9.73613V9.77607C7 10.3261 7.45 10.7761 8 10.7761C8.55 10.7761 9 10.3261 9 9.77607V9.37607C9.01 9.37607 9.01999 9.37358 9.02998 9.37109C9.03997 9.3686 9.04996 9.36611 9.05996 9.36611C9.09929 9.35488 9.14179 9.34363 9.191 9.33062C9.22937 9.32047 9.27182 9.30924 9.32002 9.29609Z" fill="#8F9AA3"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M4.04004 1.24609H3.95996C3.51996 1.24609 3.13 1.24613 2.8 1.28613C2.45 1.33613 2.06996 1.44615 1.75996 1.75615C1.44996 2.06615 1.34004 2.44609 1.29004 2.79609C1.25004 3.12609 1.25 3.51615 1.25 3.95615V4.03613C1.25 4.47613 1.25004 4.86609 1.29004 5.19609C1.34004 5.54609 1.44996 5.92613 1.75996 6.23613C2.06996 6.54613 2.45 6.65615 2.8 6.70615C2.86441 6.71396 2.9311 6.72024 3 6.72529L3 17.267C2.9311 17.272 2.86441 17.2783 2.8 17.2861C2.45 17.3361 2.06996 17.4462 1.75996 17.7562C1.44996 18.0662 1.34004 18.4461 1.29004 18.7961C1.25004 19.1261 1.25 19.5162 1.25 19.9562V20.0361C1.25 20.4761 1.25004 20.8661 1.29004 21.1961C1.34004 21.5461 1.44996 21.9261 1.75996 22.2361C2.06996 22.5461 2.45 22.6562 2.8 22.7062C3.12951 22.7461 3.51881 22.7461 3.95802 22.7461H4.04198C4.48119 22.7461 4.87049 22.7461 5.2 22.7062C5.55 22.6562 5.93004 22.5461 6.24004 22.2361C6.55004 21.9261 6.65996 21.5461 6.70996 21.1961C6.71777 21.1317 6.72405 21.065 6.72911 20.9961L17.2709 20.9961C17.2759 21.065 17.2822 21.1317 17.29 21.1961C17.34 21.5461 17.45 21.9261 17.76 22.2361C18.07 22.5461 18.45 22.6562 18.8 22.7062C19.1295 22.7461 19.5188 22.7461 19.958 22.7461H20.042C20.4812 22.7461 20.8705 22.7461 21.2 22.7062C21.55 22.6562 21.93 22.5461 22.24 22.2361C22.55 21.9261 22.66 21.5461 22.71 21.1961C22.75 20.8661 22.75 20.4761 22.75 20.0361V19.9562C22.75 19.5162 22.75 19.1261 22.71 18.7961C22.66 18.4461 22.55 18.0662 22.24 17.7562C21.93 17.4462 21.55 17.3361 21.2 17.2861C21.1356 17.2783 21.0689 17.272 21 17.267L21 6.72529C21.0689 6.72024 21.1356 6.71396 21.2 6.70615C21.55 6.65615 21.93 6.54613 22.24 6.23613C22.55 5.92613 22.66 5.54609 22.71 5.19609C22.75 4.86609 22.75 4.47613 22.75 4.03613V3.95615C22.75 3.51615 22.75 3.12609 22.71 2.79609C22.66 2.44609 22.55 2.06615 22.24 1.75615C21.93 1.44615 21.55 1.33613 21.2 1.28613C20.87 1.24613 20.48 1.24609 20.04 1.24609H19.96C19.52 1.24609 19.13 1.24613 18.8 1.28613C18.45 1.33613 18.07 1.44615 17.76 1.75615C17.45 2.06615 17.34 2.44609 17.29 2.79609C17.2822 2.8605 17.2759 2.92719 17.2709 2.99609L6.72911 2.99609C6.72405 2.92719 6.71777 2.8605 6.70996 2.79609C6.65996 2.44609 6.55004 2.06615 6.24004 1.75615C5.93004 1.44615 5.55 1.33613 5.2 1.28613C4.87 1.24613 4.48004 1.24609 4.04004 1.24609ZM17.29 18.7961C17.2822 18.8605 17.2759 18.9272 17.2709 18.9961L6.72911 18.9961C6.72405 18.9272 6.71777 18.8605 6.70996 18.7961C6.65996 18.4461 6.55004 18.0662 6.24004 17.7562C5.93004 17.4462 5.55 17.3361 5.2 17.2861C5.13559 17.2783 5.0689 17.272 5 17.267L5 6.72529C5.0689 6.72024 5.13559 6.71396 5.2 6.70615C5.55 6.65615 5.93004 6.54613 6.24004 6.23613C6.55004 5.92613 6.65996 5.54609 6.70996 5.19609C6.71777 5.13169 6.72405 5.065 6.72911 4.99609L17.2709 4.99609C17.2759 5.065 17.2822 5.13169 17.29 5.19609C17.34 5.54609 17.45 5.92613 17.76 6.23613C18.07 6.54613 18.45 6.65615 18.8 6.70615C18.8644 6.71396 18.9311 6.72024 19 6.72529L19 17.267C18.9311 17.272 18.8644 17.2783 18.8 17.2861C18.45 17.3361 18.07 17.4462 17.76 17.7562C17.45 18.0662 17.34 18.4461 17.29 18.7961Z" fill="#8F9AA3"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 4.4 KiB

4
assets/images/svg/arrow_forward.svg
Unescape Escape View File

@ -1,4 +0,0 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M14.43 18.823C14.24 18.823 14.05 18.753 13.9 18.603C13.61 18.313 13.61 17.833 13.9 17.543L19.44 12.003L13.9 6.46305C13.61 6.17305 13.61 5.69305 13.9 5.40305C14.19 5.11305 14.67 5.11305 14.96 5.40305L21.03 11.473C21.32 11.763 21.32 12.243 21.03 12.533L14.96 18.603C14.81 18.753 14.62 18.823 14.43 18.823Z" fill="#2E3039"/>
<path d="M20.33 12.753H3.5C3.09 12.753 2.75 12.413 2.75 12.003C2.75 11.593 3.09 11.253 3.5 11.253H20.33C20.74 11.253 21.08 11.593 21.08 12.003C21.08 12.413 20.74 12.753 20.33 12.753Z" fill="#2E3039"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 635 B

3
assets/images/svg/call_fill.svg
Unescape Escape View File

@ -1,3 +0,0 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M5.31726 1.28657C5.88395 1.40369 6.33524 1.78443 6.61564 2.28746L7.50885 3.88991C7.83786 4.48011 8.11473 4.9768 8.29554 5.40857C8.48735 5.86658 8.60126 6.31824 8.54919 6.8176C8.49711 7.31696 8.29246 7.7354 8.01029 8.14399C7.74428 8.52917 7.37088 8.95804 6.92718 9.46767L5.61417 10.9759C5.37889 11.2461 5.26124 11.3812 5.25049 11.5501C5.23974 11.719 5.33616 11.8633 5.529 12.1518C7.17259 14.6109 9.38773 16.8268 11.8488 18.4718C12.1374 18.6647 12.2816 18.7611 12.4505 18.7503C12.6194 18.7396 12.7546 18.6219 13.0248 18.3866L14.5331 17.0736C15.0427 16.6299 15.4716 16.2565 15.8568 15.9905C16.2653 15.7083 16.6838 15.5036 17.1831 15.4516C17.6825 15.3995 18.1342 15.5134 18.5922 15.7052C19.0239 15.886 19.5206 16.1629 20.1107 16.4918L21.7133 17.3851C22.2163 17.6655 22.5971 18.1168 22.7142 18.6835C22.8325 19.2561 22.658 19.8316 22.2724 20.3047C20.8735 22.021 18.6322 23.1139 16.281 22.6396C14.8358 22.348 13.4098 21.8623 11.6851 20.8732C8.2197 18.8858 5.11263 15.777 3.12755 12.3157C2.13843 10.591 1.65272 9.165 1.36118 7.71974C0.88688 5.36852 1.97971 3.12724 3.69608 1.72833C4.16911 1.34279 4.74466 1.16822 5.31726 1.28657Z" fill="#8F9AA3"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

3
assets/images/svg/email_transparent.svg
Unescape Escape View File

@ -1,3 +0,0 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.6823 2.78681C12.7265 2.73773 11.2735 2.73774 9.3177 2.78681L9.24285 2.78869C7.73349 2.82652 6.49161 2.85765 5.49064 3.03175C4.42828 3.21654 3.53876 3.57641 2.78536 4.33174C2.0359 5.08311 1.67705 5.9586 1.49526 7.00416C1.32465 7.98538 1.29883 9.19623 1.26758 10.6617L1.26597 10.7371C1.24467 11.7351 1.24468 12.265 1.26599 13.2629L1.2676 13.3383C1.29884 14.8038 1.32466 16.0146 1.49527 16.9959C1.67707 18.0414 2.03592 18.9169 2.78537 19.6683C3.53878 20.4236 4.42829 20.7835 5.49066 20.9683C6.49162 21.1424 7.7335 21.1735 9.24286 21.2113L9.31772 21.2132C11.2735 21.2623 12.7265 21.2623 14.6823 21.2132L14.7571 21.2113C16.2665 21.1735 17.5084 21.1423 18.5094 20.9682C19.5717 20.7835 20.4612 20.4236 21.2146 19.6683C21.9641 18.9169 22.323 18.0414 22.5047 16.9958C22.6754 16.0146 22.7012 14.8038 22.7324 13.3383L22.734 13.2629C22.7553 12.2649 22.7553 11.7351 22.734 10.7371L22.7324 10.6618C22.7012 9.19627 22.6753 7.98538 22.5047 7.00416C22.3229 5.9586 21.9641 5.08311 21.2146 4.33174C20.7913 3.90728 20.3249 3.6077 19.809 3.39389C19.7305 3.35104 19.6464 3.31873 19.5587 3.29811C19.2289 3.18184 18.8796 3.09616 18.5093 3.03176C17.5084 2.85765 16.2665 2.82652 14.7571 2.78868L14.6823 2.78681ZM20.6798 8.8503C20.6604 8.44479 20.6507 8.24204 20.5039 8.16109C20.3571 8.08014 20.1765 8.18242 19.8155 8.38697L15.5798 10.787C14.2801 11.5234 13.181 12 11.9998 12C10.8186 12 9.71946 11.5234 8.41985 10.787L4.18445 8.38719C3.82343 8.18263 3.64292 8.08035 3.49608 8.1613C3.34924 8.24225 3.33957 8.44501 3.32023 8.85053C3.29416 9.39704 3.28003 10.0306 3.26403 10.7797C3.24333 11.7492 3.24334 12.2508 3.26405 13.2203C3.29736 14.7803 3.32261 15.8393 3.46432 16.6543C3.59776 17.4218 3.82038 17.8777 4.20122 18.2595C4.5781 18.6374 5.04027 18.8638 5.83355 19.0018C6.67174 19.1476 7.76497 19.1776 9.36791 19.2178C11.2902 19.266 12.7098 19.266 14.6321 19.2178C16.235 19.1776 17.3283 19.1476 18.1665 19.0018C18.9597 18.8638 19.4219 18.6374 19.7988 18.2595C20.1796 17.8777 20.4023 17.4218 20.5357 16.6543C20.6774 15.8393 20.7027 14.7803 20.736 13.2203C20.7567 12.2508 20.7567 11.7492 20.736 10.7797C20.72 10.0305 20.7058 9.39687 20.6798 8.8503Z" fill="#8F9AA3"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

3
assets/images/svg/emergency.svg
Unescape Escape View File

@ -1,3 +0,0 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M6.01648 5.41956C6.03581 5.05074 6.07429 4.70741 6.14301 4.39459C6.25632 3.8788 6.46503 3.38426 6.86214 2.98714C7.25926 2.59003 7.7538 2.38132 8.26959 2.26801C8.77406 2.15719 9.35786 2.125 10 2.125L14 2.125C14.6421 2.125 15.2259 2.15719 15.7304 2.26801C16.2462 2.38132 16.7407 2.59003 17.1379 2.98714C17.535 3.38426 17.7437 3.8788 17.857 4.39459C17.9257 4.70741 17.9642 5.05074 17.9835 5.41956C18.325 5.43802 18.6415 5.46412 18.9342 5.50102C19.9621 5.63057 20.8113 5.90463 21.4878 6.5389C22.1712 7.1796 22.4729 7.99471 22.6143 8.98061C22.75 9.92738 22.75 11.1319 22.75 12.6289V14.6211C22.75 16.1181 22.75 17.3226 22.6143 18.2694C22.4729 19.2553 22.1712 20.0704 21.4878 20.7111C20.8113 21.3454 19.9621 21.6194 18.9342 21.749C17.9342 21.875 16.6579 21.875 15.0527 21.875H8.94733C7.3421 21.875 6.06579 21.875 5.06576 21.749C4.03794 21.6194 3.18873 21.3454 2.51217 20.7111C1.82877 20.0704 1.52713 19.2553 1.38574 18.2694C1.24996 17.3226 1.24998 16.1181 1.25 14.6211L1.25 12.6289C1.24998 11.1319 1.24996 9.92739 1.38574 8.98061C1.52713 7.99471 1.82877 7.1796 2.51217 6.5389C3.18873 5.90463 4.03794 5.63057 5.06576 5.50102C5.35855 5.46412 5.67501 5.43802 6.01648 5.41956ZM8.02299 5.376C8.03911 5.15406 8.06365 4.97295 8.09643 4.82372C8.15781 4.54433 8.23372 4.44399 8.27636 4.40136C8.31899 4.35872 8.41933 4.28281 8.69872 4.22143C8.98944 4.15756 9.40114 4.125 10 4.125L14 4.125C14.5989 4.125 15.0106 4.15756 15.3013 4.22143C15.5807 4.28281 15.681 4.35872 15.7236 4.40136C15.7663 4.44399 15.8422 4.54433 15.9036 4.82372C15.9364 4.97295 15.9609 5.15406 15.977 5.376C15.6818 5.37499 15.3738 5.375 15.0527 5.375L8.94732 5.375C8.6262 5.375 8.31821 5.37499 8.02299 5.376ZM12 9.625C12.5523 9.625 13 10.0727 13 10.625V12.625H15C15.5523 12.625 16 13.0727 16 13.625C16 14.1773 15.5523 14.625 15 14.625H13V16.625C13 17.1773 12.5523 17.625 12 17.625C11.4477 17.625 11 17.1773 11 16.625V14.625H9C8.44772 14.625 8 14.1773 8 13.625C8 13.0727 8.44772 12.625 9 12.625H11V10.625C11 10.0727 11.4477 9.625 12 9.625Z" fill="#8F9AA3"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

4
assets/images/svg/external_link.svg
Unescape Escape View File

@ -1,4 +0,0 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M11.9989 21.75H12C16.4439 21.75 18.674 21.75 20.212 20.212C21.666 18.756 21.741 16.595 21.748 12.901C21.748 12.487 21.413 12.15 20.999 12.15H20.997C20.583 12.15 20.247 12.485 20.247 12.899C20.24 16.49 20.135 18.167 19.15 19.152C18.051 20.25 16.029 20.25 11.999 20.25C7.96902 20.25 5.946 20.25 4.848 19.152C3.75 18.053 3.75 16.03 3.75 12C3.75 7.97002 3.75002 5.94705 4.84902 4.84805C5.83302 3.86305 7.50998 3.757 11.101 3.75C11.516 3.75 11.85 3.41302 11.85 2.99902C11.849 2.58502 11.514 2.25 11.1 2.25H11.098C7.403 2.257 5.24199 2.33199 3.78799 3.78799C2.25 5.32498 2.25 7.55597 2.25 11.9999C2.25 16.4438 2.25 18.674 3.78799 20.212C5.32498 21.75 7.55599 21.75 11.9989 21.75Z" fill="#2E3039"/>
<path d="M10.5201 13.5901C10.6671 13.7351 10.8581 13.8081 11.0491 13.8081C11.2421 13.8081 11.4341 13.7331 11.5811 13.5861L20.1601 4.9571C20.2191 5.5631 20.2651 6.52011 20.2441 8.01511C20.2381 8.43011 20.5691 8.77005 20.9831 8.77605C21.3991 8.78605 21.7381 8.45108 21.7441 8.03708C21.806 3.6879 21.3385 3.21848 21.0874 2.9664C20.8354 2.71436 20.3661 2.24512 16.0201 2.3071C15.6061 2.3131 15.2751 2.65404 15.2811 3.06804C15.2871 3.47804 15.6221 3.8071 16.0311 3.8071H16.0421C17.5431 3.7861 18.5011 3.83206 19.1051 3.89206L10.5171 12.5291C10.2251 12.8231 10.2261 13.2981 10.5201 13.5901Z" fill="#2E3039"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

11
assets/images/svg/language_change.svg
Unescape Escape View File

@ -1,11 +0,0 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13.3229 3.62296C13.9141 4.86448 14.5038 6.42901 14.8722 8.25H9.1278C9.49621 6.42901 10.0859 4.86448 10.6771 3.62296C10.7659 3.43657 10.8547 3.24801 10.9426 3.06128C11.2666 2.37334 11.58 1.70774 11.8443 1.2511C11.8961 1.25037 11.948 1.25 12 1.25C12.052 1.25 12.1039 1.25037 12.1557 1.2511C12.42 1.70777 12.7332 2.37286 13.0572 3.06086C13.1452 3.24777 13.234 3.43638 13.3229 3.62296Z" fill="#8F9AA3"/>
<path d="M8.75 12.0005C8.75 11.2202 8.79889 10.4689 8.88569 9.75H15.1143C15.2011 10.4689 15.25 11.2202 15.25 12.0005C15.25 12.7805 15.2012 13.5314 15.1144 14.25H8.88557C8.79884 13.5314 8.75 12.7805 8.75 12.0005Z" fill="#8F9AA3"/>
<path d="M9.12759 15.75C9.49599 17.5714 10.0858 19.1363 10.6771 20.3781C10.7649 20.5623 10.8525 20.7484 10.9395 20.9329L10.94 20.9341C11.265 21.624 11.5792 22.2911 11.8443 22.7489C11.8961 22.7496 11.948 22.75 12 22.75C12.052 22.75 12.1039 22.7496 12.1557 22.7489C12.4208 22.2911 12.735 21.624 13.06 20.9341C13.1471 20.7492 13.235 20.5626 13.3229 20.3781C13.9142 19.1363 14.504 17.5714 14.8724 15.75H9.12759Z" fill="#8F9AA3"/>
<path d="M7.25 12.0003C7.25 12.7783 7.29495 13.529 7.37546 14.2498H1.48584C1.33131 13.5242 1.25 12.7715 1.25 11.9998C1.25 11.2281 1.33131 10.4754 1.48584 9.74982H7.37557C7.29499 10.4709 7.25 11.222 7.25 12.0003Z" fill="#8F9AA3"/>
<path d="M7.59963 8.24982H1.92217C3.22631 4.74647 6.30496 2.10678 10.0655 1.42342C9.89663 1.76666 9.72044 2.13886 9.54221 2.51538L9.5415 2.5169C9.46884 2.6704 9.39584 2.82462 9.32285 2.97788C8.65771 4.37468 7.99095 6.15947 7.59963 8.24982Z" fill="#8F9AA3"/>
<path d="M1.92217 15.7498H7.59944C7.99073 17.8406 8.6576 19.6257 9.32285 21.0228C9.39489 21.174 9.46694 21.3262 9.53866 21.4777C9.718 21.8565 9.89531 22.231 10.0652 22.5762C6.30481 21.8927 3.22627 19.2531 1.92217 15.7498Z" fill="#8F9AA3"/>
<path d="M16.3994 8.24982C16.0081 6.15947 15.3414 4.37468 14.6762 2.97788C14.6031 2.82437 14.53 2.66989 14.4572 2.51615C14.279 2.13962 14.1024 1.76666 13.9336 1.42342C17.6941 2.10678 20.7728 4.74647 22.0769 8.24982H16.3994Z" fill="#8F9AA3"/>
<path d="M22.5132 9.74982H16.6235C16.7041 10.4709 16.7491 11.222 16.7491 12.0003C16.7491 12.7783 16.7041 13.529 16.6236 14.2498H22.5132C22.6678 13.5242 22.7491 12.7715 22.7491 11.9998C22.7491 11.2281 22.6678 10.4754 22.5132 9.74982Z" fill="#8F9AA3"/>
<path d="M16.3996 15.7498H22.0769C20.7728 19.2531 17.6943 21.8927 13.9339 22.5762C14.1038 22.231 14.281 21.8565 14.4604 21.4778C14.5321 21.3263 14.6042 21.1741 14.6762 21.0228C15.3415 19.6257 16.0083 17.8406 16.3996 15.7498Z" fill="#8F9AA3"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.6 KiB

4
assets/images/svg/minus.svg
Unescape Escape View File

@ -1,4 +0,0 @@
<svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8.5 11.25C8.08579 11.25 7.75 11.5858 7.75 12C7.75 12.4142 8.08579 12.75 8.5 12.75H16.5C16.9142 12.75 17.25 12.4142 17.25 12C17.25 11.5858 16.9142 11.25 16.5 11.25H8.5Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.5 1.25C6.56294 1.25 1.75 6.06294 1.75 12C1.75 17.9371 6.56294 22.75 12.5 22.75C18.4371 22.75 23.25 17.9371 23.25 12C23.25 6.06294 18.4371 1.25 12.5 1.25ZM3.25 12C3.25 6.89137 7.39137 2.75 12.5 2.75C17.6086 2.75 21.75 6.89137 21.75 12C21.75 17.1086 17.6086 21.25 12.5 21.25C7.39137 21.25 3.25 17.1086 3.25 12Z" fill="white"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 675 B

4
assets/images/svg/my_address.svg
Unescape Escape View File

@ -1,4 +0,0 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M3.75 9.5869C3.75 5.01857 7.52225 1.25 12 1.25C16.4778 1.25 20.25 5.01857 20.25 9.5869C20.25 14.2513 16.4018 17.4121 13.1696 19.4294L13.1583 19.4365L13.1467 19.4431C12.7978 19.644 12.4026 19.75 12 19.75C11.5974 19.75 11.2022 19.644 10.8533 19.4431L10.84 19.4355L10.8271 19.4273C7.60753 17.3945 3.75 14.2671 3.75 9.5869ZM8.5 9.5C8.5 7.567 10.067 6 12 6C13.933 6 15.5 7.567 15.5 9.5C15.5 11.433 13.933 13 12 13C10.067 13 8.5 11.433 8.5 9.5Z" fill="#8F9AA3"/>
<path d="M6.99581 19.6578C6.94927 19.1487 6.5212 18.75 6 18.75C5.44772 18.75 5 19.1977 5 19.75C5 20.4639 5.43495 20.9848 5.85254 21.3139C6.2814 21.6519 6.84 21.9125 7.44113 22.1129C8.65384 22.5171 10.2656 22.75 12 22.75C13.7344 22.75 15.3462 22.5171 16.5589 22.1129C17.16 21.9125 17.7186 21.6519 18.1475 21.3139C18.5651 20.9848 19 20.4639 19 19.75C19 19.1977 18.5523 18.75 18 18.75C17.4788 18.75 17.0507 19.1487 17.0042 19.6578C16.9869 19.6768 16.9574 19.7053 16.9095 19.7431C16.7311 19.8836 16.4111 20.054 15.9264 20.2155C14.9675 20.5352 13.5793 20.75 12 20.75C10.4207 20.75 9.03245 20.5352 8.07359 20.2155C7.58893 20.054 7.26885 19.8836 7.09048 19.7431C7.04258 19.7053 7.01311 19.6768 6.99581 19.6578Z" fill="#8F9AA3"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

3
assets/images/svg/permission.svg
Unescape Escape View File

@ -1,3 +0,0 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.999 1.25C10.3178 1.25 8.95094 1.81794 7.75881 2.43555C7.39857 2.62217 7.06392 2.80678 6.74414 2.98319C5.96168 3.41482 5.26815 3.7974 4.50658 4.04039C4.05929 4.1831 3.66307 4.30951 3.38214 4.4196C3.11772 4.52321 2.80348 4.6652 2.58051 4.91299C2.38023 5.13558 2.27734 5.38547 2.20912 5.6245C2.14719 5.84148 2.09425 6.13523 2.04347 6.41705C0.805527 13.2827 3.51252 19.787 10.123 22.3179C10.7727 22.5667 11.2513 22.75 12.0023 22.75C12.7534 22.75 13.2319 22.5667 13.8816 22.3179C20.4919 19.7869 23.1962 13.2824 21.9579 6.417C21.9071 6.13515 21.8541 5.84133 21.7922 5.62434C21.7239 5.38529 21.621 5.13537 21.4207 4.91278C21.1977 4.66499 20.8835 4.52304 20.619 4.41946C20.3381 4.30941 19.9419 4.18307 19.4946 4.04044C18.7327 3.79744 18.0386 3.41479 17.2555 2.98309C16.9356 2.80673 16.6007 2.6221 16.2405 2.43554C15.0477 1.81795 13.6803 1.25 11.999 1.25ZM17.3338 9.9429C17.8544 9.75852 18.127 9.18702 17.9426 8.66643C17.7582 8.14583 17.1868 7.87327 16.6662 8.05765C15.788 8.36865 14.9486 8.96179 14.212 9.60781C13.465 10.2629 12.7666 11.0235 12.1733 11.7347C11.734 12.2613 11.3456 12.7689 11.0304 13.1997C10.7416 12.8538 10.454 12.6011 10.1797 12.4182C9.9053 12.2353 9.55228 12.0003 9 12.0003C8.44772 12.0003 8 12.448 8 13.0003C8 13.521 8.39799 13.9487 8.90638 13.9959C9.11042 14.0149 9.66489 14.5661 10.1056 15.4475C10.2668 15.7698 10.5889 15.9805 10.9489 15.999C11.3087 16.0174 11.6508 15.8406 11.8441 15.5365C11.8441 15.5365 12.1922 15.0141 12.3574 14.7801C12.6885 14.3111 13.1572 13.6774 13.7091 13.0159C14.2628 12.3521 14.888 11.6751 15.5307 11.1115C16.1837 10.5388 16.8002 10.1319 17.3338 9.9429Z" fill="#8F9AA3"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

4
assets/images/svg/privacy_terms.svg
Unescape Escape View File

@ -1,4 +0,0 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M6.59274 21.9955C6.47005 22.521 5.94615 22.8471 5.42258 22.724C4.82939 22.5845 4.2977 22.3669 3.81649 22.0224C3.42612 21.7429 3.07797 21.4103 2.7834 21.0339C2.21571 20.3086 1.97347 19.4641 1.85969 18.4815C1.74997 17.5339 1.74998 16.3478 1.75 14.8805L1.75 12.267C1.75 10.8304 1.75 9.70453 1.80914 8.79342C1.8693 7.86646 1.99357 7.09484 2.27358 6.37683C3.11477 4.21983 4.88596 2.5361 7.10864 1.74322C8.49273 1.24949 10.1813 1.24971 13.0191 1.25007L13.4618 1.25005C15.0155 1.24949 16.0499 1.24912 16.9104 1.55607C18.2896 2.04807 19.3955 3.0955 19.9221 4.44583C20.1043 4.91295 20.1796 5.40206 20.2153 5.95216C20.25 6.48653 20.25 7.14147 20.25 7.9512L20.25 13.9772C20.25 14.5169 19.8141 14.9545 19.2763 14.9545C18.7386 14.9545 18.3026 14.5169 18.3026 13.9772L18.3026 7.98411C18.3026 7.1337 18.3022 6.54256 18.2721 6.07922C18.2426 5.62439 18.1874 5.36014 18.1087 5.15822C17.7964 4.35741 17.1282 3.70805 16.2582 3.39772C15.7569 3.21888 15.0922 3.20461 13.2572 3.20461C12.6524 3.20461 12.1151 3.20514 11.6343 3.20858C11.3175 3.21085 11.1591 3.21198 10.9652 3.30021C10.7713 3.38844 10.7022 3.46658 10.564 3.62286C10.1612 4.07847 9.91667 4.67735 9.91667 5.33333C9.91667 5.48046 9.92622 5.70446 9.93446 5.88206C9.93446 5.88206 9.94967 6.20556 9.95316 6.3737C9.96105 6.75379 9.94905 7.19733 9.83432 7.62548C9.61086 8.45945 8.95945 9.11086 8.12548 9.33432C7.69733 9.44904 7.25379 9.46105 6.8737 9.45315C6.70558 9.44966 6.38206 9.43446 6.38206 9.43446C6.20446 9.42622 5.98047 9.41667 5.83333 9.41667C5.16808 9.41667 4.56155 9.66813 4.10363 10.0812C3.94977 10.22 3.87285 10.2894 3.78661 10.4824C3.70037 10.6754 3.6998 10.8332 3.69868 11.1489C3.69741 11.5031 3.69737 11.886 3.69737 12.3017L3.69737 14.8203C3.69737 16.3621 3.69891 17.4343 3.79403 18.2558C3.8866 19.0553 4.05705 19.4973 4.31475 19.8265C4.49316 20.0544 4.70593 20.2583 4.94738 20.4312C5.18104 20.5985 5.46618 20.7268 5.86689 20.821C6.39046 20.9442 6.71543 21.47 6.59274 21.9955Z" fill="#8F9AA3"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M16.2025 15.7997C16.3972 15.1908 16.4797 14.5688 16.307 14.0097C16.1115 13.3765 15.6367 12.9776 15.0741 12.8251C14.5706 12.6887 14.0423 12.7561 13.5928 12.8843C13.1272 13.0172 12.6539 13.2414 12.2127 13.5224C11.3441 14.0758 10.4746 14.9316 10.0205 15.976C9.54245 17.0752 9.53819 18.382 10.4567 19.5789C10.5445 19.6933 10.6348 19.8022 10.7274 19.9054C10.4343 20.1133 10.1587 20.2849 9.9151 20.42C9.6724 20.5546 9.47193 20.6473 9.32696 20.7033C9.24363 20.7355 9.19764 20.7481 9.18234 20.7523C8.66161 20.7871 8.25 21.2205 8.25 21.75C8.25 22.3023 8.69772 22.75 9.25 22.75C9.53894 22.75 9.83849 22.6497 10.0475 22.569C10.2957 22.4731 10.5804 22.338 10.8852 22.1689C11.3549 21.9084 11.8971 21.5535 12.4573 21.1041C13.3415 21.4249 14.2436 21.3883 15.0534 21.1765C15.8562 20.9665 16.5999 20.5787 17.2256 20.1541C17.3455 20.516 17.5012 20.8678 17.6935 21.1843C17.9526 21.6106 18.3213 22.0431 18.827 22.2984C19.3782 22.5768 20.0131 22.6013 20.627 22.311C21.1924 22.0436 21.6711 21.5438 22.087 20.9078C22.3892 20.4455 22.2595 19.8258 21.7973 19.5235C21.335 19.2213 20.7153 19.351 20.413 19.8132C20.0997 20.2924 19.871 20.4561 19.772 20.503C19.7329 20.5214 19.7321 20.5193 19.7308 20.516C19.7304 20.515 19.73 20.5139 19.7286 20.5132C19.6768 20.487 19.552 20.3914 19.4027 20.1456C19.2598 19.9105 19.1322 19.5987 19.043 19.2466L19.0339 19.2108C18.974 18.9744 18.914 18.7373 18.8512 18.5561C18.8179 18.4602 18.7659 18.325 18.6837 18.1924C18.6048 18.0651 18.4358 17.8381 18.1264 17.7139C17.8175 17.59 17.5358 17.6335 17.3637 17.685C17.1998 17.7341 17.0658 17.8102 16.981 17.8626C16.8241 17.9594 16.6419 18.0998 16.4749 18.2284L16.4443 18.2519C15.8739 18.6908 15.206 19.0693 14.5473 19.2416C14.4573 19.2651 14.3686 19.2846 14.2811 19.2999C15.0605 18.3451 15.7613 17.1794 16.2025 15.7997ZM12.0433 18.3613C12.1085 18.4462 12.1736 18.5238 12.2386 18.5947C13.0813 17.7075 13.8561 16.571 14.2975 15.1906C14.3613 14.9911 14.3871 14.8496 14.3964 14.7552C14.3278 14.7626 14.2426 14.7788 14.1416 14.8076C13.8936 14.8783 13.5961 15.0125 13.2873 15.2092C12.6559 15.6115 12.1087 16.1891 11.8545 16.7736C11.6242 17.3032 11.6285 17.8207 12.0433 18.3613Z" fill="#8F9AA3"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 4.1 KiB

3
assets/images/svg/rate.svg
Unescape Escape View File

@ -1,3 +0,0 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M11.9961 1.25C13.0454 1.25 13.8719 2.04253 14.3995 3.11191L16.1616 6.66516C16.215 6.77513 16.3417 6.92998 16.5321 7.07164C16.7223 7.21315 16.9086 7.29121 17.0311 7.3118L20.2207 7.84613C21.3729 8.03973 22.3386 8.60449 22.6521 9.5879C22.9653 10.5705 22.5064 11.5916 21.6778 12.4216L21.677 12.4225L19.1991 14.9209C19.1009 15.0199 18.9909 15.2064 18.9219 15.4494C18.8534 15.6908 18.8473 15.9107 18.8784 16.0527L18.8788 16.0547L19.5877 19.1454C19.8818 20.4317 19.7843 21.7073 18.8771 22.3742C17.9667 23.0433 16.7227 22.7467 15.5925 22.0736L12.6026 20.289C12.477 20.214 12.2614 20.1532 12.0011 20.1532C11.7427 20.1532 11.5226 20.2132 11.3888 20.291L11.3869 20.2921L8.40288 22.0732C7.27405 22.7487 6.03154 23.04 5.12111 22.3702C4.21449 21.7032 4.11214 20.43 4.40711 19.1447L5.1159 16.0547L5.11633 16.0527C5.14741 15.9107 5.14133 15.6908 5.0728 15.4494C5.0038 15.2064 4.89379 15.0199 4.79558 14.9209L2.31585 12.4206C1.49265 11.5906 1.03521 10.5704 1.34595 9.58925C1.65759 8.60525 2.62143 8.0398 3.77433 7.84606L6.96132 7.31219L6.96233 7.31202C7.07917 7.29175 7.2627 7.21456 7.45248 7.07268C7.64261 6.93054 7.76959 6.77535 7.82312 6.66516L7.82582 6.65967L9.58562 3.11097L9.58632 3.10957C10.119 2.04108 10.948 1.25 11.9961 1.25Z" fill="#8F9AA3"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

3
assets/images/svg/smart_phone_fill.svg
Unescape Escape View File

@ -1,3 +0,0 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.0416 1.26258C14.1218 1.26427 14.182 1.33623 14.1698 1.41553C14.0708 2.00969 14.0061 2.38967 13.9242 2.66868C13.8477 2.92952 13.7796 3.01384 13.7265 3.06094C13.6681 3.11277 13.5772 3.16922 13.3129 3.20574C13.0235 3.24574 12.6285 3.24992 11.9995 3.24992C11.3704 3.24992 10.9754 3.24574 10.686 3.20574C10.4218 3.16922 10.3308 3.11277 10.2724 3.06094C10.2193 3.01384 10.1513 2.92953 10.0747 2.66868C9.99296 2.39014 9.92832 2.01096 9.82957 1.41849C9.81781 1.33739 9.87948 1.26422 9.96141 1.2625C10.5588 1.24999 11.2181 1.24999 11.9437 1.25H11.9438H11.9438L12.0553 1.25H12.0554H12.0555C12.7827 1.24999 13.4432 1.24999 14.0416 1.26258ZM8.05962 1.38505C8.19637 1.36667 8.32081 1.46348 8.3406 1.60003L8.34665 1.64173L8.3491 1.65746L8.35612 1.69961C8.44652 2.24219 8.52515 2.71416 8.63584 3.09132C8.75495 3.49714 8.93355 3.8782 9.27733 4.18321C9.6329 4.49868 10.0424 4.63121 10.4811 4.69184C10.8947 4.749 11.4051 4.75015 11.9999 4.75015C12.5947 4.75015 13.1051 4.749 13.5187 4.69184C13.9573 4.63121 14.3669 4.49868 14.7225 4.18321C15.0662 3.8782 15.2448 3.49714 15.3639 3.09132C15.4746 2.71416 15.5533 2.24219 15.6437 1.69962L15.6507 1.65747L15.6599 1.59788C15.6806 1.46236 15.8045 1.36679 15.9404 1.38505C16.9767 1.52438 17.8301 1.81988 18.5052 2.49502C19.1803 3.17016 19.4759 4.02357 19.6152 5.05984C19.75 6.06293 19.75 7.34189 19.75 8.94448L19.75 15.056C19.75 16.6586 19.75 17.9375 19.6152 18.9406C19.4759 19.9769 19.1803 20.8303 18.5052 21.5054C17.8301 22.1806 16.9767 22.4761 15.9404 22.6154C14.9373 22.7503 13.6583 22.7502 12.0557 22.7502H11.9443C10.3417 22.7502 9.0627 22.7503 8.05962 22.6154C7.02335 22.4761 6.16994 22.1806 5.4948 21.5054C4.81966 20.8303 4.52415 19.9769 4.38483 18.9406C4.24997 17.9375 4.24998 16.6586 4.25 15.056V15.056V15.056L4.25 8.94446V8.94445V8.94444C4.24998 7.34187 4.24997 6.06291 4.38483 5.05984C4.52415 4.02357 4.81966 3.17016 5.4948 2.49502C6.16994 1.81988 7.02335 1.52438 8.05962 1.38505ZM10.25 20C10.25 19.5858 10.5858 19.25 11 19.25L13 19.25C13.4142 19.25 13.75 19.5858 13.75 20C13.75 20.4142 13.4142 20.75 13 20.75L11 20.75C10.5858 20.75 10.25 20.4142 10.25 20Z" fill="#8F9AA3"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

4
assets/images/svg/touch_face_id.svg
Unescape Escape View File

@ -1,4 +0,0 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M17.3119 1.93154C18.6886 2.11716 19.7808 2.5053 20.639 3.36596C21.4972 4.22661 21.8843 5.322 22.0693 6.7026C22.25 8.04985 22.25 9.77545 22.2499 11.9724V12.0872C22.25 14.2841 22.25 16.0098 22.0693 17.357C21.8843 18.7376 21.4972 19.833 20.639 20.6937C19.7808 21.5543 18.6886 21.9425 17.3119 22.1281C16.8638 22.1885 16.3738 22.2288 15.8383 22.2556C15.5329 22.2709 15.3802 22.2785 15.2517 22.2033C15.1232 22.128 15.0533 21.9878 14.9135 21.7075C14.5079 20.8938 14.223 20.0433 14.0321 19.1522C13.9769 18.8946 13.9493 18.7658 14.0106 18.6638C14.072 18.5618 14.2079 18.5234 14.4797 18.4468C15.433 18.1779 16.3913 17.758 17.3722 17.1959C17.7318 16.9898 17.8568 16.5304 17.6513 16.1697C17.4457 15.809 16.9876 15.6837 16.628 15.8898C15.8532 16.3338 15.1154 16.6684 14.401 16.8995C14.1018 16.9963 13.9522 17.0447 13.8305 16.9603C13.7087 16.876 13.7007 16.7145 13.6846 16.3915C13.6511 15.7162 13.6546 15.1118 13.6709 14.634C13.6718 14.6077 13.6727 14.5814 13.6737 14.5551C13.6808 14.3587 13.688 14.1614 13.672 13.9655C13.6201 13.3299 13.1831 12.8778 12.5555 12.8037C12.302 12.7738 12.0469 12.778 11.7918 12.7822C11.5173 12.7867 11.2428 12.7912 10.9704 12.7532C10.7901 12.7375 10.749 12.6017 10.7509 12.5357C10.7447 12.362 10.7699 12.1233 10.8189 11.6941C11.0324 9.82361 11.5292 7.92461 12.0814 6.33202C12.5022 5.11856 13.084 3.97219 13.6644 2.82874C13.7511 2.65799 13.8377 2.4873 13.9238 2.31646C14.061 2.04409 14.1296 1.9079 14.2535 1.83335C14.3774 1.75881 14.5277 1.76216 14.8284 1.76886C15.7728 1.78992 16.5959 1.835 17.3119 1.93154ZM17.2499 7.26603C17.6642 7.26603 17.9999 7.60278 17.9999 8.01818V10.0239C17.9999 10.4393 17.6642 10.7761 17.2499 10.7761C16.8357 10.7761 16.4999 10.4393 16.4999 10.0239V8.01818C16.4999 7.60278 16.8357 7.26603 17.2499 7.26603Z" fill="#8F9AA3"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.9428 22.25C9.7521 22.25 8.03144 22.25 6.68802 22.0694C5.31137 21.8843 4.21911 21.4973 3.36091 20.6391C2.50272 19.7809 2.11568 18.6886 1.93059 17.312C1.74998 15.9686 1.74999 14.2479 1.75 12.0572V11.9428C1.74999 9.75212 1.74998 8.03144 1.93059 6.68802C2.11568 5.31137 2.50272 4.21911 3.36091 3.36091C4.21911 2.50272 5.31137 2.11568 6.68802 1.93059C8.03144 1.74998 9.75213 1.74999 11.9428 1.75C12.1524 1.75003 12.4906 1.82454 12.3405 2.12179C11.8582 2.85287 11.2279 4.20578 10.6645 5.82583C10.0214 7.67528 9.54656 9.5925 9.32343 11.5394C9.28144 11.9057 9.24097 12.2586 9.25186 12.5589C9.28397 13.444 9.90009 14.0869 10.7637 14.207C11.0767 14.2505 11.3942 14.2503 11.7101 14.2501C11.7688 14.2501 11.8275 14.25 11.8861 14.2503C12.0479 14.251 12.1772 14.3837 12.1717 14.5455C12.1504 15.1691 12.1478 16.0296 12.223 17.0036C12.2332 17.1353 12.1321 17.2502 12 17.2502C10.5381 17.2502 9.04088 16.8026 7.3721 15.849C7.01247 15.6435 6.55433 15.7684 6.34882 16.1281C6.14331 16.4877 6.26826 16.9458 6.6279 17.1513C8.45912 18.1978 10.2119 18.7502 12 18.7502C12.3277 18.7502 12.4472 18.8294 12.5142 19.1674C12.6915 20.0621 12.919 21.0152 13.3292 21.8356C13.4241 22.0254 13.2868 22.2488 13.0745 22.2493C12.7377 22.25 12.4008 22.25 12.0639 22.25L11.9428 22.25ZM6.75 7.25C7.16421 7.25 7.5 7.58579 7.5 8V10C7.5 10.4142 7.16421 10.75 6.75 10.75C6.33579 10.75 6 10.4142 6 10V8C6 7.58579 6.33579 7.25 6.75 7.25Z" fill="#8F9AA3"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 3.3 KiB

5
assets/langs/ar-SA.json
Unescape Escape View File

@ -847,8 +847,5 @@
"pleaseSelectAMaritalStatus": "يرجى اختيار الحالة الاجتماعية",
"pleaseSelectACountry": "يرجى اختيار الدولة",
"pleaseEnterEmail": "يرجى إدخال البريد الإلكتروني",
"pleaseEnterAValidEmailFormat": "يرجى إدخال تنسيق بريد إلكتروني صالح",
"selectCountry": "اختر الدولة",
"forLoginVerification": "للتحقق من تسجيل الدخول"
"pleaseEnterAValidEmailFormat": "يرجى إدخال تنسيق بريد إلكتروني صالح"
}

7
assets/langs/en-US.json
Unescape Escape View File

@ -803,6 +803,7 @@
"loginByOTP": "Login By OTP",
"guest": "Guest",
"switchAccount": "Switch Account",
"lastloginBy": "Last login by",
"allSet": "All Set! Now you can login with Face ID or Biometric",
"enableQuickLogin": "Enable Quick Login",
"enableMsg": "Enabling the quick login will verify through your existing device Face ID / Biometric",
@ -842,8 +843,6 @@
"pleaseSelectAMaritalStatus": "Please select a marital status",
"pleaseSelectACountry": "Please select a country",
"pleaseEnterEmail": "Please enter email",
"pleaseEnterAValidEmailFormat": "Please enter a valid email format",
"selectCountry": "Select Country",
"forLoginVerification": "for login verification",
"lastLoginBy": "Last login by"
"pleaseEnterAValidEmailFormat": "Please enter a valid email format"
}

16
lib/core/app_assets.dart
Unescape Escape View File

@ -4,8 +4,6 @@ class AppAssets {
static const String hmg = '$svgBasePath/hmg.svg';
static const String arrow_back = '$svgBasePath/arrow-back.svg';
static const String arrow_forward = '$svgBasePath/arrow_forward.svg';
static const String externalLink = '$svgBasePath/external_link.svg';
static const String calendar = '$svgBasePath/calendar.svg';
static const String hmc = '$svgBasePath/hmc.svg';
static const String ksa = '$svgBasePath/ksa.svg';
@ -119,18 +117,6 @@ class AppAssets {
static const String free_med_delivery_icon = '$svgBasePath/free_med_delivery_icon.svg';
static const String livecare_book_icon = '$svgBasePath/livecare_book_icon.svg';
static const String doctor_profile_icon = '$svgBasePath/doctor_profile_icon.svg';
static const String accessibility = '$svgBasePath/accessibility.svg';
static const String call_fill = '$svgBasePath/call_fill.svg';
static const String email_transparent = '$svgBasePath/email_transparent.svg';
static const String emergency = '$svgBasePath/emergency.svg';
static const String language_change = '$svgBasePath/language_change.svg';
static const String my_address = '$svgBasePath/my_address.svg';
static const String permission = '$svgBasePath/permission.svg';
static const String privacy_terms = '$svgBasePath/privacy_terms.svg';
static const String rate = '$svgBasePath/rate.svg';
static const String smart_phone_fill = '$svgBasePath/smart_phone_fill.svg';
static const String touch_face_id = '$svgBasePath/touch_face_id.svg';
static const String minus = '$svgBasePath/minus.svg';
//bottom navigation//
static const String homeBottom = '$svgBasePath/home_bottom.svg';
@ -141,7 +127,6 @@ class AppAssets {
static const String closeBottomNav = '$svgBasePath/close_bottom_nav.svg';
static const String feedback = '$svgBasePath/feedback.svg';
static const String news = '$svgBasePath/news.svg';
// PNGS //
static const String hmg_logo = '$pngBasePath/hmg_logo.png';
static const String livecare_service = '$pngBasePath/livecare_service.png';
@ -163,4 +148,5 @@ class AppAnimations {
static const String loadingAnimation = '$lottieBasePath/Loader.json';
static const String errorAnimation = '$lottieBasePath/ErrorAnimation.json';
static const String warningAnimation = '$lottieBasePath/warningAnimation.json';
}

4
lib/core/utils/calendar_utils.dart
Unescape Escape View File

@ -285,11 +285,11 @@ Future<void> checkAndRemove(hasReminder, {bool delete = false, String itemDescri
if (calendarUtils.calendars != null) {
if (Platform.isAndroid) {
await processEvents(calendarUtils.calendars, calendarUtils, params, delete, itemDescriptionN, hasReminder);
await processEvents(calendarUtils.calendars, calendarUtils, params, delete, itemDescriptionN,hasReminder);
} else {
List<ios.Calendar>? iosCalendars = await _myPlugin.getCalendars();
if (iosCalendars != null) {
await processEvents(iosCalendars.map((cal) => Calendar(id: cal.id, name: cal.name, accountName: cal.accountName)).toList(), calendarUtils, params, delete, itemDescriptionN, hasReminder);
await processEvents(iosCalendars.map((cal) => Calendar(id: cal.id, name: cal.name, accountName: cal.accountName)).toList(), calendarUtils, params, delete, itemDescriptionN,hasReminder);
}
}
}

17
lib/core/utils/doctor_response_mapper.dart
Unescape Escape View File

@ -7,9 +7,10 @@ import 'package:hmg_patient_app_new/features/my_appointments/models/resp_models/
class DoctorMapper{
static Future<RegionList> getMappedDoctor(List<DoctorList> doctorList,
{bool isArabic = false,double lat = 0.0,double long = 0.0}) async {
{bool isArabic = false}) async {
RegionList regionList = RegionList();
final lat = await Utils.getNumFromPrefs(CacheConst.userLat);
final long = await Utils.getNumFromPrefs(CacheConst.userLat);
for (var element in doctorList) {
String? region = element.getRegionName(isArabic);
@ -125,9 +126,11 @@ class DoctorMapper{
static Future<RegionList> getMappedHospitals(
List<HospitalsModel> hospitalList, {
bool isArabic = false, double lat = 0.0,double lng = 0.0
bool isArabic = false,
}) async {
final regionList = RegionList();
final lat = await Utils.getNumFromPrefs(CacheConst.userLat);
final long = await Utils.getNumFromPrefs(CacheConst.userLat);
for (final hospital in hospitalList) {
final region = hospital.getRegionName(isArabic);
if (region == null) continue;
@ -170,13 +173,13 @@ class DoctorMapper{
} else if (distance < regionData.hmgDistance) {
regionData.hmgDistance = distance;
}
} else if ( lat != 0.0&&
lng != 0.0 &&
} else if ( lat != 0&&
long != 0 &&
hospital.latitude != null &&
hospital.longitude != null) {
double calculatedDistance = calculateDistance(
lat,
lng,
lat.toDouble(),
long.toDouble(),
double.parse(hospital.latitude!),
double.parse(hospital.longitude!),
).abs();

18
lib/core/utils/utils.dart
Unescape Escape View File

@ -650,24 +650,6 @@ class Utils {
);
}
static Widget getPaymentAmountWithSymbol2(num habibWalletAmount, Color iconColor, double iconSize, {bool isSaudiCurrency = true, bool isExpanded = true}) {
return RichText(
text: TextSpan(
children: [
WidgetSpan(
alignment: PlaceholderAlignment.baseline,
baseline: TextBaseline.alphabetic,
child: Utils.buildSvgWithAssets(icon: AppAssets.saudi_riyal_icon, width: 14.h, height: 14.h, iconColor: Colors.black.withValues(alpha: 0.31)),
),
TextSpan(
text: " $habibWalletAmount",
style: TextStyle(color: AppColors.blackColor, fontSize: 32.fSize, letterSpacing: -4, fontWeight: FontWeight.w600, height: 1),
),
],
),
);
}
static Future<bool> isGoogleServicesAvailable() async {
GooglePlayServicesAvailability availability = await GoogleApiAvailability.instance.checkGooglePlayServicesAvailability();
String status = availability.toString().split('.').last;

4
lib/extensions/int_extensions.dart
Unescape Escape View File

@ -6,7 +6,9 @@ extension IntExtensions on int {
Widget get width => SizedBox(width: toDouble());
Widget get divider => Divider(height: toDouble(), thickness: toDouble(), color: Color(0x30D2D2D2));
Widget get divider => Divider(height: toDouble(), thickness: toDouble(), color: AppColors.buttonColor);
Widget get makeItSquare => SizedBox(width: toDouble(), height: toDouble());
}

18
lib/extensions/string_extensions.dart
Unescape Escape View File

@ -132,26 +132,14 @@ extension EmailValidator on String {
decoration: isUnderLine ? TextDecoration.underline : null),
);
Widget toText14(
{Color? color,
bool isUnderLine = false,
bool isBold = false,
bool isCenter = false,
FontWeight? weight,
int? maxlines,
double? letterSpacing = -1,
double? height,
TextOverflow? textOverflow}) =>
Text(
Widget toText14({Color? color, bool isUnderLine = false, bool isBold = false, bool isCenter = false, FontWeight? weight, int? maxlines, double? letterSpacing = -1}) => Text(
this,
textAlign: isCenter ? TextAlign.center : null,
maxLines: maxlines,
overflow: textOverflow,
style: TextStyle(
color: color ?? AppColors.blackColor,
fontSize: 14.fSize,
letterSpacing: letterSpacing,
height: height,
fontWeight: weight ?? (isBold ? FontWeight.bold : FontWeight.normal),
decoration: isUnderLine ? TextDecoration.underline : null),
);
@ -174,10 +162,8 @@ extension EmailValidator on String {
bool isBold = false,
bool isCenter = false,
int? maxlines,
double? height,
TextAlign? textAlign,
FontWeight? weight,
TextOverflow? textOverflow,
double? letterSpacing = -0.4,
}) =>
Text(
@ -188,8 +174,6 @@ extension EmailValidator on String {
color: color ?? AppColors.blackColor,
fontSize: 16.fSize,
letterSpacing: letterSpacing,
height: height,
overflow: textOverflow,
fontWeight: weight ?? (isBold ? FontWeight.bold : FontWeight.normal),
decoration: isUnderLine ? TextDecoration.underline : null,
),

3
lib/extensions/widget_extensions.dart
Unescape Escape View File

@ -150,14 +150,13 @@ extension SmoothContainerExtension on ShapeBorder {
bool isDisabled = false,
Color? backgroundColor,
BorderSide? side,
BorderRadius? customBorder,
bool hasShadow = false,
}) {
final bgColor = backgroundColor ?? color;
return ShapeDecoration(
color: isDisabled ? bgColor.withOpacity(0.5) : bgColor,
shape: SmoothRectangleBorder(
borderRadius: customBorder ?? BorderRadius.circular(borderRadius ?? 0),
borderRadius: BorderRadius.circular(borderRadius ?? 0),
smoothness: 1,
side: side ?? BorderSide.none,
),

191
lib/features/authentication/authentication_view_model.dart
Unescape Escape View File

@ -59,7 +59,8 @@ class AuthenticationViewModel extends ChangeNotifier {
required NavigationService navigationService,
required CacheService cacheService,
required LocalAuthService localAuthService,
}) : _navigationService = navigationService,
})
: _navigationService = navigationService,
_dialogService = dialogService,
_errorHandlerService = errorHandlerService,
_appState = appState,
@ -204,13 +205,13 @@ class AuthenticationViewModel extends ChangeNotifier {
final result = await _authenticationRepo.selectDeviceByImei(firebaseToken: firebaseToken);
result.fold(
(failure) async {
(failure) async {
// LoadingUtils.hideFullScreenLoader();
// await _errorHandlerService.handleError(failure: failure);
LoaderBottomSheet.hideLoader();
_navigationService.pushPage(page: LoginScreen());
},
(apiResponse) {
(apiResponse) {
// LoadingUtils.hideFullScreenLoader();
log("apiResponse: ${apiResponse.data.toString()}");
log("messageStatus: ${apiResponse.messageStatus.toString()}");
@ -300,7 +301,8 @@ class AuthenticationViewModel extends ChangeNotifier {
final result = await _authenticationRepo.checkPatientAuthentication(checkPatientAuthenticationReq: checkPatientAuthenticationReq);
result.fold(
(failure) async => await _errorHandlerService.handleError(
(failure) async =>
await _errorHandlerService.handleError(
failure: failure,
onUnHandledFailure: (failure) async {
LoaderBottomSheet.hideLoader();
@ -314,7 +316,7 @@ class AuthenticationViewModel extends ChangeNotifier {
_navigationService.pop();
});
}),
(apiResponse) async {
(apiResponse) async {
if (apiResponse.messageStatus == 2) {
LoaderBottomSheet.hideLoader();
await _dialogService.showErrorBottomSheet(message: apiResponse.errorMessage ?? "ErrorEmpty", onOkPressed: () {});
@ -357,8 +359,8 @@ class AuthenticationViewModel extends ChangeNotifier {
patientOutSA: isForRegister
? isPatientOutsideSA(request: payload)
: selectedCountrySignup.countryCode == CountryEnum.saudiArabia
? false
: true,
? false
: true,
payload: payload,
);
@ -372,8 +374,8 @@ class AuthenticationViewModel extends ChangeNotifier {
final resultEither = await _authenticationRepo.sendActivationCodeRepo(sendActivationCodeReq: request, isRegister: checkIsUserComingForRegister(request: payload), languageID: 'er');
resultEither.fold(
(failure) async => await _errorHandlerService.handleError(failure: failure),
(apiResponse) async {
(failure) async => await _errorHandlerService.handleError(failure: failure),
(apiResponse) async {
if (apiResponse.messageStatus == 2) {
LoaderBottomSheet.hideLoader();
await _dialogService.showCommonBottomSheetWithoutH(
@ -407,27 +409,27 @@ class AuthenticationViewModel extends ChangeNotifier {
bool isForRegister = (_appState.getUserRegistrationPayload.healthId != null || _appState.getUserRegistrationPayload.patientOutSa == true || _appState.getUserRegistrationPayload.patientOutSa == 1);
final request = RequestUtils.getCommonRequestWelcome(
phoneNumber: phoneNumberController.text,
otpTypeEnum: otpTypeEnum,
deviceToken: _appState.deviceToken,
// patientOutSA: _appState.getUserRegistrationPayload.projectOutSa == 1 ? true : false,
patientOutSA: isForRegister
? _appState.getUserRegistrationPayload.projectOutSa == true
? true
: false
: _appState.getSelectDeviceByImeiRespModelElement != null
? _appState.getSelectDeviceByImeiRespModelElement!.outSa!
: selectedCountrySignup == CountryEnum.saudiArabia
? false
: true,
loginTokenID: _appState.appAuthToken,
registeredData: isForRegister ? _appState.getUserRegistrationPayload : null,
nationIdText: nationalIdController.text,
countryCode: _appState.getSelectDeviceByImeiRespModelElement != null && _appState.getSelectDeviceByImeiRespModelElement!.outSa == true
? CountryEnum.unitedArabEmirates.countryCode
: selectedCountrySignup.countryCode,
//TODO: Error Here IN Zip Code.
loginType: loginTypeEnum.toInt)
phoneNumber: phoneNumberController.text,
otpTypeEnum: otpTypeEnum,
deviceToken: _appState.deviceToken,
// patientOutSA: _appState.getUserRegistrationPayload.projectOutSa == 1 ? true : false,
patientOutSA: isForRegister
? _appState.getUserRegistrationPayload.projectOutSa == true
? true
: false
: _appState.getSelectDeviceByImeiRespModelElement != null
? _appState.getSelectDeviceByImeiRespModelElement!.outSa!
: selectedCountrySignup == CountryEnum.saudiArabia
? false
: true,
loginTokenID: _appState.appAuthToken,
registeredData: isForRegister ? _appState.getUserRegistrationPayload : null,
nationIdText: nationalIdController.text,
countryCode: _appState.getSelectDeviceByImeiRespModelElement != null && _appState.getSelectDeviceByImeiRespModelElement!.outSa == true
? CountryEnum.unitedArabEmirates.countryCode
: selectedCountrySignup.countryCode,
//TODO: Error Here IN Zip Code.
loginType: loginTypeEnum.toInt)
.toJson();
LoaderBottomSheet.showLoader();
if (isForRegister) {
@ -443,7 +445,8 @@ class AuthenticationViewModel extends ChangeNotifier {
LoaderBottomSheet.hideLoader();
resultEither.fold(
(failure) async => await _errorHandlerService.handleError(
(failure) async =>
await _errorHandlerService.handleError(
failure: failure,
onUnHandledFailure: (failure) async {
LoaderBottomSheet.hideLoader();
@ -451,6 +454,9 @@ class AuthenticationViewModel extends ChangeNotifier {
message: failure.message,
label: LocaleKeys.notice.tr(),
onOkPressed: () {
_navigationService.pushAndReplace(AppRoutes.register);
},
onCancelPressed: () {
_navigationService.pop();
});
}), (apiResponse) {
@ -467,7 +473,8 @@ class AuthenticationViewModel extends ChangeNotifier {
final resultEither = await _authenticationRepo.checkActivationCodeRepo(newRequest: CheckActivationCodeRegisterReq.fromJson(request), activationCode: activationCode, isRegister: false);
resultEither.fold(
(failure) async => await _errorHandlerService.handleError(
(failure) async =>
await _errorHandlerService.handleError(
failure: failure,
onUnHandledFailure: (failure) async {
LoaderBottomSheet.hideLoader();
@ -651,15 +658,15 @@ class AuthenticationViewModel extends ChangeNotifier {
bool isOutSidePatient = selectedCountrySignup.countryCode == CountryEnum.unitedArabEmirates.countryCode ? true : false;
LoaderBottomSheet.showLoader();
final request = await RequestUtils.getPatientAuthenticationRequest(
phoneNumber: phoneNumberController.text,
nationId: nationalIdController.text,
patientOutSA: isOutSidePatient,
otpTypeEnum: otpTypeEnum,
isForRegister: true,
patientId: 0,
zipCode: selectedCountrySignup.countryCode,
calenderType: calenderType,
dob: dob)
phoneNumber: phoneNumberController.text,
nationId: nationalIdController.text,
patientOutSA: isOutSidePatient,
otpTypeEnum: otpTypeEnum,
isForRegister: true,
patientId: 0,
zipCode: selectedCountrySignup.countryCode,
calenderType: calenderType,
dob: dob)
.toJson();
var nRequest = Map<String, dynamic>.from(request);
@ -795,22 +802,22 @@ class AuthenticationViewModel extends ChangeNotifier {
Future<void> insertPatientIMEIData(int loginType) async {
final resultEither = await _authenticationRepo.insertPatientIMEIData(
patientIMEIDataRequest: PatientInsertDeviceImei(
imei: _appState.deviceToken,
deviceTypeId: _appState.getDeviceTypeID(),
patientId: _appState.getAuthenticatedUser()!.patientId!,
patientIdentificationNo: _appState.getAuthenticatedUser()!.patientIdentificationNo!,
identificationNo: _appState.getAuthenticatedUser()!.patientIdentificationNo!,
firstName: _appState.getAuthenticatedUser()!.firstName!,
lastName: _appState.getAuthenticatedUser()!.lastName!,
patientTypeId: _appState.getAuthenticatedUser()!.patientType,
mobileNo: _appState.getAuthenticatedUser()!.mobileNumber!,
logInTypeId: loginType,
patientOutSa: _appState.getAuthenticatedUser()!.outSa!,
outSa: _appState.getAuthenticatedUser()!.outSa == 1 ? true : false,
biometricEnabled: loginType == 1 || loginType == 2 ? false : true,
firstNameN: _appState.getAuthenticatedUser()!.firstNameN,
lastNameN: _appState.getAuthenticatedUser()!.lastNameN,
).toJson());
imei: _appState.deviceToken,
deviceTypeId: _appState.getDeviceTypeID(),
patientId: _appState.getAuthenticatedUser()!.patientId!,
patientIdentificationNo: _appState.getAuthenticatedUser()!.patientIdentificationNo!,
identificationNo: _appState.getAuthenticatedUser()!.patientIdentificationNo!,
firstName: _appState.getAuthenticatedUser()!.firstName!,
lastName: _appState.getAuthenticatedUser()!.lastName!,
patientTypeId: _appState.getAuthenticatedUser()!.patientType,
mobileNo: _appState.getAuthenticatedUser()!.mobileNumber!,
logInTypeId: loginType,
patientOutSa: _appState.getAuthenticatedUser()!.outSa!,
outSa: _appState.getAuthenticatedUser()!.outSa == 1 ? true : false,
biometricEnabled: loginType == 1 || loginType == 2 ? false : true,
firstNameN: _appState.getAuthenticatedUser()!.firstNameN,
lastNameN: _appState.getAuthenticatedUser()!.lastNameN,
).toJson());
resultEither.fold((failure) async => await _errorHandlerService.handleError(failure: failure), (apiResponse) async {
if (apiResponse.messageStatus == 1) {
log("Insert IMEI Success");
@ -824,20 +831,20 @@ class AuthenticationViewModel extends ChangeNotifier {
Future<void> insertPatientDeviceData(int loginType) async {
final resultEither = await _authenticationRepo.insertPatientDeviceData(
patientDeviceDataRequest: InsertPatientMobileDeviceInfo(
deviceToken: _appState.deviceToken,
deviceTypeId: _appState.getDeviceTypeID(),
patientId: _appState.getAuthenticatedUser()!.patientId!,
patientTypeId: _appState.getAuthenticatedUser()!.patientType,
patientOutSa: _appState.getAuthenticatedUser()!.outSa!,
loginType: loginType,
languageId: _appState.getLanguageID(),
latitude: _appState.userLat,
longitude: _appState.userLong,
voipToken: "",
deviceType: _appState.deviceTypeID,
patientMobileNumber: _appState.getAuthenticatedUser()!.mobileNumber,
nationalId: _appState.getAuthenticatedUser()!.patientIdentificationNo,
gender: _appState.getAuthenticatedUser()!.gender)
deviceToken: _appState.deviceToken,
deviceTypeId: _appState.getDeviceTypeID(),
patientId: _appState.getAuthenticatedUser()!.patientId!,
patientTypeId: _appState.getAuthenticatedUser()!.patientType,
patientOutSa: _appState.getAuthenticatedUser()!.outSa!,
loginType: loginType,
languageId: _appState.getLanguageID(),
latitude: _appState.userLat,
longitude: _appState.userLong,
voipToken: "",
deviceType: _appState.deviceTypeID,
patientMobileNumber: _appState.getAuthenticatedUser()!.mobileNumber,
nationalId: _appState.getAuthenticatedUser()!.patientIdentificationNo,
gender: _appState.getAuthenticatedUser()!.gender)
.toJson());
resultEither.fold((failure) async => await _errorHandlerService.handleError(failure: failure), (apiResponse) async {
if (apiResponse.messageStatus == 1) {
@ -851,18 +858,18 @@ class AuthenticationViewModel extends ChangeNotifier {
Future<void> getPatientDeviceData(int loginType) async {
final resultEither = await _authenticationRepo.getPatientDeviceData(
patientDeviceDataRequest: GetUserMobileDeviceData(
deviceToken: _appState.deviceToken,
deviceTypeId: _appState.getDeviceTypeID(),
patientId: _appState.getSelectDeviceByImeiRespModelElement!.patientId!,
patientType: _appState.getSelectDeviceByImeiRespModelElement!.patientType,
patientOutSa: _appState.getSelectDeviceByImeiRespModelElement!.outSa == true ? 1 : 0,
loginType: loginType,
languageId: _appState.getLanguageID(),
latitude: _appState.userLat,
longitude: _appState.userLong,
mobileNo: _appState.getSelectDeviceByImeiRespModelElement!.mobile!,
patientMobileNumber: int.parse(_appState.getSelectDeviceByImeiRespModelElement!.mobile!),
nationalId: _appState.getSelectDeviceByImeiRespModelElement!.identificationNo)
deviceToken: _appState.deviceToken,
deviceTypeId: _appState.getDeviceTypeID(),
patientId: _appState.getSelectDeviceByImeiRespModelElement!.patientId!,
patientType: _appState.getSelectDeviceByImeiRespModelElement!.patientType,
patientOutSa: _appState.getSelectDeviceByImeiRespModelElement!.outSa == true ? 1 : 0,
loginType: loginType,
languageId: _appState.getLanguageID(),
latitude: _appState.userLat,
longitude: _appState.userLong,
mobileNo: _appState.getSelectDeviceByImeiRespModelElement!.mobile!,
patientMobileNumber: int.parse(_appState.getSelectDeviceByImeiRespModelElement!.mobile!),
nationalId: _appState.getSelectDeviceByImeiRespModelElement!.identificationNo)
.toJson());
resultEither.fold((failure) async => await _errorHandlerService.handleError(failure: failure), (apiResponse) async {
if (apiResponse.messageStatus == 1) {
@ -878,15 +885,11 @@ class AuthenticationViewModel extends ChangeNotifier {
message: apiResponse.errorMessage ?? "",
label: LocaleKeys.notice.tr(),
onOkPressed: () {
_dialogService.showPhoneNumberPickerSheet(
label: "Where would you like to receive OTP?",
message: "Please select from the below options to receive OTP.",
onSMSPress: () {
checkUserAuthentication(otpTypeEnum: OTPTypeEnum.sms);
},
onWhatsappPress: () {
checkUserAuthentication(otpTypeEnum: OTPTypeEnum.whatsapp);
});
_dialogService.showPhoneNumberPickerSheet(label:"Where would you like to receive OTP?", message:"Please select from the below options to receive OTP.", onSMSPress: () {
checkUserAuthentication(otpTypeEnum: OTPTypeEnum.sms);
}, onWhatsappPress: () {
checkUserAuthentication(otpTypeEnum: OTPTypeEnum.whatsapp);
});
},
onCancelPressed: () {
_navigationService.pop();
@ -911,8 +914,8 @@ class AuthenticationViewModel extends ChangeNotifier {
List<ProjectDetailListModel> projectDetailListModel = [];
resultEither.fold(
(failure) async => await _errorHandlerService.handleError(failure: failure),
(apiResponse) async {
(failure) async => await _errorHandlerService.handleError(failure: failure),
(apiResponse) async {
if (apiResponse.messageStatus == 2) {
await _dialogService.showErrorBottomSheet(message: apiResponse.errorMessage ?? "ErrorEmpty");
} else {

17
lib/features/authentication/widgets/otp_verification_screen.dart
Unescape Escape View File

@ -533,7 +533,6 @@ class _OTPVerificationScreenState extends State<OTPVerificationScreen> {
@override
Widget build(BuildContext context) {
AuthenticationViewModel authVM = context.read<AuthenticationViewModel>();
AppState appState = getIt<AppState>();
return Scaffold(
backgroundColor: AppColors.scaffoldBgColor,
appBar: CustomAppBar(
@ -553,16 +552,14 @@ class _OTPVerificationScreenState extends State<OTPVerificationScreen> {
LocaleKeys.otpVerification.tr().toText24(isBold: true),
SizedBox(height: 20.h),
Wrap(
spacing: 2.h,
runSpacing: 2.h,
spacing: 4.h,
runSpacing: 8.0,
children: [
LocaleKeys.weHaveSendOTP.tr().toText15(color: AppColors.inputLabelTextColor, letterSpacing: -0.4),
_getMaskedPhoneNumber().toText15(color: AppColors.inputLabelTextColor, isBold: true),
LocaleKeys.via.tr().toText15(color: AppColors.inputLabelTextColor, letterSpacing: -0.4),
authVM.loginTypeEnum.displayName.toText15(color: AppColors.inputLabelTextColor, isBold: true, letterSpacing: -0.4),
appState.getUserRegistrationPayload.isRegister != null && appState.getUserRegistrationPayload.isRegister == true
? LocaleKeys.forRegistrationVerification.tr().toText15(color: AppColors.inputLabelTextColor, letterSpacing: -0.4)
: LocaleKeys.forLoginVerification.tr().toText15(color: AppColors.inputLabelTextColor, letterSpacing: -0.4),
LocaleKeys.weHaveSendOTP.tr().toText16(color: AppColors.inputLabelTextColor),
_getMaskedPhoneNumber().toText16(color: AppColors.inputLabelTextColor, isBold: true),
LocaleKeys.via.tr().toText16(color: AppColors.inputLabelTextColor),
authVM.loginTypeEnum.displayName.toText16(color: AppColors.inputLabelTextColor),
LocaleKeys.forRegistrationVerification.tr().toText16(color: AppColors.inputLabelTextColor),
],
),

5
lib/features/book_appointments/book_appointments_view_model.dart
Unescape Escape View File

@ -425,10 +425,7 @@ class BookAppointmentsViewModel extends ChangeNotifier {
} else if (apiResponse.messageStatus == 1) {
var projectList = apiResponse.data!;
hospitalList = await DoctorMapper.getMappedHospitals(projectList,
isArabic: false,
lat: _appState.userLat,
lng: _appState.userLong,
);
isArabic: false);
var lat = await Utils.getNumFromPrefs(CacheConst.userLat);
var lng = await Utils.getNumFromPrefs(CacheConst.userLong);

2
lib/generated/locale_keys.g.dart
Unescape Escape View File

@ -846,7 +846,5 @@ abstract class LocaleKeys {
static const pleaseSelectACountry = 'pleaseSelectACountry';
static const pleaseEnterEmail = 'pleaseEnterEmail';
static const pleaseEnterAValidEmailFormat = 'pleaseEnterAValidEmailFormat';
static const selectCountry = 'selectCountry';
static const forLoginVerification = 'forLoginVerification';
}

517
lib/presentation/authentication/register_step2.dart
Unescape Escape View File

@ -43,11 +43,9 @@ class _RegisterNew extends State<RegisterNewStep2> {
@override
Widget build(BuildContext context) {
AppState appState = getIt.get<AppState>();
var name = authVM!.isUserFromUAE()
? ""
: appState.getLanguageCode() == "en"
? ("${appState.getNHICUserData.firstNameEn!.toUpperCase()} ${appState.getNHICUserData.lastNameEn!.toUpperCase()}")
: ("${appState.getNHICUserData.firstNameAr!.toUpperCase()} ${appState.getNHICUserData.lastNameAr!.toUpperCase()}");
var name = appState.getLanguageCode() == "en"
? ("${appState.getNHICUserData.firstNameEn!.toUpperCase()} ${appState.getNHICUserData.lastNameEn!.toUpperCase()}")
: ("${appState.getNHICUserData.firstNameAr!.toUpperCase()} ${appState.getNHICUserData.lastNameAr!.toUpperCase()}");
return Scaffold(
backgroundColor: AppColors.bgScaffoldColor,
appBar: CustomAppBar(
@ -59,273 +57,262 @@ class _RegisterNew extends State<RegisterNewStep2> {
onLanguageChanged: (lang) {},
hideLogoAndLang: true,
),
body: GestureDetector(
onTap: () {
FocusScope.of(context).unfocus();
},
behavior: HitTestBehavior.translucent, // Ensures taps on empty space are detected
child: SizedBox(
width: double.infinity,
height: double.infinity,
child: SingleChildScrollView(
reverse: false,
padding: EdgeInsets.only(left: 24.h, right: 24.h, top: 0.h),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
LocaleKeys.personalDetailsVerification.tr().toText26(color: AppColors.textColor, weight: FontWeight.w600, letterSpacing: -2),
SizedBox(height: 24.h),
Container(
decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(24)),
padding: EdgeInsets.only(left: 16.h, right: 16.h),
child: Column(
children: [
TextInputWidget(
labelText: authVM!.isUserFromUAE() ? LocaleKeys.fullName.tr() : LocaleKeys.name.tr(),
hintText: authVM!.isUserFromUAE() ? LocaleKeys.enterNameHere.tr() : (name),
controller: authVM!.isUserFromUAE() ? authVM!.nameController : null,
isEnable: true,
prefix: null,
isAllowRadius: false,
isBorderAllowed: false,
keyboardType: TextInputType.text,
// textInputAction: TextInputAction.done,
onSubmitted: (value) {
FocusScope.of(context).unfocus();
},
isAllowLeadingIcon: true,
isReadOnly: authVM!.isUserFromUAE() ? false : true,
leadingIcon: AppAssets.user_circle,
labelColor: AppColors.textColor,
).paddingSymmetrical(0.h, 16.h),
Divider(height: 1, color: AppColors.greyColor),
TextInputWidget(
labelText: LocaleKeys.nationalIdNumber.tr(),
hintText: authVM!.isUserFromUAE() ? appState.getUserRegistrationPayload.patientIdentificationId.toString() : (appState.getNHICUserData.idNumber ?? ""),
controller: null,
isEnable: true,
prefix: null,
isAllowRadius: false,
isBorderAllowed: false,
isAllowLeadingIcon: true,
isReadOnly: true,
labelColor: AppColors.textColor,
leadingIcon: AppAssets.student_card)
.paddingSymmetrical(0.h, 16.h),
Divider(height: 1, color: AppColors.greyColor),
authVM!.isUserFromUAE()
? Selector<AuthenticationViewModel, GenderTypeEnum?>(
selector: (_, authViewModel) => authViewModel.genderType,
shouldRebuild: (previous, next) => previous != next,
builder: (context, genderType, child) {
final authVM = context.read<AuthenticationViewModel>();
return DropdownWidget(
labelText: LocaleKeys.gender.tr(),
hintText: LocaleKeys.malE.tr(),
isEnable: true,
dropdownItems: GenderTypeEnum.values.map((e) => appState.isArabic() ? e.typeAr : e.type).toList(),
selectedValue: genderType != null ? (appState.isArabic() ? genderType.typeAr : genderType.type) : "",
onChange: authVM.onGenderChange,
isBorderAllowed: false,
hasSelectionCustomIcon: true,
isAllowRadius: false,
labelColor: AppColors.textColor,
padding: const EdgeInsets.only(top: 8, bottom: 8, left: 0, right: 0),
selectionCustomIcon: AppAssets.arrow_down,
leadingIcon: AppAssets.user_full,
).withVerticalPadding(8);
})
: TextInputWidget(
labelText: LocaleKeys.gender.tr(),
hintText: (appState.getNHICUserData.gender ?? ""),
controller: null,
isEnable: true,
prefix: null,
isAllowRadius: false,
isBorderAllowed: false,
isAllowLeadingIcon: true,
isReadOnly: authVM!.isUserFromUAE() ? false : true,
leadingIcon: AppAssets.user_full,
labelColor: AppColors.textColor,
onChange: (value) {})
.paddingSymmetrical(0.h, 16.h),
Divider(height: 1, color: AppColors.greyColor),
authVM!.isUserFromUAE()
? Selector<AuthenticationViewModel, MaritalStatusTypeEnum?>(
selector: (_, authViewModel) => authViewModel.maritalStatus,
shouldRebuild: (previous, next) => previous != next,
builder: (context, maritalStatus, child) {
final authVM = context.read<AuthenticationViewModel>(); // For onChange
return DropdownWidget(
labelText: LocaleKeys.maritalStatus.tr(),
hintText: LocaleKeys.married.tr(),
isEnable: true,
dropdownItems: MaritalStatusTypeEnum.values.map((e) => appState.isArabic() ? e.typeAr : e.type).toList(),
selectedValue: maritalStatus != null ? (appState.isArabic() ? maritalStatus.typeAr : maritalStatus.type) : "",
onChange: authVM.onMaritalStatusChange,
isBorderAllowed: false,
hasSelectionCustomIcon: true,
isAllowRadius: false,
labelColor: AppColors.textColor,
padding: const EdgeInsets.only(top: 8, bottom: 8, left: 0, right: 0),
selectionCustomIcon: AppAssets.arrow_down,
leadingIcon: AppAssets.smart_phone,
).withVerticalPadding(8);
},
)
: TextInputWidget(
labelText: LocaleKeys.maritalStatus.tr(),
hintText: appState.isArabic()
? (MaritalStatusTypeExtension.fromValue(appState.getNHICUserData.maritalStatusCode)!.typeAr)
: (MaritalStatusTypeExtension.fromValue(appState.getNHICUserData.maritalStatusCode)!.type),
isEnable: true,
prefix: null,
isAllowRadius: false,
isBorderAllowed: false,
isAllowLeadingIcon: true,
isReadOnly: true,
labelColor: AppColors.textColor,
leadingIcon: AppAssets.smart_phone,
onChange: (value) {})
.paddingSymmetrical(0.h, 16.h),
Divider(height: 1, color: AppColors.greyColor),
authVM!.isUserFromUAE()
? Selector<AuthenticationViewModel, ({List<NationalityCountries>? countriesList, NationalityCountries? selectedCountry, bool isArabic})>(
selector: (context, authViewModel) {
final appState = getIt.get<AppState>();
return (
countriesList: authViewModel.countriesList,
selectedCountry: authViewModel.pickedCountryByUAEUser,
isArabic: appState.isArabic(),
);
},
shouldRebuild: (previous, next) => previous.countriesList != next.countriesList || previous.selectedCountry != next.selectedCountry || previous.isArabic != next.isArabic,
builder: (context, data, child) {
final authVM = context.read<AuthenticationViewModel>();
return DropdownWidget(
labelText: LocaleKeys.country.tr(),
hintText: LocaleKeys.uae.tr(),
isEnable: true,
dropdownItems: (data.countriesList ?? []).map((e) => data.isArabic ? e.nameN ?? "" : e.name ?? "").toList(),
selectedValue: data.selectedCountry != null
? data.isArabic
? data.selectedCountry!.nameN ?? ""
: data.selectedCountry!.name ?? ""
: "",
onChange: authVM.onUAEUserCountrySelection,
isBorderAllowed: false,
hasSelectionCustomIcon: true,
labelColor: AppColors.textColor,
isAllowRadius: false,
padding: const EdgeInsets.only(top: 8, bottom: 8, left: 0, right: 0),
selectionCustomIcon: AppAssets.arrow_down,
leadingIcon: AppAssets.globe,
).withVerticalPadding(8);
},
)
: TextInputWidget(
labelText: LocaleKeys.nationality.tr(),
hintText: appState.isArabic()
? (authVM!.countriesList!.firstWhere((e) => e.id == (appState.getNHICUserData.nationalityCode ?? ""), orElse: () => NationalityCountries()).nameN ?? "")
: (authVM!.countriesList!.firstWhere((e) => e.id == (appState.getNHICUserData.nationalityCode ?? ""), orElse: () => NationalityCountries()).name ?? ""),
isEnable: true,
prefix: null,
isAllowRadius: false,
isBorderAllowed: false,
isAllowLeadingIcon: true,
isReadOnly: true,
labelColor: AppColors.textColor,
leadingIcon: AppAssets.globe,
onChange: (value) {})
.paddingSymmetrical(0.h, 16.h),
Divider(
height: 1,
color: AppColors.greyColor,
),
TextInputWidget(
labelText: LocaleKeys.mobileNumber.tr(),
hintText: (appState.getUserRegistrationPayload.patientMobileNumber.toString() ?? ""),
controller: null,
isEnable: false,
prefix: null,
isAllowRadius: false,
isBorderAllowed: false,
isAllowLeadingIcon: true,
labelColor: AppColors.textColor,
isReadOnly: true,
leadingIcon: AppAssets.call)
.paddingSymmetrical(0.h, 16.h),
Divider(
height: 1,
color: AppColors.greyColor,
),
TextInputWidget(
labelText: LocaleKeys.dob.tr(),
hintText: authVM!.isUserFromUAE() ? appState.getUserRegistrationPayload.dob! : appState.getNHICUserData.dateOfBirth ?? "",
controller: authVM!.isUserFromUAE() ? authVM!.dobController : null,
isEnable: false,
prefix: null,
isBorderAllowed: false,
isAllowLeadingIcon: true,
isReadOnly: true,
labelColor: AppColors.textColor,
leadingIcon: AppAssets.birthday_cake,
selectionType: null,
).paddingSymmetrical(0.h, 16.h),
],
),
),
SizedBox(height: 50.h),
Row(
body: SingleChildScrollView(
reverse: false,
padding: EdgeInsets.only(left: 24.h, right: 24.h, top: 0.h),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
LocaleKeys.personalDetailsVerification.tr().toText26(color: AppColors.textColor, weight: FontWeight.w600, letterSpacing: -2),
SizedBox(height: 24.h),
Directionality(
textDirection: Directionality.of(context),
child: Container(
decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(24)),
padding: EdgeInsets.only(left: 16.h, right: 16.h),
child: Column(
children: [
Expanded(
child: CustomButton(
text: LocaleKeys.cancel.tr(),
icon: AppAssets.cancel,
onPressed: () {
Navigator.of(context).pop();
// authVM!.clearDefaultInputValues();
},
backgroundColor: AppColors.secondaryLightRedColor,
borderColor: AppColors.secondaryLightRedColor,
textColor: AppColors.primaryRedColor,
iconColor: AppColors.primaryRedColor,
),
TextInputWidget(
labelText: authVM!.isUserFromUAE() ? LocaleKeys.fullName.tr() : LocaleKeys.name.tr(),
hintText: authVM!.isUserFromUAE() ? LocaleKeys.enterNameHere.tr() : (name),
controller: authVM!.isUserFromUAE() ? authVM!.nameController : null,
isEnable: true,
prefix: null,
isAllowRadius: false,
isBorderAllowed: false,
keyboardType: TextInputType.text,
isAllowLeadingIcon: true,
isReadOnly: authVM!.isUserFromUAE() ? false : true,
leadingIcon: AppAssets.user_circle,
labelColor: AppColors.textColor,
).paddingSymmetrical(0.h, 16.h),
Divider(height: 1, color: AppColors.greyColor),
TextInputWidget(
labelText: LocaleKeys.nationalIdNumber.tr(),
hintText: authVM!.isUserFromUAE() ? appState.getUserRegistrationPayload.patientIdentificationId.toString() : (appState.getNHICUserData.idNumber ?? ""),
controller: null,
isEnable: true,
prefix: null,
isAllowRadius: false,
isBorderAllowed: false,
isAllowLeadingIcon: true,
isReadOnly: true,
labelColor: AppColors.textColor,
leadingIcon: AppAssets.student_card)
.paddingSymmetrical(0.h, 16.h),
Divider(height: 1, color: AppColors.greyColor),
authVM!.isUserFromUAE()
? Selector<AuthenticationViewModel, GenderTypeEnum?>(
selector: (_, authViewModel) => authViewModel.genderType,
shouldRebuild: (previous, next) => previous != next,
builder: (context, genderType, child) {
final authVM = context.read<AuthenticationViewModel>();
return DropdownWidget(
labelText: LocaleKeys.gender.tr(),
hintText: LocaleKeys.malE.tr(),
isEnable: true,
dropdownItems: GenderTypeEnum.values.map((e) => appState.isArabic() ? e.typeAr : e.type).toList(),
selectedValue: genderType != null ? (appState.isArabic() ? genderType.typeAr : genderType.type) : "",
onChange: authVM.onGenderChange,
isBorderAllowed: false,
hasSelectionCustomIcon: true,
isAllowRadius: false,
labelColor: AppColors.textColor,
padding: const EdgeInsets.only(top: 8, bottom: 8, left: 0, right: 0),
selectionCustomIcon: AppAssets.arrow_down,
leadingIcon: AppAssets.user_full,
).withVerticalPadding(8);
})
: TextInputWidget(
labelText: LocaleKeys.gender.tr(),
hintText: (appState.getNHICUserData.gender ?? ""),
controller: null,
isEnable: true,
prefix: null,
isAllowRadius: false,
isBorderAllowed: false,
isAllowLeadingIcon: true,
isReadOnly: authVM!.isUserFromUAE() ? false : true,
leadingIcon: AppAssets.user_full,
labelColor: AppColors.textColor,
onChange: (value) {})
.paddingSymmetrical(0.h, 16.h),
Divider(height: 1, color: AppColors.greyColor),
authVM!.isUserFromUAE()
? Selector<AuthenticationViewModel, MaritalStatusTypeEnum?>(
selector: (_, authViewModel) => authViewModel.maritalStatus,
shouldRebuild: (previous, next) => previous != next,
builder: (context, maritalStatus, child) {
final authVM = context.read<AuthenticationViewModel>(); // For onChange
return DropdownWidget(
labelText: LocaleKeys.maritalStatus.tr(),
hintText: LocaleKeys.married.tr(),
isEnable: true,
dropdownItems: MaritalStatusTypeEnum.values.map((e) => appState.isArabic() ? e.typeAr : e.type).toList(),
selectedValue: maritalStatus != null ? (appState.isArabic() ? maritalStatus.typeAr : maritalStatus.type) : "",
onChange: authVM.onMaritalStatusChange,
isBorderAllowed: false,
hasSelectionCustomIcon: true,
isAllowRadius: false,
labelColor: AppColors.textColor,
padding: const EdgeInsets.only(top: 8, bottom: 8, left: 0, right: 0),
selectionCustomIcon: AppAssets.arrow_down,
leadingIcon: AppAssets.smart_phone,
).withVerticalPadding(8);
},
)
: TextInputWidget(
labelText: LocaleKeys.maritalStatus.tr(),
hintText: appState.isArabic()
? (MaritalStatusTypeExtension.fromValue(appState.getNHICUserData.maritalStatusCode)!.typeAr)
: (MaritalStatusTypeExtension.fromValue(appState.getNHICUserData.maritalStatusCode)!.type),
isEnable: true,
prefix: null,
isAllowRadius: false,
isBorderAllowed: false,
isAllowLeadingIcon: true,
isReadOnly: true,
labelColor: AppColors.textColor,
leadingIcon: AppAssets.smart_phone,
onChange: (value) {})
.paddingSymmetrical(0.h, 16.h),
Divider(height: 1, color: AppColors.greyColor),
authVM!.isUserFromUAE()
? Selector<AuthenticationViewModel, ({List<NationalityCountries>? countriesList, NationalityCountries? selectedCountry, bool isArabic})>(
selector: (context, authViewModel) {
final appState = getIt.get<AppState>();
return (
countriesList: authViewModel.countriesList,
selectedCountry: authViewModel.pickedCountryByUAEUser,
isArabic: appState.isArabic(),
);
},
shouldRebuild: (previous, next) => previous.countriesList != next.countriesList || previous.selectedCountry != next.selectedCountry || previous.isArabic != next.isArabic,
builder: (context, data, child) {
final authVM = context.read<AuthenticationViewModel>();
return DropdownWidget(
labelText: LocaleKeys.country.tr(),
hintText: LocaleKeys.uae.tr(),
isEnable: true,
dropdownItems: (data.countriesList ?? []).map((e) => data.isArabic ? e.nameN ?? "" : e.name ?? "").toList(),
selectedValue: data.selectedCountry != null
? data.isArabic
? data.selectedCountry!.nameN ?? ""
: data.selectedCountry!.name ?? ""
: "",
onChange: authVM.onUAEUserCountrySelection,
isBorderAllowed: false,
hasSelectionCustomIcon: true,
labelColor: AppColors.textColor,
isAllowRadius: false,
padding: const EdgeInsets.only(top: 8, bottom: 8, left: 0, right: 0),
selectionCustomIcon: AppAssets.arrow_down,
leadingIcon: AppAssets.globe,
).withVerticalPadding(8);
},
)
: TextInputWidget(
labelText: LocaleKeys.nationality.tr(),
hintText: appState.isArabic()
? (authVM!.countriesList!.firstWhere((e) => e.id == (appState.getNHICUserData.nationalityCode ?? ""), orElse: () => NationalityCountries()).nameN ?? "")
: (authVM!.countriesList!.firstWhere((e) => e.id == (appState.getNHICUserData.nationalityCode ?? ""), orElse: () => NationalityCountries()).name ?? ""),
isEnable: true,
prefix: null,
isAllowRadius: false,
isBorderAllowed: false,
isAllowLeadingIcon: true,
isReadOnly: true,
labelColor: AppColors.textColor,
leadingIcon: AppAssets.globe,
onChange: (value) {})
.paddingSymmetrical(0.h, 16.h),
Divider(
height: 1,
color: AppColors.greyColor,
),
SizedBox(
width: 16,
TextInputWidget(
labelText: LocaleKeys.mobileNumber.tr(),
hintText: (appState.getUserRegistrationPayload.patientMobileNumber.toString() ?? ""),
controller: null,
isEnable: false,
prefix: null,
isAllowRadius: false,
isBorderAllowed: false,
isAllowLeadingIcon: true,
labelColor: AppColors.textColor,
isReadOnly: true,
leadingIcon: AppAssets.call)
.paddingSymmetrical(0.h, 16.h),
Divider(
height: 1,
color: AppColors.greyColor,
),
Expanded(
child: CustomButton(
backgroundColor: AppColors.primaryRedColor,
borderColor: AppColors.primaryRedColor,
textColor: AppColors.whiteColor,
text: LocaleKeys.confirm.tr(),
icon: AppAssets.confirm,
iconColor: AppColors.whiteColor,
onPressed: () {
if (appState.getUserRegistrationPayload.zipCode != CountryEnum.saudiArabia.countryCode) {
if (ValidationUtils.validateUaeRegistration(
name: authVM!.nameController.text,
gender: authVM!.genderType,
country: authVM!.pickedCountryByUAEUser,
maritalStatus: authVM!.maritalStatus,
onOkPress: () {
Navigator.of(context).pop();
})) {
showModel(context: context);
}
} else {
showModel(context: context);
}
},
),
)
TextInputWidget(
labelText: LocaleKeys.dob.tr(),
hintText: authVM!.isUserFromUAE() ? appState.getUserRegistrationPayload.dob! : appState.getNHICUserData.dateOfBirth ?? "",
controller: authVM!.isUserFromUAE() ? authVM!.dobController : null,
isEnable: false,
prefix: null,
isBorderAllowed: false,
isAllowLeadingIcon: true,
isReadOnly: true,
labelColor: AppColors.textColor,
leadingIcon: AppAssets.birthday_cake,
selectionType: null,
).paddingSymmetrical(0.h, 16.h),
],
),
),
),
SizedBox(height: 50.h),
Row(
children: [
Expanded(
child: CustomButton(
text: LocaleKeys.cancel.tr(),
icon: AppAssets.cancel,
onPressed: () {
Navigator.of(context).pop();
// authVM!.clearDefaultInputValues();
},
backgroundColor: AppColors.secondaryLightRedColor,
borderColor: AppColors.secondaryLightRedColor,
textColor: AppColors.primaryRedColor,
iconColor: AppColors.primaryRedColor,
),
),
SizedBox(
width: 16,
),
Expanded(
child: CustomButton(
backgroundColor: AppColors.primaryRedColor,
borderColor: AppColors.primaryRedColor,
textColor: AppColors.whiteColor,
text: LocaleKeys.confirm.tr(),
icon: AppAssets.confirm,
iconColor: AppColors.whiteColor,
onPressed: () {
if (appState.getUserRegistrationPayload.zipCode != CountryEnum.saudiArabia.countryCode) {
if (ValidationUtils.validateUaeRegistration(
name: authVM!.nameController.text,
gender: authVM!.genderType,
country: authVM!.pickedCountryByUAEUser,
maritalStatus: authVM!.maritalStatus,
onOkPress: () {
Navigator.of(context).pop();
})) {
showModel(context: context);
}
} else {
showModel(context: context);
}
},
),
)
],
),
),
],
),
),
);

31
lib/presentation/authentication/saved_login_screen.dart
Unescape Escape View File

@ -72,9 +72,7 @@ class _SavedLogin extends State<SavedLogin> {
// Welcome back text
LocaleKeys.welcomeBack.tr().toText16(color: AppColors.inputLabelTextColor),
SizedBox(height: 16.h),
appState.getSelectDeviceByImeiRespModelElement != null
? appState.getSelectDeviceByImeiRespModelElement!.name!.toCamelCase.toText26(isBold: true, height: 26 / 36, color: AppColors.textColor)
: SizedBox(),
appState.getSelectDeviceByImeiRespModelElement!.name!.toCamelCase.toText26(isBold: true, height: 26 / 36, color: AppColors.textColor),
SizedBox(height: 24.h),
Container(
padding: EdgeInsets.all(16.h),
@ -91,22 +89,15 @@ class _SavedLogin extends State<SavedLogin> {
// Last login info
("${LocaleKeys.lastLoginBy.tr()} ${loginType.displayName}").toText14(isBold: true, color: AppColors.greyTextColor, letterSpacing: -1),
appState.getSelectDeviceByImeiRespModelElement != null
? (appState.getSelectDeviceByImeiRespModelElement!.createdOn != null
? DateUtil.getFormattedDate(DateUtil.convertStringToDate(appState.getSelectDeviceByImeiRespModelElement!.createdOn!), "d MMMM, y 'at' HH:mm")
: '--')
.toText16(isBold: true, color: AppColors.textColor)
: SizedBox(),
(appState.getSelectDeviceByImeiRespModelElement!.createdOn != null
? DateUtil.getFormattedDate(DateUtil.convertStringToDate(appState.getSelectDeviceByImeiRespModelElement!.createdOn!), "d MMMM, y 'at' HH:mm")
: '--')
.toText16(isBold: true, color: AppColors.textColor),
appState.getSelectDeviceByImeiRespModelElement != null
? Container(
margin: EdgeInsets.all(16.h),
child: Utils.buildSvgWithAssets(
icon: getTypeIcons(appState.getSelectDeviceByImeiRespModelElement!.logInType!),
height: 54,
width: 54,
iconColor: loginType.toInt == 4 ? null : AppColors.primaryRedColor))
: SizedBox(),
Container(
margin: EdgeInsets.all(16.h),
child: Utils.buildSvgWithAssets(
icon: getTypeIcons(appState.getSelectDeviceByImeiRespModelElement!.logInType!), height: 54, width: 54, iconColor: loginType.toInt == 4 ? null : AppColors.primaryRedColor)),
// Face ID login button
SizedBox(
height: 45,
@ -119,8 +110,8 @@ class _SavedLogin extends State<SavedLogin> {
authVm.checkUserAuthentication(otpTypeEnum: loginType == LoginTypeEnum.sms ? OTPTypeEnum.sms : OTPTypeEnum.whatsapp);
}
},
backgroundColor: AppColors.primaryRedColor,
borderColor: AppColors.primaryRedColor,
backgroundColor: Color(0xffED1C2B),
borderColor: Color(0xffFEE9EA),
textColor: Colors.white,
fontSize: 12,
fontWeight: FontWeight.w500,

3
lib/presentation/habib_wallet/habib_wallet_page.dart
Unescape Escape View File

@ -51,7 +51,6 @@ class _HabibWalletState extends State<HabibWalletPage> {
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
@ -59,7 +58,7 @@ class _HabibWalletState extends State<HabibWalletPage> {
"${_appState.getAuthenticatedUser()!.firstName!} ${_appState.getAuthenticatedUser()!.lastName!}".toText19(isBold: true, color: AppColors.whiteColor),
"MRN: ${_appState.getAuthenticatedUser()!.patientId!}".toText14(weight: FontWeight.w500, color: AppColors.greyTextColor),
],
).expanded,
),
Utils.buildSvgWithAssets(icon: AppAssets.habiblogo, width: 24.h, height: 24.h),
],
),

396
lib/presentation/home/landing_page.dart
Unescape Escape View File

@ -34,7 +34,6 @@ import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart';
import 'package:hmg_patient_app_new/widgets/custom_tab_bar.dart' show CustomTabBar;
import 'package:hmg_patient_app_new/widgets/loader/bottomsheet_loader.dart';
import 'package:hmg_patient_app_new/widgets/routes/spring_page_route_builder.dart';
import 'package:hmg_patient_app_new/widgets/transitions/fade_page.dart';
import 'package:provider/provider.dart';
@ -87,219 +86,227 @@ class _LandingPageState extends State<LandingPage> {
return Scaffold(
backgroundColor: AppColors.bgScaffoldColor,
body: SingleChildScrollView(
padding: EdgeInsets.only(top: kToolbarHeight + 12.h, bottom: 24),
child: Column(
spacing: 16.h,
children: [
Row(
spacing: 8.h,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
appState.isAuthenticated
? WelcomeWidget(
onTap: () {
Navigator.of(context).push(springPageRoute(ProfileSettings()));
},
name: ('${appState.getAuthenticatedUser()!.firstName!} ${appState.getAuthenticatedUser()!.lastName!}'),
imageUrl: appState.getAuthenticatedUser()?.gender == 1 ? AppAssets.male_img : AppAssets.femaleImg,
).expanded
: CustomButton(
text: LocaleKeys.loginOrRegister.tr(context: context),
onPressed: () async {
await authVM.onLoginPressed();
},
backgroundColor: Color(0xffFEE9EA),
borderColor: Color(0xffFEE9EA),
textColor: Color(0xffED1C2B),
fontSize: 16,
fontWeight: FontWeight.w500,
borderRadius: 12,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 50,
),
Row(
mainAxisSize: MainAxisSize.min,
spacing: 12.h,
children: [
Utils.buildSvgWithAssets(icon: AppAssets.bell, height: 20, width: 20).onPress(() {
Navigator.of(context).push(
FadePage(
page: MedicalFilePage(),
// page: LoginScreen(),
),
);
}),
Utils.buildSvgWithAssets(icon: AppAssets.search_icon, height: 20, width: 20).onPress(() {
Navigator.of(context).push(
FadePage(
page: MedicalFilePage(),
// page: LoginScreen(),
),
);
}),
Utils.buildSvgWithAssets(icon: AppAssets.contact_icon, height: 20, width: 20).onPress(() {
Padding(
padding: EdgeInsets.only(top: 50.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
appState.isAuthenticated
? WelcomeWidget(
onTap: () {
Navigator.of(context).push(
FadePage(
page: MedicalFilePage(),
// page: LoginScreen(),
page: ProfileSettings(),
),
);
}),
],
)
],
).paddingSymmetrical(24.h, 0.h),
appState.isAuthenticated
? Column(
},
name: ('${appState.getAuthenticatedUser()!.firstName!} ${appState.getAuthenticatedUser()!.lastName!}'),
imageUrl: appState
.getAuthenticatedUser()
?.gender == 1 ? AppAssets.male_img : AppAssets.femaleImg,
)
: CustomButton(
text: LocaleKeys.loginOrRegister.tr(context: context),
onPressed: () async {
await authVM.onLoginPressed();
},
backgroundColor: Color(0xffFEE9EA),
borderColor: Color(0xffFEE9EA),
textColor: Color(0xffED1C2B),
fontSize: 16,
fontWeight: FontWeight.w500,
borderRadius: 12,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 50,
),
Row(
children: [
Container(
width: double.infinity,
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: AppColors.whiteColor,
borderRadius: 24,
),
child: Padding(
padding: EdgeInsets.all(12.h),
child: Column(
children: [
Utils.buildSvgWithAssets(icon: AppAssets.home_calendar_icon, width: 32.h, height: 32.h),
SizedBox(height: 12.h),
"You do not have any upcoming appointment. Please book an appointment".toText12(isCenter: true),
SizedBox(height: 12.h),
CustomButton(
text: LocaleKeys.bookAppo.tr(context: context),
onPressed: () {
Navigator.of(context).push(
FadePage(
page: BookAppointmentPage(),
),
);
},
backgroundColor: Color(0xffFEE9EA),
borderColor: Color(0xffFEE9EA),
textColor: Color(0xffED1C2B),
fontSize: 14,
fontWeight: FontWeight.w500,
borderRadius: 12,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 40,
icon: AppAssets.add_icon,
iconColor: AppColors.primaryRedColor,
),
],
),
),
).paddingSymmetrical(24.h, 0.h),
SizedBox(height: 12.h),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
"Quick Links".toText16(isBold: true),
Row(
children: [
"View medical file".toText12(color: AppColors.primaryRedColor),
SizedBox(width: 2.h),
Icon(Icons.arrow_forward_ios, color: AppColors.primaryRedColor, size: 10.h),
],
Utils.buildSvgWithAssets(icon: AppAssets.bell, height: 20, width: 20).onPress(() {
Navigator.of(context).push(
FadePage(
page: MedicalFilePage(),
// page: LoginScreen(),
),
],
).paddingSymmetrical(24.h, 0.h).onPress(() {
);
}).paddingSymmetrical(8.h, 0),
Utils.buildSvgWithAssets(icon: AppAssets.search_icon, height: 20, width: 20).onPress(() {
Navigator.of(context).push(
FadePage(
page: MedicalFilePage(),
// page: LoginScreen(),
),
);
}),
SizedBox(height: 12.h),
Container(
height: 127.h,
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: AppColors.whiteColor,
borderRadius: 24,
),
child: Padding(
padding: EdgeInsets.all(16.h),
child: Column(
children: [
Expanded(
child: ListView.separated(
scrollDirection: Axis.horizontal,
itemCount: LandingPageData.getLoggedInServiceCardsList.length,
shrinkWrap: true,
padding: const EdgeInsets.only(left: 0, right: 8),
itemBuilder: (context, index) {
return AnimationConfiguration.staggeredList(
position: index,
duration: const Duration(milliseconds: 1000),
child: SlideAnimation(
horizontalOffset: 100.0,
child: FadeInAnimation(
child: SmallServiceCard(
icon: LandingPageData.getLoggedInServiceCardsList[index].icon,
title: LandingPageData.getLoggedInServiceCardsList[index].title,
subtitle: LandingPageData.getLoggedInServiceCardsList[index].subtitle,
iconColor: LandingPageData.getLoggedInServiceCardsList[index].iconColor,
textColor: LandingPageData.getLoggedInServiceCardsList[index].textColor,
backgroundColor: LandingPageData.getLoggedInServiceCardsList[index].backgroundColor,
isBold: LandingPageData.getLoggedInServiceCardsList[index].isBold,
serviceName: LandingPageData.getLoggedInServiceCardsList[index].serviceName,
),
),
),
);
},
separatorBuilder: (BuildContext cxt, int index) => 0.width,
),
),
],
}).paddingSymmetrical(8.h, 0),
Utils.buildSvgWithAssets(icon: AppAssets.contact_icon, height: 20, width: 20).onPress(() {
Navigator.of(context).push(
FadePage(
page: MedicalFilePage(),
// page: LoginScreen(),
),
),
).paddingSymmetrical(24.h, 0.h),
);
}).paddingSymmetrical(8.h, 0),
],
)
: Container(
height: 127.h,
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: AppColors.whiteColor,
borderRadius: 24,
],
).paddingSymmetrical(24.h, 0.h),
),
SizedBox(height: 16.h),
appState.isAuthenticated
? Column(
children: [
Container(
width: double.infinity,
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: AppColors.whiteColor,
borderRadius: 24,
),
child: Padding(
padding: EdgeInsets.all(12.h),
child: Column(
children: [
Utils.buildSvgWithAssets(icon: AppAssets.home_calendar_icon, width: 32.h, height: 32.h),
SizedBox(height: 12.h),
"You do not have any upcoming appointment. Please book an appointment".toText12(isCenter: true),
SizedBox(height: 12.h),
CustomButton(
text: LocaleKeys.bookAppo.tr(context: context),
onPressed: () {
Navigator.of(context)
.push(
FadePage(
page: BookAppointmentPage(),
),
);
},
backgroundColor: Color(0xffFEE9EA),
borderColor: Color(0xffFEE9EA),
textColor: Color(0xffED1C2B),
fontSize: 14,
fontWeight: FontWeight.w500,
borderRadius: 12,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 40,
icon: AppAssets.add_icon,
iconColor: AppColors.primaryRedColor,
),
],
),
),
).paddingSymmetrical(24.h, 0.h),
SizedBox(height: 12.h),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
"Quick Links".toText16(isBold: true),
Row(
children: [
"View medical file".toText12(color: AppColors.primaryRedColor),
SizedBox(width: 2.h),
Icon(Icons.arrow_forward_ios, color: AppColors.primaryRedColor, size: 10.h),
],
),
],
).paddingSymmetrical(24.h, 0.h).onPress(() {
Navigator.of(context).push(
FadePage(
page: MedicalFilePage(),
),
child: Padding(
padding: EdgeInsets.all(16.h),
child: Column(
children: [
Expanded(
child: ListView.separated(
scrollDirection: Axis.horizontal,
itemCount: LandingPageData.getNotLoggedInServiceCardsList.length,
shrinkWrap: true,
padding: const EdgeInsets.only(left: 0, right: 8),
itemBuilder: (context, index) {
return AnimationConfiguration.staggeredList(
position: index,
duration: const Duration(milliseconds: 1000),
child: SlideAnimation(
horizontalOffset: 100.0,
child: FadeInAnimation(
child: SmallServiceCard(
icon: LandingPageData.getNotLoggedInServiceCardsList[index].icon,
title: LandingPageData.getNotLoggedInServiceCardsList[index].title,
subtitle: LandingPageData.getNotLoggedInServiceCardsList[index].subtitle,
iconColor: LandingPageData.getNotLoggedInServiceCardsList[index].iconColor,
textColor: LandingPageData.getNotLoggedInServiceCardsList[index].textColor,
backgroundColor: LandingPageData.getNotLoggedInServiceCardsList[index].backgroundColor,
isBold: LandingPageData.getNotLoggedInServiceCardsList[index].isBold,
),
);
}),
SizedBox(height: 12.h),
Container(
height: 127.h,
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: AppColors.whiteColor,
borderRadius: 24,
),
child: Padding(
padding: EdgeInsets.all(16.h),
child: Column(
children: [
Expanded(
child: ListView.separated(
scrollDirection: Axis.horizontal,
itemCount: LandingPageData.getLoggedInServiceCardsList.length,
shrinkWrap: true,
padding: const EdgeInsets.only(left: 0, right: 8),
itemBuilder: (context, index) {
return AnimationConfiguration.staggeredList(
position: index,
duration: const Duration(milliseconds: 1000),
child: SlideAnimation(
horizontalOffset: 100.0,
child: FadeInAnimation(
child: SmallServiceCard(
icon: LandingPageData.getLoggedInServiceCardsList[index].icon,
title: LandingPageData.getLoggedInServiceCardsList[index].title,
subtitle: LandingPageData.getLoggedInServiceCardsList[index].subtitle,
iconColor: LandingPageData.getLoggedInServiceCardsList[index].iconColor,
textColor: LandingPageData.getLoggedInServiceCardsList[index].textColor,
backgroundColor: LandingPageData.getLoggedInServiceCardsList[index].backgroundColor,
isBold: LandingPageData.getLoggedInServiceCardsList[index].isBold,
serviceName: LandingPageData.getLoggedInServiceCardsList[index].serviceName,
),
),
);
},
separatorBuilder: (BuildContext cxt, int index) => 0.width,
),
),
);
},
separatorBuilder: (BuildContext cxt, int index) => 0.width,
),
],
),
],
),
),
).paddingSymmetrical(24.h, 0.h),
],
)
: Container(
height: 127.h,
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: AppColors.whiteColor,
borderRadius: 24,
),
child: Padding(
padding: EdgeInsets.all(16.h),
child: Column(
children: [
Expanded(
child: ListView.separated(
scrollDirection: Axis.horizontal,
itemCount: LandingPageData.getNotLoggedInServiceCardsList.length,
shrinkWrap: true,
padding: const EdgeInsets.only(left: 0, right: 8),
itemBuilder: (context, index) {
return AnimationConfiguration.staggeredList(
position: index,
duration: const Duration(milliseconds: 1000),
child: SlideAnimation(
horizontalOffset: 100.0,
child: FadeInAnimation(
child: SmallServiceCard(
icon: LandingPageData.getNotLoggedInServiceCardsList[index].icon,
title: LandingPageData.getNotLoggedInServiceCardsList[index].title,
subtitle: LandingPageData.getNotLoggedInServiceCardsList[index].subtitle,
iconColor: LandingPageData.getNotLoggedInServiceCardsList[index].iconColor,
textColor: LandingPageData.getNotLoggedInServiceCardsList[index].textColor,
backgroundColor: LandingPageData.getNotLoggedInServiceCardsList[index].backgroundColor,
isBold: LandingPageData.getNotLoggedInServiceCardsList[index].isBold,
),
),
),
);
},
separatorBuilder: (BuildContext cxt, int index) => 0.width,
),
),
).paddingSymmetrical(24.h, 0.h),
],
),
),
).paddingSymmetrical(24.h, 0.h),
SizedBox(height: 16.h),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
@ -313,6 +320,7 @@ class _LandingPageState extends State<LandingPage> {
),
],
).paddingSymmetrical(24.h, 0.h),
SizedBox(height: 16.h),
SizedBox(
height: 325.h,
child: Column(
@ -346,7 +354,9 @@ class _LandingPageState extends State<LandingPage> {
],
),
),
SizedBox(height: 16.h),
appState.isAuthenticated ? HabibWalletCard() : SizedBox(),
SizedBox(height: 16.h),
],
),
),
@ -365,7 +375,7 @@ class _LandingPageState extends State<LandingPage> {
// sharedPref.setBool(HAS_ENABLED_QUICK_LOGIN, true);
authVM.loginWithFingerPrintFace(() {
isDone = true;
cacheService.saveBool(key: CacheConst.quickLoginEnabled, value: true);
cacheService.saveBool(key: CacheConst.quickLoginEnabled,value: true);
setState(() {});
});
},

25
lib/presentation/home/widgets/welcome_widget.dart
Unescape Escape View File

@ -1,9 +1,7 @@
import 'package:flutter/material.dart';
import 'package:hmg_patient_app_new/core/app_assets.dart';
import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
import 'package:hmg_patient_app_new/core/utils/utils.dart';
import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
import 'package:hmg_patient_app_new/theme/colors.dart';
class WelcomeWidget extends StatelessWidget {
@ -25,25 +23,32 @@ class WelcomeWidget extends StatelessWidget {
borderRadius: BorderRadius.circular(30),
child: Row(
mainAxisSize: MainAxisSize.min,
spacing: 8.h,
children: [
// Profile image
Image.asset(imageUrl, width: 40, height: 40),
const SizedBox(width: 10),
// Text column
Column(
crossAxisAlignment: CrossAxisAlignment.start,
spacing: 4.h,
mainAxisSize: MainAxisSize.min,
children: [
"Welcome".needTranslation.toText14(color: AppColors.greyTextColor, height: 1, weight: FontWeight.w500),
"Welcome".toText14(color: AppColors.greyTextColor),
Row(
spacing: 4.h,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
name.toText16(weight: FontWeight.w500, textOverflow: TextOverflow.ellipsis, maxlines: 1, height: 1).expanded,
name.toText16(isBold: true),
const SizedBox(width: 4),
const Icon(Icons.keyboard_arrow_down, size: 20, color: Colors.black),
],
),
],
).expanded,
),
],
),
);

13
lib/presentation/lab/collapsing_list_view.dart
Unescape Escape View File

@ -41,14 +41,11 @@ class CollapsingListView extends StatelessWidget {
systemOverlayStyle: SystemUiOverlayStyle(statusBarBrightness: Brightness.light),
surfaceTintColor: Colors.transparent,
backgroundColor: AppColors.bgScaffoldColor,
leading: isLeading
? IconButton(
icon: Utils.buildSvgWithAssets(icon: isClose ? AppAssets.closeBottomNav : AppAssets.arrow_back, width: 32.h, height: 32.h),
padding: EdgeInsets.only(left: 12),
onPressed: () => Navigator.pop(context),
highlightColor: Colors.transparent,
)
: SizedBox.shrink(),
leading: isLeading ? IconButton(
icon: Utils.buildSvgWithAssets(icon: isClose ? AppAssets.closeBottomNav : AppAssets.arrow_back, width: 32.h, height: 32.h),
padding: EdgeInsets.only(left: 12),
onPressed: () => Navigator.pop(context),
) : SizedBox.shrink(),
flexibleSpace: LayoutBuilder(
builder: (context, constraints) {
final double maxHeight = 100;

136
lib/presentation/profile_settings/profile_settings.dart
Unescape Escape View File

@ -1,24 +1,15 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter_swiper_view/flutter_swiper_view.dart';
import 'package:hmg_patient_app_new/core/app_assets.dart';
import 'package:hmg_patient_app_new/core/app_export.dart';
import 'package:hmg_patient_app_new/core/utils/utils.dart';
import 'package:hmg_patient_app_new/extensions/int_extensions.dart';
import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
import 'package:hmg_patient_app_new/features/habib_wallet/habib_wallet_view_model.dart';
import 'package:hmg_patient_app_new/features/profile_settings/profile_settings_view_model.dart';
import 'package:hmg_patient_app_new/presentation/habib_wallet/habib_wallet_page.dart';
import 'package:hmg_patient_app_new/presentation/habib_wallet/recharge_wallet_page.dart';
import 'package:hmg_patient_app_new/presentation/lab/collapsing_list_view.dart';
import 'package:hmg_patient_app_new/theme/colors.dart';
import 'package:hmg_patient_app_new/widgets/app_language_change.dart';
import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
import 'package:hmg_patient_app_new/widgets/chip/app_custom_chip_widget.dart';
import 'package:hmg_patient_app_new/widgets/common_bottom_sheet.dart';
import 'package:hmg_patient_app_new/widgets/routes/custom_page_route.dart';
import 'package:hmg_patient_app_new/widgets/transitions/fade_page.dart';
import 'package:provider/provider.dart';
class ProfileSettings extends StatefulWidget {
@ -79,7 +70,7 @@ class _ProfileSettingsState extends State<ProfileSettings> {
},
),
GridView(
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 2, crossAxisSpacing: 9, mainAxisSpacing: 9),
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 2, childAspectRatio: 105 / 105, crossAxisSpacing: 9, mainAxisSpacing: 9),
physics: const NeverScrollableScrollPhysics(),
padding: const EdgeInsets.all(24),
shrinkWrap: true,
@ -92,103 +83,17 @@ class _ProfileSettingsState extends State<ProfileSettings> {
hasShadow: true,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
spacing: 4.h,
children: [
Row(
spacing: 8.h,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Utils.buildSvgWithAssets(icon: AppAssets.wallet, width: 40.h, height: 40.h),
"Al Habib Wallet".needTranslation.toText14(weight: FontWeight.w600, maxlines: 2).expanded,
Utils.buildSvgWithAssets(icon: AppAssets.arrow_forward),
],
),
Spacer(),
Consumer<HabibWalletViewModel>(builder: (context, habibWalletVM, child) {
return Utils.getPaymentAmountWithSymbol2(habibWalletVM.habibWalletAmount, AppColors.whiteColor, 13.h, isExpanded: false)
.toShimmer2(isShow: habibWalletVM.isWalletAmountLoading, radius: 12.h, width: 80.h, height: 24.h);
}),
CustomButton(
height: 40.h,
icon: AppAssets.recharge_icon,
iconSize: 24.h,
iconColor: AppColors.infoColor,
textColor: AppColors.infoColor,
text: "Recharge",
borderWidth: 0.h,
fontWeight: FontWeight.w500,
borderColor: Colors.transparent,
backgroundColor: Color(0xff45A2F8).withValues(alpha: 0.08),
padding: EdgeInsets.all(8.h),
fontSize: 14,
onPressed: () {
Navigator.of(context).push(CustomPageRoute(page: RechargeWalletPage()));
},
),
)
],
).onPress(() {
Navigator.of(context).push(CustomPageRoute(page: HabibWalletPage()));
}),
),
)
],
),
"Quick Actions".needTranslation.toText18(weight: FontWeight.w600, textOverflow: TextOverflow.ellipsis, maxlines: 1).paddingOnly(left: 24, right: 24),
Container(
margin: EdgeInsets.only(left: 24, right: 24, top: 16, bottom: 24),
padding: EdgeInsets.only(top: 4, bottom: 4),
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24.h, hasShadow: true),
child: Column(
children: [
actionItem(AppAssets.language_change, "Language".needTranslation, () {
showCommonBottomSheetWithoutHeight(context, title: "Application Language".needTranslation, child: AppLanguageChange(), callBackFunc: () {}, isFullScreen: false);
}, trailingLabel: Utils.appState.isArabic() ? "العربية".needTranslation : "English".needTranslation),
1.divider,
actionItem(AppAssets.accessibility, "Accessibility".needTranslation, () {}),
1.divider,
actionItem(AppAssets.bell, "Notifications Settings".needTranslation, () {}),
1.divider,
actionItem(AppAssets.touch_face_id, "Touch ID / Face ID Services".needTranslation, () {}, switchValue: true),
],
),
),
"Personal Information".needTranslation.toText18(weight: FontWeight.w600, textOverflow: TextOverflow.ellipsis, maxlines: 1).paddingOnly(left: 24, right: 24),
Container(
margin: EdgeInsets.only(left: 24, right: 24, top: 16, bottom: 24),
padding: EdgeInsets.only(top: 4, bottom: 4),
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24.h, hasShadow: true),
child: Column(
children: [
actionItem(AppAssets.email_transparent, "Update Email Address".needTranslation, () {}),
1.divider,
actionItem(AppAssets.smart_phone_fill, "Phone Number".needTranslation, () {}),
1.divider,
actionItem(AppAssets.my_address, "My Addresses".needTranslation, () {}),
1.divider,
actionItem(AppAssets.emergency, "Emergency Contact".needTranslation, () {}),
],
),
),
"Help & Support".needTranslation.toText18(weight: FontWeight.w600, textOverflow: TextOverflow.ellipsis, maxlines: 1).paddingOnly(left: 24, right: 24),
Container(
margin: EdgeInsets.only(left: 24, right: 24, top: 16),
padding: EdgeInsets.only(top: 4, bottom: 4),
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24.h, hasShadow: true),
child: Column(
children: [
actionItem(AppAssets.call_fill, "Contact Us".needTranslation, () {}, trailingLabel: "9200666666"),
1.divider,
actionItem(AppAssets.permission, "Permissions".needTranslation, () {}, trailingLabel: "Location, Camera"),
1.divider,
actionItem(AppAssets.rate, "Rate Our App".needTranslation, () {}, isExternalLink: true),
1.divider,
actionItem(AppAssets.privacy_terms, "Privacy Policy".needTranslation, () {}, isExternalLink: true),
1.divider,
actionItem(AppAssets.privacy_terms, "Terms & Conditions".needTranslation, () {}, isExternalLink: true),
],
),
),
CustomButton(icon: AppAssets.minus, text: "Deactivate account".needTranslation, onPressed: () {}).paddingAll(24),
)
],
);
},
@ -196,31 +101,6 @@ class _ProfileSettingsState extends State<ProfileSettings> {
),
);
}
Widget actionItem(String icon, String label, VoidCallback onPress, {String trailingLabel = "", bool? switchValue, bool isExternalLink = false}) {
return SizedBox(
height: 56,
child: Row(
spacing: 8.h,
children: [
Utils.buildSvgWithAssets(icon: icon, iconColor: AppColors.greyTextColor),
label.toText14(weight: FontWeight.w500, textOverflow: TextOverflow.ellipsis, maxlines: 1).expanded,
if (trailingLabel.isNotEmpty) trailingLabel.toText14(color: AppColors.greyTextColor, weight: FontWeight.w500, textOverflow: TextOverflow.ellipsis, maxlines: 1),
switchValue != null
? Switch(
value: switchValue,
onChanged: (value) {},
activeColor: AppColors.successColor,
activeTrackColor: AppColors.successColor.withValues(alpha: .15),
)
: Transform.scale(
scaleX: Utils.appState.isArabic() ? -1 : 1,
child: Utils.buildSvgWithAssets(icon: isExternalLink ? AppAssets.externalLink : AppAssets.arrow_forward),
)
],
).paddingOnly(left: 16, right: 16).onPress(onPress),
);
}
}
class FamilyCardWidget extends StatelessWidget {
@ -280,8 +160,12 @@ class FamilyCardWidget extends StatelessWidget {
),
],
).paddingOnly(top: 16, right: 16, left: 16, bottom: 12).expanded,
1.divider,
CustomButton(icon: AppAssets.add_family, text: "Add a new family member".needTranslation, onPressed: () {}).paddingOnly(top: 12, right: 16, left: 16, bottom: 16),
Divider(
height: 1,
thickness: 1,
color: Color(0x30D2D2D2),
),
CustomButton(icon: AppAssets.add_family, text: "Add a new family member", onPressed: () {}).paddingOnly(top: 12, right: 16, left: 16, bottom: 16),
],
),
);

87
lib/widgets/app_language_change.dart
Unescape Escape View File

@ -1,87 +0,0 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
import 'package:hmg_patient_app_new/extensions/int_extensions.dart';
import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
import 'package:hmg_patient_app_new/theme/colors.dart';
import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
class AppLanguageChange extends StatefulWidget {
AppLanguageChange({Key? key}) : super(key: key);
@override
_AppLanguageChangeState createState() {
return _AppLanguageChangeState();
}
}
class _AppLanguageChangeState extends State<AppLanguageChange> {
String? selectedValue;
@override
void initState() {
super.initState();
}
@override
void dispose() {
super.dispose();
}
@override
Widget build(BuildContext context) {
selectedValue ??= context.locale.languageCode;
return Column(
spacing: 24.h,
children: [
Container(
padding: EdgeInsets.only(top: 4, bottom: 4),
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24.h, hasShadow: true),
child: Column(
children: [
languageItem("English".needTranslation, "en"),
1.divider,
languageItem("العربية".needTranslation, "ar"),
],
),
),
CustomButton(
text: LocaleKeys.save.tr(),
onPressed: () {
context.setLocale(selectedValue == 'en' ? Locale('en', 'US') : Locale('ar', 'SA')).then((val) {
Navigator.pop(context);
});
}),
],
);
}
Widget languageItem(String title, String _value) {
return SizedBox(
height: 72,
child: Row(
spacing: 8.h,
children: [
Radio(
value: _value,
groupValue: selectedValue,
activeColor: AppColors.errorColor,
onChanged: (value) {
setState(() {
selectedValue = _value;
});
},
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
),
title.toText16(weight: FontWeight.w500, textOverflow: TextOverflow.ellipsis, maxlines: 1).expanded,
],
).paddingOnly(left: 16, right: 16).onPress(() {
setState(() {
selectedValue = _value;
});
}),
);
}
}

5
lib/widgets/bottomsheet/generic_bottom_sheet.dart
Unescape Escape View File

@ -85,8 +85,7 @@ class _GenericBottomSheetState extends State<GenericBottomSheet> {
textDirection: Directionality.of(context),
child: Container(
padding: EdgeInsets.all(24.h),
decoration: RoundedRectangleBorder()
.toSmoothCornerDecoration(color: AppColors.bgScaffoldColor, borderRadius: 16, customBorder: BorderRadius.only(topLeft: Radius.circular(16), topRight: Radius.circular(16))),
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.bgScaffoldColor, borderRadius: 16),
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.start,
@ -152,7 +151,7 @@ class _GenericBottomSheetState extends State<GenericBottomSheet> {
prefix: widget.isForEmail ? null : widget.countryCode,
isBorderAllowed: false,
isAllowLeadingIcon: true,
fontSize: 13.h,
fontSize: 12.h,
isCountryDropDown: widget.isEnableCountryDropdown,
leadingIcon: widget.isForEmail ? AppAssets.email : AppAssets.smart_phone,
)

42
lib/widgets/buttons/custom_button.dart
Unescape Escape View File

@ -48,33 +48,35 @@ class CustomButton extends StatelessWidget {
onTap: isDisabled ? null : onPressed,
child: Container(
height: height,
padding: padding,
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: isDisabled ? Colors.transparent : backgroundColor,
borderRadius: borderRadius,
side: BorderSide(
width: borderWidth.h,
width: borderWidth,
color: isDisabled ? borderColor.withOpacity(0.5) : borderColor,
)),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
if (icon != null)
Padding(
padding: const EdgeInsets.only(right: 8.0),
child: Utils.buildSvgWithAssets(icon: icon!, iconColor: iconColor, isDisabled: isDisabled, width: iconSize, height: iconSize),
child: Padding(
padding: padding,
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
if (icon != null)
Padding(
padding: const EdgeInsets.only(right: 8.0),
child: Utils.buildSvgWithAssets(icon: icon!, iconColor: iconColor, isDisabled: isDisabled, width: iconSize, height: iconSize),
),
Text(
text,
style: context.dynamicTextStyle(
fontSize: fontSize.fSize,
color: isDisabled ? textColor.withOpacity(0.5) : textColor,
letterSpacing: -0.4,
fontWeight: fontWeight,
),
),
Text(
text,
style: context.dynamicTextStyle(
fontSize: fontSize.fSize,
color: isDisabled ? textColor.withOpacity(0.5) : textColor,
letterSpacing: -0.4,
fontWeight: fontWeight,
),
),
],
],
),
),
)

25
lib/widgets/dropdown/country_dropdown_widget.dart
Unescape Escape View File

@ -98,33 +98,30 @@ class _CustomCountryDropdownState extends State<CustomCountryDropdown> {
children: [
Text(
LocaleKeys.phoneNumber.tr(),
style: TextStyle(fontSize: 12.fSize, height: 1.2.h, fontWeight: FontWeight.w500, letterSpacing: -1),
style: TextStyle(fontSize: 12.fSize, height: 21 / 12, fontWeight: FontWeight.w500, letterSpacing: -1),
),
],
),
Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
selectedCountry!.countryCode,
style: TextStyle(fontSize: 12.fSize, fontWeight: FontWeight.w600, letterSpacing: -0.4, height: 1.5),
style: TextStyle(fontSize: 12.fSize, height: 23 / 18, fontWeight: FontWeight.w600, letterSpacing: -1),
),
SizedBox(width: 4.h),
if (widget.isEnableTextField)
SizedBox(
height: 20.h,
width: 200.h,
child: Align(
alignment: Alignment.centerLeft,
child: TextField(
height: 20,
width: 200,
// color: Colors.red,
child: TextField(
focusNode: textFocusNode,
style: TextStyle(fontSize: 12.fSize, fontWeight: FontWeight.w600, letterSpacing: -0.4, height: 1.5),
decoration: InputDecoration(hintText: "", isDense: true, border: InputBorder.none, contentPadding: EdgeInsets.zero),
style: TextStyle(fontSize: 12.fSize, height: 23 / 18, fontWeight: FontWeight.w600, letterSpacing: -1),
decoration: InputDecoration(hintText: "", isDense: false, border: InputBorder.none),
keyboardType: TextInputType.phone,
onChanged: widget.onPhoneNumberChanged,
),
),
onChanged: widget.onPhoneNumberChanged),
),
],
)
@ -137,7 +134,7 @@ class _CustomCountryDropdownState extends State<CustomCountryDropdown> {
? appState.getLanguageCode() == "ar"
? selectedCountry!.nameArabic
: selectedCountry!.displayName
: LocaleKeys.selectCountry.tr(),
: "Select Country",
style: TextStyle(fontSize: 14.fSize, height: 21 / 14, fontWeight: FontWeight.w500, letterSpacing: -0.2),
),
],

2
lib/widgets/dropdown/dropdown_widget.dart
Unescape Escape View File

@ -122,9 +122,7 @@ class DropdownWidget extends StatelessWidget {
.toList(),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12),
),
color: AppColors.scaffoldBgColor
);
if (selected != null && onChange != null) {

7
lib/widgets/input_widget.dart
Unescape Escape View File

@ -42,7 +42,6 @@ class TextInputWidget extends StatelessWidget {
final bool? isWalletAmountInput;
final Widget? suffix;
final Color? labelColor;
final Function(String)? onSubmitted;
// final List<Country> countryList;
// final Function(Country)? onCountryChange;
@ -73,8 +72,7 @@ class TextInputWidget extends StatelessWidget {
this.fontSize = 14,
this.isWalletAmountInput = false,
this.suffix,
this.labelColor,
this.onSubmitted
this.labelColor
// this.countryList = const [],
// this.onCountryChange,
});
@ -241,8 +239,7 @@ class TextInputWidget extends StatelessWidget {
onTapOutside: (event) {
FocusManager.instance.primaryFocus?.unfocus();
},
onSubmitted: onSubmitted,
style: TextStyle(fontSize: fontSize!.fSize, height: isWalletAmountInput! ? 1 / 4 : 0, fontWeight: FontWeight.w500, color: AppColors.textColor, letterSpacing: -1),
style: TextStyle(fontSize: fontSize!.fSize, height: isWalletAmountInput! ? 1 / 4 : 21 / 14, fontWeight: FontWeight.w500, color: AppColors.textColor, letterSpacing: -0.2),
decoration: InputDecoration(
isDense: true,
hintText: hintText,

60
lib/widgets/routes/custom_page_route.dart
Unescape Escape View File

@ -1,60 +0,0 @@
import 'package:flutter/material.dart';
import 'package:flutter/physics.dart';
/// Reusable spring route
class CustomPageRoute extends PageRouteBuilder {
final Widget page;
final AxisDirection direction;
CustomPageRoute({required this.page, this.direction = AxisDirection.right})
: super(
transitionDuration: const Duration(milliseconds: 1500),
reverseTransitionDuration: const Duration(milliseconds: 500),
pageBuilder: (_, __, ___) => page,
transitionsBuilder: (context, animation, secondaryAnimation, child) {
final spring = SpringDescription(mass: 1, stiffness: 100, damping: 15);
// Drive animation with spring
final curvedAnimation = animation.drive(
Tween<double>(begin: 0.0, end: 1.0).chain(CurveTween(curve: _SpringCurve(spring))),
);
// Choose offset based on direction
Offset beginOffset;
switch (direction) {
case AxisDirection.left:
beginOffset = const Offset(-1.0, 0.0);
break;
case AxisDirection.right:
beginOffset = const Offset(1.0, 0.0);
break;
case AxisDirection.up:
beginOffset = const Offset(0.0, -1.0);
break;
case AxisDirection.down:
beginOffset = const Offset(0.0, 1.0);
break;
}
final offsetAnimation = Tween<Offset>(begin: beginOffset, end: Offset.zero).animate(curvedAnimation);
return SlideTransition(
position: offsetAnimation,
child: child,
);
},
);
}
/// Custom spring curve
class _SpringCurve extends Curve {
final SpringDescription spring;
_SpringCurve(this.spring);
@override
double transform(double t) {
final sim = SpringSimulation(spring, 0, 1, 0);
return sim.x(t * 1.5); // scaled time
}
}

39
lib/widgets/routes/spring_page_route_builder.dart
Unescape Escape View File

@ -1,39 +0,0 @@
import 'package:flutter/physics.dart';
import 'package:flutter/widgets.dart';
PageRouteBuilder springPageRoute(Widget page) {
return PageRouteBuilder(
pageBuilder: (_, __, ___) => page,
transitionDuration: const Duration(milliseconds: 1500),
reverseTransitionDuration: const Duration(milliseconds: 500),
transitionsBuilder: (context, animation, secondaryAnimation, child) {
final spring = SpringDescription(mass: 1, stiffness: 100, damping: 15);
final curvedAnimation = animation.drive(
Tween<double>(begin: 0.0, end: 1.0).chain(CurveTween(curve: _SpringCurve(spring))),
);
final offsetAnimation = Tween<Offset>(
begin: const Offset(-1.0, 0.0), // slide from left
end: Offset.zero,
).animate(curvedAnimation);
return SlideTransition(
position: offsetAnimation,
child: child,
);
},
);
}
class _SpringCurve extends Curve {
final SpringDescription spring;
_SpringCurve(this.spring);
@override
double transform(double t) {
final sim = SpringSimulation(spring, 0, 1, 0);
return sim.x(t * 1.5); // scale time so it completes properly
}
}
Write Preview
Loading…
Cancel
Save