icon added & improvements

main_production_RSG
Sikander Saleem 2 months ago
parent b3f2225ae6
commit 141d8c001f

@ -0,0 +1,4 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12.0059 3.5C12.5581 3.5 13.0059 3.94772 13.0059 4.5V11L13.5884 11C13.764 10.9999 13.9797 10.9997 14.1561 11.0218L14.1595 11.0222C14.2859 11.038 14.862 11.1098 15.1363 11.6754C15.4113 12.2422 15.1093 12.7424 15.044 12.8506L15.0416 12.8546C14.9494 13.0077 14.8152 13.1785 14.7049 13.3191L14.6812 13.3493C14.3865 13.7252 14.0046 14.2094 13.6241 14.6004C13.4343 14.7955 13.217 14.9967 12.9861 15.1556C12.7809 15.2968 12.4307 15.5 12 15.5C11.5693 15.5 11.2191 15.2968 11.0139 15.1556C10.783 14.9967 10.5657 14.7955 10.3759 14.6004C9.99545 14.2094 9.61348 13.7252 9.31885 13.3493L9.29511 13.3191C9.18477 13.1785 9.05062 13.0076 8.95841 12.8546L8.95597 12.8506C8.89065 12.7424 8.58872 12.2423 8.86368 11.6754C9.13804 11.1098 9.71408 11.038 9.84053 11.0222L9.84387 11.0218C10.0203 10.9997 10.236 10.9999 10.4116 11L11.0059 11V4.5C11.0059 3.94772 11.4536 3.5 12.0059 3.5Z" fill="#212936"/>
<path d="M5 16.5002C5 15.9479 4.55228 15.5002 4 15.5002C3.44772 15.5002 3 15.9479 3 16.5002C3 17.1423 3.03219 17.7261 3.14301 18.2306C3.25632 18.7464 3.46503 19.2409 3.86214 19.6381C4.25926 20.0352 4.7538 20.2439 5.26959 20.3572C5.77406 20.468 6.35786 20.5002 7 20.5002H17C17.6421 20.5002 18.2259 20.468 18.7304 20.3572C19.2462 20.2439 19.7407 20.0352 20.1379 19.6381C20.535 19.2409 20.7437 18.7464 20.857 18.2306C20.9678 17.7261 21 17.1423 21 16.5002C21 15.9479 20.5523 15.5002 20 15.5002C19.4477 15.5002 19 15.9479 19 16.5002C19 17.0991 18.9674 17.5108 18.9036 17.8015C18.8422 18.0809 18.7663 18.1812 18.7236 18.2238C18.681 18.2665 18.5807 18.3424 18.3013 18.4038C18.0106 18.4676 17.5989 18.5002 17 18.5002H7C6.40114 18.5002 5.98944 18.4676 5.69872 18.4038C5.41933 18.3424 5.31899 18.2665 5.27636 18.2238C5.23372 18.1812 5.15781 18.0809 5.09643 17.8015C5.03256 17.5108 5 17.0991 5 16.5002Z" fill="#212936"/>
</svg>

After

Width:  |  Height:  |  Size: 1.9 KiB

@ -0,0 +1,8 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M16.75 3.47825C16.75 3.26399 16.75 3.06711 16.7387 2.90179C16.7266 2.72415 16.699 2.52881 16.6168 2.33031C16.4392 1.90151 16.0985 1.56083 15.6697 1.38321C15.4712 1.30099 15.2759 1.27338 15.0982 1.26126C14.9329 1.24998 14.7361 1.24999 14.5218 1.25H14.4782C14.264 1.24999 14.0671 1.24998 13.9018 1.26126C13.7241 1.27338 13.5288 1.30099 13.3303 1.38321C12.9015 1.56083 12.5608 1.90151 12.3832 2.33031C12.301 2.52881 12.2734 2.72415 12.2613 2.90179C12.2591 2.93341 12.2574 2.96618 12.2559 3H3C2.44771 3 2 3.44772 2 4C2 4.55229 2.44771 5 3 5H12.2559C12.2574 5.03382 12.2591 5.06659 12.2613 5.09821C12.2734 5.27585 12.301 5.4712 12.3832 5.6697C12.5608 6.0985 12.9015 6.43918 13.3303 6.61679C13.5288 6.69902 13.7241 6.72663 13.9018 6.73875C14.0671 6.75003 14.264 6.75002 14.4782 6.75H14.5218C14.736 6.75002 14.9329 6.75003 15.0982 6.73875C15.2759 6.72663 15.4712 6.69902 15.6697 6.61679C16.0985 6.43918 16.4392 6.0985 16.6168 5.6697C16.699 5.4712 16.7266 5.27586 16.7387 5.09821C16.75 4.9329 16.75 4.73607 16.75 4.52182V3.47825Z" fill="#212936"/>
<path d="M3 20H10.2559C10.2574 20.0338 10.2591 20.0666 10.2613 20.0982C10.2734 20.2759 10.301 20.4712 10.3832 20.6697C10.5608 21.0985 10.9015 21.4392 11.3303 21.6168C11.5288 21.699 11.7241 21.7266 11.9018 21.7387C12.0671 21.75 12.264 21.75 12.4782 21.75H12.5218C12.736 21.75 12.9329 21.75 13.0982 21.7387C13.2759 21.7266 13.4712 21.699 13.6697 21.6168C14.0985 21.4392 14.4392 21.0985 14.6168 20.6697C14.699 20.4712 14.7266 20.2759 14.7387 20.0982C14.75 19.9329 14.75 19.7361 14.75 19.5218V18.4782C14.75 18.264 14.75 18.0671 14.7387 17.9018C14.7266 17.7241 14.699 17.5288 14.6168 17.3303C14.4392 16.9015 14.0985 16.5608 13.6697 16.3832C13.4712 16.301 13.2759 16.2734 13.0982 16.2613C12.9329 16.25 12.736 16.25 12.5218 16.25H12.4782C12.264 16.25 12.0671 16.25 11.9018 16.2613C11.7241 16.2734 11.5288 16.301 11.3303 16.3832C10.9015 16.5608 10.5608 16.9015 10.3832 17.3303C10.301 17.5288 10.2734 17.7241 10.2613 17.9018C10.2591 17.9334 10.2574 17.9662 10.2559 18H3C2.44771 18 2 18.4477 2 19C2 19.5523 2.44771 20 3 20Z" fill="#212936"/>
<path d="M21 20C21.5523 20 22 19.5523 22 19C22 18.4477 21.5523 18 21 18H17C16.4477 18 16 18.4477 16 19C16 19.5523 16.4477 20 17 20H21Z" fill="#212936"/>
<path d="M22 11.5C22 12.0523 21.5523 12.5 21 12.5H11.7441C11.7426 12.5338 11.7409 12.5666 11.7387 12.5982C11.7266 12.7759 11.699 12.9712 11.6168 13.1697C11.4392 13.5985 11.0985 13.9392 10.6697 14.1168C10.4712 14.199 10.2759 14.2266 10.0982 14.2387C9.93288 14.25 9.73603 14.25 9.52176 14.25H9.47824C9.26396 14.25 9.06711 14.25 8.90179 14.2387C8.72415 14.2266 8.52881 14.199 8.3303 14.1168C7.9015 13.9392 7.56082 13.5985 7.38321 13.1697C7.30099 12.9712 7.27337 12.7759 7.26125 12.5982C7.24997 12.4329 7.24998 12.236 7.25 12.0218V10.9782C7.24998 10.764 7.24997 10.5671 7.26125 10.4018C7.27337 10.2242 7.30099 10.0288 7.38321 9.83031C7.56082 9.40151 7.9015 9.06083 8.3303 8.88321C8.52881 8.80099 8.72415 8.77338 8.90179 8.76126C9.06711 8.74998 9.26396 8.74999 9.47824 8.75H9.52175C9.73603 8.74999 9.93288 8.74998 10.0982 8.76126C10.2759 8.77338 10.4712 8.80099 10.6697 8.88321C11.0985 9.06083 11.4392 9.40151 11.6168 9.83031C11.699 10.0288 11.7266 10.2242 11.7387 10.4018C11.7409 10.4334 11.7426 10.4662 11.7441 10.5H21C21.5523 10.5 22 10.9477 22 11.5Z" fill="#212936"/>
<path d="M21 5C21.5523 5 22 4.55229 22 4C22 3.44772 21.5523 3 21 3L19 3C18.4477 3 18 3.44772 18 4C18 4.55229 18.4477 5 19 5H21Z" fill="#212936"/>
<path d="M6 11.5C6 12.0523 5.55228 12.5 5 12.5H3C2.44772 12.5 2 12.0523 2 11.5C2 10.9477 2.44772 10.5 3 10.5H5C5.55228 10.5 6 10.9477 6 11.5Z" fill="#212936"/>
</svg>

After

Width:  |  Height:  |  Size: 3.6 KiB

@ -0,0 +1,5 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M9.50516 3.49475C8.52011 2.5097 7.17125 2.10983 5.89339 2.29325C5.61229 2.3336 5.37808 2.52927 5.28836 2.79871C5.19865 3.06816 5.26882 3.36516 5.46963 3.56597L6.87175 4.9681V6.74996H4.8463L3.56597 5.46963C3.36516 5.26882 3.06816 5.19865 2.79871 5.28836C2.52927 5.37808 2.3336 5.61229 2.29325 5.89339C2.10983 7.17125 2.5097 8.52011 3.49475 9.50516C4.59591 10.6063 6.15002 10.976 7.55486 10.6175L13.3824 16.445C13.0239 17.8499 13.3936 19.404 14.4948 20.5052C15.4798 21.4902 16.8287 21.8901 18.1065 21.7067C18.3876 21.6663 18.6218 21.4706 18.7115 21.2012C18.8013 20.9318 18.7311 20.6347 18.5303 20.4339L17.25 19.1536V17.1282H19.0318L20.4339 18.5303C20.6347 18.7311 20.9318 18.8013 21.2012 18.7115C21.4706 18.6218 21.6663 18.3876 21.7067 18.1065C21.8901 16.8287 21.4902 15.4798 20.5052 14.4948C19.4032 13.3928 17.8476 13.0233 16.4419 13.3832L10.6167 7.55797C10.9766 6.15231 10.6071 4.59673 9.50516 3.49475Z" fill="#EAF1F4"/>
<path d="M20.0303 2.96969C19.787 2.72634 19.4092 2.67983 19.1141 2.8569L16.6141 4.3569C16.4161 4.47572 16.2838 4.67916 16.2556 4.90838C16.2274 5.1376 16.3064 5.36704 16.4697 5.53035L16.938 5.99862L13.8809 9.05572L14.9415 10.1164L17.9986 7.05928L18.4697 7.53035C18.633 7.69365 18.8624 7.77262 19.0916 7.7444C19.3209 7.71618 19.5243 7.58393 19.6431 7.38589L21.1431 4.88589C21.3202 4.59078 21.2737 4.21304 21.0303 3.96969L20.0303 2.96969Z" fill="#EAF1F4"/>
<path d="M7.7032 12.5332L3.36553 16.8709C2.54482 17.6916 2.54482 19.0222 3.36553 19.8429L4.15725 20.6346C4.97796 21.4553 6.30859 21.4553 7.1293 20.6346L11.467 16.297L7.7032 12.5332Z" fill="#EAF1F4"/>
</svg>

After

Width:  |  Height:  |  Size: 1.6 KiB

@ -0,0 +1,6 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M3.38311 3.34204H3.3418V5.91539H3.38311C5.08687 5.85028 5.08892 3.40746 3.38311 3.34204Z" fill="#EAF1F4"/>
<path d="M15.8368 3.34204C15.4707 3.34204 15.1729 3.63964 15.1729 4.00542V5.25202C15.2056 6.12986 16.4678 6.13192 16.5009 5.2514V4.00607C16.5009 3.63329 16.1992 3.34204 15.8368 3.34204Z" fill="#EAF1F4"/>
<path d="M19.2614 0H0.581329C0.26028 0 0 0.26028 0 0.581329V8.67602C0 8.99707 0.26028 9.25735 0.581329 9.25735H19.2614C19.5824 9.25735 19.8427 8.99707 19.8427 8.67602V0.581329C19.8427 0.26028 19.5824 0 19.2614 0ZM3.38333 7.07803H2.76065C2.43961 7.07803 2.17932 6.81775 2.17932 6.4967V2.76069C2.17932 2.43964 2.43961 2.17936 2.76065 2.17936H3.38333C6.64017 2.30741 6.61727 6.95971 3.38333 7.07803ZM7.9506 4.04733C8.7211 4.07593 8.72052 5.18166 7.9506 5.20999H7.70067V5.91533H8.36467C9.13516 5.94393 9.13458 7.04966 8.36467 7.07799H7.11934C6.79829 7.07799 6.53801 6.81771 6.53801 6.49666V2.76065C6.53801 2.43961 6.79829 2.17932 7.11934 2.17932H8.36467C9.13516 2.20793 9.13458 3.31365 8.36467 3.34198H7.70067V4.04733H7.9506ZM13.3047 6.4967C13.2761 7.26719 12.1704 7.26661 12.142 6.4967V5.22324L11.998 5.51135C11.791 5.93665 11.1649 5.93649 10.9581 5.51135L10.814 5.22324V6.4967C10.7854 7.26719 9.67967 7.26661 9.65134 6.4967V2.76069C9.65134 2.49107 9.83671 2.25687 10.0991 2.1949C10.3615 2.13293 10.632 2.25955 10.7526 2.50072L11.478 3.95149L12.2034 2.50072C12.324 2.25959 12.5946 2.1329 12.8569 2.1949C13.1194 2.25684 13.3047 2.49107 13.3047 2.76069V6.4967H13.3047ZM17.6634 5.25134C17.5684 7.68385 14.0947 7.65796 14.01 5.25196V4.00536C14.0948 1.59877 17.569 1.57401 17.6634 4.00598V5.25134Z" fill="#EAF1F4"/>
<path d="M18.3053 13.8349L18.7827 13.3563C19.0871 13.0616 18.959 12.5213 18.555 12.3942L13.2187 10.6153C13.0098 10.5457 12.7796 10.6 12.6238 10.7557C12.4682 10.9114 12.4138 11.1417 12.4835 11.3505L14.2624 16.6868C14.3894 17.091 14.9298 17.2188 15.2245 16.9145L15.703 16.4371L17.0714 17.8046C17.2984 18.0314 17.6662 18.0314 17.8932 17.8046L19.6728 16.0251C19.8996 15.7981 19.8996 15.4303 19.6727 15.2033L18.3053 13.8349Z" fill="#EAF1F4"/>
</svg>

After

Width:  |  Height:  |  Size: 2.1 KiB

@ -0,0 +1,8 @@
<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="M9.75 4V8C9.75 8.5442 9.37777 8.8697 9.12507 9.04531C8.87741 9.21741 8.5324 9.38909 8.16797 9.57043L6.24987 10.5257C6.08237 10.6109 5.80889 10.75 5.5 10.75C5.19111 10.75 4.91763 10.6109 4.75014 10.5257L2.83202 9.57042C2.46759 9.38908 2.12259 9.21741 1.87493 9.04531C1.62224 8.8697 1.25 8.5442 1.25 8V4C1.25 3.4558 1.62223 3.1303 1.87493 2.9547C2.12259 2.78259 2.46759 2.61092 2.83203 2.42958L4.75014 1.47434C4.91763 1.38913 5.19111 1.25 5.5 1.25C5.80889 1.25 6.08237 1.38913 6.24986 1.47434L8.16797 2.42957C8.53239 2.61091 8.87742 2.7826 9.12507 2.9547C9.37777 3.1303 9.75 3.4558 9.75 4ZM2.75 7.82625L4.75 8.84935V6.5253L2.75 5.5293V7.82625ZM8.25 5.5293L6.25 6.5253V8.84935L8.25 7.82625V5.5293Z" fill="#EAF1F4"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M22.1251 2.9547C22.3778 3.1303 22.75 3.4558 22.75 4V8C22.75 8.5442 22.3778 8.8697 22.1251 9.04531C21.8774 9.21741 21.5324 9.38909 21.168 9.57043L19.2499 10.5257C19.0824 10.6109 18.8089 10.75 18.5 10.75C18.1911 10.75 17.9176 10.6109 17.7501 10.5257L15.832 9.57042C15.4676 9.38908 15.1226 9.21741 14.8749 9.04531C14.6222 8.8697 14.25 8.5442 14.25 8V4C14.25 3.4558 14.6222 3.1303 14.8749 2.9547C15.1226 2.78259 15.4676 2.61092 15.832 2.42958L17.7501 1.47434C17.9176 1.38913 18.1911 1.25 18.5 1.25C18.8089 1.25 19.0824 1.38913 19.2499 1.47434L21.168 2.42957C21.5324 2.61091 21.8774 2.7826 22.1251 2.9547ZM15.75 7.82625L17.75 8.84935V6.5253L15.75 5.5293V7.82625ZM21.25 5.5293L19.25 6.5253V8.84935L21.25 7.82625V5.5293Z" fill="#EAF1F4"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M16.25 20V16C16.25 15.4558 15.8778 15.1303 15.6251 14.9547C15.3774 14.7826 15.0324 14.6109 14.668 14.4296L12.7499 13.4743C12.5824 13.3891 12.3089 13.25 12 13.25C11.6911 13.25 11.4176 13.3891 11.2501 13.4743L9.33203 14.4296C8.96759 14.6109 8.62259 14.7826 8.37493 14.9547C8.12223 15.1303 7.75 15.4558 7.75 16V20C7.75 20.5442 8.12224 20.8697 8.37493 21.0453C8.62258 21.2174 8.96757 21.3891 9.33198 21.5704L11.2501 22.5257C11.4176 22.6109 11.6911 22.75 12 22.75C12.3089 22.75 12.5824 22.6109 12.7499 22.5257L14.668 21.5704C15.0324 21.3891 15.3774 21.2174 15.6251 21.0453C15.8778 20.8697 16.25 20.5442 16.25 20ZM11.25 20.8494L9.25 19.8263V17.5293L11.25 18.5253V20.8494ZM12.75 18.5253L14.75 17.5293V19.8263L12.75 20.8494V18.5253Z" fill="#EAF1F4"/>
<path d="M10.75 6C10.75 5.58579 11.0858 5.25 11.5 5.25H12.5C12.9142 5.25 13.25 5.58579 13.25 6C13.25 6.41421 12.9142 6.75 12.5 6.75H11.5C11.0858 6.75 10.75 6.41421 10.75 6Z" fill="#EAF1F4"/>
<path d="M2 11.25C2.41422 11.25 2.75 11.5858 2.75 12V15.5C2.75 16.2178 2.75091 16.6998 2.78828 17.0672C2.82438 17.422 2.8882 17.586 2.96067 17.6945C3.05186 17.8309 3.16905 17.9481 3.30554 18.0393C3.41399 18.1118 3.57796 18.1756 3.93283 18.2117C4.30023 18.2491 4.78216 18.25 5.5 18.25C5.91422 18.25 6.25 18.5858 6.25 19C6.25 19.4142 5.91422 19.75 5.5 19.75H5.46166C4.79208 19.75 4.23335 19.75 3.78102 19.704C3.30755 19.6559 2.86818 19.5511 2.47218 19.2865C2.17191 19.0859 1.9141 18.8281 1.71346 18.5278C1.44886 18.1318 1.34415 17.6925 1.29599 17.219C1.24997 16.7667 1.24999 16.2079 1.25 15.5384V12C1.25 11.5858 1.58579 11.25 2 11.25Z" fill="#EAF1F4"/>
<path d="M22.75 12C22.75 11.5858 22.4142 11.25 22 11.25C21.5858 11.25 21.25 11.5858 21.25 12V15.5C21.25 16.2178 21.2491 16.6998 21.2117 17.0672C21.1756 17.422 21.1118 17.586 21.0393 17.6945C20.9481 17.8309 20.831 17.9481 20.6945 18.0393C20.586 18.1118 20.422 18.1756 20.0672 18.2117C19.6998 18.2491 19.2178 18.25 18.5 18.25C18.0858 18.25 17.75 18.5858 17.75 19C17.75 19.4142 18.0858 19.75 18.5 19.75H18.5383C19.2079 19.75 19.7666 19.75 20.219 19.704C20.6925 19.6559 21.1318 19.5511 21.5278 19.2865C21.8281 19.0859 22.0859 18.8281 22.2865 18.5278C22.5511 18.1318 22.6559 17.6925 22.704 17.219C22.75 16.7667 22.75 16.208 22.75 15.5385V12Z" fill="#EAF1F4"/>
</svg>

After

Width:  |  Height:  |  Size: 3.8 KiB

@ -0,0 +1,6 @@
<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="M12 1.25C8.824 1.25 6.25 3.824 6.25 7C6.25 9.3775 7.69241 11.4177 9.75 12.2932V13.75H14.25V12.2932C16.3076 11.4177 17.75 9.3775 17.75 7C17.75 3.824 15.176 1.25 12 1.25ZM14.03 6.02998C14.323 5.73698 14.323 5.26302 14.03 4.97002C13.737 4.67702 13.263 4.67702 12.97 4.97002L11.47 6.47002C11.177 6.76302 11.177 7.23698 11.47 7.52998C11.763 7.82298 12.237 7.82298 12.53 7.52998L14.03 6.02998Z" fill="#EAF1F4"/>
<path d="M14.045 15.25C14.4776 15.25 14.8743 15.25 15.197 15.293C15.553 15.341 15.928 15.454 16.237 15.763C16.546 16.072 16.659 16.447 16.707 16.803C16.75 17.126 16.75 17.522 16.75 17.955V20.045C16.75 20.478 16.75 20.874 16.707 21.197C16.659 21.553 16.546 21.928 16.237 22.237C15.928 22.546 15.553 22.659 15.197 22.707C14.8743 22.75 14.4786 22.75 14.0459 22.75H9.95498C9.52234 22.75 9.12575 22.75 8.80298 22.707C8.44698 22.659 8.07199 22.546 7.76299 22.237C7.45399 21.928 7.34102 21.553 7.29302 21.197C7.25002 20.874 7.25 20.478 7.25 20.045V17.955C7.25 17.522 7.25002 17.126 7.29302 16.803C7.34102 16.447 7.45399 16.072 7.76299 15.763C8.07199 15.454 8.44698 15.341 8.80298 15.293C9.12574 15.25 9.5214 15.25 9.95403 15.25H14.045Z" fill="#EAF1F4"/>
<path d="M1.25 17.5C1.25 17.086 1.586 16.75 2 16.75H5.75V21.25H2C1.586 21.25 1.25 20.914 1.25 20.5V17.5Z" fill="#EAF1F4"/>
<path d="M18.25 16.75V21.25H22C22.414 21.25 22.75 20.914 22.75 20.5V17.5C22.75 17.086 22.414 16.75 22 16.75H18.25Z" fill="#EAF1F4"/>
</svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

@ -71,13 +71,7 @@ class _ExportFormViewState<T> extends State<ExportFormView<T>> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: DefaultAppBar(
title: 'Export',
titleStyle: AppTextStyles.heading3.copyWith(
fontWeight: FontWeight.w500,
color: Theme.of(context).brightness == Brightness.dark ? AppColor.neutral30 : AppColor.neutral50,
),
),
appBar: const DefaultAppBar(title: 'Export'),
body: Column(
children: [
Expanded(

@ -69,20 +69,19 @@ class CreateRequestTypeBottomSheet extends StatelessWidget {
onTap: onTap,
child: Container(
constraints: BoxConstraints(minWidth: 111.toScreenWidth, minHeight: 111.toScreenHeight),
padding: EdgeInsets.symmetric(horizontal: 12.toScreenWidth, vertical: 12.toScreenHeight),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(12), border: Border.all(width: 1, color: AppColor.white70)),
padding: EdgeInsets.all(12.toScreenWidth),
decoration: BoxDecoration(
color: AppColor.background(context),
borderRadius: BorderRadius.circular(16),
border: Border.all(color: AppColor.borderColor(context), width: 2),
),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Icon(
Icons.add_circle,
color: AppColor.iconColor(context),
size: 32,
),
//24.height,
label.bodyText2(context).custom(color: context.isDark ? Colors.white : AppColor.black20, fontSize: context.isTablet() ? 10.toScreenWidth : null),
icon.toSvgAsset(width: 24, height: 24, color: AppColor.icon2Color(context)),
label.bodyText2(context).custom(color: AppColor.labelTextStyleColor(context), fontSize: context.isTablet() ? 10.toScreenWidth : null),
],
),
),
@ -122,7 +121,7 @@ class CreateRequestModel {
list.add(CreateRequestModel("TRAF".addTranslation, "add_icon", CreateTRAFRequestPage.id));
} else if (context.userProvider.isEngineer) {
if (Provider.of<SettingProvider>(context, listen: false).engineerCanCreateCM) {
list.add(CreateRequestModel(context.translation.correctiveMaintenance, "add_icon", CreateCMRequest.id));
list.add(CreateRequestModel(context.translation.correctiveMaintenance, "wo/cm_wo", CreateCMRequest.id));
}
//TODO uncommit this to enable task.
@ -132,9 +131,9 @@ class CreateRequestModel {
list.add(CreateRequestModel('Medical Gas'.addTranslation, "add_icon", CreateMedicalGasRequestPage.id));
}
} else {
list.add(CreateRequestModel(context.translation.correctiveMaintenance, "add_icon", CreateCMRequest.id));
list.add(CreateRequestModel(context.translation.gasRefill, "add_icon", GasRefillRequestForm.routeName));
list.add(CreateRequestModel(context.translation.transferAsset, "add_icon", CreateDeviceTransferRequest.id));
list.add(CreateRequestModel(context.translation.correctiveMaintenance, "wo/cm_wo", CreateCMRequest.id));
list.add(CreateRequestModel(context.translation.gasRefill, "wo/gas_refill_wo", GasRefillRequestForm.routeName));
list.add(CreateRequestModel(context.translation.transferAsset, "wo/device_transfer_wo", CreateDeviceTransferRequest.id));
list.add(CreateRequestModel(context.translation.task, "add_icon", CreateTaskView.id));
// context.userProvider.modulesPermissionsList.forEach((module) {
// if (module.module!.value! == 9) {
@ -153,7 +152,7 @@ class CreateRequestModel {
list.add(CreateRequestModel("TRAF".addTranslation, "add_icon", CreateTRAFRequestPage.id));
}
if (module.module!.value! == 15 && (module.canAdd ?? false)) {
list.add(CreateRequestModel('Demo Request'.addTranslation, "add_icon", CreateDemoRequestPage.id));
list.add(CreateRequestModel('Demo Request'.addTranslation, "wo/demo_wo", CreateDemoRequestPage.id));
}
});
if (!context.userProvider.isNurse && context.settingProvider.isUserFlowMedical) {

@ -2,6 +2,7 @@
import 'dart:developer';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:test_sa/controllers/providers/api/all_requests_provider.dart';
@ -143,41 +144,42 @@ class _MyRequestsPageState extends State<MyRequestsPage> {
],
),
).onPress(() async {
final result = await Navigator.push(context, MaterialPageRoute(builder: (context) => AllRequestsSearchPage(data: _search)));
final result = await Navigator.push(context, CupertinoPageRoute(builder: (context) => AllRequestsSearchPage(data: _search)));
if (result != null) {
_search = result;
setState(() {});
}
}).expanded,
16.width,
Text(
'Export',
style: AppTextStyles.bodyText2.copyWith(color: AppColor.blueStatus(context)),
).onPress(() async {
final provider = Provider.of<AllRequestsProvider>(context, listen: false);
await Navigator.push(
context,
MaterialPageRoute(
builder: (context) => ExportFormView(
searchModel: _search,
moduleType: ExportModuleType.callRequest,
pageNo: provider.pageItemNumber,
pageSize: (provider.allRequestsAndCount?.requestsDetails?.length ?? 0) ~/ (provider.pageItemNumber > 0 ? provider.pageItemNumber : 1) + 1,
IconButton(
icon: "download".toSvgAsset(height: 24, width: 24, color: AppColor.icon2Color(context)),
padding: EdgeInsets.zero,
onPressed: () async {
final provider = Provider.of<AllRequestsProvider>(context, listen: false);
await Navigator.push(
context,
CupertinoPageRoute(
builder: (context) => ExportFormView(
searchModel: _search,
moduleType: ExportModuleType.callRequest,
pageNo: provider.pageItemNumber,
pageSize: (provider.allRequestsAndCount?.requestsDetails?.length ?? 0) ~/ (provider.pageItemNumber > 0 ? provider.pageItemNumber : 1) + 1,
),
),
),
);
}),
16.width,
Text(
context.translation.filter,
style: AppTextStyles.bodyText2.copyWith(color: AppColor.blueStatus(context)),
).onPress(() async {
final result = await Navigator.push(context, MaterialPageRoute(builder: (context) => AllRequestsFilterPage(data: _search)));
if (result != null) {
_search = result;
setState(() {});
}
}),
);
},
),
IconButton(
icon: "filter".toSvgAsset(height: 24, width: 24, color: AppColor.icon2Color(context)),
padding: EdgeInsets.zero,
onPressed: () async {
final result = await Navigator.push(context, CupertinoPageRoute(builder: (context) => AllRequestsFilterPage(data: _search)));
if (result != null) {
_search = result;
setState(() {});
}
},
),
],
).paddingOnly(start: 16, end: 16),
),

@ -84,7 +84,7 @@ class RequestItemViewList extends StatelessWidget {
);
}
},
separatorBuilder: (cxt, index) => 16.height,
separatorBuilder: (cxt, index) => 12.height,
itemCount: isLoading ? 6 : list.length);
}
}

@ -118,7 +118,7 @@ class SwipeGeneralUtils {
padding: const EdgeInsets.all(12),
decoration: BoxDecoration(
color: isEnabled ? AppColor.background(context) : AppColor.tabBarBackground(context),
borderRadius: BorderRadius.circular(18),
borderRadius: BorderRadius.circular(16),
border: Border.all(color: AppColor.borderColor(context), width: 2),
),
child: Column(

@ -1,3 +1,4 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:test_sa/controllers/providers/api/devices_provider.dart';
@ -122,42 +123,38 @@ class _MyAssetsPageState extends State<MyAssetsPage> {
_searchableList.addAll(_devicesProvider.devices);
}).expanded,
16.width,
Icon(
Icons.grid_view_outlined,
color: context.isDark ? AppColor.neutral10 : AppColor.neutral20,
).onPress(() => setState(() {
Icon(Icons.grid_view_outlined, color: AppColor.icon2Color(context)).onPress(() => setState(() {
showListView = !showListView;
})),
16.width,
Text(
context.translation.filter,
style: AppTextStyles.bodyText2.copyWith(color: AppColor.blueStatus(context)),
).onPress(() async {
final result = await Navigator.push(context, MaterialPageRoute(builder: (context) => DeviceFilterScreen(data: _searchAsset)));
if (result != null) {
_searchAsset = result;
}
_searchableList.clear();
_searchableList.addAll(_devicesProvider.devices);
}),
16.width,
Text(
'Export',
style: AppTextStyles.bodyText2.copyWith(color: AppColor.blueStatus(context)),
).onPress(() async {
await Navigator.push(
context,
MaterialPageRoute(
builder: (context) => ExportFormView(
searchModel: _searchAsset,
moduleType: ExportModuleType.asset,
pageNo: _devicesProvider.pageItemNumber,
pageSize:_devicesProvider.devices.length ~/ _devicesProvider.pageItemNumber + 1 ,
IconButton(
icon: "download".toSvgAsset(height: 24, width: 24, color: AppColor.icon2Color(context)),
padding: EdgeInsets.zero,
onPressed: () async {
await Navigator.push(
context,
CupertinoPageRoute(
builder: (context) => ExportFormView(
searchModel: _searchAsset,
moduleType: ExportModuleType.asset,
pageNo: _devicesProvider.pageItemNumber,
pageSize: _devicesProvider.devices.length ~/ _devicesProvider.pageItemNumber + 1,
),
),
),
);
}),
16.width,
);
},
),
IconButton(
icon: "filter".toSvgAsset(height: 24, width: 24, color: AppColor.icon2Color(context)),
padding: EdgeInsets.zero,
onPressed: () async {
final result = await Navigator.push(context, CupertinoPageRoute(builder: (context) => DeviceFilterScreen(data: _searchAsset)));
if (result != null) {
_searchAsset = result;
}
_searchableList.clear();
_searchableList.addAll(_devicesProvider.devices);
},
),
],
).paddingOnly(start: 16, end: 16),
),

@ -138,6 +138,7 @@ flutter:
- assets/audio/
- assets/images/
- assets/images/dashboard/
- assets/images/wo/
- assets/lottie/
- assets/subtitles/
- assets/rives/

Loading…
Cancel
Save