Icons updated

assets/images/drawer/drawer_marathon.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20.527" height="19.358" viewBox="0 0 20.527 19.358">
+  <path id="winner" d="M8.828,34.936H14.18v6.547H8V35.763A.829.829,0,0,1,8.828,34.936ZM25.106,22.124a1.353,1.353,0,1,1-1.353,1.353A1.353,1.353,0,0,1,25.106,22.124Zm0,3.068a2.678,2.678,0,0,1,2.558,1.884.612.612,0,0,1-.585.793H23.133a.612.612,0,0,1-.584-.793,2.678,2.678,0,0,1,2.558-1.884Zm-6.842-.661a1.353,1.353,0,1,1-1.353,1.353A1.353,1.353,0,0,1,18.264,24.532Zm0,3.068a2.678,2.678,0,0,1,2.558,1.884.612.612,0,0,1-.584.793H16.291a.612.612,0,0,1-.584-.793A2.678,2.678,0,0,1,18.264,27.6Zm-6.842-.661a1.353,1.353,0,1,1-1.353,1.353A1.353,1.353,0,0,1,11.421,26.939Zm0,3.068a2.678,2.678,0,0,1,2.558,1.884.612.612,0,0,1-.584.793H9.448a.612.612,0,0,1-.584-.793A2.678,2.678,0,0,1,11.421,30.008Zm11.091.269H27.7a.829.829,0,0,1,.828.828V41.482H21.685V31.1A.829.829,0,0,1,22.513,30.277Zm-1.49,2.408H15.67a.829.829,0,0,0-.828.828v7.97h6.18Z" transform="translate(-8 -22.124)" fill="#2e303a" fill-rule="evenodd"/>
+</svg>

assets/images/winner_ribbon.svg

@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="195.225" height="49.742" viewBox="0 0 195.225 49.742">
+  <g id="ribbon" transform="translate(0 -280.776)">
+    <g id="Group_8895" data-name="Group 8895" transform="translate(0 280.776)">
+      <path id="Path_14052" data-name="Path 14052" d="M.125,280.776l12.038,25.168L0,330.518H97.613l20.923-22.538-20.923-27.2Z" transform="translate(0 -280.776)" fill="#1fa269"/>
+    </g>
+    <g id="Group_8896" data-name="Group 8896" transform="translate(97.613 280.776)">
+      <path id="Path_14054" data-name="Path 14054" d="M341.49,305.762l12.074-24.986H256v49.742h97.613Z" transform="translate(-256 -280.776)" fill="#1a8959"/>
+    </g>
+  </g>
+</svg>

lib/provider/dashboard_provider_model.dart

@@ -101,7 +101,7 @@ class DashboardProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
       DrawerMenuItem("assets/images/drawer/performance_evaluation.svg", LocaleKeys.performanceEvaluation.tr(), AppRoutes.performanceEvaluation),
       DrawerMenuItem("assets/images/drawer/mowadhafi.svg", LocaleKeys.mowadhafhi.tr(), AppRoutes.mowadhafhi),
       DrawerMenuItem("assets/images/drawer/pending_trasactions.svg", LocaleKeys.pendingTransactions.tr(), AppRoutes.pendingTransactions),
-      DrawerMenuItem("assets/images/drawer/pending_trasactions.svg", LocaleKeys.brainMarathon.tr(), AppRoutes.marathonIntroScreen),
+      DrawerMenuItem("assets/images/drawer/drawer_marathon.svg", LocaleKeys.brainMarathon.tr(), AppRoutes.marathonIntroScreen),
       DrawerMenuItem("assets/images/drawer/change_password.svg", LocaleKeys.changePassword.tr(), AppRoutes.changePassword),
     ];
 

lib/ui/login/login_screen.dart

@@ -140,7 +140,7 @@ class _LoginScreenState extends State<LoginScreen> {
   Widget build(BuildContext context) {
     if (isAppOpenBySystem == null) {
       isAppOpenBySystem = (ModalRoute.of(context)!.settings.arguments ?? true) as bool;
-      if (kReleaseMode) {
+      if (kDebugMode) {
         // username.text = "15444"; // Maha User
         username.text = "15153"; // Tamer User
         password.text = "Abcd@12345";

lib/ui/marathon/widgets/countdown_timer.dart

@@ -33,8 +33,9 @@ class BuildCountdownTimer extends StatelessWidget {
     color: MyColors.white,
     fontSize: 24,
     fontStyle: FontStyle.italic,
+    fontFamily: "Poppins",
     letterSpacing: -1.44,
-    fontWeight: FontWeight.w600,
+    fontWeight: FontWeight.bold,
   );
 
   final TextStyle styleTextMarathon = const TextStyle(
@@ -141,15 +142,11 @@ class BuildCountdownTimer extends StatelessWidget {
             time.days == null
                 ? Text(
                     "00",
-                    style:
+                    style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
-                        screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
                   )
                 : Text(
-                    time.days! < 10
+                    time.days! < 10 ? "0${time.days.toString()}" : time.days.toString(),
-                        ? "0${time.days.toString()}"
+                    style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
-                        : time.days.toString(),
-                    style:
-                        screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
                   ),
             Text(
               LocaleKeys.days.tr(),
@@ -163,15 +160,11 @@ class BuildCountdownTimer extends StatelessWidget {
             time.hours == null
                 ? Text(
                     "00",
-                    style:
+                    style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
-                        screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
                   )
                 : Text(
-                    time.hours! < 10
+                    time.hours! < 10 ? "0${time.hours.toString()}" : time.hours.toString(),
-                        ? "0${time.hours.toString()}"
+                    style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
-                        : time.hours.toString(),
-                    style:
-                        screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
                   ),
             Text(
               LocaleKeys.hours.tr(),
@@ -185,15 +178,11 @@ class BuildCountdownTimer extends StatelessWidget {
             time.min == null
                 ? Text(
                     "00",
-                    style:
+                    style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
-                        screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
                   )
                 : Text(
-                    time.min! < 10
+                    time.min! < 10 ? "0${time.min.toString()}" : time.min.toString(),
-                        ? "0${time.min.toString()}"
+                    style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
-                        : time.min.toString(),
-                    style:
-                        screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
                   ),
             Text(
               LocaleKeys.minutes.tr(),
@@ -207,15 +196,11 @@ class BuildCountdownTimer extends StatelessWidget {
             time.sec == null
                 ? Text(
                     "00",
-                    style:
+                    style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
-                        screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
                   )
                 : Text(
-                    time.sec! < 10
+                    time.sec! < 10 ? "0${time.sec.toString()}" : time.sec.toString(),
-                        ? "0${time.sec.toString()}"
+                    style: screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
-                        : time.sec.toString(),
-                    style:
-                        screenFlag == 0 ? styleDigitHome : styleDigitMarathon,
                   ),
             Text(
               LocaleKeys.seconds.tr(),

lib/ui/marathon/widgets/marathon_banner.dart

@@ -1,3 +1,4 @@
+import 'package:auto_size_text/auto_size_text.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
@@ -22,6 +23,7 @@ class MarathonBanner extends StatelessWidget {
     MarathonProvider provider = context.read<MarathonProvider>();
     return Container(
       decoration: MyDecorations.shadowDecoration,
+      height: 90,
       child: Stack(
         children: [
           Transform(
@@ -35,16 +37,33 @@ class MarathonBanner extends StatelessWidget {
               width: MediaQuery.of(context).size.width - 40,
             ),
           ),
-          Row(
+          SizedBox(
+            width: double.infinity,
+            height: double.infinity,
+            child: Row(
+              children: [
+                const Expanded(
+                  flex: 3,
+                  child: SizedBox(
+                    width: double.infinity,
+                    height: double.infinity,
+                  ),
+                ),
+                Expanded(
+                  flex: 5,
+                  child: SizedBox(
+                    width: double.infinity,
+                    height: double.infinity,
+                    child: Row(
                       mainAxisAlignment: MainAxisAlignment.end,
                       children: <Widget>[
                         Column(
                           mainAxisAlignment: MainAxisAlignment.center,
+                          crossAxisAlignment: CrossAxisAlignment.start,
                           mainAxisSize: MainAxisSize.min,
                           children: <Widget>[
                             AppState().isArabic(context) ? 0.height : 5.height,
-                  Flexible(
+                            AutoSizeText(
-                    child: Text(
                               LocaleKeys.getReadyForContest.tr(),
                               style: const TextStyle(
                                 fontStyle: FontStyle.italic,
@@ -54,9 +73,7 @@ class MarathonBanner extends StatelessWidget {
                                 letterSpacing: -0.4,
                               ),
                             ),
-                  ),
+                            const AutoSizeText(
-                  const Flexible(
-                    child: Text(
                               "Saudi Arabia",
                               style: TextStyle(
                                 fontStyle: FontStyle.italic,
@@ -66,7 +83,6 @@ class MarathonBanner extends StatelessWidget {
                                 height: 32 / 22,
                               ),
                             ),
-                  ),
                             3.height,
                             BuildCountdownTimer(
                               timeToMarathon: dummyEndTime,
@@ -79,6 +95,11 @@ class MarathonBanner extends StatelessWidget {
                           right: AppState().isArabic(context) ? 0 : 12,
                         )
                       ],
+                    ).paddingOnly(right: 20),
+                  ),
+                ),
+              ],
+            ),
           ),
         ],
       ).onPress(

lib/ui/marathon/winner_screen.dart

@@ -1,5 +1,6 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
 import 'package:lottie/lottie.dart';
 import 'package:mohem_flutter_app/classes/colors.dart';
 import 'package:mohem_flutter_app/classes/decorations_helper.dart';
@@ -43,18 +44,34 @@ class WinnerScreen extends StatelessWidget {
                       ],
                     ),
                   ),
-                  50.height,
+                  26.height,
+                  SizedBox(
+                    height: 50,
+                    child: Stack(
+                      children: [
+                        Align(
+                          alignment: Alignment.center,
+                          child: SvgPicture.asset(
+                            "assets/images/winner_ribbon.svg",
+                            height: 50,
+                          ),
+                        ),
+                        Align(
+                          alignment: Alignment.center,
+                          child: "WINNER".toText32(color: MyColors.white, isBold: true).paddingOnly(top: 07),
+                        )
+                      ],
+                    ),
+                  ),
+                  12.height,
                   "Muhammad Shrouff".toText22(color: MyColors.grey3AColor),
                   "837436".toText22(color: MyColors.grey57Color),
-                  90.height,
+                  80.height,
                   Row(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: <Widget>[
-                      LocaleKeys.sponsoredBy
+                      LocaleKeys.sponsoredBy.tr().toText14(color: MyColors.grey77Color),
-                          .tr()
+                      " Extra".toText14(color: MyColors.darkTextColor, isBold: true),
-                          .toText14(color: MyColors.grey77Color),
-                      " Extra".toText14(
-                          color: MyColors.darkTextColor, isBold: true),
                     ],
                   ),
                   5.height,