Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0

# Conflicts:
#	lib/config/localized_values.dart
merge-update-with-lab-changes
Mirza.Shafique 5 years ago
commit b0dfbef52a

@ -1,7 +0,0 @@
<svg id="Group_7426" data-name="Group 7426" xmlns="http://www.w3.org/2000/svg" width="38.595" height="38.024" viewBox="0 0 38.595 38.024">
<path id="Path_4539" data-name="Path 4539" d="M38.892,0H33.378A1.379,1.379,0,0,0,32,1.378v8.27a1.378,1.378,0,0,0,2.757,0V2.757h4.135a1.378,1.378,0,1,0,0-2.757Z" transform="translate(-32)" fill="#28323a"/>
<path id="Path_4540" data-name="Path 4540" d="M38.892,200.27H34.757v-6.892a1.378,1.378,0,1,0-2.757,0v8.27a1.379,1.379,0,0,0,1.378,1.378h5.514a1.378,1.378,0,1,0,0-2.757Z" transform="translate(-32 -165.003)" fill="#28323a"/>
<path id="Path_4541" data-name="Path 4541" d="M390.892,0h-5.514a1.378,1.378,0,0,0,0,2.757h4.135V9.649a1.378,1.378,0,0,0,2.757,0V1.378A1.379,1.379,0,0,0,390.892,0Z" transform="translate(-353.676)" fill="#28323a"/>
<path id="Path_4542" data-name="Path 4542" d="M390.892,192a1.379,1.379,0,0,0-1.378,1.378v6.892h-4.135a1.378,1.378,0,0,0,0,2.757h5.514a1.379,1.379,0,0,0,1.378-1.378v-8.27A1.379,1.379,0,0,0,390.892,192Z" transform="translate(-353.676 -165.003)" fill="#28323a"/>
<path id="Path_4551" data-name="Path 4551" d="M13.343,0A13.343,13.343,0,1,0,26.686,13.343,13.343,13.343,0,0,0,13.343,0Zm4.924,8.9a1.911,1.911,0,1,1-1.911,1.911A1.912,1.912,0,0,1,18.267,8.9Zm-9.849,0a1.911,1.911,0,1,1-1.911,1.911A1.912,1.912,0,0,1,8.418,8.9Zm12.124,9.083a8.733,8.733,0,0,1-14.4,0A1.169,1.169,0,1,1,8.07,16.657a6.4,6.4,0,0,0,10.55,0,1.168,1.168,0,1,1,1.923,1.325Z" transform="translate(5.954 5.509)" fill="#28323a"/>
</svg>

Before

Width:  |  Height:  |  Size: 1.5 KiB

@ -0,0 +1,53 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 43.8 45.12">
<g id="Layer_2" data-name="Layer 2">
<g id="Layer_1-2" data-name="Layer 1">
<g>
<g>
<path d="M20,42.54l-.34.21a.62.62,0,0,0-.19-.22.41.41,0,0,0-.23-.06.44.44,0,0,0-.3.1.32.32,0,0,0-.12.25c0,.14.11.25.31.33l.28.12a1.17,1.17,0,0,1,.51.34.8.8,0,0,1,.16.49.87.87,0,0,1-.26.64.88.88,0,0,1-.65.26.85.85,0,0,1-.61-.22,1,1,0,0,1-.3-.61l.43-.1a.75.75,0,0,0,.11.35.44.44,0,0,0,.38.18.42.42,0,0,0,.33-.13.46.46,0,0,0,.14-.34.33.33,0,0,0,0-.15.33.33,0,0,0-.07-.13.65.65,0,0,0-.12-.11l-.19-.09L19,43.53c-.39-.16-.58-.4-.58-.71a.7.7,0,0,1,.24-.54.92.92,0,0,1,.61-.21A.85.85,0,0,1,20,42.54Z" style="fill: #ea202d"/>
<path d="M20.56,43.52a1.33,1.33,0,0,1,.44-1,1.42,1.42,0,0,1,1-.43,1.4,1.4,0,0,1,1,.43,1.42,1.42,0,0,1,.43,1,1.37,1.37,0,0,1-.43,1A1.45,1.45,0,0,1,22,45a1.47,1.47,0,0,1-1-.38A1.38,1.38,0,0,1,20.56,43.52Zm.43,0a1,1,0,0,0,1.79.76,1.1,1.1,0,0,0,0-1.51,1,1,0,0,0-.74-.31,1,1,0,0,0-.75.31A1,1,0,0,0,21,43.53Z" style="fill: #ea202d"/>
<path d="M24.59,42.12v2.43h.83V45H24.16V42.12Z" style="fill: #ea202d"/>
<path d="M26.27,42.12v1.7a.94.94,0,0,0,.12.54.59.59,0,0,0,.5.24.58.58,0,0,0,.5-.24.94.94,0,0,0,.12-.54v-1.7h.43v1.82a1,1,0,0,1-.28.74,1.09,1.09,0,0,1-1.54,0,1,1,0,0,1-.28-.74V42.12Z" style="fill: #ea202d"/>
<path d="M29.5,42.52V45h-.42V42.52h-.65v-.4h1.72v.4Z" style="fill: #ea202d"/>
<path d="M31.07,42.12V45h-.43V42.12Z" style="fill: #ea202d"/>
<path d="M31.72,43.52a1.36,1.36,0,0,1,.43-1,1.48,1.48,0,0,1,2.52,1,1.37,1.37,0,0,1-.43,1,1.49,1.49,0,0,1-2,0A1.38,1.38,0,0,1,31.72,43.52Zm.43,0a1,1,0,0,0,1.79.76,1.1,1.1,0,0,0,0-1.51,1.05,1.05,0,0,0-1.49,0A1,1,0,0,0,32.15,43.53Z" style="fill: #ea202d"/>
<path d="M35.32,45v-3l2.06,2.16v-2h.43v3L35.74,43v2Z" style="fill: #ea202d"/>
<path d="M40.19,42.54l-.35.21a.53.53,0,0,0-.18-.22.49.49,0,0,0-.53,0,.32.32,0,0,0-.12.25c0,.14.1.25.31.33l.28.12a1.17,1.17,0,0,1,.51.34.79.79,0,0,1,.15.49.83.83,0,0,1-.26.64.85.85,0,0,1-.65.26.84.84,0,0,1-.6-.22,1,1,0,0,1-.3-.61l.43-.1a.75.75,0,0,0,.11.35.43.43,0,0,0,.38.18.44.44,0,0,0,.33-.13.45.45,0,0,0,.13-.34.34.34,0,0,0,0-.15.33.33,0,0,0-.07-.13.5.5,0,0,0-.13-.11l-.18-.09-.27-.12c-.39-.16-.58-.4-.58-.71a.7.7,0,0,1,.24-.54.9.9,0,0,1,.61-.21A.85.85,0,0,1,40.19,42.54Z" style="fill: #ea202d"/>
</g>
<g>
<path d="M6.27,34.85a2,2,0,0,0-.68-.8,1.87,1.87,0,0,0-1.1-.31,2.61,2.61,0,0,0-1,.2,2.94,2.94,0,0,0-.84.56,3.13,3.13,0,0,0-.61.85,3.21,3.21,0,0,0-.32,1.09,2.79,2.79,0,0,0,.06,1.09,2.17,2.17,0,0,0,.41.85,1.88,1.88,0,0,0,.7.54,2.21,2.21,0,0,0,1,.2A2.21,2.21,0,0,0,5,38.81,3.09,3.09,0,0,0,5.9,38l1.27.83A4.49,4.49,0,0,1,5.76,40a4,4,0,0,1-2,.48,4,4,0,0,1-1.61-.31,3.51,3.51,0,0,1-1.23-.85,3.31,3.31,0,0,1-.74-1.29A3.59,3.59,0,0,1,0,36.44a4.56,4.56,0,0,1,1.49-2.93,4.62,4.62,0,0,1,1.4-.84,4.48,4.48,0,0,1,1.68-.31,3.55,3.55,0,0,1,1.9.48,3.46,3.46,0,0,1,1.17,1.21Z" style="fill: #221f1f"/>
<path d="M13,40.27H8.05l1.71-7.68h1.7l-1.41,6.32h3.21Z" style="fill: #221f1f"/>
<path d="M22.61,38.07a4.41,4.41,0,0,1-1,1.28,4.66,4.66,0,0,1-1.36.85,4.46,4.46,0,0,1-1.64.3,3.88,3.88,0,0,1-1.58-.32,3.5,3.5,0,0,1-1.2-.87A3.27,3.27,0,0,1,15.13,38,3.76,3.76,0,0,1,15,36.44a4.68,4.68,0,0,1,.49-1.63,4.47,4.47,0,0,1,1-1.29,4.32,4.32,0,0,1,1.37-.85,4.27,4.27,0,0,1,1.64-.31,3.88,3.88,0,0,1,1.58.32,3.66,3.66,0,0,1,1.2.88A3.41,3.41,0,0,1,23,34.85a3.83,3.83,0,0,1,.13,1.59A4.68,4.68,0,0,1,22.61,38.07Zm-1.24-2.68a2.3,2.3,0,0,0-.36-.86,1.78,1.78,0,0,0-.67-.57,2,2,0,0,0-1-.22,2.22,2.22,0,0,0-1,.22,2.75,2.75,0,0,0-.82.57,3.07,3.07,0,0,0-.57.86,3.41,3.41,0,0,0-.29,1,3,3,0,0,0,0,1,2.33,2.33,0,0,0,.36.85,2,2,0,0,0,.66.58,2.13,2.13,0,0,0,1,.21,2.36,2.36,0,0,0,1-.21,2.78,2.78,0,0,0,.81-.58,3,3,0,0,0,.58-.85,3.43,3.43,0,0,0,.29-1A3.06,3.06,0,0,0,21.37,35.39Z" style="fill: #221f1f"/>
<path d="M31.43,37.67a3.65,3.65,0,0,1-.45,1.1,3.4,3.4,0,0,1-.78.91,3.48,3.48,0,0,1-1.09.6,4.11,4.11,0,0,1-1.4.22,3.32,3.32,0,0,1-1.41-.28,2.65,2.65,0,0,1-1.59-1.84,2.94,2.94,0,0,1,0-1.32c.19-.88.34-1.61.46-2.18s.22-1,.28-1.32.11-.54.14-.68,0-.24.05-.29h1.73l-1,4.65a1.63,1.63,0,0,0,0,.66A1.43,1.43,0,0,0,27.07,39a1.58,1.58,0,0,0,.76.17,2.08,2.08,0,0,0,.71-.13,2.42,2.42,0,0,0,.58-.35,2.33,2.33,0,0,0,.43-.51,2,2,0,0,0,.25-.61l1.11-4.93h1.73Z" style="fill: #221f1f"/>
<path d="M40.42,38a4.08,4.08,0,0,1-1,1.21A4.28,4.28,0,0,1,38.1,40a4.91,4.91,0,0,1-1.64.27H32.87l1.7-7.68h2.65a4.34,4.34,0,0,1,1.6.29,3.28,3.28,0,0,1,1.2.8,3.25,3.25,0,0,1,.73,1.21,3.45,3.45,0,0,1,.14,1.55A4.48,4.48,0,0,1,40.42,38Zm-1.29-2.57a2.11,2.11,0,0,0-.36-.79,1.83,1.83,0,0,0-.67-.52,2.18,2.18,0,0,0-1-.19H36l-1.11,5h1.62a2.45,2.45,0,0,0,1-.19,3,3,0,0,0,.83-.53,3.11,3.11,0,0,0,.6-.79,3,3,0,0,0,.29-1A2.93,2.93,0,0,0,39.13,35.45Z" style="fill: #221f1f"/>
</g>
<path d="M32,16.82s-.42-2.31-3.9-2.31a4.61,4.61,0,0,0-3.47-4.22s-.59-4.16-3.25-5.11L30.49,7.5s1.69,0,1.53,2.95Z" style="fill: #ea202d"/>
<path d="M19.12,4.45,2.64,0S.27-.34.21,1.81s0,12.27,0,12.27S2.53,10.29,8.64,11c0,0,1.11-6.55,7.32-3.55A3.73,3.73,0,0,1,19.12,4.45Z" style="fill: #ea202d"/>
<path d="M19.09,17.82s.37-2.16,2.05-1.58,4.64,2,4.64,2A2.45,2.45,0,0,1,27,20.77l-.3,2.53a1.23,1.23,0,0,1-1.81.95L19.51,22a1.57,1.57,0,0,1-.63-1.76Z" style="fill: #ea202d"/>
<path d="M12.35,19.61s.29-1.22,1.23-.83,2.57,1.28,2.57,1.28a1.4,1.4,0,0,1,.6,1.51L16.49,23a.71.71,0,0,1-1.07.48l-3-1.49a.89.89,0,0,1-.3-1Z" style="fill: #ea202d"/>
<path d="M30,18.45s.29-1.22,1.23-.83,2.58,1.28,2.58,1.28a1.39,1.39,0,0,1,.59,1.52l-.26,1.43a.7.7,0,0,1-1.06.47l-3-1.48a.9.9,0,0,1-.29-1Z" style="fill: #ea202d"/>
<path d="M15.89,11.52s.24-1,1-.7,2.17,1.08,2.17,1.08a1.18,1.18,0,0,1,.51,1.28l-.23,1.21a.59.59,0,0,1-.89.4L16,13.53a.76.76,0,0,1-.25-.87Z" style="fill: #ea202d"/>
<path d="M23.42,13.58s.21-.88.88-.6,1.84.92,1.84.92A1,1,0,0,1,26.57,15l-.19,1a.5.5,0,0,1-.76.34l-2.14-1.07a.64.64,0,0,1-.21-.73Z" style="fill: #ea202d"/>
<path d="M19.52,25s.21-.87.88-.59,1.84.92,1.84.92a1,1,0,0,1,.43,1.08l-.19,1a.5.5,0,0,1-.76.34l-2.13-1.07a.64.64,0,0,1-.22-.73Z" style="fill: #ea202d"/>
<path d="M10.6,13.58s.21-.88.88-.6,1.84.92,1.84.92A1,1,0,0,1,13.75,15l-.19,1a.5.5,0,0,1-.76.34l-2.13-1.07a.64.64,0,0,1-.22-.73Z" style="fill: #ea202d"/>
<path d="M35,27.42s.21-.87.88-.59,1.84.92,1.84.92a1,1,0,0,1,.43,1.08l-.19,1a.5.5,0,0,1-.76.34l-2.13-1.07a.64.64,0,0,1-.21-.73Z" style="fill: #ea202d"/>
<path d="M27.83,27.25s.12-.52.52-.35,1.08.54,1.08.54a.59.59,0,0,1,.26.64l-.12.6a.29.29,0,0,1-.44.2l-1.26-.63a.38.38,0,0,1-.13-.43Z" style="fill: #ea202d"/>
<path d="M7.4,20.08s.12-.51.52-.34S9,20.28,9,20.28a.57.57,0,0,1,.25.63l-.11.61a.3.3,0,0,1-.45.2l-1.25-.63a.38.38,0,0,1-.13-.43Z" style="fill: #ea202d"/>
<path d="M4.19,14.75s.12-.52.51-.35,1.09.54,1.09.54a.59.59,0,0,1,.25.64l-.11.6a.29.29,0,0,1-.45.2l-1.26-.63a.38.38,0,0,1-.12-.43Z" style="fill: #ea202d"/>
<g>
<path d="M2.26,30.72H2a.54.54,0,0,1-.56-.29.52.52,0,0,1-.54.29c-.47,0-.71-.31-.71-.93s.24-.89.71-.89h.75V30c0,.28.12.42.37.42h.22Zm-.94-1.51H.94a.3.3,0,0,0-.3.16.86.86,0,0,0-.08.42.88.88,0,0,0,.08.43.31.31,0,0,0,.3.17.3.3,0,0,0,.3-.17.88.88,0,0,0,.08-.43ZM1,28.33a.21.21,0,0,1-.2.21.21.21,0,0,1,0-.42A.21.21,0,0,1,1,28.33Zm.49,0a.21.21,0,0,1-.19.21.21.21,0,0,1,0-.42A.21.21,0,0,1,1.49,28.33Z" style="fill: #221f1f"/>
<path d="M3.15,30a.69.69,0,0,1-.19.51.63.63,0,0,1-.5.21H2.17v-.33h.27q.36,0,.36-.42V29l.35-.11Zm-.22,1.28a.21.21,0,0,1-.19.21.21.21,0,0,1,0-.42A.21.21,0,0,1,2.93,31.28Z" style="fill: #221f1f"/>
<path d="M4.52,30.72H4.13a.47.47,0,0,1-.49-.52v-2L4,28.12v2.06c0,.13.06.2.18.2h.35Z" style="fill: #221f1f"/>
<path d="M6.92,30.72H4.43v-.33H6.09v-.15A2.07,2.07,0,0,0,6,29.58a.48.48,0,0,0-.49-.34.74.74,0,0,0-.57.31l-.25-.26a1.12,1.12,0,0,1,.82-.39.81.81,0,0,1,.78.44,2.17,2.17,0,0,1,.14.9v.14h.47Z" style="fill: #221f1f"/>
<path d="M10.21,30.72H6.83v-.34h.44v-1l.35-.11v1.13h.74V29.19l.35-.11v1.3h.75V29l.35-.11v1.48h.4Z" style="fill: #221f1f"/>
<path d="M11.07,30a.73.73,0,0,1-.19.51.66.66,0,0,1-.51.21h-.24v-.34h.22c.24,0,.36-.14.36-.41V28.24l.36-.12Z" style="fill: #221f1f"/>
<path d="M11.9,30.72h-.35V28.24l.35-.12Z" style="fill: #221f1f"/>
<path d="M16.2,30.61c0,.59-.34.88-1,.88a1,1,0,0,1-.81-.33,1.8,1.8,0,0,1-.26-.92l.35-.13a1.52,1.52,0,0,0,.16.8.68.68,0,0,0,.56.22.76.76,0,0,0,.46-.1.46.46,0,0,0,.18-.41V28.24l.35-.12Z" style="fill: #221f1f"/>
<path d="M18.52,30.72h-.44a1,1,0,0,1-.24.54.71.71,0,0,1-.54.23.83.83,0,0,1-.43-.1L16.71,31a1.22,1.22,0,0,0,.58.15.48.48,0,0,0,.44-.44h-.29a.77.77,0,0,1-.58-.25.86.86,0,0,1-.19-.58,1.13,1.13,0,0,1,.17-.64.64.64,0,0,1,.57-.3c.47,0,.71.31.71.94,0,.13,0,.29,0,.5h.41Zm-.75-.83a1.21,1.21,0,0,0-.05-.4.3.3,0,0,0-.31-.21c-.25,0-.38.21-.38.61s.13.5.41.5h.33Z" style="fill: #221f1f"/>
<path d="M20,30.72h-.25a.69.69,0,0,1-.52-.22.65.65,0,0,1-.52.22h-.3v-.34h.28c.24,0,.37-.14.37-.41V28.24l.35-.12V30q0,.39.36.39H20Z" style="fill: #221f1f"/>
<path d="M21.9,30.72h-2v-.33h1.62v-.15a2,2,0,0,0-.08-.66.47.47,0,0,0-.49-.34.72.72,0,0,0-.56.31l-.26-.26A1.12,1.12,0,0,1,21,28.9a.79.79,0,0,1,.78.44,2.15,2.15,0,0,1,.15.9Z" style="fill: #221f1f"/>
</g>
<path d="M43.8,33.59a1.3,1.3,0,0,1-.39.95,1.27,1.27,0,0,1-.95.4,1.31,1.31,0,0,1-1-.4,1.28,1.28,0,0,1-.4-1,1.4,1.4,0,0,1,.13-.57,1.47,1.47,0,0,1,.36-.46A1.34,1.34,0,0,1,43,32.36a1.29,1.29,0,0,1,.57.49A1.31,1.31,0,0,1,43.8,33.59Zm-1.35-1.15a1,1,0,0,0-.79.34,1.09,1.09,0,0,0-.33.8,1.12,1.12,0,0,0,.33.82,1.07,1.07,0,0,0,.8.34,1,1,0,0,0,.79-.34,1.1,1.1,0,0,0,.33-.81,1.18,1.18,0,0,0-.13-.53,1,1,0,0,0-.34-.41A1.1,1.1,0,0,0,42.45,32.44Zm.14,1.28.5.65h-.36l-.46-.62v.62H42V32.81h.31a.77.77,0,0,1,.48.12.48.48,0,0,1,.08.62.46.46,0,0,1-.23.16Zm-.32-.22h0c.21,0,.32-.07.32-.22s-.1-.2-.31-.2h-.06Z" style="fill: #808083"/>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 9.7 KiB

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="61.183" height="61.227" viewBox="0 0 61.183 61.227">
<path id="Path_4645" data-name="Path 4645" d="M240.521,51.17s2.141-.016,3.648-.016l11.428.056c1.364,0,2.5-1.45,2.564-3.545l.013-9.549c0-2.036.91-3.629,2.321-3.72L264,34.368c1.413.087,2.383,1.7,2.383,3.723l-.009,9.6c.062,2.094,1.014,3.461,2.385,3.461l15.384.042.028-11.8c0-2.03-.976-3.607-2.4-3.7l-6.18-.031c-1.367,0-2.442-1.443-2.5-3.54l-.024-3.192c.068-2.094,1.149-3.534,2.519-3.534l6.214.018c1.412-.091,2.332-1.758,2.332-3.785L284.147,6.9a6.275,6.275,0,0,1-4.76,2.976l-10.45-.009c-1.361,0-2.5,1.484-2.564,3.578v9.459c-.064,2.09-1.133,3.569-2.5,3.569l-3.162-.024c-1.371,0-2.467-1.431-2.529-3.515l.008-9.563c-.062-2.095-1.148-3.5-2.516-3.5l-15.165.007,0,11.764c0,2.032.949,3.659,2.365,3.753l6.214-.026c1.405.092,2.4,1.768,2.4,3.789l-.019,2.723c0,2.031-.96,3.656-2.372,3.748l-6.224-.015c-1.416.1-2.365,1.7-2.365,3.731Zm52.241-45.1v49.2a6.256,6.256,0,0,1-6.325,5.951H237.873a6.231,6.231,0,0,1-6.294-5.958l0-49.295A6.253,6.253,0,0,1,237.883,0L286.4.021a6.371,6.371,0,0,1,6.36,6.053" transform="translate(-231.579)" fill="#ec1c2b"/>
</svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

@ -0,0 +1,8 @@
<svg xmlns="http://www.w3.org/2000/svg" width="47.902" height="41.741" viewBox="0 0 47.902 41.741">
<g id="medical-report_10_" data-name="medical-report (10)" transform="translate(0 -31)">
<path id="Path_4641" data-name="Path 4641" d="M188.454,196h-2.981v4.472H181v2.981h4.472v4.472h2.981v-4.472h4.472v-2.981h-4.472Z" transform="translate(-163.012 -148.602)" fill="#28323a"/>
<path id="Path_4642" data-name="Path 4642" d="M16.317,32.31A4.443,4.443,0,0,0,13.154,31H0V66.778H47.9V39.944H23.951ZM32.9,48.889v8.944H28.423v4.472H19.479V57.833H15.007V48.889h4.472V44.417h8.944v4.472Z" fill="#28323a"/>
<path id="Path_4643" data-name="Path 4643" d="M0,421H47.9v2.981H0Z" transform="translate(0 -351.241)" fill="#28323a"/>
<path id="Path_4644" data-name="Path 4644" d="M226.407,63.981h22.716V61h-25.7Z" transform="translate(-201.221 -27.019)" fill="#28323a"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 884 B

@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" width="50.309" height="35.997" viewBox="0 0 50.309 35.997">
<g id="identification-card" transform="translate(0 -44.872)">
<path id="Path_4640" data-name="Path 4640" d="M46.839,44.872H3.47A3.47,3.47,0,0,0,0,48.342V77.4a3.47,3.47,0,0,0,3.47,3.47h43.37a3.47,3.47,0,0,0,3.47-3.47V48.342A3.47,3.47,0,0,0,46.839,44.872ZM22.589,52.8h11.24a1.3,1.3,0,1,1,0,2.6H22.589a1.3,1.3,0,0,1,0-2.6ZM17.926,72.64H5.637V53.112H17.925V72.64Zm26.962.151h-22.3a1.3,1.3,0,0,1,0-2.6h22.3a1.3,1.3,0,0,1,0,2.6Zm0-4.662h-22.3a1.3,1.3,0,1,1,0-2.6h22.3a1.3,1.3,0,0,1,0,2.6Zm0-4.662h-22.3a1.3,1.3,0,0,1,0-2.6h22.3a1.3,1.3,0,0,1,0,2.6Z" fill="#28323a"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 681 B

@ -0,0 +1,9 @@
<svg xmlns="http://www.w3.org/2000/svg" width="38.595" height="38.024" viewBox="0 0 38.595 38.024">
<g id="fingerprint1-scan" transform="translate(0.342 0.655)">
<path id="Path_4539" data-name="Path 4539" d="M38.892,0H33.378A1.379,1.379,0,0,0,32,1.378v8.27a1.378,1.378,0,0,0,2.757,0V2.757h4.135a1.378,1.378,0,1,0,0-2.757Z" transform="translate(-32.342 -0.655)" fill="#28323a"/>
<path id="Path_4540" data-name="Path 4540" d="M38.892,200.27H34.757v-6.892a1.378,1.378,0,1,0-2.757,0v8.27a1.379,1.379,0,0,0,1.378,1.378h5.514a1.378,1.378,0,1,0,0-2.757Z" transform="translate(-32.342 -165.658)" fill="#28323a"/>
<path id="Path_4541" data-name="Path 4541" d="M390.892,0h-5.514a1.378,1.378,0,0,0,0,2.757h4.135V9.649a1.378,1.378,0,0,0,2.757,0V1.378A1.379,1.379,0,0,0,390.892,0Z" transform="translate(-354.018 -0.655)" fill="#28323a"/>
<path id="Path_4542" data-name="Path 4542" d="M390.892,192a1.379,1.379,0,0,0-1.378,1.378v6.892h-4.135a1.378,1.378,0,0,0,0,2.757h5.514a1.379,1.379,0,0,0,1.378-1.378v-8.27A1.379,1.379,0,0,0,390.892,192Z" transform="translate(-354.018 -165.658)" fill="#28323a"/>
<path id="Path_4648" data-name="Path 4648" d="M13.343,0A13.343,13.343,0,1,0,26.686,13.343,13.343,13.343,0,0,0,13.343,0Zm4.924,8.9a1.911,1.911,0,1,1-1.911,1.911A1.912,1.912,0,0,1,18.267,8.9Zm-9.849,0a1.911,1.911,0,1,1-1.911,1.911A1.912,1.912,0,0,1,8.418,8.9Zm12.124,9.083a8.733,8.733,0,0,1-14.4,0A1.169,1.169,0,1,1,8.07,16.657a6.4,6.4,0,0,0,10.55,0,1.168,1.168,0,1,1,1.923,1.325Z" transform="translate(5.611 4.855)" fill="#28323a"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

File diff suppressed because it is too large Load Diff

@ -30,6 +30,7 @@ import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:local_auth/auth_strings.dart'; import 'package:local_auth/auth_strings.dart';
import 'package:local_auth/local_auth.dart'; import 'package:local_auth/local_auth.dart';
@ -115,7 +116,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
children: [ children: [
SizedBox(height: 12), // todo discuss SizedBox(height: 12),
Text( Text(
TranslationBase.of(context).welcomeBack, TranslationBase.of(context).welcomeBack,
style: TextStyle(fontSize: 12, fontFamily: "Poppins", fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.64), style: TextStyle(fontSize: 12, fontFamily: "Poppins", fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.64),
@ -755,7 +756,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[ children: <Widget>[
Image.asset( SvgPicture.asset(
_icon, _icon,
height: 38, height: 38,
width: 38, width: 38,
@ -801,19 +802,20 @@ class _ConfirmLogin extends State<ConfirmLogin> {
))); )));
} }
// todo 'sikander' optimize this after knowing usage
Widget getButton(int flag) { Widget getButton(int flag) {
switch (flag) { switch (flag) {
case 4: case 4:
return _loginOptionButton(TranslationBase.of(context).verifyWhatsApp, 'assets/images/login/104.png', flag, null); return _loginOptionButton(TranslationBase.of(context).verifyWhatsApp, 'assets/images/new/verify_whatsapp.svg', flag, null);
break; break;
case 1: case 1:
return _loginOptionButton(TranslationBase.of(context).verifySMS, 'assets/images/login/103.png', flag, null); return _loginOptionButton(TranslationBase.of(context).verifySMS, 'assets/images/new/verify_sms.svg', flag, null);
break; break;
case 2: case 2:
return _loginOptionButton(TranslationBase.of(context).verifyFingerprint, 'assets/images/login/102.png', flag, BiometricType.fingerprint.index); return _loginOptionButton(TranslationBase.of(context).verifyFingerprint, 'assets/images/new/verify_thumb.svg', flag, BiometricType.fingerprint.index);
break; break;
case 3: case 3:
return _loginOptionButton(TranslationBase.of(context).verifyFaceID, 'assets/images/login/101.png', flag, BiometricType.face.index); return _loginOptionButton(TranslationBase.of(context).verifyFaceID, 'assets/images/new/verify_face.svg', flag, BiometricType.face.index);
break; break;
default: default:
@ -847,7 +849,9 @@ class _ConfirmLogin extends State<ConfirmLogin> {
Texts(TranslationBase.of(context).moreVerification, fontSize: SizeConfig.textMultiplier * 1.8, textAlign: TextAlign.center, color: Colors.black) Texts(TranslationBase.of(context).moreVerification, fontSize: SizeConfig.textMultiplier * 1.8, textAlign: TextAlign.center, color: Colors.black)
], ],
), ),
))); ),
),
);
} }
} }

@ -10,21 +10,122 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart'; import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
class LoginType extends StatelessWidget { class LoginType extends StatelessWidget {
static int loginType = 0; static int loginType = 0;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return Scaffold(
backgroundColor: Color(0xfff8f8f8),
resizeToAvoidBottomPadding: false,
appBar: AppBar(
backgroundColor: Colors.transparent,
leading: IconButton(
icon: Icon(Icons.arrow_back_ios),
color: Color(0xff2B353E),
onPressed: () => Navigator.pop(context),
),
),
body: Padding(
padding: EdgeInsets.only(bottom: 20, left: 21, right: 21),
child: Column(children: [
Expanded(
child: ListView(
padding: EdgeInsets.zero,
physics: BouncingScrollPhysics(),
children: [
SizedBox(height: 12),
Row(
children: [
SvgPicture.asset(
"assets/images/new/hmg_icon.svg",
height: 62,
width: 62,
),
SizedBox(width: 10),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [
Text(
TranslationBase.of(context).welcomeTo,
style: TextStyle(fontSize: 12, fontFamily: "Poppins", fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.72, height: 23 / 12),
),
Text(
TranslationBase.of(context).drSulaimanText,
style: TextStyle(fontSize: 24, fontFamily: "Poppins", fontWeight: FontWeight.w700, color: Color(0xff2B353E), letterSpacing: -1.44, height: 23 / 24),
),
Text(
TranslationBase.of(context).patientApp,
style: TextStyle(fontSize: 12, fontFamily: "Poppins", fontWeight: FontWeight.w600, color: Color(0xffD02127), letterSpacing: -0.72),
),
SizedBox(height: 2),
],
),
)
],
),
SizedBox(height: 50),
Text(
TranslationBase.of(context).logintypeRadio,
style: TextStyle(fontSize: 16, fontFamily: "Poppins", fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.64, height: 23 / 16),
),
GridView(
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 2, crossAxisSpacing: 13, mainAxisSpacing: 9),
physics: NeverScrollableScrollPhysics(),
padding: EdgeInsets.only(top: 25),
shrinkWrap: true,
children: [
getButton(context, TranslationBase.of(context).idNo, 'assets/images/new/national_id.svg', 1),
getButton(context, TranslationBase.of(context).fileNo, 'assets/images/new/medical_file.svg', 2),
],
),
SizedBox(height: 20),
RichText(
text: TextSpan(
text: TranslationBase.of(context).forgotPassword,
style: TextStyle(
decoration: TextDecoration.underline, fontSize: 12, fontFamily: "Poppins", fontWeight: FontWeight.w600, color: Color(0xffC9272B), letterSpacing: -0.48, height: 18 / 12),
recognizer: TapGestureRecognizer()..onTap = () => Navigator.of(context).push(FadePage(page: ForgotPassword())),
),
),
],
),
),
SizedBox(
height: 43,
width: double.infinity,
child: FlatButton(
onPressed: () {
Navigator.of(context).pushNamed(LOGIN_TYPE);
},
child: Text(
TranslationBase.of(context).registerNow,
style: TextStyle(fontSize: 16, fontFamily: "Poppins", fontWeight: FontWeight.w600, color: Colors.white, letterSpacing: -0.48, height: 35 / 16),
),
color: Color(0xffD02127),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(6),
),
),
),
]),
),
);
AppScaffold(
appBarTitle: TranslationBase.of(context).login, appBarTitle: TranslationBase.of(context).login,
isShowAppBar: true, isShowAppBar: true,
isShowDecPage: false, isShowDecPage: false,
body: SingleChildScrollView( body: SingleChildScrollView(
child: Container( child: Container(
padding: padding: EdgeInsets.only(top: 10, left: 20, right: 20, bottom: 30),
EdgeInsets.only(top: 10, left: 20, right: 20, bottom: 30),
height: SizeConfig.realScreenHeight * .9, height: SizeConfig.realScreenHeight * .9,
width: SizeConfig.realScreenWidth, width: SizeConfig.realScreenWidth,
child: Column( child: Column(
@ -54,37 +155,27 @@ class LoginType extends StatelessWidget {
child: InkWell( child: InkWell(
onTap: () => { onTap: () => {
LoginType.loginType = 1, LoginType.loginType = 1,
Navigator.of(context) Navigator.of(context).push(FadePage(page: Login())),
.push(FadePage(page: Login())),
}, },
child: RoundedContainer( child: RoundedContainer(
borderColor: Colors.grey, borderColor: Colors.grey,
showBorder: true, showBorder: true,
child: Padding( child: Padding(
padding: EdgeInsets.fromLTRB( padding: EdgeInsets.fromLTRB(20, 10, 20, 10),
20, 10, 20, 10),
child: Column( child: Column(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.center,
MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/id_card_icon.png', 'assets/images/id_card_icon.png',
height: SizeConfig height: SizeConfig.imageSizeMultiplier * 12,
.imageSizeMultiplier * width: SizeConfig.imageSizeMultiplier * 15,
12,
width: SizeConfig
.imageSizeMultiplier *
15,
), ),
SizedBox( SizedBox(
height: 20, height: 20,
), ),
AppText( AppText(
TranslationBase.of(context) TranslationBase.of(context).idNo,
.idNo, fontSize: SizeConfig.textMultiplier * 2,
fontSize: SizeConfig
.textMultiplier *
2,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
) )
], ],
@ -94,35 +185,26 @@ class LoginType extends StatelessWidget {
child: InkWell( child: InkWell(
onTap: () => { onTap: () => {
LoginType.loginType = 2, LoginType.loginType = 2,
Navigator.of(context) Navigator.of(context).push(FadePage(page: Login())),
.push(FadePage(page: Login())),
}, },
child: RoundedContainer( child: RoundedContainer(
borderColor: Colors.grey, borderColor: Colors.grey,
showBorder: true, showBorder: true,
child: Padding( child: Padding(
padding: EdgeInsets.fromLTRB( padding: EdgeInsets.fromLTRB(25, 10, 25, 10),
25, 10, 25, 10),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
'assets/images/my_file_white_icon.png', 'assets/images/my_file_white_icon.png',
height: SizeConfig height: SizeConfig.imageSizeMultiplier * 12,
.imageSizeMultiplier * width: SizeConfig.imageSizeMultiplier * 15,
12,
width: SizeConfig
.imageSizeMultiplier *
15,
), ),
SizedBox( SizedBox(
height: 20, height: 20,
), ),
AppText( AppText(
TranslationBase.of(context) TranslationBase.of(context).fileNo,
.fileNo, fontSize: SizeConfig.textMultiplier * 2,
fontSize: SizeConfig
.textMultiplier *
2,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
) )
], ],
@ -140,16 +222,9 @@ class LoginType extends StatelessWidget {
Center( Center(
child: InkWell( child: InkWell(
onTap: () => { onTap: () => {
Navigator.of(context) Navigator.of(context).push(FadePage(page: ForgotPassword())),
.push(FadePage(page: ForgotPassword())),
}, },
child: AppText( child: AppText(TranslationBase.of(context).forgotPassword, fontSize: SizeConfig.textMultiplier * 2.5, marginTop: 20.0, underline: true)))
TranslationBase.of(context)
.forgotPassword,
fontSize:
SizeConfig.textMultiplier * 2.5,
marginTop: 20.0,
underline: true)))
]), ]),
), ),
Expanded( Expanded(
@ -170,8 +245,7 @@ class LoginType extends StatelessWidget {
child: DefaultButton( child: DefaultButton(
TranslationBase.of(context).registerNow, TranslationBase.of(context).registerNow,
() => { () => {
Navigator.of(context) Navigator.of(context).push(FadePage(page: Register())),
.push(FadePage(page: Register())),
}, },
)), )),
], ],
@ -181,4 +255,39 @@ class LoginType extends StatelessWidget {
], ],
)))); ))));
} }
Widget getButton(BuildContext _context, String _title, String _icon, int _flag) {
return InkWell(
onTap: () {
LoginType.loginType = _flag;
Navigator.of(_context).push(FadePage(page: Login()));
},
child: Container(
padding: EdgeInsets.only(left: 20, right: 20, bottom: 15, top: 28),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15),
color: Colors.white,
border: Border.all(
color: Color(0xffefefef),
width: 1,
),
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
SvgPicture.asset(
_icon,
height: 38,
width: 38,
),
Text(
_title,
style: TextStyle(fontSize: 16, fontFamily: "Poppins", fontWeight: FontWeight.w600, color: Color(0xff2B353E), letterSpacing: -0.48, height: 20 / 16),
),
],
),
),
);
}
} }

@ -296,7 +296,7 @@ class _GeneralSettings extends State<GeneralSettings>
fontName: fontName:
Provider.of<ProjectViewModel>(context, listen: false).isArabic Provider.of<ProjectViewModel>(context, listen: false).isArabic
? 'Cairo' ? 'Cairo'
: 'WorkSans'); : 'Poppins');
} }
} }
} }

@ -4,6 +4,7 @@ import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'config/shared_pref_kay.dart'; import 'config/shared_pref_kay.dart';
@ -16,8 +17,7 @@ import 'models/Authentication/authenticated_user.dart';
import 'widgets/transitions/slide_up_page.dart'; import 'widgets/transitions/slide_up_page.dart';
AppSharedPreferences sharedPref = new AppSharedPreferences(); AppSharedPreferences sharedPref = new AppSharedPreferences();
AuthenticatedUserObject authenticatedUserObject = AuthenticatedUserObject authenticatedUserObject = locator<AuthenticatedUserObject>();
locator<AuthenticatedUserObject>();
class SplashScreen extends StatefulWidget { class SplashScreen extends StatefulWidget {
@override @override
@ -46,19 +46,56 @@ class _SplashScreenState extends State<SplashScreen> {
/// load the Privilege from service /// load the Privilege from service
Future loadPrivilege() async { Future loadPrivilege() async {
await _privilegeService.getPrivilege(); await _privilegeService.getPrivilege();
Provider.of<ProjectViewModel>(context, listen: false) Provider.of<ProjectViewModel>(context, listen: false).setPrivilegeModelList(privilege: _privilegeService.privilegeModelList);
.setPrivilegeModelList(privilege: _privilegeService.privilegeModelList);
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: Color(0xffF8F8F8),
body: Image.asset( body: Stack(
'assets/images/powerd-by.jpg', alignment: Alignment.center,
children: [
Padding(
padding: EdgeInsets.symmetric(horizontal: 53),
child: Image.asset(
'assets/images/new/hmg_logo.png',
fit: BoxFit.fitWidth, fit: BoxFit.fitWidth,
width: MediaQuery.of(context).size.width, width: MediaQuery.of(context).size.width,
), ),
),
Align(
alignment: Alignment.bottomCenter,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Text(
TranslationBase.of(context).poweredBy,
style: TextStyle(fontSize: 14, fontFamily: "Poppins", fontWeight: FontWeight.w400, color: Color(0xff333C45), letterSpacing: -0.56, height: 16 / 14),
),
SizedBox(
height: 5,
),
SvgPicture.asset(
'assets/images/new/cloud_logo.svg',
width: 40,
height: 40,
),
SizedBox(
height: 7,
),
Text(
"Version 1.1.0",
style: TextStyle(fontSize: 10, fontFamily: "Poppins", fontWeight: FontWeight.w400, color: Color(0xff3989898), letterSpacing: 0, height: 12 / 10),
),
SizedBox(
height: 18,
)
],
),
)
],
),
); );
} }
} }

@ -118,6 +118,12 @@ class TranslationBase {
String get welcome => localizedValues['welcome'][locale.languageCode]; String get welcome => localizedValues['welcome'][locale.languageCode];
String get welcomeTo => localizedValues['welcome-to'][locale.languageCode];
String get drSulaimanText => localizedValues['dr-sulaiman-text'][locale.languageCode];
String get patientApp => localizedValues['patient-app'][locale.languageCode];
String get welcomeText => localizedValues['welcome_text'][locale.languageCode]; String get welcomeText => localizedValues['welcome_text'][locale.languageCode];
String get welcomeText2 => localizedValues['welcome_text2'][locale.languageCode]; String get welcomeText2 => localizedValues['welcome_text2'][locale.languageCode];

Loading…
Cancel
Save