Haroon6138
/
diplomatic-quarter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Home page icons and drawer

Browse Source
merge-requests/390/head
Mirza.Shafique 3 years ago
parent 1bea9d39b5
commit 38465eaafb
19 changed files with 425 additions and 307 deletions
Show Stats Download Patch File Download Diff File

9
assets/images/new/E_Referral.svg
Unescape Escape View File

@ -0,0 +1,9 @@
<svg xmlns="http://www.w3.org/2000/svg" width="32.381" height="37.391" viewBox="0 0 32.381 37.391">
<g id="affiliate-marketing_1_" data-name="affiliate-marketing (1)" transform="translate(-34.298 0)">
<path id="Path_4982" data-name="Path 4982" d="M63.419,23.145l.415,1.991-2.684-1.55a11.718,11.718,0,0,0,0-9.782l2.684-1.55-.415,1.991,2.145.447,1.115-5.345L61.492,7.641l-.685,2.081,1.932.636-2.687,1.551a11.736,11.736,0,0,0-8.469-4.893v-3.1L53.1,5.272l1.46-1.634L50.489,0,46.417,3.639l1.46,1.634,1.517-1.355v3.1a11.736,11.736,0,0,0-8.469,4.893l-2.687-1.551,1.932-.636-.685-2.081L34.3,9.348l1.115,5.346,2.145-.447-.415-1.991,2.684,1.55a11.718,11.718,0,0,0,0,9.782l-2.684,1.55.415-1.991L35.413,22.7,34.3,28.043l5.187,1.707.685-2.081-1.932-.636,2.687-1.551a11.736,11.736,0,0,0,8.469,4.893v3.1l-1.517-1.355-1.46,1.634,4.072,3.639,4.072-3.639L53.1,32.118l-1.517,1.355v-3.1a11.736,11.736,0,0,0,8.469-4.893l2.687,1.551-1.932.636.685,2.081,5.187-1.707L65.564,22.7Z" fill="#2e303a"/>
<g id="user_24_" data-name="user (24)" transform="translate(42.096 9.104)">
<path id="Path_4983" data-name="Path 4983" d="M10.267,8.536a3.028,3.028,0,0,0,1.792.581,3.125,3.125,0,0,0,3.059-3.059,3.059,3.059,0,1,0-4.85,2.478Z" transform="translate(-3.378 0)" fill="#fff"/>
<path id="Path_4984" data-name="Path 4984" d="M11.372,16.55a3.919,3.919,0,0,1-5.384,0,5.689,5.689,0,0,0-2.989,5,.438.438,0,0,0,.437.437H13.924a.438.438,0,0,0,.437-.437A5.689,5.689,0,0,0,11.372,16.55Z" transform="translate(0 -7.629)" fill="#fff"/>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

11
assets/images/new/HHC.svg
Unescape Escape View File

@ -1,8 +1,9 @@
<svg xmlns="http://www.w3.org/2000/svg" width="30.002" height="30.002" viewBox="0 0 30.002 30.002">
<g id="home_7_" data-name="home (7)" transform="translate(0.001 -0.001)">
<path id="Path_4358" data-name="Path 4358" d="M42.427,95.366a.879.879,0,0,1-.879-.879V92a2.637,2.637,0,1,0,3.365,3.365Zm0,0a.879.879,0,0,1-.879-.879V92a2.637,2.637,0,1,0,3.365,3.365Zm14.012-4.292-12.254-12.3-12.254,12.3a2.619,2.619,0,0,1-.931.605v11.6a.879.879,0,0,0,.879.879H56.49a.879.879,0,0,0,.879-.879v-11.6A2.629,2.629,0,0,1,56.438,91.074Zm-6.98,7.808H47.7A.879.879,0,0,1,46.822,98V95.366h-.088a4.4,4.4,0,1,1-5.185-5.185V88.334H39.79a.879.879,0,1,1,0-1.758h2.637a.879.879,0,0,1,.879.879v6.153H47.7a.879.879,0,0,1,.879.879v2.637h.879a.879.879,0,1,1,0,1.758Zm-7.911-4.395V92a2.637,2.637,0,1,0,3.365,3.365H42.427a.879.879,0,0,1-.879-.879Z" transform="translate(-29.184 -74.152)" fill="#2e303a"/>
<g id="Group_7059" data-name="Group 7059" transform="translate(-0.001 0.001)">
<path id="Path_4359" data-name="Path 4359" d="M28.5,15.681,15,2.126,1.5,15.681a.879.879,0,1,1-1.246-1.24L14.378.26a.879.879,0,0,1,1.246,0L29.746,14.441a.879.879,0,0,1-1.246,1.24Z" transform="translate(0.001 -0.001)" fill="#2e303a"/>
<svg xmlns="http://www.w3.org/2000/svg" width="33.14" height="32.422" viewBox="0 0 33.14 32.422">
<g id="green-house" transform="translate(1.359 1)">
<path id="Path_4947" data-name="Path 4947" d="M28.045,28.639V11.21l1.428.877.933-1.519L15.211,1.24,9.78,4.574V1.783h1.159V0H3.214V1.783H4.373V7.894L.016,10.568l.933,1.519,1.428-.876V28.639H0v1.783H30.422V28.639Z" fill="#dedede" stroke="#2e303a" stroke-width="2"/>
<g id="Group_8187" data-name="Group 8187" transform="translate(-1.173 -1.044)">
<path id="Path_4948" data-name="Path 4948" d="M10.076,14.17h12.7V26.358h-12.7Z" transform="translate(0.007 0.008)" fill="#fff" stroke="#707070" stroke-width="1"/>
<path id="Path_4645" data-name="Path 4645" d="M233.745,12.4s.519,0,.884,0l2.768.013c.33,0,.606-.351.621-.859l0-2.313c0-.493.22-.879.562-.9l.849-.007c.342.021.577.411.577.9l0,2.326c.015.507.246.838.578.838l3.726.01.007-2.859c0-.492-.236-.874-.58-.9l-1.5-.008c-.331,0-.592-.35-.606-.857l-.006-.773c.016-.507.278-.856.61-.856l1.505,0c.342-.022.565-.426.565-.917l0-3.568a1.52,1.52,0,0,1-1.153.721l-2.531,0c-.33,0-.606.359-.621.867V5.549c-.016.506-.275.865-.606.865l-.766-.006c-.332,0-.6-.347-.613-.851l0-2.316c-.015-.507-.278-.849-.609-.849l-3.673,0v2.85c0,.492.23.886.573.909l1.505-.006c.34.022.582.428.582.918l0,.66c0,.492-.233.886-.575.908l-1.508,0c-.343.023-.573.413-.573.9ZM246.4,1.471V13.39a1.515,1.515,0,0,1-1.532,1.441H233.1a1.509,1.509,0,0,1-1.525-1.443V1.447A1.515,1.515,0,0,1,233.106,0l11.753.005A1.543,1.543,0,0,1,246.4,1.471" transform="translate(-222.605 12.889)" fill="#da4a54"/>
</g>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

15
assets/images/new/Live_Care.svg
Unescape Escape View File

@ -1,8 +1,11 @@
<svg id="Group_767" data-name="Group 767" xmlns="http://www.w3.org/2000/svg" width="38.696" height="21.244" viewBox="0 0 38.696 21.244">
<path id="Subtraction_64" data-name="Subtraction 64" d="M808.025,958.742h-3.364A4.213,4.213,0,0,1,803,958.4a4.318,4.318,0,0,1-2.278-2.275,4.189,4.189,0,0,1-.337-1.653V941.763a4.206,4.206,0,0,1,.337-1.657A4.312,4.312,0,0,1,803,937.834a4.209,4.209,0,0,1,1.654-.336h15.766a4.2,4.2,0,0,1,1.657.337,4.31,4.31,0,0,1,2.272,2.275,4.207,4.207,0,0,1,.336,1.653V944.9a3.516,3.516,0,0,0,0,6.58v2.99a4.212,4.212,0,0,1-.331,1.659,4.3,4.3,0,0,1-2.269,2.277,4.2,4.2,0,0,1-1.656.337h-3.686a11.117,11.117,0,0,0,1.2-1.192,1.109,1.109,0,0,0,.245-.877,16.2,16.2,0,0,0,2.287-4.3,15.64,15.64,0,0,0,.622-2.267,11.347,11.347,0,0,0,.217-2.127,7.514,7.514,0,0,0-.336-2.461,3.216,3.216,0,0,0-.969-1.448,4.611,4.611,0,0,0-1.542-.806c-.607-.2-1.309-.365-2.051-.535h0l0-.008a1.147,1.147,0,0,0-1.026-.651,1.165,1.165,0,1,0,0,2.329,1.119,1.119,0,0,0,.686-.257l.027.01h.008l.018,0c.742.171,1.327.305,1.814.463a3.171,3.171,0,0,1,1.155.589,1.976,1.976,0,0,1,.6,1.018,6.8,6.8,0,0,1,.172,1.752,9.8,9.8,0,0,1-.2,1.885,14.159,14.159,0,0,1-.568,2.027,15.8,15.8,0,0,1-.886,2.012,13.922,13.922,0,0,1-1.156,1.841,1.114,1.114,0,0,0-.767.372,7.883,7.883,0,0,1-1.658,1.48,3.814,3.814,0,0,1-4.47.006,7.819,7.819,0,0,1-1.657-1.473,1.112,1.112,0,0,0-.766-.371,13.994,13.994,0,0,1-1.158-1.846,15.865,15.865,0,0,1-.888-2.017,14.106,14.106,0,0,1-.57-2.03,9.84,9.84,0,0,1-.2-1.887,6.88,6.88,0,0,1,.17-1.753,1.97,1.97,0,0,1,.6-1.018,3.161,3.161,0,0,1,1.157-.589c.492-.159,1.11-.3,1.827-.464l.016,0h0l.011-.01a1.149,1.149,0,0,0,.7.258,1.164,1.164,0,1,0,0-2.328,1.129,1.129,0,0,0-.618.184,1.264,1.264,0,0,0-.423.466h0l-.015,0c-3.052.7-4.894,1.129-4.894,5.255a11.351,11.351,0,0,0,.218,2.13,15.664,15.664,0,0,0,.626,2.271,16.09,16.09,0,0,0,2.3,4.31,1.1,1.1,0,0,0,.246.876,11.265,11.265,0,0,0,1.187,1.178h0Zm30.344-2.221h-1.726a1.486,1.486,0,0,1-.771-.224l-7.178-4.531a.71.71,0,0,1-.332-.6v-.45a3.511,3.511,0,0,0,0-5.06v-.8a.71.71,0,0,1,.332-.6l7.178-4.531a1.421,1.421,0,0,1,.771-.224h1.726a.71.71,0,0,1,.714.705v15.6a.7.7,0,0,1-.208.5.713.713,0,0,1-.506.205Z" transform="translate(-800.388 -937.498)" fill="#2e303a"/>
<g id="Group_766" data-name="Group 766" transform="translate(9.038 9.147)">
<path id="Path_673" data-name="Path 673" d="M495.692,5.173h.368l1.153.005c.138,0,.252-.146.259-.358V3.856c0-.205.092-.366.234-.375l.354,0c.142.009.24.171.24.375v.969c.006.211.1.349.241.349l1.552,0,0-1.191c0-.2-.1-.364-.241-.373l-.624,0c-.138,0-.246-.146-.253-.357l0-.322c.007-.211.116-.357.254-.357l.627,0c.142-.009.235-.178.235-.382l0-1.486a.633.633,0,0,1-.48.3H498.56c-.138,0-.252.15-.259.361v.955c-.006.211-.114.36-.252.36l-.319,0c-.138,0-.249-.144-.255-.355V1.359c-.006-.211-.116-.354-.254-.354h-1.531V2.193c0,.205.1.369.239.379l.627,0c.142.009.242.179.242.382l0,.275c0,.2-.1.369-.239.378h-.628c-.143.01-.239.172-.239.376ZM500.964.622V5.588a.631.631,0,0,1-.638.6h-4.9a.629.629,0,0,1-.635-.6V.613a.632.632,0,0,1,.636-.6l4.9,0A.642.642,0,0,1,500.964.622Z" transform="translate(-494.79 -0.01)" fill="#ee6161"/>
<path id="Path_929" data-name="Path 929" d="M502.5,10.434h.368l1.153.005c.138,0,.252-.146.259-.358V9.117c0-.205.092-.366.235-.375l.354,0c.142.009.24.171.24.375v.969c.006.211.1.349.241.349l1.552,0,0-1.191c0-.2-.1-.364-.241-.373l-.624,0c-.138,0-.246-.146-.253-.357l0-.322c.007-.211.116-.357.254-.357l.627,0c.143-.009.235-.178.235-.382V5.967a.632.632,0,0,1-.48.3h-1.054c-.138,0-.252.15-.259.361v.955c-.006.211-.114.36-.252.36l-.319,0c-.139,0-.249-.144-.255-.355V6.62c-.006-.211-.116-.354-.254-.354H502.5V7.454c0,.205.1.369.239.379l.627,0c.142.009.242.179.242.382l0,.275c0,.2-.1.369-.239.378h-.628c-.143.01-.239.172-.239.376Z" transform="translate(-501.595 -5.271)" fill="#fff"/>
<svg xmlns="http://www.w3.org/2000/svg" width="36.033" height="32.32" viewBox="0 0 36.033 32.32">
<g id="Group_6982" data-name="Group 6982" transform="translate(0 0)">
<g id="Group_6964" data-name="Group 6964">
<path id="Subtraction_64" data-name="Subtraction 64" d="M807.5,957.28h-3.132a3.925,3.925,0,0,1-1.545-.314,4.019,4.019,0,0,1-2.121-2.119,3.9,3.9,0,0,1-.314-1.54V941.469a3.908,3.908,0,0,1,.314-1.543,4.014,4.014,0,0,1,2.118-2.116,3.916,3.916,0,0,1,1.54-.312h14.682a3.915,3.915,0,0,1,1.543.314,4.01,4.01,0,0,1,2.116,2.118,3.92,3.92,0,0,1,.313,1.54v2.919a3.274,3.274,0,0,0,0,6.127V953.3a3.93,3.93,0,0,1-.309,1.545,4,4,0,0,1-2.113,2.12,3.91,3.91,0,0,1-1.542.314h-3.432a10.325,10.325,0,0,0,1.118-1.11,1.034,1.034,0,0,0,.228-.817,15.093,15.093,0,0,0,2.129-4.006,14.583,14.583,0,0,0,.579-2.111,10.557,10.557,0,0,0,.2-1.981,7,7,0,0,0-.313-2.292,2.991,2.991,0,0,0-.9-1.348,4.283,4.283,0,0,0-1.436-.751c-.565-.19-1.219-.34-1.91-.5h0l0-.007a1.068,1.068,0,0,0-.956-.607,1.084,1.084,0,1,0,0,2.169,1.043,1.043,0,0,0,.638-.239l.025.009h.007l.017,0c.691.159,1.236.284,1.689.431a2.958,2.958,0,0,1,1.076.549,1.844,1.844,0,0,1,.558.947,6.338,6.338,0,0,1,.16,1.631,9.146,9.146,0,0,1-.186,1.755,13.223,13.223,0,0,1-.529,1.887,14.692,14.692,0,0,1-.825,1.874,12.98,12.98,0,0,1-1.077,1.715,1.035,1.035,0,0,0-.714.346,7.34,7.34,0,0,1-1.544,1.378,3.552,3.552,0,0,1-4.162.006,7.291,7.291,0,0,1-1.543-1.371,1.035,1.035,0,0,0-.713-.346,13.038,13.038,0,0,1-1.079-1.719,14.8,14.8,0,0,1-.827-1.878,13.155,13.155,0,0,1-.53-1.89,9.167,9.167,0,0,1-.187-1.758,6.412,6.412,0,0,1,.158-1.632,1.835,1.835,0,0,1,.556-.947,2.928,2.928,0,0,1,1.077-.549c.458-.148,1.034-.28,1.7-.432l.015,0h0l.01-.009a1.072,1.072,0,0,0,.652.24,1.084,1.084,0,1,0,0-2.168,1.052,1.052,0,0,0-.575.171,1.176,1.176,0,0,0-.393.434h0l-.014,0c-2.842.656-4.557,1.051-4.557,4.893a10.584,10.584,0,0,0,.2,1.983,14.543,14.543,0,0,0,.583,2.115,14.983,14.983,0,0,0,2.146,4.013,1.028,1.028,0,0,0,.229.816,10.456,10.456,0,0,0,1.105,1.1h0Zm1.9-11.264a.588.588,0,0,0-.592.561v4.632a.585.585,0,0,0,.591.559h4.563a.588.588,0,0,0,.594-.559v-4.623a.565.565,0,0,0-.18-.4.621.621,0,0,0-.417-.169Zm26.359,9.2h-1.607a1.387,1.387,0,0,1-.718-.208l-6.684-4.219a.66.66,0,0,1-.309-.556v-.419a3.27,3.27,0,0,0,0-4.712v-.742a.661.661,0,0,1,.309-.557l6.684-4.219a1.322,1.322,0,0,1,.718-.209h1.607a.661.661,0,0,1,.665.657v14.528a.65.65,0,0,1-.193.464.665.665,0,0,1-.471.191Z" transform="translate(-800.388 -937.498)" fill="#2e303a"/>
<path id="Path_656" data-name="Path 656" d="M894.195,1023.524l-.051,13.538c0,3.014-2.447,6.151-5.461,6.151a5.464,5.464,0,0,1-5.461-5.461l-.091-4.43c1.43-.191-2.655-.191-1.227,0l.079,4.43a6.707,6.707,0,0,0,6.7,6.693c3.69,0,6.687-3.692,6.687-7.383l.051-13.538C897.162,1023.233,892.453,1023.234,894.195,1023.524Z" transform="translate(-871.015 -1012.125)" fill="#de5c5d"/>
<path id="Path_663" data-name="Path 663" d="M970.188,998.3a1.9,1.9,0,1,1-1.9,1.9h0A1.9,1.9,0,0,1,970.188,998.3Z" transform="translate(-946.411 -990.378)" fill="#de5c5d"/>
<path id="Subtraction_64-2" data-name="Subtraction 64" d="M807.5,957.28h-3.132a3.925,3.925,0,0,1-1.545-.314,4.019,4.019,0,0,1-2.121-2.119,3.9,3.9,0,0,1-.314-1.54V941.469a3.908,3.908,0,0,1,.314-1.543,4.014,4.014,0,0,1,2.118-2.116,3.916,3.916,0,0,1,1.54-.312h14.682a3.915,3.915,0,0,1,1.543.314,4.01,4.01,0,0,1,2.116,2.118,3.92,3.92,0,0,1,.313,1.54v2.919a3.274,3.274,0,0,0,0,6.127V953.3a3.93,3.93,0,0,1-.309,1.545,4,4,0,0,1-2.113,2.12,3.91,3.91,0,0,1-1.542.314h-3.432a10.325,10.325,0,0,0,1.118-1.11,1.034,1.034,0,0,0,.228-.817,15.093,15.093,0,0,0,2.129-4.006,14.583,14.583,0,0,0,.579-2.111,10.557,10.557,0,0,0,.2-1.981,7,7,0,0,0-.313-2.292,2.991,2.991,0,0,0-.9-1.348,4.283,4.283,0,0,0-1.436-.751c-.565-.19-1.219-.34-1.91-.5h0l0-.007a1.068,1.068,0,0,0-.956-.607,1.084,1.084,0,1,0,0,2.169,1.043,1.043,0,0,0,.638-.239l.025.009h.007l.017,0c.691.159,1.236.284,1.689.431a2.958,2.958,0,0,1,1.076.549,1.844,1.844,0,0,1,.558.947,6.338,6.338,0,0,1,.16,1.631,9.146,9.146,0,0,1-.186,1.755,13.223,13.223,0,0,1-.529,1.887,14.692,14.692,0,0,1-.825,1.874,12.98,12.98,0,0,1-1.077,1.715,1.035,1.035,0,0,0-.714.346,7.34,7.34,0,0,1-1.544,1.378,3.552,3.552,0,0,1-4.162.006,7.291,7.291,0,0,1-1.543-1.371,1.035,1.035,0,0,0-.713-.346,13.038,13.038,0,0,1-1.079-1.719,14.8,14.8,0,0,1-.827-1.878,13.155,13.155,0,0,1-.53-1.89,9.167,9.167,0,0,1-.187-1.758,6.412,6.412,0,0,1,.158-1.632,1.835,1.835,0,0,1,.556-.947,2.928,2.928,0,0,1,1.077-.549c.458-.148,1.034-.28,1.7-.432l.015,0h0l.01-.009a1.072,1.072,0,0,0,.652.24,1.084,1.084,0,1,0,0-2.168,1.052,1.052,0,0,0-.575.171,1.176,1.176,0,0,0-.393.434h0l-.014,0c-2.842.656-4.557,1.051-4.557,4.893a10.584,10.584,0,0,0,.2,1.983,14.543,14.543,0,0,0,.583,2.115,14.983,14.983,0,0,0,2.146,4.013,1.028,1.028,0,0,0,.229.816,10.456,10.456,0,0,0,1.105,1.1h0Zm28.256-2.069h-1.607a1.387,1.387,0,0,1-.718-.208l-6.684-4.219a.66.66,0,0,1-.309-.556v-.419a3.27,3.27,0,0,0,0-4.712v-.742a.661.661,0,0,1,.309-.557l6.684-4.219a1.322,1.322,0,0,1,.718-.209h1.607a.661.661,0,0,1,.665.657v14.528a.65.65,0,0,1-.193.464.665.665,0,0,1-.471.191Z" transform="translate(-800.388 -937.498)" fill="#2e303a"/>
<path id="Path_4645" data-name="Path 4645" d="M232.363,4.484h.32l1,0c.119,0,.219-.127.225-.311V3.34c0-.178.08-.318.2-.326l.307,0c.124.008.209.149.209.326V4.18c.005.183.089.3.209.3l1.348,0,0-1.034c0-.178-.085-.316-.21-.324l-.542,0c-.12,0-.214-.126-.219-.31l0-.28c.006-.183.1-.31.221-.31l.544,0c.124-.008.2-.154.2-.332V.6a.55.55,0,0,1-.417.261h-.916c-.119,0-.219.13-.225.314v.829c-.006.183-.1.313-.219.313l-.277,0c-.12,0-.216-.125-.222-.308V1.172c-.005-.184-.1-.307-.22-.307h-1.329V1.9c0,.178.083.321.207.329l.545,0c.123.008.21.155.21.332l0,.239c0,.178-.084.32-.208.328h-.545c-.124.008-.207.149-.207.327ZM236.941.532V4.844a.548.548,0,0,1-.554.521h-4.256a.546.546,0,0,1-.552-.522V.523A.548.548,0,0,1,232.131,0l4.252,0a.558.558,0,0,1,.557.53" transform="translate(-223.139 8.931)" fill="#fff"/>
</g>
</g>
<path id="Path_663" data-name="Path 663" d="M970.328,998.3a2.042,2.042,0,1,1-2.042,2.042h0A2.042,2.042,0,0,1,970.328,998.3Z" transform="translate(-944.793 -989.792)" fill="#fff"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

9
assets/images/new/comprehensive_checkup.svg
Unescape Escape View File

@ -1,7 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="29.021" height="32.513" viewBox="0 0 29.021 32.513">
<g id="Page-1" transform="translate(0 2.076)">
<g id="_028---Body-Nerves" data-name="028---Body-Nerves">
<path id="Shape" d="M28.32,32.51H27.164a.581.581,0,0,1-.513-.309,11.355,11.355,0,0,1-1.364-5.426V26.7a17.718,17.718,0,0,0-1.191-7.15.581.581,0,0,0-1-.179c-.1.128-2.482,3.183-1.277,8.616a6.626,6.626,0,0,1-.641,4.18.639.639,0,0,1-.531.337l-12.256,0a.587.587,0,0,1-.532-.337A6.624,6.624,0,0,1,7.21,27.99c1.21-5.432-1.17-8.484-1.271-8.615a.581.581,0,0,0-.454-.218.547.547,0,0,0-.1.009.581.581,0,0,0-.449.388A17.718,17.718,0,0,0,3.743,26.7v.066a12.656,12.656,0,0,1-1.361,5.423.575.575,0,0,1-.515.316H.71a.581.581,0,0,1-.581-.522,33.207,33.207,0,0,1,.122-6.945A60.178,60.178,0,0,0,.84,18.577a5.372,5.372,0,0,1,.737-2.5,2.6,2.6,0,0,0,.363-2.406,4.153,4.153,0,0,1,.01-3.164A5.636,5.636,0,0,1,5.665,7.519L6.78,7.15c4.211-1.393,5.087-1.684,5.087-4.245A6.68,6.68,0,0,0,11.526.756.576.576,0,0,1,12.083,0h1.852V2.9c0,3.013-1.813,3.729-5.915,5.062l-1.985.652A4.6,4.6,0,0,0,3.045,10.9a3.088,3.088,0,0,0-.068,2.252A3.714,3.714,0,0,1,2.6,16.627a4.229,4.229,0,0,0-.6,1.95,52.679,52.679,0,0,1-.464,5.636v.006l-.116.859c-.019.116-.024.186-.026.189a33.309,33.309,0,0,0-.229,3.643.581.581,0,0,0,.575.585h.005a.581.581,0,0,0,.581-.576,32.072,32.072,0,0,1,.222-3.512c0-.034.007-.058.008-.075v.008l.022-.142a.059.059,0,0,1,0-.024L2.59,25.1c.024-.174.058-.427.095-.729a53.945,53.945,0,0,0,.475-5.791,3.4,3.4,0,0,1,.5-1.473,4.763,4.763,0,0,0,.368-4.436,1.993,1.993,0,0,1,.079-1.3A3.541,3.541,0,0,1,6.4,9.718l1.978-.65c2.4-.779,4.379-1.427,5.555-2.733v9.339c0,1.015-.639,1.71-1.9,2.075a2.328,2.328,0,1,0,.125,1.158,4.774,4.774,0,0,0,1.775-.831v8.047a2,2,0,0,1-1.4,1.894,2.322,2.322,0,1,0,.225,1.155A3.186,3.186,0,0,0,15.1,26.124V24.468a4.362,4.362,0,0,0,1.176.639,2.322,2.322,0,1,0,.225-1.155,2,2,0,0,1-1.4-1.892V14.013a4.774,4.774,0,0,0,1.775.831A2.315,2.315,0,1,0,17,13.683c-1.262-.362-1.9-1.058-1.9-2.073V6.336c1.176,1.306,3.16,1.954,5.555,2.733l1.974.648a3.544,3.544,0,0,1,2.293,1.65,2.056,2.056,0,0,1,.095,1.267,4.821,4.821,0,0,0,.373,4.513,3.284,3.284,0,0,1,.485,1.43,53.742,53.742,0,0,0,.474,5.784c.035.309.071.563.1.736l.011.077v.016l.021.1c0,.024.007.1.01.121a32.073,32.073,0,0,1,.224,3.513.581.581,0,0,0,.581.576h.005a.581.581,0,0,0,.575-.586,32.188,32.188,0,0,0-.232-3.624,1.691,1.691,0,0,0-.024-.209l-.116-.858a52.812,52.812,0,0,1-.463-5.643,4.315,4.315,0,0,0-.625-1.989,3.688,3.688,0,0,1-.341-3.462,3.092,3.092,0,0,0-.081-2.223,4.6,4.6,0,0,0-2.992-2.288L21.01,7.964C16.909,6.631,15.1,5.916,15.1,2.9V.005h1.851A.576.576,0,0,1,17.5.76,6.684,6.684,0,0,0,17.16,2.9c0,2.565.876,2.855,5.087,4.245l1.115.369a5.643,5.643,0,0,1,3.718,2.992,4.153,4.153,0,0,1,.01,3.164,2.6,2.6,0,0,0,.363,2.406,5.372,5.372,0,0,1,.737,2.5,60.144,60.144,0,0,0,.586,6.468,33.215,33.215,0,0,1,.122,6.946.581.581,0,0,1-.579.521ZM11.032,18.577a1.161,1.161,0,1,1-1.161-1.161A1.161,1.161,0,0,1,11.032,18.577Zm.581,10.45a1.161,1.161,0,1,1-1.161-1.161A1.161,1.161,0,0,1,11.612,29.027ZM18.579,23.8a1.161,1.161,0,1,1-1.161,1.161A1.161,1.161,0,0,1,18.579,23.8ZM18,14.513a1.161,1.161,0,1,1,1.161,1.161A1.161,1.161,0,0,1,18,14.513Z" transform="translate(-0.004 -2.076)" fill="#2e303a"/>
</g>
<svg xmlns="http://www.w3.org/2000/svg" width="27.682" height="40.133" viewBox="0 0 27.682 40.133">
<g id="Group_8185" data-name="Group 8185" transform="translate(0 0)">
<path id="Path_4944" data-name="Path 4944" d="M68.423,22.945a52.3,52.3,0,0,0,.657,5.827,9,9,0,0,1,.32,2.393,8.691,8.691,0,0,0-.121,2.516,8.175,8.175,0,0,1-.02,2.757,20.1,20.1,0,0,0-.379,2.047c-.639,1.613-.278,1.534-.278,1.534.2.243.537.019.537.019A.332.332,0,0,0,69.575,40a.4.4,0,0,0,.48-.023.491.491,0,0,0,.536-.122c.16.081.2-.021.2-.021.48-.031-.268-1.566-.268-1.566a4.192,4.192,0,0,1,.178-2.146c1.168-3.463,1.227-4.382.76-5.688-.131-.377-.165-.526-.1-.69.14-.378.038-1.9.209-2.5a54.113,54.113,0,0,0,.823-5.489,10.623,10.623,0,0,0-.805-4.339,27.788,27.788,0,0,1,.105-4.615,4.369,4.369,0,0,1,.445,1.993,8.269,8.269,0,0,0,1.078,3.373,5.43,5.43,0,0,1,.763,1.7c0,.243-.053.83-.053.83l.021.512a7.3,7.3,0,0,1,.071.8c-.086,1.335.126,1.084.126,1.084.179,0,.376-1.074.376-1.074a4.6,4.6,0,0,0,.082,1.419c.179.373.31-.064.313-.152.047-1.7.149-1.254.149-1.254.1,1.379.222,1.69.441,1.582.166-.079.014-1.655.014-1.655.284.936.5,1.085.5,1.085.469.329.179-.58.114-.76a5.17,5.17,0,0,1-.358-1.289c.434.86.76.828.76.828.423-.135-.37-1.353-.834-1.936a4.745,4.745,0,0,1-.631-.932,11.259,11.259,0,0,1-.254-1.687,5.071,5.071,0,0,0-.419-2.178,7.868,7.868,0,0,1-.763-2.944L73.6,8.909c-.225-2.207-1.851-2.223-1.851-2.223-1.644-.245-1.873-.776-1.873-.776a2.318,2.318,0,0,1-.149-1.462,1.747,1.747,0,0,0,.4-.859c.48-.368.456-.906.235-.9-.178,0-.138-.143-.138-.143A2.049,2.049,0,0,0,68.373,0h-.328a2.049,2.049,0,0,0-1.852,2.546s.04.147-.139.143c-.221-.006-.242.532.236.9a1.746,1.746,0,0,0,.4.859,2.318,2.318,0,0,1-.149,1.462s-.228.531-1.873.776c0,0-1.629.016-1.851,2.223l-.031,3.236a7.817,7.817,0,0,1-.763,2.944,5.089,5.089,0,0,0-.417,2.178,11.33,11.33,0,0,1-.253,1.687,4.693,4.693,0,0,1-.632.932c-.468.582-1.256,1.8-.834,1.936,0,0,.329.032.76-.828a5.119,5.119,0,0,1-.355,1.289c-.068.178-.358,1.087.111.76,0,0,.217-.149.5-1.085,0,0-.152,1.575.017,1.655.22.108.341-.2.44-1.582,0,0,.1-.445.149,1.254,0,.088.131.525.31.152a4.538,4.538,0,0,0,.083-1.419s.194,1.074.376,1.074c0,0,.214.251.126-1.084a6.719,6.719,0,0,1,.072-.8L62.5,20.7s-.053-.586-.053-.83a5.424,5.424,0,0,1,.763-1.7,8.272,8.272,0,0,0,1.076-3.373,4.38,4.38,0,0,1,.447-1.993,28.166,28.166,0,0,1,.106,4.615,10.6,10.6,0,0,0-.806,4.339,53.433,53.433,0,0,0,.822,5.489c.172.6.07,2.12.209,2.5.062.165.03.316-.1.69-.464,1.305-.405,2.224.763,5.688a4.154,4.154,0,0,1,.178,2.146s-.746,1.535-.268,1.566c0,0,.037.1.2.021a.492.492,0,0,0,.537.122.4.4,0,0,0,.479.023.329.329,0,0,0,.435.039s.339.229.54-.019c0,0,.358.079-.279-1.534a20.009,20.009,0,0,0-.378-2.047,8.216,8.216,0,0,1-.021-2.757,8.844,8.844,0,0,0-.12-2.516,8.81,8.81,0,0,1,.319-2.393A52.612,52.612,0,0,0,68,22.944l.2.069A.4.4,0,0,0,68.423,22.945Z" transform="translate(-59.768)" fill="#2e303a"/>
<path id="Path_4945" data-name="Path 4945" d="M59.165,10.877a1.411,1.411,0,1,0-1.9,1.323,2.8,2.8,0,1,1-5.6,0,1.413,1.413,0,0,0,.921-1.323v-.82c2.144-1.069,3.761-4.513,3.761-6.7,0-1.206-.109-1.8-1.127-2.327C54.918.722,54.147,0,53.523,0a1.411,1.411,0,1,0,0,2.821,2.7,2.7,0,0,0,1.493-.831c.332.214.387.463.387,1.364,0,2.2-2.015,6.112-4.232,6.112S46.94,5.56,46.94,3.354c0-.9.055-1.15.387-1.364a2.7,2.7,0,0,0,1.493.831,1.411,1.411,0,0,0,0-2.821c-.624,0-1.4.722-1.694,1.027C46.109,1.55,46,2.148,46,3.354c0,2.138,1.579,5.614,3.761,6.7v.82a1.413,1.413,0,0,0,.957,1.335,3.746,3.746,0,1,0,7.49,0A1.413,1.413,0,0,0,59.165,10.877Z" transform="translate(-31.483 0)" fill="#da4a54"/>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

26
assets/images/new/covid_test_drive_thru.svg
Unescape Escape View File

@ -1,10 +1,20 @@
<svg xmlns="http://www.w3.org/2000/svg" width="32.068" height="30.609" viewBox="0 0 32.068 30.609">
<g id="drive-thru_2_" data-name="drive-thru (2)" transform="translate(1.379 1.666)">
<g id="Group_8063" data-name="Group 8063" transform="translate(0 -1.666)">
<path id="Path_4609" data-name="Path 4609" d="M226.092,0h-4.8a.9.9,0,0,0-.9.9V3.842h-2.135a4.739,4.739,0,1,0,0,1.794h2.135V16.329h-2.945a.9.9,0,1,0,0,1.794h2.945v11.59a.9.9,0,0,0,.9.9h4.8a.9.9,0,0,0,.9-.9V.9A.9.9,0,0,0,226.092,0Z" transform="translate(-196.3)" fill="#2e303a"/>
<g id="car-compact" transform="translate(-1.379 14.596)">
<path id="Path_4610" data-name="Path 4610" d="M19.291,47.249a2.529,2.529,0,0,0-.24-1.073c-.016-.084-.034-.168-.057-.254l-1.676-4.153-.011-.037c-.586-1.746-1.421-3.361-3.536-3.361H5.683c-2.168,0-2.933,1.656-3.533,3.352L.4,45.885A2.563,2.563,0,0,0,0,47.249v1.292a2.512,2.512,0,0,0,.069.583A1.016,1.016,0,0,0,0,49.49v3.843a1.021,1.021,0,0,0,1.021,1.021H3.138a1.021,1.021,0,0,0,1.02-1.021V51.412h11.1v1.922a1.021,1.021,0,0,0,1.021,1.021h2a1.021,1.021,0,0,0,1.021-1.021V49.49a1.022,1.022,0,0,0-.068-.365,2.524,2.524,0,0,0,.068-.584V47.249h0Zm-15.9-5.11c.667-1.883,1.2-2.457,2.289-2.457H13.77c1.077,0,1.677.641,2.286,2.449l1.223,2.478a3.743,3.743,0,0,0-1.3-.23H3.312a3.76,3.76,0,0,0-1.179.188Zm1.05,6.893H2.21a.729.729,0,0,1,0-1.458H4.444a.729.729,0,0,1,0,1.458Zm7.893-.146H7.14a.461.461,0,0,1,0-.923h5.2a.461.461,0,1,1,0,.923Zm4.687.146H14.791a.729.729,0,0,1,0-1.458h2.234a.729.729,0,1,1,0,1.458Z" transform="translate(0 -38.37)" fill="#2e303a"/>
</g>
</g>
<svg id="car_2_" data-name="car (2)" xmlns="http://www.w3.org/2000/svg" width="36.25" height="26.585" viewBox="0 0 36.25 26.585">
<g id="Group_8169" data-name="Group 8169" transform="translate(0 6.37)">
<path id="Path_4845" data-name="Path 4845" d="M325.672,265.192l2.665-.016a.92.92,0,0,1,.925.914l.032,5.291a.92.92,0,0,1-.914.925l-2.665.016a.92.92,0,0,1-.925-.914l-.032-5.291A.92.92,0,0,1,325.672,265.192Z" transform="translate(-295.231 -252.268)" fill="#2f4859"/>
<path id="Path_4846" data-name="Path 4846" d="M27.439,266.967l2.665-.016a.92.92,0,0,1,.925.914l.031,5.291a.92.92,0,0,1-.914.925l-2.665.016a.92.92,0,0,1-.925-.914l-.032-5.291A.92.92,0,0,1,27.439,266.967Z" transform="translate(-24.113 -253.882)" fill="#2f4859"/>
<path id="Path_4847" data-name="Path 4847" d="M351.094,123.245a.43.43,0,0,0-.389.433.87.87,0,0,1-.651.952l-.663,0,.34.993s4.268-.026,4.14-1.427C353.772,123.111,351.919,123.166,351.094,123.245Z" transform="translate(-317.624 -123.208)" fill="#2f4859"/>
<path id="Path_4848" data-name="Path 4848" d="M2.78,123.245a.43.43,0,0,1,.39.433.869.869,0,0,0,.651.952l.663,0-.34.993S-.125,125.6,0,124.2c.1-1.088,1.951-1.034,2.777-.954Z" transform="translate(0 -123.208)" fill="#2f4859"/>
</g>
<path id="Path_4849" data-name="Path 4849" d="M44.372,67.882a7.343,7.343,0,0,0-.884-2.973l-1.8-3.3s-3.194-7.2-4.525-7.773c-1.287-.554-9.5-.679-10.044-.686h-.03c-.544.014-8.755.237-10.035.806-1.324.589-4.434,7.825-4.434,7.825L10.863,65.1a7.35,7.35,0,0,0-.849,2.983,21.5,21.5,0,0,0,.735,6.839,2.4,2.4,0,0,0,2.335,1.763l14.145-.082h.03L41.4,76.523a2.4,2.4,0,0,0,2.313-1.791,21.477,21.477,0,0,0,.654-6.849Z" transform="translate(-9.076 -53.151)" fill="#de5c5d"/>
<path id="Path_4850" data-name="Path 4850" d="M119.245,261.412l13.784-.082a.447.447,0,0,1,.449.444l.014,2.347a.447.447,0,0,1-.444.449l-13.784.082a.447.447,0,0,1-.449-.444l-.014-2.347A.447.447,0,0,1,119.245,261.412Z" transform="translate(-108 -242.402)" fill="#3a556a"/>
<path id="Path_4851" data-name="Path 4851" d="M80.067,65.472a.9.9,0,0,0-.8-.524l-9.425-.193h-.03l-9.423.306a.9.9,0,0,0-.792.533l-2.7,6.082L69.853,71.6h.03l12.961-.077Z" transform="translate(-51.721 -63.7)" fill="#2f4859"/>
<path id="Path_4852" data-name="Path 4852" d="M329.158,256.968a1.645,1.645,0,1,0,1.655,1.636h0A1.645,1.645,0,0,0,329.158,256.968Z" transform="translate(-297.744 -238.437)" fill="#ebf0f3"/>
<path id="Path_4853" data-name="Path 4853" d="M38.622,258.7a1.645,1.645,0,1,0,1.655,1.635A1.645,1.645,0,0,0,38.622,258.7Z" transform="translate(-33.624 -240.015)" fill="#ebf0f3"/>
<path id="Path_4854" data-name="Path 4854" d="M131.61,216.343h12v1.5h-12Z" transform="translate(-119.644 -201.506)" fill="#3a556a"/>
<path id="Path_4855" data-name="Path 4855" d="M292.439,184.776a.638.638,0,0,0-.787-.548l-5.487,1.342a.639.639,0,0,0-.394.29l-1.087,1.8a.638.638,0,0,0,.546.967h5.361a.642.642,0,0,0,.353-.1A3.664,3.664,0,0,0,292.439,184.776Z" transform="translate(-258.716 -172.294)" fill="#e1e6e9"/>
<path id="Path_4856" data-name="Path 4856" d="M330.774,196.033a1.2,1.2,0,1,0,1.25,1.152A1.2,1.2,0,0,0,330.774,196.033Z" transform="translate(-299.652 -183.041)" fill="#bdbec1"/>
<path id="Path_4857" data-name="Path 4857" d="M305.515,208.653a.914.914,0,1,0,.95.877h0A.914.914,0,0,0,305.515,208.653Z" transform="translate(-276.94 -194.515)" fill="#bdbec1"/>
<path id="Path_4858" data-name="Path 4858" d="M27.445,184.776a.638.638,0,0,1,.787-.548l5.487,1.342a.639.639,0,0,1,.394.29l1.087,1.8a.638.638,0,0,1-.546.967H29.294a.642.642,0,0,1-.353-.1A3.664,3.664,0,0,1,27.445,184.776Z" transform="translate(-24.918 -172.294)" fill="#e1e6e9"/>
<path id="Path_4859" data-name="Path 4859" d="M43.888,196.033a1.2,1.2,0,1,1-1.25,1.152A1.2,1.2,0,0,1,43.888,196.033Z" transform="translate(-38.76 -183.041)" fill="#bdbec1"/>
<path id="Path_4860" data-name="Path 4860" d="M74.9,208.653a.914.914,0,1,1-.95.877h0A.914.914,0,0,1,74.9,208.653Z" transform="translate(-67.228 -194.515)" fill="#bdbec1"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

28
assets/images/new/emergency.svg
Unescape Escape View File

@ -0,0 +1,28 @@
<svg xmlns="http://www.w3.org/2000/svg" width="39.338" height="34.687" viewBox="0 0 39.338 34.687">
<g id="ambulance_5_" data-name="ambulance (5)" transform="translate(0 -28.362)">
<g id="Group_8189" data-name="Group 8189" transform="translate(0 34.785)">
<g id="Group_8188" data-name="Group 8188">
<path id="Path_4980" data-name="Path 4980" d="M38.918,121.812l-3.485-3.107-5.29-7.305a1.252,1.252,0,0,0-1.008-.5H26.365l-1.008-3.275a1.26,1.26,0,0,0-1.217-.924H20.991a1.221,1.221,0,0,0-1.218,1.008l-.63,3.191H1.469A1.237,1.237,0,0,0,.21,112.156L0,129.915a1.237,1.237,0,0,0,1.259,1.259H4.534a4.969,4.969,0,0,0,9.656,0h8.942a4.969,4.969,0,0,0,9.656,0h5.29a1.237,1.237,0,0,0,1.259-1.259v-7.179A1.2,1.2,0,0,0,38.918,121.812ZM9.362,132.433A2.435,2.435,0,1,1,11.8,130,2.437,2.437,0,0,1,9.362,132.433Zm18.556,0A2.435,2.435,0,1,1,30.354,130,2.437,2.437,0,0,1,27.919,132.433ZM23.93,118.285v-4.87h4.534l3.569,4.87Z" transform="translate(0 -106.698)" fill="#2e303a"/>
<g id="Group_8196" data-name="Group 8196" transform="translate(-2.387 -4.424)">
<path id="Path_4948" data-name="Path 4948" d="M10.076,14.17h7.129v6.84H10.076Z" transform="translate(-0.48 -0.558)" fill="#fff" stroke="#707070" stroke-width="1"/>
<path id="Path_4645" data-name="Path 4645" d="M232.795,6.956l.5,0,1.554.008c.185,0,.34-.2.349-.482l0-1.3c0-.277.124-.493.316-.506l.477,0c.192.012.324.231.324.506V6.484c.008.285.138.471.324.471l2.091.006,0-1.6c0-.276-.133-.49-.326-.5l-.84,0c-.186,0-.332-.2-.34-.481l0-.434c.009-.285.156-.48.342-.48l.845,0c.192-.012.317-.239.317-.515l0-2a.853.853,0,0,1-.647.4h-1.421c-.185,0-.34.2-.349.486V3.114c-.009.284-.154.485-.34.485l-.43,0c-.186,0-.335-.194-.344-.478v-1.3c-.008-.285-.156-.476-.342-.476h-2.062v1.6c0,.276.129.5.322.51l.845,0c.191.013.326.24.326.515l0,.37c0,.276-.131.5-.322.51l-.846,0c-.193.013-.322.232-.322.507ZM239.9.826V7.515a.851.851,0,0,1-.86.809h-6.6a.847.847,0,0,1-.856-.81V.812A.85.85,0,0,1,232.436,0l6.6,0a.866.866,0,0,1,.865.823" transform="translate(-222.605 12.889)" fill="#da4a54"/>
</g>
</g>
</g>
<g id="Group_8191" data-name="Group 8191" transform="translate(21.327 28.362)">
<g id="Group_8190" data-name="Group 8190" transform="translate(0 0)">
<rect id="Rectangle_17462" data-name="Rectangle 17462" width="2.519" height="5.248" fill="#da4a54"/>
</g>
</g>
<g id="Group_8193" data-name="Group 8193" transform="translate(25.455 30.177)">
<g id="Group_8192" data-name="Group 8192" transform="translate(0 0)">
<rect id="Rectangle_17463" data-name="Rectangle 17463" width="5.416" height="2.519" transform="translate(0 3.829) rotate(-45)" fill="#da4a54"/>
</g>
</g>
<g id="Group_8195" data-name="Group 8195" transform="translate(14.112 30.196)">
<g id="Group_8194" data-name="Group 8194" transform="translate(0 0)">
<rect id="Rectangle_17464" data-name="Rectangle 17464" width="2.519" height="5.416" transform="translate(0 1.781) rotate(-45)" fill="#da4a54"/>
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

6
assets/images/new/h2o.svg
Unescape Escape View File

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24.809" height="32.569" viewBox="0 0 24.809 32.569">
<g id="h2o_1_" data-name="h2o (1)" transform="translate(-61)">
<path id="Path_4978" data-name="Path 4978" d="M157.107,265.979a5.807,5.807,0,0,0-5.444-.813,6.576,6.576,0,0,0-.663,2.912,6.679,6.679,0,0,0,13.358,0,6.825,6.825,0,0,0-.073-1A7.712,7.712,0,0,1,157.107,265.979Z" transform="translate(-84.275 -247.977)" fill="#fff"/>
<path id="Path_4979" data-name="Path 4979" d="M85.809,20.1a12.31,12.31,0,0,0-2.489-7.454L73.4,0,63.476,12.665A12.3,12.3,0,0,0,61,20.1a12.4,12.4,0,1,0,24.809,0ZM73.4,28.689A8.6,8.6,0,0,1,64.817,20.1a8.688,8.688,0,0,1,1.212-4.417,7.748,7.748,0,0,1,7.947.791,5.8,5.8,0,0,0,6.243.453l1.014-.553.351,1.1A8.6,8.6,0,0,1,73.4,28.689Z" fill="#259bd6"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 794 B

6
assets/images/new/menu.svg
Unescape Escape View File

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="23.889" height="10.643" viewBox="0 0 23.889 10.643">
<g id="Group_8197" data-name="Group 8197" transform="translate(-20.5 -27.854)">
<path id="Path_4646" data-name="Path 4646" d="M4.5,18H19.3" transform="translate(17.5 18.996)" fill="none" stroke="#2b353e" stroke-linecap="round" stroke-linejoin="round" stroke-width="3"/>
<path id="Path_4647" data-name="Path 4647" d="M4.5,9H25.389" transform="translate(17.5 20.354)" fill="none" stroke="#2b353e" stroke-linecap="round" stroke-linejoin="round" stroke-width="3"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 585 B

BIN
assets/images/new/payment.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

6
assets/images/new/reach_us.svg
Unescape Escape View File

@ -0,0 +1,6 @@
<svg id="location_6_" data-name="location (6)" xmlns="http://www.w3.org/2000/svg" width="32.622" height="32.621" viewBox="0 0 32.622 32.621">
<path id="Path_4938" data-name="Path 4938" d="M34.894,84.289H26.369a51.717,51.717,0,0,1-3.752,5.194,51.716,51.716,0,0,1-3.752-5.194H10.339L6.306,94.864H38.928Z" transform="translate(-6.306 -62.243)" fill="#544f57"/>
<path id="Path_4939" data-name="Path 4939" d="M41.972,6.31a8.682,8.682,0,0,0-8.682,8.682c-.051,8.284,8.682,18.558,8.682,18.558S50.7,23.276,50.654,14.992A8.682,8.682,0,0,0,41.972,6.31Zm0,12.366a3.684,3.684,0,1,1,3.684-3.684A3.684,3.684,0,0,1,41.972,18.676Z" transform="translate(-25.661 -6.31)" fill="#da4a54"/>
<path id="Path_4940" data-name="Path 4940" d="M53.343,86.741l-16.279,5.79L30.72,84.29h5.657a51.665,51.665,0,0,0,3.752,5.193A51.668,51.668,0,0,0,43.88,84.29h8.527Z" transform="translate(-23.818 -62.244)" fill="#544f57"/>
<path id="Path_4941" data-name="Path 4941" d="M29.96,107.152l16.114-5.732,4.411,5.732Z" transform="translate(-23.273 -74.531)" fill="#544f57"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
assets/images/new/visa.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

2
lib/config/localized_values.dart
Unescape Escape View File

@ -435,11 +435,13 @@ const Map localizedValues = {
"StartDay": {"en": "Start Day", "ar": "يوم البداية"},
"EndDay": {"en": "End Day", "ar": "يوم الانتهاء"},
"Days": {"en": "Days ", "ar": "أيام"},
"please-verify": {"en": "Please Verify ", "ar": "ارجوك تحقق"},
"ScheduleTime": {"en": "Schedule time", "ar": "الجدول الزمني"},
"AskDoctor": {"en": "Ask Doctor", "ar": "اسأل طبيبك"},
"DoctorResponses": {"en": "Doctor Responses", "ar": "ردود الأطباء"},
"New": {"en": "New", "ar": "جديد"},
"All": {"en": "All", "ar": "الكل"},
"dailyWater": {"en": "Daily Water Check", "ar": "فحص المياه اليومي"},
"QuestionHere": {"en": "Enter the question here...", "ar": "اضف الاستفسار هنا"},
"ViewDoctorResponses": {"en": "View Doctor Responses", "ar": "الاطلاع على ردود الأطباء"},
"ServiceInformationButton": {"en": "LOGIN / REGISTER", "ar": "دخول / تسجيل"},

44
lib/pages/landing/fragments/home_page_fragment2.dart
Unescape Escape View File

@ -47,10 +47,13 @@ class _HomePageFragment2State extends State<HomePageFragment2> {
hmgServices.clear();
hmgServices.add(new HmgServices(0, TranslationBase.of(context).liveCare, TranslationBase.of(context).onlineConsulting, "assets/images/new/Live_Care.svg", isLogin));
hmgServices.add(new HmgServices(1, TranslationBase.of(context).covidTest, TranslationBase.of(context).driveThru, "assets/images/new/covid_test_drive_thru.svg", isLogin));
hmgServices.add(new HmgServices(2, TranslationBase.of(context).checkup, TranslationBase.of(context).comprehensive, "assets/images/new/comprehensive_checkup.svg", isLogin));
hmgServices.add(new HmgServices(2, TranslationBase.of(context).online, TranslationBase.of(context).payment, "assets/images/new/visa.png", isLogin));
hmgServices.add(new HmgServices(3, TranslationBase.of(context).hhcHome, TranslationBase.of(context).healthCare, "assets/images/new/HHC.svg", isLogin));
hmgServices.add(new HmgServices(4, TranslationBase.of(context).refferal, TranslationBase.of(context).services2, "assets/images/new/E_Refferal.svg", isLogin));
hmgServices.add(new HmgServices(5, "RRT", TranslationBase.of(context).emergency, "assets/images/new/RRT.svg", isLogin));
hmgServices.add(new HmgServices(4, TranslationBase.of(context).checkup, TranslationBase.of(context).comprehensive, "assets/images/new/comprehensive_checkup.svg", isLogin));
hmgServices.add(new HmgServices(5, "RRT", TranslationBase.of(context).emergency, "assets/images/new/emergency.svg", isLogin));
hmgServices.add(new HmgServices(6, TranslationBase.of(context).refferal, TranslationBase.of(context).services2, "assets/images/new/E_Referral.svg", isLogin));
hmgServices.add(new HmgServices(7, "H\u2082O", TranslationBase.of(context).dailyWater, "assets/images/new/h2o.svg", isLogin));
hmgServices.add(new HmgServices(8, TranslationBase.of(context).reachUs, TranslationBase.of(context).findUs, "assets/images/new/reach_us.svg", isLogin));
}
@override
@ -65,9 +68,9 @@ class _HomePageFragment2State extends State<HomePageFragment2> {
children: [
projectViewModel.isLogin
? AspectRatio(
aspectRatio: 2.5,
aspectRatio: 2.7,
child: Padding(
padding: const EdgeInsets.only(left: 20, right: 20, top: 16, bottom: 6),
padding: const EdgeInsets.only(left: 20, right: 20, top: 8, bottom: 6),
child: LoggedSliderView(
projectViewModel,
new SliderData(TranslationBase.of(context).fileno + ": " + projectViewModel.user.patientID.toString(), projectViewModel.user.firstName + ' ' + projectViewModel.user.lastName,
@ -75,9 +78,9 @@ class _HomePageFragment2State extends State<HomePageFragment2> {
),
)
: AspectRatio(
aspectRatio: 2.5,
aspectRatio: 2.7,
child: Container(
margin: EdgeInsets.only(left: 20, right: 20, top: 16, bottom: 6),
margin: EdgeInsets.only(left: 20, right: 20, top: 8, bottom: 6),
child: SliderView(
onLoginClick: () {
widget.onLoginClick();
@ -279,6 +282,29 @@ class _HomePageFragment2State extends State<HomePageFragment2> {
],
),
),
projectViewModel.isArabic
? Positioned(
left: 20,
top: 12,
child: Opacity(
opacity: 0.04,
child: SvgPicture.asset(
"assets/images/new/logo.svg",
height: MediaQuery.of(context).size.width * 0.14,
),
),
)
: Positioned(
right: 20,
top: 12,
child: Opacity(
opacity: 0.04,
child: SvgPicture.asset(
"assets/images/new/logo.svg",
height: MediaQuery.of(context).size.width * 0.14,
),
),
),
projectViewModel.isArabic
? Positioned(
right: -16,
@ -404,7 +430,7 @@ class _HomePageFragment2State extends State<HomePageFragment2> {
left: 20,
top: 12,
child: Opacity(
opacity: 0.1,
opacity: 0.04,
child: SvgPicture.asset(
"assets/images/new/Pharmacy.svg",
height: MediaQuery.of(context).size.width * 0.15,
@ -415,7 +441,7 @@ class _HomePageFragment2State extends State<HomePageFragment2> {
right: 20,
top: 12,
child: Opacity(
opacity: 0.1,
opacity: 0.04,
child: SvgPicture.asset(
"assets/images/new/Pharmacy.svg",
height: MediaQuery.of(context).size.width * 0.15,

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

@ -20,6 +20,7 @@ import 'package:diplomaticquarterapp/pages/medical/medical_profile_page_new.dart
import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
import 'package:diplomaticquarterapp/services/family_files/family_files_provider.dart' as family;
import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart';
import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/CalendarUtils.dart';
import 'package:diplomaticquarterapp/uitl/HMGNetworkConnectivity.dart';
import 'package:diplomaticquarterapp/uitl/HMG_Geofence.dart';
@ -40,6 +41,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_local_notifications/flutter_local_notifications.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:provider/provider.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
@ -498,85 +500,90 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
projectViewModel = Provider.of(context);
return Scaffold(
appBar: AppBar(
elevation: 0,
textTheme: TextTheme(
headline6: TextStyle(color: Theme.of(context).textTheme.headline1.color, fontWeight: FontWeight.bold),
),
title: Text(
getText(currentTab).toUpperCase(),
style: TextStyle(fontWeight: FontWeight.bold, color: Theme.of(context).textTheme.headline1.color, fontFamily: projectViewModel.isArabic ? 'Cairo' : 'WorkSans'),
// bold: true,
// color: Colors.white,
),
leading: Builder(
builder: (BuildContext context) {
return new Stack(
children: <Widget>[
currentTab == 0
? IconButton(
icon: Icon(Icons.menu),
color: Theme.of(context).textTheme.headline1.color,
onPressed: () => Scaffold.of(context).openDrawer(),
)
: IconButton(
icon: Icon(Icons.arrow_back),
color: Theme.of(context).textTheme.headline1.color,
onPressed: () {
setState(() {
currentTab = 0;
});
pageController.jumpToPage(0);
},
),
notificationCount != ''
? new Positioned(
right: projectViewModel.isArabic ? 35 : 0,
top: 5,
child: new Container(
padding: EdgeInsets.all(4),
decoration: new BoxDecoration(
color: Colors.red,
borderRadius: BorderRadius.circular(20),
),
constraints: BoxConstraints(
minWidth: 20,
minHeight: 20,
),
child: new Text(
notificationCount,
style: new TextStyle(
color: Colors.white,
fontSize: projectViewModel.isArabic ? 8 : 9,
appBar: PreferredSize(
preferredSize: Size.fromHeight(currentTab == 0 ? 45 : 0.0),
child: AppBar(
elevation: 0,
backgroundColor: CustomColors.backgroudGreyColor ,
textTheme: TextTheme(
headline6: TextStyle(color: Theme.of(context).textTheme.headline1.color, fontWeight: FontWeight.bold),
),
title: Text(
getText(currentTab).toUpperCase(),
style: TextStyle(
fontWeight: FontWeight.bold,
color: currentTab == 0 ? CustomColors.backgroudGreyColor : Theme.of(context).textTheme.headline1.color,
fontFamily: projectViewModel.isArabic ? 'Cairo' : 'WorkSans'),
// bold: true,
),
leading: Builder(
builder: (BuildContext context) {
return new Stack(
children: <Widget>[
currentTab == 0
? IconButton(
icon: SvgPicture.asset("assets/images/new/menu.svg"),
color: Theme.of(context).textTheme.headline1.color,
onPressed: () => Scaffold.of(context).openDrawer(),
)
: IconButton(
icon: Icon(Icons.arrow_back),
onPressed: () {
setState(() {
currentTab = 0;
});
pageController.jumpToPage(0);
},
),
notificationCount != ''
? new Positioned(
right: projectViewModel.isArabic ? 35 : 0,
top: 5,
child: new Container(
padding: EdgeInsets.all(4),
decoration: new BoxDecoration(
color: Colors.red,
borderRadius: BorderRadius.circular(20),
),
constraints: BoxConstraints(
minWidth: 20,
minHeight: 20,
),
child: new Text(
notificationCount,
style: new TextStyle(
color: Colors.white,
fontSize: projectViewModel.isArabic ? 8 : 9,
),
textAlign: TextAlign.center,
),
textAlign: TextAlign.center,
),
),
)
: SizedBox()
],
);
},
)
: SizedBox()
],
);
},
),
actions: [
// IconButton(
// //iconSize: 70,
// icon: Icon(
// projectViewModel.isLogin ? Icons.settings : Icons.login,
// color: Theme.of(context).textTheme.headline1.color,
// ),
// onPressed: () {
// if (projectViewModel.isLogin)
// Navigator.of(context).pushNamed(
// SETTINGS,
// );
// else
// login();
// }, //do something,
// )
],
centerTitle: true,
),
actions: [
IconButton(
//iconSize: 70,
icon: Icon(
projectViewModel.isLogin ? Icons.settings : Icons.login,
color: Theme.of(context).textTheme.headline1.color,
),
onPressed: () {
if (projectViewModel.isLogin)
Navigator.of(context).pushNamed(
SETTINGS,
);
else
login();
}, //do something,
)
],
centerTitle: true,
),
drawer: SafeArea(child: AppDrawer()),
extendBody: true,

44
lib/pages/landing/widgets/services_view.dart
Unescape Escape View File

@ -4,9 +4,12 @@ import 'package:diplomaticquarterapp/models/hmg_services.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/E-Referral/e_referral_page.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/HomeHealthCare/home_health_care_page.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/h2o_page.dart';
import 'package:diplomaticquarterapp/pages/ContactUs/findus/findus_page.dart';
import 'package:diplomaticquarterapp/pages/Covid-DriveThru/covid-drivethru-location.dart';
import 'package:diplomaticquarterapp/pages/ErService/ErOptions.dart';
import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart';
import 'package:diplomaticquarterapp/pages/paymentService/payment_service.dart';
import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
@ -28,13 +31,19 @@ class ServicesView extends StatelessWidget {
} else if (index == 1) {
Navigator.push(context, FadePage(page: CovidDrivethruLocation()));
} else if (index == 2) {
Navigator.push(context, FadePage(page: CMCPage()));
Navigator.push(context, FadePage(page: PaymentService()));
} else if (index == 3) {
Navigator.push(context, FadePage(page: HomeHealthCarePage()));
} else if (index == 4) {
Navigator.push(context, FadePage(page: EReferralPage()));
Navigator.push(context, FadePage(page: CMCPage()));
} else if (index == 5) {
Navigator.push(context, FadePage(page: ErOptions(isAppbar: true)));
} else if (index == 6) {
Navigator.push(context, FadePage(page: EReferralPage()));
} else if (index == 7) {
Navigator.push(context, FadePage(page: H2OPage()));
} else if (index == 8) {
Navigator.push(context, FadePage(page: FindUsPage()));
}
},
child: Container(
@ -60,12 +69,18 @@ class ServicesView extends StatelessWidget {
child: Padding(
padding: const EdgeInsets.all(12.0),
child: Opacity(
opacity: 0.07,
child: SvgPicture.asset(
hmgServices.icon,
width: double.infinity,
height: double.infinity,
),
opacity: 0.04,
child: hmgServices.action == 2
? Image.asset(
hmgServices.icon,
width: double.infinity,
height: double.infinity,
)
: SvgPicture.asset(
hmgServices.icon,
width: double.infinity,
height: double.infinity,
),
),
),
),
@ -84,10 +99,15 @@ class ServicesView extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
mFlex(1),
SvgPicture.asset(
hmgServices.icon,
height: index == 0 ? MediaQuery.of(context).size.width / 18 : MediaQuery.of(context).size.width / 14,
),
hmgServices.action == 2
? Image.asset(
hmgServices.icon,
height: index == 0 ? MediaQuery.of(context).size.width / 18 : MediaQuery.of(context).size.width / 14,
)
: SvgPicture.asset(
hmgServices.icon,
height: index == 0 ? MediaQuery.of(context).size.width / 18 : MediaQuery.of(context).size.width / 14,
),
mFlex(4),
AutoSizeText(
hmgServices.title,

2
lib/uitl/translations_delegate_base.dart
Unescape Escape View File

@ -192,7 +192,7 @@ class TranslationBase {
String get pendingPayment => localizedValues['pendingPayment'][locale.languageCode];
String get payNow => localizedValues['payNow'][locale.languageCode];
String get dailyWater => localizedValues['dailyWater'][locale.languageCode];
String get viewQR => localizedValues['viewQR'][locale.languageCode];
String get instruction => localizedValues['instruction'][locale.languageCode];

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

@ -61,6 +61,10 @@ class _AppDrawerState extends State<AppDrawer> {
@override
Widget build(BuildContext context) {
projectProvider = Provider.of(context);
// (user.isFamily == null || user.isFamily == false) && projectProvider.havePrivilege(2)
print(user.isFamily.toString());
print(user.isFamily.toString());
print(projectProvider.havePrivilege(2).toString());
return Container(
width: MediaQuery.of(context).size.width * 0.75,
color: Theme.of(context).scaffoldBackgroundColor,
@ -78,7 +82,8 @@ class _AppDrawerState extends State<AppDrawer> {
Container(
height: SizeConfig.screenHeight * .30,
child: InkWell(
child: DrawerHeader(
child: Padding(
padding: const EdgeInsets.all(14.0),
child: Column(
children: <Widget>[
Container(
@ -97,64 +102,31 @@ class _AppDrawerState extends State<AppDrawer> {
],
),
),
(user != null && projectProvider.isLogin)
? Padding(
padding: EdgeInsets.all(15),
child: Column(mainAxisAlignment: MainAxisAlignment.start, children: <Widget>[
Row(
children: <Widget>[
Padding(
padding: EdgeInsets.only(right: 5),
child: Icon(
Icons.account_circle,
color: Color(0xFF40ACC9),
)),
AppText(
user.firstName + ' ' + user.lastName,
color: Color(0xFF40ACC9),
)
],
),
Row(children: <Widget>[
Padding(
padding: EdgeInsets.only(left: 30, top: 5),
child: Column(
children: <Widget>[
AppText(
TranslationBase.of(context).fileno + ": " + user.patientID.toString(),
color: Color(0xFF40ACC9),
fontSize: SizeConfig.textMultiplier * 1.5,
),
AppText(
user.bloodGroup != null ? 'Blood Group: ' + user.bloodGroup : '',
fontSize: SizeConfig.textMultiplier * 1.5,
),
],
))
])
]))
: Container(
width: double.infinity,
margin: EdgeInsets.only(top: 12),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Text(
TranslationBase.of(context).cantSeeProfile,
style: TextStyle(
color: Colors.black,
fontWeight: FontWeight.bold,
fontSize: 18,
),
),
Text(
TranslationBase.of(context).loginRegisterNow,
style: TextStyle(color: Colors.black, fontSize: 14),
),
],
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: Colors.black,
fontWeight: FontWeight.bold,
fontSize: 18,
),
),
Text(
(user != null && projectProvider.isLogin)
? TranslationBase.of(context).fileno + ": " + user.patientID.toString()
: TranslationBase.of(context).loginRegisterNow,
style: TextStyle(color: Colors.black, fontSize: 14),
),
],
),
),
],
),
),
@ -164,34 +136,37 @@ class _AppDrawerState extends State<AppDrawer> {
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
InkWell(
child: DrawerItem(
TranslationBase.of(context).arabicChange,
Padding(child: Image.asset('assets/images/lang.png'), padding: EdgeInsets.all(3)),
isImageIcon: true,
bottomLine: false,
),
onTap: () {
sharedPref.setBool(IS_ROBOT_INIT, null);
if (projectProvider.isArabic) {
projectProvider.changeLanguage('en');
} else {
projectProvider.changeLanguage('ar');
}
},
),
(user != null && projectProvider.isLogin)
? Container()
: InkWell(
child: DrawerItem(
TranslationBase.of(context).arabicChange,
Padding(child: Image.asset('assets/images/lang.png'), padding: EdgeInsets.all(3)),
isImageIcon: true,
bottomLine: false,
),
onTap: () {
sharedPref.setBool(IS_ROBOT_INIT, null);
if (projectProvider.isArabic) {
projectProvider.changeLanguage('en');
} else {
projectProvider.changeLanguage('ar');
}
},
),
(user != null && projectProvider.isLogin)
? Column(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
(user.isFamily == null || user.isFamily == false) && projectProvider.havePrivilege(2)
(user.isFamily == null || user.isFamily == false)
? InkWell(
child: DrawerItem(
TranslationBase.of(context).family,
Icons.group,
SvgPicture.asset("assets/images/new/family_files.svg"),
isImageIcon: true,
bottomLine: false,
textColor: Theme.of(context).textTheme.bodyText1.color,
iconColor: Theme.of(context).textTheme.bodyText1.color,
bottomLine: false,
sideArrow: true,
),
onTap: () {
@ -213,73 +188,99 @@ class _AppDrawerState extends State<AppDrawer> {
return Padding(padding: EdgeInsets.all(10), child: Text(snapshot.error));
else
return Container(
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
// <--- left side
color: Colors.grey[200],
width: 1.0,
),
)),
child: Column(
children: [
user.isFamily == true
? Container(
padding: EdgeInsets.only(bottom: 5),
child: InkWell(
children: [
user.isFamily == true
? Container(
padding: EdgeInsets.only(bottom: 5, left: 4),
child: InkWell(
onTap: () {
switchUser(mainUser, context);
},
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Expanded(
child: SvgPicture.asset("assets/images/new/family_files.svg"),
),
Expanded(
flex: 7,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
AppText(mainUser.firstName + ' ' + mainUser.lastName, color: Theme.of(context).textTheme.bodyText1.color),
AppText(
TranslationBase.of(context).fileno + ": " + mainUser.patientID.toString(),
color: Theme.of(context).textTheme.bodyText1.color,
),
],
),
),
],
),
),
)
: SizedBox(),
Column(
mainAxisAlignment: MainAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: snapshot.data.getAllSharedRecordsByStatusList.map<Widget>((result) {
return result.status == 3
? Container(
padding: EdgeInsets.only(bottom: 5),
child: InkWell(
onTap: () {
switchUser(mainUser, context);
switchUser(result, context);
},
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Expanded(
child: Icon(Icons.person),
child: Icon(Icons.person, color: result.responseID == user.patientID ? Colors.transparent : Colors.transparent),
),
Expanded(
flex: 7,
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
AppText(mainUser.firstName + ' ' + mainUser.lastName, color: Theme.of(context).textTheme.bodyText1.color),
AppText(
TranslationBase.of(context).fileno + ": " + mainUser.patientID.toString(),
color: Theme.of(context).textTheme.bodyText1.color,
),
])),
flex: 7,
child: Padding(
padding: EdgeInsets.only(left: 5, right: 5),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
AppText(result.patientName, color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black),
AppText(TranslationBase.of(context).fileno + ": " + result.responseID.toString(),
color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black),
Divider(
color: Colors.grey[400],
),
],
),
),
),
],
)))
: SizedBox(),
Column(
mainAxisAlignment: MainAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: snapshot.data.getAllSharedRecordsByStatusList.map<Widget>((result) {
return result.status == 3
? Container(
padding: EdgeInsets.only(bottom: 5),
child: InkWell(
onTap: () {
switchUser(result, context);
},
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Expanded(
child: Icon(Icons.person, color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black),
),
Expanded(
flex: 7,
child: Padding(
padding: EdgeInsets.only(left: 5, right: 5),
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
AppText(result.patientName, color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black),
AppText(TranslationBase.of(context).fileno + ": " + result.responseID.toString(),
color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black),
]))),
],
)))
: SizedBox();
}).toList())
],
));
),
),
)
: SizedBox();
}).toList())
],
));
}
},
),
mHeight(20),
InkWell(
child: DrawerItem(
TranslationBase.of(context).arabicChange,
Padding(child: Image.asset('assets/images/lang.png'), padding: EdgeInsets.only(left: 3, right: 3, top: 3, bottom: projectProvider.isArabic ? 3 : 0)),
isImageIcon: true,
bottomLine: false,
fontHeight: projectProvider.isArabic ? 1 : 0.8,
),
onTap: () {
sharedPref.setBool(IS_ROBOT_INIT, null);
if (projectProvider.isArabic) {
projectProvider.changeLanguage('en');
} else {
projectProvider.changeLanguage('ar');
}
},
),
@ -288,7 +289,9 @@ class _AppDrawerState extends State<AppDrawer> {
children: [
DrawerItem(
TranslationBase.of(context).notification,
Icons.notifications,
SvgPicture.asset("assets/images/new/notifications.svg"),
isImageIcon: true,
bottomLine: false,
count: notificationCount != null
? new Container(
padding: EdgeInsets.all(4),
@ -323,7 +326,12 @@ class _AppDrawerState extends State<AppDrawer> {
),
if (projectProvider.havePrivilege(3))
InkWell(
child: DrawerItem(TranslationBase.of(context).appsetting, Icons.settings_input_composite),
child: DrawerItem(
TranslationBase.of(context).appsetting,
SvgPicture.asset("assets/images/new/app_setting.svg"),
isImageIcon: true,
bottomLine: false,
),
onTap: () {
Navigator.of(context).pushNamed(
SETTINGS,
@ -331,7 +339,11 @@ class _AppDrawerState extends State<AppDrawer> {
},
),
InkWell(
child: DrawerItem(TranslationBase.of(context).rateApp, Icons.star),
child: DrawerItem(
TranslationBase.of(context).rateApp,
Icons.star,
bottomLine: false,
),
onTap: () {
if (Platform.isIOS) {
launch("https://apps.apple.com/sa/app/dr-suliaman-alhabib/id733503978");
@ -345,6 +357,7 @@ class _AppDrawerState extends State<AppDrawer> {
TranslationBase.of(context).logout,
SvgPicture.asset("assets/images/new/logout.svg"),
isImageIcon: true,
bottomLine: false,
),
onTap: () {
logout();
@ -468,6 +481,7 @@ class _AppDrawerState extends State<AppDrawer> {
GifLoaderDialogUtils.showMyDialog(context);
this.familyFileProvider.silentLoggin(user is AuthenticatedUser ? null : user, mainUser: user is AuthenticatedUser).then((value) {
GifLoaderDialogUtils.hideDialog(context);
Navigator.of(context).pop();
loginAfter(value, context);
}).catchError((err) {
GifLoaderDialogUtils.hideDialog(context);

59
lib/widgets/drawer/drawer_item_widget.dart
Unescape Escape View File

@ -16,14 +16,9 @@ class DrawerItem extends StatefulWidget {
final bool sideArrow;
final Widget count;
final bool isImageIcon;
DrawerItem(this.title, this.icon,
{this.textColor,
this.iconColor,
this.subTitle = '',
this.bottomLine = true,
this.count,
this.sideArrow = false,
this.isImageIcon = false});
final double fontHeight;
DrawerItem(this.title, this.icon, {this.textColor, this.iconColor, this.subTitle = '', this.bottomLine = true, this.count, this.sideArrow = false, this.isImageIcon = false,this.fontHeight});
@override
_DrawerItemState createState() => _DrawerItemState();
@ -53,39 +48,31 @@ class _DrawerItemState extends State<DrawerItem> {
? widget.icon
: Icon(
widget.icon,
color: widget.iconColor == null
? Theme.of(context).textTheme.bodyText1.color
: widget.iconColor,
color: widget.iconColor == null ? Theme.of(context).textTheme.bodyText1.color : widget.iconColor,
size: SizeConfig.imageSizeMultiplier * 5,
)),
Expanded(
flex: 7,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Row(
children: [
AppText(
widget.title,
fontSize: SizeConfig.textMultiplier * 2.3,
),
widget.count ?? SizedBox(),
],
child: Column(crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
Row(
children: [
AppText(
widget.title,
fontWeight: FontWeight.bold,
fontSize: SizeConfig.textMultiplier * 2.3,
height: widget.fontHeight,
),
widget.subTitle != ''
? AppText(
widget.subTitle,
fontSize: SizeConfig.textMultiplier * 2.5,
)
: SizedBox(),
])),
widget.sideArrow == true
? Expanded(
flex: 1,
child:
Icon(Icons.keyboard_arrow_right, color: Colors.red))
: Expanded(flex: 1, child: SizedBox()),
widget.count ?? SizedBox(),
],
),
widget.subTitle != ''
? AppText(
widget.subTitle,
fontSize: SizeConfig.textMultiplier * 2.5,
)
: SizedBox(),
])),
widget.sideArrow == true ? Expanded(flex: 1, child: Icon(Icons.keyboard_arrow_right, color: Colors.black)) : Expanded(flex: 1, child: SizedBox()),
],
),
));

20
lib/widgets/text/app_texts_widget.dart
Unescape Escape View File

@ -23,6 +23,8 @@ class AppText extends StatefulWidget {
final TextAlign textAlign;
final Color backGroundcolor;
final bool underline;
final double height;
AppText(this.data,
{this.color,
this.fontWeight = FontWeight.normal,
@ -37,6 +39,7 @@ class AppText extends StatefulWidget {
this.visibility = true,
this.textAlign,
this.underline = false,
this.height,
this.backGroundcolor = Colors.white});
@override
@ -50,31 +53,22 @@ class _AppTextState extends State<AppText> {
return Visibility(
visible: widget.visibility,
child: Container(
margin: widget.margin != null
? EdgeInsets.all(widget.margin)
: EdgeInsets.only(
top: widget.marginTop,
right: widget.marginRight,
bottom: widget.marginBottom,
left: widget.marginLeft),
margin: widget.margin != null ? EdgeInsets.all(widget.margin) : EdgeInsets.only(top: widget.marginTop, right: widget.marginRight, bottom: widget.marginBottom, left: widget.marginLeft),
child: Text(
widget.data,
textAlign: widget.textAlign,
overflow: TextOverflow.clip,
style: TextStyle(
color: widget.color == null
? Theme.of(context).textTheme.bodyText1.color
: widget.color,
color: widget.color == null ? Theme.of(context).textTheme.bodyText1.color : widget.color,
fontWeight: widget.fontWeight,
fontSize: widget.fontSize ?? (SizeConfig.textMultiplier * 2),
height: widget.height,
fontFamily: widget.fontFamily == null
? projectViewModel.isArabic
? 'Cairo'
: 'WorkSans'
: widget.fontFamily,
decoration: widget.underline == true
? TextDecoration.underline
: TextDecoration.none
decoration: widget.underline == true ? TextDecoration.underline : TextDecoration.none
// backgroundColor:widget.backGroundcolor
),
),

Write Preview
Loading…
Cancel
Save