Merge branch 'master_mohemm_flutter' into mohemm_HMG_flutter_upgrade

# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/ui/landing/dashboard_screen.dart
#	pubspec.yaml

.vscode/settings.json

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

GoogleService-Info.plist

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CLIENT_ID</key>
+	<string>448880075189-tcgggmh2ua9tsmdr97c1ttcgrmf5kg5m.apps.googleusercontent.com</string>
+	<key>REVERSED_CLIENT_ID</key>
+	<string>com.googleusercontent.apps.448880075189-tcgggmh2ua9tsmdr97c1ttcgrmf5kg5m</string>
+	<key>API_KEY</key>
+	<string>AIzaSyB--KUTUYVpcdxpETCEsdhKs5cV3QawW7Q</string>
+	<key>GCM_SENDER_ID</key>
+	<string>448880075189</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>com.cloudsolutions.alhabibmohemm</string>
+	<key>PROJECT_ID</key>
+	<string>al-habib-mohemm</string>
+	<key>STORAGE_BUCKET</key>
+	<string>al-habib-mohemm.appspot.com</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:448880075189:ios:c6fd2b86fe7b388088b9fc</string>
+	<key>DATABASE_URL</key>
+	<string>https://al-habib-mohemm.firebaseio.com</string>
+</dict>
+</plist>

HMG FOLDER/resources/README.md

@@ -0,0 +1,8 @@
+These are Cordova resources. You can replace icon.png and splash.png and run
+`ionic cordova resources` to generate custom icons and splash screens for your
+app. See `ionic cordova resources --help` for details.
+
+Cordova reference documentation:
+
+- Icons: https://cordova.apache.org/docs/en/latest/config_ref/images.html
+- Splash Screens: https://cordova.apache.org/docs/en/latest/reference/cordova-plugin-splashscreen/

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":"737518067793556928",
+		"client_id":"715220003200189504",
+		"client_secret":"E856B50CB99E8ECCE8CEF05B5D09DC8F9905B8E194563EC2EA7BABC03C522DBB",
+		"project_id":"737518067793556928",
+		"app_id":"104732599",
+		"api_key":"DAEDABdE+co8zJWzDdPZKxRNpRW0bkERH0lfu32jI7xJ1A/phqLDyDN0cwvZgmL7CwTe1vWryhetKjHSJ8UkPR3Iym+TGTBW6JCa8A==",
+		"package_name":"com.cloudsolutions.alhabibmohemm"
+	},
+	"oauth_client":{
+		"client_id":"104732599",
+		"client_type":1
+	},
+	"app_info":{
+		"app_id":"104732599",
+		"package_name":"com.cloudsolutions.alhabibmohemm"
+	},
+	"configuration_version":"3.0",
+	"appInfos":[
+		{
+			"package_name":"com.cloudsolutions.alhabibmohemm",
+			"client":{
+				"app_id":"104732599"
+			},
+			"app_info":{
+				"package_name":"com.cloudsolutions.alhabibmohemm",
+				"app_id":"104732599"
+			},
+			"oauth_client":{
+				"client_type":1,
+				"client_id":"104732599"
+			}
+		}
+	]
+}

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/agconnect-services.json

@@ -27,7 +27,7 @@
 		"project_id":"737518067793559971",
 		"app_id":"104737117",
 		"api_key":"DAEDACKDrYgyco9mjPV9ZUjCSh1kCr/GBV0nseHH0z2mnxlZ41RksOKmyTi+PUTwmGEPK+VxCup4F9oUf4VbDnCsjB7aNBShYcjR+g==",
-		"package_name":"hmg.cloudSolutions.mohem"
+		"package_name":"com.cloudsolutions.alhabibmohemm"
 	},
 	"oauth_client":{
 		"client_id":"104737117",
@@ -35,17 +35,17 @@
 	},
 	"app_info":{
 		"app_id":"104737117",
-		"package_name":"hmg.cloudSolutions.mohem"
+		"package_name":"com.cloudsolutions.alhabibmohemm"
 	},
 	"configuration_version":"3.0",
 	"appInfos":[
 		{
-			"package_name":"hmg.cloudSolutions.mohem",
+			"package_name":"com.cloudsolutions.alhabibmohemm",
 			"client":{
 				"app_id":"104737117"
 			},
 			"app_info":{
-				"package_name":"hmg.cloudSolutions.mohem",
+				"package_name":"com.cloudsolutions.alhabibmohemm",
 				"app_id":"104737117"
 			},
 			"oauth_client":{

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 34
+    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 {
@@ -51,11 +37,17 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "hmg.cloudSolutions.mohem"
+        applicationId "com.cloudsolutions.alhabibmohemm"
         minSdkVersion 28
-        targetSdkVersion 34
-        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/google-services.json

@@ -1,40 +1,40 @@
-{
-  "project_info": {
-    "project_number": "679409052782",
-    "firebase_url": "https://mohemm-dce93.firebaseio.com",
-    "project_id": "mohemm-dce93",
-    "storage_bucket": "mohemm-dce93.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:679409052782:android:dba155ac0859d7fea78a7f",
-        "android_client_info": {
-          "package_name": "hmg.cloudSolutions.mohem"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "679409052782-mtd6d8rjltucnm9uatn6g7et08sm6lbv.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyDgWjuSBIKGghWxYg_KGBRIZTi-O_UA8mU"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "679409052782-mtd6d8rjltucnm9uatn6g7et08sm6lbv.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
+{
+  "project_info": {
+    "project_number": "448880075189",
+    "firebase_url": "https://al-habib-mohemm.firebaseio.com",
+    "project_id": "al-habib-mohemm",
+    "storage_bucket": "al-habib-mohemm.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:448880075189:android:5bb4821d515a826d88b9fc",
+        "android_client_info": {
+          "package_name": "com.cloudsolutions.alhabibmohemm"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "448880075189-49hc2l78pr9hsmr9p3k7j411r40diej8.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyC8nrli7eyuRNow8nF-QHvDMOxqUkj6fEw"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "448880075189-49hc2l78pr9hsmr9p3k7j411r40diej8.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
 }

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,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.mohem_flutter_app">
+    >
 
 <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
@@ -9,12 +9,12 @@
     <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" />
+
+    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" tools:node="remove" />
+
     <!-- Required only if your app needs to access audio files
          that other apps created. -->
     <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
@@ -33,7 +33,7 @@
     <application
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
-        android:label="MoheM"
+        android:label="Al Habib MoheM"
         android:extractNativeLibs="true"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round">

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/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.9.10'
     repositories {
         google()
         mavenCentral()
@@ -7,11 +6,10 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.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:r8:8.2.33"
+        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'
     }
 }
 
@@ -21,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')
 }
 
 tasks.register("clean", Delete) {
-    delete rootProject.buildDir
+    delete rootProject.layout.buildDirectory
 }

android/gradle.properties

@@ -1,4 +1,6 @@
 org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true
 android.enableJetifier=true
-org.gradle.java.home=/Users/user/Library/Java/JavaVirtualMachines/jbr-17.0.12/Contents/Home/
+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 @@
-#Thu Mar 06 11:40:30 AST 2025
+#Tue Jul 08 11:08:34 AST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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/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/langs/ar-SA.json

@@ -545,12 +545,9 @@
   "missingDocuments": "مستندات مفقودة",
   "uploadedDocuments": "المستندات التي تم تحميلها",
   "addAtLeastOneAttachment": "الرجاء إضافة مرفق واحد على الأقل.",
-  "pleaseClickButtonToJoinMarathon": "الرجاء الضغط على الزر أدناه للانضمام إلى الماراثون",
-  "youCannotJoinTheMarathon": "لا يمكنك الانضمام إلى الماراثون لأنك تجاوزت الحد الزمني",
   "open": "يفتح",
   "youCannotJoinTheMarathon": "لا يمكنك الانضمام إلى الماراثون لأنك تجاوزت الحد الزمني",
   "pleaseClickButtonToJoinMarathon": "الرجاء الضغط على الزر أدناه للانضمام إلى الماراثون",
-  "generate": "يولد",
   "paymentRequest": "طلب الدفع",
   "paymentDetails": "تفاصيل الدفع",
   "requestNo": "رقم الطلب",
@@ -615,5 +612,10 @@
   "searchByUserName": "البحث بواسطة اسم المستخدم",
   "shareScreen": "مشاركة الشاشة",
   "start":"يبدأ",
-  "about":"عن"
+  "about":"عن",
+  "explore": "يستكشف",
+  "mazaya": "مازيا",
+  "benefits": "فوائد",
+  "mazayaDesc": "اكتشف الخصومات والعروض الخاصة المتاحة للموظفين",
+  "viewallofferMazaya" : "أعرض كل المزايا"
 }

assets/langs/en-US.json

@@ -566,7 +566,6 @@
   "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",
@@ -613,5 +612,11 @@
   "bonusQty": "Bonus Qty.",
   "balQty": "Bal. Qty.",
   "start":"Start",
-  "about":"About"
+  "about":"About",
+  "explore": "Explore",
+  "mazaya": "MAZAYA",
+  "benefits": "Benefits",
+  "mazayaDesc": "Discover special Discounts and offers available to Employees",
+  "viewallofferMazaya" : "View All Offers"
+
 }

google-services.json

@@ -0,0 +1,40 @@
+{
+  "project_info": {
+    "project_number": "448880075189",
+    "firebase_url": "https://al-habib-mohemm.firebaseio.com",
+    "project_id": "al-habib-mohemm",
+    "storage_bucket": "al-habib-mohemm.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:448880075189:android:5bb4821d515a826d88b9fc",
+        "android_client_info": {
+          "package_name": "com.cloudsolutions.alhabibmohemm"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "448880075189-49hc2l78pr9hsmr9p3k7j411r40diej8.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyC8nrli7eyuRNow8nF-QHvDMOxqUkj6fEw"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "448880075189-49hc2l78pr9hsmr9p3k7j411r40diej8.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

ios/Runner.xcodeproj/project.pbxproj

@@ -242,6 +242,23 @@
 			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;
@@ -274,23 +291,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		EF29CE25BB57F5AA48CE1136 /* [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;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -387,17 +387,17 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 99Z3UD3LJM;
+				DEVELOPMENT_TEAM = 3A359E86ZF;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = Mohemm;
+				INFOPLIST_KEY_CFBundleDisplayName = "Al Habib MoheM";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.7.95;
-				PRODUCT_BUNDLE_IDENTIFIER = com.cloudsolutions.mohemm;
+				MARKETING_VERSION = 3.7.94;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cloudsolutions.alhabibmohemm;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -526,17 +526,17 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 99Z3UD3LJM;
+				DEVELOPMENT_TEAM = 3A359E86ZF;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = Mohemm;
+				INFOPLIST_KEY_CFBundleDisplayName = "Al Habib MoheM";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.7.95;
-				PRODUCT_BUNDLE_IDENTIFIER = com.cloudsolutions.mohemm;
+				MARKETING_VERSION = 3.7.94;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cloudsolutions.alhabibmohemm;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -557,17 +557,17 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 99Z3UD3LJM;
+				DEVELOPMENT_TEAM = 3A359E86ZF;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = Mohemm;
+				INFOPLIST_KEY_CFBundleDisplayName = "Al Habib MoheM";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.7.95;
-				PRODUCT_BUNDLE_IDENTIFIER = com.cloudsolutions.mohemm;
+				MARKETING_VERSION = 3.7.94;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cloudsolutions.alhabibmohemm;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";

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

@@ -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/GoogleService-Info.plist

@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CLIENT_ID</key>
-	<string>679409052782-3teqf8vdh9e1suvnhddj3pgmna7vg5rt.apps.googleusercontent.com</string>
-	<key>REVERSED_CLIENT_ID</key>
-	<string>com.googleusercontent.apps.679409052782-3teqf8vdh9e1suvnhddj3pgmna7vg5rt</string>
-	<key>API_KEY</key>
-	<string>AIzaSyCjMjhbeS7qilBoP4SH0t3SgkkHryf34JA</string>
-	<key>GCM_SENDER_ID</key>
-	<string>679409052782</string>
-	<key>PLIST_VERSION</key>
-	<string>1</string>
-	<key>BUNDLE_ID</key>
-	<string>com.cloudsolutions.mohemm</string>
-	<key>PROJECT_ID</key>
-	<string>mohemm-dce93</string>
-	<key>STORAGE_BUCKET</key>
-	<string>mohemm-dce93.appspot.com</string>
-	<key>IS_ADS_ENABLED</key>
-	<false></false>
-	<key>IS_ANALYTICS_ENABLED</key>
-	<false></false>
-	<key>IS_APPINVITE_ENABLED</key>
-	<true></true>
-	<key>IS_GCM_ENABLED</key>
-	<true></true>
-	<key>IS_SIGNIN_ENABLED</key>
-	<true></true>
-	<key>GOOGLE_APP_ID</key>
-	<string>1:679409052782:ios:ace07cf8ba043b48a78a7f</string>
-	<key>DATABASE_URL</key>
-	<string>https://mohemm-dce93.firebaseio.com</string>
-</dict>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CLIENT_ID</key>
+	<string>448880075189-tcgggmh2ua9tsmdr97c1ttcgrmf5kg5m.apps.googleusercontent.com</string>
+	<key>REVERSED_CLIENT_ID</key>
+	<string>com.googleusercontent.apps.448880075189-tcgggmh2ua9tsmdr97c1ttcgrmf5kg5m</string>
+	<key>API_KEY</key>
+	<string>AIzaSyB--KUTUYVpcdxpETCEsdhKs5cV3QawW7Q</string>
+	<key>GCM_SENDER_ID</key>
+	<string>448880075189</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>com.cloudsolutions.alhabibmohemm</string>
+	<key>PROJECT_ID</key>
+	<string>al-habib-mohemm</string>
+	<key>STORAGE_BUCKET</key>
+	<string>al-habib-mohemm.appspot.com</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:448880075189:ios:c6fd2b86fe7b388088b9fc</string>
+	<key>DATABASE_URL</key>
+	<string>https://al-habib-mohemm.firebaseio.com</string>
+</dict>
 </plist>

ios/Runner/Info.plist

@@ -2,6 +2,15 @@
 <!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>
@@ -13,7 +22,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>MoheM</string>
+	<string>Al Habib MoheM</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -22,10 +31,6 @@
 	<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>
@@ -36,15 +41,6 @@
 	<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>
@@ -55,17 +51,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>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>NSMicrophoneUsageDescription</key>
+	<string>This app requires microphone access to for call.</string>
 	<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>
@@ -89,9 +85,13 @@
 	<array>
 		<string>0000</string>
 	</array>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>com.apple.developer.nfc.readersession.formats</key>
 	<array>
 		<string>TAG</string>
 	</array>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>

ios/Runner/Runner.entitlements

@@ -6,7 +6,7 @@
 	<string>development</string>
 	<key>com.apple.developer.icloud-container-identifiers</key>
 	<array>
-		<string>iCloud.com.cloudsolutions.mohemm</string>
+		<string>iCloud.com.cloudsolutions.alhabibmohemm</string>
 	</array>
 	<key>com.apple.developer.icloud-services</key>
 	<array>
@@ -24,7 +24,7 @@
 	</array>
 	<key>com.apple.developer.ubiquity-container-identifiers</key>
 	<array>
-		<string>iCloud.com.cloudsolutions.mohemm</string>
+		<string>iCloud.com.cloudsolutions.alhabibmohemm</string>
 	</array>
 </dict>
 </plist>

lib/api/chat/chat_api_client.dart

@@ -28,7 +28,7 @@ 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",

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,9 @@ 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';
@@ -153,6 +159,59 @@ class DashboardApiClient {
     );
   }
 
+  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",
@@ -165,10 +224,17 @@ class DashboardApiClient {
   }) 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,

lib/api/items_for_sale/items_for_sale_api_client.dart

@@ -85,7 +85,7 @@ class ItemsForSaleApiClient {
       "employeeNumber": AppState().memberInformationList?.eMPLOYEENUMBER,
       "MobileNo": AppState().memberInformationList?.eMPLOYEEMOBILENUMBER,
       "itemSaleID": itemSaleID.toString(),
-      "Channel": "31",
+      "Channel": "33",
       "isActive": "false",
       "Token": AppState().postParamsObject?.tokenID
     };

lib/api/login_api_client.dart

@@ -60,7 +60,7 @@ class LoginApiClient {
 
   Future<MemberLoginListModel?> memberLogin(String username, String password) async {
     String url = "${ApiConsts.erpRest}MemberLogin";
-    Map<String, dynamic> postParams = {"P_APP_VERSION": "CS", "P_LANGUAGE": "US", "P_PASSWORD": password, "P_USER_NAME": username};
+    Map<String, dynamic> postParams = {"P_APP_VERSION": "HMG", "P_LANGUAGE": "US", "P_PASSWORD": password, "P_USER_NAME": username};
     postParams.addAll(AppState().postParamsJson);
     return await ApiClient().postJsonForObject((json) {
       GenericResponseModel responseData = GenericResponseModel.fromJson(json);

lib/app_state/app_state.dart

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

lib/classes/colors.dart

@@ -66,4 +66,5 @@ class MyColors {
   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

@@ -9,12 +9,12 @@ class ApiConsts {
  //  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://mohemm.hmg.com"; // New Live server
   //
-  static String baseUrl = "https://uat.hmgwebservices.com"; // UAT ser343622ver
+  //  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://webservices.hmg.com"; // PreProd
   // static String baseUrl = "https://mohemm.hmg.com";
   // static String baseUrl = "https://hmgwebservices.com"; // Live server
 
@@ -27,6 +27,8 @@ 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/";

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

@@ -34,8 +34,8 @@ class AppNotifications {
     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 ------------------------");

lib/classes/utils.dart

@@ -31,13 +31,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 +64,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 +114,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 +135,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 +154,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 +188,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 +196,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 +319,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 +345,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

lib/dialogs/otp_dialog.dart

@@ -67,6 +67,7 @@ class OtpDialog {
           // projectProvider = Provider.of(context);
           return Dialog(
             backgroundColor: Colors.white,
+            surfaceTintColor: Colors.transparent,
             shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
             insetPadding: const EdgeInsets.only(left: 21, right: 21),
             child: StatefulBuilder(builder: (context, setState) {
@@ -202,8 +203,13 @@ class OtpDialog {
       ),
       errorBorder: OutlineInputBorder(
         borderRadius: const BorderRadius.all(Radius.circular(10.0)),
-        borderSide: BorderSide(color: Theme.of(context).colorScheme.error),
+        borderSide: BorderSide(color: Colors.red),
       ),
+      // focusedErrorBorder: OutlineInputBorder(
+      //   borderRadius: const BorderRadius.all(Radius.circular(10.0)),
+      //   borderSide: BorderSide(color: Colors.red),
+      //   // borderSide: BorderSide(color: Theme.of(context).colorScheme.error),
+      // ),
       focusedErrorBorder: OutlineInputBorder(
         borderRadius: const BorderRadius.all(Radius.circular(10.0)),
         borderSide: BorderSide(color: Theme.of(context).colorScheme.error),

lib/generated/codegen_loader.g.dart

@@ -1,6 +1,6 @@
 // DO NOT EDIT. This is code generated via package:easy_localization/generate.dart
 
-// ignore_for_file: prefer_single_quotes, avoid_renaming_method_parameters
+// ignore_for_file: prefer_single_quotes, avoid_renaming_method_parameters, constant_identifier_names
 
 import 'dart:ui';
 
@@ -14,7 +14,7 @@ class CodegenLoader extends AssetLoader{
     return Future.value(mapLocales[locale.toString()]);
   }
 
-  static const Map<String,dynamic> ar_SA = {
+  static const Map<String,dynamic> _ar_SA = {
   "mohemm": "Mohemm",
   "english": "English",
   "arabic": "عربي",
@@ -116,6 +116,7 @@ class CodegenLoader extends AssetLoader{
   "reject": "يرفض",
   "approve": "يوافق",
   "cancel": "إلغاء",
+  "generate": "يولد",
   "requestedItems": "العناصر المطلوبة",
   "request": "طلب",
   "myRequest": "طلبي",
@@ -560,10 +561,9 @@ class CodegenLoader extends AssetLoader{
   "missingDocuments": "مستندات مفقودة",
   "uploadedDocuments": "المستندات التي تم تحميلها",
   "addAtLeastOneAttachment": "الرجاء إضافة مرفق واحد على الأقل.",
-  "open": "يفتح",
-  "youCannotJoinTheMarathon": "لا يمكنك الانضمام إلى الماراثون لأنك تجاوزت الحد الزمني",
   "pleaseClickButtonToJoinMarathon": "الرجاء الضغط على الزر أدناه للانضمام إلى الماراثون",
-  "generate": "يولد",
+  "youCannotJoinTheMarathon": "لا يمكنك الانضمام إلى الماراثون لأنك تجاوزت الحد الزمني",
+  "open": "يفتح",
   "paymentRequest": "طلب الدفع",
   "paymentDetails": "تفاصيل الدفع",
   "requestNo": "رقم الطلب",
@@ -627,10 +627,15 @@ class CodegenLoader extends AssetLoader{
   "members": "الأعضاء",
   "searchByUserName": "البحث بواسطة اسم المستخدم",
   "shareScreen": "مشاركة الشاشة",
-    "start":"يبدأ",
-    "about":"عن"
+  "start": "يبدأ",
+  "about": "عن",
+  "explore": "يستكشف",
+  "mazaya": "مازيا",
+  "benefits": "فوائد",
+  "mazayaDesc": "اكتشف الخصومات والعروض الخاصة المتاحة للموظفين",
+  "viewallofferMazaya": "أعرض كل المزايا"
 };
-static const Map<String,dynamic> en_US = {
+static const Map<String,dynamic> _en_US = {
   "mohemm": "Mohemm",
   "english": "English",
   "arabic": "عربي",
@@ -725,6 +730,7 @@ static const Map<String,dynamic> en_US = {
   "whatsapp": "Whatsapp",
   "reject": "Reject",
   "approve": "Approve",
+  "generate": "Generate",
   "cancel": "Cancel",
   "requestedItems": "Requested Items",
   "request": "Request",
@@ -1197,7 +1203,6 @@ static const Map<String,dynamic> en_US = {
   "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",
@@ -1243,8 +1248,13 @@ static const Map<String,dynamic> en_US = {
   "qtyReceived": "Qty. Received",
   "bonusQty": "Bonus Qty.",
   "balQty": "Bal. Qty.",
-  "start":"Start",
-  "about":"About"
+  "start": "Start",
+  "about": "About",
+  "explore": "Explore",
+  "mazaya": "MAZAYA",
+  "benefits": "Benefits",
+  "mazayaDesc": "Discover special Discounts and offers available to Employees",
+  "viewallofferMazaya": "View All Offers"
 };
-static const Map<String, Map<String,dynamic>> mapLocales = {"ar_SA": ar_SA, "en_US": en_US};
+static const Map<String, Map<String,dynamic>> mapLocales = {"ar_SA": _ar_SA, "en_US": _en_US};
 }

lib/generated/locale_keys.g.dart

@@ -1,5 +1,7 @@
 // DO NOT EDIT. This is code generated via package:easy_localization/generate.dart
 
+// ignore_for_file: constant_identifier_names
+
 abstract class  LocaleKeys {
   static const mohemm = 'mohemm';
   static const english = 'english';
@@ -101,6 +103,7 @@ abstract class  LocaleKeys {
   static const reject = 'reject';
   static const approve = 'approve';
   static const cancel = 'cancel';
+  static const generate = 'generate';
   static const requestedItems = 'requestedItems';
   static const request = 'request';
   static const myRequest = 'myRequest';
@@ -530,10 +533,9 @@ abstract class  LocaleKeys {
   static const missingDocuments = 'missingDocuments';
   static const uploadedDocuments = 'uploadedDocuments';
   static const addAtLeastOneAttachment = 'addAtLeastOneAttachment';
-  static const open = 'open';
-  static const youCannotJoinTheMarathon = 'youCannotJoinTheMarathon';
   static const pleaseClickButtonToJoinMarathon = 'pleaseClickButtonToJoinMarathon';
-  static const generate = 'generate';
+  static const youCannotJoinTheMarathon = 'youCannotJoinTheMarathon';
+  static const open = 'open';
   static const paymentRequest = 'paymentRequest';
   static const paymentDetails = 'paymentDetails';
   static const requestNo = 'requestNo';
@@ -598,5 +600,11 @@ abstract class  LocaleKeys {
   static const searchByUserName = 'searchByUserName';
   static const shareScreen = 'shareScreen';
   static const start = 'start';
-  static const about ='about';
+  static const about = 'about';
+  static const explore = 'explore';
+  static const mazaya = 'mazaya';
+  static const benefits = 'benefits';
+  static const mazayaDesc = 'mazayaDesc';
+  static const viewallofferMazaya = 'viewallofferMazaya';
+
 }

lib/generated_plugin_registrant.dart

@@ -35,7 +35,7 @@ void registerPlugins(Registrar registrar) {
   // GoogleMapsPlugin.registerWith(registrar);
   ImagePickerPlugin.registerWith(registrar);
   JustAudioPlugin.registerWith(registrar);
-  //RecordPluginWeb.registerWith(registrar);
+  // RecordPluginWeb.registerWith(registrar);
   SharedPreferencesPlugin.registerWith(registrar);
   UrlLauncherPlugin.registerWith(registrar);
   VideoPlayerPlugin.registerWith(registrar);

lib/models/chat/get_user_login_token_model.dart

@@ -5,21 +5,21 @@ UserAutoLoginModel userAutoLoginModelFromJson(String str) => UserAutoLoginModel.
 String userAutoLoginModelToJson(UserAutoLoginModel data) => json.encode(data.toJson());
 
 class UserAutoLoginModel {
-  UserAutoLoginModel({
-    this.response,
-    this.errorResponses,
-  });
+  UserAutoLoginModel({this.response, this.errorResponses, this.StatusCode});
 
   Response? response;
   List<ErrorResponse>? errorResponses;
+  int? StatusCode;
 
   factory UserAutoLoginModel.fromJson(Map<String, dynamic> json) => UserAutoLoginModel(
         response: json["response"] == null ? null : Response.fromJson(json["response"]),
+        StatusCode: json["StatusCode"],
         errorResponses: json["errorResponses"] == null ? null : List<ErrorResponse>.from(json["errorResponses"].map((x) => ErrorResponse.fromJson(x))),
       );
 
   Map<String, dynamic> toJson() => {
         "response": response == null ? null : response!.toJson(),
+        "StatusCode": StatusCode,
         "errorResponses": errorResponses == null ? null : List<dynamic>.from(errorResponses!.map((x) => x.toJson())),
       };
 }

lib/models/generic_response_model.dart

@@ -1,3 +1,5 @@
+import 'dart:convert';
+
 import 'package:mohem_flutter_app/models/add_att_success_list_model.dart';
 import 'package:mohem_flutter_app/models/add_attachment_list_model.dart';
 import 'package:mohem_flutter_app/models/basic_member_information_model.dart';
@@ -391,275 +393,278 @@ class GenericResponseModel {
   String? ePharmacyGetItemOnHandList;
   bool? isActiveCode;
   bool? isSMSSent;
-
-  GenericResponseModel(
-      {this.date,
-      this.languageID,
-      this.serviceName,
-      this.time,
-      this.androidLink,
-      this.authenticationTokenID,
-      this.data,
-      this.dataw,
-      this.dietType,
-      this.dietTypeID,
-      this.errorCode,
-      this.errorEndUserMessage,
-      this.errorEndUserMessageN,
-      this.errorMessage,
-      this.errorType,
-      this.foodCategory,
-      this.iOSLink,
-      this.isAuthenticated,
-      this.mealOrderStatus,
-      this.mealType,
-      this.messageStatus,
-      this.numberOfResultRecords,
-      this.patientBlodType,
-      this.successMsg,
-      this.successMsgN,
-      this.vidaUpdatedResponse,
-      this.addAttSuccessList,
-      this.addAttachmentList,
-      this.bCDomain,
-      this.bCLogo,
-      this.basicMemberInformation,
-      this.businessCardPrivilege,
-      this.calculateAbsenceDuration,
-      this.cancelHRTransactionLIst,
-      this.chatEmployeeLoginList,
-      this.companyBadge,
-      this.companyImage,
-      this.companyImageDescription,
-      this.companyImageURL,
-      this.companyMainCompany,
-      this.countryList,
-      this.createVacationRuleList,
-      this.deleteAttachmentList,
-      this.deleteVacationRuleList,
-      this.disableSessionList,
-      this.employeeQR,
-      this.employeeDocumentsList,
-      this.forgetPasswordTokenID,
-      this.getAbsenceAttachmentsList,
-      this.getAbsenceAttendanceTypesList,
-      this.getAbsenceCollectionNotificationBodyList,
-      this.getAbsenceDffStructureList,
-      this.getAbsenceTransactionList,
-      this.getAccrualBalancesList,
-      this.getActionHistoryList,
-      this.getPRActionHistoryList,
-      this.getAddressDffStructureList,
-      this.getAddressNotificationBodyList,
-      this.getApprovesList,
-      this.getAttachementList,
-      this.getPRAttachmentList,
-      this.getAttendanceTrackingList,
-      this.getBasicDetColsStructureList,
-      this.getBasicDetDffStructureList,
-      this.getBasicDetNtfBodyList,
-      this.getCEICollectionNotificationBodyList,
-      this.getCEIDFFStructureList,
-      this.getCEITransactionList,
-      this.getCcpTransactionsList,
-      this.getCcpTransactionsListNew,
-      this.getConcurrentProgramsList,
-      this.getContactColsStructureList,
-      this.getContactDetailsList,
-      this.getContactDffStructureList,
-      this.getContactNotificationBodyList,
-      this.getCountriesList,
-      this.getDayHoursTypeDetailsList,
-      this.getDeductionsList,
-      this.getDefaultValueList,
-      this.getEITCollectionNotificationBodyList,
-      this.getEITDFFStructureList,
-      this.getEITTransactionList,
-      this.getEarningsList,
-      this.getEmployeeAddressList,
-      this.getEmployeeBasicDetailsList,
-      this.getEmployeeContactsList,
-      this.getEmployeePhonesList,
-      this.getEmployeeSubordinatesList,
-      this.getFliexfieldStructureList,
-      this.getHrCollectionNotificationBodyList,
-      this.getHrTransactionList,
-      this.getItemCreationNtfBodyList,
-      this.getItemTypeNotificationsList,
-      this.getItemTypesList,
-      this.getLookupValuesList,
-      this.getMenuEntriesList,
-      this.getEventActivityList,
-      this.getMoItemHistoryList,
-      this.getMoNotificationBodyList,
-      this.getNotificationButtonsList,
-      this.getNotificationReassignModeList,
-      this.getObjectValuesList,
-      this.getOpenMissingSwipesList,
-      this.getOpenNotificationsList,
-      this.getOpenNotificationsNumList,
-      this.getOpenPeriodDatesList,
-      this.getOrganizationsSalariesList,
-      this.getPaymentInformationList,
-      this.getPayslipList,
-      this.getPerformanceAppraisalList,
-      this.getPhonesNotificationBodyList,
-      this.getPoItemHistoryList,
-      this.getPoNotificationBodyList,
-      this.getPrNotificationBodyList,
-      this.getPaymentNotificationBodyList,
-      this.getPRInformationList,
-      this.getQuotationAnalysisList,
-      this.getRFCEmployeeListList,
-      this.getRespondAttributeValueList,
-      this.getSITCollectionNotificationBodyList,
-      this.getSITDFFStructureList,
-      this.getSITTransactionList,
-      this.getScheduleShiftsDetailsList,
-      this.getShiftTypesList,
-      this.getStampMsNotificationBodyList,
-      this.getStampNsNotificationBodyList,
-      this.getSubordinatesAttdStatusList,
-      this.getSubordinatesLeavesList,
-      this.getSubordinatesLeavesTotalVacationsList,
-      this.getSummaryOfPaymentList,
-      this.getSwipesList,
-      this.getTermColsStructureList,
-      this.getTermDffStructureList,
-      this.getTermNotificationBodyList,
-      this.getTimeCardSummaryList,
-      this.getTicketsByEmployeeList,
-      this.getTicketDetailsByEmployee,
-      this.getTicketTransactions,
-      this.getTicketTypes,
-      this.getSectionTopics,
-      this.getMowadhafhiProjects,
-      this.getProjectDepartments,
-      this.getDepartmentSections,
-      this.getPendingTransactionsFunctions,
-      this.getPendingTransactionsDetails,
-      this.getConcurrentProgramsModel,
-      this.getCCPTransactionsModel,
-      this.getCCPOutputModel,
-      this.getCCPDFFStructureModel,
-      this.getUserItemTypesList,
-      this.getVacationRulesList,
-      this.getVaccinationOnHandList,
-      this.getVaccinationsList,
-      this.getValueSetValuesList,
-      this.getWorkList,
-      this.hRCertificateTemplate,
-      this.imgURLsList,
-      this.insertApInv,
-      this.insertBooked,
-      this.insertEmpSwipesList,
-      this.insertJournal,
-      this.insertOrders,
-      this.intPortalGetEmployeeList,
-      this.isDeviceTokenEmpty,
-      this.isPasswordExpired,
-      this.isRegisterAllowed,
-      this.isRequriedValueSetEmpty,
-      this.isUserSMSExcluded,
-      this.itemOnHand,
-      this.languageAvailable,
-      this.listSupplier,
-      this.listUserAgreement,
-      this.listEITStrucrure,
-      this.listItemImagesDetails,
-      this.listItemMaster,
-      this.listMedicineDetails,
-      this.listMenu,
-      this.listNewEmployees,
-      this.listRadScreen,
-      this.logInTokenID,
-      this.memberInformationList,
-      this.memberLoginList,
-      this.mohemmGetBusinessCardEnabledList,
-      this.mohemmGetFavoriteReplacementsList,
-      this.mohemmGetMobileDeviceInfobyEmpInfoList,
-      this.mohemmGetMobileLoginInfoList,
-      this.mohemmGetPatientIDList,
-      this.mohemmITGResponseItem,
-      this.mohemmIsChangeIsActiveBusinessCardEnable,
-      this.mohemmIsInsertBusinessCardEnable,
-      this.mohemmWifiPassword,
-      this.mohemmWifiSSID,
-      this.notificationAction,
-      this.notificationGetRespondAttributesList,
-      this.notificationRespondRolesList,
-      this.oracleOutPutNumber,
-      this.pASSWORDEXPIREDMSG,
-      this.pCOUNTRYCODE,
-      this.pCOUNTRYNAME,
-      this.pDESCFLEXCONTEXTCODE,
-      this.pDESCFLEXCONTEXTNAME,
-      this.pForm,
-      this.pINFORMATION,
-      this.pMBLID,
-      this.pNUMOFSUBORDINATES,
-      this.pOPENNTFNUMBER,
-      this.pQUESTION,
-      this.pSESSIONID,
-      this.pSchema,
-      this.pharmacyStockAddPharmacyStockList,
-      this.pharmacyStockGetOnHandList,
-      this.privilegeList,
-      this.processTransactions,
-      this.registerUserNameList,
-      this.replacementList,
-      this.respondAttributesList,
-      this.respondRolesList,
-      this.resubmitAbsenceTransactionList,
-      this.resubmitEITTransactionList,
-      this.resubmitHrTransactionList,
-      this.sFHGetPoNotificationBodyList,
-      this.sFHGetPrNotificationBodyList,
-      this.startAbsenceApprovalProccess,
-      this.startAddressApprovalProcessList,
-      this.startBasicDetApprProcessList,
-      this.startCeiApprovalProcess,
-      this.startContactApprovalProcessList,
-      this.startEitApprovalProcess,
-      this.startHrApprovalProcessList,
-      this.startPhonesApprovalProcessList,
-      this.startSitApprovalProcess,
-      this.startTermApprovalProcessList,
-      this.submitAddressTransactionList,
-      this.submitBasicDetTransactionList,
-      this.submitCEITransactionList,
-      this.submitCcpTransactionList,
-      this.submitContactTransactionList,
-      this.submitEITTransactionList,
-      this.submitHrTransactionList,
-      this.submitPhonesTransactionList,
-      this.submitSITTransactionList,
-      this.submitTermTransactionList,
-      this.subordinatesOnLeavesList,
-      this.sumbitAbsenceTransactionList,
-      this.tokenID,
-      this.updateAttachmentList,
-      this.updateEmployeeImageList,
-      this.updateItemTypeSuccessList,
-      this.updateUserItemTypesList,
-      this.updateVacationRuleList,
-      this.vHREmployeeLoginList,
-      this.vHRGetEmployeeDetailsList,
-      this.vHRGetManagersDetailsList,
-      this.vHRGetProjectByCodeList,
-      this.vHRIsVerificationCodeValid,
-      this.validateAbsenceTransactionList,
-      this.validateEITTransactionList,
-      this.validatePhonesTransactionList,
-      this.vrItemTypesList,
-      this.wFLookUpList,
-      this.eLearningGETEMPLOYEEPROFILEList,
-      this.eLearningLOGINList,
-      this.eLearningValidateLoginList,
-      this.eLearningValidate_LoginList,
-      this.ePharmacyGetItemOnHandList,
-      this.isActiveCode,
-      this.isSMSSent});
+  PortalDirectionData? portalDirectionData;
+
+  GenericResponseModel({
+    this.date,
+    this.languageID,
+    this.portalDirectionData,
+    this.serviceName,
+    this.time,
+    this.androidLink,
+    this.authenticationTokenID,
+    this.data,
+    this.dataw,
+    this.dietType,
+    this.dietTypeID,
+    this.errorCode,
+    this.errorEndUserMessage,
+    this.errorEndUserMessageN,
+    this.errorMessage,
+    this.errorType,
+    this.foodCategory,
+    this.iOSLink,
+    this.isAuthenticated,
+    this.mealOrderStatus,
+    this.mealType,
+    this.messageStatus,
+    this.numberOfResultRecords,
+    this.patientBlodType,
+    this.successMsg,
+    this.successMsgN,
+    this.vidaUpdatedResponse,
+    this.addAttSuccessList,
+    this.addAttachmentList,
+    this.bCDomain,
+    this.bCLogo,
+    this.basicMemberInformation,
+    this.businessCardPrivilege,
+    this.calculateAbsenceDuration,
+    this.cancelHRTransactionLIst,
+    this.chatEmployeeLoginList,
+    this.companyBadge,
+    this.companyImage,
+    this.companyImageDescription,
+    this.companyImageURL,
+    this.companyMainCompany,
+    this.countryList,
+    this.createVacationRuleList,
+    this.deleteAttachmentList,
+    this.deleteVacationRuleList,
+    this.disableSessionList,
+    this.employeeQR,
+    this.employeeDocumentsList,
+    this.forgetPasswordTokenID,
+    this.getAbsenceAttachmentsList,
+    this.getAbsenceAttendanceTypesList,
+    this.getAbsenceCollectionNotificationBodyList,
+    this.getAbsenceDffStructureList,
+    this.getAbsenceTransactionList,
+    this.getAccrualBalancesList,
+    this.getActionHistoryList,
+    this.getPRActionHistoryList,
+    this.getAddressDffStructureList,
+    this.getAddressNotificationBodyList,
+    this.getApprovesList,
+    this.getAttachementList,
+    this.getPRAttachmentList,
+    this.getAttendanceTrackingList,
+    this.getBasicDetColsStructureList,
+    this.getBasicDetDffStructureList,
+    this.getBasicDetNtfBodyList,
+    this.getCEICollectionNotificationBodyList,
+    this.getCEIDFFStructureList,
+    this.getCEITransactionList,
+    this.getCcpTransactionsList,
+    this.getCcpTransactionsListNew,
+    this.getConcurrentProgramsList,
+    this.getContactColsStructureList,
+    this.getContactDetailsList,
+    this.getContactDffStructureList,
+    this.getContactNotificationBodyList,
+    this.getCountriesList,
+    this.getDayHoursTypeDetailsList,
+    this.getDeductionsList,
+    this.getDefaultValueList,
+    this.getEITCollectionNotificationBodyList,
+    this.getEITDFFStructureList,
+    this.getEITTransactionList,
+    this.getEarningsList,
+    this.getEmployeeAddressList,
+    this.getEmployeeBasicDetailsList,
+    this.getEmployeeContactsList,
+    this.getEmployeePhonesList,
+    this.getEmployeeSubordinatesList,
+    this.getFliexfieldStructureList,
+    this.getHrCollectionNotificationBodyList,
+    this.getHrTransactionList,
+    this.getItemCreationNtfBodyList,
+    this.getItemTypeNotificationsList,
+    this.getItemTypesList,
+    this.getLookupValuesList,
+    this.getMenuEntriesList,
+    this.getEventActivityList,
+    this.getMoItemHistoryList,
+    this.getMoNotificationBodyList,
+    this.getNotificationButtonsList,
+    this.getNotificationReassignModeList,
+    this.getObjectValuesList,
+    this.getOpenMissingSwipesList,
+    this.getOpenNotificationsList,
+    this.getOpenNotificationsNumList,
+    this.getOpenPeriodDatesList,
+    this.getOrganizationsSalariesList,
+    this.getPaymentInformationList,
+    this.getPayslipList,
+    this.getPerformanceAppraisalList,
+    this.getPhonesNotificationBodyList,
+    this.getPoItemHistoryList,
+    this.getPoNotificationBodyList,
+    this.getPrNotificationBodyList,
+    this.getPaymentNotificationBodyList,
+    this.getPRInformationList,
+    this.getQuotationAnalysisList,
+    this.getRFCEmployeeListList,
+    this.getRespondAttributeValueList,
+    this.getSITCollectionNotificationBodyList,
+    this.getSITDFFStructureList,
+    this.getSITTransactionList,
+    this.getScheduleShiftsDetailsList,
+    this.getShiftTypesList,
+    this.getStampMsNotificationBodyList,
+    this.getStampNsNotificationBodyList,
+    this.getSubordinatesAttdStatusList,
+    this.getSubordinatesLeavesList,
+    this.getSubordinatesLeavesTotalVacationsList,
+    this.getSummaryOfPaymentList,
+    this.getSwipesList,
+    this.getTermColsStructureList,
+    this.getTermDffStructureList,
+    this.getTermNotificationBodyList,
+    this.getTimeCardSummaryList,
+    this.getTicketsByEmployeeList,
+    this.getTicketDetailsByEmployee,
+    this.getTicketTransactions,
+    this.getTicketTypes,
+    this.getSectionTopics,
+    this.getMowadhafhiProjects,
+    this.getProjectDepartments,
+    this.getDepartmentSections,
+    this.getPendingTransactionsFunctions,
+    this.getPendingTransactionsDetails,
+    this.getConcurrentProgramsModel,
+    this.getCCPTransactionsModel,
+    this.getCCPOutputModel,
+    this.getCCPDFFStructureModel,
+    this.getUserItemTypesList,
+    this.getVacationRulesList,
+    this.getVaccinationOnHandList,
+    this.getVaccinationsList,
+    this.getValueSetValuesList,
+    this.getWorkList,
+    this.hRCertificateTemplate,
+    this.imgURLsList,
+    this.insertApInv,
+    this.insertBooked,
+    this.insertEmpSwipesList,
+    this.insertJournal,
+    this.insertOrders,
+    this.intPortalGetEmployeeList,
+    this.isDeviceTokenEmpty,
+    this.isPasswordExpired,
+    this.isRegisterAllowed,
+    this.isRequriedValueSetEmpty,
+    this.isUserSMSExcluded,
+    this.itemOnHand,
+    this.languageAvailable,
+    this.listSupplier,
+    this.listUserAgreement,
+    this.listEITStrucrure,
+    this.listItemImagesDetails,
+    this.listItemMaster,
+    this.listMedicineDetails,
+    this.listMenu,
+    this.listNewEmployees,
+    this.listRadScreen,
+    this.logInTokenID,
+    this.memberInformationList,
+    this.memberLoginList,
+    this.mohemmGetBusinessCardEnabledList,
+    this.mohemmGetFavoriteReplacementsList,
+    this.mohemmGetMobileDeviceInfobyEmpInfoList,
+    this.mohemmGetMobileLoginInfoList,
+    this.mohemmGetPatientIDList,
+    this.mohemmITGResponseItem,
+    this.mohemmIsChangeIsActiveBusinessCardEnable,
+    this.mohemmIsInsertBusinessCardEnable,
+    this.mohemmWifiPassword,
+    this.mohemmWifiSSID,
+    this.notificationAction,
+    this.notificationGetRespondAttributesList,
+    this.notificationRespondRolesList,
+    this.oracleOutPutNumber,
+    this.pASSWORDEXPIREDMSG,
+    this.pCOUNTRYCODE,
+    this.pCOUNTRYNAME,
+    this.pDESCFLEXCONTEXTCODE,
+    this.pDESCFLEXCONTEXTNAME,
+    this.pForm,
+    this.pINFORMATION,
+    this.pMBLID,
+    this.pNUMOFSUBORDINATES,
+    this.pOPENNTFNUMBER,
+    this.pQUESTION,
+    this.pSESSIONID,
+    this.pSchema,
+    this.pharmacyStockAddPharmacyStockList,
+    this.pharmacyStockGetOnHandList,
+    this.privilegeList,
+    this.processTransactions,
+    this.registerUserNameList,
+    this.replacementList,
+    this.respondAttributesList,
+    this.respondRolesList,
+    this.resubmitAbsenceTransactionList,
+    this.resubmitEITTransactionList,
+    this.resubmitHrTransactionList,
+    this.sFHGetPoNotificationBodyList,
+    this.sFHGetPrNotificationBodyList,
+    this.startAbsenceApprovalProccess,
+    this.startAddressApprovalProcessList,
+    this.startBasicDetApprProcessList,
+    this.startCeiApprovalProcess,
+    this.startContactApprovalProcessList,
+    this.startEitApprovalProcess,
+    this.startHrApprovalProcessList,
+    this.startPhonesApprovalProcessList,
+    this.startSitApprovalProcess,
+    this.startTermApprovalProcessList,
+    this.submitAddressTransactionList,
+    this.submitBasicDetTransactionList,
+    this.submitCEITransactionList,
+    this.submitCcpTransactionList,
+    this.submitContactTransactionList,
+    this.submitEITTransactionList,
+    this.submitHrTransactionList,
+    this.submitPhonesTransactionList,
+    this.submitSITTransactionList,
+    this.submitTermTransactionList,
+    this.subordinatesOnLeavesList,
+    this.sumbitAbsenceTransactionList,
+    this.tokenID,
+    this.updateAttachmentList,
+    this.updateEmployeeImageList,
+    this.updateItemTypeSuccessList,
+    this.updateUserItemTypesList,
+    this.updateVacationRuleList,
+    this.vHREmployeeLoginList,
+    this.vHRGetEmployeeDetailsList,
+    this.vHRGetManagersDetailsList,
+    this.vHRGetProjectByCodeList,
+    this.vHRIsVerificationCodeValid,
+    this.validateAbsenceTransactionList,
+    this.validateEITTransactionList,
+    this.validatePhonesTransactionList,
+    this.vrItemTypesList,
+    this.wFLookUpList,
+    this.eLearningGETEMPLOYEEPROFILEList,
+    this.eLearningLOGINList,
+    this.eLearningValidateLoginList,
+    this.eLearningValidate_LoginList,
+    this.ePharmacyGetItemOnHandList,
+    this.isActiveCode,
+    this.isSMSSent,
+  });
 
   GenericResponseModel.fromJson(Map<String, dynamic> json) {
     date = json['Date'];
@@ -688,6 +693,7 @@ class GenericResponseModel {
     successMsg = json['SuccessMsg'];
     successMsgN = json['SuccessMsgN'];
     vidaUpdatedResponse = json['VidaUpdatedResponse'];
+    portalDirectionData = json["PortalDirectionData"] == null ? null : PortalDirectionData.fromJson(json["PortalDirectionData"]);
 
     if (json['AddAttSuccessList'] != null) {
       addAttSuccessList = <AddAttSuccessList>[];
@@ -848,9 +854,10 @@ class GenericResponseModel {
       });
     }
 
-    getCEICollectionNotificationBodyList = json["GetCEICollectionNotificationBodyList"] == null
-        ? null
-        : List<GetEitCollectionNotificationBodyList>.from(json["GetCEICollectionNotificationBodyList"].map((x) => GetEitCollectionNotificationBodyList.fromJson(x)));
+    getCEICollectionNotificationBodyList =
+        json["GetCEICollectionNotificationBodyList"] == null
+            ? null
+            : List<GetEitCollectionNotificationBodyList>.from(json["GetCEICollectionNotificationBodyList"].map((x) => GetEitCollectionNotificationBodyList.fromJson(x)));
 
     if (json['GetCEIDFFStructureList'] != null) {
       getCEIDFFStructureList = <GetEITDFFStructureList>[];
@@ -909,9 +916,10 @@ class GenericResponseModel {
       });
     }
     getDefaultValueList = json['GetDefaultValueList'] != null ? GetDefaultValueList.fromJson(json['GetDefaultValueList']) : null;
-    getEITCollectionNotificationBodyList = json["GetEITCollectionNotificationBodyList"] == null
-        ? null
-        : List<GetEitCollectionNotificationBodyList>.from(json["GetEITCollectionNotificationBodyList"].map((x) => GetEitCollectionNotificationBodyList.fromJson(x)));
+    getEITCollectionNotificationBodyList =
+        json["GetEITCollectionNotificationBodyList"] == null
+            ? null
+            : List<GetEitCollectionNotificationBodyList>.from(json["GetEITCollectionNotificationBodyList"].map((x) => GetEitCollectionNotificationBodyList.fromJson(x)));
     if (json['GetEITDFFStructureList'] != null) {
       getEITDFFStructureList = <GetEITDFFStructureList>[];
       json['GetEITDFFStructureList'].forEach((v) {
@@ -1475,6 +1483,7 @@ class GenericResponseModel {
     data['SuccessMsg'] = this.successMsg;
     data['SuccessMsgN'] = this.successMsgN;
     data['VidaUpdatedResponse'] = this.vidaUpdatedResponse;
+    data['PortalDirectionData'] = portalDirectionData?.toJson();
 
     if (this.addAttSuccessList != null) {
       data['AddAttSuccessList'] = this.addAttSuccessList!.map((v) => v.toJson()).toList();
@@ -1930,3 +1939,25 @@ class GenericResponseModel {
     return data;
   }
 }
+
+class PortalDirectionData {
+  String? pRedirection;
+  String? clientID;
+
+  PortalDirectionData({this.pRedirection, this.clientID});
+
+  factory PortalDirectionData.fromRawJson(String str) => PortalDirectionData.fromJson(json.decode(str));
+
+  String toRawJson() => json.encode(toJson());
+
+  factory PortalDirectionData.fromJson(Map<String, dynamic> json) => PortalDirectionData(pRedirection: json["P_REDIRECTION"], clientID: json["ClientID"]);
+
+  Map<String, dynamic> toJson() => {"P_REDIRECTION": pRedirection, "ClientID": clientID};
+}
+
+
+class TicketBookingResult {
+  final bool success;
+  final String? clientId;
+  TicketBookingResult(this.success, this.clientId);
+}

lib/models/sso_auth_model.dart

@@ -0,0 +1,65 @@
+import 'dart:convert';
+
+class SSOAuthModel {
+  String? status;
+  List<dynamic>? message;
+  Data? data;
+
+  SSOAuthModel({
+    this.status,
+    this.message,
+    this.data,
+  });
+
+  factory SSOAuthModel.fromRawJson(String str) => SSOAuthModel.fromJson(json.decode(str));
+
+  String toRawJson() => json.encode(toJson());
+
+  factory SSOAuthModel.fromJson(Map<String, dynamic> json) => SSOAuthModel(
+    status: json["status"],
+    message: json["message"] == null ? [] : List<dynamic>.from(json["message"]!.map((x) => x)),
+    data: json["data"] == null ? null : Data.fromJson(json["data"]),
+  );
+
+  Map<String, dynamic> toJson() => {
+    "status": status,
+    "message": message == null ? [] : List<dynamic>.from(message!.map((x) => x)),
+    "data": data?.toJson(),
+  };
+}
+
+class Data {
+  String? accessToken;
+  String? idToken;
+  int? expiresIn;
+  String? refreshToken;
+  String? postBackUrl;
+
+  Data({
+    this.accessToken,
+    this.idToken,
+    this.expiresIn,
+    this.refreshToken,
+    this.postBackUrl,
+  });
+
+  factory Data.fromRawJson(String str) => Data.fromJson(json.decode(str));
+
+  String toRawJson() => json.encode(toJson());
+
+  factory Data.fromJson(Map<String, dynamic> json) => Data(
+    accessToken: json["accessToken"],
+    idToken: json["idToken"],
+    expiresIn: json["expiresIn"],
+    refreshToken: json["refreshToken"],
+    postBackUrl: json["postBackUrl"],
+  );
+
+  Map<String, dynamic> toJson() => {
+    "accessToken": accessToken,
+    "idToken": idToken,
+    "expiresIn": expiresIn,
+    "refreshToken": refreshToken,
+    "postBackUrl": postBackUrl,
+  };
+}