Get Notification User Information Updates

# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart

.vscode/settings.json

@@ -1,5 +1,6 @@
 {
     "cSpell.words": [
         "MPLOYEEIMAGE"
-    ]
+    ],
+    "java.configuration.updateBuildConfiguration": "disabled"
 }

AppIcons/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -0,0 +1 @@
+{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"72x72","expected-size":"72","filename":"72.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"76x76","expected-size":"152","filename":"152.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"50x50","expected-size":"100","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"76x76","expected-size":"76","filename":"76.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"50x50","expected-size":"50","filename":"50.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"72x72","expected-size":"144","filename":"144.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"40x40","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"83.5x83.5","expected-size":"167","filename":"167.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"20x20","expected-size":"20","filename":"20.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"}]}

AuthKey_67L2G322GR.p8

@@ -0,0 +1,6 @@
+-----BEGIN PRIVATE KEY-----
+MIGTAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBHkwdwIBAQQg+oBl9YdOiMRXfQZe
+nIe6tR1tojoOvvcohNJmJtH+SsagCgYIKoZIzj0DAQehRANCAATDY9E82MAgMI/g
+bKF1t4zLHJ1Yt9uoOnedNYsfyZLhh3l3ZyXRj02uDXz04AsNbNFjkLJXPc4xY9ad
++A4rY70x
+-----END PRIVATE KEY-----

android/agconnect-services.json

@@ -0,0 +1,57 @@
+{
+	"agcgw_all":{
+		"CN":"connect-drcn.dbankcloud.cn",
+		"CN_back":"connect-drcn.hispace.hicloud.com",
+		"DE":"connect-dre.dbankcloud.cn",
+		"DE_back":"connect-dre.hispace.hicloud.com",
+		"RU":"connect-drru.hispace.dbankcloud.ru",
+		"RU_back":"connect-drru.hispace.dbankcloud.cn",
+		"SG":"connect-dra.dbankcloud.cn",
+		"SG_back":"connect-dra.hispace.hicloud.com"
+	},
+	"websocketgw_all":{
+		"CN":"connect-ws-drcn.hispace.dbankcloud.cn",
+		"CN_back":"connect-ws-drcn.hispace.dbankcloud.com",
+		"DE":"connect-ws-dre.hispace.dbankcloud.cn",
+		"DE_back":"connect-ws-dre.hispace.dbankcloud.com",
+		"RU":"connect-ws-drru.hispace.dbankcloud.ru",
+		"RU_back":"connect-ws-drru.hispace.dbankcloud.cn",
+		"SG":"connect-ws-dra.hispace.dbankcloud.cn",
+		"SG_back":"connect-ws-dra.hispace.dbankcloud.com"
+	},
+	"client":{
+		"cp_id":"2640966000002322881",
+		"product_id":"737518067793559971",
+		"client_id":"715996003571874624",
+		"client_secret":"B5B89A56A53847C6BB9D216A8747E75952760DF9A8232239D8744CD847A8FFDA",
+		"project_id":"737518067793559971",
+		"app_id":"104737117",
+		"api_key":"DAEDACKDrYgyco9mjPV9ZUjCSh1kCr/GBV0nseHH0z2mnxlZ41RksOKmyTi+PUTwmGEPK+VxCup4F9oUf4VbDnCsjB7aNBShYcjR+g==",
+		"package_name":"hmg.cloudSolutions.mohem"
+	},
+	"oauth_client":{
+		"client_id":"104737117",
+		"client_type":1
+	},
+	"app_info":{
+		"app_id":"104737117",
+		"package_name":"hmg.cloudSolutions.mohem"
+	},
+	"configuration_version":"3.0",
+	"appInfos":[
+		{
+			"package_name":"hmg.cloudSolutions.mohem",
+			"client":{
+				"app_id":"104737117"
+			},
+			"app_info":{
+				"package_name":"hmg.cloudSolutions.mohem",
+				"app_id":"104737117"
+			},
+			"oauth_client":{
+				"client_type":1,
+				"client_id":"104737117"
+			}
+		}
+	]
+}

android/app/build.gradle

@@ -1,25 +1,12 @@
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "com.google.gms.google-services"
+    id "dev.flutter.flutter-gradle-plugin"
+    id "com.google.firebase.crashlytics"
+    id "com.huawei.agconnect"
 }
 
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
 
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
@@ -27,18 +14,17 @@ if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'com.google.gms.google-services'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-apply plugin: 'com.huawei.agconnect'
+
 
 android {
-    compileSdkVersion 33
+    namespace 'hmg.cloudSolutions.mohem'
+    compileSdk 36  // Changed from 36 to a supported version
+    ndkVersion '28.2.13676358'
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
+        coreLibraryDesugaringEnabled true
     }
 
     kotlinOptions {
@@ -53,9 +39,15 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "hmg.cloudSolutions.mohem"
         minSdkVersion 28
-        targetSdkVersion 33
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+//        targetSdk = flutter.targetSdkVersion
+        targetSdk 35
+        versionCode flutter.versionCode
+        versionName flutter.versionName
+        multiDexEnabled true
+    }
+
+    buildFeatures{
+        buildConfig true
     }
 
     signingConfigs {
@@ -84,5 +76,9 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.20"
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
+    implementation 'com.huawei.hms:push:6.11.0.300'
+
+
 }

android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mohem_flutter_app">
+    >
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

android/app/src/main/AndroidManifest.xml

@@ -1,13 +1,26 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mohem_flutter_app">
+    xmlns:tools="http://schemas.android.com/tools"
+    >
 
-    <uses-permission android:name="android.permission.INTERNET" />
+<uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+
+    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" tools:node="remove" />
+
+    <!-- Required only if your app needs to access videos
+         that other apps created. -->
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+    <!-- Required only if your app needs to access audio files
+         that other apps created. -->
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+<!--    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />-->
     <!--    Chat Web RTC Calling -->
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
@@ -20,10 +33,21 @@
     <application
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
-        android:label="Mohemm"
+        android:label="MoheM"
         android:extractNativeLibs="true"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round">
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true"
+            tools:replace="android:authorities">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/filepaths"
+                tools:replace="android:resource" />
+        </provider>
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"

android/app/src/main/kotlin/hmg/cloudSolutions/mohem/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.mohem_flutter_app
+package hmg.cloudSolutions.mohem
 
 //import io.flutter.embedding.android.FlutterActivity
 //

android/app/src/main/res/xml/filepaths.xml

@@ -0,0 +1,8 @@
+<paths>
+    <external-path name="external-path" path="."/>
+    <external-cache-path name="external-cache-path" path="."/>
+    <external-files-path name="external-files-path" path="."/>
+    <files-path name="files_path" path="."/>
+    <cache-path name="cache-path" path="."/>
+    <root-path name="root" path="."/>
+</paths>

android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mohem_flutter_app">
+    >
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

android/build.gradle

@@ -1,5 +1,4 @@
 buildscript {
-    ext.kotlin_version = '1.6.0'
     repositories {
         google()
         mavenCentral()
@@ -7,10 +6,10 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.8'
-        classpath 'com.huawei.agconnect:agcp:1.8.0.300'
+        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
+        classpath 'com.google.gms:google-services:4.3.15'
+        classpath 'com.huawei.agconnect:agcp:1.9.1.304'
     }
 }
 
@@ -20,14 +19,66 @@ allprojects {
         mavenCentral()
         maven { url 'https://developer.huawei.com/repo/' }
     }
+
+    // Exclude old BouncyCastle globally to avoid duplicate classes
+    configurations.all {
+        exclude group: 'org.bouncycastle', module: 'bcprov-jdk16'
+    }
+
+    tasks.withType(JavaCompile).configureEach {
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
+    }
+
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+        kotlinOptions {
+            jvmTarget = "21"
+        }
+    }
+
+    subprojects {
+        afterEvaluate { project ->
+            if (project.hasProperty('android')) {
+                project.android {
+                    if (namespace == null) {
+                        namespace project.group
+                    }
+
+                    buildFeatures {
+                        if (buildConfig == null) {
+                            buildConfig true
+                        }
+                    }
+                    compileOptions {
+                        sourceCompatibility JavaVersion.VERSION_21
+                        targetCompatibility JavaVersion.VERSION_21
+                    }
+                }
+            }
+            // Force Java 17 for all JavaCompile tasks in all subprojects (including plugins)
+            project.tasks.withType(JavaCompile).configureEach {
+                sourceCompatibility = JavaVersion.VERSION_21
+                targetCompatibility = JavaVersion.VERSION_21
+            }
+            // Force Kotlin JVM target for all subprojects
+            project.tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+                kotlinOptions {
+                    jvmTarget = "21"
+                }
+            }
+        }
+    }
 }
 
+
 rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+tasks.register("clean", Delete) {
+    delete rootProject.layout.buildDirectory
 }

android/gradle.properties

@@ -1,3 +1,6 @@
-org.gradle.jvmargs=-Xmx1836M
+org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true
 android.enableJetifier=true
+apmsInstrumentationEnabled=false
+
+#org.gradle.java.home=/Users/amirs/Library/Java/JavaVirtualMachines/jbr-17.0.12/Contents/Home/

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Tue Jul 08 11:08:34 AST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip

android/settings.gradle

@@ -1,11 +1,56 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+        maven { url 'https://developer.huawei.com/repo/' }
+    }
+
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.id == "com.huawei.agconnect") {
+                useModule("com.huawei.agconnect:agcp:1.9.1.304")
+            }
+        }
+    }
+
+}
+
+
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version '8.11.0' apply false
+    id("org.jetbrains.kotlin.android") version "2.2.0" apply false
+    id("com.google.gms.google-services") version "4.4.3" apply false
+    id("com.google.firebase.crashlytics") version "3.0.4" apply false
+    id('org.gradle.toolchains.foojay-resolver-convention') version '0.9.0' apply false
+    id "com.huawei.agconnect" version "1.9.1.304" apply false
+}
+
+
+dependencyResolutionManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+        maven { url 'https://developer.huawei.com/repo/' }
+        maven {
+            url "https://artifactory.ess-dev.com/artifactory/gradle-dev-local"
+        }
+    }
+}
+
+
+
+include ":app"

assets/icons/close.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path id="delete_1_" data-name="delete (1)" d="M13.657,2.343A8,8,0,0,0,2.343,13.657,8,8,0,0,0,13.657,2.343Zm-2.2,8.012a.781.781,0,1,1-1.1,1.1L8,9.1,5.645,11.46a.781.781,0,0,1-1.1-1.1L6.9,8,4.54,5.645a.781.781,0,0,1,1.1-1.1L8,6.9,10.355,4.54a.781.781,0,0,1,1.1,1.1L9.1,8Zm0,0" fill="#ca3332"/>
+</svg>

assets/icons/itg/alert.svg

@@ -0,0 +1,3 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.49171 1.97683C9.39251 1.79825 9.20428 1.6875 9 1.6875C8.79572 1.6875 8.60749 1.79825 8.50829 1.97683L1.00829 15.4768C0.911496 15.6511 0.914125 15.8635 1.0152 16.0353C1.11627 16.207 1.3007 16.3125 1.5 16.3125H16.5C16.6993 16.3125 16.8837 16.207 16.9848 16.0353C17.0859 15.8635 17.0885 15.6511 16.9917 15.4768L9.49171 1.97683ZM8.4375 12.375V13.5H9.5625V12.375H8.4375ZM9.5625 11.25V7.5H8.4375V11.25H9.5625Z" fill="#EB5757"/>
+</svg>

assets/icons/itg/calendar-remove.svg

@@ -0,0 +1,4 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.6095 15.7235C13.0888 15.2028 12.2446 15.2028 11.7239 15.7235C11.2032 16.2442 11.2032 17.0885 11.7239 17.6091L14.1144 19.9997L11.7239 22.3902C11.2032 22.9109 11.2032 23.7551 11.7239 24.2758C12.2446 24.7965 13.0888 24.7965 13.6095 24.2758L16 21.8853L18.3905 24.2758C18.9112 24.7965 19.7554 24.7965 20.2761 24.2758C20.7968 23.7551 20.7968 22.9109 20.2761 22.3902L17.8856 19.9997L20.2761 17.6091C20.7968 17.0885 20.7968 16.2442 20.2761 15.7235C19.7554 15.2028 18.9112 15.2028 18.3905 15.7235L16 18.1141L13.6095 15.7235Z" fill="#3B3D4A"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.33333 2.66634C9.33333 1.92996 8.73638 1.33301 8 1.33301C7.26362 1.33301 6.66667 1.92996 6.66667 2.66634V3.26481C5.65176 3.58674 4.76978 4.09292 4.02403 4.89914C2.91932 6.09342 2.44372 7.58997 2.21888 9.39789C1.99996 11.1583 1.99998 13.4051 2 16.2315V17.1012C1.99998 19.9276 1.99996 22.1744 2.21888 23.9348C2.44372 25.7427 2.91932 27.2393 4.02403 28.4335C5.1424 29.6426 6.56713 30.1769 8.28711 30.4269C9.93522 30.6664 12.0305 30.6664 14.6283 30.6663H17.3717C19.9694 30.6664 22.0648 30.6664 23.7129 30.4269C25.4329 30.1769 26.8576 29.6426 27.976 28.4335C29.0807 27.2393 29.5563 25.7427 29.7811 23.9348C30 22.1744 30 19.9276 30 17.1011V16.2315C30 13.4051 30 11.1583 29.7811 9.39789C29.5563 7.58997 29.0807 6.09342 27.976 4.89914C27.2302 4.09292 26.3482 3.58674 25.3333 3.26481V2.66634C25.3333 1.92996 24.7364 1.33301 24 1.33301C23.2636 1.33301 22.6667 1.92996 22.6667 2.66634V2.78865C21.2039 2.66628 19.4483 2.66631 17.3717 2.66634H14.6283C12.5517 2.66631 10.7961 2.66628 9.33333 2.78865V2.66634ZM5.9971 11.9997C5.38561 11.9997 5.07986 11.9997 4.88514 12.1919C4.69041 12.3841 4.6865 12.686 4.67867 13.2897C4.66703 14.1872 4.66667 15.1919 4.66667 16.324V17.0087C4.66667 19.9485 4.6691 22.0292 4.86516 23.6057C5.0577 25.1539 5.41684 26.0122 5.98163 26.6228C6.53275 27.2186 7.28627 27.5867 8.67067 27.7879C10.1048 27.9964 12.0057 27.9997 14.7333 27.9997H17.2667C19.9943 27.9997 21.8952 27.9964 23.3293 27.7879C24.7137 27.5867 25.4673 27.2186 26.0184 26.6228C26.5832 26.0122 26.9423 25.1539 27.1348 23.6057C27.3309 22.0292 27.3333 19.9485 27.3333 17.0087V16.324C27.3333 15.1919 27.333 14.1872 27.3213 13.2897C27.3135 12.686 27.3096 12.3841 27.1149 12.1919C26.9201 11.9997 26.6144 11.9997 26.0029 11.9997H5.9971Z" fill="#3B3D4A"/>
+</svg>

assets/icons/itg/calendar.svg

@@ -0,0 +1,8 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.6667 15.6663C9.74619 15.6663 9 16.4125 9 17.333C9 18.2535 9.74619 18.9997 10.6667 18.9997H10.6786C11.5991 18.9997 12.3453 18.2535 12.3453 17.333C12.3453 16.4125 11.5991 15.6663 10.6786 15.6663H10.6667Z" fill="#3B3D4A"/>
+<path d="M15.994 15.6663C15.0735 15.6663 14.3274 16.4125 14.3274 17.333C14.3274 18.2535 15.0735 18.9997 15.994 18.9997H16.006C16.9265 18.9997 17.6726 18.2535 17.6726 17.333C17.6726 16.4125 16.9265 15.6663 16.006 15.6663H15.994Z" fill="#3B3D4A"/>
+<path d="M21.3214 15.6663C20.4009 15.6663 19.6547 16.4125 19.6547 17.333C19.6547 18.2535 20.4009 18.9997 21.3214 18.9997H21.3333C22.2538 18.9997 23 18.2535 23 17.333C23 16.4125 22.2538 15.6663 21.3333 15.6663H21.3214Z" fill="#3B3D4A"/>
+<path d="M10.6667 20.9997C9.74619 20.9997 9 21.7459 9 22.6663C9 23.5868 9.74619 24.333 10.6667 24.333H10.6786C11.5991 24.333 12.3453 23.5868 12.3453 22.6663C12.3453 21.7459 11.5991 20.9997 10.6786 20.9997H10.6667Z" fill="#3B3D4A"/>
+<path d="M15.994 20.9997C15.0735 20.9997 14.3274 21.7459 14.3274 22.6663C14.3274 23.5868 15.0735 24.333 15.994 24.333H16.006C16.9265 24.333 17.6726 23.5868 17.6726 22.6663C17.6726 21.7459 16.9265 20.9997 16.006 20.9997H15.994Z" fill="#3B3D4A"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.33333 2.66634C9.33333 1.92996 8.73638 1.33301 8 1.33301C7.26362 1.33301 6.66667 1.92996 6.66667 2.66634V3.26481C5.65176 3.58674 4.76978 4.09292 4.02403 4.89914C2.91932 6.09342 2.44372 7.58997 2.21888 9.39789C1.99996 11.1583 1.99998 13.4051 2 16.2315V17.1012C1.99998 19.9276 1.99996 22.1744 2.21888 23.9348C2.44372 25.7427 2.91932 27.2393 4.02403 28.4335C5.1424 29.6426 6.56713 30.1769 8.28711 30.4269C9.93522 30.6664 12.0305 30.6664 14.6283 30.6663H17.3717C19.9694 30.6664 22.0648 30.6664 23.7129 30.4269C25.4329 30.1769 26.8576 29.6426 27.976 28.4335C29.0807 27.2393 29.5563 25.7427 29.7811 23.9348C30 22.1744 30 19.9276 30 17.1011V16.2315C30 13.4051 30 11.1583 29.7811 9.39789C29.5563 7.58997 29.0807 6.09342 27.976 4.89914C27.2302 4.09292 26.3482 3.58674 25.3333 3.26481V2.66634C25.3333 1.92996 24.7364 1.33301 24 1.33301C23.2636 1.33301 22.6667 1.92996 22.6667 2.66634V2.78865C21.2039 2.66628 19.4483 2.66631 17.3717 2.66634H14.6283C12.5517 2.66631 10.7961 2.66628 9.33333 2.78865V2.66634ZM5.9971 11.9997C5.38561 11.9997 5.07986 11.9997 4.88514 12.1919C4.69041 12.3841 4.6865 12.686 4.67867 13.2897C4.66703 14.1872 4.66667 15.1919 4.66667 16.324V17.0087C4.66667 19.9485 4.6691 22.0292 4.86516 23.6057C5.0577 25.1539 5.41684 26.0122 5.98163 26.6228C6.53275 27.2186 7.28627 27.5867 8.67067 27.7879C10.1048 27.9964 12.0057 27.9997 14.7333 27.9997H17.2667C19.9943 27.9997 21.8952 27.9964 23.3293 27.7879C24.7137 27.5867 25.4673 27.2186 26.0184 26.6228C26.5832 26.0122 26.9423 25.1539 27.1348 23.6057C27.3309 22.0292 27.3333 19.9485 27.3333 17.0087V16.324C27.3333 15.1919 27.333 14.1872 27.3213 13.2897C27.3135 12.686 27.3096 12.3841 27.1149 12.1919C26.9201 11.9997 26.6144 11.9997 26.0029 11.9997H5.9971Z" fill="#3B3D4A"/>
+</svg>

assets/icons/itg/coming-soon.svg

@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.7057 5.9642C18.8944 5.57148 19.0001 5.13134 19.0001 4.6665C19.0001 3.00965 17.6569 1.6665 16.0001 1.6665C14.3432 1.6665 13.0001 3.00965 13.0001 4.6665C13.0001 5.13134 13.1058 5.57148 13.2945 5.9642C7.78443 7.19747 3.66675 12.1178 3.66675 17.9998C3.66675 24.8114 9.18857 30.3332 16.0001 30.3332C22.8116 30.3332 28.3334 24.8114 28.3334 17.9998C28.3334 12.1178 24.2157 7.19747 18.7057 5.9642ZM15.0001 4.6665C15.0001 5.21879 15.4478 5.6665 16.0001 5.6665C16.5524 5.6665 17.0001 5.21879 17.0001 4.6665C17.0001 4.11422 16.5524 3.6665 16.0001 3.6665C15.4478 3.6665 15.0001 4.11422 15.0001 4.6665ZM20.8322 12.5546C21.1386 12.0951 21.0144 11.4742 20.5549 11.1679C20.0954 10.8615 19.4745 10.9857 19.1681 11.4452L15.1681 17.4452C14.8618 17.9048 14.986 18.5256 15.4455 18.832C15.905 19.1383 16.5259 19.0142 16.8322 18.5546L20.8322 12.5546ZM18.2619 9.97712C18.0819 10.132 17.9197 10.3137 17.7816 10.5209L13.7816 16.5209C12.9646 17.7463 13.2958 19.402 14.5212 20.2189C14.9764 20.5224 15.4911 20.6675 16.0001 20.6671V26.3332C11.3977 26.3332 7.66675 22.6022 7.66675 17.9998C7.66675 13.3975 11.3977 9.6665 16.0001 9.6665C16.784 9.6665 17.5427 9.77475 18.2619 9.97712Z" fill="#3B3D4A"/>
+</svg>

assets/icons/itg/finger-print-remove.svg

@@ -0,0 +1,10 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18.4031 6.11616C16.1007 1.37059 9.84631 -0.212484 5.50919 2.74956C5.06506 3.05288 4.94963 3.6607 5.25138 4.10715C5.55313 4.5536 6.15779 4.66963 6.60192 4.3663C9.98615 2.05504 14.8861 3.32611 16.6555 6.97296C16.8908 7.45809 17.4729 7.65955 17.9555 7.42295C18.4381 7.18635 18.6385 6.60128 18.4031 6.11616Z" fill="#3B3D4A"/>
+<path d="M10.5 5.15873C9.96306 5.15873 9.52778 5.59628 9.52778 6.13602C9.52778 6.67577 9.96306 7.11332 10.5 7.11332C12.0667 7.11332 13.4167 8.46799 13.4167 10.2407C13.4167 10.7804 13.8519 11.2179 14.3889 11.2179C14.9258 11.2179 15.3611 10.7804 15.3611 10.2407C15.3611 7.47946 13.2289 5.15873 10.5 5.15873Z" fill="#3B3D4A"/>
+<path d="M4.3337 6.99541C4.56722 6.50939 4.36457 5.92509 3.88107 5.69035C3.39757 5.45561 2.8163 5.65931 2.58278 6.14534C2.04863 7.25704 1.75 8.49947 1.75 9.80827V14.1599C1.75 17.092 3.24516 19.6724 5.50919 21.2186C5.95333 21.5219 6.55798 21.4059 6.85973 20.9594C7.16148 20.513 7.04606 19.9052 6.60192 19.6018C4.83599 18.3958 3.69444 16.4035 3.69444 14.1599V9.80827C3.69444 8.80143 3.92361 7.84892 4.3337 6.99541Z" fill="#3B3D4A"/>
+<path d="M7.87113 8.88437C8.09246 8.39261 7.87531 7.81361 7.3861 7.59112C6.8969 7.36864 6.3209 7.58693 6.09957 8.07868C5.80332 8.7369 5.63889 9.47052 5.63889 10.2407V13.7589C5.63889 16.5201 7.77113 18.8408 10.5 18.8408C10.707 18.8408 10.9114 18.8273 11.1123 18.8008C11.6447 18.7307 12.0198 18.2401 11.9501 17.7049C11.8804 17.1697 11.3923 16.7927 10.8599 16.8628C10.7424 16.8782 10.6223 16.8862 10.5 16.8862C8.93332 16.8862 7.58333 15.5316 7.58333 13.7589V10.2407C7.58333 9.75172 7.68745 9.29248 7.87113 8.88437Z" fill="#3B3D4A"/>
+<path d="M19.25 10.371C19.25 9.83121 18.8147 9.39367 18.2778 9.39367C17.7408 9.39367 17.3056 9.83121 17.3056 10.371V11.5111C17.3056 12.0509 17.7408 12.4884 18.2778 12.4884C18.8147 12.4884 19.25 12.0509 19.25 11.5111V10.371Z" fill="#3B3D4A"/>
+<path d="M11.4722 10.5338C11.4722 9.9941 11.0369 9.55655 10.5 9.55655C9.96306 9.55655 9.52778 9.9941 9.52778 10.5338V13.4657C9.52778 14.0055 9.96306 14.443 10.5 14.443C11.0369 14.443 11.4722 14.0055 11.4722 13.4657V10.5338Z" fill="#3B3D4A"/>
+<path d="M12.1461 22.5843C12.6729 22.4801 13.016 21.9663 12.9122 21.4367C12.8085 20.9071 12.2974 20.5623 11.7706 20.6665C11.0467 20.8098 10.2898 20.8375 9.52305 20.7301C8.99124 20.6556 8.50006 21.0286 8.42597 21.5632C8.35187 22.0978 8.72292 22.5915 9.25473 22.666C10.2414 22.8042 11.216 22.7684 12.1461 22.5843Z" fill="#3B3D4A"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.75 18C12.75 15.3766 14.8766 13.25 17.5 13.25C20.1234 13.25 22.25 15.3766 22.25 18C22.25 20.6234 20.1234 22.75 17.5 22.75C14.8766 22.75 12.75 20.6234 12.75 18ZM15.97 16.4694C16.263 16.1766 16.7379 16.1769 17.0306 16.47L17.4995 16.9393L17.97 16.4694C18.263 16.1766 18.7379 16.1769 19.0306 16.47C19.3234 16.763 19.3231 17.2379 19.03 17.5306L18.5601 18L19.03 18.4694C19.3231 18.7621 19.3234 19.237 19.0306 19.53C18.7379 19.8231 18.263 19.8234 17.97 19.5306L17.4995 19.0606L17.0306 19.53C16.7379 19.8231 16.263 19.8234 15.97 19.5306C15.6769 19.2379 15.6766 18.763 15.9694 18.47L16.4388 18L15.9694 17.53C15.6766 17.237 15.6769 16.7621 15.97 16.4694Z" fill="#3B3D4A"/>
+</svg>

assets/icons/itg/knight-shield.svg

@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.557 3.26204C12.05 2.44665 13.8133 1.66699 15.9975 1.66699C18.1818 1.66699 19.9458 2.44665 21.4394 3.26199C23.0239 4.1269 24.1152 4.89406 25.3967 5.32492C26.2566 5.61401 27.332 5.85395 27.9465 6.5738C28.4384 7.15002 28.5493 7.91216 28.6724 8.6325C30.1141 17.0636 26.8146 26.3753 18.4262 29.7627C17.6289 30.0848 17.0128 30.3336 16.0016 30.3337C14.9905 30.3337 14.3743 30.0848 13.5769 29.7628C5.18871 26.3752 1.88692 17.0558 3.32669 8.63263C3.44977 7.91236 3.56064 7.15032 4.05243 6.57411C4.66688 5.85419 5.74229 5.61409 6.60219 5.32487C7.88315 4.894 8.97322 4.12707 10.557 3.26204ZM7.43525 7.79468C7.15451 7.88911 6.89087 7.98207 6.66235 8.06561C6.37258 8.17153 6.2277 8.2245 6.11276 8.3619C5.97686 8.52436 5.95979 8.71611 5.89098 9.11845C5.09669 13.7625 5.74427 18.1016 7.72328 21.4968C7.94296 21.8737 8.0528 22.0622 8.24874 22.0876C8.44469 22.1131 8.60556 21.9527 8.9273 21.6321L22.5227 8.08309C22.8857 7.72139 23.0671 7.54054 23.0391 7.34287C23.0111 7.1452 22.7801 7.01812 22.3183 6.76395C21.5577 6.34542 20.8366 5.90275 20.1882 5.54883C18.8328 4.80895 17.5313 4.27311 15.9978 4.27311C14.4644 4.27311 13.1637 4.80885 11.8092 5.5486C10.5457 6.2387 9.0051 7.26664 7.43525 7.79468Z" fill="#3B3D4A"/>
+</svg>

assets/icons/itg/money-not-found.svg

@@ -0,0 +1,4 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.60952 1.72353C3.08882 1.20283 2.2446 1.20283 1.7239 1.72353C1.2032 2.24423 1.2032 3.08845 1.7239 3.60915L4.07617 5.96143C3.80679 6.18359 3.55528 6.42534 3.32402 6.68474C2.43578 7.68103 2.03914 8.8886 1.85021 10.3701C1.66668 11.8094 1.66669 13.6307 1.66671 15.9293V16.07C1.66669 18.3687 1.66668 20.19 1.85021 21.6292C2.03914 23.1108 2.43578 24.3183 3.32402 25.3146C3.58761 25.6103 3.87752 25.883 4.19021 26.13C5.23471 26.9548 6.49126 27.3198 8.04082 27.4949C9.55893 27.6664 11.4846 27.6664 13.9366 27.6663H18.0634C20.5154 27.6664 22.4411 27.6664 23.9593 27.4949C24.4597 27.4383 24.9295 27.362 25.3715 27.2568L28.3906 30.2758C28.9113 30.7965 29.7555 30.7965 30.2762 30.2758C30.7969 29.7551 30.7969 28.9109 30.2762 28.3902L3.60952 1.72353ZM17.7247 19.61L12.3901 14.2753C12.1403 14.7975 12.0004 15.3822 12.0004 15.9997C12.0004 18.2088 13.7912 19.9997 16.0004 19.9997C16.6178 19.9997 17.2026 19.8598 17.7247 19.61ZM7.33363 14.6663C8.07001 14.6663 8.66697 15.2633 8.66697 15.9997C8.66697 16.7361 8.07001 17.333 7.33363 17.333H7.32166C6.58528 17.333 5.98832 16.7361 5.98832 15.9997C5.98832 15.2633 6.58528 14.6663 7.32166 14.6663H7.33363Z" fill="#3B3D4A"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.0634 4.33301H13.9367C12.8203 4.333 11.8131 4.333 10.9037 4.34918C10.1498 4.36259 9.77284 4.3693 9.67372 4.61474C9.5746 4.86019 9.84454 5.13013 10.3844 5.67L16.6215 11.9071C16.7028 11.9883 16.7434 12.029 16.7893 12.0554C16.8351 12.0818 16.8995 12.0988 17.0281 12.1329C18.4113 12.4996 19.5005 13.5888 19.8671 14.9719C19.9012 15.1006 19.9183 15.1649 19.9447 15.2108C19.9711 15.2567 20.0117 15.2973 20.093 15.3786L28.5247 23.8103C28.8644 24.15 29.0343 24.3199 29.2476 24.2735C29.4609 24.2272 29.5377 24.0221 29.6911 23.6117C29.9157 23.0114 30.0576 22.353 30.1499 21.6292C30.3334 20.19 30.3334 18.3687 30.3334 16.07V15.9293C30.3334 13.6307 30.3334 11.8094 30.1499 10.3701C29.9609 8.8886 29.5643 7.68103 28.6761 6.68474C28.4125 6.38907 28.1226 6.11633 27.8099 5.86939C26.7654 5.0445 25.5088 4.67951 23.9593 4.50447C22.4411 4.33299 20.5154 4.333 18.0634 4.33301ZM26.012 15.9997C26.012 15.2633 25.4151 14.6663 24.6787 14.6663H24.6667C23.9303 14.6663 23.3334 15.2633 23.3334 15.9997C23.3334 16.7361 23.9303 17.333 24.6667 17.333H24.6787C25.4151 17.333 26.012 16.7361 26.012 15.9997Z" fill="#3B3D4A"/>
+</svg>

assets/icons/itg/stethoscope.svg

@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.26312 3.63509C4.82911 3.63509 3.66663 4.80057 3.66663 6.23827V10.7938C3.66663 15.0237 6.76283 18.5286 10.807 19.1546V22.1827C10.807 26.3161 14.1491 29.6668 18.2719 29.6668C22.3946 29.6668 25.7368 26.3161 25.7368 22.1827V21.6353C27.2497 21.0994 28.3337 19.6529 28.3337 17.9526C28.3337 15.7961 26.59 14.0479 24.439 14.0479C22.288 14.0479 20.5442 15.7961 20.5442 17.9526C20.5442 19.6526 21.6278 21.0989 23.1403 21.635V22.1827C23.1403 24.8784 20.9606 27.0637 18.2719 27.0637C15.5831 27.0637 13.4035 24.8784 13.4035 22.1827V19.1546C17.4476 18.5286 20.5438 15.0237 20.5438 10.7938V6.23827C20.5438 4.80057 19.3813 3.63509 17.9473 3.63509H16.6485C16.6485 2.91624 16.0673 2.33301 15.3503 2.33301C14.6333 2.33301 14.052 2.91575 14.052 3.6346V6.23777C14.052 6.95662 14.6333 7.53936 15.3503 7.53936C16.0671 7.53936 16.6483 6.95688 16.6485 6.23827H17.9473V10.7938C17.9473 14.0286 15.3317 16.651 12.1052 16.651C8.87872 16.651 6.26312 14.0286 6.26312 10.7938V6.23827H7.56116C7.56142 6.95688 8.14257 7.53936 8.8594 7.53936C9.5764 7.53936 10.1576 6.95662 10.1576 6.23777V4.96007L10.1579 4.93668L10.1576 4.91329V3.6346C10.1576 2.91575 9.5764 2.33301 8.8594 2.33301C8.1424 2.33301 7.56116 2.91575 7.56116 3.6346L6.26312 3.63509Z" fill="#3B3D4A"/>
+</svg>

assets/icons/itg/time-quarter-pass.svg

@@ -0,0 +1,15 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.6985 2.96954C14.6985 2.24989 15.2819 1.6665 16.0015 1.6665C23.9177 1.6665 30.3349 8.08379 30.3349 15.9999C30.3349 16.7196 29.7516 17.303 29.0319 17.303C28.3123 17.303 27.7289 16.7196 27.7289 15.9999C27.7289 9.52309 22.4784 4.27258 16.0015 4.27258C15.2819 4.27258 14.6985 3.68919 14.6985 2.96954Z" fill="#3B3D4A"/>
+<path d="M12.4986 3.81587C12.7505 4.48999 12.4082 5.24068 11.7341 5.49258C11.484 5.58604 11.238 5.68799 10.9964 5.79809C10.3416 6.09657 9.5688 5.80769 9.27032 5.15286C8.97184 4.49803 9.26071 3.72522 9.91554 3.42674C10.2122 3.2915 10.5145 3.16623 10.8219 3.05138C11.496 2.79947 12.2467 3.14175 12.4986 3.81587Z" fill="#3B3D4A"/>
+<path d="M7.9664 6.02794C8.45838 6.55315 8.43144 7.37775 7.90623 7.86974C7.72561 8.03894 7.55045 8.2139 7.38106 8.39435C6.88851 8.91903 6.06388 8.94509 5.5392 8.45254C5.01452 7.95999 4.98846 7.13537 5.48101 6.61068C5.6886 6.38955 5.90325 6.17513 6.1246 5.96778C6.64981 5.4758 7.47441 5.50273 7.9664 6.02794Z" fill="#3B3D4A"/>
+<path d="M4.63221 9.80776C5.28813 10.1038 5.57982 10.8756 5.28374 11.5315C5.18379 11.7529 5.09068 11.978 5.00466 12.2066C4.7512 12.8802 3.99973 13.2207 3.32619 12.9672C2.65265 12.7138 2.31211 11.9623 2.56557 11.2888C2.67127 11.0079 2.78568 10.7313 2.90846 10.4593C3.20454 9.80337 3.9763 9.51167 4.63221 9.80776Z" fill="#3B3D4A"/>
+<path d="M3.01708 14.5398C3.73638 14.5621 4.30137 15.1634 4.27902 15.8827C4.27142 16.1273 4.2714 16.3731 4.27902 16.6172C4.30146 17.3365 3.73655 17.9378 3.01725 17.9602C2.29796 17.9826 1.69665 17.4177 1.67421 16.6984C1.6649 16.4001 1.66493 16.1002 1.6742 15.8017C1.69655 15.0824 2.29778 14.5174 3.01708 14.5398Z" fill="#3B3D4A"/>
+<path d="M28.184 19.5016C28.8581 19.7535 29.2004 20.5042 28.9485 21.1783C28.8251 21.5084 28.6897 21.8327 28.5429 22.1505C28.241 22.8037 27.4667 23.0886 26.8134 22.7867C26.1601 22.4848 25.8753 21.7105 26.1772 21.0573C26.2967 20.7985 26.4069 20.5347 26.5073 20.266C26.7592 19.5919 27.5099 19.2497 28.184 19.5016Z" fill="#3B3D4A"/>
+<path d="M3.33307 19.5557C4.00607 19.3009 4.75827 19.6398 5.01314 20.3128C5.1007 20.544 5.19551 20.7716 5.29732 20.9954C5.5953 21.6505 5.30583 22.4231 4.65078 22.7211C3.99572 23.0191 3.22313 22.7296 2.92515 22.0745C2.80008 21.7996 2.68358 21.5199 2.57599 21.2358C2.32111 20.5628 2.66007 19.8106 3.33307 19.5557Z" fill="#3B3D4A"/>
+<path d="M26.0039 23.9914C26.5311 24.4813 26.5614 25.3058 26.0716 25.833C25.8422 26.0799 25.604 26.3186 25.3576 26.5485C24.8314 27.0394 24.0068 27.0109 23.5159 26.4847C23.025 25.9585 23.0535 25.1339 23.5797 24.643C23.7808 24.4554 23.9752 24.2606 24.1624 24.0591C24.6522 23.5319 25.4767 23.5016 26.0039 23.9914Z" fill="#3B3D4A"/>
+<path d="M5.55842 24.0695C6.0819 23.5757 6.90659 23.5997 7.40042 24.1232C7.56048 24.2929 7.72566 24.4577 7.89569 24.6173C8.42028 25.11 8.44619 25.9346 7.95355 26.4592C7.46091 26.9838 6.63627 27.0097 6.11168 26.5171C5.9033 26.3214 5.70088 26.1194 5.50473 25.9115C5.01091 25.388 5.03495 24.5633 5.55842 24.0695Z" fill="#3B3D4A"/>
+<path d="M22.1944 27.3663C22.4907 28.0222 22.1991 28.794 21.5433 29.0902C21.2732 29.2122 20.9986 29.3259 20.7198 29.431C20.0464 29.6849 19.2947 29.3449 19.0408 28.6715C18.7869 27.9981 19.1269 27.2464 19.8003 26.9925C20.0272 26.907 20.2507 26.8144 20.4706 26.7151C21.1264 26.4189 21.8982 26.7105 22.1944 27.3663Z" fill="#3B3D4A"/>
+<path d="M9.32298 27.3748C9.61834 26.7185 10.3898 26.426 11.046 26.7213C11.2575 26.8165 11.4723 26.9054 11.6902 26.9879C12.3633 27.2426 12.7025 27.9947 12.4478 28.6677C12.1932 29.3408 11.4411 29.68 10.768 29.4253C10.5001 29.324 10.2362 29.2147 9.97644 29.0978C9.32019 28.8025 9.02763 28.031 9.32298 27.3748Z" fill="#3B3D4A"/>
+<path d="M13.9967 28.9768C14.0215 28.2576 14.6247 27.6947 15.3439 27.7195C15.6149 27.7288 15.8879 27.7288 16.1589 27.7195C16.8781 27.6947 17.4813 28.2576 17.5061 28.9768C17.5309 29.696 16.968 30.2992 16.2488 30.324C15.9179 30.3354 15.5849 30.3354 15.2541 30.324C14.5348 30.2992 13.9719 29.696 13.9967 28.9768Z" fill="#3B3D4A"/>
+<path d="M17.3339 7.99984C17.3339 7.26346 16.7369 6.6665 16.0006 6.6665C15.2642 6.6665 14.6672 7.26346 14.6672 7.99984V12.9439C13.49 13.4582 12.6672 14.633 12.6672 15.9998C12.6672 17.8408 14.1596 19.3332 16.0006 19.3332C17.3674 19.3332 18.5422 18.5104 19.0565 17.3332H21.3339C22.0703 17.3332 22.6672 16.7362 22.6672 15.9998C22.6672 15.2635 22.0703 14.6665 21.3339 14.6665H19.0565C18.7206 13.8975 18.1029 13.2798 17.3339 12.9439V7.99984Z" fill="#3B3D4A"/>
+</svg>

assets/icons/itg/time-quarter.svg

@@ -0,0 +1,7 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.96976 17.3036C2.25013 17.3036 1.66675 16.7203 1.66675 16.0006C1.66675 8.08465 8.08392 1.66748 15.9999 1.66748C23.9159 1.66748 30.3331 8.08465 30.3331 16.0006C30.3331 23.9166 23.9159 30.3338 15.9999 30.3338C15.2803 30.3338 14.6969 29.7504 14.6969 29.0308C14.6969 28.3111 15.2803 27.7278 15.9999 27.7278C22.4766 27.7278 27.727 22.4773 27.727 16.0006C27.727 9.52392 22.4766 4.27351 15.9999 4.27351C9.52319 4.27351 4.27278 9.52392 4.27278 16.0006C4.27278 16.7203 3.6894 17.3036 2.96976 17.3036Z" fill="#3B3D4A"/>
+<path d="M2.55728 18.6734C3.23984 18.4454 3.978 18.8139 4.206 19.4965C4.37546 20.0038 4.57419 20.4971 4.80011 20.9742C5.10807 21.6246 4.83046 22.4015 4.18005 22.7095C3.52964 23.0174 2.75273 22.7398 2.44476 22.0894C2.17451 21.5187 1.93684 20.9287 1.73423 20.3222C1.50623 19.6396 1.87472 18.9014 2.55728 18.6734Z" fill="#3B3D4A"/>
+<path d="M4.88987 23.803C5.43541 23.3337 6.25812 23.3955 6.72743 23.941C7.10221 24.3767 7.50445 24.7865 7.93126 25.1676C8.46803 25.647 8.51459 26.4707 8.03527 27.0074C7.55594 27.5442 6.73223 27.5908 6.19547 27.1114C5.68316 26.654 5.20085 26.1625 4.75183 25.6406C4.28252 25.095 4.34432 24.2723 4.88987 23.803Z" fill="#3B3D4A"/>
+<path d="M9.21607 27.7957C9.52534 27.146 10.3028 26.8699 10.9526 27.1792C11.4492 27.4155 11.9628 27.62 12.4909 27.7902C13.1758 28.0109 13.5521 28.7451 13.3314 29.4301C13.1107 30.115 12.3765 30.4914 11.6916 30.2706C11.0528 30.0648 10.4321 29.8176 9.83263 29.5323C9.18284 29.223 8.90679 28.4455 9.21607 27.7957Z" fill="#3B3D4A"/>
+<path d="M16.0001 12.6672C14.6332 12.6672 13.4585 13.4899 12.9441 14.6672H8.00008C7.2637 14.6672 6.66675 15.2641 6.66675 16.0005C6.66675 16.7369 7.2637 17.3338 8.00008 17.3338H12.9441C13.2801 18.1028 13.8978 18.7205 14.6667 19.0565V21.3338C14.6667 22.0702 15.2637 22.6672 16.0001 22.6672C16.7365 22.6672 17.3334 22.0702 17.3334 21.3338V19.0565C18.5107 18.5421 19.3334 17.3674 19.3334 16.0005C19.3334 14.1595 17.841 12.6672 16.0001 12.6672Z" fill="#3B3D4A"/>
+</svg>

assets/icons/mazaya_brand.svg

@@ -0,0 +1,17 @@
+<svg width="90" height="47" viewBox="0 0 90 47" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.6637 23.3332H6.12992C4.29216 23.3332 3.22754 22.3002 3.22754 20.584V12.585H5.6329V19.3679C5.6329 20.5007 5.92436 21.102 7.69463 21.102H14.6668V23.3347L14.6637 23.3332Z" fill="#5D5E5E"/>
+<path d="M15.7284 26.0988H13.5991V24.1653H15.7284V26.0988ZM19.1293 20.1166C19.1293 20.9993 18.8716 21.7331 18.373 22.3166C17.8054 22.9998 17.0154 23.3332 16.0198 23.3332H13.9765V21.1005H15.5044C16.3113 21.1005 16.7239 20.5498 16.7239 19.4677V15.7837H19.1293V20.1166ZM18.9744 26.0988H16.8283V24.1653H18.9744V26.0988Z" fill="#5D5E5E"/>
+<path d="M23.2848 23.3332H20.8794V12.5835H23.2848V23.3332Z" fill="#5D5E5E"/>
+<path d="M32.285 23.3335H29.6219C29.2261 25.1673 27.6813 26.0827 24.9492 26.0827V24.1998C26.5293 24.1998 27.3193 23.4659 27.3193 21.9998V15.7839H29.7415V21.1008H32.2834V23.3335H32.285ZM29.5881 14.5172H27.4589V12.6001H29.5881V14.5172Z" fill="#5D5E5E"/>
+<path d="M41.868 20.9665C41.868 23.1992 40.3217 24.7666 37.9179 24.7666C36.4575 24.7666 35.3592 24.2828 34.655 23.3332H31.564V21.1005H33.9509C33.9509 18.7174 35.3592 17.2007 37.832 17.2007C40.3049 17.2007 41.868 18.6832 41.868 20.9665ZM39.4811 21.0499C39.4811 19.7326 38.9657 19.0672 37.9532 19.0672H37.7814C36.9055 19.0672 36.3041 19.8502 36.3041 20.9501C36.3041 22.0501 36.8886 22.8673 37.9179 22.8673C38.8629 22.8673 39.4811 22.1335 39.4811 21.0514V21.0499Z" fill="#5D5E5E"/>
+<path d="M79.3108 4.83447H54.3276C50.4719 4.83447 47.3462 7.86731 47.3462 11.6085V35.8498C47.3462 39.591 50.4719 42.6238 54.3276 42.6238H79.3108C83.1665 42.6238 86.2921 39.591 86.2921 35.8498V11.6085C86.2921 7.86731 83.1665 4.83447 79.3108 4.83447Z" fill="#ED1C2B"/>
+<path d="M81.526 29.9599L81.5045 37.6687L71.1253 37.6419C70.1972 37.6419 69.5575 36.7473 69.5145 35.3794C69.5161 33.233 68.858 31.1209 67.5586 29.3824C65.1119 26.1077 61.6603 23.485 57.1748 21.5337C56.0672 21.0529 54.8645 20.8073 53.6527 20.8117C52.697 20.7522 52.0542 19.6939 52.0542 18.3662L52.0573 10.6812L62.2908 10.6782C63.2158 10.6782 63.9491 11.6026 63.992 12.9675C63.9905 14.4575 64.4108 15.9251 65.2453 17.1754C68.0403 21.3699 71.6146 24.7309 76.3885 26.8147C77.4946 27.297 78.6988 27.5367 79.9122 27.5441C80.8679 27.6036 81.526 28.6322 81.526 29.9599Z" fill="white"/>
+<path d="M64.0242 28.7545C64.015 28.8631 64.0104 28.9733 64.0104 29.0864L64.0012 34.4211V35.3425C63.9537 36.7104 63.1867 37.6585 62.2632 37.6585L54.5332 37.6273C53.5146 37.6273 52.068 37.6362 52.068 37.6362L52.0542 29.8961C52.0542 28.5714 52.6985 27.5176 53.6573 27.4565L56.5274 27.461H57.6273H62.5884C63.2557 27.461 63.8233 28.0028 64.0258 28.7545H64.0242Z" fill="white"/>
+<path d="M81.5779 8.74026L81.5641 18.3826C81.5641 19.7103 80.9444 20.8013 79.9887 20.8594L77.0832 20.852L76.106 20.849C76.0385 20.8371 75.9695 20.8326 75.9005 20.8326H70.9486C70.2936 20.8326 69.7337 20.3102 69.522 19.5793C69.5358 19.4602 69.5465 19.3367 69.5496 19.2102V13.0241C69.5925 11.6517 70.3626 10.6842 71.283 10.6842L78.3534 10.6902C80.4918 10.5815 81.5748 8.73877 81.5748 8.73877L81.5779 8.74026Z" fill="white"/>
+<path d="M9.65051 32.5902C9.62289 31.8728 9.59528 31.005 9.59528 30.1387H9.56767C9.37591 30.8993 9.12126 31.7492 8.88349 32.4488L8.13488 34.7768H7.04879L6.39223 32.4667C6.19127 31.7671 5.98111 30.9172 5.83537 30.1387H5.81696C5.78015 30.9439 5.75254 31.8653 5.70651 32.6081L5.5976 34.8735H4.31055L4.70326 28.9077H6.55483L7.15617 30.8993C7.34793 31.5899 7.53968 32.3342 7.67621 33.0323H7.70382C7.87717 32.3416 8.08733 31.5542 8.28829 30.8904L8.94485 28.9077H10.7596L11.0971 34.8735H9.73794L9.64744 32.5902H9.65051Z" fill="#5D5E5E"/>
+<path d="M13.7557 33.3433L13.3185 34.875H11.8765L13.7557 28.9092H15.5796L17.4864 34.875H15.9907L15.5167 33.3433H13.7557ZM15.3158 32.3342L14.9323 31.069C14.8233 30.7147 14.7129 30.2726 14.6224 29.9184H14.604C14.5119 30.2726 14.4214 30.7236 14.3217 31.069L13.9566 32.3342H15.3158Z" fill="#5D5E5E"/>
+<path d="M18.8135 34.1486L21.814 30.0583V30.0226H18.8135V28.9077H23.6641V29.6862L20.7295 33.7229V33.7586H23.7116V34.8735H18.8135V34.1471V34.1486Z" fill="#5D5E5E"/>
+<path d="M26.9051 33.3433L26.4679 34.875H25.0259L26.9051 28.9092H28.729L30.6358 34.875H29.1401L28.6661 33.3433H26.9051ZM28.4652 32.3342L28.0817 31.069C27.9712 30.7147 27.8623 30.2726 27.7718 29.9184H27.7534C27.6613 30.2726 27.5708 30.7236 27.4711 31.069L27.106 32.3342H28.4652Z" fill="#5D5E5E"/>
+<path d="M32.1961 34.875V32.4324L30.2524 28.9092H31.8402L32.4691 30.3441C32.6609 30.7772 32.7882 31.0972 32.9431 31.4857H32.9615C33.0981 31.1136 33.2438 30.7683 33.4263 30.3441L34.0461 28.9092H35.6062L33.5813 32.3877V34.875H32.1945H32.1961Z" fill="#5D5E5E"/>
+<path d="M37.0496 33.3433L36.6124 34.875H35.1704L37.0496 28.9092H38.8736L40.7804 34.875H39.2847L38.8107 33.3433H37.0496ZM38.6097 32.3342L38.2262 31.069C38.1157 30.7147 38.0068 30.2726 37.9163 29.9184H37.8979C37.8059 30.2726 37.7154 30.7236 37.6157 31.069L37.2506 32.3342H38.6097Z" fill="#5D5E5E"/>
+</svg>

assets/images/biometrics.svg

@@ -0,0 +1,33 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="18.141" height="24.326" viewBox="0 0 18.141 24.326">
+  <g id="biometrics" transform="translate(-76.645 0.102)">
+    <g id="Group_10711" data-name="Group 10711" transform="translate(76.745 -0.001)">
+      <g id="Group_10702" data-name="Group 10702" transform="translate(0.997 0)">
+        <path id="Path_13731" data-name="Path 13731" d="M92.682,4.276a.519.519,0,0,0,.373-.151,12.049,12.049,0,0,1,4.38-2.6c3.451-1.126,6.718-.255,9.7,2.573a.528.528,0,0,0,.746-.02.507.507,0,0,0,.144-.373.528.528,0,0,0-.164-.367A11.681,11.681,0,0,0,102.1.171a9.846,9.846,0,0,0-4.963.347,13.266,13.266,0,0,0-4.826,2.868.525.525,0,0,0-.157.373.519.519,0,0,0,.151.373A.574.574,0,0,0,92.682,4.276Z" transform="translate(-92.158 0.001)" fill="#fff" stroke="#fff" stroke-width="0.2"/>
+      </g>
+      <g id="Group_10703" data-name="Group 10703" transform="translate(6.494 2.408)">
+        <path id="Path_13732" data-name="Path 13732" d="M227.426,62.967c-.537-3.457-1.9-5.939-4.053-7.366a9.5,9.5,0,0,0-6.98-1.139.526.526,0,0,0,.249,1.021,8.349,8.349,0,0,1,6.122,1c1.918,1.27,3.143,3.5,3.627,6.639a.539.539,0,0,0,.21.347.528.528,0,0,0,.308.1.318.318,0,0,0,.079-.007.531.531,0,0,0,.439-.6Z" transform="translate(-215.99 -54.236)" fill="#fff" stroke="#fff" stroke-width="0.2"/>
+      </g>
+      <g id="Group_10704" data-name="Group 10704" transform="translate(0 3.288)">
+        <path id="Path_13733" data-name="Path 13733" d="M70.745,81.922c.471-5.513,4.132-6.783,4.289-6.836a.518.518,0,0,0,.3-.262.5.5,0,0,0,.026-.4.53.53,0,0,0-.668-.334c-.183.059-4.472,1.545-5,7.746a.53.53,0,0,0,.124.386.536.536,0,0,0,.36.183h.046a.545.545,0,0,0,.34-.124A.551.551,0,0,0,70.745,81.922Z" transform="translate(-69.688 -74.064)" fill="#fff" stroke="#fff" stroke-width="0.2"/>
+      </g>
+      <g id="Group_10705" data-name="Group 10705" transform="translate(0.596 4.424)">
+        <path id="Path_13734" data-name="Path 13734" d="M85.763,106.351A7.125,7.125,0,0,1,87.3,102.73a5.731,5.731,0,0,1,2.1-1.6,5.122,5.122,0,0,1,2.665-.373,7.6,7.6,0,0,1,3.87,1.84.527.527,0,0,0,.74-.065.508.508,0,0,0,.118-.386.491.491,0,0,0-.19-.354,8.581,8.581,0,0,0-4.413-2.076,6.1,6.1,0,0,0-3.208.452,6.82,6.82,0,0,0-2.495,1.892,8.114,8.114,0,0,0-1.774,4.164,20.017,20.017,0,0,1-.511,2.757,3.9,3.9,0,0,1-.9,1.86.543.543,0,0,0-.19.36.555.555,0,0,0,.118.386.531.531,0,0,0,.406.19.521.521,0,0,0,.34-.124,4.747,4.747,0,0,0,1.244-2.39,21.652,21.652,0,0,0,.544-2.914Z" transform="translate(-83.109 -99.669)" fill="#fff" stroke="#fff" stroke-width="0.2"/>
+      </g>
+      <g id="Group_10706" data-name="Group 10706" transform="translate(1.971 6.473)">
+        <path id="Path_13735" data-name="Path 13735" d="M125.938,152.379v-.007c-.052-.478-.1-.976-.151-1.4-.02-.17-.033-.275-.046-.38A4.981,4.981,0,0,0,124.307,147a4.777,4.777,0,0,0-2.377-1.12,4.646,4.646,0,0,0-2.167.151,4.453,4.453,0,0,0-1.971,1.283,6.3,6.3,0,0,0-1.434,3.241c-.007.026-.007.052-.013.072v.02a22.787,22.787,0,0,1-.9,4.367,6.623,6.623,0,0,1-1.165,2.514.543.543,0,0,0-.19.36.554.554,0,0,0,.118.386.543.543,0,0,0,.36.19.554.554,0,0,0,.386-.118,7.67,7.67,0,0,0,1.5-3.012,23.869,23.869,0,0,0,.949-4.6,5.31,5.31,0,0,1,1.179-2.711,3.32,3.32,0,0,1,1.506-.982,3.55,3.55,0,0,1,1.683-.111,3.692,3.692,0,0,1,1.846.864,4.191,4.191,0,0,1,1.087,2.92c.02.151.033.295.046.386.059.511.1.956.151,1.388a21.5,21.5,0,0,0,1.486,6.829.52.52,0,0,0,.478.308.514.514,0,0,0,.216-.046.528.528,0,0,0,.262-.694A20.806,20.806,0,0,1,125.938,152.379Z" transform="translate(-114.084 -145.821)" fill="#fff" stroke="#fff" stroke-width="0.2"/>
+      </g>
+      <g id="Group_10707" data-name="Group 10707" transform="translate(3.013 8.548)">
+        <path id="Path_13736" data-name="Path 13736" d="M146.12,196.064a3.543,3.543,0,0,0-.537-2.449,2.455,2.455,0,0,0-1.08-.871,2.317,2.317,0,0,0-1.3-.138,2.291,2.291,0,0,0-1.44.917,4.445,4.445,0,0,0-.563,1.087,9.367,9.367,0,0,0-.386,1.434c-.079.413-.131.779-.177,1.126a8.913,8.913,0,0,1-.419,1.945,17.939,17.939,0,0,1-1.1,2.468,16.894,16.894,0,0,1-1.434,2.311.526.526,0,0,0,.458.858.5.5,0,0,0,.354-.19,17.82,17.82,0,0,0,1.552-2.482,18.717,18.717,0,0,0,1.165-2.619,10.284,10.284,0,0,0,.471-2.148c.046-.327.092-.668.17-1.067a7.909,7.909,0,0,1,.34-1.264,3.271,3.271,0,0,1,.426-.832,1.222,1.222,0,0,1,.779-.5,1.2,1.2,0,0,1,.707.079,1.388,1.388,0,0,1,.615.5,2.55,2.55,0,0,1,.347,1.742,22.62,22.62,0,0,1-1.46,5.284,25.8,25.8,0,0,1-2.573,5.271.53.53,0,0,0,.092.74.545.545,0,0,0,.321.111.518.518,0,0,0,.413-.2,26.528,26.528,0,0,0,2.724-5.546A23.906,23.906,0,0,0,146.12,196.064Z" transform="translate(-137.568 -192.57)" fill="#fff" stroke="#fff" stroke-width="0.2"/>
+      </g>
+      <g id="Group_10708" data-name="Group 10708" transform="translate(14.291 8.495)">
+        <path id="Path_13737" data-name="Path 13737" d="M393.392,196.2a13.938,13.938,0,0,0-.773-4.518.526.526,0,0,0-.963.426,13.269,13.269,0,0,1,.681,4.158,11.225,11.225,0,0,0,.8,4.315.511.511,0,0,0,.314.255.6.6,0,0,0,.151.02.488.488,0,0,0,.249-.065.511.511,0,0,0,.255-.314.5.5,0,0,0-.046-.4A10.731,10.731,0,0,1,393.392,196.2Z" transform="translate(-391.612 -191.37)" fill="#fff" stroke="#fff" stroke-width="0.2"/>
+      </g>
+      <g id="Group_10709" data-name="Group 10709" transform="translate(4.374 10.687)">
+        <path id="Path_13738" data-name="Path 13738" d="M173.334,241.3a.516.516,0,0,0-.138-.38.511.511,0,0,0-.367-.17.526.526,0,0,0-.55.5,19.166,19.166,0,0,1-1.2,5.762,14.612,14.612,0,0,1-2.711,4.59.529.529,0,0,0,.046.746.5.5,0,0,0,.347.131.523.523,0,0,0,.393-.177,15.861,15.861,0,0,0,2.914-4.917A20.284,20.284,0,0,0,173.334,241.3Z" transform="translate(-168.231 -240.745)" fill="#fff" stroke="#fff" stroke-width="0.2"/>
+      </g>
+      <g id="Group_10710" data-name="Group 10710" transform="translate(8.472 16.753)">
+        <path id="Path_13739" data-name="Path 13739" d="M264.567,378.107l-.052-.262a.533.533,0,0,0-.347-.413.546.546,0,0,0-.406.02.529.529,0,0,0-.268.3l-.02.059c-.367,1.035-.727,2.049-1.179,3.064a19.518,19.518,0,0,1-1.676,3.077.522.522,0,0,0-.079.393.513.513,0,0,0,.223.334.539.539,0,0,0,.295.092.529.529,0,0,0,.439-.229,20.72,20.72,0,0,0,1.768-3.241c.2-.458.4-.943.609-1.5a11.594,11.594,0,0,0,1.146,2.92.519.519,0,0,0,.314.249.53.53,0,0,0,.4-.046.537.537,0,0,0,.249-.314.53.53,0,0,0-.046-.4A13.648,13.648,0,0,1,264.567,378.107Z" transform="translate(-260.531 -377.402)" fill="#fff" stroke="#fff" stroke-width="0.2"/>
+      </g>
+    </g>
+  </g>
+</svg>

assets/images/cancel_button.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="22.015" height="22.015" viewBox="0 0 22.015 22.015">
+  <g id="Button" transform="translate(-75.66 64.04) rotate(-45)">
+    <rect id="Rectangle_5860" data-name="Rectangle 5860" width="15.567" height="15.567" rx="7.783" transform="translate(91 16)" fill="#d85323"/>
+    <g id="plus_1" data-name="plus 1" transform="translate(95.001 20.001)">
+      <path id="Vector" d="M0,0V7.756" transform="translate(3.878)" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2"/>
+      <path id="Vector-2" data-name="Vector" d="M0,0H7.756" transform="translate(0 3.878)" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2"/>
+    </g>
+  </g>
+</svg>

assets/images/chat-group.svg

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#000000" height="800px" width="800px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
+	 viewBox="0 0 392.601 392.601" xml:space="preserve">
+<g>
+	<g>
+		<path d="M117.659,132.85c-29.479,0-53.463,23.984-53.463,53.463s23.984,53.463,53.463,53.463
+			c29.543,0,53.463-23.984,53.463-53.463S147.138,132.85,117.659,132.85z M117.659,217.989c-17.455,0-31.677-14.222-31.677-31.677
+			s14.222-31.677,31.677-31.677s31.677,14.222,31.677,31.677S135.114,217.989,117.659,217.989z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path d="M301.32,192.842c-23.531,0-42.731,19.2-42.731,42.731c0,23.596,19.135,42.731,42.731,42.731
+			c23.596,0,42.731-19.135,42.731-42.731C344.051,211.977,324.916,192.842,301.32,192.842z M301.32,256.518
+			c-11.507,0-20.945-9.374-20.945-20.945s9.438-20.945,20.945-20.945c11.572,0,20.945,9.374,20.945,20.945
+			C322.265,247.08,312.891,256.518,301.32,256.518z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path d="M301.32,292.591c-32.194,0-60.832,17.325-76.994,43.119c-18.554-40.792-59.604-69.495-106.731-69.495
+			c-63.547,0-116.234,51.717-117.592,115.2c-0.065,2.909,1.099,5.818,3.103,7.887c2.069,2.069,4.848,3.232,7.822,3.232h370.166
+			c2.909,0,5.689-1.164,7.822-3.232c2.133-2.069,3.168-4.978,3.103-7.887C390.984,332.478,350.257,292.591,301.32,292.591z
+			 M22.758,370.813c6.465-46.545,46.998-82.683,94.901-82.683c47.903,0,88.372,36.137,94.901,82.683H22.758z M233.57,370.813
+			c6.012-31.935,34.327-56.307,67.685-56.307s61.737,24.436,67.685,56.307H233.57z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path d="M274.427,0.066c-65.164,0-118.174,36.913-118.174,82.36c0,22.109,12.541,43.184,34.844,58.505v44.865
+			c0,3.685,1.875,7.111,4.913,9.115c2.78,1.875,7.24,2.069,10.343,0.84l70.4-31.095c64.065-0.776,115.846-37.43,115.846-82.23
+			C392.601,36.979,339.59,0.066,274.427,0.066z M274.427,142.87c-1.552,0-3.038,0.323-4.396,0.905l-57.212,25.277v-34.069
+			c0-3.814-2.004-7.37-5.236-9.244c-18.747-11.507-29.608-27.281-29.608-43.378c0.065-32.776,44.218-60.509,96.452-60.509
+			s96.388,27.733,96.388,60.509C370.815,115.201,326.661,142.87,274.427,142.87z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path d="M219.671,69.238h-5.107c-6.012,0-10.925,4.849-10.925,10.925c0.065,6.077,4.913,10.925,10.925,10.925h5.107
+			c6.012,0,10.925-4.849,10.925-10.925C230.597,74.151,225.748,69.238,219.671,69.238z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path d="M276.948,69.238h-5.107c-6.012,0-10.925,4.849-10.925,10.925c0,6.077,4.978,10.925,10.925,10.925h5.107
+			c6.012,0,10.925-4.849,10.925-10.925C287.873,74.151,283.025,69.238,276.948,69.238z"/>
+	</g>
+</g>
+<g>
+	<g>
+		<path d="M334.289,69.238h-5.107c-6.012,0-10.925,4.849-10.925,10.925c0,6.077,4.913,10.925,10.925,10.925h5.107
+			c6.012,0,10.925-4.849,10.925-10.925C345.215,74.151,340.366,69.238,334.289,69.238z"/>
+	</g>
+</g>
+</svg>

assets/images/document.svg

@@ -0,0 +1,4 @@
+<svg id="google-docs" xmlns="http://www.w3.org/2000/svg" width="18.402" height="24.158" viewBox="0 0 18.402 24.158">
+  <path id="Path_4955" data-name="Path 4955" d="M63.123,24.158H77.278A2.126,2.126,0,0,0,79.4,22.035V7.078H74.447a2.126,2.126,0,0,1-2.123-2.123V0h-9.2A2.126,2.126,0,0,0,61,2.123V22.035A2.126,2.126,0,0,0,63.123,24.158Zm2.831-14.2h8.493a.708.708,0,0,1,0,1.416H65.954a.708.708,0,1,1,0-1.416Zm0,2.831h8.493a.708.708,0,0,1,0,1.416H65.954a.708.708,0,1,1,0-1.416Zm0,2.831h8.493a.708.708,0,0,1,0,1.416H65.954a.708.708,0,1,1,0-1.416Zm0,2.831h5.662a.708.708,0,0,1,0,1.416H65.954a.708.708,0,1,1,0-1.416Z" transform="translate(-61)" fill="#125765"/>
+  <path id="Path_4956" data-name="Path 4956" d="M331.708,14.036h4.54L331,8.789v4.54A.708.708,0,0,0,331.708,14.036Z" transform="translate(-318.26 -8.374)" fill="#2bb8a6"/>
+</svg>

assets/json/demo_upcoming_marathon

@@ -16,7 +16,7 @@
   "projects": {
     "id": "b1cd3fa3-bb27-422e-a4c1-08dac09254df",
     "nameEn": "Cloud Solutions",
-    "nameAr": "333شركة حلول السحابة للاتصالات وتقنية المعلومات",
+    "nameAr": "شركة حلول السحابة للاتصالات وتقنية المعلومات",
     "projectCode": "CS"
   },
   "sponsors": [
@@ -42,5 +42,6 @@
   "totalQuestions": 10,
   "cancelReason": null,
   "marathonBufferTime": 30,
-  "currentTime": "2022-12-28T08:03:24.3671803Z"
+  "currentTime": "2022-12-28T08:03:24.3671803Z",
+  "displayCorrectAnswer": true
 }

assets/langs/ar-SA.json

@@ -4,7 +4,10 @@
   "arabic": "عربي",
   "login": "تسجيل الدخول",
   "pleaseEnterLoginDetails": "الرجاء إدخال التفاصيل أدناه لتسجيل الدخول",
+  "userId": "UserID",
   "username": "اسم المستخدم",
+  "userName": "اسم المستخدم",
+  "userSearch": "User Search",
   "password": "كلمة المرور",
   "welcomeBack": "مرحبا بعودتك",
   "wouldYouLikeToLoginWithCurrentUsername": "هل ترغب في تسجيل الدخول باسم المستخدم الحالي؟",
@@ -88,7 +91,7 @@
   "atLeastOneNumeric": "رقم واحد على الأقل",
   "minimum8Characters": "8 أحرف على الأقل",
   "doNotAddRepeatingLetters": "لا تقم بإضافة أحرف متكررة",
-  "itShouldContainSpecialCharacter": "يجب أن يحتوي على طابع خاص",
+  "itShouldContainSpecialCharacter": "يجب لا يحتوي على أحرف خاصة",
   "confirmPasswordMustMatch": "يجب أن يتطابق تأكيد كلمة المرور",
   "sms": "رسالة قصيرة",
   "fingerPrint": "بصمة",
@@ -97,6 +100,7 @@
   "reject": "يرفض",
   "approve": "يوافق",
   "cancel": "إلغاء",
+  "generate": "يولد",
   "requestedItems": "العناصر المطلوبة",
   "request": "طلب",
   "myRequest": "طلبي",
@@ -527,8 +531,94 @@
   "noWinner": "حزين! لم يفز أحد اليوم.",
   "myTeam": "فريقي",
   "youCanPlayDemo": "لكن يمكنك لعب العرض",
+  "group" : "مجموعة",
+  "searchGroup": "مجموعة البحث",
   "connectHmgWifi": "قم بتوصيل HMG WIFI",
   "connectedHmgWifi": "اتصال HMG WIFI",
   "itgForms": "نماذج (ITG)",
-  "resetAdPassword": "إعادة تعيين كلمة مرور AD"
+  "resetAdPassword": "إعادة تعيين كلمة مرور AD",
+  "myDocuments": "مستنداتي",
+  "requiredDocuments": "المستندات المطلوبة",
+  "optionalDocuments": "المستندات الاختيارية",
+  "allDocuments": "كافة المستندات",
+  "expiredDocuments": "المستندات منتهية الصلاحية",
+  "missingDocuments": "مستندات مفقودة",
+  "uploadedDocuments": "المستندات التي تم تحميلها",
+  "addAtLeastOneAttachment": "الرجاء إضافة مرفق واحد على الأقل.",
+  "pleaseClickButtonToJoinMarathon": "الرجاء الضغط على الزر أدناه للانضمام إلى الماراثون",
+  "youCannotJoinTheMarathon": "لا يمكنك الانضمام إلى الماراثون لأنك تجاوزت الحد الزمني",
+  "open": "يفتح",
+  "youCannotJoinTheMarathon": "لا يمكنك الانضمام إلى الماراثون لأنك تجاوزت الحد الزمني",
+  "pleaseClickButtonToJoinMarathon": "الرجاء الضغط على الزر أدناه للانضمام إلى الماراثون",
+  "generate": "يولد",
+  "paymentRequest": "طلب الدفع",
+  "paymentDetails": "تفاصيل الدفع",
+  "requestNo": "رقم الطلب",
+  "requesterEmpNum": "رقم الموظف الذي قدم الطلب",
+  "requesterEmpName": "اسم الموظف مقدم الطلب",
+  "prepareEmpName": "إعداد اسم الموظف",
+  "requesterPositionName": "اسم الوظيفة لمقدم الطلب",
+  "preparePositionName": "إعداد اسم الوظيفة",
+  "requesterPayrollName": "اسم مقدم الطلب",
+  "payingORGName": "اسم المنظمة الدافعة",
+  "requestAmount": "مبلغ الطلب",
+  "typeofPayment": "نوع الدفع",
+  "beneficiaryDetails": "تفاصيل المستفيد",
+  "beneficiaryName": "اسم المستفيد",
+  "idIqama": "الهوية السعودية / الإقامة",
+  "beneficiaryBankName": "اسم البنك المستفيد",
+  "sadadNumber": "رقم سداد",
+  "beneficiaryIBAN": "رقم IBAN للمستفيد",
+  "purchaseOrders": "طلبات الشراء",
+  "approvalDate": "تاريخ الموافقة",
+  "pOAmount": "مبلغ الطلب",
+  "versionStatus": "حالة الإصدار",
+  "supplierNo": "رقم المورد",
+  "general": "عام",
+  "requesterOperatingUnit":"وحدة تشغيل مقدم الطلب",
+  "prepareEmpNum":"إعداد رقم الموظف",
+  "supplierInfo" : "معلومات المورد",
+  "supplierAcNo": "رقم حساب المورد",
+  "supplierAcName": "اسم حساب المورد",
+  "supplierIBAN" : "رقم IBAN للمورد",
+  "supplierCRNo" :"رقم السجل التجاري",
+  "suppliedAcNo" : "رقم الحساب المقدم",
+  "patientRefundInvoice" : "فاتورة استرداد الأموال للمريض",
+  "patientNumber" : "رقم المريض",
+  "patientName" : "اسم المريض",
+  "invoiceDate" : "تاريخ الفاتورة",
+  "refundInvoice" :"فاتورة الاسترجاع",
+  "hospitalClinic" : "عيادة المستشفى",
+  "graphicalAnalysis": "التحليل الرسومي",
+  "itemHistoryAnalysis": "تحليل تاريخ العنصر",
+  "pOno": "امر شراء #",
+  "oprUnit": "وحدة التشغيل",
+  "qtyOrdered": "الكمية المطلوبة",
+  "qtyReceived": "الكمية المستلمة",
+  "bonusQty": "كمية المكافأة",
+  "balQty": "كمية التوازن",
+  "videoCall": "مكالمة فيديو",
+  "addUsers": "إضافة مستخدمين إلى المجموعة",
+  "admin": "مشرف",
+  "areYouSureWantTodelete": "هل أنت متأكد أنك تريد الحذف؟",
+  "Attendance": "الحضور",
+  "audioCall": "مكالمة صوتية",
+  "editGroups": "تعديل المجموعة",
+  "enterGroupName": "يرجى إدخال اسم المجموعة الصحيح",
+  "enterGroupNamePlease": "يرجى إدخال اسم المجموعة",
+  "groupMembers": "أعضاء المجموعة",
+  "groupName": "اسم المجموعة",
+  "groupNameshouldbe": "يجب أن يتكون اسم المجموعة من 10 أحرف على الأقل",
+  "manage": "إدارة",
+  "manageGroup": "إدارة المجموعة",
+  "members": "الأعضاء",
+  "searchByUserName": "البحث بواسطة اسم المستخدم",
+  "shareScreen": "مشاركة الشاشة",
+  "start":"يبدأ",
+  "about":"عن",
+  "explore": "يستكشف",
+  "mazaya": "مازيا",
+  "benefits": "فوائد",
+  "mazayaDesc": "اكتشف الخصومات والعروض الخاصة المتاحة للموظفين",
+  "viewallofferMazaya" : "أعرض كل المزايا"
 }

assets/langs/en-US.json

@@ -85,7 +85,7 @@
   "atLeastOneNumeric": "At least one numeric",
   "minimum8Characters": "Minimum 8 characters",
   "doNotAddRepeatingLetters": "Do not add repeating letters",
-  "itShouldContainSpecialCharacter": "It should contain special character",
+  "itShouldContainSpecialCharacter": "It should not contain special characters",
   "confirmPasswordMustMatch": "Confirm password must match",
   "sms": "SMS",
   "fingerPrint": "Fingerprint",
@@ -93,6 +93,7 @@
   "whatsapp": "Whatsapp",
   "reject": "Reject",
   "approve": "Approve",
+  "generate": "Generate",
   "cancel": "Cancel",
   "requestedItems": "Requested Items",
   "request": "Request",
@@ -302,6 +303,7 @@
   "section": "Section",
   "topic": "Topic",
   "actionBy": "Action By",
+  "pending": "Pending",
   "pendingTransactions": "Pending Transactions",
   "selectRequestType": "Please select request type",
   "dateFrom": "Date From",
@@ -527,8 +529,95 @@
   "noWinner": "Sad! No one won today.",
   "myTeam": "My Team",
   "youCanPlayDemo": "But you can play demo",
+  "group": "Groups",
+  "searchGroup": "Search Group",
   "connectHmgWifi": "Connect HMG WIFI",
   "connectedHmgWifi": "Connected HMG WIFI",
   "itgForms": "ITG Forms",
-  "resetAdPassword": "Reset AD Password"
+  "resetAdPassword": "Reset AD Password",
+  "myDocuments": "My Documents",
+  "requiredDocuments": "Required Documents",
+  "optionalDocuments": "Optional Documents",
+  "allDocuments": "All\nDocuments",
+  "expiredDocuments": "Expired\nDocuments",
+  "missingDocuments": "Missing\nDocuments",
+  "uploadedDocuments": "Uploaded\nDocuments",
+  "manage": "Manage",
+  "members": "Members",
+  "areYouSureWantTodelete": "Are you sure want to delete?",
+  "groupMembers": "Group Members",
+  "manageGroup": "Manage Group",
+  "admin": "Admin",
+  "addUsers": "Add users to the group",
+  "editGroups": "Edit Group",
+  "groupNameshouldbe": "Group name should be minimum 10 character long",
+  "enterGroupName": "Please enter valid group Name",
+  "groupName": "Group Name",
+  "enterGroupNamePlease": "Please enter group name",
+  "audioCall": "Audio Call",
+  "videoCall": "Video Call",
+  "shareScreen": "Share Screen",
+  "searchByUserName": "Search By Username",
+  "userSearch": "User Search",
+  "userName": "User Name",
+  "userId": "UserID",
+  "open": "open",
+  "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.",
+  "requesterOperatingUnit":"Requester Operating Unit",
+  "generate": "Generate",
+  "paymentRequest": "Pay Request",
+  "paymentDetails": "Payment Details",
+  "requestNo": "Request No",
+  "requesterEmpNum": "Requester Employee Num",
+  "requesterEmpName": "Requester Employee Name",
+  "prepareEmpName": "Prepare Employee Name",
+  "requesterPositionName": "Requester Position Name",
+  "preparePositionName": "Prepare Position Name",
+  "requesterPayrollName": "Requester Payroll Name",
+  "payingORGName": "Paying Organization Name",
+  "requestAmount": "Request Amount",
+  "typeofPayment": "Type of Payment",
+  "beneficiaryDetails": "Beneficiary Details",
+  "beneficiaryName": "Beneficiary Name",
+  "idIqama": "Saudi ID / Iqama",
+  "beneficiaryBankName": "Beneficiary Bank Name",
+  "sadadNumber": "Sadad Number",
+  "beneficiaryIBAN": "Beneficiary IBAN",
+  "purchaseOrders": "Purchase Orders",
+  "approvalDate": "Approval Date",
+  "pOAmount": "PO Amount",
+  "versionStatus": "Version Status",
+  "supplierNo": "Supplier No",
+  "general": "General",
+  "prepareEmpNum":"Prepare Employee Num",
+  "supplierInfo" : "Supplier Information",
+  "supplierAcNo": "Supplier Account No",
+  "supplierAcName":"Supplier Account Name",
+  "supplierIBAN" : "Supplier IBAN",
+  "supplierCRNo" : "CR Number",
+  "suppliedAcNo" : "Supplied Account No.",
+  "patientRefundInvoice" : "Patient Refund Invoice",
+  "patientNumber" : "Patient Number",
+  "patientName" : "Patient Name",
+  "invoiceDate" : "Invoice Date",
+  "refundInvoice" :"Refund Invoice",
+  "hospitalClinic" : "Hospital Clinic",
+  "graphicalAnalysis": "Graphical Analysis",
+  "itemHistoryAnalysis": "Item History Analysis",
+  "pOno": "P.O #",
+  "oprUnit": "Opr. Unit",
+  "qtyOrdered": "Qty. Ordered",
+  "qtyReceived": "Qty. Received",
+  "bonusQty": "Bonus Qty.",
+  "balQty": "Bal. Qty.",
+  "start":"Start",
+  "about":"About",
+  "explore": "Explore",
+  "mazaya": "MAZAYA",
+  "benefits": "Benefits",
+  "mazayaDesc": "Discover special Discounts and offers available to Employees",
+  "viewallofferMazaya" : "View All Offers"
+
 }

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>12.0</string>
 </dict>
 </plist>

ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -144,7 +144,7 @@
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				C4CFBC4C5CAC00182015ACD5 /* [CP] Embed Pods Frameworks */,
-				1C704830960BB41251F31356 /* [CP] Copy Pods Resources */,
+				EF29CE25BB57F5AA48CE1136 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -161,7 +161,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -204,23 +204,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		1C704830960BB41251F31356 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		2D06B7AD3B87C9C9059E4168 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -245,10 +228,12 @@
 		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (
@@ -257,8 +242,26 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
+		6C6E76E4FB19FAF11C24005D /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -378,21 +381,23 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 99Z3UD3LJM;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Mohemm;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.cloudsolutions.mohemmtest;
+				MARKETING_VERSION = 3.7.95;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cloudsolutions.mohemm;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -515,21 +520,23 @@
 			baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 99Z3UD3LJM;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Mohemm;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.cloudsolutions.mohemmtest;
+				MARKETING_VERSION = 3.7.95;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cloudsolutions.mohemm;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -544,21 +551,23 @@
 			baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 99Z3UD3LJM;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Mohemm;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.cloudsolutions.mohemmtest;
+				MARKETING_VERSION = 3.7.95;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cloudsolutions.mohemm;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -43,11 +44,13 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

ios/Runner/AppDelegate.swift

@@ -4,7 +4,7 @@ import Firebase
 import flutter_local_notifications
 
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,128 +1 @@
-{
-    "images":[
-        {
-            "idiom":"iphone",
-            "size":"20x20",
-            "scale":"2x",
-            "filename":"Icon-App-20x20@2x.png"
-        },
-        {
-            "idiom":"iphone",
-            "size":"20x20",
-            "scale":"3x",
-            "filename":"Icon-App-20x20@3x.png"
-        },
-        {
-            "idiom":"iphone",
-            "size":"29x29",
-            "scale":"1x",
-            "filename":"Icon-App-29x29@1x.png"
-        },
-        {
-            "idiom":"iphone",
-            "size":"29x29",
-            "scale":"2x",
-            "filename":"Icon-App-29x29@2x.png"
-        },
-        {
-            "idiom":"iphone",
-            "size":"29x29",
-            "scale":"3x",
-            "filename":"Icon-App-29x29@3x.png"
-        },
-        {
-            "idiom":"iphone",
-            "size":"40x40",
-            "scale":"2x",
-            "filename":"Icon-App-40x40@2x.png"
-        },
-        {
-            "idiom":"iphone",
-            "size":"40x40",
-            "scale":"3x",
-            "filename":"Icon-App-40x40@3x.png"
-        },
-        {
-            "idiom":"iphone",
-            "size":"60x60",
-            "scale":"2x",
-            "filename":"Icon-App-60x60@2x.png"
-        },
-        {
-            "idiom":"iphone",
-            "size":"60x60",
-            "scale":"3x",
-            "filename":"Icon-App-60x60@3x.png"
-        },
-        {
-            "idiom":"iphone",
-            "size":"76x76",
-            "scale":"2x",
-            "filename":"Icon-App-76x76@2x.png"
-        },
-        {
-            "idiom":"ipad",
-            "size":"20x20",
-            "scale":"1x",
-            "filename":"Icon-App-20x20@1x.png"
-        },
-        {
-            "idiom":"ipad",
-            "size":"20x20",
-            "scale":"2x",
-            "filename":"Icon-App-20x20@2x.png"
-        },
-        {
-            "idiom":"ipad",
-            "size":"29x29",
-            "scale":"1x",
-            "filename":"Icon-App-29x29@1x.png"
-        },
-        {
-            "idiom":"ipad",
-            "size":"29x29",
-            "scale":"2x",
-            "filename":"Icon-App-29x29@2x.png"
-        },
-        {
-            "idiom":"ipad",
-            "size":"40x40",
-            "scale":"1x",
-            "filename":"Icon-App-40x40@1x.png"
-        },
-        {
-            "idiom":"ipad",
-            "size":"40x40",
-            "scale":"2x",
-            "filename":"Icon-App-40x40@2x.png"
-        },
-        {
-            "idiom":"ipad",
-            "size":"76x76",
-            "scale":"1x",
-            "filename":"Icon-App-76x76@1x.png"
-        },
-        {
-            "idiom":"ipad",
-            "size":"76x76",
-            "scale":"2x",
-            "filename":"Icon-App-76x76@2x.png"
-        },
-        {
-            "idiom":"ipad",
-            "size":"83.5x83.5",
-            "scale":"2x",
-            "filename":"Icon-App-83.5x83.5@2x.png"
-        },
-        {
-            "size" : "1024x1024",
-            "idiom" : "ios-marketing",
-            "scale" : "1x",
-            "filename" : "ItunesArtwork@2x.png"
-        }
-    ],
-    "info":{
-        "version":1,
-        "author":"easyappicon"
-    }
-}
+{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"72x72","expected-size":"72","filename":"72.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"76x76","expected-size":"152","filename":"152.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"50x50","expected-size":"100","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"76x76","expected-size":"76","filename":"76.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"50x50","expected-size":"50","filename":"50.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"72x72","expected-size":"144","filename":"144.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"40x40","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"83.5x83.5","expected-size":"167","filename":"167.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"20x20","expected-size":"20","filename":"20.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"}]}

ios/Runner/Info.plist

@@ -2,15 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>NSAppTransportSecurity</key>
-        <dict>
-            <key>NSAllowsArbitraryLoads</key>
-            <true/>
-            <key>NSAllowsArbitraryLoadsForMedia</key>
-            <true/>
-            <key>NSAllowsArbitraryLoadsInWebContent</key>
-            <true/>
-        </dict>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
 	<key>CFBundleDevelopmentRegion</key>
@@ -22,7 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>MOHEMM</string>
+	<string>MoheM</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -31,6 +22,10 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>FirebaseAppDelegateProxyEnabled</key>
+	<false/>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>sms</string>
@@ -41,6 +36,15 @@
 	<true/>
 	<key>NFCReaderUsageDescription</key>
 	<string>This App requires access to NFC to mark your attendance.</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+		<key>NSAllowsArbitraryLoadsForMedia</key>
+		<true/>
+		<key>NSAllowsArbitraryLoadsInWebContent</key>
+		<true/>
+	</dict>
 	<key>NSCameraUsageDescription</key>
 	<string>This app requires camera access to capture &amp; upload picture as profile image.</string>
 	<key>NSFaceIDUsageDescription</key>
@@ -51,17 +55,17 @@
 	<string>This App requires access to your location to mark your attendance.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>This App requires access to your location to mark your attendance.</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>This app requires photo library access to select image as document &amp; upload it.</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>This app requires microphone access to for call.</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>This app requires photo library access to select image as document &amp; upload it.</string>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>fetch</string>
 		<string>remote-notification</string>
 	</array>
-	<key>FirebaseAppDelegateProxyEnabled</key>
-	<false/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -85,8 +89,6 @@
 	<array>
 		<string>0000</string>
 	</array>
-	<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
 	<key>com.apple.developer.nfc.readersession.formats</key>
 	<array>
 		<string>TAG</string>

lib/api/api_client.dart

@@ -6,6 +6,8 @@ import 'package:flutter/foundation.dart';
 import 'package:http/http.dart';
 import 'package:http/io_client.dart';
 import 'package:mohem_flutter_app/app_state/app_state.dart';
+import 'package:mohem_flutter_app/classes/utils.dart';
+import 'package:mohem_flutter_app/config/routes.dart';
 import 'package:mohem_flutter_app/exceptions/api_exception.dart';
 import 'package:mohem_flutter_app/main.dart';
 // ignore_for_file: avoid_annotating_with_dynamic
@@ -13,16 +15,17 @@ import 'package:mohem_flutter_app/main.dart';
 typedef FactoryConstructor<U> = U Function(dynamic);
 
 class APIError {
-  int? errorCode;
+  dynamic errorCode;
   int? errorType;
   String? errorMessage;
-
-  APIError(this.errorCode, this.errorMessage, this.errorType);
+  int?    errorStatusCode;
+  APIError(this.errorCode, this.errorMessage, this.errorType, this.errorStatusCode);
 
   Map<String, dynamic> toJson() => {
         'errorCode': errorCode,
         'errorMessage': errorMessage,
         'errorType': errorType,
+        'ErrorStatusCode':  errorStatusCode
       };
 
   @override
@@ -38,14 +41,14 @@ APIException _throwAPIException(Response response) {
       if (response.body != null && response.body.isNotEmpty) {
         var jsonError = jsonDecode(response.body);
         print(jsonError);
-        apiError = APIError(jsonError['ErrorCode'], jsonError['ErrorMessage'], jsonError['ErrorType']);
+        apiError = APIError(jsonError['ErrorCode'], jsonError['ErrorMessage'], jsonError['ErrorType'], jsonError['ErrorStatusCode']);
       }
       return APIException(APIException.BAD_REQUEST, error: apiError);
     case 400:
       APIError? apiError;
       if (response.body != null && response.body.isNotEmpty) {
         var jsonError = jsonDecode(response.body);
-        apiError = APIError(jsonError['ErrorCode'], jsonError['ErrorMessage'], jsonError['ErrorType']);
+        apiError = APIError(jsonError['ErrorCode'], jsonError['ErrorMessage'], jsonError['ErrorType'],jsonError['ErrorStatusCode']);
       }
       return APIException(APIException.BAD_REQUEST, error: apiError);
     case 401:
@@ -85,6 +88,7 @@ class ApiClient {
     var response = await postJsonForResponse(url, jsonObject, token: token, queryParameters: queryParameters, headers: _headers, retryTimes: retryTimes, isFormData: isFormData);
     try {
       if (!kReleaseMode) {
+        logger.i("Url: " + url);
         logger.i("res: " + response.body);
       }
 
@@ -92,11 +96,20 @@ class ApiClient {
       if (jsonData["IsAuthenticated"] != null) {
         AppState().setIsAuthenticated = jsonData["IsAuthenticated"];
       }
+
+      // if(url.contains("GetOfferDiscountsConfigData")) {
+      //   jsonData["ErrorMessage"] = "Service Not Available";
+      //   jsonData["ErrorEndUserMessage"] = "Service Not Available";
+      // }
+
       if (jsonData["ErrorMessage"] == null) {
         return factoryConstructor(jsonData);
-      } else {
+      } else if (jsonData["MessageStatus"] == 2 && jsonData["IsOTPMaxLimitExceed"] == true) {
+        await Utils.performLogout(AppRoutes.navigatorKey.currentContext, null);
+        throw const APIException(APIException.UNAUTHORIZED, error: null);
+      }  else {
         APIError? apiError;
-        apiError = APIError(jsonData['ErrorCode'], jsonData['ErrorEndUserMessage'], jsonData['ErrorType'] ?? 0);
+        apiError = APIError(jsonData['ErrorCode'], jsonData['ErrorEndUserMessage'], jsonData['ErrorType'] ?? 0, jsonData['ErrorStatusCode']);
         throw APIException(APIException.BAD_REQUEST, error: apiError);
       }
     } catch (ex) {
@@ -146,7 +159,7 @@ class ApiClient {
       }
       var response = await _post(Uri.parse(url), body: requestBody, headers: _headers).timeout(Duration(seconds: 120));
 
-      if (response.statusCode >= 200 && response.statusCode < 300) {
+      if (response. statusCode >= 200 && response.statusCode < 300) {
         return response;
       } else {
         throw _throwAPIException(response);
@@ -186,6 +199,13 @@ class ApiClient {
     } else {
       headers['Content-Type'] = 'application/json';
     }
+
+    if (!kReleaseMode) {
+      print("Url:$url");
+      // var bodyJson = json.encode(jsonObject);
+      // print("body:$bodyJson");
+    }
+
     return await _getForResponse(url, token: token, queryParameters: queryParameters, headers: headers, retryTimes: retryTimes);
   }
 

lib/api/chat/chat_api_client.dart

@@ -12,7 +12,11 @@ import 'package:mohem_flutter_app/classes/utils.dart';
 import 'package:mohem_flutter_app/exceptions/api_exception.dart';
 import 'package:mohem_flutter_app/main.dart';
 import 'package:mohem_flutter_app/models/chat/chat_user_image_model.dart';
+import 'package:mohem_flutter_app/models/chat/create_group_request.dart' as createGroup;
+import 'package:mohem_flutter_app/models/chat/get_group_chat_history.dart';
 import 'package:mohem_flutter_app/models/chat/get_search_user_chat_model.dart';
+import 'package:mohem_flutter_app/models/chat/get_user_groups_by_id.dart' as groups;
+import 'package:mohem_flutter_app/models/chat/get_user_groups_by_id.dart';
 import 'package:mohem_flutter_app/models/chat/get_user_login_token_model.dart' as user;
 import 'package:mohem_flutter_app/models/chat/make_user_favotire_unfavorite_chat_model.dart' as fav;
 
@@ -24,15 +28,18 @@ class ChatApiClient {
   factory ChatApiClient() => _instance;
 
   Future<user.UserAutoLoginModel> getUserLoginToken() async {
-    user.UserAutoLoginModel userLoginResponse = user.UserAutoLoginModel();
+    user.UserAutoLoginModel userLoginResponse =   user.UserAutoLoginModel();
+    String? deviceToken = AppState().getIsHuawei ? AppState().getHuaweiPushToken : AppState().getDeviceToken;
     Response response = await ApiClient().postJsonForResponse(
       "${ApiConsts.chatLoginTokenUrl}externaluserlogin",
       {
         "employeeNumber": AppState().memberInformationList!.eMPLOYEENUMBER.toString(),
         "password": "FxIu26rWIKoF8n6mpbOmAjDLphzFGmpG",
         "isMobile": true,
-        "deviceToken":AppState().getIsHuawei ? AppState().getHuaweiPushToken : AppState().getDeviceToken,
+        "platform": Platform.isIOS ? "ios" : "android",
+        "deviceToken": AppState().getIsHuawei ? AppState().getHuaweiPushToken : AppState().getDeviceToken,
         "isHuaweiDevice": AppState().getIsHuawei,
+        "voipToken": Platform.isIOS ? "80a3b01fc1ef2453eb4f1daa4fc31d8142d9cb67baf848e91350b607971fe2ba" : "",
       },
     );
 
@@ -138,14 +145,14 @@ class ChatApiClient {
   }
 
 // Upload Chat Media
-  Future<Object?> uploadMedia(String userId, File file) async {
+  Future<Object?> uploadMedia(String userId, File file, String fileSource) async {
     if (kDebugMode) {
       print("${ApiConsts.chatMediaImageUploadUrl}upload");
       print(AppState().chatDetails!.response!.token);
     }
 
     dynamic request = MultipartRequest('POST', Uri.parse('${ApiConsts.chatMediaImageUploadUrl}upload'));
-    request.fields.addAll({'userId': userId, 'fileSource': '1'});
+    request.fields.addAll({'userId': userId, 'fileSource': fileSource});
     request.files.add(await MultipartFile.fromPath('files', file.path));
     request.headers.addAll({'Authorization': 'Bearer ${AppState().chatDetails!.response!.token}'});
     StreamedResponse response = await request.send();
@@ -157,10 +164,10 @@ class ChatApiClient {
   }
 
   // Download File For Chat
-  Future<Uint8List> downloadURL({required String fileName, required String fileTypeDescription}) async {
+  Future<Uint8List> downloadURL({required String fileName, required String fileTypeDescription, required int fileSource}) async {
     Response response = await ApiClient().postJsonForResponse(
       "${ApiConsts.chatMediaImageUploadUrl}download",
-      {"fileType": fileTypeDescription, "fileName": fileName, "fileSource": 1},
+      {"fileType": fileTypeDescription, "fileName": fileName, "fileSource": fileSource},
       token: AppState().chatDetails!.response!.token,
     );
     Uint8List data = Uint8List.fromList(response.bodyBytes);
@@ -188,4 +195,122 @@ class ChatApiClient {
     }
     return imagesData;
   }
+
+  //group chat apis start here.
+  Future<groups.GetUserGroups> getGroupsByUserId() async {
+    try {
+      Response response = await ApiClient().getJsonForResponse(
+        "${ApiConsts.getGroupByUserId}${AppState().chatDetails!.response!.id}",
+        token: AppState().chatDetails!.response!.token,
+      );
+      if (!kReleaseMode) {
+        logger.i("res: " + response.body);
+      }
+      return groups.GetUserGroups.fromRawJson(response.body);
+    } catch (e) {
+      //if fail api returning 500 hence just printing here
+      print(e);
+      throw e;
+    }
+  }
+
+  Future<Response> deleteGroup(int? groupId) async {
+    try {
+      Response response = await ApiClient().postJsonForResponse(
+        ApiConsts.deleteGroup,
+        {"groupId": groupId},
+        token: AppState().chatDetails!.response!.token,
+      );
+      if (!kReleaseMode) {
+        logger.i("res: " + response.body);
+      }
+      return response;
+    } catch (e) {
+      //if fail api returning 500 hence just printing here
+      print(e);
+      throw e;
+    }
+  }
+
+  Future<Response> updateGroupAdmin(int? groupId, List<GroupUserList> groupList) async {
+    try {
+      Response response = await ApiClient().postJsonForResponse(
+        ApiConsts.updateGroupAdmin,
+        {"groupId": groupId, "groupUserList": groupList},
+        token: AppState().chatDetails!.response!.token,
+      );
+      if (!kReleaseMode) {
+        logger.i("res: " + response.body);
+      }
+      return response;
+    } catch (e) {
+      //if fail api returning 500 hence just printing here
+      print(e);
+      throw e;
+    }
+  }
+
+  Future<List<GetGroupChatHistoryAsync>> getGroupChatHistory(int? groupId, List<GroupUserList> groupList) async {
+    try {
+      Response response = await ApiClient().postJsonForResponse(
+        ApiConsts.getGroupChatHistoryAsync,
+        {"groupId": groupId, "targetUserList": groupList, "CurrentId": AppState().chatDetails!.response!.id},
+        token: AppState().chatDetails!.response!.token,
+      );
+      if (!kReleaseMode) {
+        logger.i("res: " + response.body);
+      }
+      List<GetGroupChatHistoryAsync> groupChat = [];
+      List groupChatData = json.decode(response.body);
+      for (var i in groupChatData) {
+        groupChat.add(GetGroupChatHistoryAsync.fromJson(i));
+      }
+
+      groupChat.sort((a, b) => b.createdDate!.compareTo(a.createdDate!));
+      return groupChat;
+      // for(GetGroupChatHistoryAsync i in groupChat) {
+      //   return GetGroupChatHistoryAsync.fromJson(jsonEncode(i));
+      // }
+    } catch (e) {
+      //if fail api returning 500 hence just printing here
+      print(e);
+      throw e;
+    }
+  }
+
+  Future addGroupAndUsers(createGroup.CreateGroupRequest request) async {
+    try {
+      Response response = await ApiClient().postJsonForResponse(
+        ApiConsts.addGroupsAndUsers,
+        request,
+        token: AppState().chatDetails!.response!.token,
+      );
+      if (!kReleaseMode) {
+        logger.i("res: " + response.body);
+      }
+      return response.body;
+    } catch (e) {
+      //if fail api returning 500 hence just printing here
+      print(e);
+      throw e;
+    }
+  }
+
+  Future updateGroupAndUsers(createGroup.CreateGroupRequest request) async {
+    try {
+      Response response = await ApiClient().postJsonForResponse(
+        ApiConsts.updateGroupsAndUsers,
+        request,
+        token: AppState().chatDetails!.response!.token,
+      );
+      if (!kReleaseMode) {
+        logger.i("res: " + response.body);
+      }
+      return response.body;
+    } catch (e) {
+      //if fail api returning 500 hence just printing here
+      print(e);
+      throw e;
+    }
+  }
 }

lib/api/dashboard_api_client.dart

@@ -1,6 +1,10 @@
 import 'dart:async';
 import 'dart:convert';
+import 'dart:io';
 
+import 'package:easy_localization/easy_localization.dart';
+import 'package:http/http.dart' as http;
+import 'package:device_info_plus/device_info_plus.dart';
 import 'package:mohem_flutter_app/api/api_client.dart';
 import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/classes/consts.dart';
@@ -12,7 +16,11 @@ import 'package:mohem_flutter_app/models/dashboard/list_menu.dart';
 import 'package:mohem_flutter_app/models/generic_response_model.dart';
 import 'package:mohem_flutter_app/models/itg/itg_main_response.dart';
 import 'package:mohem_flutter_app/models/itg/itg_response_model.dart';
-import 'package:platform_device_id/platform_device_id.dart';
+import 'package:mohem_flutter_app/models/sso_auth_model.dart';
+import 'package:platform_device_id_plus/platform_device_id.dart';
+// import 'package:platform_device_id/platform_device_id.dart';
+
+// import 'package:platform_device_id/platform_device_id.dart';
 import 'package:uuid/uuid.dart';
 
 class DashboardApiClient {
@@ -26,40 +34,56 @@ class DashboardApiClient {
     String url = "${ApiConsts.erpRest}GET_Attendance_Tracking";
     Map<String, dynamic> postParams = {};
     postParams.addAll(AppState().postParamsJson);
-    return await ApiClient().postJsonForObject((json) {
-      GenericResponseModel responseData = GenericResponseModel.fromJson(json);
-      return responseData.getAttendanceTrackingList;
-    }, url, postParams);
+    return await ApiClient().postJsonForObject(
+      (json) {
+        GenericResponseModel responseData = GenericResponseModel.fromJson(json);
+        return responseData.getAttendanceTrackingList;
+      },
+      url,
+      postParams,
+    );
   }
 
   Future<GenericResponseModel?> getOpenNotifications() async {
     String url = "${ApiConsts.erpRest}GET_OPEN_NOTIFICATIONS";
     Map<String, dynamic> postParams = {};
     postParams.addAll(AppState().postParamsJson);
-    return await ApiClient().postJsonForObject((json) {
-      GenericResponseModel responseData = GenericResponseModel.fromJson(json);
-      return responseData;
-    }, url, postParams);
+    return await ApiClient().postJsonForObject(
+      (json) {
+        GenericResponseModel responseData = GenericResponseModel.fromJson(json);
+        return responseData;
+      },
+      url,
+      postParams,
+    );
   }
 
   Future<GenericResponseModel?> getCOCNotifications() async {
     String url = "${ApiConsts.cocRest}Mohemm_ITG_ReviewerAdmin_Pending_Tasks";
     Map<String, dynamic> postParams = {"Date": DateUtil.getISODateFormat(DateTime.now()), "EmployeeNumber": AppState().memberInformationList?.eMPLOYEENUMBER};
     postParams.addAll(AppState().postParamsJson);
-    return await ApiClient().postJsonForObject((json) {
-      GenericResponseModel responseData = GenericResponseModel.fromJson(json);
-      return responseData;
-    }, url, postParams);
+    return await ApiClient().postJsonForObject(
+      (json) {
+        GenericResponseModel responseData = GenericResponseModel.fromJson(json);
+        return responseData;
+      },
+      url,
+      postParams,
+    );
   }
 
   Future<ItgFormsModel?> getItgFormsPendingTask() async {
     String url = "${ApiConsts.cocRest}ITGFormsPendingTasks";
     Map<String, dynamic> postParams = {};
     postParams.addAll(AppState().postParamsJson);
-    return await ApiClient().postJsonForObject((json) {
-      ItgFormsModel responseData = ItgFormsModel.fromJson(json);
-      return responseData;
-    }, url, postParams);
+    return await ApiClient().postJsonForObject(
+      (json) {
+        ItgFormsModel responseData = ItgFormsModel.fromJson(json);
+        return responseData;
+      },
+      url,
+      postParams,
+    );
   }
 
   Future<List<GetAccrualBalancesList>> getAccrualBalances(String effectiveDate, {String? empID}) async {
@@ -67,20 +91,28 @@ class DashboardApiClient {
     Map<String, dynamic> postParams = {"P_EFFECTIVE_DATE": effectiveDate};
     postParams.addAll(AppState().postParamsJson);
     if (empID != null) postParams["P_SELECTED_EMPLOYEE_NUMBER"] = empID;
-    return await ApiClient().postJsonForObject((json) {
-      GenericResponseModel responseData = GenericResponseModel.fromJson(json);
-      return responseData.getAccrualBalancesList ?? [];
-    }, url, postParams);
+    return await ApiClient().postJsonForObject(
+      (json) {
+        GenericResponseModel responseData = GenericResponseModel.fromJson(json);
+        return responseData.getAccrualBalancesList ?? [];
+      },
+      url,
+      postParams,
+    );
   }
 
   Future<GenericResponseModel?> getOpenMissingSwipes() async {
     String url = "${ApiConsts.erpRest}GET_OPEN_MISSING_SWIPES";
     Map<String, dynamic> postParams = {};
     postParams.addAll(AppState().postParamsJson);
-    return await ApiClient().postJsonForObject((json) {
-      GenericResponseModel responseData = GenericResponseModel.fromJson(json);
-      return responseData;
-    }, url, postParams);
+    return await ApiClient().postJsonForObject(
+      (json) {
+        GenericResponseModel responseData = GenericResponseModel.fromJson(json);
+        return responseData;
+      },
+      url,
+      postParams,
+    );
   }
 
   //Menus List
@@ -88,10 +120,14 @@ class DashboardApiClient {
     String url = "${ApiConsts.erpRest}GET_MENU";
     Map<String, dynamic> postParams = {};
     postParams.addAll(AppState().postParamsJson);
-    return await ApiClient().postJsonForObject((json) {
-      GenericResponseModel responseData = GenericResponseModel.fromJson(json);
-      return responseData.listMenu ?? [];
-    }, url, postParams);
+    return await ApiClient().postJsonForObject(
+      (json) {
+        GenericResponseModel responseData = GenericResponseModel.fromJson(json);
+        return responseData.listMenu ?? [];
+      },
+      url,
+      postParams,
+    );
   }
 
   //GET_MENU_ENTRIES
@@ -99,20 +135,106 @@ class DashboardApiClient {
     String url = "${ApiConsts.erpRest}GET_MENU_ENTRIES";
     Map<String, dynamic> postParams = {"P_SELECTED_RESP_ID": -999, "P_MENU_TYPE": "E"};
     postParams.addAll(AppState().postParamsJson);
-    return await ApiClient().postJsonForObject((json) {
-      GenericResponseModel responseData = GenericResponseModel.fromJson(json);
-      return responseData;
-    }, url, postParams);
+    return await ApiClient().postJsonForObject(
+      (json) {
+        GenericResponseModel responseData = GenericResponseModel.fromJson(json);
+        return responseData;
+      },
+      url,
+      postParams,
+    );
+  }
+
+  Future<GenericResponseModel?> getEventActivity() async {
+    String url = "${ApiConsts.erpRest}Get_EventActivity";
+    Map<String, dynamic> postParams = {"P_SELECTED_RESP_ID": -999, "P_MENU_TYPE": "E"};
+    postParams.addAll(AppState().postParamsJson);
+    return await ApiClient().postJsonForObject(
+      (json) {
+        GenericResponseModel responseData = GenericResponseModel.fromJson(json);
+        return responseData;
+      },
+      url,
+      postParams,
+    );
+  }
+
+  Future<GenericResponseModel?> getTicketBookingRedirection() async {
+    String url = "${ApiConsts.erpRest}GET_PORTAL_REDIRECTION";
+    Map<String, dynamic> postParams = {"P_USER_NAME": AppState().memberInformationList?.eMPLOYEENUMBER};
+    postParams.addAll(AppState().postParamsJson);
+    return await ApiClient().postJsonForObject(
+      (json) {
+        GenericResponseModel responseData = GenericResponseModel.fromJson(json);
+        return responseData;
+      },
+      url,
+      postParams,
+    );
+  }
+
+  Future<SSOAuthModel?> getBookingSSOAuthRedirection({required String clientID}) async {
+    String url = "${ApiConsts.ssoAuthRedirection}?grantType=mohemm";
+    //https://sso-uat.hmg.com/api/auth/connect?grantType=mohemm'
+    // Map<String, dynamic> postParams = {"P_USER_NAME": AppState().memberInformationList?.eMPLOYEENUMBER};
+    Map<String, dynamic> postParams = {
+      "ClientId": clientID,
+      // "ClientId": "a9f4d1a0596d4aea8f830992ec4bdac1",
+      "PersonId": AppState().memberInformationList?.eMPLOYEENUMBER,
+      "Username": AppState().memberInformationList?.eMPLOYEENUMBER,
+      "Language": "US",
+    };
+    postParams.addAll(AppState().postParamsJson);
+    return await ApiClient().postJsonForObject(
+      (json) {
+        SSOAuthModel responseData = SSOAuthModel.fromJson(json);
+        return responseData;
+      },
+      url,
+      postParams,
+    );
+  }
+
+  Future<dynamic> getBookingSSOFinalRedirection({required String token}) async {
+    token = "eyJhbGciOiJSUzI1NiIsImtpZCI6IjhjZTE2OWM0YjIwYjQ2ZWM5YTQyOTU3Y2ZhODUzNzQ1IiwidHlwIjoiSldUIn0.eyJ0ZW5hbnRfaWQiOiJhOWY0ZDFhMDU5NmQ0YWVhOGY4MzA5OTJlYzRiZGFjMSIsImVpZCI6IjExNzkzMCIsImh0dHA6Ly9zY2hlbWFzLnhtbHNvYXAub3JnL3dzLzIwMDUvMDUvaWRlbnRpdHkvY2xhaW1zL3NpZCI6Ijk2MDI0OGM1NzA3YzQ3MmFhYTEzM2I1N2ZhODE1ZmVhIiwibGFuZ3VhZ2UiOiJVUyIsImh0dHA6Ly9zY2hlbWFzLnhtbHNvYXAub3JnL3dzLzIwMDUvMDUvaWRlbnRpdHkvY2xhaW1zL2VtYWlsYWRkcmVzcyI6IjExNzkzMEBobWcuY29tIiwiZXhwIjoxNzgyNDc1NzY5LCJpc3MiOiJodHRwczovL3Nzby11YXQuaG1nLmNvbSIsImF1ZCI6ImE5ZjRkMWEwNTk2ZDRhZWE4ZjgzMDk5MmVjNGJkYWMxIn0.rJcLVsG8D0XECyLERCTD2uqGeWyvp-OBVGE9uL2qKrX4etFUHgdFt_5kYF6edFTtGy-0PIZadHDmv7e-IOhVWHm5HVMClaukiXoRXR8cDN8XA1wfme3Kd-U5PXN-IRh49AyRTzLO0rYNPvH81ScosWGlsFSkOvA-0hJNa2adHdtvgNvB8wJshSU5p7sAmF8mjdDY6aInG19etu2iEuUDwHHA4ZY_ts4hboHo8fE392hFaYGonExoD7bpW5RMx5xKWeRCmWpG_PK8Aw_z1jGzdB9PANus4pteRGuln1J-kmo2lQC9pVrSyZATAKp1HfgfyZ_vUhaHEfM69cMWaCslJQ";
+    var request = http.MultipartRequest('POST', Uri.parse('https://ek.techmaster.in/SSO/HMG'));
+    request.fields.addAll({'JWTToken': token});
+
+    // request.headers.addAll(headers);
+
+    http.StreamedResponse response = await request.send();
+    if (response.statusCode == 302) {
+      print("================== post ==========");
+      var res = await response.stream.bytesToString();
+      return response.headers["location"];
+    } else {
+      print(response.reasonPhrase);
+    }
   }
 
   //Mark Attendance
-  Future<GenericResponseModel?> markAttendance({String lat = "0", String? long = "0", required int pointType, String nfcValue = "", bool isGpsRequired = false, String QRValue = ""}) async {
+  Future<GenericResponseModel?> markAttendance({
+    String lat = "0",
+    String? long = "0",
+    required int pointType,
+    String nfcValue = "",
+    bool isGpsRequired = false,
+    String QRValue = "",
+    String payrollCode = "",
+  }) async {
     String url = "${ApiConsts.swpRest}AuthenticateAndSwipeUserSupportNFC";
     var uuid = Uuid();
+    String? deviceId = "";
     // Generate a v4 (random) id
-
+    if (Platform.isAndroid) {
+      AndroidDeviceInfo androidInfo = await DeviceInfoPlugin().androidInfo;
+      deviceId = androidInfo.id;
+    } else if (Platform.isIOS) {
+      IosDeviceInfo iosInfo = await DeviceInfoPlugin().iosInfo;
+      deviceId = iosInfo.identifierForVendor;
+    }
     Map<String, dynamic> postParams = {
-      "UID": await PlatformDeviceId.getDeviceId, //uuid.v4(), //Mobile Id
+      "UID": deviceId, //uuid.v4(), //Mobile Id
       // "UID": uuid.v4(), //Mobile Id
       "Latitude": lat,
       "Longitude": long,
@@ -120,13 +242,18 @@ class DashboardApiClient {
       "PointType": pointType, // NFC=2, Wifi = 3, QR= 1,
       "NFCValue": nfcValue,
       "WifiValue": pointType == 3 ? "100" : "",
-      "IsGpsRequired": isGpsRequired
+      "IsGpsRequired": isGpsRequired,
+      "PayrollCodeStr": AppState().postParamsObject?.payrollCodeStr.toString() ?? "",
     };
     postParams.addAll(AppState().postParamsJson);
-    return await ApiClient().postJsonForObject((json) {
-      GenericResponseModel responseData = GenericResponseModel.fromJson(json);
-      return responseData;
-    }, url, postParams);
+    return await ApiClient().postJsonForObject(
+      (json) {
+        GenericResponseModel responseData = GenericResponseModel.fromJson(json);
+        return responseData;
+      },
+      url,
+      postParams,
+    );
   }
 
   //Mark Fake Location
@@ -145,10 +272,14 @@ class DashboardApiClient {
       "EmployeeID": AppState().memberInformationList!.eMPLOYEENUMBER,
     };
     postParams.addAll(AppState().postParamsJson);
-    return await ApiClient().postJsonForObject((json) {
-      GenericResponseModel responseData = GenericResponseModel.fromJson(json);
-      return responseData;
-    }, url, postParams);
+    return await ApiClient().postJsonForObject(
+      (json) {
+        GenericResponseModel responseData = GenericResponseModel.fromJson(json);
+        return responseData;
+      },
+      url,
+      postParams,
+    );
   }
 
   //Check ITG Type
@@ -158,15 +289,19 @@ class DashboardApiClient {
     Map<String, dynamic> postParams = {
       "EmployeeNumber": AppState().getUserName,
       "ItgEnableAt": "After Service Submission", //Mobile Id
-      "ItgServiceName": "Login"
+      "ItgServiceName": "Login",
     };
     postParams.addAll(AppState().postParamsJson);
-    return await ApiClient().postJsonForObject((json) {
-      GenericResponseModel responseData = GenericResponseModel.fromJson(json);
-      MohemmItgResponseItem res = MohemmItgResponseItem.fromJson(jsonDecode(responseData.mohemmITGResponseItem ?? ""));
-      // var jsonDecodedData = jsonDecode(jsonDecode(responseData.mohemmITGResponseItem!)['result']['data']);
-      return res;
-    }, url, postParams);
+    return await ApiClient().postJsonForObject(
+      (json) {
+        GenericResponseModel responseData = GenericResponseModel.fromJson(json);
+        MohemmItgResponseItem res = MohemmItgResponseItem.fromJson(jsonDecode(responseData.mohemmITGResponseItem ?? ""));
+        // var jsonDecodedData = jsonDecode(jsonDecode(responseData.mohemmITGResponseItem!)['result']['data']);
+        return res;
+      },
+      url,
+      postParams,
+    );
   }
 
   //Submit ITG
@@ -178,13 +313,17 @@ class DashboardApiClient {
       "ItgComments": comment,
       "ItgNotificationMasterId": masterId,
       "ItgQuestionResponses": itgList,
-      "ItgSurveyId": serviceId
+      "ItgSurveyId": serviceId,
     };
     postParams.addAll(AppState().postParamsJson);
-    return await ApiClient().postJsonForObject((json) {
-      ItgMainRes responseData = ItgMainRes.fromJson(json);
-      return responseData;
-    }, url, postParams);
+    return await ApiClient().postJsonForObject(
+      (json) {
+        ItgMainRes responseData = ItgMainRes.fromJson(json);
+        return responseData;
+      },
+      url,
+      postParams,
+    );
   }
 
   Future<ItgMainRes?> getAdvertisementDetail(String masterID) async {
@@ -195,24 +334,48 @@ class DashboardApiClient {
       "ItgNotificationMasterId": masterID, //Mobile Id
     };
     postParams.addAll(AppState().postParamsJson);
-    return await ApiClient().postJsonForObject((json) {
-      ItgMainRes responseData = ItgMainRes.fromJson(json);
-      return responseData;
-    }, url, postParams);
+    return await ApiClient().postJsonForObject(
+      (json) {
+        ItgMainRes responseData = ItgMainRes.fromJson(json);
+        return responseData;
+      },
+      url,
+      postParams,
+    );
   }
 
-  Future setAdvertisementViewed(String masterID, int advertisementId) async {
+  Future setAdvertisementViewed(String masterID, int advertisementId, String? ackValue) async {
     String url = "${ApiConsts.cocRest}Mohemm_ITG_UpdateAdvertisementAsViewed";
 
     Map<String, dynamic> postParams = {
       "ItgNotificationMasterId": masterID,
       "EmployeeNumber": AppState().memberInformationList!.eMPLOYEENUMBER.toString(),
-      "ItgAdvertisement": {"advertisementId": advertisementId, "acknowledgment": true} //Mobile Id
+      "ItgAdvertisementId": advertisementId,
+      "ItgAcknowledgment": ackValue,
+      // "ItgAdvertisement": {"ItgAdvertisementId": advertisementId, "ItgAcknowledgment": ackValue} //Mobile Id
     };
     postParams.addAll(AppState().postParamsJson);
-    return await ApiClient().postJsonForObject((json) {
-      // ItgMainRes responseData = ItgMainRes.fromJson(json);
-      return json;
-    }, url, postParams);
+    return await ApiClient().postJsonForObject(
+      (json) {
+        // ItgMainRes responseData = ItgMainRes.fromJson(json);
+        return json;
+      },
+      url,
+      postParams,
+    );
   }
+
+  // Future<dynamic?> getItgTimeCardDetails() async {
+  //   String url = "${ApiConsts.cocRest}ITG_TimeCard_Get";
+  //   Map<String, dynamic> postParams = {};
+  //   postParams.addAll(AppState().postParamsJson);
+  //   return await ApiClient().postJsonForObject(
+  //     (json) {
+  //       ItgTimeCardModel responseData = ItgTimeCardModel.fromJson(json);
+  //       return responseData;
+  //     },
+  //     url,
+  //     postParams,
+  //   );
+  // }
 }

lib/api/marathon/marathon_api_client.dart

@@ -11,6 +11,7 @@ import 'package:mohem_flutter_app/config/routes.dart';
 import 'package:mohem_flutter_app/models/marathon/marathon_generic_model.dart';
 import 'package:mohem_flutter_app/models/marathon/marathon_model.dart';
 import 'package:mohem_flutter_app/models/marathon/question_model.dart';
+import 'package:mohem_flutter_app/models/marathon/tutorial_notification_model.dart';
 import 'package:mohem_flutter_app/models/marathon/winner_model.dart';
 import 'package:mohem_flutter_app/ui/marathon/marathon_provider.dart';
 import 'package:provider/provider.dart';
@@ -62,7 +63,6 @@ class MarathonApiClient {
 
   Future<MarathonDetailModel> getMarathonDetails() async {
     String payrollString = AppState().postParamsObject?.payrollCodeStr.toString() ?? "CS";
-
     Response response = await ApiClient().getJsonForResponse(
       ApiConsts.marathonUpcomingUrl + payrollString,
       token: AppState().getMarathonToken == null || AppState().getMarathonToken == "" ? await getMarathonToken() : AppState().getMarathonToken,
@@ -84,7 +84,7 @@ class MarathonApiClient {
     return marathonDetailModel;
   }
 
-  Future<int?> joinMarathonAsParticipant() async {
+  Future<MarathonGenericModel> joinMarathonAsParticipant() async {
     Map<String, String> jsonObject = <String, String>{
       "employeeNumber": AppState().memberInformationList!.eMPLOYEENUMBER ?? "",
       "employeeNameAr": AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEAr ?? AppState().memberInformationList!.eMPLOYEEDISPLAYNAMEEn ?? "",
@@ -95,7 +95,7 @@ class MarathonApiClient {
     return await ApiClient().postJsonForObject(
       (json) {
         MarathonGenericModel marathonModel = MarathonGenericModel.fromJson(json);
-        return marathonModel.data["remainingTime"];
+        return marathonModel;
       },
       ApiConsts.marathonJoinParticipantUrl,
       jsonObject,
@@ -196,6 +196,24 @@ class MarathonApiClient {
     return null;
   }
 
+  Future<TutorialNotificationModel?> getMarathonTutorial() async {
+    Response response = await ApiClient().getJsonForResponse(
+      //  ApiConsts.marathonGetTutorial,
+      "https://marathoon.com/uatservice/api/tutorial/GetTutorialNotification",
+      token: AppState().getMarathonToken == null || AppState().getMarathonToken == "" ? await getMarathonToken() : AppState().getMarathonToken,
+    );
+    try {
+      MarathonGenericModel marathonModel = MarathonGenericModel.fromJson(jsonDecode(response.body));
+      if (marathonModel.data is List) {
+        return TutorialNotificationModel.fromJson(marathonModel.data[0]);
+      }
+    } catch (ex) {
+      print(ex);
+    }
+
+    return null;
+  }
+
 //  late HubConnection hubConnection;
 // Future<void> buildHubConnection(BuildContext context, String prizeId) async {
 //   HttpConnectionOptions httpOptions = HttpConnectionOptions(skipNegotiation: false, logMessageContent: true);

lib/api/mowadhafhi/mowadhafhi_api_client.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:mohem_flutter_app/api/api_client.dart';
 import 'package:mohem_flutter_app/app_state/app_state.dart';
 import 'package:mohem_flutter_app/classes/consts.dart';
@@ -10,6 +12,7 @@ import 'package:mohem_flutter_app/models/mowadhafhi/get_ticket_details.dart';
 import 'package:mohem_flutter_app/models/mowadhafhi/get_ticket_transactions.dart';
 import 'package:mohem_flutter_app/models/mowadhafhi/get_ticket_types.dart';
 import 'package:mohem_flutter_app/models/mowadhafhi/get_tickets_list.dart';
+import 'package:mohem_flutter_app/models/mowadhafhi/get_transaction_attachment_model.dart';
 
 class MowadhafhiApiClient {
   static final MowadhafhiApiClient _instance = MowadhafhiApiClient._internal();
@@ -51,6 +54,18 @@ class MowadhafhiApiClient {
     }, url, postParams);
   }
 
+  Future<GetTransactionAttachmentModel> getTransactionAttachments(int? attachmentID) async {
+    String url = "${ApiConsts.cocRest}Mohemm_ITG_GetTicketAttachment";
+    Map<String, dynamic> postParams = {"EmployeeNumber": AppState().memberInformationList?.eMPLOYEENUMBER, "ItgAttachmentId": attachmentID};
+
+    postParams.addAll(AppState().postParamsJson);
+    return await ApiClient().postJsonForObject((json) {
+      GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
+      var jsonDecodedData = jsonDecode(responseData.mohemmITGResponseItem!);
+      return GetTransactionAttachmentModel.fromJson(jsonDecodedData);
+    }, url, postParams);
+  }
+
   Future<List<GetTicketTypes>> getTicketTypes() async {
     String url = "${ApiConsts.cocRest}Mohemm_ITG_GetTicketTypes";
     Map<String, dynamic> postParams = {"EmployeeNumber": AppState().memberInformationList?.eMPLOYEENUMBER};

lib/api/my_attendance_api_client.dart

@@ -29,6 +29,21 @@ class MyAttendanceApiClient {
     }, url, postParams);
   }
 
+  Future<List<GetEITTransactionList>?> getCeiTransaction(String pFunctionName, int? relationID) async {
+    String url = "${ApiConsts.erpRest}GET_CEI_TRANSACTIONS";
+    Map<String, dynamic> postParams = {"P_PAGE_LIMIT": 50, "P_PAGE_NUM": 1, "P_FUNCTION_NAME": pFunctionName};
+    postParams.addAll(AppState().postParamsJson);
+    if (relationID != null) postParams["P_CONTACT_RELATIONSHIP_ID"] = relationID;
+    return await ApiClient().postJsonForObject((json) {
+      GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
+      if (responseData.getCEITransactionList?.isNotEmpty ?? false) {
+        return responseData.getCEITransactionList!.map((e) => GetEITTransactionList(collectionTransaction: e.collectionTransaction)).toList();
+      } else {
+        return [];
+      }
+    }, url, postParams);
+  }
+
   Future<GenericResponseModel> getEitDffStructure(String pFunctionName, String? empID) async {
     String url = "${ApiConsts.erpRest}GET_EIT_DFF_STRUCTURE";
     Map<String, dynamic> postParams = {"P_SELECTED_RESP_ID": -999, "P_MENU_TYPE": "E", "P_FUNCTION_NAME": pFunctionName};
@@ -40,14 +55,55 @@ class MyAttendanceApiClient {
     }, url, postParams);
   }
 
-  Future<List<ESERVICESVS>> getValueSetValues(String pSegmentName, String pDescFlexContextCode, String pDescFlexName, List<Map<String, dynamic>> list, {String? empID, String? parentValue}) async {
+  Future<GenericResponseModel> getCEIDffStructure(String pFunctionName, String? empID) async {
+    String url = "${ApiConsts.erpRest}GET_CEI_DFF_STRUCTURE";
+    Map<String, dynamic> postParams = {"P_FUNCTION_NAME": pFunctionName};
+    postParams.addAll(AppState().postParamsJson);
+    if (empID != null) postParams["P_SELECTED_EMPLOYEE_NUMBER"] = empID;
+    return await ApiClient().postJsonForObject((json) {
+      GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
+      return responseData;
+    }, url, postParams);
+  }
+
+  Future<List<ESERVICESVS>> getValueSetValues(String pSegmentName, String pDescFlexContextCode, String pDescFlexName, List<Map<String, dynamic>> list,
+      {String? empID, String? parentValue, bool hasParent = false}) async {
     String url = "${ApiConsts.erpRest}GET_VALUE_SET_VALUES";
     Map<String, dynamic> postParams = {
       "P_SELECTED_RESP_ID": -999,
       "P_MENU_TYPE": "E",
       "P_PAGE_LIMIT": 1000,
       "P_PAGE_NUM": 1,
-      "P_PARENT_VALUE": empID != null ? parentValue : null,
+      "P_PARENT_VALUE": hasParent
+          ? parentValue
+          : empID != null
+              ? parentValue
+              : null,
+      "P_SEGMENT_NAME": pSegmentName,
+      "P_DESC_FLEX_CONTEXT_CODE": pDescFlexContextCode,
+      "P_DESC_FLEX_NAME": pDescFlexName,
+      "GetValueSetValuesTBL": list,
+    };
+    postParams.addAll(AppState().postParamsJson);
+    if (empID != null) postParams["P_SELECTED_EMPLOYEE_NUMBER"] = empID;
+    return await ApiClient().postJsonForObject((json) {
+      GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
+      return responseData.getValueSetValuesList ?? [];
+    }, url, postParams);
+  }
+  Future<List<ESERVICESVS>> getValueSetValuesSearch(String pSegmentName, String pDescFlexContextCode, String pDescFlexName, List<Map<String, dynamic>> list,
+      {String? empID, String? parentValue, bool hasParent = false}) async {
+    String url = "${ApiConsts.erpRest}GET_VALUE_SET_VALUES_SRCH";
+    Map<String, dynamic> postParams = {
+      "P_SELECTED_RESP_ID": -999,
+      "P_MENU_TYPE": "E",
+      "P_PAGE_LIMIT": 1000,
+      "P_PAGE_NUM": 1,
+      "P_PARENT_VALUE": hasParent
+          ? parentValue
+          : empID != null
+          ? parentValue
+          : null,
       "P_SEGMENT_NAME": pSegmentName,
       "P_DESC_FLEX_CONTEXT_CODE": pDescFlexContextCode,
       "P_DESC_FLEX_NAME": pDescFlexName,
@@ -60,7 +116,6 @@ class MyAttendanceApiClient {
       return responseData.getValueSetValuesList ?? [];
     }, url, postParams);
   }
-
   Future<ESERVICESDV> getDefaultValue(String pSegmentName, String pDescFlexContextCode, String pDescFlexName, List<Map<String, dynamic>> list, {String? empID}) async {
     String url = "${ApiConsts.erpRest}GET_DEFAULT_VALUE";
     Map<String, dynamic> postParams = {
@@ -97,6 +152,25 @@ class MyAttendanceApiClient {
     }, url, postParams);
   }
 
+  Future<SubmitEITTransactionList> submitCEITransaction(String pDescFlexContextCode, String pFunctionName, List<Map<String, dynamic>> list, {String? empID, int? pContactRelationID}) async {
+    String url = "${ApiConsts.erpRest}SUBMIT_CEI_TRANSACTION";
+    Map<String, dynamic> postParams = {
+      "P_SELECTED_RESP_ID": -999,
+      "P_MENU_TYPE": "E",
+      "P_DESC_FLEX_CONTEXT_CODE": pDescFlexContextCode,
+      "P_CONTACT_RELATIONSHIP_ID": pContactRelationID,
+      "P_FUNCTION_NAME": pFunctionName,
+      "EITTransactionTBL": list,
+      "EITTransactionTBLModel": list,
+    };
+    postParams.addAll(AppState().postParamsJson);
+    if (empID != null) postParams["P_SELECTED_EMPLOYEE_NUMBER"] = empID;
+    return await ApiClient().postJsonForObject((json) {
+      GenericResponseModel responseData = GenericResponseModel.fromJson(json);
+      return responseData.submitCEITransactionList!; //ESERVICESDV.fromJson(responseData.getDefaultValueList!.toJson());
+    }, url, postParams);
+  }
+
   Future<SubmitEITTransactionList> submitEitTransaction(String pDescFlexContextCode, String pFunctionName, List<Map<String, dynamic>> list, {String? empID}) async {
     String url = "${ApiConsts.erpRest}SUBMIT_EIT_TRANSACTION";
     Map<String, dynamic> postParams = {

lib/api/my_requests_api_client.dart

@@ -60,7 +60,7 @@ class MyRequestsApiClient {
     }, url, postParams);
   }
 
-  Future<SubmitCcpTransactionList?> getSubmitNewRequest(List<Map<String, dynamic>> list) async
+  Future<GenericResponseModel> getSubmitNewRequest(List<Map<String, dynamic>> list) async
   {
     String url = "${ApiConsts.erpRest}SUBMIT_CCP_TRANSACTION";
     Map<String, dynamic> postParams = {
@@ -73,7 +73,7 @@ class MyRequestsApiClient {
     postParams["EITTransactionTBL"] = list;
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
-      return responseData.submitCcpTransactionList;
+      return responseData;
     }, url, postParams);
   }
 

lib/api/profile_api_client.dart

@@ -12,6 +12,7 @@ import 'package:mohem_flutter_app/models/get_employee_address_model.dart';
 import 'package:mohem_flutter_app/models/get_employee_basic_details.model.dart';
 import 'package:mohem_flutter_app/models/get_employee_contacts.model.dart';
 import 'package:mohem_flutter_app/models/get_employee_phones_model.dart';
+import 'package:mohem_flutter_app/models/my_documents/employee_documents_list_model.dart';
 import 'package:mohem_flutter_app/models/performance.dart';
 import 'package:mohem_flutter_app/models/profile/basic_details_dff_structure.dart';
 import 'package:mohem_flutter_app/models/profile/get_contact_clos_structure_list.dart';
@@ -84,6 +85,19 @@ class ProfileApiClient {
     }, url, postParams);
   }
 
+  Future<List<EmployeeDocumentsList>> getEmployeeDocuments() async {
+    String url = "${ApiConsts.erpRest}GET_EMPLOYEE_DOCUMENTS";
+    Map<String, dynamic> postParams = {
+      "P_MENU_TYPE": "E",
+      "P_SELECTED_RESP_ID": -999,
+    };
+    postParams.addAll(AppState().postParamsJson);
+    return await ApiClient().postJsonForObject((json) {
+      GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
+      return responseData.employeeDocumentsList ?? [];
+    }, url, postParams);
+  }
+
   Future updateEmpImage(img) async {
     String url = "${ApiConsts.erpRest}UPDATE_EMPLOYEE_IMAGE";
     Map<String, dynamic> postParams = {"P_MENU_TYPE": "E", "P_SELECTED_RESP_ID": -999, "P_IMAGE": img};
@@ -166,7 +180,7 @@ class ProfileApiClient {
       ],
       "P_CONTACT_RELATIONSHIP_ID": contactRelationId,
       "P_ACTION": actionType,
-      "PayrollCodeStr": "CS",
+      "PayrollCodeStr": "HMG",
       "LegislationCodeStr": "SA",
     };
     postParams.addAll(AppState().postParamsJson);

lib/app_state/app_state.dart

@@ -90,7 +90,7 @@ class AppState {
 
   String get getHuaweiPushToken => _huaweiPushToken;
 
-  final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 4.8, mobileType: Platform.isAndroid ? "android" : "ios");
+  final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 9.3, mobileType: Platform.isAndroid ? "android" : "ios");
 
   void setPostParamsInitConfig() {
     isAuthenticated = false;

lib/classes/colors.dart

@@ -35,6 +35,7 @@ class MyColors {
   static const Color orange = Color(0xFFCC9B14);
   static const Color yellowFavColor = Color(0xffEAC321);
   static const Color yellowColorII = Color(0xffEAA118);
+  static const Color yellowColor00 = Color(0xffE6AA00);
   static const Color backgroundBlackColor = Color(0xff202529);
   static const Color black = Color(0xff000000);
   static const Color white = Color(0xffffffff);
@@ -64,4 +65,6 @@ class MyColors {
   static const Color grey71Color = Color(0xff717171);
   static const Color darkGrey3BColor = Color(0xff3B3B3B);
   static const Color lightGreyIconColor = Color(0xff919191);
+  static const Color selectedBorderColor = Color(0xff37A4BE);
+  static const Color mazayaRedColor = Color(0xffED1C2B);
 }

lib/classes/consts.dart

@@ -1,10 +1,23 @@
 import 'package:mohem_flutter_app/ui/marathon/widgets/question_card.dart';
 
 class ApiConsts {
-  //static String baseUrl = "http://10.200.204.20:2801/"; // Local server
+  // static String baseUrl = "http://10.200.204.11"; // Local server
   // static String baseUrl = "https://erptstapp.srca.org.sa"; // SRCA server
-  static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
+
+  // static String baseUrl = "https://uat.hmgwebservices.com"; // UAT ser343622ver
+ // static String baseUrl = "http://10.201.204.101:2024";
+ //  static String baseUrl = "https://webservices.hmg.com"; // PreProd
+ //  static String baseUrl = "https://hmgwebservices.com"; // Live server
+
+  // static String baseUrl = "https://mohemm.hmg.com"; // New Live server
+  //
+   static String baseUrl = "https://uat.hmgwebservices.com"; // UAT ser343622ver
+ // static String baseUrl = "http://10.20.200.111:1010/";
+
+ // static String baseUrl = "https://webservices.hmg.com"; // PreProd
+ //  static String baseUrl = "https://mohemm.hmg.com";
   // static String baseUrl = "https://hmgwebservices.com"; // Live server
+
   static String baseUrlServices = baseUrl + "/Services/"; // server
   // static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server
   static String utilitiesRest = baseUrlServices + "Utilities.svc/REST/";
@@ -14,12 +27,22 @@ class ApiConsts {
   static String user = baseUrlServices + "api/User/";
   static String cocRest = baseUrlServices + "COCWS.svc/REST/";
 
+  static String ssoAuthRedirection = "https://sso-uat.hmg.com/api/auth/connect";
+
   //Chat
   static String chatServerBaseUrl = "https://apiderichat.hmg.com/";
   static String chatServerBaseApiUrl = chatServerBaseUrl + "api/";
   static String chatLoginTokenUrl = chatServerBaseApiUrl + "user/";
   static String chatHubConnectionUrl = chatServerBaseUrl + "ConnectionChatHub";
 
+  //Groups
+  static String getGroupByUserId = chatServerBaseApiUrl + "group/getgroupsbyuserid/";
+  static String deleteGroup = chatServerBaseApiUrl + "group/updateGroupIsDeleted/";
+  static String updateGroupAdmin = chatServerBaseApiUrl + "group/updateGroupAdmin/";
+  static String getGroupChatHistoryAsync = chatServerBaseApiUrl + "GroupChat/GetGroupChatHistoryAsync/";
+  static String addGroupsAndUsers = chatServerBaseApiUrl + "group/addgroupandusers/";
+  static String updateGroupsAndUsers = chatServerBaseApiUrl + "group/updategroupandusers/";
+
   // static String chatSearchMember = chatLoginTokenUrl + "user/";
   static String chatRecentUrl = chatServerBaseApiUrl + "UserChatHistory/"; //For a Mem
   static String chatSingleUserHistoryUrl = chatServerBaseApiUrl + "UserChatHistory/";
@@ -28,7 +51,11 @@ class ApiConsts {
   static String chatUserImages = chatServerBaseUrl + "empservice/api/employee/";
 
   //Brain Marathon Constants
-  static String marathonBaseUrl = "https://marathoon.com/service/api/";
+  static String marathonBaseUrlLive = "https://marathoon.com/service/api/";
+  static String marathonBaseUrlUAT = "https://marathoon.com/uatservice/api/";
+
+  static String marathonBaseUrl = marathonBaseUrlLive;
+  // static String marathonBaseUrl = marathonBaseUrlUAT;
   static String marathonBaseUrlServices = "https://marathoon.com/service/";
   static String marathonParticipantLoginUrl = marathonBaseUrl + "auth/participantlogin";
   static String marathonProjectGetUrl = marathonBaseUrl + "Project/Project_Get";
@@ -39,9 +66,9 @@ class ApiConsts {
   static String marathonQualifiersUrl = marathonBaseUrl + "winner/getWinner/";
   static String marathonSelectedWinner = marathonBaseUrl + "winner/getSelectedWinner/";
   static String marathonGetMarathonersCount = marathonBaseUrl + "Participant/GetRemainingParticipants";
+  static String marathonGetTutorial = marathonBaseUrl + "tutorial/GetTutorialNotification";
 
   //DummyCards for the UI
-  static CardContent dummyQuestion = const CardContent();
 
   static int tabletMinLength = 500;
 }
@@ -59,3 +86,5 @@ class SharedPrefsConsts {
   static String mohemmWifiPassword = "mohemmWifiPassword";
   static String editItemForSale = "editItemForSale";
 }
+
+

lib/classes/date_uitl.dart

@@ -7,7 +7,7 @@ class DateUtil {
   ///
 
   static DateTime convertStringToDateMarathon(String date) {
-    // /Date(1585774800000+0300)/
+    // return DateTime(2025, 2, 5);
     if (date != null) {
       const start = "/Date(";
       const end = "+0300)";
@@ -38,12 +38,12 @@ class DateUtil {
       return DateTime.now();
   }
 
-  static DateTime convertSimpleStringDateToDate(String date) {
+  static DateTime convertSimpleStringDateToDate(String date, {bool isITG = false}) {
     // print(date.toUpperCase());
-    return getDateTimeFromString(date.split(" ")[0], date.toUpperCase().split(" ")[1] + " " + date.toUpperCase().split(" ")[2]);
+    return getDateTimeFromString(date.split(" ")[0], date.toUpperCase().split(" ")[1] + " " + date.toUpperCase().split(" ")[2], isITG: isITG);
   }
 
-  static DateTime getDateTimeFromString(String date, String time) {
+  static DateTime getDateTimeFromString(String date, String time, {bool isITG = false}) {
     var hours = num.parse(time.split(":")[0]);
     var mins = time.split(":")[1];
     var secs = time.split(":")[2].split(" ")[0];
@@ -60,7 +60,7 @@ class DateUtil {
       }
     }
     date = date + " $hours:$mins:$secs";
-    DateTime returnDate = DateFormat("MM/dd/yyyy HH:mm:ss", "en_US").parse(date);
+    DateTime returnDate = isITG ? DateFormat("dd/MM/yyyy HH:mm:ss", "en_US").parse(date) : DateFormat("MM/dd/yyyy HH:mm:ss", "en_US").parse(date);
 
     return returnDate;
   }
@@ -524,4 +524,14 @@ class DateUtil {
 //   }
 //   return "";
 // }
+  static String replaceArabicNumber(String input) {
+    const english = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
+    const arabic = ['٠', '١', '٢', '٣', '٤', '٥', '٦', '٧', '٨', '٩'];
+
+    for (int i = 0; i < english.length; i++) {
+      input = input.replaceAll(arabic[i], english[i]);
+    }
+
+    return input;
+  }
 }

lib/classes/decorations_helper.dart

@@ -30,7 +30,6 @@ class MyDecorations {
         return getContainersDecoration(MyColors.greenColor);
       case QuestionsOptionStatus.wrong:
         return getContainersDecoration(MyColors.redColor);
-
       case QuestionsOptionStatus.selected:
         return getContainersDecoration(MyColors.yellowColorII);
       case QuestionsOptionStatus.unSelected:

lib/classes/file_process.dart

@@ -2,8 +2,9 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:open_file/open_file.dart';
+import 'package:open_filex/open_filex.dart';
 import 'package:path_provider/path_provider.dart';
+import 'package:http/http.dart' as http;
 
 class FileProcess {
   static bool isFolderCreated = false;
@@ -23,9 +24,9 @@ class FileProcess {
     }
   }
 
-  static void openFile(String fileName) {
+  static void openFile(String fileName, {bool isFullPath = false}) {
     String dir = directory!.path + "/$fileName.pdf";
-    OpenFile.open(dir);
+    OpenFilex.open(isFullPath ? fileName : dir);
   }
 
   static Future<File> downloadFile(String base64Content, String fileName) async {
@@ -37,4 +38,24 @@ class FileProcess {
     await file.writeAsBytes(bytes);
     return file;
   }
+
+  static Future<String> downloadFileFromUrl(String url,String fileName) async {
+    await checkDocumentFolder();
+    String filePath = '${directory!.path}/$fileName';
+
+    if (await File(filePath).exists()) {
+      await Future.delayed(const Duration(seconds: 1));
+      return filePath;
+    } else {
+      var response = await http.get(Uri.parse(url));
+      if (response.statusCode == 200) {
+        var bytes = response.bodyBytes;
+        File file = File(filePath);
+        await file.writeAsBytes(bytes);
+        return filePath;
+      } else {
+        throw Exception('Failed to download file');
+      }
+    }
+  }
 }

lib/classes/inAppWebView.dart

@@ -0,0 +1,33 @@
+import 'dart:developer';
+
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
+
+class MyInAppBrowser extends InAppBrowser {
+  final Function onExitCallback;
+  final Function(String) onLoadStartCallback;
+
+  MyInAppBrowser({
+    required this.onExitCallback,
+    required this.onLoadStartCallback,
+  });
+
+  @override
+  Future onBrowserCreated() async {
+    log("\n\nBrowser Created!\n\n");
+  }
+
+  @override
+  Future onLoadStart(Uri? url) async {
+    onLoadStartCallback(url.toString());
+  }
+
+  @override
+  Future onLoadStop(Uri? url) async {
+    log("\n\nStopped $url\n\n");
+  }
+
+  @override
+  void onLoadError(Uri? url, int code, String message) {
+    log("Can't load $url.. Error: $message");
+  }
+}

lib/classes/notifications.dart

@@ -3,12 +3,16 @@ import 'dart:io';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 
 // import 'package:huawei_hmsavailability/huawei_hmsavailability.dart';
 import 'package:huawei_push/huawei_push.dart' as huawei_push;
 import 'package:mohem_flutter_app/app_state/app_state.dart';
+import 'package:mohem_flutter_app/classes/date_uitl.dart';
 import 'package:mohem_flutter_app/classes/utils.dart';
+import 'package:mohem_flutter_app/models/get_notifications_response_model.dart';
+import 'package:mohem_flutter_app/ui/notifications/notification_details_page.dart';
 import 'package:permission_handler/permission_handler.dart';
 
 final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
@@ -24,12 +28,14 @@ class AppNotifications {
 
   String _huaweiToken = '';
 
+  late BuildContext context;
+
   Future<void> requestPermissions() async {
     if (Platform.isIOS) {
       await flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation<IOSFlutterLocalNotificationsPlugin>()?.requestPermissions(alert: true, badge: true, sound: true);
     } else if (Platform.isAndroid) {
-      AndroidFlutterLocalNotificationsPlugin? androidImplementation = flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation<AndroidFlutterLocalNotificationsPlugin>();
-      bool? granted = await androidImplementation?.requestPermission();
+        AndroidFlutterLocalNotificationsPlugin? androidImplementation = flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation<AndroidFlutterLocalNotificationsPlugin>();
+      bool? granted = await androidImplementation?.requestNotificationsPermission();
       if (granted == false) {
         if (kDebugMode) {
           print("-------------------- Permission Granted ------------------------");
@@ -40,11 +46,13 @@ class AppNotifications {
     }
   }
 
-  void init(String? firebaseToken) async {
+  void init(String? firebaseToken, BuildContext context) async {
     // if (Platform.isAndroid) {
     //   hmsApiAvailability = HmsApiAvailability();
     // }
 
+    this.context = context;
+
     await requestPermissions();
     AppState().setDeviceToken = firebaseToken;
     await Permission.notification.isDenied.then((bool value) {
@@ -101,7 +109,10 @@ class AppNotifications {
     debugPrint("HUAWEI PUSH TOKEN: $_huaweiToken");
   }
 
-  void _onTokenError(Object error) {}
+  void _onTokenError(Object error) {
+    debugPrint("HUAWEI PUSH TOKEN ERROR: $error");
+    Utils.hideLoading(context);
+  }
 
   Future<void> initTokenStream(Function loginCallback) async {
     huawei_push.Push.getTokenStream.listen(_onTokenEvent, onError: _onTokenError).onData((data) {
@@ -113,12 +124,51 @@ class AppNotifications {
 
   void _handleMessage(RemoteMessage message) {
     Utils.saveStringFromPrefs("isAppOpendByChat", "false");
+    GetNotificationsResponseModel notification = GetNotificationsResponseModel();
+
+    notification.createdOn = DateUtil.getMonthDayYearDateFormatted(DateTime.now());
+    notification.messageTypeData = message.data['picture'];
+    notification.message = message.data['message'];
+    notification.notificationType = message.data["NotificationType"].toString();
+    if (message.data["NotificationType"] == "2") {
+      notification.videoURL = message.data["VideoUrl"];
+    }
+
+    Future.delayed(Duration(seconds: 5), () {
+      Navigator.of(context).push(
+        MaterialPageRoute(
+          builder: (BuildContext context) => NotificationsDetailsPage(
+            notification: notification,
+          ),
+        ),
+      );
+    });
   }
 
   void _handleOpenApp(RemoteMessage message) {
     if (message.data.isNotEmpty && message.data["type"] == 'chat') {
       Utils.saveStringFromPrefs("isAppOpendByChat", "true");
       Utils.saveStringFromPrefs("notificationData", message.data["user_chat_history_response"].toString());
+    } else {
+      GetNotificationsResponseModel notification = GetNotificationsResponseModel();
+
+      notification.createdOn = DateUtil.getMonthDayYearDateFormatted(DateTime.now());
+      notification.messageTypeData = message.data['picture'];
+      notification.message = message.data['message'];
+      notification.notificationType = message.data["NotificationType"].toString();
+      if (message.data["NotificationType"] == "2") {
+        notification.videoURL = message.data["VideoUrl"];
+      }
+
+      Future.delayed(Duration(seconds: 5), () {
+        Navigator.of(context).push(
+          MaterialPageRoute(
+            builder: (BuildContext context) => NotificationsDetailsPage(
+              notification: notification,
+            ),
+          ),
+        );
+      });
     }
   }
 }

lib/classes/utils.dart

@@ -16,6 +16,7 @@ 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/provider/chat_provider_model.dart';
 import 'package:mohem_flutter_app/widgets/dialogs/confirm_dialog.dart';
 import 'package:mohem_flutter_app/widgets/loading_dialog.dart';
 import 'package:nfc_manager/nfc_manager.dart';
@@ -31,13 +32,14 @@ class Utils {
 
   static void showToast(String message, {bool longDuration = true}) {
     Fluttertoast.showToast(
-        msg: message,
-        toastLength: longDuration ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT,
-        gravity: ToastGravity.BOTTOM,
-        timeInSecForIosWeb: 1,
-        backgroundColor: Colors.black54,
-        textColor: Colors.white,
-        fontSize: 13.0);
+      msg: message,
+      toastLength: longDuration ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT,
+      gravity: ToastGravity.BOTTOM,
+      timeInSecForIosWeb: 1,
+      backgroundColor: Colors.black54,
+      textColor: Colors.white,
+      fontSize: 13.0,
+    );
   }
 
   static dynamic getNotNullValue(List<dynamic> list, int index) {
@@ -63,12 +65,7 @@ class Utils {
   static void showLoading(BuildContext context) {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       _isLoadingVisible = true;
-      showDialog(
-        context: context,
-        barrierColor: Colors.black.withOpacity(0.5),
-        useRootNavigator: false,
-        builder: (BuildContext context) => LoadingDialog(),
-      ).then((value) {
+      showDialog(context: context, barrierColor: Colors.black.withOpacity(0.5), useRootNavigator: false, builder: (BuildContext context) => LoadingDialog()).then((value) {
         _isLoadingVisible = false;
       });
     });
@@ -118,13 +115,14 @@ class Utils {
           showDialog(
             barrierDismissible: false,
             context: cxt,
-            builder: (cxt) => ConfirmDialog(
-              message: errorMessage,
-              onTap: () {
-                Navigator.pushNamedAndRemoveUntil(cxt, AppRoutes.login, (Route<dynamic> route) => false);
-              },
-              onCloseTap: () {},
-            ),
+            builder:
+                (cxt) => ConfirmDialog(
+                  message: errorMessage,
+                  onTap: () {
+                    Navigator.pushNamedAndRemoveUntil(cxt, AppRoutes.login, (Route<dynamic> route) => false);
+                  },
+                  onCloseTap: () {},
+                ),
           );
         } else {
           if (cxt != null) {
@@ -138,33 +136,18 @@ class Utils {
   }
 
   static Future showErrorDialog({required BuildContext context, required VoidCallback onOkTapped, required String message}) async {
-    return showDialog(
-      context: context,
-      builder: (BuildContext context) => ConfirmDialog(
-        message: message,
-        onTap: onOkTapped,
-      ),
-    );
+    return showDialog(context: context, builder: (BuildContext context) => ConfirmDialog(message: message, onTap: onOkTapped));
   }
 
   static void confirmDialog(cxt, String message, {VoidCallback? onTap}) {
-    showDialog(
-      context: cxt,
-      builder: (BuildContext cxt) => ConfirmDialog(
-        message: message,
-        onTap: onTap,
-      ),
-    );
+    showDialog(context: cxt, builder: (BuildContext cxt) => ConfirmDialog(message: message, onTap: onTap));
   }
 
   static Widget getNoDataWidget(BuildContext context) {
     return Column(
       mainAxisAlignment: MainAxisAlignment.center,
       crossAxisAlignment: CrossAxisAlignment.center,
-      children: [
-        SvgPicture.asset('assets/images/not_found.svg', width: 110.0, height: 110.0),
-        LocaleKeys.noDataAvailable.tr().toText16().paddingOnly(top: 15),
-      ],
+      children: [SvgPicture.asset('assets/images/not_found.svg', width: 110.0, height: 110.0), LocaleKeys.noDataAvailable.tr().toText16().paddingOnly(top: 15)],
     ).center;
   }
 
@@ -172,10 +155,7 @@ class Utils {
     return Column(
       mainAxisAlignment: MainAxisAlignment.center,
       crossAxisAlignment: CrossAxisAlignment.center,
-      children: [
-        SvgPicture.asset('assets/images/not_found.svg', width: 110.0, height: 110.0),
-        LocaleKeys.noDataAvailable.tr().toText16().paddingOnly(top: 15),
-      ],
+      children: [SvgPicture.asset('assets/images/not_found.svg', width: 110.0, height: 110.0), LocaleKeys.noDataAvailable.tr().toText16().paddingOnly(top: 15)],
     ).center;
   }
 
@@ -209,17 +189,7 @@ class Utils {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       mainAxisSize: MainAxisSize.min,
-      children: [
-        6.height,
-        alignCenter ? text.toText12().center : text.toText12(),
-        5.height,
-        if (showDivider)
-          const Divider(
-            height: 1,
-            color: Color(0xff2E303A),
-            thickness: 1,
-          )
-      ],
+      children: [6.height, alignCenter ? text.toText12().center : text.toText12(), 5.height, if (showDivider) const Divider(height: 1, color: Color(0xff2E303A), thickness: 1)],
     );
   }
 
@@ -227,17 +197,15 @@ class Utils {
     return BoxDecoration(
       color: background,
       border: Border.all(
-          width: 1, //
-          color: background //                  <--- border width here
-          ),
+        width: 1, //
+        color: background, //                  <--- border width here
+      ),
       borderRadius: BorderRadius.circular(radius),
     );
   }
 
   static Widget mHeight(double h) {
-    return Container(
-      height: h,
-    );
+    return Container(height: h);
   }
 
   static Widget mDivider(Color color) {
@@ -352,20 +320,21 @@ class Utils {
     if (!Platform.isIOS) {
       await showCupertinoModalPopup(
         context: context,
-        builder: (BuildContext cxt) => Container(
-          height: 250,
-          color: Colors.white,
-          child: CupertinoDatePicker(
-            backgroundColor: Colors.white,
-            mode: CupertinoDatePickerMode.date,
-            onDateTimeChanged: (DateTime value) {
-              if (value != null && value != selectedDate) {
-                selectedDate = value;
-              }
-            },
-            initialDateTime: selectedDate,
-          ),
-        ),
+        builder:
+            (BuildContext cxt) => Container(
+              height: 250,
+              color: Colors.white,
+              child: CupertinoDatePicker(
+                backgroundColor: Colors.white,
+                mode: CupertinoDatePickerMode.date,
+                onDateTimeChanged: (DateTime value) {
+                  if (value != null && value != selectedDate) {
+                    selectedDate = value;
+                  }
+                },
+                initialDateTime: selectedDate,
+              ),
+            ),
       );
     } else {
       DateTime? picked = await showDatePicker(context: context, initialDate: selectedDate, initialEntryMode: DatePickerEntryMode.calendarOnly, firstDate: DateTime(2015, 8), lastDate: DateTime(2101));
@@ -377,19 +346,25 @@ class Utils {
   }
 
   static void readNFc({required Function(String) onRead}) {
-    NfcManager.instance.startSession(onDiscovered: (NfcTag tag) async {
-      MifareUltralight f;
-      if (Platform.isAndroid) {
-        f = MifareUltralight(tag: tag, identifier: tag.data["nfca"]["identifier"], type: 2, maxTransceiveLength: 252, timeout: 22);
-      } else {
-        f = MifareUltralight(tag: tag, identifier: tag.data["mifare"]["identifier"], type: 2, maxTransceiveLength: 252, timeout: 22);
-      }
-      String identifier = f.identifier.map((e) => e.toRadixString(16).padLeft(2, '0')).join('');
-      NfcManager.instance.stopSession();
-      onRead(identifier);
-    }).catchError((err) {
-      print(err);
-    });
+    NfcManager.instance
+        .startSession(
+          onDiscovered: (NfcTag tag) async {
+            MifareUltralight f;
+            if (Platform.isAndroid) {
+              print(tag);
+              f = MifareUltralight(tag: tag, identifier: tag.data["nfca"]["identifier"], type: 2, maxTransceiveLength: 252, timeout: 22);
+            } else {
+              f = MifareUltralight(tag: tag, identifier: tag.data["mifare"]["identifier"], type: 2, maxTransceiveLength: 252, timeout: 22);
+            }
+            String identifier = f.identifier.map((e) => e.toRadixString(16).padLeft(2, '0')).join('');
+            NfcManager.instance.stopSession();
+            onRead(identifier);
+          },
+          pollingOptions: {NfcPollingOption.iso14443},
+        )
+        .catchError((err) {
+          print(err);
+        });
   }
 
   //HUAWEI DECISION MAKING
@@ -401,4 +376,27 @@ class Utils {
     }
     return false;
   }
+
+  static bool isDate(String input, String format) {
+    try {
+      DateTime d = DateFormat(format).parseStrict(input);
+      //print(d);
+      return true;
+    } catch (e) {
+      //print(e);
+      return false;
+    }
+  }
+
+  static Future<void> performLogout(BuildContext? context, ChatProviderModel? chatData) async {
+    AppState().isAuthenticated = false;
+    AppState().isLogged = false;
+    AppState().setPostParamsInitConfig();
+    if (chatData != null) {
+      chatData.disposeData();
+    }
+    // SharedPreferences prefs = await SharedPreferences.getInstance();
+    // await prefs.clear();
+    Navigator.pushNamedAndRemoveUntil(context!, AppRoutes.login, (Route<dynamic> route) => false, arguments: null);
+  }
 }