Merge branch 'development_new_design_2.0' into haroon-new-design

# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
merge-update-with-lab-changes
haroon amjad 4 years ago
commit 5d44fff28d

@ -0,0 +1,6 @@
<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>

After

Width:  |  Height:  |  Size: 3.5 KiB

@ -0,0 +1,11 @@
<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>
</svg>

After

Width:  |  Height:  |  Size: 5.8 KiB

@ -0,0 +1,5 @@
<svg id="Group_8429" data-name="Group 8429" xmlns="http://www.w3.org/2000/svg" width="31.346" height="31.94" viewBox="0 0 31.346 31.94">
<path id="Path_5095" data-name="Path 5095" d="M132.741,147.943a8.267,8.267,0,0,1-7.14,3.659,8.465,8.465,0,0,1-7.027-12.764l6.243-10.641a1.154,1.154,0,0,1,1.4-.5,1.138,1.138,0,0,1,.6.5l6.243,10.641A8.474,8.474,0,0,1,132.741,147.943Zm0,0" transform="translate(-110.073 -119.664)" fill="#de5c5d"/>
<path id="Path_5096" data-name="Path 5096" d="M366.039,9.648a4.471,4.471,0,0,1-4.3,2.722A4.551,4.551,0,0,1,358,5.506L360.9.57a1.154,1.154,0,0,1,1.4-.5,1.131,1.131,0,0,1,.6.5l2.9,4.936A4.541,4.541,0,0,1,366.039,9.648Zm0,0" transform="translate(-335.077 0.001)" fill="#de5c5d"/>
<path id="Path_5097" data-name="Path 5097" d="M7.76,107.5a3.965,3.965,0,0,1-3.752,2.62A4.029,4.029,0,0,1,.56,104.039l2.564-4.372a1.024,1.024,0,0,1,1.34-.4,1.009,1.009,0,0,1,.426.4l2.564,4.372A4.017,4.017,0,0,1,7.76,107.5Zm0,0" transform="translate(0 -92.976)" fill="#de5c5d"/>
</svg>

After

Width:  |  Height:  |  Size: 999 B

@ -0,0 +1,5 @@
<svg id="Group_7066" data-name="Group 7066" xmlns="http://www.w3.org/2000/svg" width="28.357" height="28.357" viewBox="0 0 28.357 28.357">
<path id="Path_4367" data-name="Path 4367" d="M24.7,2.215H22.154V.886a.886.886,0,1,0-1.772,0V2.215H7.976V.886A.886.886,0,1,0,6.2.886V2.215H3.655A3.66,3.66,0,0,0,0,5.871V24.7a3.66,3.66,0,0,0,3.655,3.655H24.7A3.66,3.66,0,0,0,28.357,24.7V5.871A3.66,3.66,0,0,0,24.7,2.215ZM26.585,24.7A1.883,1.883,0,0,1,24.7,26.585H3.655A1.883,1.883,0,0,1,1.772,24.7V10.025a.277.277,0,0,1,.277-.277H26.308a.277.277,0,0,1,.277.277Z" fill="#2e303a"/>
<line id="Line_12" data-name="Line 12" y2="10.743" transform="translate(13.755 12.168)" fill="none" stroke="#da4a54" stroke-width="2.5"/>
<line id="Line_13" data-name="Line 13" y2="10.743" transform="translate(19.127 17.539) rotate(90)" fill="none" stroke="#da4a54" stroke-width="2.5"/>
</svg>

After

Width:  |  Height:  |  Size: 867 B

@ -0,0 +1,89 @@
<svg xmlns="http://www.w3.org/2000/svg" width="29.723" height="30.591" viewBox="0 0 29.723 30.591">
<g id="injection" transform="translate(-2.188 -1.267)">
<g id="Group_8391" data-name="Group 8391" transform="translate(2.188 26.82)">
<g id="Group_8390" data-name="Group 8390">
<path id="Path_5064" data-name="Path 5064" d="M2.89,60.126a.7.7,0,0,1-.5-.206.7.7,0,0,1,0-.991L5.16,56.164a.7.7,0,1,1,.991.991L3.385,59.921A.685.685,0,0,1,2.89,60.126Z" transform="translate(-2.188 -55.957)" fill="#2e303a"/>
</g>
</g>
<g id="Group_8409" data-name="Group 8409" transform="translate(4.631 3.194)">
<g id="Group_8392" data-name="Group 8392" transform="translate(0.502 2.995)">
<path id="Path_5065" data-name="Path 5065" d="M30.348,18.486,15.6,33.232a1.444,1.444,0,0,1-2.037,0L8.917,28.583a1.435,1.435,0,0,1,0-2.037L23.662,11.8Z" transform="translate(-8.492 -11.8)" fill="#2e303a"/>
</g>
<g id="Group_8393" data-name="Group 8393" transform="translate(0.506 11.755)">
<path id="Path_5066" data-name="Path 5066" d="M14.906,30.55,8.921,36.535a1.444,1.444,0,0,0,0,2.037l4.649,4.649a1.444,1.444,0,0,0,2.037,0l8.134-8.134Z" transform="translate(-8.5 -30.55)" fill="#de5c5d"/>
</g>
<g id="Group_8394" data-name="Group 8394" transform="translate(0 20.628)">
<path id="Path_5067" data-name="Path 5067" d="M10.984,53.652l1.159-1.159L9.189,49.54,8.031,50.7a2.088,2.088,0,0,0,2.953,2.953Z" transform="translate(-7.418 -49.54)" fill="#2e303a"/>
</g>
<g id="Group_8395" data-name="Group 8395" transform="translate(0.005 22.726)" opacity="0.1">
<path id="Path_5068" data-name="Path 5068" d="M12.148,54.885l-1.159,1.159A2.085,2.085,0,0,1,7.5,54.03a1.994,1.994,0,0,0,.537.939,2.087,2.087,0,0,0,2.953,0l.621-.621Z" transform="translate(-7.428 -54.03)" fill="#070707"/>
</g>
<g id="Group_8396" data-name="Group 8396" transform="translate(17.798 0)">
<path id="Path_5069" data-name="Path 5069" d="M53.065,7.824l-4.457,4.462-.663.659L45.51,10.511l.663-.659L50.631,5.39Z" transform="translate(-45.51 -5.39)" fill="#2e303a"/>
</g>
<g id="Group_8398" data-name="Group 8398" transform="translate(16.834 9.007)">
<g id="Group_8397" data-name="Group 8397">
<path id="Path_5070" data-name="Path 5070" d="M46.878,27.435l-.659.659h0l-2.63-2.63a.465.465,0,0,1,0-.659.471.471,0,0,1,.663,0Z" transform="translate(-43.447 -24.667)" fill="#fff"/>
</g>
</g>
<g id="Group_8400" data-name="Group 8400" transform="translate(15.675 12.212)">
<g id="Group_8399" data-name="Group 8399" transform="translate(0)">
<path id="Path_5071" data-name="Path 5071" d="M43.375,33.271l-.663.663L41.1,32.323a.466.466,0,1,1,.659-.659Z" transform="translate(-40.967 -31.527)" fill="#fff"/>
</g>
</g>
<g id="Group_8402" data-name="Group 8402" transform="translate(12.466 13.371)">
<g id="Group_8401" data-name="Group 8401">
<path id="Path_5072" data-name="Path 5072" d="M37.528,36.779l-.659.659-2.635-2.63a.469.469,0,0,1,.663-.663Z" transform="translate(-34.097 -34.007)" fill="#fff"/>
</g>
</g>
<g id="Group_8404" data-name="Group 8404" transform="translate(11.307 16.576)">
<g id="Group_8403" data-name="Group 8403">
<path id="Path_5073" data-name="Path 5073" d="M34.025,42.616l-.659.659h0l-1.607-1.607a.471.471,0,0,1,0-.663.465.465,0,0,1,.659,0Z" transform="translate(-31.617 -40.868)" fill="#fff"/>
</g>
</g>
<g id="Group_8406" data-name="Group 8406" transform="translate(8.102 17.739)">
<g id="Group_8405" data-name="Group 8405">
<path id="Path_5074" data-name="Path 5074" d="M28.183,46.125v0l-.659.659-2.63-2.635a.466.466,0,0,1,.659-.659Z" transform="translate(-24.757 -43.357)" fill="#fff"/>
</g>
</g>
<g id="Group_8408" data-name="Group 8408" transform="translate(6.938 20.945)">
<g id="Group_8407" data-name="Group 8407">
<path id="Path_5075" data-name="Path 5075" d="M24.675,51.966l-.659.659L22.4,51.018a.469.469,0,0,1,.663-.663Z" transform="translate(-22.267 -50.218)" fill="#fff"/>
</g>
</g>
</g>
<g id="Group_8410" data-name="Group 8410" transform="translate(23.326 20.986)">
<path id="Path_5076" data-name="Path 5076" d="M55.116,46.89v6.2a1.254,1.254,0,0,1-1.257,1.257H48.692a1.258,1.258,0,0,1-1.262-1.257V46.895A1.266,1.266,0,0,1,48.7,45.633a1.262,1.262,0,0,0,1.257-1.205V43.47H52.6v.958a1.26,1.26,0,0,0,1.257,1.205h0A1.254,1.254,0,0,1,55.116,46.89Z" transform="translate(-47.43 -43.47)" fill="#6f6f6f"/>
</g>
<g id="Group_8411" data-name="Group 8411" transform="translate(23.321 26.822)">
<path id="Path_5077" data-name="Path 5077" d="M47.42,56.148v3.593A1.258,1.258,0,0,0,48.682,61h5.168a1.254,1.254,0,0,0,1.257-1.257V56.148C52.438,55.41,50.653,57.181,47.42,56.148Z" transform="translate(-47.42 -55.962)" fill="#de5c5d"/>
</g>
<g id="Group_8413" data-name="Group 8413" transform="translate(25.844 20.986)" opacity="0.1">
<path id="Path_5079" data-name="Path 5079" d="M52.82,43.47h2.645v.565H52.82Z" transform="translate(-52.82 -43.47)" fill="#070707"/>
</g>
<g id="Group_8414" data-name="Group 8414" transform="translate(24.714 19.121)">
<path id="Path_5080" data-name="Path 5080" d="M55.306,39.947V40.9a.469.469,0,0,1-.467.467H50.867A.469.469,0,0,1,50.4,40.9v-.953a.469.469,0,0,1,.467-.467h3.971A.466.466,0,0,1,55.306,39.947Z" transform="translate(-50.4 -39.48)" fill="#2e303a"/>
</g>
<g id="Group_8415" data-name="Group 8415" transform="translate(24.709 19.121)" opacity="0.1">
<path id="Path_5081" data-name="Path 5081" d="M55.3,39.947V40.9a.469.469,0,0,1-.467.467H50.857a.469.469,0,0,1-.467-.467V40.84h3.915a.469.469,0,0,0,.467-.467V39.48h.061A.469.469,0,0,1,55.3,39.947Z" transform="translate(-50.39 -39.48)" fill="#070707"/>
</g>
<g id="Group_8416" data-name="Group 8416" transform="translate(23.326 24.906)">
<path id="Path_5082" data-name="Path 5082" d="M50.659,52.4v3.63a.544.544,0,0,1-.547.547H47.43V51.86h2.682a.538.538,0,0,1,.547.542Z" transform="translate(-47.43 -51.86)" fill="#259bd6"/>
</g>
<g id="Group_8420" data-name="Group 8420" transform="translate(25.624 1.267)">
<g id="Group_8419" data-name="Group 8419" transform="translate(0 0)">
<g id="Group_8418" data-name="Group 8418">
<path id="Path_5084" data-name="Path 5084" d="M58.17,7.558a.479.479,0,0,1-.332-.135L52.484,2.063a.466.466,0,1,1,.659-.659L58.5,6.759a.465.465,0,0,1,0,.659A.446.446,0,0,1,58.17,7.558Z" transform="translate(-52.347 -1.267)" fill="#2e303a"/>
</g>
</g>
</g>
<g id="Group_8422" data-name="Group 8422" transform="translate(22.429 7.656)" opacity="0.1">
<path id="Path_5086" data-name="Path 5086" d="M48.608,17.374l-.663.659L45.51,15.6l.663-.659Z" transform="translate(-45.51 -14.94)" fill="#070707"/>
</g>
<g id="Group_8424" data-name="Group 8424" transform="translate(19.545 5.426)">
<g id="Group_8423" data-name="Group 8423">
<path id="Path_5087" data-name="Path 5087" d="M47.076,18.378a.479.479,0,0,1-.332-.135l-7.27-7.279a.466.466,0,0,1,.659-.659l7.275,7.275a.465.465,0,0,1,0,.659A.456.456,0,0,1,47.076,18.378Z" transform="translate(-39.337 -10.167)" fill="#2e303a"/>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 7.2 KiB

@ -0,0 +1,20 @@
<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>

After

Width:  |  Height:  |  Size: 3.9 KiB

@ -0,0 +1,15 @@
<svg id="calculator_1_" data-name="calculator (1)" xmlns="http://www.w3.org/2000/svg" width="33.121" height="33.121" viewBox="0 0 33.121 33.121">
<path id="Path_5098" data-name="Path 5098" d="M28.528,0H2.911A2.914,2.914,0,0,0,0,2.911V28.528a2.914,2.914,0,0,0,2.911,2.911H22.059a.97.97,0,0,0,.686-.284l8.41-8.41a.97.97,0,0,0,.284-.686V2.911A2.914,2.914,0,0,0,28.528,0Z" fill="#696969"/>
<path id="Path_5099" data-name="Path 5099" d="M15.72,0H2.911A2.914,2.914,0,0,0,0,2.911V15.72H15.72Z" fill="#4d4e55"/>
<path id="Path_5100" data-name="Path 5100" d="M258.72,15.72V2.911A2.914,2.914,0,0,0,255.809,0H243V15.72Z" transform="translate(-227.28)" fill="#2e303a"/>
<path id="Path_5101" data-name="Path 5101" d="M243,243v15.72h6.34a.97.97,0,0,0,.686-.284l8.41-8.41a.97.97,0,0,0,.284-.686V243Zm14.749,6.34h0Z" transform="translate(-227.28 -227.28)" fill="#414141"/>
<path id="Path_5102" data-name="Path 5102" d="M0,243v12.809a2.914,2.914,0,0,0,2.911,2.911H15.72V243Z" transform="translate(0 -227.28)" fill="#2e303a"/>
<path id="Path_5103" data-name="Path 5103" d="M77,73.764H75.7V72.47a.97.97,0,0,0-1.941,0v1.294H72.47a.97.97,0,0,0,0,1.941h1.294V77A.97.97,0,0,0,75.7,77V75.7H77a.97.97,0,0,0,0-1.941Z" transform="translate(-66.875 -66.875)" fill="#fff"/>
<path id="Path_5104" data-name="Path 5104" d="M320,108.441H315.47a.97.97,0,1,1,0-1.941H320a.97.97,0,0,1,0,1.941Z" transform="translate(-294.155 -99.611)" fill="#fff"/>
<path id="Path_5105" data-name="Path 5105" d="M85.459,327.087l.931-.931a.97.97,0,1,0-1.372-1.372l-.931.931-.931-.931a.97.97,0,1,0-1.372,1.372l.931.931-.931.931a.97.97,0,1,0,1.372,1.372l.931-.931.931.931a.97.97,0,0,0,1.372-1.372Z" transform="translate(-76.227 -303.508)" fill="#fff"/>
<path id="Path_5106" data-name="Path 5106" d="M212.027,222.054a10.027,10.027,0,1,1,10.027-10.027A10.038,10.038,0,0,1,212.027,222.054Z" transform="translate(-188.933 -188.933)" fill="#de5c5d"/>
<g id="Group_8431" data-name="Group 8431" transform="translate(19.86 20.183)">
<path id="Path_5107" data-name="Path 5107" d="M312.5,373.941H307.97a.97.97,0,0,1,0-1.941H312.5a.97.97,0,1,1,0,1.941Z" transform="translate(-307 -368.119)" fill="#fff"/>
<path id="Path_5108" data-name="Path 5108" d="M312.5,313.941H307.97a.97.97,0,0,1,0-1.941H312.5a.97.97,0,1,1,0,1.941Z" transform="translate(-307 -312)" fill="#fff"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.3 KiB

@ -0,0 +1,14 @@
<svg xmlns="http://www.w3.org/2000/svg" width="30.758" height="32.546" viewBox="0 0 30.758 32.546">
<g id="swap" transform="translate(-14.063 0.001)">
<g id="Group_8434" data-name="Group 8434" transform="translate(14.063 -0.001)">
<g id="Group_8433" data-name="Group 8433" transform="translate(0 0)">
<path id="Path_5141" data-name="Path 5141" d="M41.166,5.582H20.456l3.337-3.337A1.316,1.316,0,0,0,21.932.384L14.448,7.868a1.316,1.316,0,0,0,0,1.861l7.483,7.483a1.316,1.316,0,0,0,1.861-1.861l-3.337-3.337H41.166a3.216,3.216,0,0,0,0-6.432Z" transform="translate(-14.063 0.001)" fill="#2e303a"/>
</g>
</g>
<g id="Group_8436" data-name="Group 8436" transform="translate(14.502 14.947)">
<g id="Group_8435" data-name="Group 8435">
<path id="Path_5142" data-name="Path 5142" d="M50.9,243.024l-7.483-7.483a1.316,1.316,0,0,0-1.861,1.861l3.337,3.337H24.18a3.216,3.216,0,0,0,0,6.432H44.891l-3.337,3.337a1.316,1.316,0,1,0,1.861,1.861l7.483-7.483A1.316,1.316,0,0,0,50.9,243.024Z" transform="translate(-20.964 -235.155)" fill="#de5c5d"/>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -0,0 +1,17 @@
<svg xmlns="http://www.w3.org/2000/svg" width="17.983" height="35.071" viewBox="0 0 17.983 35.071">
<g id="journalism" transform="translate(-0.5 -0.001)">
<path id="Path_5128" data-name="Path 5128" d="M78.014,335.73v9.408a2.666,2.666,0,0,1-2.666,2.666h-3.2a2.666,2.666,0,0,1-2.666-2.666V335.73Zm0,0" transform="translate(-64.255 -312.732)" fill="#2e303a"/>
<path id="Path_5130" data-name="Path 5130" d="M30.909,16.548a26.612,26.612,0,0,1-9.3,0,3.333,3.333,0,0,1-2.706-2.784,34.666,34.666,0,0,1,0-10.569A3.333,3.333,0,0,1,21.614.41a26.625,26.625,0,0,1,9.3,0,3.333,3.333,0,0,1,2.706,2.784,34.683,34.683,0,0,1,0,10.569A3.333,3.333,0,0,1,30.909,16.548Zm0,0" transform="translate(-16.77)" fill="#2e303a"/>
<path id="Path_5131" data-name="Path 5131" d="M25,17.347a26.784,26.784,0,0,1-3.38-.378,3.333,3.333,0,0,1-2.707-2.784,34.684,34.684,0,0,1,0-10.569A3.334,3.334,0,0,1,21.617.831,26.782,26.782,0,0,1,25,.453,3.519,3.519,0,0,0,22.42,3.328a36.564,36.564,0,0,0,0,11.144A3.519,3.519,0,0,0,25,17.347Zm0,0" transform="translate(-16.772 -0.421)" fill="#20303f"/>
<path id="Path_5132" data-name="Path 5132" d="M18.483,230.207V234.1a2.636,2.636,0,0,1-2.636,2.637H3.136A2.637,2.637,0,0,1,.5,234.1v-3.889a2.637,2.637,0,0,1,2.636-2.637H15.847A2.636,2.636,0,0,1,18.483,230.207Zm0,0" transform="translate(0 -211.981)" fill="#da4a54"/>
<g id="Group_8432" data-name="Group 8432" transform="translate(2.426 17.774)">
<path id="Path_5134" data-name="Path 5134" d="M31.248,259.727c-.26,0-.435.127-.435.317v2.4l-1.175-2.292c-.145-.278-.282-.429-.59-.429-.264,0-.435.127-.435.323v4.1c0,.212.219.323.435.323.256,0,.435-.133.435-.323v-2.413l1.28,2.437h0a.539.539,0,0,0,.484.3c.256,0,.435-.133.435-.323v-4.1C31.683,259.851,31.512,259.727,31.248,259.727Zm0,0" transform="translate(-28.613 -259.708)" fill="#e6e6e6"/>
<path id="Path_5135" data-name="Path 5135" d="M89.381,260.522c.187,0,.323-.17.323-.4a.352.352,0,0,0-.323-.391H87.175a.361.361,0,0,0-.4.323v4.1a.361.361,0,0,0,.4.323h2.206a.352.352,0,0,0,.323-.391c0-.234-.136-.4-.323-.4H87.647v-1.212h.848a.37.37,0,0,0,0-.733h-.848v-1.206Zm0,0" transform="translate(-82.793 -259.708)" fill="#e6e6e6"/>
<path id="Path_5136" data-name="Path 5136" d="M139.343,259.8a.318.318,0,0,0-.333.215l-.271,2.925-.405-1.612a.477.477,0,0,0-.863,0l-.406,1.615-.268-2.907,0-.018a.318.318,0,0,0-.333-.215c-.243,0-.515.153-.515.373a.3.3,0,0,0,.008.082l.413,3.906a.407.407,0,0,0,.24.33,1.1,1.1,0,0,0,.409.083.5.5,0,0,0,.519-.3l.367-1.461.367,1.461a.5.5,0,0,0,.519.3,1.09,1.09,0,0,0,.408-.083.408.408,0,0,0,.241-.33l.413-3.905a.3.3,0,0,0,.008-.082C139.858,259.958,139.586,259.8,139.343,259.8Zm0,0" transform="translate(-128.593 -259.781)" fill="#e6e6e6"/>
<path id="Path_5137" data-name="Path 5137" d="M198.574,261.3c-.448-.181-.722-.307-.722-.612,0-.378.363-.458.668-.458a1.181,1.181,0,0,1,.611.154.538.538,0,0,0,.245.081c.247,0,.379-.267.379-.459,0-.436-.776-.553-1.234-.553-.743,0-1.538.34-1.538,1.3,0,.871.63,1.137,1.186,1.371.444.187.828.349.828.785,0,.5-.472.55-.674.55a1,1,0,0,1-.745-.315.488.488,0,0,0-.314-.174.461.461,0,0,0-.391.459c0,.4.631.838,1.476.838a1.368,1.368,0,0,0,1.519-1.426C199.866,261.825,199.15,261.536,198.574,261.3Zm0,0" transform="translate(-185.346 -259.457)" fill="#e6e6e6"/>
</g>
<path id="Path_5138" data-name="Path 5138" d="M189.03,29.156a.532.532,0,1,1,.522-.428A.536.536,0,0,1,189.03,29.156Zm0,0" transform="translate(-175.121 -26.17)" fill="#20303f"/>
<path id="Path_5139" data-name="Path 5139" d="M205.285,50.391a.532.532,0,1,1,.523-.434A.537.537,0,0,1,205.285,50.391Zm0,0" transform="translate(-190.267 -45.948)" fill="#20303f"/>
<path id="Path_5140" data-name="Path 5140" d="M178.957,54.437a.532.532,0,1,1,.521-.428A.536.536,0,0,1,178.957,54.437Zm0,0" transform="translate(-165.742 -49.717)" fill="#20303f"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.7 KiB

@ -0,0 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" width="29.98" height="26.475" viewBox="0 0 29.98 26.475">
<g id="Group_8437" data-name="Group 8437" transform="translate(-1 -1)">
<path id="Path_5143" data-name="Path 5143" d="M30.98,2.2V14.562a3.007,3.007,0,0,0-1.363-.325H14.955l-1.976-3.49a2.785,2.785,0,0,0-2.439-1.324H9.176V2.2A1.291,1.291,0,0,1,10.539,1H29.618A1.291,1.291,0,0,1,30.98,2.2Zm-6.814,3.61H21.441V3.407H18.716V5.814H15.99V8.22h2.725v2.407h2.725V8.22h2.725Z" fill="#de5c5d"/>
<path id="Path_5144" data-name="Path 5144" d="M30.98,16.644v7.22a3.872,3.872,0,0,1-4.088,3.61H5.088A3.872,3.872,0,0,1,1,23.864V11.831a1.291,1.291,0,0,1,1.363-1.2V8.22A3.872,3.872,0,0,1,6.451,4.61H7.814V7.017H6.451a1.291,1.291,0,0,0-1.363,1.2v2.407h5.451a1.393,1.393,0,0,1,1.226.662l.136.241,2.208,3.911H29.618A1.291,1.291,0,0,1,30.98,16.644Z" fill="#2e303a"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 866 B

@ -0,0 +1,47 @@
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32.001" viewBox="0 0 32 32.001">
<g id="family" transform="translate(-0.004 0)">
<path id="Path_5017" data-name="Path 5017" d="M270.514,15.439h-2.821a.779.779,0,0,1-.776-.776l-.388-6.579s-.628-5.45,2.63-6.166c0,0,1.325-2.578,5.568-1.752a1.646,1.646,0,0,1,.17.05,6.451,6.451,0,0,1,2.642,1.591,6.823,6.823,0,0,1,1.9,5.354c0,1.887.03-.21-.388,7.5a.779.779,0,0,1-.776.776h-3" transform="translate(-249.821 -0.002)" fill="#2e303a"/>
<path id="Path_5018" data-name="Path 5018" d="M271,15.523V14.6a4.883,4.883,0,0,1-2.923-4.228c0-.012,0-.05,0-.057,0-.064,0-.128,0-.193,0-2.9,0-2.729,0-2.776-.029-1.55.211-4.8,2.677-5.345a4.1,4.1,0,0,1,3.2-1.87c-1.819-.2-3.953.341-4.795,1.87-2.2.483-2.728,3.161-2.676,5.4q0,.047,0,.091c.013.415.043.676.043.676l.388,6.579a.779.779,0,0,0,.776.776Z" transform="translate(-249.818 -0.086)" fill="#2e303a"/>
<path id="Path_5019" data-name="Path 5019" d="M14.271,244.618l.835-7.458c.293-2.252.173-3.117.9-4a3.34,3.34,0,0,0-.756-.656l-.023-.006a11.465,11.465,0,0,0-2.908-.892h0l-1.493-.715h0v-1.784a4.9,4.9,0,0,1-3.894.01h0L6.924,230.9h0l-1.487.707h0a11.469,11.469,0,0,0-2.908.892l-.023.006a2.084,2.084,0,0,0-.205.144,3.212,3.212,0,0,0-1.24,2.632l-.447,3.993h0c-.629,5.715-.61,5.255-.61,5.7a1.727,1.727,0,0,0,1.787,1.82h0c.125,0,14.106,0,14.213,0A1.777,1.777,0,0,1,14.271,244.618Z" transform="translate(-0.001 -214.788)" fill="#dd9a5e"/>
<path id="Path_5022" data-name="Path 5022" d="M245.8,247.531c-1.137-10.068-1.073-9.784-1.175-10.276a2.793,2.793,0,0,0-1.315-1.837l-.023-.006a3.971,3.971,0,0,0-.942-.4l-3.278-.816a.422.422,0,0,1-.18-.388v-1.581a4.893,4.893,0,0,1-3.894-.008V233.8a.422.422,0,0,1-.18.388c-2.773.739-3.39.722-4.22,1.219l-.023.006a2.859,2.859,0,0,0-1.394,2.322l-1.1,9.792a1.776,1.776,0,0,0,1.775,2.171h14.172a1.727,1.727,0,0,0,1.787-1.82v0A3.432,3.432,0,0,0,245.8,247.531Z" transform="translate(-213.813 -217.701)" fill="#eab883"/>
<path id="Path_5023" data-name="Path 5023" d="M229.68,287.478v0a3.4,3.4,0,0,1,.012-.349l1.1-10.371a2.872,2.872,0,0,1,1.367-2.3,5.249,5.249,0,0,0-1.559.556l-.023.006a2.859,2.859,0,0,0-1.394,2.322l-1.1,9.792a1.776,1.776,0,0,0,1.775,2.171h1.61A1.727,1.727,0,0,1,229.68,287.478Z" transform="translate(-213.813 -257.297)" fill="#d8a373"/>
<path id="Path_5024" data-name="Path 5024" d="M254.353,242.184c-.517-4.587-.494-4.534-.576-4.931a2.8,2.8,0,0,0-1.315-1.837l-.023-.006a3.97,3.97,0,0,0-.942-.4l-3.278-.816a.422.422,0,0,1-.18-.388v-1.581h0v-.008a4.852,4.852,0,0,1-3.894,0v.008h0V233.8a.422.422,0,0,1-.18.388c-2.773.739-3.39.721-4.22,1.219l-.023.006a2.873,2.873,0,0,0-1.394,2.322l-.5,4.446,3.136.329a.316.316,0,0,1,.282.33L240.9,249.7h10.4l-.361-6.831a.343.343,0,0,1,.307-.359Z" transform="translate(-222.96 -217.7)" fill="#de5c5d"/>
<path id="Path_5025" data-name="Path 5025" d="M237.827,281.78l1.559.164.548-5.189a2.871,2.871,0,0,1,1.367-2.3,5.32,5.32,0,0,0-1.559.557l-.023.006a2.793,2.793,0,0,0-1.315,1.837C238.3,277.338,238.322,277.444,237.827,281.78Z" transform="translate(-222.959 -257.296)" fill="#a82626"/>
<path id="Path_5026" data-name="Path 5026" d="M24.39,259.258l-.023-.006a11.414,11.414,0,0,0-2.9-.89v0l-1.493-.715-.011.016v-.006l-1.947,1.833-1.942-1.837-1.487.707h0a11.47,11.47,0,0,0-2.908.892l-.023.006a2.86,2.86,0,0,0-1.394,2.322l-.5,4.447,3.076.323a.367.367,0,0,1,.328.384l-.342,6.809h10.4l-.361-6.831a.344.344,0,0,1,.307-.36l.822-.086c.6-5,.427-5.451,1.157-6.344A4.427,4.427,0,0,0,24.39,259.258Z" transform="translate(-9.154 -241.541)" fill="#2e303a"/>
<path id="Path_5028" data-name="Path 5028" d="M321.57,231.621l-1.313-.327a.422.422,0,0,1-.18-.388v-1.774h0v-.008a4.854,4.854,0,0,1-3.894,0v.008h0v1.774a.422.422,0,0,1-.18.388l-1.333.332A3.954,3.954,0,0,0,321.57,231.621Z" transform="translate(-294.999 -214.803)" fill="#eab883"/>
<path id="SVGCleanerId_0" d="M44.139,7.782V6.1A6.114,6.114,0,0,1,53.731,1.1c3.143,2.194,2.544,5.422,2.614,6.686" transform="translate(-41.377 0)" fill="#4c4846"/>
<g id="Group_8382" data-name="Group 8382" transform="translate(2.762 0)">
<path id="SVGCleanerId_0_1_" d="M44.139,7.782V6.1A6.114,6.114,0,0,1,53.731,1.1c3.143,2.194,2.544,5.422,2.614,6.686" transform="translate(-44.139 0)" fill="#2e303a"/>
</g>
<path id="Path_5029" data-name="Path 5029" d="M50.85.035a6.108,6.108,0,0,0-6.711,6.072V7.786h1.217V6.108A6.1,6.1,0,0,1,50.85.035Z" transform="translate(-41.377 -0.004)" fill="#3f3b39"/>
<g id="Group_8383" data-name="Group 8383" transform="translate(2.458 7.054)">
<path id="Path_5030" data-name="Path 5030" d="M221.477,114.131a1.414,1.414,0,0,1-1.521,1.273v-2.547A1.414,1.414,0,0,1,221.477,114.131Z" transform="translate(-208.663 -112.858)" fill="#dd9a5e"/>
<path id="Path_5031" data-name="Path 5031" d="M39.279,114.131A1.414,1.414,0,0,0,40.8,115.4v-2.547A1.414,1.414,0,0,0,39.279,114.131Z" transform="translate(-39.279 -112.858)" fill="#dd9a5e"/>
</g>
<g id="Group_8384" data-name="Group 8384" transform="translate(2.457 7.755)">
<path id="Path_5032" data-name="Path 5032" d="M219.956,124.776v1.145a1.414,1.414,0,0,0,1.521-1.273,1.1,1.1,0,0,0-.162-.572A1.573,1.573,0,0,1,219.956,124.776Z" transform="translate(-208.662 -124.075)" fill="#d38d54"/>
<path id="Path_5033" data-name="Path 5033" d="M39.426,124.075c-.5.838.219,1.846,1.358,1.846v-1.145A1.573,1.573,0,0,1,39.426,124.075Z" transform="translate(-39.263 -124.075)" fill="#d38d54"/>
</g>
<path id="Path_5034" data-name="Path 5034" d="M72.2,74a.7.7,0,0,0-.807-.7l-.255.038a18.857,18.857,0,0,1-5.651-.038.7.7,0,0,0-.807.7,1.989,1.989,0,0,1-.787,1.6,1.47,1.47,0,0,1-.339.191c0,3.163-.038,3.374.132,4.091a4.888,4.888,0,0,0,9.3.668c.467-1.18.341-2.076.341-4.758A1.908,1.908,0,0,1,72.2,74Z" transform="translate(-59.577 -68.714)" fill="#edae6b"/>
<path id="Path_5036" data-name="Path 5036" d="M135.023,283.8V279.84l-.483.455-.483-.457V283.8a.483.483,0,1,0,.966,0Z" transform="translate(-125.675 -262.347)" fill="#575a69"/>
<path id="Path_5037" data-name="Path 5037" d="M143.742,257.645l-1.958,1.844,1.057,1.065a.476.476,0,0,0,.713-.042l1.681-2.152Z" transform="translate(-132.919 -241.541)" fill="#dadada"/>
<g id="Group_8385" data-name="Group 8385" transform="translate(8.865 16.104)">
<path id="Path_5039" data-name="Path 5039" d="M161,305.775a.477.477,0,0,0,.279.034Z" transform="translate(-159.799 -302.767)" fill="#ceccca"/>
</g>
<path id="Path_5040" data-name="Path 5040" d="M88.07,257.763l1.942,1.837-1.057,1.065a.476.476,0,0,1-.713-.042L86.56,258.47Z" transform="translate(-81.147 -241.652)" fill="#dadada"/>
<path id="Path_5043" data-name="Path 5043" d="M301.281,89.531a.515.515,0,0,1,.492.514v.369h0a6.576,6.576,0,0,1-.207,2.128,4.887,4.887,0,0,1-9.558-1.164c0-.018,0,.005,0-.057s0-.128,0-.193V88.651h0V88.4a.607.607,0,0,1,.484-.593,3.911,3.911,0,0,0,2.037-1.171.445.445,0,0,1,.668.022A8.249,8.249,0,0,0,301.281,89.531Z" transform="translate(-273.747 -81.092)" fill="#f7cf9c"/>
<path id="Path_5049" data-name="Path 5049" d="M195.393,253.09a4.263,4.263,0,0,0-6.963.407,5.5,5.5,0,0,0-.635,3.183h8.519A5.031,5.031,0,0,0,195.393,253.09Z" transform="translate(-176.051 -235.759)" fill="#2e303a"/>
<path id="Path_5050" data-name="Path 5050" d="M188.95,254.745c.019-.081.064-.24.066-.247a4.261,4.261,0,0,1,3.558-2.994,4.259,4.259,0,0,0-4.145,1.988,5.5,5.5,0,0,0-.635,3.183h1.041A7.649,7.649,0,0,1,188.95,254.745Z" transform="translate(-176.051 -235.754)" fill="#2e303a"/>
<path id="Path_5051" data-name="Path 5051" d="M313.3,357.808a5.812,5.812,0,0,0-1.229-2.264,1.553,1.553,0,0,1-.846.414,3.289,3.289,0,0,1,.452,2.309.367.367,0,0,0,.44.382l.789-.164A.527.527,0,0,0,313.3,357.808Z" transform="translate(-291.767 -333.322)" fill="#2e303a"/>
<path id="Path_5052" data-name="Path 5052" d="M309.291,325.275a1.37,1.37,0,0,1-1.474,1.235v-2.469A1.37,1.37,0,0,1,309.291,325.275Z" transform="translate(-288.575 -303.788)" fill="#efd0a3"/>
<path id="Path_5053" data-name="Path 5053" d="M167.178,357.808a5.812,5.812,0,0,1,1.229-2.264,1.553,1.553,0,0,0,.846.414,3.289,3.289,0,0,0-.452,2.309.367.367,0,0,1-.44.382l-.789-.164A.528.528,0,0,1,167.178,357.808Z" transform="translate(-156.702 -333.322)" fill="#2e303a"/>
<path id="Path_5054" data-name="Path 5054" d="M180.589,325.275a1.37,1.37,0,0,0,1.474,1.235v-2.469A1.37,1.37,0,0,0,180.589,325.275Z" transform="translate(-169.299 -303.788)" fill="#efd0a3"/>
<path id="Path_5057" data-name="Path 5057" d="M179.139,409.154l-.336-3a1.907,1.907,0,0,0-.924-1.539l-.015,0a12.4,12.4,0,0,0-2.8-.808c-.2-.093-.086-.49-.119-1.5a3.241,3.241,0,0,1-2.581-.006c-.033.985.086,1.411-.12,1.5a12.4,12.4,0,0,0-2.8.808l-.015,0a1.851,1.851,0,0,0-.872,1.218c-.066.317-.048.342-.388,3.323Z" transform="translate(-157.659 -377.152)" fill="#efd0a3"/>
<path id="Path_5058" data-name="Path 5058" d="M168.171,432.966h10.966l-.336-3a1.909,1.909,0,0,0-.924-1.539l-.015,0a10.422,10.422,0,0,0-2.45-.721v.388a1.748,1.748,0,0,1-.181.777c-.019.039-.05.1-.08.144l-.022.035c-.031.047-.064.092-.1.133-.015.019-.036.044-.052.062l-.008.009-.031.035,0,0h0l0,.005-.038.038-.012.013-.05.047-.015.013-.033.028-.005,0-.02.016-.035.027-.022.017-.034.025-.017.012-.006,0-.036.024-.006,0-.017.011-.031.019-.01.006,0,0-.014.008-.061.033-.008,0h0l-.01.005-.041.02-.023.01-.042.018-.026.01-.04.016-.027.01-.042.014-.021.007-.005,0-.012,0-.034.01-.017,0-.006,0-.07.017-.01,0-.031.007-.084.014a1.712,1.712,0,0,1-.172.016h-.166c-.058,0-.115-.008-.172-.016l-.084-.014-.031-.007-.01,0-.07-.017-.006,0-.017,0-.034-.01-.012,0-.005,0-.021-.007-.042-.014-.027-.01-.04-.016-.026-.01-.042-.018-.023-.01-.041-.02-.01-.005h0l-.008,0-.061-.033-.014-.008,0,0-.01-.006-.031-.019-.017-.011-.006,0a1.754,1.754,0,0,1-.728-.965,2.951,2.951,0,0,1-.074-.9l-.372.093a8.433,8.433,0,0,0-2.09.632l-.015,0a1.857,1.857,0,0,0-.872,1.218C168.494,429.959,168.507,430.021,168.171,432.966Z" transform="translate(-157.657 -400.965)" fill="#f9b938"/>
<g id="Group_8389" data-name="Group 8389" transform="translate(10.514 26.988)">
<path id="Path_5060" data-name="Path 5060" d="M198.743,483.558l.045-1.4a.483.483,0,0,0-.965-.031l-.046,1.429Z" transform="translate(-195.927 -478.545)" fill="#eaa224"/>
<path id="Path_5061" data-name="Path 5061" d="M299.044,483.559,299,482.13a.483.483,0,0,0-.965.031l.045,1.4Z" transform="translate(-289.916 -478.546)" fill="#eaa224"/>
</g>
<path id="Path_5063" data-name="Path 5063" d="M207.066,304.947a2.618,2.618,0,0,1-2.818.912.166.166,0,0,0-.2.163h0a10.954,10.954,0,0,0,.138,3.053,3.239,3.239,0,0,0,6.34-.937v-2.116h0a.166.166,0,0,0-.2-.163,2.618,2.618,0,0,1-2.818-.912A.26.26,0,0,0,207.066,304.947Z" transform="translate(-191.285 -285.768)" fill="#fce3bb"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 10 KiB

@ -0,0 +1,9 @@
<svg id="parking" xmlns="http://www.w3.org/2000/svg" width="34.324" height="36.274" viewBox="0 0 34.324 36.274">
<path id="Path_5117" data-name="Path 5117" d="M4.851,482H0v2.011H6.239A6.688,6.688,0,0,1,4.851,482Z" transform="translate(0 -449.687)" fill="#2e303a"/>
<path id="Path_5118" data-name="Path 5118" d="M9.924,198.773H0v5.72H13.761Z" transform="translate(0 -185.447)" fill="#2e303a"/>
<path id="Path_5119" data-name="Path 5119" d="M4.278,322.588a6.659,6.659,0,0,1,13.318,0H21.88v-3.9H18.57v-2.011h3.31a2.572,2.572,0,0,0-2.572-2.572H0v8.485Z" transform="translate(0 -293.046)" fill="#2e303a"/>
<circle id="Ellipse_185" data-name="Ellipse 185" cx="4.716" cy="4.716" r="4.716" transform="translate(4.264 29.607) rotate(-45)" fill="#2e303a"/>
<path id="Path_5120" data-name="Path 5120" d="M243.252,260.611v14.842h-8.647a6.689,6.689,0,0,1-1.387,2.011h18.689v-2.011h-6.644V260.611Z" transform="translate(-217.583 -243.14)" fill="#2e303a"/>
<path id="Path_5121" data-name="Path 5121" d="M295.916,15.527V0H280.389V15.527ZM284.805,3.363h4.622a2.962,2.962,0,0,1,0,5.925h-2.611v3.384h-2.011Z" transform="translate(-261.592)" fill="#359846"/>
<path id="Path_5122" data-name="Path 5122" d="M379.827,81.113a.952.952,0,0,0-.951-.951h-2.611v1.9h2.611A.952.952,0,0,0,379.827,81.113Z" transform="translate(-351.04 -74.788)" fill="#359846"/>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

@ -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>

After

Width:  |  Height:  |  Size: 1.0 KiB

@ -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>

After

Width:  |  Height:  |  Size: 1.5 KiB

@ -0,0 +1,12 @@
<svg xmlns="http://www.w3.org/2000/svg" width="21.857" height="30.6" viewBox="0 0 21.857 30.6">
<g id="smart-watch" transform="translate(5.168)">
<path id="Path_5109" data-name="Path 5109" d="M43.411,111.639A1.639,1.639,0,0,0,41.772,110h-15.3a1.639,1.639,0,0,0-1.639,1.639v15.3a1.639,1.639,0,0,0,1.639,1.639h15.3a1.639,1.639,0,0,0,1.639-1.639Zm-3.493,8.091-5.41,5.41a.547.547,0,0,1-.773,0l-5.409-5.41a3.825,3.825,0,1,1,5.413-5.406l.383.382.383-.382a3.825,3.825,0,1,1,5.413,5.406Zm0,0" transform="translate(-28.361 -103.989)" fill="#2e303a"/>
<path id="Path_5110" data-name="Path 5110" d="M97.214,188.6a2.7,2.7,0,0,0-1.934.8l-.772.772a.546.546,0,0,1-.773,0l-.771-.77a2.732,2.732,0,0,0-3.865,3.863l5.022,5.022,5.023-5.023a2.732,2.732,0,0,0,0-3.861A2.7,2.7,0,0,0,97.214,188.6Zm0,0" transform="translate(-88.36 -178.291)" fill="#de5c5d"/>
<path id="Path_5111" data-name="Path 5111" d="M385.378,321.639v-1.093a.546.546,0,0,0-.546-.546v2.186A.546.546,0,0,0,385.378,321.639Zm0,0" transform="translate(-368.689 -302.514)" fill="#2e303a"/>
<path id="Path_5112" data-name="Path 5112" d="M385.378,200.546a.546.546,0,0,0-.546-.546v2.186a.546.546,0,0,0,.546-.546Zm0,0" transform="translate(-368.689 -189.071)" fill="#2e303a"/>
<path id="Path_5113" data-name="Path 5113" d="M84.832,470H96.854v4.918H84.832Zm0,0" transform="translate(-85.082 -444.318)" fill="#2e303a"/>
<path id="Path_5114" data-name="Path 5114" d="M-5.168,321.639a.547.547,0,0,0,.546.546V320a.547.547,0,0,0-.546.546Zm0,0" transform="translate(0 -302.514)" fill="#2e303a"/>
<path id="Path_5115" data-name="Path 5115" d="M-5.168,200.546v1.093a.547.547,0,0,0,.546.546V200A.547.547,0,0,0-5.168,200.546Zm0,0" transform="translate(0 -189.071)" fill="#2e303a"/>
<path id="Path_5116" data-name="Path 5116" d="M84.832,0H96.854V4.918H84.832Zm0,0" transform="translate(-85.082)" fill="#2e303a"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

@ -0,0 +1,19 @@
<svg xmlns="http://www.w3.org/2000/svg" width="28.115" height="28.971" viewBox="0 0 28.115 28.971">
<g id="to-do-list" transform="translate(-3.965 -3.05)">
<g id="Group_8425" data-name="Group 8425" transform="translate(4.045 3.116)">
<path id="Path_5088" data-name="Path 5088" d="M10.435,3.192V8.153A1.182,1.182,0,0,1,9.251,9.333H4.135a3.716,3.716,0,0,1,1.044-1.9L8.525,4.179a3.689,3.689,0,0,1,1.91-.988Z" transform="translate(-4.135 -3.192)" fill="#2e303a"/>
</g>
<g id="Group_8426" data-name="Group 8426" transform="translate(3.965 3.05)">
<path id="Path_5089" data-name="Path 5089" d="M21.957,21.079l5-7.638V6.766A3.713,3.713,0,0,0,23.244,3.05H11.281V8.077a2.12,2.12,0,0,1-2.12,2.116h-5.2V28.305a3.713,3.713,0,0,0,3.716,3.716H23.244a3.713,3.713,0,0,0,3.716-3.716V24.954a4.105,4.105,0,0,1-1.278,1.02l-2.761,1.413A1.261,1.261,0,0,1,21.1,26.194l.192-3.1a4.155,4.155,0,0,1,.669-2.017Zm2.738-6.145a.469.469,0,0,1-.468.468H15.816a.468.468,0,1,1,0-.936h8.411A.466.466,0,0,1,24.695,14.933ZM12.788,27.1a.867.867,0,0,1-.866.866H8.056a.866.866,0,0,1-.861-.866V23.232a.865.865,0,0,1,.861-.861h3.866a.866.866,0,0,1,.866.861Zm0-9.028a.863.863,0,0,1-.866.861H8.056a.862.862,0,0,1-.861-.861V14.2a.862.862,0,0,1,.861-.861h3.866a.863.863,0,0,1,.866.861ZM13.944,8.54V6.71a.481.481,0,0,1,.482-.482h9.019a.481.481,0,0,1,.482.482V8.54a.481.481,0,0,1-.482.482H14.426a.481.481,0,0,1-.482-.482Zm4.61,18.3H15.816a.468.468,0,1,1,0-.936h2.738a.468.468,0,1,1,0,.936Zm.964-2.41h-3.7a.468.468,0,1,1,0-.936h3.7a.468.468,0,0,1,0,.936Zm-3.7-6.623a.468.468,0,0,1,0-.936h6.216a.468.468,0,1,1,0,.936Z" transform="translate(-3.965 -3.05)" fill="#2e303a"/>
</g>
<g id="Group_8427" data-name="Group 8427" transform="translate(8.575 15.194)">
<path id="Path_5090" data-name="Path 5090" d="M14.383,30.685l-.481-.671a.468.468,0,0,1,.761-.546l.2.286.9-.667a.468.468,0,0,1,.556.753l-1.286.948a.468.468,0,0,1-.658-.1Z" transform="translate(-13.814 -28.996)" fill="#de5c5d"/>
</g>
<g id="Group_8428" data-name="Group 8428" transform="translate(8.639 24.224)">
<path id="Path_5091" data-name="Path 5091" d="M14.52,49.979l-.481-.671a.468.468,0,0,1,.761-.546l.2.285.9-.667a.468.468,0,1,1,.556.753l-1.286.948A.468.468,0,0,1,14.52,49.979Z" transform="translate(-13.951 -48.29)" fill="#de5c5d"/>
</g>
<path id="Path_5092" data-name="Path 5092" d="M52.036,32.2l-3.721,5.682-3.74-2.448,3.73-5.7C48.435,29.815,51.927,32.087,52.036,32.2Z" transform="translate(-21.603 -14.193)" fill="#de5c5d"/>
<path id="Path_5093" data-name="Path 5093" d="M43.033,43.633a3.182,3.182,0,0,0-.277,1.108l-.19,3.1a.318.318,0,0,0,.463.3l2.762-1.412a3.184,3.184,0,0,0,.9-.7Z" transform="translate(-20.534 -21.588)" fill="#de5c5d"/>
<path id="Path_5094" data-name="Path 5094" d="M58.154,26.9,57.4,28.063l-.009-.009-3.73-2.443.749-1.161a2.236,2.236,0,0,1,3.094-.646h0a2.237,2.237,0,0,1,.641,3.094Z" transform="translate(-26.439 -10.85)" fill="#de5c5d"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.9 KiB

@ -0,0 +1,21 @@
<svg xmlns="http://www.w3.org/2000/svg" width="37.001" height="26" viewBox="0 0 37.001 26">
<g id="_002---Donor-Card" data-name="002---Donor-Card" transform="translate(0.001)">
<rect id="Rectangle-path" width="37" height="26" rx="5" fill="#2e303a"/>
<path id="Rectangle-path-2" data-name="Rectangle-path" d="M0,26H37v5.537H0Z" transform="translate(-0.001 -10.597)" fill="#ecf0f1"/>
<g id="Group_8371" data-name="Group 8371" transform="translate(2.524 18.296)">
<path id="Shape" d="M4.631,31.524A.631.631,0,0,1,4,30.893V29.631a.631.631,0,1,1,1.262,0v1.262A.631.631,0,0,1,4.631,31.524Z" transform="translate(-4 -30)" fill="#3f5c6c"/>
<path id="Shape-2" data-name="Shape" d="M8.631,31.524A.631.631,0,0,1,8,30.893V29.631a.631.631,0,1,1,1.262,0v1.262A.631.631,0,0,1,8.631,31.524Z" transform="translate(-5.476 -30)" fill="#3f5c6c"/>
<path id="Shape-3" data-name="Shape" d="M12.631,31.524A.631.631,0,0,1,12,30.893V29.631a.631.631,0,1,1,1.262,0v1.262A.631.631,0,0,1,12.631,31.524Z" transform="translate(-6.953 -30)" fill="#3f5c6c"/>
<path id="Shape-4" data-name="Shape" d="M16.631,31.524A.631.631,0,0,1,16,30.893V29.631a.631.631,0,0,1,1.262,0v1.262A.631.631,0,0,1,16.631,31.524Z" transform="translate(-8.429 -30)" fill="#3f5c6c"/>
<path id="Shape-5" data-name="Shape" d="M20.631,31.524A.631.631,0,0,1,20,30.893V29.631a.631.631,0,0,1,1.262,0v1.262A.631.631,0,0,1,20.631,31.524Z" transform="translate(-9.906 -30)" fill="#3f5c6c"/>
<circle id="Oval" cx="1" cy="1" r="1" transform="translate(22.477 -0.295)" fill="#3f5c6c"/>
<circle id="Oval-2" data-name="Oval" cx="1" cy="1" r="1" transform="translate(25.477 -0.295)" fill="#3f5c6c"/>
<circle id="Oval-3" data-name="Oval" cx="1" cy="1" r="1" transform="translate(28.477 -0.295)" fill="#3f5c6c"/>
</g>
<rect id="Rectangle-path-3" data-name="Rectangle-path" width="9" height="10" rx="2" transform="translate(3 3)" fill="#ecf0f1"/>
<circle id="Oval-4" data-name="Oval" cx="1.5" cy="1.5" r="1.5" transform="translate(6 6)" fill="#d9ba64"/>
<path id="Shape-6" data-name="Shape" d="M14.047,18.785H9V17.524a2.524,2.524,0,1,1,5.047,0Z" transform="translate(-4 -5.785)" fill="#de5c5d"/>
<line id="Line_50" data-name="Line 50" y2="9" transform="translate(28.5 3.5)" fill="none" stroke="#de5c5d" stroke-width="2"/>
<line id="Line_51" data-name="Line 51" y2="9" transform="translate(33 8) rotate(90)" fill="none" stroke="#de5c5d" stroke-width="2"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.4 KiB

@ -0,0 +1,9 @@
<svg xmlns="http://www.w3.org/2000/svg" width="29.063" height="29.063" viewBox="0 0 29.063 29.063">
<g id="_360-degrees" data-name="360-degrees" transform="translate(0)">
<path id="Path_5123" data-name="Path 5123" d="M95.134,96.812a.854.854,0,0,1-.843-.732.866.866,0,0,1-.008-.12.851.851,0,0,0-1.7,0,2.554,2.554,0,0,0,5.109,0,2.544,2.544,0,0,0-.652-1.7,2.554,2.554,0,1,0-4.408-2.2.851.851,0,0,0,1.671.328.852.852,0,1,1,.835,1.017.851.851,0,0,0,0,1.7.851.851,0,0,1,0,1.7Z" transform="translate(-87.325 -84.891)" fill="#de5c5d"/>
<path id="Path_5124" data-name="Path 5124" d="M205.425,98.513a2.843,2.843,0,0,0,0-5.685c-.052,0-.1,0-.154,0a5.727,5.727,0,0,1,1.145-1.3.851.851,0,0,0-1.019-1.364,7.8,7.8,0,0,0-2.781,5.067,2.843,2.843,0,0,0,2.809,3.279Zm0-3.982a1.14,1.14,0,1,1-1.14,1.14,1.141,1.141,0,0,1,1.14-1.14Z" transform="translate(-191.083 -84.89)" fill="#de5c5d"/>
<path id="Path_5125" data-name="Path 5125" d="M325.484,98.514a2.747,2.747,0,0,0,2.744-2.744V92.744a2.744,2.744,0,1,0-5.488,0V95.77A2.747,2.747,0,0,0,325.484,98.514Zm-1.041-5.77a1.041,1.041,0,1,1,2.082,0V95.77a1.041,1.041,0,1,1-2.082,0Z" transform="translate(-304.42 -84.891)" fill="#de5c5d"/>
<path id="Path_5126" data-name="Path 5126" d="M393.554,5.109A2.554,2.554,0,1,0,391,2.554,2.557,2.557,0,0,0,393.554,5.109Zm0-3.406a.851.851,0,1,1-.851.851A.852.852,0,0,1,393.554,1.7Z" transform="translate(-368.806)" fill="#de5c5d"/>
<path id="Path_5127" data-name="Path 5127" d="M27.895,242.031c-7.369,2.95-19.358,2.95-26.727,0a.851.851,0,0,0-1.168.79v13.623a.851.851,0,0,0,1.168.79c7.369-2.95,19.358-2.95,26.727,0a.851.851,0,0,0,1.168-.79V242.822A.851.851,0,0,0,27.895,242.031Zm-21.332,8.7a.851.851,0,1,1-1.2,1.2l-1.7-1.7a.851.851,0,0,1,0-1.2l1.7-1.7a.851.851,0,1,1,1.2,1.2l-1.1,1.1Zm18.845-.5-1.7,1.7a.851.851,0,1,1-1.2-1.2l1.1-1.1-1.1-1.1a.851.851,0,0,1,1.2-1.2l1.7,1.7A.851.851,0,0,1,25.407,250.236Z" transform="translate(0 -228.235)" fill="#2e303a"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.9 KiB

@ -107,10 +107,8 @@ const Map localizedValues = {
'location': {'en': 'Locations', 'ar': 'مواقعنا'},
'online': {'en': 'Online', 'ar': 'الالكتروني'},
'payment': {'en': 'Payment', 'ar': 'الدفع'},
'onlinePayment': {'en': 'Online', 'ar': 'الدفع'},
'onlinePaymentSubtitle': {'en': 'Payment', 'ar': 'الالكتروني'},
'cancel-nocaps': {'en': 'Cancel', 'ar': 'الغاء'},
'set-reminder': {'en': 'Set Reminder', 'ar': 'إضافة تذكير'},
"national-id-number": {"en": "National ID Number", "ar": "رقم الهوية الوطنية / الاقامة"},
@ -313,7 +311,8 @@ const Map localizedValues = {
"branch": {"en": "Branch:", "ar": "الفرع"},
"emergencyServices": {"en": "Emergency Services", "ar": "خدمات الطوارئ"},
"nearester": {"en": "Nearest ER", "ar": "أقرب طوارى"},
"locationa": {"en": "location", "ar": "الموقع"},
"locationa": {"en": "Location", "ar": "الموقع"},
"call_now": {"en": "Call now", "ar": "اتصل الان"},
"ambulancerequest": {"en": "Ambulance", "ar": "طلب نقل "},
"requestA": {"en": "Request", "ar": "اسعاف"},
"NoBookedAppointments": {"en": "No Booked Appointments", "ar": "لا توجد مواعيد محجوزة"},
@ -410,6 +409,8 @@ const Map localizedValues = {
"SelectFamilyPatientName": {"en": "Family Members", "ar": "أفراد الأسرة"},
"SelectHospital": {"en": "Select Hospital", "ar": "اختر المستشفى"},
"selectCity": {"en": "Select City", "ar": "اختر المدينة"},
"city": {"en": "City", "ar": "مدينة"},
"distance": {"en": "Distance", "ar": "مسافه"},
"MyAccount": {"en": "My Account", "ar": "حسابي"},
"OtherAccount": {"en": "Other Account", "ar": "حساب آخر"},
"SelectBeneficiary": {"en": "Select Beneficiary", "ar": "حدد المستفيد"},
@ -420,6 +421,7 @@ const Map localizedValues = {
"country": {"en": "Country", "ar": "دولة"},
"Ok": {"en": "Ok", "ar": "موافق"},
"averageWaitingTime": {"en": "Average Waiting Time:", "ar": "متوسط ​​وقت الانتظار:"},
"waitingTime": {"en": "Waiting Time:", "ar": "وقت الانتظار:"},
"WaterConsumedInWeek": {"en": "Water consumed in a week", "ar": "معدل شرب الماء خلال الاسبوع"},
"WaterConsumedInMonth": {"en": "Water consumed in a month", "ar": "معدل شرب الماء خلال الشهر"},
"TheVerificationCodeExpiresIn": {"en": "The Verification Code Expires in", "ar": "تنتهي صلاحية رمز التحقق في"},
@ -1516,11 +1518,11 @@ const Map localizedValues = {
"modesBelow": {"en": "Please select the modes below:", "ar": ":الرجاء تحديد الأوضاع أدناه"},
"prefferedMode": {"en": "Please select the preferred mode below:", "ar": ":الرجاء تحديد الوضع المفضل أدناه"},
"permissionsBellow": {"en": "Please allow the permissions below:", "ar": ":الرجاء السماح الأذونات أدناه"},
"appointmentReminder": { "en": "Would you like to set a reminder for this appointment in your calendar?", "ar": "هل ترغب في اضافة تذكير لهذا الموعد في التقويم؟" },
"cancelAppointment": { "en": "Cancel Appt.", "ar": "الغاء الموعد" },
"appointmentReminder": {"en": "Would you like to set a reminder for this appointment in your calendar?", "ar": "هل ترغب في اضافة تذكير لهذا الموعد في التقويم؟"},
"cancelAppointment": {"en": "Cancel Appt.", "ar": "الغاء الموعد"},
"updateInsurCards": {"en": "Update Insurance Cards", "ar": "تحديث بطاقات التأمين"},
"patientAge": {"en": "y", "ar": "سنة"},
"searchCriteria": { "en": "Select Search Criteria", "ar": "حدد معايير البحث" },
"searchCriteria": {"en": "Select Search Criteria", "ar": "حدد معايير البحث"},
"RequesterInfo": {"en": "Requester Info", "ar": "معلومات مقدم الطلب"},
"PatientInfo": {"en": "Patient Info", "ar": "معلومات المريض"},
"OtherInfo": {"en": "Other Info", "ar": "معلومات اخرى"},
@ -1533,4 +1535,24 @@ const Map localizedValues = {
"ereferralTitle": {"en": "E-Referral", "ar": "خدمة"},
"ereferralSubtitle": {"en": "Service", "ar": "الإحالة الإلكترونية"},
"medicalFileTitle": {"en": "Medical File", 'ar': 'الملف الطبي'},
"My_File_Details": {"en": "My File Details", "ar": "تفاصيل ملفي"},
"Ecommerce": {"en": "Ecommerce", "ar": "التجارة الإلكترونية"},
"Family_Files": {"en": "Family Files", "ar": "ملفات العائلة"},
"My_Child": {"en": "My Child", "ar": "طفلي"},
"Vaccines": {"en": "Vaccines", "ar": "اللقاحات"},
"Todo": {"en": "Todo", "ar": "لكى يفعل"},
"List": {"en": "List", "ar": "قائمة"},
"Blood": {"en": "Blood", "ar": "دم"},
"Donation": {"en": "Donation", "ar": "هبة"},
"Health": {"en": "Health", "ar": "الصحة"},
"Calculator": {"en": "Calculator", "ar": "آلة حاسبة"},
"Converter": {"en": "Converter", "ar": "محول"},
"Smart": {"en": "Smart", "ar": "ذكي"},
"Watches": {"en": "Watches", "ar": "ساعات"},
"Parking": {"en": "Parking", "ar": "موقف سيارات"},
"Details": {"en": "Details", "ar": "تفاصيل"},
"Virtual": {"en": "Virtual", "ar": "افتراضية"},
"News": {"en": "News", "ar": "أخبار"},
"Latest": {"en": "Latest", "ar": "أحدث"},
"Tour": {"en": "Tour", "ar": "رحلة"},
};

@ -12,6 +12,8 @@ import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/doctor_card.dart';
import 'package:diplomaticquarterapp/widgets/errors/app_embedded_error.dart';
import 'package:diplomaticquarterapp/widgets/my_rich_text.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/mobile-no/mobile_no.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart';
@ -217,9 +219,9 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
style: TextStyle(fontSize: 14.0, letterSpacing: -0.56, fontWeight: FontWeight.bold)),
Container(
margin: EdgeInsets.only(top: 5.0),
child: myRichText(TranslationBase.of(context).patientName + ": ", model.allReferral[index].patientName, projectViewModel.isArabic)),
myRichText(TranslationBase.of(context).hospital + ": ", model.allReferral[index].preferredBranchName, projectViewModel.isArabic),
myRichText(TranslationBase.of(context).referralDate + ": ",
child: MyRichText(TranslationBase.of(context).patientName + ": ", model.allReferral[index].patientName, projectViewModel.isArabic)),
MyRichText(TranslationBase.of(context).hospital + ": ", model.allReferral[index].preferredBranchName, projectViewModel.isArabic),
MyRichText(TranslationBase.of(context).referralDate + ": ",
DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDateNoTimeZone(model.allReferral[index].referralDate)), projectViewModel.isArabic),
],
),

@ -0,0 +1,251 @@
import 'package:diplomaticquarterapp/config/shared_pref_kay.dart';
import 'package:diplomaticquarterapp/core/service/weather_service.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
import 'package:diplomaticquarterapp/models/hmg_services.dart';
import 'package:diplomaticquarterapp/pages/landing/widgets/services_view.dart';
import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/uitl/location_util.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart';
import 'package:geolocator/geolocator.dart';
import 'package:provider/provider.dart';
import 'health-weather/health-weather-indicator.dart';
class AllHabibMedicalSevicePage2 extends StatefulWidget {
@override
_AllHabibMedicalSevicePage2State createState() => _AllHabibMedicalSevicePage2State();
}
class _AllHabibMedicalSevicePage2State extends State<AllHabibMedicalSevicePage2> {
List<HmgServices> hmgServices = [];
LocationUtils locationUtils;
var weather = '--';
AppSharedPreferences sharedPref = AppSharedPreferences();
AuthenticatedUser authUser = new AuthenticatedUser();
AuthProvider authProvider = new AuthProvider();
WeatherService _weatherService = WeatherService();
double weatherNum = 30;
@override
void initState() {
// TODO: implement initState
super.initState();
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
locationUtils = new LocationUtils(isShowConfirmDialog: true, context: context);
WidgetsBinding.instance.addPostFrameCallback((_) => {Geolocator.getLastKnownPosition().then((value) => setLocation(value))});
});
// getPatientAppointmentHistory1();
// getFamilyFiles();
}
initialiseHmgServices(bool isLogin) {
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).online, TranslationBase.of(context).payment, "assets/images/new/paymentMethods.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).checkup, TranslationBase.of(context).comprehensive, "assets/images/new/comprehensive_checkup.svg", isLogin));
hmgServices.add(new HmgServices(5, TranslationBase.of(context).emergency, TranslationBase.of(context).services2, "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));
hmgServices.add(new HmgServices(9, TranslationBase.of(context).medicalFile, TranslationBase.of(context).My_File_Details, "assets/images/new/medical file.svg", isLogin));
hmgServices.add(new HmgServices(10, TranslationBase.of(context).book, TranslationBase.of(context).appointment, "assets/images/new/book appointment.svg", isLogin));
hmgServices.add(new HmgServices(11, TranslationBase.of(context).pharmacy, TranslationBase.of(context).Ecommerce, "assets/images/new/Pharmacy.svg", isLogin));
hmgServices.add(new HmgServices(12, TranslationBase.of(context).update, TranslationBase.of(context).insuranceCards, "assets/images/new/update insurance card.svg", isLogin));
hmgServices.add(new HmgServices(13, TranslationBase.of(context).myFamily, TranslationBase.of(context).Family_Files, "assets/images/new/my family.svg", isLogin));
hmgServices.add(new HmgServices(14, TranslationBase.of(context).My_Child, TranslationBase.of(context).Vaccines, "assets/images/new/child vaccines.svg", isLogin));
hmgServices.add(new HmgServices(15, TranslationBase.of(context).Todo, TranslationBase.of(context).list, "assets/images/new/todo.svg", isLogin));
hmgServices.add(new HmgServices(16, TranslationBase.of(context).Blood, TranslationBase.of(context).Donation, "assets/images/new/blood donation.svg", isLogin));
hmgServices.add(new HmgServices(17, TranslationBase.of(context).Health, TranslationBase.of(context).Calculator, "assets/images/new/health calculator.svg", isLogin));
hmgServices.add(new HmgServices(18, TranslationBase.of(context).Health, TranslationBase.of(context).Converter, "assets/images/new/health converter.svg", isLogin));
hmgServices.add(new HmgServices(19, TranslationBase.of(context).Smart, TranslationBase.of(context).Watches, "assets/images/new/smart watch.svg", isLogin));
hmgServices.add(new HmgServices(20, TranslationBase.of(context).Parking, TranslationBase.of(context).Details, "assets/images/new/parking details.svg", isLogin));
hmgServices.add(new HmgServices(21, TranslationBase.of(context).Virtual, TranslationBase.of(context).Tour, "assets/images/new/virtual tour.svg", isLogin));
hmgServices.add(new HmgServices(22, TranslationBase.of(context).News, TranslationBase.of(context).Latest, "assets/images/new/latest news.svg", isLogin));
}
@override
Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
initialiseHmgServices(false);
return AppScaffold(
isShowAppBar: true,
isShowDecPage: false,
showNewAppBar: true,
showNewAppBarTitle: true,
appBarTitle: TranslationBase.of(context).alhabiServices,
body: Container(
width: double.infinity,
height: double.infinity,
child: SingleChildScrollView(
child: Column(
children: [
AspectRatio(
aspectRatio: 1.8,
child: Container(
width: double.infinity,
height: double.infinity,
decoration: containerRadiusWithGradient(0,
color1: timeCalculator(6, 0, 10, 59)
? Color(0xFFB3E3FE)
: timeCalculator(11, 0, 15, 59)
? Color(0xFFFF9E7E)
: Color(0xFF2E6686),
color2: timeCalculator(6, 0, 10, 59)
? Color(0xFF9AC7FF)
: timeCalculator(11, 0, 15, 59)
? Color(0xFFFECB50)
: Color(0xFF122F48)),
child: Padding(
padding: const EdgeInsets.all(30.0),
child: Stack(
alignment: projectViewModel.isArabic ? Alignment.centerLeft : Alignment.centerRight,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
weather,
style: TextStyle(
fontSize: 30,
letterSpacing: -0.83,
fontWeight: FontWeight.bold,
color: Colors.white,
),
),
Text(
DateUtil.formatDateToDate(new DateTime.now(), false),
style: TextStyle(
fontSize: 10,
letterSpacing: -0.60,
fontWeight: FontWeight.w600,
color: Colors.white,
),
),
mFlex(1),
Text(
TranslationBase.of(context).healthWeatherIndicators,
style: TextStyle(
fontSize: 16,
letterSpacing: -0.96,
fontWeight: FontWeight.bold,
color: Colors.white,
),
),
Text(
TranslationBase.of(context).healthTipsBasedOnCurrentWeather,
style: TextStyle(
fontSize: 12,
letterSpacing: -0.72,
fontWeight: FontWeight.w600,
color: Colors.white,
),
),
InkWell(
onTap: () {
Navigator.push(
context,
FadePage(
page: HealthWeatherIndicator(),
),
);
},
child: Padding(
padding: const EdgeInsets.only(top: 8, bottom: 8),
child: Text(
TranslationBase.of(context).moreDetails,
style: TextStyle(fontSize: 12, letterSpacing: -0.72, fontWeight: FontWeight.w600, color: Colors.white, decoration: TextDecoration.underline),
),
),
)
],
),
Image.asset(
"assets/images/Weather_ico.png",
color: Colors.white.withOpacity(0.5),
),
],
),
),
),
),
mHeight(16),
Padding(
padding: const EdgeInsets.only(
left: 16,
right: 16,
top: 0,
),
child: GridView.builder(
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 2 / 2, crossAxisSpacing: 12, mainAxisSpacing: 12),
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemCount: hmgServices.length,
padding: EdgeInsets.zero,
itemBuilder: (BuildContext context, int index) {
return ServicesView(hmgServices[index], index);
},
),
),
mHeight(16),
],
),
),
),
);
}
bool timeCalculator(int startHour, int startMint, int endHour, int endMint) {
DateTime now = DateTime.now();
DateTime startDate = DateTime(now.year, now.month, now.day, startHour, startHour);
DateTime endDate = DateTime(now.year, now.month, now.day, endHour, endMint);
print(startDate.toString());
print(endDate.toString());
print(now);
print("------------");
if (startDate.isBefore(now) && endDate.isAfter(now))
return true;
else
return false;
}
void setLocation(Position position) {
this.sharedPref.setDouble(USER_LAT, position.latitude ?? 0.0);
this.sharedPref.setDouble(USER_LONG, position.longitude ?? 0.0);
getAuthUser();
}
getAuthUser() async {
if (await this.sharedPref.getObject(USER_PROFILE) != null) {
var data = AuthenticatedUser.fromJson(await this.sharedPref.getObject(USER_PROFILE));
setState(() {
authUser = data;
});
}
var data = await this.sharedPref.getObject(WEATHER);
if (data == null) {
var d = await _weatherService.getWeatherData();
print(d);
weatherNum = d.temperature;
setState(() {
weather = d != null ? d.temperature.toString() + '\u2103' : '--';
});
} else {
setState(() {
weather = data != null ? data['Temperature'].toString() + '\u2103' : '--';
});
}
}
}

@ -8,6 +8,7 @@ import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/avatar/large_avatar.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/doctor_card.dart';
import 'package:diplomaticquarterapp/widgets/my_rich_text.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
@ -73,8 +74,8 @@ class DoctorView extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
if (doctor.clinicName != null) myRichText(TranslationBase.of(context).clinic + ":", doctor.clinicName, projectViewModel.isArabic),
if (doctor.projectName != null) myRichText(TranslationBase.of(context).branch, doctor.projectName, projectViewModel.isArabic),
if (doctor.clinicName != null) MyRichText(TranslationBase.of(context).clinic + ":", doctor.clinicName, projectViewModel.isArabic),
if (doctor.projectName != null) MyRichText(TranslationBase.of(context).branch, doctor.projectName, projectViewModel.isArabic),
if (doctor.speciality != null)
Text(
getDoctorSpeciality(this.doctor.speciality).trim(),
@ -99,11 +100,12 @@ class DoctorView extends StatelessWidget {
filledIcon: Icons.star,
emptyIcon: Icons.star_border,
),
if (isShowFlag) Icon(
Icons.arrow_forward,
color: Theme.of(context).primaryColor,
),
// if (isShowFlag) Image.network(this.doctor.nationalityFlagURL, width: 22.0, height: 22.0)
if (isShowFlag)
Icon(
Icons.arrow_forward,
color: Theme.of(context).primaryColor,
),
// if (isShowFlag) Image.network(this.doctor.nationalityFlagURL, width: 22.0, height: 22.0)
],
),
],

@ -1,5 +1,6 @@
import 'package:diplomaticquarterapp/core/model/contactus/get_hmg_locations.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/hospital_location.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:giffy_dialog/giffy_dialog.dart';
@ -28,102 +29,7 @@ class _HospitalsPageState extends State<HospitalsPage> {
shrinkWrap: true,
padding: EdgeInsets.zero,
separatorBuilder: (context, index) => SizedBox(height: 14),
itemBuilder: (context, index) {
GetHMGLocationsModel _location = widget.findusHospitalModelList[index];
return Container(
padding: const EdgeInsets.only(left: 12, right: 12, top: 12, bottom: 12),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
//spreadRadius: 5,
blurRadius: 27,
offset: Offset(0, -3),
),
],
color: Colors.white),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
InkWell(
onTap: () {
showDialog(
context: context,
builder: (_) => AssetGiffyDialog(
title: Text(
_location.locationName,
style: TextStyle(fontSize: 22.0, fontWeight: FontWeight.w600),
),
image: Image.network(
_location.projectImageURL.toString(),
fit: BoxFit.cover,
),
buttonCancelText: Text(TranslationBase.of(context).cancel),
buttonCancelColor: Colors.grey,
onlyCancelButton: true,
),
);
},
child: ClipRRect(
borderRadius: BorderRadius.circular(12),
child: Image.network(
_location.projectImageURL.toString(),
width: 48,
height: 48,
fit: BoxFit.cover,
),
),
),
Expanded(
child: Padding(
padding: EdgeInsets.only(left: 12, right: 12),
child: Text(
_location.locationName?.trim().toString() + "\n" + _location.distanceInKilometers.toString() + " " + TranslationBase.of(context).km_ ?? "",
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600,
color: Color(0xff2E303A),
letterSpacing: -0.56,
),
),
),
), //model.cOCItemList[index].cOCTitl
IconButton(
icon: Icon(
Icons.location_on,
color: Color(0xff2B353E),
),
constraints: BoxConstraints(),
padding: EdgeInsets.all(8),
tooltip: '',
onPressed: () {
setState(() {
MapsLauncher.launchCoordinates(double.parse(_location.latitude), double.parse(_location.longitude), _location.locationName);
});
},
),
IconButton(
icon: Icon(
Icons.phone,
color: Color(0xff2B353E),
),
constraints: BoxConstraints(),
padding: EdgeInsets.all(8),
tooltip: '',
onPressed: () {
setState(() {
launch("tel://" + _location.phoneNumber);
});
},
),
],
),
);
},
itemBuilder: (context, index) => HospitalLocation(widget.findusHospitalModelList[index]),
itemCount: widget.findusHospitalModelList.length,
),
Container(

@ -1,9 +1,7 @@
import 'package:diplomaticquarterapp/core/model/contactus/get_hmg_locations.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/hospital_location.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:giffy_dialog/giffy_dialog.dart';
import 'package:maps_launcher/maps_launcher.dart';
import 'package:url_launcher/url_launcher.dart';
class PharmaciesPage extends StatefulWidget {
@ -28,128 +26,7 @@ class _PharmaciesPageState extends State<PharmaciesPage> {
shrinkWrap: true,
padding: EdgeInsets.zero,
separatorBuilder: (context, index) => SizedBox(height: 14),
itemBuilder: (context, index) {
GetHMGLocationsModel _location = widget.findusPharmaciesModelList[index];
return Container(
padding: const EdgeInsets.only(left: 12, right: 12, top: 12, bottom: 12),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
//spreadRadius: 5,
blurRadius: 27,
offset: Offset(0, -3),
),
],
color: Colors.white),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
InkWell(
onTap: () {
showDialog(
context: context,
builder: (_) => AssetGiffyDialog(
title: Text(
_location.locationName,
style: TextStyle(fontSize: 22.0, fontWeight: FontWeight.w600),
),
image: _location.projectImageURL != null
? Image.network(
_location.projectImageURL,
fit: BoxFit.cover,
)
: Image.network(
'https://hmgwebservices.com/Images/Hospitals/15.jpg',
fit: BoxFit.cover,
),
buttonCancelText: Text(TranslationBase.of(context).cancel),
// buttonCancelText:Text(model.user.projectID) ,
buttonCancelColor: Colors.grey,
onlyCancelButton: true,
),
);
},
child: ClipRRect(
borderRadius: BorderRadius.circular(12),
child: Image.network(
_location?.projectImageURL?.toString() ?? 'https://hmgwebservices.com/Images/Hospitals/15.jpg',
width: 48,
height: 48,
fit: BoxFit.cover,
),
),
),
Expanded(
child: Padding(
padding: EdgeInsets.only(left: 12, right: 12),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
_location.locationName?.trim() ?? "",
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600,
color: Color(0xff2E303A),
letterSpacing: -0.56,
),
),
SizedBox(
height: 2,
),
Text(
_location.cityName?.trim().toString() + "\n" + _location.distanceInKilometers.toString() + " " + TranslationBase.of(context).km_ ?? "",
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600,
color: Color(0xff2E303A),
letterSpacing: -0.56,
),
),
SizedBox(
height: 2,
),
],
),
),
),
IconButton(
icon: Icon(
Icons.location_on,
color: Color(0xff2B353E),
),
constraints: BoxConstraints(),
padding: EdgeInsets.all(8),
tooltip: '',
onPressed: () {
setState(() {
MapsLauncher.launchCoordinates(double.parse(_location.latitude), double.parse(_location.longitude), _location.locationName);
});
},
),
IconButton(
icon: Icon(
Icons.phone,
color: Color(0xff2B353E),
),
constraints: BoxConstraints(),
padding: EdgeInsets.all(8),
tooltip: '',
onPressed: () {
setState(() {
launch("tel://" + _location.phoneNumber);
});
},
),
],
),
);
},
itemBuilder: (context, index) => HospitalLocation(widget.findusPharmaciesModelList[index], showCity: true),
itemCount: widget.findusPharmaciesModelList.length,
),
Container(

@ -5,13 +5,12 @@ import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/feedback/feedback-detail.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/doctor_card.dart';
import 'package:diplomaticquarterapp/widgets/dialogs/radio_selection_dialog.dart';
import 'package:diplomaticquarterapp/widgets/mobile-no/mobile_no.dart';
import 'package:diplomaticquarterapp/widgets/my_rich_text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
@ -217,7 +216,7 @@ class _StatusFeedbackPageState extends State<StatusFeedbackPage> {
margin: EdgeInsets.only(top: 5.0),
child: Text(cOCItemList[index].formType.toString(),
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, fontFamily: isArabic ? 'Cairo' : 'Poppins', color: Color(0xff2B353E), letterSpacing: -0.48, height: 18 / 12))),
myRichText(TranslationBase.of(context).number + ": ", cOCItemList[index].itemID.toString(), isArabic),
MyRichText(TranslationBase.of(context).number + ": ", cOCItemList[index].itemID.toString(), isArabic),
Text(cOCItemList[index].cOCTitle,
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, fontFamily: isArabic ? 'Cairo' : 'Poppins', color: Color(0xff2B353E), letterSpacing: -0.48, height: 18 / 12)),
],

@ -4,7 +4,7 @@ import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:diplomaticquarterapp/widgets/avatar/large_avatar.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/doctor_card.dart';
import 'package:diplomaticquarterapp/widgets/my_rich_text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@ -12,6 +12,7 @@ import 'package:provider/provider.dart';
class InsuranceApprovalDetail extends StatelessWidget {
final InsuranceApprovalModel insuranceApprovalModel;
InsuranceApprovalDetail({Key key, this.insuranceApprovalModel}) : super(key: key);
@override
@ -71,15 +72,15 @@ class InsuranceApprovalDetail extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
myRichText(TranslationBase.of(context).clinic + ":", insuranceApprovalModel?.clinicName ?? "", projectViewModel.isArabic),
myRichText(TranslationBase.of(context).approvalNo, insuranceApprovalModel?.approvalNo.toString() ?? "", projectViewModel.isArabic),
myRichText(TranslationBase.of(context).unusedCount, insuranceApprovalModel?.unUsedCount.toString() ?? "", projectViewModel.isArabic),
myRichText(TranslationBase.of(context).companyName, insuranceApprovalModel?.companyName ?? "", projectViewModel.isArabic),
MyRichText(TranslationBase.of(context).clinic + ":", insuranceApprovalModel?.clinicName ?? "", projectViewModel.isArabic),
MyRichText(TranslationBase.of(context).approvalNo, insuranceApprovalModel?.approvalNo.toString() ?? "", projectViewModel.isArabic),
MyRichText(TranslationBase.of(context).unusedCount, insuranceApprovalModel?.unUsedCount.toString() ?? "", projectViewModel.isArabic),
MyRichText(TranslationBase.of(context).companyName, insuranceApprovalModel?.companyName ?? "", projectViewModel.isArabic),
SizedBox(height: 6),
myRichText(TranslationBase.of(context).receiptOn,
DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDateTime(insuranceApprovalModel.receiptOn)) ?? "", projectViewModel.isArabic),
myRichText(TranslationBase.of(context).expiryOn,
DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDateTime(insuranceApprovalModel.expiryDate)) ?? "", projectViewModel.isArabic),
MyRichText(TranslationBase.of(context).receiptOn, DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDateTime(insuranceApprovalModel.receiptOn)) ?? "",
projectViewModel.isArabic),
MyRichText(TranslationBase.of(context).expiryOn, DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDateTime(insuranceApprovalModel.expiryDate)) ?? "",
projectViewModel.isArabic),
],
),
),

@ -2,12 +2,11 @@ import 'package:diplomaticquarterapp/core/model/ImagesInfo.dart';
import 'package:diplomaticquarterapp/core/viewModels/insurance_card_View_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/extensions/string_extensions.dart';
import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/avatar/large_avatar.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/doctor_card.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/my_rich_text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
@ -47,126 +46,128 @@ class _InsuranceApprovalState extends State<InsuranceApproval> {
description: TranslationBase.of(context).infoApprovals,
infoList: TranslationBase.of(context).infoApprovalPoints,
imagesInfo: imagesInfo,
body: model.insuranceApproval.length > 0 ? ListView.separated(
padding: EdgeInsets.all(21),
physics: BouncingScrollPhysics(),
itemBuilder: (_, index) {
Color _patientStatusColor;
String _patientStatusString;
body: model.insuranceApproval.length > 0
? ListView.separated(
padding: EdgeInsets.all(21),
physics: BouncingScrollPhysics(),
itemBuilder: (_, index) {
Color _patientStatusColor;
String _patientStatusString;
if (model.insuranceApproval[index].isLiveCareAppointment) {
_patientStatusColor = Color(0xff2E303A);
_patientStatusString = TranslationBase.of(context).liveCare.capitalizeFirstofEach;
} else if (!model.insuranceApproval[index].isInOutPatient) {
_patientStatusColor = Color(0xffD02127);
_patientStatusString = TranslationBase.of(context).inPatient.capitalizeFirstofEach;
} else {
_patientStatusString = TranslationBase.of(context).outpatient.capitalizeFirstofEach;
_patientStatusColor = Color(0xffa9a089);
}
return InkWell(
onTap: () {
Navigator.push(context, FadePage(page: InsuranceApprovalDetail(insuranceApprovalModel: model.insuranceApproval[index])));
},
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
//spreadRadius: 5,
blurRadius: 27,
offset: Offset(0, -3),
),
],
color: _patientStatusColor),
child: Row(
children: [
SizedBox(
width: 16,
child: RotatedBox(
quarterTurns: 3,
child: Text(
_patientStatusString,
style: TextStyle(fontSize: 10, fontWeight: FontWeight.w700, color: Colors.white, letterSpacing: -0.2, height: 16 / 10),
if (model.insuranceApproval[index].isLiveCareAppointment) {
_patientStatusColor = Color(0xff2E303A);
_patientStatusString = TranslationBase.of(context).liveCare.capitalizeFirstofEach;
} else if (!model.insuranceApproval[index].isInOutPatient) {
_patientStatusColor = Color(0xffD02127);
_patientStatusString = TranslationBase.of(context).inPatient.capitalizeFirstofEach;
} else {
_patientStatusString = TranslationBase.of(context).outpatient.capitalizeFirstofEach;
_patientStatusColor = Color(0xffa9a089);
}
return InkWell(
onTap: () {
Navigator.push(context, FadePage(page: InsuranceApprovalDetail(insuranceApprovalModel: model.insuranceApproval[index])));
},
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
),
),
Expanded(
child: Container(
padding: EdgeInsets.fromLTRB(12, 10, 12, 10),
decoration: BoxDecoration(
border: Border.all(color: Colors.white, width: 1),
borderRadius: BorderRadius.only(
bottomRight: Radius.circular(10.0),
topRight: Radius.circular(10.0),
boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
//spreadRadius: 5,
blurRadius: 27,
offset: Offset(0, -3),
),
],
color: _patientStatusColor),
child: Row(
children: [
SizedBox(
width: 16,
child: RotatedBox(
quarterTurns: 3,
child: Text(
_patientStatusString,
style: TextStyle(fontSize: 10, fontWeight: FontWeight.w700, color: Colors.white, letterSpacing: -0.2, height: 16 / 10),
),
color: Colors.white),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
model.insuranceApproval[index].approvalStatusDescption,
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w600,
color: model.insuranceApproval[index].status == 9 ? Color(0xff359846) : Color(0xffD02127),
letterSpacing: -0.4,
height: 18 / 10),
),
Text(
model.insuranceApproval[index].doctorName,
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
color: Color(0xff2E303A),
letterSpacing: -0.64,
),
),
SizedBox(height: 6),
Row(
children: [
LargeAvatar(
name: model.insuranceApproval[index].doctorName,
url: model.insuranceApproval[index].doctorImageURL,
width: 48,
height: 48,
),
),
Expanded(
child: Container(
padding: EdgeInsets.fromLTRB(12, 10, 12, 10),
decoration: BoxDecoration(
border: Border.all(color: Colors.white, width: 1),
borderRadius: BorderRadius.only(
bottomRight: Radius.circular(10.0),
topRight: Radius.circular(10.0),
),
SizedBox(width: 12),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
myRichText(TranslationBase.of(context).clinic + ":", model.insuranceApproval[index]?.clinicName.toLowerCase().capitalizeFirstofEach ?? "",
projectViewModel.isArabic),
myRichText(TranslationBase.of(context).approvalNo, model.insuranceApproval[index]?.approvalNo.toString() ?? "", projectViewModel.isArabic),
],
),
color: Colors.white),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
model.insuranceApproval[index].approvalStatusDescption,
style: TextStyle(
fontSize: 12,
fontWeight: FontWeight.w600,
color: model.insuranceApproval[index].status == 9 ? Color(0xff359846) : Color(0xffD02127),
letterSpacing: -0.4,
height: 18 / 10),
),
Container(
height: 48,
alignment: Alignment.bottomRight,
child: Icon(
Icons.arrow_forward,
Text(
model.insuranceApproval[index].doctorName,
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
color: Color(0xff2E303A),
letterSpacing: -0.64,
),
),
SizedBox(height: 6),
Row(
children: [
LargeAvatar(
name: model.insuranceApproval[index].doctorName,
url: model.insuranceApproval[index].doctorImageURL,
width: 48,
height: 48,
),
SizedBox(width: 12),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
children: [
MyRichText(TranslationBase.of(context).clinic + ":", model.insuranceApproval[index]?.clinicName.toLowerCase().capitalizeFirstofEach ?? "",
projectViewModel.isArabic),
MyRichText(TranslationBase.of(context).approvalNo, model.insuranceApproval[index]?.approvalNo.toString() ?? "", projectViewModel.isArabic),
],
),
),
Container(
height: 48,
alignment: Alignment.bottomRight,
child: Icon(
Icons.arrow_forward,
color: Color(0xff2E303A),
),
)
],
)
],
)
],
),
),
),
),
],
),
],
),
),
);
},
separatorBuilder: (context, index) => SizedBox(height: 12),
itemCount: model.insuranceApproval.length) : getNoDataWidget(context)),
),
);
},
separatorBuilder: (context, index) => SizedBox(height: 12),
itemCount: model.insuranceApproval.length)
: getNoDataWidget(context)),
);
}

@ -8,6 +8,7 @@ import 'package:diplomaticquarterapp/models/gradient_color.dart';
import 'package:diplomaticquarterapp/models/hmg_services.dart';
import 'package:diplomaticquarterapp/models/slider_data.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/all_habib_medical_service_page.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/all_habib_medical_service_page2.dart';
import 'package:diplomaticquarterapp/pages/landing/widgets/logged_slider_view.dart';
import 'package:diplomaticquarterapp/pages/landing/widgets/services_view.dart';
import 'package:diplomaticquarterapp/pages/landing/widgets/slider_view.dart';
@ -235,7 +236,7 @@ class _HomePageFragment2State extends State<HomePageFragment2> {
),
FlatButton(
onPressed: () {
Navigator.push(context, FadePage(page: AllHabibMedicalService()));
Navigator.push(context, FadePage(page: AllHabibMedicalSevicePage2()));
},
child: Text(
TranslationBase.of(context).viewAllServices,

@ -1,24 +1,47 @@
import 'package:auto_size_text/auto_size_text.dart';
import 'package:diplomaticquarterapp/config/size_config.dart';
import 'package:diplomaticquarterapp/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart';
import 'package:diplomaticquarterapp/models/Authentication/authenticated_user.dart';
import 'package:diplomaticquarterapp/models/hmg_services.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/%E2%80%8B%20health_calculators.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/AlHabibMedicalService/health_converter.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/my_web_view.dart';
import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/parking_page.dart';
import 'package:diplomaticquarterapp/pages/Blood/blood_donation.dart';
import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart';
import 'package:diplomaticquarterapp/pages/ChildVaccines/child_vaccines_page.dart';
import 'package:diplomaticquarterapp/pages/ContactUs/contact_us_page.dart';
import 'package:diplomaticquarterapp/pages/Covid-DriveThru/covid-drivethru-location.dart';
import 'package:diplomaticquarterapp/pages/DrawerPages/family/my-family.dart';
import 'package:diplomaticquarterapp/pages/ErService/ErOptions.dart';
import 'package:diplomaticquarterapp/pages/insurance/insurance_update_screen.dart';
import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart';
import 'package:diplomaticquarterapp/pages/medical/medical_profile_page_new.dart';
import 'package:diplomaticquarterapp/pages/medical/smart_watch_health_data/smart_watch_instructions.dart';
import 'package:diplomaticquarterapp/pages/paymentService/payment_service.dart';
import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart';
import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:url_launcher/url_launcher.dart';
import '../../../locator.dart';
import '../landing_page.dart';
import '../landing_page_pharmcy.dart';
class ServicesView extends StatelessWidget {
HmgServices hmgServices;
int index;
AuthenticatedUser authUser = new AuthenticatedUser();
AuthProvider authProvider = new AuthProvider();
PharmacyModuleViewModel pharmacyModuleViewModel = locator<PharmacyModuleViewModel>();
ServicesView(this.hmgServices, this.index);
@ -46,6 +69,83 @@ class ServicesView extends StatelessWidget {
Navigator.push(context, FadePage(page: H2OPage()));
} else if (index == 8) {
Navigator.push(context, FadePage(page: ContactUsPage()));
} else if (index == 9) {
Navigator.push(
context,
FadePage(
page: MedicalProfilePageNew(),
),
);
} else if (index == 10) {
Navigator.push(
context,
FadePage(
page: Search(),
),
);
} else if (index == 11) {
getPharmacyToken(context);
} else if (index == 12) {
Navigator.push(
context,
FadePage(
page: InsuranceUpdate(),
),
);
} else if (index == 13) {
Navigator.push(
context,
FadePage(
page: MyFamily(),
),
);
} else if (index == 14) {
Navigator.push(
context,
FadePage(page: ChildVaccinesPage()),
);
} else if (index == 15) {
Navigator.pop(context);
LandingPage.shared.switchToDoFromHMGServices();
} else if (index == 16) {
Navigator.push(
context,
FadePage(page: BloodDonationPage()),
);
} else if (index == 17) {
Navigator.push(
context,
FadePage(
page: (HealthCalculators()),
),
);
} else if (index == 18) {
Navigator.push(
context,
FadePage(
page: HealthConverter(),
),
);
} else if (index == 19) {
Navigator.push(
context,
FadePage(page: SmartWatchInstructions()),
);
} else if (index == 20) {
Navigator.push(
context,
FadePage(
page: ParkingPage(),
),
);
} else if (index == 21) {
launch("https://hmgwebservices.com/vt_mobile/html/index.html");
} else if (index == 22) {
Navigator.of(context).push(MaterialPageRoute(
builder: (BuildContext context) => MyWebView(
title: "HMG News",
selectedUrl: "https://twitter.com/hashtag/مجموعة_د_سليمان_الحبيب_الطبية?src=hashtag_click&f=live",
),),);
}
},
child: Container(
@ -147,4 +247,23 @@ class ServicesView extends StatelessWidget {
),
);
}
getPharmacyToken(BuildContext context) async {
if (!authProvider.isLogin) {
Navigator.push(context, FadePage(page: LandingPagePharmacy()));
} else {
GifLoaderDialogUtils.showMyDialog(context);
await pharmacyModuleViewModel.generatePharmacyToken().then((value) async {
if (pharmacyModuleViewModel.error.isNotEmpty) {
await pharmacyModuleViewModel.createUser().then((value) {
GifLoaderDialogUtils.hideDialog(context);
Navigator.push(context, FadePage(page: LandingPagePharmacy()));
});
} else {
GifLoaderDialogUtils.hideDialog(context);
Navigator.push(context, FadePage(page: LandingPagePharmacy()));
}
});
}
}
}

@ -10,7 +10,7 @@ import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/doctor_card.dart';
import 'package:diplomaticquarterapp/widgets/my_rich_text.dart';
import 'package:diplomaticquarterapp/widgets/new_design/doctor_header.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/material.dart';
@ -113,13 +113,13 @@ class _InvoiceDetailState extends State<InvoiceDetail> {
margin: EdgeInsets.only(bottom: 10.0),
child: Text(TranslationBase.of(context).cardDetail, style: TextStyle(color: Colors.black, letterSpacing: -0.64, fontSize: 18.0, fontWeight: FontWeight.bold)),
),
myRichText(
MyRichText(
TranslationBase.of(context).insuranceCompany + ": ",
projectViewModel.isArabic
? widget.dentalInvoiceDetailResponse.listEInvoiceForDental[0].groupNameN
: widget.dentalInvoiceDetailResponse.listEInvoiceForDental[0].companyName,
projectViewModel.isArabic),
myRichText(
MyRichText(
TranslationBase.of(context).insuranceID + ": ",
widget.dentalInvoiceDetailResponse.listEInvoiceForDental[0].insuranceID != null ? widget.dentalInvoiceDetailResponse.listEInvoiceForDental[0].insuranceID : "N/A",
projectViewModel.isArabic),

@ -1,14 +1,13 @@
import 'package:diplomaticquarterapp/core/model/contactus/get_hmg_locations.dart';
import 'package:diplomaticquarterapp/core/model/prescriptions/prescription_report.dart';
import 'package:diplomaticquarterapp/core/viewModels/medical/prescriptions_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/hospital_location.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:giffy_dialog/giffy_dialog.dart';
import 'package:maps_launcher/maps_launcher.dart';
import 'package:url_launcher/url_launcher.dart';
class PharmacyForPrescriptionsPage extends StatelessWidget {
final itemID;
@ -28,211 +27,63 @@ class PharmacyForPrescriptionsPage extends StatelessWidget {
baseViewModel: model,
body: Column(
children: [
Container(
width: double.infinity,
margin: EdgeInsets.only(top: 10, left: 10, right: 10),
padding: EdgeInsets.all(8.0),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
border: Border.all(color: Colors.grey[200], width: 0.5),
),
child: Row(
children: <Widget>[
ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(5)),
child: Image.network(
prescriptionReport.imageSRCUrl,
fit: BoxFit.cover,
width: 60,
height: 70,
Padding(
padding: const EdgeInsets.fromLTRB(21, 21, 21, 0),
child: Container(
width: double.infinity,
padding: const EdgeInsets.only(left: 12, right: 12, top: 12, bottom: 12),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
),
Expanded(
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Center(
child: Texts(prescriptionReport.itemDescription.isNotEmpty ? prescriptionReport.itemDescription : prescriptionReport.itemDescriptionN ?? ''),
boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
//spreadRadius: 5,
blurRadius: 27,
offset: Offset(0, -3),
),
],
color: Colors.white),
child: Row(
children: <Widget>[
ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(5)),
child: Image.network(
prescriptionReport.imageSRCUrl,
fit: BoxFit.cover,
width: 60,
height: 70,
),
),
)
],
Expanded(
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Center(
child: Texts(prescriptionReport.itemDescription.isNotEmpty ? prescriptionReport.itemDescription : prescriptionReport.itemDescriptionN ?? ''),
),
),
)
],
),
),
),
model.pharmacyPrescriptionsList.isNotEmpty == true
? Expanded(
child: ListView.builder(
scrollDirection: Axis.vertical,
padding: EdgeInsets.all(21),
physics: BouncingScrollPhysics(),
itemBuilder: (context, index) => Container(
margin: EdgeInsets.all(12.0),
padding: const EdgeInsets.only(left: 12, right: 12, top: 12, bottom: 12),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
//spreadRadius: 5,
blurRadius: 27,
offset: Offset(0, -3),
),
],
color: Colors.white),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
InkWell(
onTap: () {
showDialog(
context: context,
builder: (_) => AssetGiffyDialog(
title: Text(
model.pharmacyPrescriptionsList[index].locationDescription,
style: TextStyle(fontSize: 22.0, fontWeight: FontWeight.w600),
),
image: Image.network(
model.pharmacyPrescriptionsList[index].projectImageURL.toString(),
fit: BoxFit.cover,
),
buttonCancelText: Text(TranslationBase.of(context).cancel),
buttonCancelColor: Colors.grey,
onlyCancelButton: true,
),
);
},
child: ClipRRect(
borderRadius: BorderRadius.circular(12),
child: Image.network(
model.pharmacyPrescriptionsList[index].projectImageURL.toString(),
width: 48,
height: 48,
fit: BoxFit.cover,
),
),
),
Expanded(
child: Padding(
padding: EdgeInsets.only(left: 12, right: 12),
child: Text(
model.pharmacyPrescriptionsList[index].locationDescription?.trim().toString() +
"\n" +
model.pharmacyPrescriptionsList[index].cityName.trim().toString() +
"\n" +
model.pharmacyPrescriptionsList[index].distanceInKilometers.toString() +
" " +
TranslationBase.of(context).km_ ??
"",
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600,
color: Color(0xff2E303A),
letterSpacing: -0.56,
),
),
),
), //model.cOCItemList[index].cOCTitl
IconButton(
icon: Icon(
Icons.location_on,
color: Color(0xff2B353E),
),
constraints: BoxConstraints(),
padding: EdgeInsets.all(8),
tooltip: '',
onPressed: () {
// setState(() {
MapsLauncher.launchCoordinates(double.parse(model.pharmacyPrescriptionsList[index].latitude), double.parse(model.pharmacyPrescriptionsList[index].longitude),
model.pharmacyPrescriptionsList[index].locationDescription);
// });
},
),
IconButton(
icon: Icon(
Icons.phone,
color: Color(0xff2B353E),
),
constraints: BoxConstraints(),
padding: EdgeInsets.all(8),
tooltip: '',
onPressed: () {
// setState(() {
launch("tel://" + model.pharmacyPrescriptionsList[index].phoneNumber);
// });
},
),
],
),
),
// Container(
// width: double.infinity,
// margin: EdgeInsets.only(top: 10, left: 10, right: 10),
// padding: EdgeInsets.all(8.0),
// decoration: BoxDecoration(
// color: Colors.white,
// borderRadius: BorderRadius.all(
// Radius.circular(10.0),
// ),
// border: Border.all(color: Colors.grey[200], width: 0.5),
// ),
// child: Row(
// children: <Widget>[
// ClipRRect(
// borderRadius: BorderRadius.all(Radius.circular(5)),
// child: Image.network(
// model.pharmacyPrescriptionsList[index].projectImageURL,
// fit: BoxFit.cover,
// width: 60,
// height: 70,
// ),
// ),
// Expanded(
// child: Padding(
// padding: const EdgeInsets.all(8.0),
// child: Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: <Widget>[
// Texts(model.pharmacyPrescriptionsList[index].locationDescription),
// SizedBox(
// height: 5,
// ),
// Texts(model.pharmacyPrescriptionsList[index].cityName),
// ],
// ),
// ),
// ),
// InkWell(
// onTap: () {
// MapsLauncher.launchCoordinates(double.parse(model.pharmacyPrescriptionsList[index].latitude), double.parse(model.pharmacyPrescriptionsList[index].longitude));
// },
// child: Icon(
// Icons.pin_drop,
// size: 18,
// color: Colors.red[900],
// ),
// ),
// SizedBox(
// width: 15,
// ),
// InkWell(
// onTap: Feedback.wrapForTap(() {
// launch("tel://${model.pharmacyPrescriptionsList[index].phoneNumber}");
// }, context),
// child: Container(
// child: Icon(
// Icons.call,
// size: 18,
// color: Colors.red[900],
// ),
// ),
// )
// ],
// ),
// ),
itemBuilder: (context, index) {
GetHMGLocationsModel location = GetHMGLocationsModel();
location.locationName = model.pharmacyPrescriptionsList[index].locationDescription;
location.cityName = model.pharmacyPrescriptionsList[index].cityName;
location.phoneNumber = model.pharmacyPrescriptionsList[index].phoneNumber;
location.latitude = model.pharmacyPrescriptionsList[index].latitude;
location.longitude = model.pharmacyPrescriptionsList[index].longitude;
location.distanceInKilometers = model.pharmacyPrescriptionsList[index].distanceInKilometers;
return HospitalLocation(location, showCity: true);
},
itemCount: model.pharmacyPrescriptionsList.length,
),
)

@ -11,14 +11,14 @@ import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/doctor_card.dart';
import 'package:diplomaticquarterapp/widgets/my_rich_text.dart';
import 'package:diplomaticquarterapp/widgets/new_design/doctor_header.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import '../../../widgets/dialogs/confirm_send_email_dialog.dart';
import 'PrescriptionIDeliveryAddressPage.dart';
@ -285,8 +285,8 @@ class PrescriptionItemsPage extends StatelessWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
myRichText(TranslationBase.of(context).route + ": ", model.prescriptionReportEnhList[index].route, projectViewModel.isArabic),
myRichText(TranslationBase.of(context).dailyDoses + ": ", model.prescriptionReportEnhList[index].doseDailyQuantity.toString(),
MyRichText(TranslationBase.of(context).route + ": ", model.prescriptionReportEnhList[index].route, projectViewModel.isArabic),
MyRichText(TranslationBase.of(context).dailyDoses + ": ", model.prescriptionReportEnhList[index].doseDailyQuantity.toString(),
projectViewModel.isArabic),
mHeight(9),
Text(

@ -9,8 +9,8 @@ import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/avatar/large_avatar.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/doctor_card.dart';
import 'package:diplomaticquarterapp/widgets/dialogs/confirm_send_email_dialog.dart';
import 'package:diplomaticquarterapp/widgets/my_rich_text.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
@ -27,93 +27,95 @@ class ReportListWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
projectViewModel = Provider.of(context);
return reportList.length > 0 ? ListView.separated(
physics: BouncingScrollPhysics(),
padding: EdgeInsets.only(bottom: 14, top: 14, left: 21, right: 21),
separatorBuilder: (context, index) => SizedBox(height: 14),
itemBuilder: (context, index) {
Reports report = reportList[index];
return Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
//spreadRadius: 5,
blurRadius: 27,
offset: Offset(0, -3),
),
],
color: Colors.white),
child: Padding(
padding: const EdgeInsets.only(left: 12, right: 12, top: 12, bottom: 12),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (report.doctorName != null)
Text(
report.doctorName,
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64, height: 25 / 16),
),
if (report.doctorName != null) SizedBox(height: 6),
Row(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
LargeAvatar(
name: report.doctorName,
url: report.doctorImageURL,
width: 48,
height: 48,
return reportList.length > 0
? ListView.separated(
physics: BouncingScrollPhysics(),
padding: EdgeInsets.only(bottom: 14, top: 14, left: 21, right: 21),
separatorBuilder: (context, index) => SizedBox(height: 14),
itemBuilder: (context, index) {
Reports report = reportList[index];
return Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
SizedBox(width: 11),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
//spreadRadius: 5,
blurRadius: 27,
offset: Offset(0, -3),
),
],
color: Colors.white),
child: Padding(
padding: const EdgeInsets.only(left: 12, right: 12, top: 12, bottom: 12),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (report.doctorName != null)
Text(
report.doctorName,
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64, height: 25 / 16),
),
if (report.doctorName != null) SizedBox(height: 6),
Row(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
if (report.projectName != null) myRichText(TranslationBase.of(context).clinic + ":", report.projectName, projectViewModel.isArabic),
if (report.clinicDescription != null) myRichText(TranslationBase.of(context).hospital + ":", report.clinicDescription, projectViewModel.isArabic),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisSize: MainAxisSize.max,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingBar.readOnly(
initialRating: report.actualDoctorRate.toDouble(),
size: 16.0,
filledColor: Color(0XFFD02127),
emptyColor: Color(0XFFD02127),
isHalfAllowed: true,
halfFilledIcon: Icons.star_half,
filledIcon: Icons.star,
emptyIcon: Icons.star_border,
),
if (reportList[index].status == 2)
IconButton(
icon: Icon(Icons.email),
color: Color(0xff28323A),
constraints: BoxConstraints(),
padding: EdgeInsets.zero,
onPressed: () {
showConfirmMessage(reportList[index]);
})
],
LargeAvatar(
name: report.doctorName,
url: report.doctorImageURL,
width: 48,
height: 48,
),
SizedBox(width: 11),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
if (report.projectName != null) MyRichText(TranslationBase.of(context).clinic + ":", report.projectName, projectViewModel.isArabic),
if (report.clinicDescription != null) MyRichText(TranslationBase.of(context).hospital + ":", report.clinicDescription, projectViewModel.isArabic),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisSize: MainAxisSize.max,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
RatingBar.readOnly(
initialRating: report.actualDoctorRate.toDouble(),
size: 16.0,
filledColor: Color(0XFFD02127),
emptyColor: Color(0XFFD02127),
isHalfAllowed: true,
halfFilledIcon: Icons.star_half,
filledIcon: Icons.star,
emptyIcon: Icons.star_border,
),
if (reportList[index].status == 2)
IconButton(
icon: Icon(Icons.email),
color: Color(0xff28323A),
constraints: BoxConstraints(),
padding: EdgeInsets.zero,
onPressed: () {
showConfirmMessage(reportList[index]);
})
],
),
],
),
),
],
),
),
],
],
),
),
],
),
),
);
},
itemCount: reportList.length,
) : getNoDataWidget(context) ;
);
},
itemCount: reportList.length,
)
: getNoDataWidget(context);
}
void showConfirmMessage(Reports report) {

@ -6,9 +6,8 @@ import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/avatar/large_avatar.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/doctor_card.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/dialogs/ConfirmWithMessageDialog.dart';
import 'package:diplomaticquarterapp/widgets/my_rich_text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@ -100,8 +99,8 @@ class MedicalReports extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
if (_appointmenHistory.projectName != null) myRichText(TranslationBase.of(context).clinic + ":", _appointmenHistory.projectName, projectViewModel.isArabic),
if (_appointmenHistory.clinicName != null) myRichText(TranslationBase.of(context).hospital + ":", _appointmenHistory.clinicName, projectViewModel.isArabic),
if (_appointmenHistory.projectName != null) MyRichText(TranslationBase.of(context).clinic + ":", _appointmenHistory.projectName, projectViewModel.isArabic),
if (_appointmenHistory.clinicName != null) MyRichText(TranslationBase.of(context).hospital + ":", _appointmenHistory.clinicName, projectViewModel.isArabic),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisSize: MainAxisSize.max,
@ -135,4 +134,4 @@ class MedicalReports extends StatelessWidget {
),
);
}
}
}

@ -1,26 +1,20 @@
import 'package:diplomaticquarterapp/core/enum/viewstate.dart';
import 'package:diplomaticquarterapp/core/model/rate/appointment_details.dart';
import 'package:diplomaticquarterapp/core/viewModels/appointment_rate_view_model.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/pages/base/base_view.dart';
import 'package:diplomaticquarterapp/pages/landing/landing_page.dart';
import 'package:diplomaticquarterapp/theme/colors.dart';
import 'package:diplomaticquarterapp/uitl/app_toast.dart';
import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/avatar/large_avatar.dart';
import 'package:diplomaticquarterapp/widgets/buttons/defaultButton.dart';
import 'package:diplomaticquarterapp/widgets/buttons/secondary_button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/doctor_card.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/drawer/app_drawer_widget.dart';
import 'package:diplomaticquarterapp/widgets/my_rich_text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:hexcolor/hexcolor.dart';
import 'package:provider/provider.dart';
class RateAppointmentClinic extends StatefulWidget {
@ -28,8 +22,7 @@ class RateAppointmentClinic extends StatefulWidget {
final String doctorNote;
final int doctorRate;
RateAppointmentClinic(
{this.appointmentDetails, this.doctorRate, this.doctorNote});
RateAppointmentClinic({this.appointmentDetails, this.doctorRate, this.doctorNote});
@override
_RateAppointmentClinicState createState() => _RateAppointmentClinicState();
@ -61,12 +54,7 @@ class _RateAppointmentClinicState extends State<RateAppointmentClinic> {
),
Text(
TranslationBase.of(context).lastAppointment,
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
color: Color(0xff2B353E),
letterSpacing: -0.64,
height: 23 / 16),
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.64, height: 23 / 16),
),
SizedBox(
height: 25,
@ -75,8 +63,7 @@ class _RateAppointmentClinicState extends State<RateAppointmentClinic> {
elevation: 0,
shape: cardRadius(10),
child: Padding(
padding: const EdgeInsets.only(
left: 12, right: 12, top: 12, bottom: 12),
padding: const EdgeInsets.only(left: 12, right: 12, top: 12, bottom: 12),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
@ -88,21 +75,11 @@ class _RateAppointmentClinicState extends State<RateAppointmentClinic> {
children: [
Text(
model.appointmentDetails.projectName,
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
color: Color(0xff2E303A),
letterSpacing: -0.64,
height: 25 / 16),
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64, height: 25 / 16),
),
Text(
model.appointmentDetails.startTime.toString().substring(0, 5),
style: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600,
color: Color(0xff2E303A),
letterSpacing: -0.64,
height: 25 / 16),
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.64, height: 25 / 16),
),
],
),
@ -111,11 +88,7 @@ class _RateAppointmentClinicState extends State<RateAppointmentClinic> {
mainAxisSize: MainAxisSize.min,
children: <Widget>[
LargeAvatar(
url:
'https://hmgwebservices.com/Images/Hospitals/' +
model.appointmentDetails.projectID
.toString() +
'.jpg',
url: 'https://hmgwebservices.com/Images/Hospitals/' + model.appointmentDetails.projectID.toString() + '.jpg',
width: 48,
height: 48,
),
@ -125,16 +98,8 @@ class _RateAppointmentClinicState extends State<RateAppointmentClinic> {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: <Widget>[
myRichText(
TranslationBase.of(context).clinic + ":",
model.appointmentDetails.projectName,
projectViewModel.isArabic),
myRichText(
TranslationBase.of(context).date + ":",
DateUtil.getDayMonthYearDateFormatted(
DateUtil.convertStringToDate(model
.appointmentDetails
.appointmentDate)),
MyRichText(TranslationBase.of(context).clinic + ":", model.appointmentDetails.projectName, projectViewModel.isArabic),
MyRichText(TranslationBase.of(context).date + ":", DateUtil.getDayMonthYearDateFormatted(DateUtil.convertStringToDate(model.appointmentDetails.appointmentDate)),
projectViewModel.isArabic),
],
),
@ -160,12 +125,7 @@ class _RateAppointmentClinicState extends State<RateAppointmentClinic> {
children: [
Text(
TranslationBase.of(context).rateClinic,
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
color: Color(0xff2B353E),
letterSpacing: -0.64,
height: 23 / 16),
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.64, height: 23 / 16),
),
SizedBox(
height: 12,
@ -179,21 +139,13 @@ class _RateAppointmentClinicState extends State<RateAppointmentClinic> {
duration: Duration(milliseconds: 300),
switchInCurve: Curves.elasticOut,
switchOutCurve: Curves.elasticIn,
transitionBuilder: (Widget child,
Animation<double> animation) {
return ScaleTransition(
child: child, scale: animation);
transitionBuilder: (Widget child, Animation<double> animation) {
return ScaleTransition(child: child, scale: animation);
},
child: rating == (index + 1)
? Container(
margin: EdgeInsets.only(
left: 3.0, right: 3.0),
decoration: BoxDecoration(
borderRadius:
BorderRadius.circular(100),
border: Border.all(
width: 3,
color: CustomColors.green)),
margin: EdgeInsets.only(left: 3.0, right: 3.0),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(100), border: Border.all(width: 3, color: CustomColors.green)),
key: ValueKey<int>(rating),
child: IconButton(
onPressed: () {
@ -202,10 +154,7 @@ class _RateAppointmentClinicState extends State<RateAppointmentClinic> {
});
},
iconSize: 35,
icon: SvgPicture.asset(
'assets/images/new/appointment-rating/' +
(index + 1).toString() +
'.svg'),
icon: SvgPicture.asset('assets/images/new/appointment-rating/' + (index + 1).toString() + '.svg'),
),
)
: Container(
@ -217,10 +166,7 @@ class _RateAppointmentClinicState extends State<RateAppointmentClinic> {
});
},
iconSize: 35,
icon: SvgPicture.asset(
'assets/images/new/appointment-rating/' +
(index + 1).toString() +
'.svg'),
icon: SvgPicture.asset('assets/images/new/appointment-rating/' + (index + 1).toString() + '.svg'),
),
),
),
@ -270,25 +216,18 @@ class _RateAppointmentClinicState extends State<RateAppointmentClinic> {
: () {
model
.sendAppointmentRate(
rating,
widget.appointmentDetails.appointmentNo,
widget.appointmentDetails.projectID,
widget.appointmentDetails.doctorID,
widget.appointmentDetails.clinicID,
note)
rating, widget.appointmentDetails.appointmentNo, widget.appointmentDetails.projectID, widget.appointmentDetails.doctorID, widget.appointmentDetails.clinicID, note)
.then(
(value) => {
model
.sendDoctorRate(
widget.doctorRate,
widget
.appointmentDetails.appointmentNo,
widget.appointmentDetails.appointmentNo,
widget.appointmentDetails.projectID,
widget.appointmentDetails.doctorID,
widget.appointmentDetails.clinicID,
note,
widget.appointmentDetails
.appointmentDate,
widget.appointmentDetails.appointmentDate,
widget.appointmentDetails.doctorName,
widget.appointmentDetails.projectName,
widget.appointmentDetails.clinicName)

@ -127,6 +127,8 @@ class TranslationBase {
String get waitingForDoctor => localizedValues['waitingForDoctor'][locale.languageCode];
String get waitingTime => localizedValues['waitingTime'][locale.languageCode];
String get confirmLater => localizedValues['confirmLater'][locale.languageCode];
String get todoList => localizedValues['todoList'][locale.languageCode];
@ -615,6 +617,8 @@ class TranslationBase {
String get locationa => localizedValues['locationa'][locale.languageCode];
String get callNow => localizedValues['call_now'][locale.languageCode];
String get ambulancerequest => localizedValues['ambulancerequest'][locale.languageCode];
String get requestA => localizedValues['requestA'][locale.languageCode];
@ -825,6 +829,10 @@ class TranslationBase {
String get selectCity => localizedValues['selectCity'][locale.languageCode];
String get city => localizedValues['city'][locale.languageCode];
String get distance => localizedValues['distance'][locale.languageCode];
String get myAccount => localizedValues['MyAccount'][locale.languageCode];
String get otherAccount => localizedValues['OtherAccount'][locale.languageCode];
@ -2424,6 +2432,46 @@ class TranslationBase {
String get ereferralSubtitle => localizedValues["ereferralSubtitle"][locale.languageCode];
String get medicalFileTitle => localizedValues["medicalFileTitle"][locale.languageCode];
String get My_File_Details => localizedValues["My_File_Details"][locale.languageCode];
String get Ecommerce => localizedValues["Ecommerce"][locale.languageCode];
String get Family_Files => localizedValues["Family_Files"][locale.languageCode];
String get My_Child => localizedValues["My_Child"][locale.languageCode];
String get Vaccines => localizedValues["Vaccines"][locale.languageCode];
String get Todo => localizedValues["Todo"][locale.languageCode];
String get list => localizedValues["List"][locale.languageCode];
String get Blood => localizedValues["Blood"][locale.languageCode];
String get Donation => localizedValues["Donation"][locale.languageCode];
String get Health => localizedValues["Health"][locale.languageCode];
String get Calculator => localizedValues["Calculator"][locale.languageCode];
String get Converter => localizedValues["Converter"][locale.languageCode];
String get Smart => localizedValues["Smart"][locale.languageCode];
String get Watches => localizedValues["Watches"][locale.languageCode];
String get Parking => localizedValues["Parking"][locale.languageCode];
String get Details => localizedValues["Details"][locale.languageCode];
String get Virtual => localizedValues["Virtual"][locale.languageCode];
String get News => localizedValues["News"][locale.languageCode];
String get Latest => localizedValues["Latest"][locale.languageCode];
String get Tour => localizedValues["Tour"][locale.languageCode];
}
class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

@ -219,13 +219,13 @@ RoundedRectangleBorder buttonShape() {
);
}
Decoration containerRadiusWithGradient(double radius) {
Decoration containerRadiusWithGradient(double radius,{Color color1,Color color2}) {
return BoxDecoration(
borderRadius: BorderRadius.circular(radius),
gradient: LinearGradient(
colors: [
Color(0xFFF71787E),
Color(0xFFF2B353E),
color1?? Color(0xFFF71787E),
color2?? Color(0xFFF2B353E),
],
begin: Alignment.centerLeft,
end: Alignment.centerRight,

@ -11,6 +11,8 @@ import 'package:flutter_countdown_timer/flutter_countdown_timer.dart';
import 'package:provider/provider.dart';
import 'package:rating_bar/rating_bar.dart';
import '../../my_rich_text.dart';
class DoctorCard extends StatelessWidget {
final String name;
final String subName;
@ -164,12 +166,12 @@ class DoctorCard extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
myRichText(isSortByClinic ? TranslationBase.of(context).branch : TranslationBase.of(context).clinic + ":", subName, projectViewModel.isArabic),
MyRichText(isSortByClinic ? TranslationBase.of(context).branch : TranslationBase.of(context).clinic + ":", subName, projectViewModel.isArabic),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
if (rating == null && billNo != "") myRichText(TranslationBase.of(context).invoiceNo, billNo ?? "", projectViewModel.isArabic),
if (vaccineName != "") myRichText("", vaccineName ?? "", projectViewModel.isArabic),
if (rating == null && billNo != "") MyRichText(TranslationBase.of(context).invoiceNo, billNo ?? "", projectViewModel.isArabic),
if (vaccineName != "") MyRichText("", vaccineName ?? "", projectViewModel.isArabic),
if (rating != null)
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -216,10 +218,12 @@ class DoctorCard extends StatelessWidget {
color: Theme.of(context).primaryColor,
),
)
: onTap != null ? Icon(
Icons.arrow_forward,
color: Theme.of(context).primaryColor,
) : SizedBox(),
: onTap != null
? Icon(
Icons.arrow_forward,
color: Theme.of(context).primaryColor,
)
: SizedBox(),
),
),
],
@ -234,19 +238,3 @@ class DoctorCard extends StatelessWidget {
);
}
}
// todo 'sikander' move this widget to separate file
Widget myRichText(String title, String value, bool isArabic) {
return RichText(
maxLines: 1,
text: TextSpan(
text: title,
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, fontFamily: isArabic ? 'Cairo' : 'Poppins', color: Color(0xff575757), letterSpacing: -0.4, height: 18 / 10),
children: <TextSpan>[
TextSpan(
text: " $value",
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, fontFamily: isArabic ? 'Cairo' : 'Poppins', color: Color(0xff2B353E), letterSpacing: -0.48, height: 18 / 12),
)
]),
);
}

@ -0,0 +1,108 @@
import 'package:diplomaticquarterapp/core/model/contactus/get_hmg_locations.dart';
import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:flutter/material.dart';
import 'package:maps_launcher/maps_launcher.dart';
import 'package:provider/provider.dart';
import 'package:url_launcher/url_launcher.dart';
import 'my_rich_text.dart';
class HospitalLocation extends StatelessWidget {
final GetHMGLocationsModel location;
final bool showCity;
HospitalLocation(this.location, {Key key, this.showCity = false}) : super(key: key);
@override
Widget build(BuildContext context) {
ProjectViewModel projectViewModel = Provider.of(context);
return Container(
padding: const EdgeInsets.only(left: 12, right: 12, top: 12, bottom: 12),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(10.0),
),
boxShadow: [
BoxShadow(
color: Color(0xff000000).withOpacity(.05),
//spreadRadius: 5,
blurRadius: 27,
offset: Offset(0, -3),
),
],
color: Colors.white),
child: Row(
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
location.locationName.trim(),
style: TextStyle(fontSize: 16, letterSpacing: -0.64, fontWeight: FontWeight.w600, color: Color(0xff2E303A)),
),
SizedBox(height: 10),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
ClipRRect(
borderRadius: BorderRadius.circular(30),
child: Image.network(
location?.projectImageURL?.toString() ?? 'https://hmgwebservices.com/Images/Hospitals/15.jpg',
width: 48,
height: 48,
fit: BoxFit.cover,
),
),
SizedBox(width: 10),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (showCity) MyRichText(TranslationBase.of(context).city + ":", location.cityName?.trim().toString(), projectViewModel.isArabic),
MyRichText(TranslationBase.of(context).distance + ":", location.distanceInKilometers.toString() + " " + TranslationBase.of(context).km_ ?? "", projectViewModel.isArabic),
],
),
)
],
),
],
),
),
Column(
children: [
contactButton(Icons.location_on, TranslationBase.of(context).locationa, () {
MapsLauncher.launchCoordinates(double.parse(location.latitude), double.parse(location.longitude), location.locationName);
}),
SizedBox(height: 10),
contactButton(Icons.call, TranslationBase.of(context).callNow, () {
launch("tel://" + location.phoneNumber);
}),
],
),
],
),
);
}
Widget contactButton(IconData _iconData, String title, VoidCallback callback) {
return SizedBox(
height: 32,
child: FlatButton.icon(
color: Color(0xffF5F5F5),
shape: StadiumBorder(side: BorderSide(color: Color(0xffF0F0F0), width: 1)),
onPressed: callback,
icon: Icon(
_iconData,
size: 12,
color: Color(0xff2E303A),
),
label: Text(
title,
style: TextStyle(fontSize: 12, letterSpacing: -0.48, fontWeight: FontWeight.w600, color: Color(0xff2E303A)),
),
),
);
}
}

@ -0,0 +1,24 @@
import 'package:flutter/material.dart';
class MyRichText extends StatelessWidget {
final String title;
final String value;
final bool isArabic;
MyRichText(this.title,this.value,this.isArabic,{Key key}) : super(key: key);
@override
Widget build(BuildContext context) {
return RichText(
maxLines: 1,
text: TextSpan(
text: title,
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, fontFamily: isArabic ? 'Cairo' : 'Poppins', color: Color(0xff575757), letterSpacing: -0.4, height: 18 / 10),
children: <TextSpan>[
TextSpan(
text: " $value",
style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, fontFamily: isArabic ? 'Cairo' : 'Poppins', color: Color(0xff2B353E), letterSpacing: -0.48, height: 18 / 12),
)
]),
);
}
}

@ -7,8 +7,8 @@ import 'package:diplomaticquarterapp/uitl/date_uitl.dart';
import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/avatar/large_avatar.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/doctor_card.dart';
import 'package:diplomaticquarterapp/widgets/dialogs/confirm_send_email_dialog.dart';
import 'package:diplomaticquarterapp/widgets/my_rich_text.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:provider/provider.dart';
@ -68,8 +68,8 @@ class DoctorHeader extends StatelessWidget {
_speciality,
style: TextStyle(fontSize: 12, fontWeight: FontWeight.w600, color: Color(0xff2E303A), letterSpacing: -0.48, height: 18 / 12),
),
headerModel.invoiceNo.isNotEmpty ? myRichText(TranslationBase.of(context).invoiceNo + ":", headerModel.invoiceNo, projectViewModel.isArabic) : Container(),
myRichText(TranslationBase.of(context).branch, headerModel.projectName, projectViewModel.isArabic),
headerModel.invoiceNo.isNotEmpty ? MyRichText(TranslationBase.of(context).invoiceNo + ":", headerModel.invoiceNo, projectViewModel.isArabic) : Container(),
MyRichText(TranslationBase.of(context).branch, headerModel.projectName, projectViewModel.isArabic),
],
),
),

Loading…
Cancel
Save