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

saved login fixes & design changes.

Browse Source
updare-to-3.32.sultan
Aamir Muhammad 3 months ago
parent 54d17d2c16
commit da32bd8df1
16 changed files with 763 additions and 488 deletions
Show Stats Download Patch File Download Diff File

7
assets/images/svg/card_user.svg
Unescape Escape View File

@ -0,0 +1,7 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.3335 9C9.30849 9 7.66686 10.6416 7.66686 12.6667C7.66686 14.6917 9.30849 16.3333 11.3335 16.3333C13.3586 16.3333 15.0002 14.6917 15.0002 12.6667C15.0002 10.6416 13.3586 9 11.3335 9ZM9.66686 12.6667C9.66686 11.7462 10.4131 11 11.3335 11C12.254 11 13.0002 11.7462 13.0002 12.6667C13.0002 13.5871 12.254 14.3333 11.3335 14.3333C10.4131 14.3333 9.66686 13.5871 9.66686 12.6667Z" fill="#2E3039"/>
<path d="M7.57253 22.424C8.17053 21.1466 9.65415 20.3583 11.3085 20.3339C12.9508 20.3097 14.4477 21.0424 15.0945 22.424C15.3287 22.9242 15.924 23.1398 16.4242 22.9057C16.9244 22.6715 17.14 22.0762 16.9059 21.576C15.8356 19.2897 13.4714 18.3018 11.279 18.3341C9.09878 18.3663 6.77427 19.412 5.76119 21.576C5.52703 22.0762 5.74269 22.6715 6.24288 22.9057C6.74307 23.1398 7.33838 22.9242 7.57253 22.424Z" fill="#2E3039"/>
<path d="M19 13.3333C19 12.781 19.4477 12.3333 20 12.3333H25.3333C25.8856 12.3333 26.3333 12.781 26.3333 13.3333C26.3333 13.8856 25.8856 14.3333 25.3333 14.3333H20C19.4477 14.3333 19 13.8856 19 13.3333Z" fill="#2E3039"/>
<path d="M20 17.6667C19.4477 17.6667 19 18.1144 19 18.6667C19 19.219 19.4477 19.6667 20 19.6667L25.3333 19.6667C25.8856 19.6667 26.3333 19.219 26.3333 18.6667C26.3333 18.1144 25.8856 17.6667 25.3333 17.6667H20Z" fill="#2E3039"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M16.0695 3H15.9304C12.8466 2.99999 10.4402 2.99998 8.56469 3.22691C6.65625 3.45784 5.14577 3.93812 3.95028 5.01407C2.73971 6.10358 2.18539 7.5033 1.92168 9.26862C1.66658 10.9763 1.6666 13.159 1.66663 15.9167V16.0833C1.6666 18.841 1.66658 21.0237 1.92168 22.7314C2.18539 24.4967 2.73971 25.8964 3.95028 26.9859C5.14577 28.0619 6.65625 28.5422 8.56469 28.7731C10.4401 29 12.8466 29 15.9304 29H16.0695C19.1533 29 21.5598 29 23.4352 28.7731C25.3437 28.5422 26.8541 28.0619 28.0496 26.9859C29.2602 25.8964 29.8145 24.4967 30.0782 22.7314C30.3333 21.0237 30.3333 18.8411 30.3333 16.0834V15.9166C30.3333 13.1589 30.3333 10.9763 30.0782 9.26862C29.8145 7.5033 29.2602 6.10358 28.0496 5.01407C26.8541 3.93812 25.3437 3.45784 23.4352 3.22691C21.5598 2.99998 19.1533 2.99999 16.0695 3ZM5.28821 6.50065C6.04534 5.81924 7.08253 5.42084 8.80494 5.21243C10.5463 5.00173 12.8318 5 16 5C19.1682 5 21.4537 5.00173 23.195 5.21243C24.9174 5.42084 25.9546 5.81924 26.7117 6.50065C27.4538 7.1685 27.8757 8.06168 28.1002 9.56412C28.3307 11.1071 28.3333 13.1403 28.3333 16C28.3333 18.8597 28.3307 20.8929 28.1002 22.4359C27.8757 23.9383 27.4538 24.8315 26.7117 25.4993C25.9546 26.1808 24.9174 26.5792 23.195 26.7876C21.4537 26.9983 19.1682 27 16 27C12.8318 27 10.5463 26.9983 8.80494 26.7876C7.08253 26.5792 6.04534 26.1808 5.28821 25.4993C4.54617 24.8315 4.12417 23.9383 3.89973 22.4359C3.66924 20.8929 3.66663 18.8597 3.66663 16C3.66663 13.1403 3.66924 11.1071 3.89973 9.56412C4.12417 8.06168 4.54617 7.1685 5.28821 6.50065Z" fill="#2E3039"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

5
assets/images/svg/fingerprint.svg
Unescape Escape View File

@ -0,0 +1,5 @@
<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M48.6667 30.6667C48.6667 21.4619 41.2047 14 32 14C22.7953 14 15.3333 21.4619 15.3333 30.6667L15.3333 56C15.3333 57.1046 16.2288 58 17.3333 58C18.4379 58 19.3333 57.1046 19.3333 56L19.3333 30.6667C19.3333 23.6711 25.0044 18 32 18C38.9956 18 44.6667 23.6711 44.6667 30.6667L44.6667 56C44.6667 57.1046 45.5621 58 46.6667 58C47.7712 58 48.6667 57.1046 48.6667 56L48.6667 30.6667Z" fill="#ED1C2B"/>
<path d="M58 32C58 17.6406 46.3594 6 32 6C17.6406 6 6 17.6406 6 32L6 34.6667C6 35.7712 6.89543 36.6667 8 36.6667C9.10457 36.6667 10 35.7712 10 34.6667V32C10 19.8497 19.8497 10 32 10C44.1503 10 54 19.8497 54 32V34.6667C54 35.7712 54.8954 36.6667 56 36.6667C57.1046 36.6667 58 35.7712 58 34.6667V32Z" fill="#ED1C2B"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M32 22C36.7865 22 40.6667 25.8802 40.6667 30.6667V34C40.6667 36.9455 38.2789 39.3333 35.3333 39.3333L28.6667 39.3333C25.7211 39.3333 23.3333 36.9455 23.3333 34V30.6667C23.3333 25.8802 27.2135 22 32 22ZM36.6667 30.6667C36.6667 28.0893 34.5773 26 32 26C29.4227 26 27.3333 28.0893 27.3333 30.6667V34C27.3333 34.7364 27.9303 35.3333 28.6667 35.3333L35.3333 35.3333C36.0697 35.3333 36.6667 34.7364 36.6667 34V30.6667Z" fill="#ED1C2B"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

6
assets/images/svg/globe_black.svg
Unescape Escape View File

@ -0,0 +1,6 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.0671 1.77998C11.9152 1.90083 12.6751 2.1674 13.2796 2.80804C13.8763 3.44047 14.1173 4.2217 14.2277 5.09204C14.3334 5.9248 14.3333 6.97683 14.3333 8.25236L14.3333 11.3955C14.3334 11.9208 14.3335 12.4163 14.2797 12.8019C14.2254 13.191 14.0757 13.8033 13.4746 14.1442C12.8492 14.499 12.2401 14.2802 11.8833 14.1016C11.5421 13.9308 11.1465 13.6511 10.7386 13.3628L10.5443 13.2255C9.82679 12.7185 9.63536 12.5963 9.43754 12.5329C9.24282 12.4704 9.02571 12.4594 8.16293 12.4594H6.77542C6.11806 12.4594 5.56598 12.4594 5.1133 12.4231C4.63965 12.3851 4.19138 12.3027 3.76325 12.0911C2.97599 11.702 2.35676 11.0385 2.00115 10.2303C1.81048 9.79691 1.73542 9.34287 1.7004 8.85277C1.66661 8.37982 1.66662 7.80062 1.66663 7.09899V7.02694C1.66662 6.32532 1.66661 5.74611 1.7004 5.27316C1.73542 4.78306 1.81048 4.32902 2.00115 3.89564C2.35676 3.08739 2.97599 2.4239 3.76325 2.03482C4.19138 1.82323 4.63965 1.74083 5.1133 1.70281C5.56599 1.66648 6.11804 1.66649 6.77543 1.66651L8.07261 1.66651C9.26768 1.66646 10.2701 1.66642 11.0671 1.77998ZM10.785 3.75998C10.1457 3.66889 9.28695 3.66651 7.99996 3.66651H6.81478C6.10774 3.66651 5.63645 3.66726 5.2733 3.6964C4.92211 3.72459 4.75704 3.77459 4.64937 3.8278C4.30024 4.00035 4.0061 4.3049 3.8318 4.70107C3.77262 4.83557 3.72276 5.03158 3.69532 5.41569C3.66722 5.80889 3.66663 6.31633 3.66663 7.06296C3.66663 7.8096 3.66722 8.31704 3.69532 8.71023C3.72276 9.09434 3.77262 9.29036 3.8318 9.42485C4.0061 9.82102 4.30024 10.1256 4.64937 10.2981C4.75704 10.3513 4.92211 10.4013 5.2733 10.4295C5.63645 10.4587 6.10774 10.4594 6.81478 10.4594L8.28338 10.4594C8.96721 10.4588 9.51834 10.4583 10.0486 10.6285C10.576 10.7978 11.0297 11.1188 11.5982 11.5212L11.8374 11.6903C12.0272 11.8244 12.1875 11.9376 12.3289 12.0339C12.3328 11.8474 12.3333 11.6179 12.3333 11.3312V8.31909C12.3333 6.96005 12.3314 6.03576 12.2436 5.34373C12.1588 4.67479 12.0092 4.37595 11.8249 4.18058C11.6483 3.99342 11.3892 3.84609 10.785 3.75998Z" fill="#2E3039"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M16.3515 3.99984C16.3515 3.44755 16.7992 2.99984 17.3515 2.99984C23.0133 2.99984 27.8274 6.61877 29.6115 11.6666C30.0145 12.8067 30.2628 14.0193 30.3318 15.2785C30.362 15.83 29.9394 16.3015 29.388 16.3317C28.8365 16.3619 28.365 15.9393 28.3348 15.3878C28.2897 14.5639 28.154 13.7647 27.9377 12.9998L22.229 12.9998C22.2915 13.7495 22.3308 14.5236 22.3453 15.3149C22.3553 15.8671 21.9159 16.3229 21.3637 16.333C20.8115 16.3431 20.3557 15.9036 20.3456 15.3514C20.3308 14.5398 20.2884 13.7532 20.2217 12.9998L17.3515 12.9998C16.7992 12.9998 16.3515 12.5521 16.3515 11.9998C16.3515 11.4476 16.7992 10.9998 17.3515 10.9998L19.9767 10.9998C19.7727 9.71558 19.4939 8.57413 19.1621 7.62867C18.8241 6.66556 18.4498 5.96036 18.0859 5.51551C17.7156 5.06287 17.4622 4.99984 17.3515 4.99984C16.7992 4.99984 16.3515 4.55212 16.3515 3.99984ZM20.393 5.42575C20.6362 5.89294 20.8546 6.4116 21.0493 6.96635C21.4532 8.11738 21.7766 9.48601 22 10.9998L27.1524 10.9998C25.7808 8.31674 23.34 6.27187 20.393 5.42575Z" fill="#2E3039"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2.66663 14.9999C3.21891 14.9999 3.66663 15.4476 3.66663 15.9999C3.66663 17.0411 3.81102 18.0471 4.08042 18.9999L9.78908 18.9999C9.74479 18.4678 9.71212 17.9237 9.69172 17.37C9.67138 16.8181 10.1023 16.3542 10.6542 16.3339C11.2061 16.3135 11.67 16.7445 11.6904 17.2964C11.7119 17.8801 11.7477 18.4489 11.7964 18.9999H14.6666C15.2189 18.9999 15.6666 19.4476 15.6666 19.9999C15.6666 20.5521 15.2189 20.9999 14.6666 20.9999H12.0414C12.2602 22.3769 12.5647 23.5884 12.9276 24.5696C13.2601 25.4687 13.6221 26.1205 13.9696 26.529C14.3211 26.9422 14.5597 26.9999 14.6666 26.9999C15.2189 26.9999 15.6666 27.4476 15.6666 27.9999C15.6666 28.5521 15.2189 28.9999 14.6666 28.9999C9.00478 28.9999 4.19076 25.3809 2.40661 20.3331C1.9271 18.9764 1.66663 17.5175 1.66663 15.9999C1.66663 15.4476 2.11434 14.9999 2.66663 14.9999ZM11.6251 26.5739C11.4154 26.171 11.2246 25.7307 11.0517 25.2634C10.6085 24.0649 10.2564 22.6142 10.0181 20.9999L4.86575 20.9999C6.23732 23.683 8.67809 25.7278 11.6251 26.5739Z" fill="#2E3039"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M23.9273 17.6665C22.7322 17.6665 21.7298 17.6664 20.9328 17.78C20.0848 17.9008 19.3248 18.1674 18.7203 18.808C18.1236 19.4405 17.8826 20.2217 17.7722 21.092C17.6666 21.9248 17.6666 22.9769 17.6666 24.2524L17.6666 27.3955C17.6665 27.9208 17.6665 28.4163 17.7202 28.8019C17.7745 29.191 17.9243 29.8033 18.5254 30.1442C19.1508 30.499 19.7598 30.2802 20.1166 30.1016C20.4578 29.9308 20.8534 29.6511 21.2614 29.3628L21.4557 29.2255C22.1731 28.7185 22.3646 28.5963 22.5624 28.5329C22.7571 28.4704 22.9742 28.4594 23.837 28.4594H25.2245C25.8819 28.4594 26.4339 28.4594 26.8866 28.4231C27.3603 28.3851 27.8086 28.3027 28.2367 28.0911C29.0239 27.702 29.6432 27.0385 29.9988 26.2303C30.1895 25.7969 30.2645 25.3429 30.2995 24.8528C30.3333 24.3798 30.3333 23.8006 30.3333 23.099V23.0269C30.3333 22.3253 30.3333 21.7461 30.2995 21.2732C30.2645 20.7831 30.1895 20.329 29.9988 19.8956C29.6432 19.0874 29.0239 18.4239 28.2367 18.0348C27.8086 17.8232 27.3603 17.7408 26.8866 17.7028C26.4339 17.6665 25.8819 17.6665 25.2245 17.6665H23.9273ZM20.175 20.1806C20.3516 19.9934 20.6107 19.8461 21.215 19.76C21.8543 19.6689 22.713 19.6665 24 19.6665H25.1852C25.8922 19.6665 26.3635 19.6673 26.7266 19.6964C27.0778 19.7246 27.2429 19.7746 27.3506 19.8278C27.6997 20.0004 27.9938 20.3049 28.1681 20.7011C28.2273 20.8356 28.2772 21.0316 28.3046 21.4157C28.3327 21.8089 28.3333 22.3163 28.3333 23.063C28.3333 23.8096 28.3327 24.317 28.3046 24.7102C28.2772 25.0943 28.2273 25.2904 28.1681 25.4249C27.9938 25.821 27.6997 26.1256 27.3506 26.2981C27.2429 26.3513 27.0778 26.4013 26.7266 26.4295C26.3635 26.4587 25.8922 26.4594 25.1852 26.4594L23.7166 26.4594C23.0327 26.4588 22.4816 26.4583 21.9513 26.6285C21.4239 26.7978 20.9702 27.1188 20.4017 27.5212L20.1625 27.6903C19.9727 27.8244 19.8124 27.9376 19.671 28.0339C19.6672 27.8474 19.6666 27.6179 19.6666 27.3312V24.3191C19.6666 22.9601 19.6685 22.0358 19.7563 21.3437C19.8412 20.6748 19.9907 20.376 20.175 20.1806Z" fill="#2E3039"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 6.1 KiB

5
assets/images/svg/sms.svg
Unescape Escape View File

@ -0,0 +1,5 @@
<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M22.6667 40.6665C21.5621 40.6665 20.6667 39.7711 20.6667 38.6665C20.6667 37.5619 21.5621 36.6665 22.6667 36.6665L41.3334 36.6665C42.4379 36.6665 43.3334 37.5619 43.3334 38.6665C43.3334 39.7711 42.4379 40.6665 41.3334 40.6665H22.6667Z" fill="#ED1C2B"/>
<path d="M22.6667 27.3332C21.5621 27.3332 20.6667 26.4377 20.6667 25.3332C20.6667 24.2286 21.5621 23.3332 22.6667 23.3332L32 23.3332C33.1046 23.3332 34 24.2286 34 25.3332C34 26.4377 33.1046 27.3332 32 27.3332L22.6667 27.3332Z" fill="#ED1C2B"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M37.921 4.86044C34.027 4.60159 29.9652 4.60212 26.0791 4.86044C13.9014 5.66993 4.23928 15.5 3.44484 27.7928C3.29622 30.0926 3.29622 32.4714 3.44484 34.7712C3.74064 39.3481 5.73732 43.4772 7.95686 46.8276C8.62174 48.1117 8.27533 50.0374 7.03178 52.3939L6.9745 52.5024C6.55667 53.2938 6.14767 54.0684 5.91173 54.7289C5.66172 55.4287 5.40332 56.5398 6.04779 57.6386C6.63994 58.6482 7.58605 59.0179 8.35077 59.1659C8.98566 59.2888 9.76417 59.3074 10.4945 59.3248L10.6165 59.3277C14.4025 59.4199 17.0703 58.3268 19.1835 56.7685C19.6029 56.4592 19.891 56.2476 20.1078 56.0986C20.4232 56.2141 20.8542 56.3911 21.4891 56.6525C22.9328 57.2472 24.5726 57.6034 26.0791 57.7035C29.9652 57.9618 34.027 57.9624 37.921 57.7035C50.0987 56.894 59.7608 47.0639 60.5552 34.7712C60.7039 32.4714 60.7039 30.0926 60.5552 27.7928C59.7608 15.5 50.0987 5.66993 37.921 4.86044ZM26.3444 8.85163C30.054 8.60505 33.9385 8.60454 37.6557 8.85163C47.7873 9.52512 55.8958 17.7176 56.5636 28.0508C56.7011 30.1787 56.7011 32.3852 56.5636 34.5132C55.8958 44.8463 47.7873 53.0388 37.6557 53.7123C33.9385 53.9594 30.054 53.9589 26.3444 53.7123C25.2353 53.6386 24.0241 53.3707 23.0124 52.954L22.9607 52.9327C22.3221 52.6696 21.7688 52.4418 21.3339 52.2889C20.9939 52.1693 20.3127 51.9306 19.6104 52.017C18.9398 52.0994 18.3881 52.4436 18.0865 52.6388C17.7393 52.8635 17.3197 53.1729 16.8566 53.5144L16.8095 53.5492C15.3707 54.6102 13.5638 55.3983 10.7138 55.3289C10.4517 55.3225 10.2251 55.317 10.0238 55.31C10.1722 55.0138 10.3514 54.674 10.5694 54.2608C11.9006 51.7382 13.2074 48.0586 11.4252 44.8318C11.3985 44.7835 11.3697 44.7362 11.3391 44.6902C9.28923 41.6121 7.67093 38.1404 7.43652 34.5132C7.29899 32.3852 7.29899 30.1787 7.43652 28.0508C8.10431 17.7176 16.2128 9.52512 26.3444 8.85163Z" fill="#ED1C2B"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

27
lib/new_ui/otp/otp_validation_bootmsheet_widget.dart
Unescape Escape View File

@ -18,7 +18,15 @@ class GenericBottomSheet extends StatefulWidget {
final bool isFromSavedLogin;
GenericBottomSheet(
{Key? key, this.countryCode = "", this.initialPhoneNumber = "", required this.buttons, this.textController, this.isForEmail = false, this.onCountryChange, this.isEnableCountryDropdown = false, this.isFromSavedLogin = false})
{Key? key,
this.countryCode = "",
this.initialPhoneNumber = "",
required this.buttons,
this.textController,
this.isForEmail = false,
this.onCountryChange,
this.isEnableCountryDropdown = false,
this.isFromSavedLogin = false})
: super(key: key);
@override
@ -26,12 +34,25 @@ class GenericBottomSheet extends StatefulWidget {
}
class _GenericBottomSheetState extends State<GenericBottomSheet> {
FocusNode node = FocusNode();
@override
void initState() {
super.initState();
if (!widget.isForEmail) {
widget.textController = TextEditingController(text: widget.initialPhoneNumber);
}
WidgetsBinding.instance.addPostFrameCallback((_) {
print("GenericBottomSheet initState called");
FocusScope.of(context).requestFocus(node);
// if (widget.textController != null) {
//
// widget.textController!.selection = TextSelection.fromPosition(
// TextPosition(offset: widget.textController!.text.length),
// );
// }
});
}
@override
@ -83,12 +104,13 @@ class _GenericBottomSheetState extends State<GenericBottomSheet> {
widget.isForEmail ? "demo@gmail.com" : "5xxxxxxxx",
widget.textController!,
padding: EdgeInsets.only(top: 8, bottom: 8, left: 8, right: 8),
keyboardType: widget.isForEmail ? TextInputType.emailAddress : TextInputType.number,
onChange: (value) {
widget.textController!.text = value!;
},
isEnable: true,
focusNode: node,
autoFocus: true,
isReadOnly: widget.isFromSavedLogin,
prefix: widget.isForEmail ? null : widget.countryCode,
hasSelection: false,
@ -96,7 +118,6 @@ class _GenericBottomSheetState extends State<GenericBottomSheet> {
isAllowLeadingIcon: true,
countryList: Country.values,
isCountryDropDown: widget.isEnableCountryDropdown,
// selectedCountry: widget,
onCountryChange: (Country country) {
widget.onCountryChange!(country);
},

5
lib/pages/AlHabibMedicalService/health_calculator/carbs/carbs.dart
Unescape Escape View File

@ -590,7 +590,8 @@ Widget newInputWidget(
String lang = 'en',
bool isCountryDropDown = false,
List<Country> countryList = const [],
// Country? selectedCountry,
FocusNode? focusNode,
bool autoFocus = false,
Function(Country)? onCountryChange,
}) {
return Builder(
@ -768,6 +769,8 @@ Widget newInputWidget(
textAlign: isRtl ? TextAlign.right : TextAlign.left,
textDirection: isRtl ? TextDirection.rtl : TextDirection.ltr,
onChanged: onChange,
focusNode: focusNode,
autofocus: autoFocus,
style: context.dynamicTextStyle(
fontSize: 14,
height: 21 / 14,

19
lib/pages/landing/landing_page.dart
Unescape Escape View File

@ -398,7 +398,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
);
} else {
GifLoaderDialogUtils.hideDialog(context);
Navigator.of(context).pushReplacement(
Navigator.of(context).push(
MaterialPageRoute(
builder: (BuildContext context) => WelcomeLogin(),
),
@ -747,13 +747,16 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
context: context,
backgroundColor: Colors.transparent,
isScrollControlled: true,
builder: (context) => Padding(
padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
child: QuickLoginBottomSheet(
isDone:isDone,
onPressed: (){
loginWithFingerPrintFace(3, 1, user, deviceToken);
},),
useSafeArea: true,
builder: (context) => SafeArea(
child: Padding(
padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
child: QuickLoginBottomSheet(
isDone:isDone,
onPressed: (){
loginWithFingerPrintFace(3, 1, user, deviceToken);
},),
),
),
);
}

36
lib/pages/login/register_new.dart
Unescape Escape View File

@ -242,11 +242,11 @@ class _RegisterNew extends State<RegisterNew> {
),
child: isTermsAccepted ? const Icon(Icons.check, size: 16, color: Colors.white) : null,
),
const SizedBox(width: 12),
SizedBox(width: 12),
Expanded(
child: Text(
TranslationBase.of(context).iAcceptTermsConditions,
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w500, color: Color(0xFF2E3039)),
style: context.dynamicTextStyle(fontSize: 14, fontWeight: FontWeight.w500, color: Color(0xFF2E3039)),
),
),
],
@ -614,7 +614,7 @@ class _RegisterNew extends State<RegisterNew> {
checkActivationCode({value, type}) async {
// Navigator.pop(context);
GifLoaderDialogUtils.showMyDialog(context);
// GifLoaderDialogUtils.showMyDialog(context);
var request = authService.getCommonRequest(
registerd_data: null,
deviceToken: DEVICE_TOKEN,
@ -679,17 +679,35 @@ class _RegisterNew extends State<RegisterNew> {
});
}
// startSMSService(type) {
// SMSOTP(
// context,
// type,
// phoneController.text,
// (value) {
// this.checkActivationCode(value: value, type: type);
// },
// () => {
// Navigator.pop(context),
// },
// ).displayDialog(context);
// }
startSMSService(type) {
SMSOTP(
late SMSOTP smsOtp; // Declare the variable first
smsOtp = SMSOTP(
context,
type,
phoneController.text,
(value) {
this.checkActivationCode(value: value, type: type);
(code) {
smsOtp.dispose(); // Now we can reference it
this.checkActivationCode(value: code, type: type);
},
() => {
Navigator.pop(context),
() {
smsOtp.dispose(); // Now we can reference it
Navigator.pop(context);
},
).displayDialog(context);
);
smsOtp.displayDialog(context);
}
}

95
lib/pages/login/saved_login.dart
Unescape Escape View File

@ -76,10 +76,11 @@ class _SavedLogin extends State<SavedLogin> {
dropDownList: [],
resizeToAvoidBottomInset: true,
showCenteredLogo: true,
showLastLoginScreenBar: true,
dropDownIndexChange: (value) {
Utils.changeAppLanguage(context: context);
},
// backgroundColor: const Color(0xFFF8F8FA),
// backgroundColor: const Color(0xFFF8F8FA),
body: SafeArea(
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 24.0),
@ -141,7 +142,7 @@ class _SavedLogin extends State<SavedLogin> {
// Last login info
Text(
TranslationBase.of(context).lastloginBy + ' ${getType(widget.savedLoginData.logInType!, context)}',
style: const TextStyle(
style: context.dynamicTextStyle(
fontSize: 16,
color: Color(0xFF8F9AA3),
fontWeight: FontWeight.w600,
@ -149,7 +150,7 @@ class _SavedLogin extends State<SavedLogin> {
),
Text(
widget.savedLoginData.createdOn != null ? DateUtil.getFormattedDate(DateUtil.convertStringToDate(widget.savedLoginData.createdOn!), "d MMMM, y 'at' HH:mm") : '--',
style: const TextStyle(
style: context.dynamicTextStyle(
fontSize: 16,
color: Color(0xFF2E3039),
fontWeight: FontWeight.w600,
@ -165,24 +166,27 @@ class _SavedLogin extends State<SavedLogin> {
),
),
// Face ID login button
CustomButton(
text: "${TranslationBase.of(context).loginBy} ${getType(widget.savedLoginData.logInType!, context)}",
onPressed: () {
if (widget.savedLoginData.logInType! == 2 || widget.savedLoginData.logInType! == 3) {
loginWithFingerPrintFace(widget.savedLoginData.logInType!, widget.savedLoginData.iMEI!);
} else {
int? val = widget.savedLoginData.logInType!;
checkUserAuthentication(val);
}
},
backgroundColor: Color(0xffFEE9EA),
borderColor: Color(0xffFEE9EA),
textColor: Color(0xffED1C2B),
fontSize: 12,
fontWeight: FontWeight.w500,
borderRadius: 12,
padding: EdgeInsets.fromLTRB(0, 10, 0, 10),
// icon: "assets/images/svg/apple-finder.svg",
Container(
height: 45,
child: CustomButton(
text: "${TranslationBase.of(context).loginBy} ${getType(widget.savedLoginData.logInType!, context)}",
onPressed: () {
if (widget.savedLoginData.logInType! == 2 || widget.savedLoginData.logInType! == 3) {
loginWithFingerPrintFace(widget.savedLoginData.logInType!, widget.savedLoginData.iMEI!);
} else {
int? val = widget.savedLoginData.logInType!;
checkUserAuthentication(val);
}
},
backgroundColor: Color(0xffFEE9EA),
borderColor: Color(0xffFEE9EA),
textColor: Color(0xffED1C2B),
fontSize: 12,
fontWeight: FontWeight.w500,
borderRadius: 12,
padding: EdgeInsets.fromLTRB(0, 10, 0, 10),
// icon: "assets/images/svg/apple-finder.svg",
),
),
],
),
@ -227,7 +231,9 @@ class _SavedLogin extends State<SavedLogin> {
text: TranslationBase.of(context).sendOTPSMS,
onPressed: () {
int? val = Utils.onOtpBtnPressed(OTPType.sms, phoneController);
if (val != null) checkUserAuthentication(val);
if (val != null) {
checkUserAuthentication(val);
}
},
backgroundColor: CustomColors.bgRedColor,
borderColor: CustomColors.bgRedBorderColor,
@ -248,7 +254,6 @@ class _SavedLogin extends State<SavedLogin> {
color: Color(0xFF2E3039),
fontWeight: FontWeight.w500,
),
),
),
],
@ -259,7 +264,10 @@ class _SavedLogin extends State<SavedLogin> {
text: TranslationBase.of(context).sendOTPWHATSAPP,
onPressed: () {
int? val = Utils.onOtpBtnPressed(OTPType.whatsapp, phoneController);
if (val != null) checkUserAuthentication(val);
if (val != null) {
GifLoaderDialogUtils.showMyDialog(context);
checkUserAuthentication(val);
}
},
backgroundColor: Colors.white,
borderColor: Color(0xFF2E3039),
@ -567,8 +575,8 @@ class _SavedLogin extends State<SavedLogin> {
});
}
checkUserAuthentication(type) {
GifLoaderDialogUtils.showMyDialog(context);
checkUserAuthentication(type) async {
await GifLoaderDialogUtils.showMyDialog(context);
var req = this.authService.getCommonRequest(
type: type,
registerd_data: null,
@ -631,7 +639,7 @@ class _SavedLogin extends State<SavedLogin> {
user: widget.savedLoginData,
);
request.sMSSignature = await SMSOTP.getSignature();
GifLoaderDialogUtils.showMyDialog(context);
// GifLoaderDialogUtils.showMyDialog(context);
request.dob = "";
request.healthId = "";
request.isHijri = 0;
@ -648,19 +656,40 @@ class _SavedLogin extends State<SavedLogin> {
var tempType;
//
// startSMSService(type, String loginToken) {
// tempType = type;
// SMSOTP(
// context,
// type,
// phoneController.text,
// (value) {
// this.checkActivationCode(value, type, loginToken);
// },
// () => {
// Navigator.pop(context),
// },
// ).displayDialog(context);
// }
startSMSService(type, String loginToken) {
tempType = type;
SMSOTP(
late SMSOTP smsOtp; // Declare the variable first
smsOtp = SMSOTP(
context,
type,
phoneController.text,
(value) {
this.checkActivationCode(value, type, loginToken);
(code) {
smsOtp.dispose(); // Now we can reference it
this.checkActivationCode(code, type, loginToken);
},
() => {
Navigator.pop(context),
() {
smsOtp.dispose(); // Now we can reference it
Navigator.pop(context);
},
).displayDialog(context);
);
smsOtp.displayDialog(context);
}
void checkIfIsInPatient() {

66
lib/pages/login/welcome.dart
Unescape Escape View File

@ -79,7 +79,6 @@ class _WelcomeLogin extends State<WelcomeLogin> {
bool onlySMSBox = false;
var userData;
int fingrePrintBefore = 0;
var dob;
@ -100,7 +99,7 @@ class _WelcomeLogin extends State<WelcomeLogin> {
appBarTitle: TranslationBase.of(context).welcome,
isShowDecPage: false,
isShowAppBar: true,
isshowBackButton: false,
isshowBackButton: true,
showNewAppBar: true,
backgroundColor: Color(0xffF8F8F8),
showNewAppBarTitle: false,
@ -173,13 +172,9 @@ class _WelcomeLogin extends State<WelcomeLogin> {
SizedBox(height: 16),
CustomButton(
text: TranslationBase.of(context).login,
// fontFamily: FontUtils.getFontFamily(context),
// padding: EdgeInsets.all(10),
// padding: ,
icon: "assets/images/svg/login1.svg",
onPressed: () {
// bool isValid = Utils.validateIqama(nationIdController.text);
if (true) {
if (nationIdController.text.isNotEmpty) {
showModalBottomSheet(
context: context,
isScrollControlled: true,
@ -250,10 +245,9 @@ class _WelcomeLogin extends State<WelcomeLogin> {
);
}),
);
} else {
Utils.showErrorToast("Please enter National id or File no", context);
}
// } else {
// Utils.showErrorToast(TranslationBase.of(context).validIQama, context);
// }
},
),
SizedBox(height: 14),
@ -261,7 +255,6 @@ class _WelcomeLogin extends State<WelcomeLogin> {
child: RichText(
textAlign: TextAlign.center,
text: TextSpan(
style: context.dynamicTextStyle(
color: Colors.black,
fontSize: 16,
@ -310,7 +303,7 @@ class _WelcomeLogin extends State<WelcomeLogin> {
authService
.checkPatientAuthentication(request)
.then((value) => {
GifLoaderDialogUtils.hideDialog(context),
// GifLoaderDialogUtils.hideDialog(context),
if (value['isSMSSent'])
{
sharedPref.setString(LOGIN_TOKEN_ID, value['LogInTokenID']),
@ -335,7 +328,7 @@ class _WelcomeLogin extends State<WelcomeLogin> {
var request = this.getCommonRequest(type: type);
request.sMSSignature = await SMSOTP.getSignature();
selectedOption = type;
GifLoaderDialogUtils.showMyDialog(context);
// GifLoaderDialogUtils.showMyDialog(context);
if (healthId != null || isDubai) {
if (!isDubai) {
request.dob = dob; //isHijri == 1 ? dob : dateFormat2.format(dateFormat.parse(dob));
@ -343,7 +336,7 @@ class _WelcomeLogin extends State<WelcomeLogin> {
request.healthId = healthId;
request.isHijri = isHijri;
await this.authService.sendActivationCodeRegister(request).then((result) {
GifLoaderDialogUtils.hideDialog(context);
// GifLoaderDialogUtils.hideDialog(context);
if (result != null && result['isSMSSent'] == true) {
this.startSMSService(type);
}
@ -483,27 +476,32 @@ class _WelcomeLogin extends State<WelcomeLogin> {
startSMSService(type) {
tempType = type;
SMSOTP(
late SMSOTP smsOtp; // Declare the variable first
smsOtp = SMSOTP(
context,
type,
phoneController.text,
(value) {
this.checkActivationCode(value: value);
(code) {
smsOtp.dispose(); // Now we can reference it
this.checkActivationCode(value: code);
},
() => {
Navigator.pop(context),
() {
smsOtp.dispose(); // Now we can reference it
Navigator.pop(context);
},
).displayDialog(context);
);
smsOtp.displayDialog(context);
}
showLoader(bool isTrue) {
setState(() {
isLoading = isTrue;
});
}
// showLoader(bool isTrue) {
// setState(() {
// isLoading = isTrue;
// });
// }
setDefault() async {
showLoader(true);
// showLoader(true);
if (await sharedPref.getObject(IMEI_USER_DATA) != null) user = SelectDeviceIMEIRES.fromJson(await sharedPref.getObject(IMEI_USER_DATA));
if (await sharedPref.getObject(REGISTER_DATA_FOR_LOGIIN) != null) {
@ -548,7 +546,11 @@ class _WelcomeLogin extends State<WelcomeLogin> {
}
getCommonRequest({type}) {
var fileNo = false;
bool fileNo = false;
if (nationIdController.text != null && nationIdController.text.isNotEmpty) {
fileNo = nationIdController.text.length < 10;
}
var request = SendActivationRequest();
request.patientMobileNumber = int.parse(phoneController.text);
request.mobileNo = '0' + phoneController.text.toString();
@ -567,14 +569,16 @@ class _WelcomeLogin extends State<WelcomeLogin> {
request.dob = this.registerd_data.dob;
request.isRegister = this.registerd_data.isRegister;
} else {
request.searchType = request.searchType != null ? request.searchType : 1;
// request.searchType = request.searchType != null ? request.searchType : 1;
if (fileNo) {
request.patientID = this.user!.patientID != null ? this.user!.patientID : 0;
request.patientID = this.user != null && this.user!.patientID != null ? this.user!.patientID : int.parse(nationIdController.text);
request.patientIdentificationID = request.nationalID = "";
request.searchType = 2;
} else {
request.patientID = 0;
request.searchType = 1;
request.patientIdentificationID = request.nationalID = nationIdController != null ? nationIdController.text : '0';
}
request.nationalID = nationIdController != null ? nationIdController.text : '0';
request.patientIdentificationID = nationIdController != null ? nationIdController.text : '0';
request.isRegister = false;
}
request.deviceTypeID = request.searchType;

389
lib/pages/rateAppointment/rate_appointment_doctor.dart
Unescape Escape View File

@ -38,212 +38,215 @@ class _RateAppointmentDoctorState extends State<RateAppointmentDoctor> {
Widget build(BuildContext context) {
projectViewModel = Provider.of(context);
return BaseView<AppointmentRateViewModel>(
builder: (_, model, w) => AppScaffold(
isShowAppBar: true,
showNewAppBar: true,
showNewAppBarTitle: true,
baseViewModel: model,
appBarTitle: TranslationBase.of(context).rateDoctor,
body: SingleChildScrollView(
child: Container(
padding: EdgeInsets.all(12),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
TranslationBase.of(context).lastVisit,
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
color: Color(0xff2B353E),
letterSpacing: -0.64,
height: 23 / 16),
),
SizedBox(
height: 25,
),
Container(
child: DoctorView(
doctor: getDoctorObject(model),
isLiveCareAppointment: false,
isShowFlag: false,
builder: (_, model, w) => SafeArea(
top: false,
child: AppScaffold(
isShowAppBar: true,
showNewAppBar: true,
showNewAppBarTitle: true,
baseViewModel: model,
appBarTitle: TranslationBase.of(context).rateDoctor,
body: SingleChildScrollView(
child: Container(
padding: EdgeInsets.all(12),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
TranslationBase.of(context).lastVisit,
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
color: Color(0xff2B353E),
letterSpacing: -0.64,
height: 23 / 16),
),
),
SizedBox(
height: 12,
),
Container(
width: double.infinity,
child: Container(
decoration: cardRadius(10),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
TranslationBase.of(context).tapTitle,
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
color: Color(0xff2B353E),
letterSpacing: -0.64,
height: 23 / 16),
),
SizedBox(
height: 12,
),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
...List.generate(
5,
(index) => AnimatedSwitcher(
duration: Duration(milliseconds: 1000),
switchInCurve: Curves.elasticOut,
switchOutCurve: Curves.elasticIn,
transitionBuilder: (Widget child,
Animation<double> animation) {
return ScaleTransition(
child: child, scale: animation);
},
child: Container(
key: ValueKey<int>(rating),
child: IconButton(
iconSize: 45.0,
onPressed: () {
setState(() {
rating = index + 1;
});
},
color: rating >= (index + 1)
? Color.fromRGBO(255, 186, 0, 1.0)
: Colors.grey[400],
icon: Icon(rating >= (index + 1)
? Icons.star
: Icons.star)),
),
),
)
],
),
],
),
SizedBox(
height: 25,
),
Container(
child: DoctorView(
doctor: getDoctorObject(model),
isLiveCareAppointment: false,
isShowFlag: false,
),
),
),
SizedBox(
height: 12,
),
Container(
decoration: cardRadius(10),
child: Padding(
padding: EdgeInsets.all(8.0),
child: TextField(
maxLines: 5,
decoration: InputDecoration.collapsed(
hintText: TranslationBase.of(context).notes,
hintStyle: TextStyle(
SizedBox(
height: 12,
),
Container(
width: double.infinity,
child: Container(
decoration: cardRadius(10),
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
TranslationBase.of(context).tapTitle,
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
color: Color(0xff2B353E),
letterSpacing: -0.64,
height: 23 / 16)),
onChanged: (value) {
setState(() {
note = value;
});
},
))),
],
height: 23 / 16),
),
SizedBox(
height: 12,
),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
...List.generate(
5,
(index) => AnimatedSwitcher(
duration: Duration(milliseconds: 1000),
switchInCurve: Curves.elasticOut,
switchOutCurve: Curves.elasticIn,
transitionBuilder: (Widget child,
Animation<double> animation) {
return ScaleTransition(
child: child, scale: animation);
},
child: Container(
key: ValueKey<int>(rating),
child: IconButton(
iconSize: 45.0,
onPressed: () {
setState(() {
rating = index + 1;
});
},
color: rating >= (index + 1)
? Color.fromRGBO(255, 186, 0, 1.0)
: Colors.grey[400],
icon: Icon(rating >= (index + 1)
? Icons.star
: Icons.star)),
),
),
)
],
),
],
),
),
),
),
SizedBox(
height: 12,
),
Container(
decoration: cardRadius(10),
child: Padding(
padding: EdgeInsets.all(8.0),
child: TextField(
maxLines: 5,
decoration: InputDecoration.collapsed(
hintText: TranslationBase.of(context).notes,
hintStyle: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
color: Color(0xff2B353E),
letterSpacing: -0.64,
height: 23 / 16)),
onChanged: (value) {
setState(() {
note = value;
});
},
))),
],
),
),
),
),
bottomSheet: Container(
color: Colors.white,
padding: EdgeInsets.only(top: 16, bottom: 16, right: 21, left: 21),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Expanded(
child: DefaultButton(
TranslationBase.of(context).later,
() {
if(widget.isFromRegistration) {
ConfirmDialog dialog = new ConfirmDialog(
context: context,
confirmMessage: TranslationBase.of(context).validInsurance,
okText: TranslationBase.of(context).yes,
cancelText: TranslationBase.of(context).no,
okFunction: () {
ConfirmDialog.closeAlertDialog(context);
Navigator.pushAndRemoveUntil(
bottomSheet: Container(
color: Colors.white,
padding: EdgeInsets.only(top: 16, bottom: 16, right: 21, left: 21),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Expanded(
child: DefaultButton(
TranslationBase.of(context).later,
() {
if(widget.isFromRegistration) {
ConfirmDialog dialog = new ConfirmDialog(
context: context,
confirmMessage: TranslationBase.of(context).validInsurance,
okText: TranslationBase.of(context).yes,
cancelText: TranslationBase.of(context).no,
okFunction: () {
ConfirmDialog.closeAlertDialog(context);
Navigator.pushAndRemoveUntil(
context,
MaterialPageRoute(builder: (context) => LandingPage()),
(Route<dynamic> route) => false,
);
Navigator.push(context, FadePage(page: InsuranceUpdate()));
},
cancelFunction: () {
Navigator.pushAndRemoveUntil(
context,
MaterialPageRoute(builder: (context) => LandingPage()),
(Route<dynamic> route) => false,
);
});
dialog.showAlertDialog(context);
} else {
Navigator.pushReplacement(
context,
FadePage(
page: LandingPage(),
),
);
// if(projectViewModel.isLoginChild) {
// Navigator.pushReplacement(
// context,
// FadePage(
// page: LandingPage(),
// ),
// );
// } else {
// Navigator.pop(
// context,
// // FadePage(
// // page: LandingPage(),
// // ),
// );
// }
}
},
color: CustomColors.accentColor,
textColor: Colors.white,
),
),
SizedBox(width: 10),
Expanded(
child: DefaultButton(
TranslationBase.of(context).next,
rating <= 0
? null
: () {
Navigator.push(
context,
MaterialPageRoute(builder: (context) => LandingPage()),
(Route<dynamic> route) => false,
FadePage(
page: RateAppointmentClinic(
appointmentDetails: model.appointmentDetails,
doctorNote: note,
doctorRate: rating,
),
),
);
Navigator.push(context, FadePage(page: InsuranceUpdate()));
},
cancelFunction: () {
Navigator.pushAndRemoveUntil(
context,
MaterialPageRoute(builder: (context) => LandingPage()),
(Route<dynamic> route) => false,
);
});
dialog.showAlertDialog(context);
} else {
Navigator.pushReplacement(
context,
FadePage(
page: LandingPage(),
),
);
// if(projectViewModel.isLoginChild) {
// Navigator.pushReplacement(
// context,
// FadePage(
// page: LandingPage(),
// ),
// );
// } else {
// Navigator.pop(
// context,
// // FadePage(
// // page: LandingPage(),
// // ),
// );
// }
}
},
color: CustomColors.accentColor,
textColor: Colors.white,
),
),
SizedBox(width: 10),
Expanded(
child: DefaultButton(
TranslationBase.of(context).next,
rating <= 0
? null
: () {
Navigator.push(
context,
FadePage(
page: RateAppointmentClinic(
appointmentDetails: model.appointmentDetails,
doctorNote: note,
doctorRate: rating,
),
),
);
},
// iconData: Icons.notifications_active,
color: Color(0xff359846),
disabledColor: Colors.grey,
// iconData: Icons.notifications_active,
color: Color(0xff359846),
disabledColor: Colors.grey,
),
),
),
],
],
),
),
),
),

6
lib/uitl/gif_loader_dialog_utils.dart
Unescape Escape View File

@ -8,8 +8,8 @@ class GifLoaderDialogUtils {
static bool get isLoading => _isLoadingVisible;
static showMyDialog(BuildContext context, {bool barrierDismissible = true}) {
// showDialog(context: context, builder: (cxt) => GifLoaderContainer());
WidgetsBinding.instance.addPostFrameCallback((_) {
// Remove the PostFrameCallback to show dialog immediately
if (!_isLoadingVisible) {
_isLoadingVisible = true;
showDialog(
barrierDismissible: barrierDismissible,
@ -22,7 +22,7 @@ class GifLoaderDialogUtils {
).then((value) {
_isLoadingVisible = false;
});
});
}
}
static hideDialog(BuildContext context) {

199
lib/widgets/drawer/app_drawer_widget.dart
Unescape Escape View File

@ -21,6 +21,8 @@ import 'package:hmg_patient_app/pages/Blood/user_agreement_page.dart';
import 'package:hmg_patient_app/pages/DrawerPages/notifications/notifications_page.dart';
import 'package:hmg_patient_app/pages/landing/landing_page.dart';
import 'package:hmg_patient_app/pages/livecare/livecare_home.dart';
import 'package:hmg_patient_app/pages/login/saved_login.dart';
import 'package:hmg_patient_app/pages/login/welcome.dart';
import 'package:hmg_patient_app/pages/rateAppointment/rate_appointment_doctor.dart';
import 'package:hmg_patient_app/routes.dart';
import 'package:hmg_patient_app/services/authentication/auth_provider.dart';
@ -108,78 +110,75 @@ class _AppDrawerState extends State<AppDrawer> {
child: ListView(
padding: EdgeInsets.zero,
children: <Widget>[
Container(
height: SizeConfig.screenHeight! * .30,
child: InkWell(
child: Padding(
padding: const EdgeInsets.all(14.0),
child: Column(
children: <Widget>[
Container(
width: double.infinity,
padding: EdgeInsets.only(top: 12),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
SvgPicture.asset(
"assets/images/new/logo.svg",
height: 60,
width: 60,
),
IconButton(
icon: Icon(Icons.clear),
onPressed: () {
Navigator.pop(context);
},
)
],
),
InkWell(
child: Padding(
padding: const EdgeInsets.all(14.0),
child: Column(
children: <Widget>[
Container(
width: double.infinity,
padding: EdgeInsets.only(top: 12),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
SvgPicture.asset(
"assets/images/new/logo.svg",
height: 60,
width: 60,
),
IconButton(
icon: Icon(Icons.clear),
onPressed: () {
Navigator.pop(context);
},
)
],
),
mHeight(12),
Container(
width: double.infinity,
margin: EdgeInsets.only(top: 12),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text(
(user != null && projectProvider!.isLogin) ? user!.firstName! + ' ' + user!.lastName! : TranslationBase.of(context).cantSeeProfile,
style: TextStyle(color: Color(0xff2E303A), fontWeight: FontWeight.bold, fontSize: 20, letterSpacing: -1.2, height: 35 / 20),
),
AutoSizeText(
(user != null && projectProvider!.isLogin)
? TranslationBase.of(context).fileNumber + ": " + user!.patientID.toString()
: TranslationBase.of(context).loginRegisterNow,
maxLines: 1,
minFontSize: 10,
style: TextStyle(
fontSize: SizeConfig.textMultiplier! * 1.6,
fontWeight: FontWeight.w600,
letterSpacing: -0.39,
height: 0.8,
),
),
// Text(
// (user != null && projectProvider!.isLogin)
// ? TranslationBase.of(context).fileNumber + ": " + user!.patientID.toString()
// : TranslationBase.of(context).loginRegisterNow,
// style: TextStyle(
// color: Color(0xff2E303A),
// fontSize: 16,
// letterSpacing: -0.96,
// height: 1,
// ),
// ),
mHeight(20.0),
),
mHeight(12),
Container(
width: double.infinity,
margin: EdgeInsets.only(top: 12),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text(
(user != null && projectProvider!.isLogin) ? user!.firstName! + ' ' + user!.lastName! : TranslationBase.of(context).cantSeeProfile,
style: TextStyle(color: Color(0xff2E303A), fontWeight: FontWeight.bold, fontSize: 20, letterSpacing: -1.2, height: 35 / 20),
),
AutoSizeText(
(user != null && projectProvider!.isLogin)
? Image.network("https://api.qrserver.com/v1/create-qr-code/?size=250x250&data=${user!.patientID.toString()}", fit: BoxFit.fill, height: 70, width: 70)
: Container(),
],
),
? TranslationBase.of(context).fileNumber + ": " + user!.patientID.toString()
: TranslationBase.of(context).loginRegisterNow,
maxLines: 1,
minFontSize: 10,
style: TextStyle(
fontSize: SizeConfig.textMultiplier! * 1.6,
fontWeight: FontWeight.w600,
letterSpacing: -0.39,
height: 0.8,
),
),
// Text(
// (user != null && projectProvider!.isLogin)
// ? TranslationBase.of(context).fileNumber + ": " + user!.patientID.toString()
// : TranslationBase.of(context).loginRegisterNow,
// style: TextStyle(
// color: Color(0xff2E303A),
// fontSize: 16,
// letterSpacing: -0.96,
// height: 1,
// ),
// ),
mHeight(20.0),
(user != null && projectProvider!.isLogin)
? Image.network("https://api.qrserver.com/v1/create-qr-code/?size=250x250&data=${user!.patientID.toString()}", fit: BoxFit.fill, height: 70, width: 70)
: Container(),
],
),
],
),
),
],
),
),
),
@ -647,25 +646,42 @@ class _AppDrawerState extends State<AppDrawer> {
login() async {
var data = await sharedPref.getObject(IMEI_USER_DATA);
sharedPref.remove(REGISTER_DATA_FOR_LOGIIN);
if (data != null) {
Navigator.of(context).pushNamed(CONFIRM_LOGIN);
SelectDeviceIMEIRES savedData = SelectDeviceIMEIRES.fromJson(data);
Navigator.of(context).pushReplacement(
MaterialPageRoute(
builder: (BuildContext context) => SavedLogin(savedData),
),
);
} else {
GifLoaderDialogUtils.showMyDialog(context);
authService.selectDeviceImei(DEVICE_TOKEN).then((SelectDeviceIMEIRES? value) {
authService.selectDeviceImei(DEVICE_TOKEN).then((value) async {
GifLoaderDialogUtils.hideDialog(context);
var data = await sharedPref.getObject(IMEI_USER_DATA);
if (value != null) {
SelectDeviceIMEIRES savedData = SelectDeviceIMEIRES.fromJson(data);
setUserValues(value);
Navigator.of(context).pushNamed(CONFIRM_LOGIN);
Navigator.of(context).pushReplacement(
MaterialPageRoute(
builder: (BuildContext context) => SavedLogin(savedData),
),
);
} else {
Navigator.of(context).pushNamed(
WELCOME_LOGIN,
GifLoaderDialogUtils.hideDialog(context);
Navigator.of(context).pushReplacement(
MaterialPageRoute(
builder: (BuildContext context) => WelcomeLogin(),
),
);
}
}).catchError((err) {
GifLoaderDialogUtils.hideDialog(context);
Navigator.of(context).pushNamed(
WELCOME_LOGIN,
Navigator.of(context).pushReplacement(
MaterialPageRoute(
builder: (BuildContext context) => WelcomeLogin(),
),
);
});
}
@ -673,6 +689,35 @@ class _AppDrawerState extends State<AppDrawer> {
locator<GAnalytics>().hamburgerMenu.logMenuItemClick('login');
}
// login() async {
// var data = await sharedPref.getObject(IMEI_USER_DATA);
// sharedPref.remove(REGISTER_DATA_FOR_LOGIIN);
//
// if (data != null) {
// Navigator.of(context).pushNamed(CONFIRM_LOGIN);
// } else {
// GifLoaderDialogUtils.showMyDialog(context);
// authService.selectDeviceImei(DEVICE_TOKEN).then((SelectDeviceIMEIRES? value) {
// GifLoaderDialogUtils.hideDialog(context);
// if (value != null) {
// setUserValues(value);
// Navigator.of(context).pushNamed(CONFIRM_LOGIN);
// } else {
// Navigator.of(context).pushNamed(
// WELCOME_LOGIN,
// );
// }
// }).catchError((err) {
// GifLoaderDialogUtils.hideDialog(context);
// Navigator.of(context).pushNamed(
// WELCOME_LOGIN,
// );
// });
// }
// locator<GAnalytics>().loginRegistration.login_register_initiate();
// locator<GAnalytics>().hamburgerMenu.logMenuItemClick('login');
// }
Future<GetAllSharedRecordsByStatusResponse?> getFamilyFiles() async {
if (user != null) {
if (await sharedPref.getObject(FAMILY_FILE) != null) {

74
lib/widgets/drawer/langauge_picker.dart
Unescape Escape View File

@ -6,12 +6,14 @@ class LanguageSelector extends StatefulWidget {
final String currentLanguage;
final ValueChanged<String> onLanguageChanged;
final List<Map<String, String>> languages;
final bool showOnlyIcon;
const LanguageSelector({
super.key,
required this.currentLanguage,
required this.onLanguageChanged,
required this.languages,
required this.showOnlyIcon,
});
@override
@ -26,44 +28,54 @@ class _LanguageSelectorState extends State<LanguageSelector> {
orElse: () => {'code': 'en', 'name': 'English'},
);
return Stack(clipBehavior: Clip.none, children: [
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12),
color: Color(0xFFFEE9EA),
),
child: InkWell(
onTap: () {
final newLanguage = widget.currentLanguage == 'ar' ? 'en' : 'ar';
print(newLanguage);
widget.onLanguageChanged(newLanguage);
},
child: Container(
padding: EdgeInsets.all(8),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
SvgPicture.asset("assets/images/svg/language.svg", width: 24),
const SizedBox(width: 6),
Text(
currentLangData['name']?.toUpperCase() ?? 'EN',
style: context.dynamicTextStyle(
if (widget.showOnlyIcon) {
return InkWell(
onTap: () {
final newLanguage = widget.currentLanguage == 'ar' ? 'en' : 'ar';
print(newLanguage);
widget.onLanguageChanged(newLanguage);
},
child: SvgPicture.asset("assets/images/svg/globe_black.svg", width: 32),
);
} else {
return Stack(clipBehavior: Clip.none, children: [
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12),
color: Color(0xFFFEE9EA),
),
child: InkWell(
onTap: () {
final newLanguage = widget.currentLanguage == 'ar' ? 'en' : 'ar';
print(newLanguage);
widget.onLanguageChanged(newLanguage);
},
child: Container(
padding: EdgeInsets.all(8),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(12),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
SvgPicture.asset("assets/images/svg/language.svg", width: 24),
const SizedBox(width: 6),
Text(
currentLangData['name']?.toUpperCase() ?? 'EN',
style: context.dynamicTextStyle(
fontWeight: FontWeight.w500,
fontSize: 14,
color: const Color(0xFFED1C2B),
letterSpacing: 0.1,
isLanguageSwitcher: true,
isLanguageSwitcher: true,
),
),
),
],
],
),
),
),
),
),
]);
]);
}
}
}

270
lib/widgets/others/app_scaffold_widget.dart
Unescape Escape View File

@ -89,6 +89,7 @@ class AppScaffold extends StatefulWidget {
final bool isShowLanguageChanger;
final bool resizeToAvoidBottomInset;
final bool showCenteredLogo;
final bool showLastLoginScreenBar;
AppScaffold setOnAppBarCartClick(VoidCallback onClick) {
_onCartClick = onClick;
@ -141,6 +142,7 @@ class AppScaffold extends StatefulWidget {
this.isShowLanguageChanger = false,
this.resizeToAvoidBottomInset = false,
this.showCenteredLogo = false,
this.showLastLoginScreenBar = false,
});
@override
@ -237,7 +239,7 @@ class _AppScaffoldState extends State<AppScaffold> {
// : widget.isShowAppBar
// ? widget.customAppBar != null
// ? widget.customAppBar
extendBodyBehindAppBar: true,
appBar: isUserNotLogin
? null
: widget.isShowPharmacyAppbar
@ -256,6 +258,7 @@ class _AppScaffoldState extends State<AppScaffold> {
appBarIcons: widget.appBarIcons,
showCenterLogo: widget.showCenteredLogo,
isShowLanguageChanger: widget.isShowLanguageChanger,
showSavedLoginBar: widget.showLastLoginScreenBar,
onTap: () {
widget.onTap;
},
@ -361,25 +364,27 @@ class NewAppBarWidget extends StatelessWidget implements PreferredSizeWidget {
final List<Widget>? appBarIcons;
final bool isShowLanguageChanger;
final bool showCenterLogo;
final bool showSavedLoginBar;
String currentLang = 'ar';
VoidCallback? onTap;
NewAppBarWidget(
{Key? key,
this.showTitle = false,
this.showDropDown = false,
this.title = "",
this.dropDownList,
this.appBarIcons,
this.dropdownIndexValue,
this.dropDownIndexChange,
this.onTap,
this.isShowBackButton = true,
this.isShowLanguageChanger = false,
this.showCenterLogo = false})
: super(key: key);
NewAppBarWidget({
Key? key,
this.showTitle = false,
this.showDropDown = false,
this.title = "",
this.dropDownList,
this.appBarIcons,
this.dropdownIndexValue,
this.dropDownIndexChange,
this.onTap,
this.isShowBackButton = true,
this.isShowLanguageChanger = false,
this.showCenterLogo = false,
this.showSavedLoginBar = false,
}) : super(key: key);
@override
Widget build(BuildContext context) {
@ -397,77 +402,178 @@ class NewAppBarWidget extends StatelessWidget implements PreferredSizeWidget {
: null,
// centerTitle: showCenterLogo,
titleSpacing: -8,
// centerTitle: false,
title: Row(
crossAxisAlignment: CrossAxisAlignment.end,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
if (showCenterLogo) SvgPicture.asset('assets/images/svg/habiblogo.svg', height: 32, width: 32).withHorizontalPadding(25),
if (showTitle)
Expanded(
child: Text(
title,
maxLines: 1,
style: TextStyle(
fontSize: 24, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
),
),
if (showDropDown! && !isShowLanguageChanger)
Container(
decoration: containerRadius(Color(0xFFF7F7F7), 30),
height: 30,
child: DropdownButtonHideUnderline(
child: ButtonTheme(
alignedDropdown: true,
child: DropdownButton<int>(
iconEnabledColor: CustomColors.grey2,
style: TextStyle(color: CustomColors.lightGreyColor, fontSize: 12),
dropdownColor: CustomColors.lightGreyColor,
value: dropdownIndexValue,
items: [
for (int i = 0; i < dropDownList!.length; i++)
DropdownMenuItem<int>(
value: i,
child: AutoSizeText(
dropDownList![i],
style: TextStyle(
fontSize: 12,
fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'),
fontWeight: FontWeight.w600,
color: Color(0xff2B2E31),
letterSpacing: -.48,
// height: 12 / 18
),
// centerTitle: showSavedLoginBar,
title: showSavedLoginBar
? Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.start,
children: [
SvgPicture.asset(
'assets/images/svg/card_user.svg',
height: 32,
width: 32,
).withHorizontalPadding(24),
if (showCenterLogo) Expanded(child: SvgPicture.asset('assets/images/svg/habiblogo.svg', height: 32, width: 32)),
if (showDropDown! && isShowLanguageChanger)
Directionality(
textDirection: TextDirection.ltr,
child: LanguageSelector(
currentLanguage: projectViewModel.isArabic ? 'ar' : 'en',
showOnlyIcon: true,
onLanguageChanged: (String value) {
dropDownIndexChange!(value == 'ar' ? 1 : 0);
},
languages: [
{'code': 'ar', 'name': '${TranslationBase.of(context).lanEnglish}'},
{'code': 'en', 'name': '${TranslationBase.of(context).lanArabic}'}
],
),
).withHorizontalPadding(24),
],
)
: Row(
crossAxisAlignment: CrossAxisAlignment.end,
mainAxisAlignment: MainAxisAlignment.end,
children: [
if (showTitle)
Expanded(
child: Text(
title,
maxLines: 1,
style: TextStyle(
fontSize: 24, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
),
),
if (showDropDown! && !isShowLanguageChanger)
Container(
decoration: containerRadius(Color(0xFFF7F7F7), 30),
height: 30,
child: DropdownButtonHideUnderline(
child: ButtonTheme(
alignedDropdown: true,
child: DropdownButton<int>(
iconEnabledColor: CustomColors.grey2,
style: TextStyle(color: CustomColors.lightGreyColor, fontSize: 12),
dropdownColor: CustomColors.lightGreyColor,
value: dropdownIndexValue,
items: [
for (int i = 0; i < dropDownList!.length; i++)
DropdownMenuItem<int>(
value: i,
child: AutoSizeText(
dropDownList![i],
style: TextStyle(
fontSize: 12,
fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'),
fontWeight: FontWeight.w600,
color: Color(0xff2B2E31),
letterSpacing: -.48,
// height: 12 / 18
),
),
)
],
onChanged: dropDownIndexChange,
underline: Container(
height: 0,
),
)
],
onChanged: dropDownIndexChange,
underline: Container(
height: 0,
),
),
),
),
),
),
),
if (showDropDown! && isShowLanguageChanger)
Padding(
padding: EdgeInsets.symmetric(horizontal: 25),
child: Directionality(
textDirection: TextDirection.ltr,
child: LanguageSelector(
currentLanguage: projectViewModel.isArabic ? 'ar' : 'en',
onLanguageChanged: (String value) {
dropDownIndexChange!(value == 'ar' ? 1 : 0);
},
languages: [
{'code': 'ar', 'name': '${TranslationBase.of(context).lanEnglish}'},
{'code': 'en', 'name': '${TranslationBase.of(context).lanArabic}'}
],
),
),
if (showDropDown! && isShowLanguageChanger)
Padding(
padding: EdgeInsets.symmetric(horizontal: 20),
child: Directionality(
textDirection: TextDirection.ltr,
child: LanguageSelector(
currentLanguage: projectViewModel.isArabic ? 'ar' : 'en',
showOnlyIcon: false,
onLanguageChanged: (String value) {
dropDownIndexChange!(value == 'ar' ? 1 : 0);
},
languages: [
{'code': 'ar', 'name': '${TranslationBase.of(context).lanEnglish}'},
{'code': 'en', 'name': '${TranslationBase.of(context).lanArabic}'}
],
),
),
),
],
),
],
),
// Row(
// crossAxisAlignment: CrossAxisAlignment.center,
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [
// if (showTitle)
// Expanded(
// child: Text(
// title,
// maxLines: 1,
// style: TextStyle(
// fontSize: 24, fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'), fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 35 / 24),
// ),
// ),
// if (showDropDown! && !isShowLanguageChanger)
// Container(
// decoration: containerRadius(Color(0xFFF7F7F7), 30),
// height: 30,
// child: DropdownButtonHideUnderline(
// child: ButtonTheme(
// alignedDropdown: true,
// child: DropdownButton<int>(
// iconEnabledColor: CustomColors.grey2,
// style: TextStyle(color: CustomColors.lightGreyColor, fontSize: 12),
// dropdownColor: CustomColors.lightGreyColor,
// value: dropdownIndexValue,
// items: [
// for (int i = 0; i < dropDownList!.length; i++)
// DropdownMenuItem<int>(
// value: i,
// child: AutoSizeText(
// dropDownList![i],
// style: TextStyle(
// fontSize: 12,
// fontFamily: (projectViewModel.isArabic ? 'Cairo' : 'Poppins'),
// fontWeight: FontWeight.w600,
// color: Color(0xff2B2E31),
// letterSpacing: -.48,
// // height: 12 / 18
// ),
// ),
// )
// ],
// onChanged: dropDownIndexChange,
// underline: Container(
// height: 0,
// ),
// ),
// ),
// ),
// ),
// if (showDropDown! && isShowLanguageChanger)
// Expanded(
// child: Padding(
// padding: EdgeInsets.symmetric(horizontal: 25),
// child: Directionality(
// textDirection: TextDirection.ltr,
// child: LanguageSelector(
// currentLanguage: projectViewModel.isArabic ? 'ar' : 'en',
// onLanguageChanged: (String value) {
// dropDownIndexChange!(value == 'ar' ? 1 : 0);
// },
// languages: [
// {'code': 'ar', 'name': '${TranslationBase.of(context).lanEnglish}'},
// {'code': 'en', 'name': '${TranslationBase.of(context).lanArabic}'}
// ],
// ),
// ),
// ),
// ),
// ],
// ),
actions: <Widget>[
if (appBarIcons != null)
...appBarIcons!

42
lib/widgets/otp/sms-popup.dart
Unescape Escape View File

@ -18,21 +18,16 @@ import '../otp_widget.dart';
class SMSOTP {
final type;
final mobileNo;
final Function onSuccess;
final Function onFailure;
final context;
int remainingTime = 120;
Future<dynamic>? timer;
Timer? _timer; // Changed from Future<dynamic>? to Timer?
bool _isDisposed = false; // Add disposal flag
static BuildContext? _context;
static bool? _loading;
SMSOTP(
@ -361,19 +356,32 @@ class SMSOTP {
}
startTimer(setState) {
// Cancel any existing timer
_timer?.cancel();
this.remainingTime--;
setState(() {
displayTime = this.getSecondsAsDigitalClock(this.remainingTime);
});
// Check if widget is still mounted before calling setState
if (!_isDisposed) {
setState(() {
displayTime = this.getSecondsAsDigitalClock(this.remainingTime);
});
_timer = Timer(Duration(seconds: 1), () {
if (!_isDisposed && this.remainingTime > 0) {
startTimer(setState);
} else if (!_isDisposed && this.remainingTime <= 0) {
Navigator.pop(context);
}
});
}
}
timer = Future.delayed(Duration(seconds: 1), () {
if (this.remainingTime > 0) {
startTimer(setState);
} else {
Navigator.pop(context);
}
});
// Add method to dispose the timer properly
void dispose() {
_isDisposed = true;
_timer?.cancel();
_timer = null;
}
static void hideSMSBox(context) {

Write Preview
Loading…
Cancel
Save