Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app

11 months ago · 5fae260ffa
parent ff908bd2a7 2e60909e05
commit 5fae260ffa
9 changed files with 1144 additions and 1127 deletions
--- a/assets/langs/ar-SA.json
+++ b/assets/langs/ar-SA.json
@ -540,5 +540,7 @@
  "expiredDocuments": "المستندات منتهية الصلاحية",
  "missingDocuments": "مستندات مفقودة",
  "uploadedDocuments": "المستندات التي تم تحميلها",
-  "addAtLeastOneAttachment": "الرجاء إضافة مرفق واحد على الأقل."
+  "addAtLeastOneAttachment": "الرجاء إضافة مرفق واحد على الأقل.",
+  "pleaseClickButtonToJoinMarathon": "الرجاء الضغط على الزر أدناه للانضمام إلى الماراثون",
+  "youCannotJoinTheMarathon": "لا يمكنك الانضمام إلى الماراثون لأنك تجاوزت الحد الزمني"
 }
--- a/assets/langs/en-US.json
+++ b/assets/langs/en-US.json
@ -539,8 +539,7 @@
  "allDocuments": "All\nDocuments",
  "expiredDocuments": "Expired\nDocuments",
  "missingDocuments": "Missing\nDocuments",
-  "uploadedDocuments": "Uploaded\nDocuments"
-  "resetAdPassword": "Reset AD Password"
+  "uploadedDocuments": "Uploaded\nDocuments",
  "manage": "Manage",
  "members": "Members",
  "areYouSureWantTodelete": "Are you sure want to delete?",
@ -560,5 +559,7 @@
  "userSearch": "User Search",
  "userName": "User Name",
  "userId": "UserID",
-  "addAtLeastOneAttachment": "Please add at least one attachment."
+  "addAtLeastOneAttachment": "Please add at least one attachment.",
+  "pleaseClickButtonToJoinMarathon": "Press the button below to join the Marathon.",
+  "youCannotJoinTheMarathon": "You cannot join the Marathon because you have exceeded the time limit."
 }
--- a/lib/extensions/string_extensions.dart
+++ b/lib/extensions/string_extensions.dart
@ -162,8 +162,9 @@ extension EmailValidator on String {
        ),
      );

-  Widget toText17({Color? color, bool isBold = false}) => Text(
+  Widget toText17({Color? color, bool isBold = false, bool isCentered = false}) => Text(
        this,
+        textAlign: isCentered ? TextAlign.center : null,
        style: TextStyle(color: color ?? MyColors.darkTextColor, fontSize: 17, letterSpacing: -0.68, fontWeight: isBold ? FontWeight.bold : FontWeight.w600),
      );

@ -196,7 +197,6 @@ extension EmailValidator on String {
        style: TextStyle(height: 1, color: color ?? MyColors.darkTextColor, fontSize: 22, letterSpacing: -1.44, fontWeight: isBold ? FontWeight.bold : FontWeight.w600),
      );

-
  Widget toText23({Color? color, bool isBold = false, bool isCentered = false}) => Text(
        this,
        textAlign: isCentered ? TextAlign.center : null,
--- a/lib/generated/codegen_loader.g.dart
+++ b/lib/generated/codegen_loader.g.dart
@ -6,15 +6,15 @@ import 'dart:ui';

 import 'package:easy_localization/easy_localization.dart' show AssetLoader;

-class CodegenLoader extends AssetLoader{
+class CodegenLoader extends AssetLoader {
  const CodegenLoader();

  @override
-  Future<Map<String, dynamic>> load(String fullPath, Locale locale ) {
+  Future<Map<String, dynamic>> load(String fullPath, Locale locale) {
    return Future.value(mapLocales[locale.toString()]);
  }

-  static const Map<String,dynamic> ar_SA = {
+  static const Map<String, dynamic> ar_SA = {
    "mohemm": "Mohemm",
    "english": "English",
    "arabic": "عربي",
@ -446,11 +446,7 @@ class CodegenLoader extends AssetLoader{
    "CorrectAddress": "تصحيح أو تعديل هذا العنوان",
    "SelectChangeWantToMake": " حدد نوع التغيير الذي تريد القيام به.",
    "profile": {
-    "reset_password": {
-      "label": "Reset Password",
-      "username": "Username",
-      "password": "password"
-    },
+      "reset_password": {"label": "Reset Password", "username": "Username", "password": "password"},
      "profileCompletionPer": "استكمال الملف الشخصي",
      "completeProfile": "الملف الشخصي الكامل",
      "personalInformation": "معلومات شخصية",
@ -472,10 +468,7 @@ class CodegenLoader extends AssetLoader{
    "gender": {
      "male": "Hi man ;) ",
      "female": "Hello girl :)",
-    "with_arg": {
-      "male": "Hi man ;) {}",
-      "female": "Hello girl :) {}"
-    }
+      "with_arg": {"male": "Hi man ;) {}", "female": "Hello girl :) {}"}
    },
    "reset_locale": "إعادة ضبط اللغة",
    "chat": "دردشة",
@ -555,9 +548,11 @@ class CodegenLoader extends AssetLoader{
    "allDocuments": "كافة المستندات",
    "expiredDocuments": "المستندات منتهية الصلاحية",
    "missingDocuments": "مستندات مفقودة",
-  "uploadedDocuments": "المستندات التي تم تحميلها"
-};
-static const Map<String,dynamic> en_US = {
+    "uploadedDocuments": "المستندات التي تم تحميلها",
+    "youCannotJoinTheMarathon": "لا يمكنك الانضمام إلى الماراثون لأنك تجاوزت الحد الزمني",
+    "pleaseClickButtonToJoinMarathon": "الرجاء الضغط على الزر أدناه للانضمام إلى الماراثون",
+  };
+  static const Map<String, dynamic> en_US = {
    "mohemm": "Mohemm",
    "english": "English",
    "arabic": "عربي",
@ -989,11 +984,7 @@ static const Map<String,dynamic> en_US = {
    "CorrectAddress": "Correct or amend this address",
    "SelectChangeWantToMake": "Select the type of change you want to make",
    "profile": {
-    "reset_password": {
-      "label": "Reset Password",
-      "username": "Username",
-      "password": "password"
-    },
+      "reset_password": {"label": "Reset Password", "username": "Username", "password": "password"},
      "profileCompletionPer": "Profile Completion",
      "completeProfile": "Complete Profile",
      "personalInformation": "Personal Information",
@ -1015,10 +1006,7 @@ static const Map<String,dynamic> en_US = {
    "gender": {
      "male": "Hi man ;) ",
      "female": "Hello girl :)",
-    "with_arg": {
-      "male": "Hi man ;) {}",
-      "female": "Hello girl :) {}"
-    }
+      "with_arg": {"male": "Hi man ;) {}", "female": "Hello girl :) {}"}
    },
    "reset_locale": "Reset Language",
    "chat": "Chat",
@ -1117,7 +1105,9 @@ static const Map<String,dynamic> en_US = {
    "searchByUserName": "Search By Username",
    "userSearch": "User Search",
    "userName": "User Name",
-  "userId": "UserID"
-};
-static const Map<String, Map<String,dynamic>> mapLocales = {"ar_SA": ar_SA, "en_US": en_US};
+    "userId": "UserID",
+    "pleaseClickButtonToJoinMarathon": "Press the button below to join the Marathon.",
+    "youCannotJoinTheMarathon": "You cannot join the Marathon because you have exceeded the time limit."
+  };
+  static const Map<String, Map<String, dynamic>> mapLocales = {"ar_SA": ar_SA, "en_US": en_US};
 }
--- a/lib/generated/locale_keys.g.dart
+++ b/lib/generated/locale_keys.g.dart
@ -547,4 +547,6 @@ abstract class  LocaleKeys {
  static const userName ='userName';
  static const userId ='userId';
  static const addAtLeastOneAttachment ='addAtLeastOneAttachment';
+  static const pleaseClickButtonToJoinMarathon ='pleaseClickButtonToJoinMarathon';
+  static const youCannotJoinTheMarathon ='youCannotJoinTheMarathon';
 }
--- a/lib/main.dart
+++ b/lib/main.dart
@ -9,7 +9,6 @@ import 'package:mohem_flutter_app/classes/consts.dart';
 import 'package:mohem_flutter_app/config/routes.dart';
 import 'package:mohem_flutter_app/generated/codegen_loader.g.dart';
 import 'package:mohem_flutter_app/models/post_params_model.dart';
-import 'package:mohem_flutter_app/provider/chat_call_provider.dart';
 import 'package:mohem_flutter_app/provider/chat_provider_model.dart';
 import 'package:mohem_flutter_app/provider/dashboard_provider_model.dart';
 import 'package:mohem_flutter_app/provider/eit_provider_model.dart';
@ -20,6 +19,11 @@ import 'package:provider/provider.dart';
 import 'package:provider/single_child_widget.dart';
 import 'package:sizer/sizer.dart';

+
+// test uat account
+// username  199067
+// pass h123456
+
 Logger logger = Logger(
  // filter: null, // Use the default LogFilter (-> only log in debug mode)
  printer: PrettyPrinter(
--- a/lib/ui/marathon/widgets/marathon_details_card.dart
+++ b/lib/ui/marathon/widgets/marathon_details_card.dart
@ -64,7 +64,7 @@ class MarathonDetailsCard extends StatelessWidget {
            marathonDetailModel.sponsors!.first.sponsorPrizes != null
                ? Row(
                    children: <Widget>[
-                      "${LocaleKeys.prize.tr()} ".toText16(color: MyColors.grey77Color, isBold: true),
+                      "${LocaleKeys.prize.tr()} ".toText16(color: MyColors.grey77Color),
                      Expanded(
                        child: SizedBox(
                          height: 30,
--- a/lib/ui/marathon/widgets/marathon_footer.dart
+++ b/lib/ui/marathon/widgets/marathon_footer.dart
@ -1,6 +1,10 @@
+// ignore_for_file: always_specify_types
+
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:mohem_flutter_app/classes/colors.dart';
+import 'package:mohem_flutter_app/extensions/int_extensions.dart';
+import 'package:mohem_flutter_app/extensions/string_extensions.dart';
 import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
 import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
 import 'package:mohem_flutter_app/ui/marathon/marathon_provider.dart';
@ -41,15 +45,29 @@ class MarathonFooter extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    return provider.isUpComingMarathon && !provider.canPlayDemo
-        ? DefaultButton(
+    if (provider.isUpComingMarathon && !provider.canPlayDemo) {
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          if (provider.isButtonEnabled && (provider.totalSecondsToWaitForMarathon < 30 && provider.totalSecondsToWaitForMarathon > 0)) ...[
+            LocaleKeys.pleaseClickButtonToJoinMarathon.tr().toText18(color: MyColors.greenColor, isCentered: true),
+            20.height,
+          ] else if (!provider.isButtonEnabled && (provider.totalSecondsToWaitForMarathon <= 0)) ...[
+            LocaleKeys.youCannotJoinTheMarathon.tr().toText18(color: MyColors.redColor, isCentered: true),
+            20.height,
+          ],
+          DefaultButton(
            LocaleKeys.joinMarathon.tr(),
            provider.isButtonEnabled ? () => provider.onJoinMarathonPressed(context) : null,
-          ).insideContainer
-        : DefaultButton(
+          )
+        ],
+      ).insideContainer;
+    } else {
+      return DefaultButton(
        LocaleKeys.joinDemoMarathon.tr(),
        () => provider.onJoinDemoMarathonPressed(context),
        color: MyColors.yellowColorII,
      ).insideContainer;
    }
+  }
 }
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -88,7 +88,7 @@ dependencies:
  signalr_netcore: ^1.3.3
  logging: ^1.0.1
  swipe_to: ^1.0.2
-  flutter_webrtc: ^0.9.16
+  flutter_webrtc: ^0.9.17
  camera: ^0.10.3
  flutter_local_notifications: ^10.0.0
  #firebase_analytics: any