Haroon6138
/
mohemm-flutter-app
1
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev

Browse Source
merge-requests/48/head
Sultan khan 2 years ago
parent 4b79c6eda3 2fdde18b52
commit 5cd0ff1567
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File

14
assets/images/marathon_banner_bg.svg
Unescape Escape View File

@ -1,4 +1,4 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="333" height="88.222" viewBox="0 0 333 88.222">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="334" height="89" viewBox="0 0 334 89">
<defs>
<clipPath id="clip-path">
<rect id="Rectangle_17532" data-name="Rectangle 17532" width="54.986" height="20.029" fill="none"/>
@ -33,10 +33,6 @@
<clipPath id="clip-path-13">
<rect id="Rectangle_17620" data-name="Rectangle 17620" width="61.469" height="15.006" fill="none"/>
</clipPath>
<linearGradient id="linear-gradient" x1="0.111" y1="0.256" x2="0.944" y2="0.848" gradientUnits="objectBoundingBox">
<stop offset="0" stop-color="#ffee1f"/>
<stop offset="1" stop-color="#f4b045"/>
</linearGradient>
<clipPath id="clip-path-14">
<rect id="Rectangle_17693" data-name="Rectangle 17693" width="333" height="88" rx="15" fill="#fff"/>
</clipPath>
@ -53,10 +49,10 @@
<rect id="Rectangle_17683" data-name="Rectangle 17683" width="111.63" height="15.748" fill="none"/>
</clipPath>
</defs>
<g id="Group_8897" data-name="Group 8897" transform="translate(-21 -321.778)">
<g id="Group_8897" data-name="Group 8897" transform="translate(-20.5 -321.5)">
<g id="Group_8890" data-name="Group 8890" transform="translate(21 321.778)">
<g id="Group_8745" data-name="Group 8745" transform="translate(0 0)">
<rect id="Rectangle_17692" data-name="Rectangle 17692" width="333" height="88" rx="15" transform="translate(0 0.222)" fill="#fff"/>
<rect id="Rectangle_17692" data-name="Rectangle 17692" width="333" height="88" rx="15" transform="translate(0 0.222)" fill="#fff" stroke="#f5f5f5" stroke-width="1"/>
<g id="Group_8889" data-name="Group 8889" transform="translate(0.31 4.779)">
<g id="Group_8902" data-name="Group 8902" transform="translate(0)">
<rect id="Rectangle_17523" data-name="Rectangle 17523" width="26.188" height="0.075" transform="translate(22.444 75.504)" fill="#ebebeb"/>
@ -243,7 +239,7 @@
</g>
</g>
</g>
<path id="Path_13973" data-name="Path 13973" d="M-122.1,0,64.718-.222A14.962,14.962,0,0,1,79.68,14.741V72.6A14.962,14.962,0,0,1,64.718,87.557l-215.6.221Z" transform="translate(253 0.222)" fill="url(#linear-gradient)"/>
<path id="Path_13973" data-name="Path 13973" d="M-122.1,0,64.718-.222A14.962,14.962,0,0,1,79.68,14.741V72.6A14.962,14.962,0,0,1,64.718,87.557l-215.6.221Z" transform="translate(253 0.222)" fill="#2d2f39" opacity="0.998"/>
<g id="Mask_Group_9" data-name="Mask Group 9" transform="translate(0 0.222)" clip-path="url(#clip-path-14)">
<g id="Group_8909" data-name="Group 8909" transform="translate(83.633 -11.455)">
<g id="Group_8908" data-name="Group 8908" transform="translate(0 0)">
@ -307,7 +303,7 @@
</g>
</g>
<g id="light-bulb" transform="translate(282.24 326.782)" opacity="0.054">
<path id="XMLID_49_" d="M52.08,62.218V64.3a3.3,3.3,0,0,1-2.8,3.267l-.513,1.89A2.352,2.352,0,0,1,46.5,71.2H41.415a2.352,2.352,0,0,1-2.271-1.743l-.5-1.89a3.314,3.314,0,0,1-2.813-3.282V62.2a2,2,0,0,1,2.009-2H50.073a2.023,2.023,0,0,1,2.007,2.018Zm9.42-28.04a17.452,17.452,0,0,1-4.922,12.174,16.084,16.084,0,0,0-4.307,8.731A2.9,2.9,0,0,1,49.4,57.53H38.514a2.872,2.872,0,0,1-2.857-2.43,16.263,16.263,0,0,0-4.336-8.761A17.538,17.538,0,1,1,61.5,34.178ZM45.942,23.557a1.979,1.979,0,0,0-1.978-1.978A12.67,12.67,0,0,0,31.306,34.237a1.978,1.978,0,1,0,3.955,0,8.713,8.713,0,0,1,8.7-8.7,1.97,1.97,0,0,0,1.981-1.98ZM43.964,10.885a1.979,1.979,0,0,0,1.978-1.978V1.978a1.978,1.978,0,0,0-3.955,0V8.907a1.979,1.979,0,0,0,1.977,1.978ZM20.685,34.164a1.979,1.979,0,0,0-1.978-1.978H11.778a1.978,1.978,0,0,0,0,3.955h6.929a1.97,1.97,0,0,0,1.978-1.977ZM76.15,32.186H69.22a1.978,1.978,0,0,0,0,3.955h6.93a1.978,1.978,0,0,0,0-3.955ZM24.714,50.63l-4.908,4.908a1.974,1.974,0,0,0,2.783,2.8l4.911-4.91a1.974,1.974,0,1,0-2.783-2.8ZM61.822,18.283a1.975,1.975,0,0,0,1.392-.571L68.122,12.8a1.98,1.98,0,1,0-2.8-2.8l-4.908,4.908a1.972,1.972,0,0,0,0,2.8A2.009,2.009,0,0,0,61.822,18.283ZM24.714,17.7A1.975,1.975,0,0,0,27.5,14.9L22.589,9.991a1.98,1.98,0,0,0-2.8,2.8Zm38.5,32.933a1.98,1.98,0,1,0-2.8,2.8l4.908,4.908a1.974,1.974,0,0,0,2.784-2.8Z" transform="translate(-9.844 -0.044)" fill="#34363f"/>
<path id="XMLID_49_" d="M52.08,62.218V64.3a3.3,3.3,0,0,1-2.8,3.267l-.513,1.89A2.352,2.352,0,0,1,46.5,71.2H41.415a2.352,2.352,0,0,1-2.271-1.743l-.5-1.89a3.314,3.314,0,0,1-2.813-3.282V62.2a2,2,0,0,1,2.009-2H50.073a2.023,2.023,0,0,1,2.007,2.018Zm9.42-28.04a17.452,17.452,0,0,1-4.922,12.174,16.084,16.084,0,0,0-4.307,8.731A2.9,2.9,0,0,1,49.4,57.53H38.514a2.872,2.872,0,0,1-2.857-2.43,16.263,16.263,0,0,0-4.336-8.761A17.538,17.538,0,1,1,61.5,34.178ZM45.942,23.557a1.979,1.979,0,0,0-1.978-1.978A12.67,12.67,0,0,0,31.306,34.237a1.978,1.978,0,1,0,3.955,0,8.713,8.713,0,0,1,8.7-8.7,1.97,1.97,0,0,0,1.981-1.98ZM43.964,10.885a1.979,1.979,0,0,0,1.978-1.978V1.978a1.978,1.978,0,0,0-3.955,0V8.907a1.979,1.979,0,0,0,1.977,1.978ZM20.685,34.164a1.979,1.979,0,0,0-1.978-1.978H11.778a1.978,1.978,0,0,0,0,3.955h6.929a1.97,1.97,0,0,0,1.978-1.977ZM76.15,32.186H69.22a1.978,1.978,0,0,0,0,3.955h6.93a1.978,1.978,0,0,0,0-3.955ZM24.714,50.63l-4.908,4.908a1.974,1.974,0,0,0,2.783,2.8l4.911-4.91a1.974,1.974,0,1,0-2.783-2.8ZM61.822,18.283a1.975,1.975,0,0,0,1.392-.571L68.122,12.8a1.98,1.98,0,1,0-2.8-2.8l-4.908,4.908a1.972,1.972,0,0,0,0,2.8A2.009,2.009,0,0,0,61.822,18.283ZM24.714,17.7A1.975,1.975,0,0,0,27.5,14.9L22.589,9.991a1.98,1.98,0,0,0-2.8,2.8Zm38.5,32.933a1.98,1.98,0,1,0-2.8,2.8l4.908,4.908a1.974,1.974,0,0,0,2.784-2.8Z" transform="translate(-9.844 -0.044)" fill="#fff"/>
</g>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

4
lib/ui/marathon/widgets/countdown_timer.dart
Unescape Escape View File

@ -22,7 +22,7 @@ class BuildCountdownTimer extends StatelessWidget {
}) : super(key: key);
final TextStyle styleTextHome = TextStyle(
color: MyColors.grey3AColor.withOpacity(0.45),
color: MyColors.white.withOpacity(0.45),
fontStyle: FontStyle.italic,
fontWeight: FontWeight.w800,
letterSpacing: -0.4,
@ -30,7 +30,7 @@ class BuildCountdownTimer extends StatelessWidget {
final TextStyle styleDigitHome = const TextStyle(
height: 23 / 27,
color: MyColors.darkDigitColor,
color: MyColors.white,
fontStyle: FontStyle.italic,
letterSpacing: -1.44,
fontWeight: FontWeight.bold,

4
lib/ui/marathon/widgets/marathon_banner.dart
Unescape Escape View File

@ -83,7 +83,7 @@ class MarathonBanner extends StatelessWidget {
style: TextStyle(
fontStyle: FontStyle.italic,
fontWeight: FontWeight.w600,
color: MyColors.grey3AColor.withOpacity(0.8),
color: MyColors.white.withOpacity(0.83),
letterSpacing: -0.4,
),
),
@ -93,7 +93,7 @@ class MarathonBanner extends StatelessWidget {
fontStyle: FontStyle.italic,
fontSize: 19,
fontWeight: FontWeight.bold,
color: MyColors.grey3AColor.withOpacity(0.8),
color: MyColors.white.withOpacity(0.83),
height: 32 / 22,
),
),

3
pubspec.yaml
Unescape Escape View File

@ -183,3 +183,6 @@ flutter:
#
# For details regarding fonts from package dependencies,
# see https://flutter.dev/custom-fonts/#from-packages
# Adding this to test the push from iMac

Write Preview
Loading…
Cancel
Save