Merge branch 'refs/heads/master' into flutter_upgrade_with_timesheet_changes

# Conflicts:
#	android/app/build.gradle
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/landing/widget/services_widget.dart
flutter_upgrade_with_timesheet_changes
aamir-csol 2 weeks ago
commit 107846dd82

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

@ -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"
}
}
]
}

@ -4,7 +4,7 @@ plugins {
id "com.google.gms.google-services" id "com.google.gms.google-services"
id "dev.flutter.flutter-gradle-plugin" id "dev.flutter.flutter-gradle-plugin"
id "com.google.firebase.crashlytics" id "com.google.firebase.crashlytics"
id "com.huawei.agconnect"
} }
@ -19,6 +19,7 @@ if (keystorePropertiesFile.exists()) {
android { android {
namespace 'hmg.cloudSolutions.mohem' namespace 'hmg.cloudSolutions.mohem'
compileSdk 36 compileSdk 36
ndkVersion '28.2.13676358'
kotlinOptions { kotlinOptions {
@ -33,6 +34,7 @@ android {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "hmg.cloudSolutions.mohem" applicationId "hmg.cloudSolutions.mohem"
minSdkVersion 30 minSdkVersion 30
targetSdk 35
targetSdk = flutter.targetSdkVersion targetSdk = flutter.targetSdkVersion
versionCode flutter.versionCode versionCode flutter.versionCode
versionName flutter.versionName versionName flutter.versionName
@ -43,6 +45,10 @@ android {
coreLibraryDesugaringEnabled true coreLibraryDesugaringEnabled true
} }
buildFeatures{
buildConfig true
}
signingConfigs { signingConfigs {
release { release {
keyAlias keystoreProperties['keyAlias'] keyAlias keystoreProperties['keyAlias']
@ -71,5 +77,8 @@ flutter {
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.20" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.20"
implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.multidex:multidex:2.0.1'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
implementation 'com.huawei.hms:push:6.11.0.300'
} }

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

@ -1,8 +1,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="hmg.cloudSolutions.mohem"> >
<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.USE_BIOMETRIC" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.NFC" /> <uses-permission android:name="android.permission.NFC" />

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

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

@ -1,49 +1,23 @@
//buildscript { buildscript {
// ext.kotlin_version = '1.9.10' repositories {
// repositories { google()
// google() mavenCentral()
// mavenCentral() maven { url 'https://developer.huawei.com/repo/' }
// maven { url 'https://developer.huawei.com/repo/' } }
// }
//
// 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"
// }
//}
//
//allprojects {
// repositories {
// google()
// mavenCentral()
// maven { url 'https://developer.huawei.com/repo/' }
// }
//}
//
//rootProject.buildDir = '../build'
//subprojects {
// project.buildDir = "${rootProject.buildDir}/${project.name}"
// project.evaluationDependsOn(':app')
//}
//
//tasks.register("clean", Delete) {
// delete rootProject.buildDir
//}
dependencies {
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'
}
}
allprojects { allprojects {
repositories { repositories {
google() google()
mavenCentral() mavenCentral()
maven { maven { url 'https://developer.huawei.com/repo/' }
url 'https://developer.huawei.com/repo/'
}
maven {
url "https://artifactory.ess-dev.com/artifactory/gradle-dev-local"
}
} }
// Exclude old BouncyCastle globally to avoid duplicate classes // Exclude old BouncyCastle globally to avoid duplicate classes

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

@ -15,22 +15,19 @@ pluginManagement {
mavenCentral() mavenCentral()
gradlePluginPortal() gradlePluginPortal()
maven { url 'https://developer.huawei.com/repo/' } maven { url 'https://developer.huawei.com/repo/' }
} }
dependencyResolutionManagement { resolutionStrategy {
repositories { eachPlugin {
google() if (requested.id.id == "com.huawei.agconnect") {
mavenCentral() useModule("com.huawei.agconnect:agcp:1.9.1.304")
gradlePluginPortal()
maven { url 'https://developer.huawei.com/repo/' }
maven {
url "https://artifactory.ess-dev.com/artifactory/gradle-dev-local"
} }
} }
} }
} }
plugins { plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0" id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version '8.11.0' apply false id "com.android.application" version '8.11.0' apply false
@ -38,7 +35,22 @@ plugins {
id("com.google.gms.google-services") version "4.4.3" 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("com.google.firebase.crashlytics") version "3.0.4" apply false
id('org.gradle.toolchains.foojay-resolver-convention') version '0.9.0' 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" include ":app"

@ -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>

After

Width:  |  Height:  |  Size: 4.8 KiB

@ -615,5 +615,10 @@
"searchByUserName": "البحث بواسطة اسم المستخدم", "searchByUserName": "البحث بواسطة اسم المستخدم",
"shareScreen": "مشاركة الشاشة", "shareScreen": "مشاركة الشاشة",
"start":"يبدأ", "start":"يبدأ",
"about":"عن" "about":"عن",
"explore": "يستكشف",
"mazaya": "مازيا",
"benefits": "فوائد",
"mazayaDesc": "اكتشف الخصومات والعروض الخاصة المتاحة للموظفين",
"viewallofferMazaya" : "أعرض كل المزايا"
} }

@ -613,5 +613,11 @@
"bonusQty": "Bonus Qty.", "bonusQty": "Bonus Qty.",
"balQty": "Bal. Qty.", "balQty": "Bal. Qty.",
"start":"Start", "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"
} }

@ -144,7 +144,7 @@
9705A1C41CF9048500538489 /* Embed Frameworks */, 9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */,
C4CFBC4C5CAC00182015ACD5 /* [CP] Embed Pods Frameworks */, C4CFBC4C5CAC00182015ACD5 /* [CP] Embed Pods Frameworks */,
6C6E76E4FB19FAF11C24005D /* [CP] Copy Pods Resources */, EF29CE25BB57F5AA48CE1136 /* [CP] Copy Pods Resources */,
); );
buildRules = ( buildRules = (
); );

@ -13,7 +13,7 @@
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>MOHEMM</string> <string>MoheM</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>

@ -86,6 +86,7 @@ class ApiClient {
var response = await postJsonForResponse(url, jsonObject, token: token, queryParameters: queryParameters, headers: _headers, retryTimes: retryTimes, isFormData: isFormData); var response = await postJsonForResponse(url, jsonObject, token: token, queryParameters: queryParameters, headers: _headers, retryTimes: retryTimes, isFormData: isFormData);
try { try {
if (!kReleaseMode) { if (!kReleaseMode) {
logger.i("Url: " + url);
logger.i("res: " + response.body); logger.i("res: " + response.body);
} }
@ -93,6 +94,12 @@ class ApiClient {
if (jsonData["IsAuthenticated"] != null) { if (jsonData["IsAuthenticated"] != null) {
AppState().setIsAuthenticated = jsonData["IsAuthenticated"]; AppState().setIsAuthenticated = jsonData["IsAuthenticated"];
} }
// if(url.contains("GetOfferDiscountsConfigData")) {
// jsonData["ErrorMessage"] = "Service Not Available";
// jsonData["ErrorEndUserMessage"] = "Service Not Available";
// }
if (jsonData["ErrorMessage"] == null) { if (jsonData["ErrorMessage"] == null) {
return factoryConstructor(jsonData); return factoryConstructor(jsonData);
} else { } else {

@ -28,7 +28,7 @@ class ChatApiClient {
factory ChatApiClient() => _instance; factory ChatApiClient() => _instance;
Future<user.UserAutoLoginModel> getUserLoginToken() async { Future<user.UserAutoLoginModel> getUserLoginToken() async {
user.UserAutoLoginModel userLoginResponse = user.UserAutoLoginModel(); user.UserAutoLoginModel userLoginResponse = user.UserAutoLoginModel();
String? deviceToken = AppState().getIsHuawei ? AppState().getHuaweiPushToken : AppState().getDeviceToken; String? deviceToken = AppState().getIsHuawei ? AppState().getHuaweiPushToken : AppState().getDeviceToken;
Response response = await ApiClient().postJsonForResponse( Response response = await ApiClient().postJsonForResponse(
"${ApiConsts.chatLoginTokenUrl}externaluserlogin", "${ApiConsts.chatLoginTokenUrl}externaluserlogin",

@ -1,8 +1,10 @@
import 'dart:async'; import 'dart:async';
import 'dart:convert'; import 'dart:convert';
import 'dart:io';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:http/http.dart' as http; 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/api/api_client.dart';
import 'package:mohem_flutter_app/app_state/app_state.dart'; import 'package:mohem_flutter_app/app_state/app_state.dart';
import 'package:mohem_flutter_app/classes/consts.dart'; import 'package:mohem_flutter_app/classes/consts.dart';
@ -17,6 +19,7 @@ import 'package:mohem_flutter_app/models/itg/itg_main_response.dart';
import 'package:mohem_flutter_app/models/itg/itg_response_model.dart'; import 'package:mohem_flutter_app/models/itg/itg_response_model.dart';
import 'package:mohem_flutter_app/models/sso_auth_model.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_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:platform_device_id/platform_device_id.dart';
import 'package:uuid/uuid.dart'; import 'package:uuid/uuid.dart';
@ -254,10 +257,17 @@ class DashboardApiClient {
}) async { }) async {
String url = "${ApiConsts.swpRest}AuthenticateAndSwipeUserSupportNFC"; String url = "${ApiConsts.swpRest}AuthenticateAndSwipeUserSupportNFC";
var uuid = Uuid(); var uuid = Uuid();
String? deviceId = "";
// Generate a v4 (random) id // 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 = { Map<String, dynamic> postParams = {
"UID": await PlatformDeviceId.getDeviceId, //uuid.v4(), //Mobile Id "UID": deviceId, //uuid.v4(), //Mobile Id
// "UID": uuid.v4(), //Mobile Id // "UID": uuid.v4(), //Mobile Id
"Latitude": lat, "Latitude": lat,
"Longitude": long, "Longitude": long,

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

@ -66,4 +66,5 @@ class MyColors {
static const Color darkGrey3BColor = Color(0xff3B3B3B); static const Color darkGrey3BColor = Color(0xff3B3B3B);
static const Color lightGreyIconColor = Color(0xff919191); static const Color lightGreyIconColor = Color(0xff919191);
static const Color selectedBorderColor = Color(0xff37A4BE); static const Color selectedBorderColor = Color(0xff37A4BE);
static const Color mazayaRedColor = Color(0xffED1C2B);
} }

@ -6,16 +6,16 @@ class ApiConsts {
// static String baseUrl = "https://uat.hmgwebservices.com"; // UAT ser343622ver // static String baseUrl = "https://uat.hmgwebservices.com"; // UAT ser343622ver
// static String baseUrl = "http://10.201.204.101:2024"; // static String baseUrl = "http://10.201.204.101:2024";
// static String baseUrl = "https://webservices.hmg.com"; // PreProd // static String baseUrl = "https://webservices.hmg.com"; // PreProd
// static String baseUrl = "https://hmgwebservices.com"; // Live server // 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 = "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://mohemm.hmg.com";
// static String baseUrl = "https://hmgwebservices.com"; // Live server // static String baseUrl = "https://hmgwebservices.com"; // Live server
static String baseUrlServices = baseUrl + "/Services/"; // server static String baseUrlServices = baseUrl + "/Services/"; // server
@ -68,8 +68,6 @@ class ApiConsts {
static String marathonGetMarathonersCount = marathonBaseUrl + "Participant/GetRemainingParticipants"; static String marathonGetMarathonersCount = marathonBaseUrl + "Participant/GetRemainingParticipants";
static String marathonGetTutorial = marathonBaseUrl + "tutorial/GetTutorialNotification"; static String marathonGetTutorial = marathonBaseUrl + "tutorial/GetTutorialNotification";
//DummyCards for the UI //DummyCards for the UI
static int tabletMinLength = 500; static int tabletMinLength = 500;

@ -38,12 +38,12 @@ class DateUtil {
return DateTime.now(); return DateTime.now();
} }
static DateTime convertSimpleStringDateToDate(String date) { static DateTime convertSimpleStringDateToDate(String date, {bool isITG = false}) {
// print(date.toUpperCase()); // 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 hours = num.parse(time.split(":")[0]);
var mins = time.split(":")[1]; var mins = time.split(":")[1];
var secs = time.split(":")[2].split(" ")[0]; var secs = time.split(":")[2].split(" ")[0];
@ -60,7 +60,7 @@ class DateUtil {
} }
} }
date = date + " $hours:$mins:$secs"; 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; return returnDate;
} }

@ -34,7 +34,7 @@ class AppNotifications {
if (Platform.isIOS) { if (Platform.isIOS) {
await flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation<IOSFlutterLocalNotificationsPlugin>()?.requestPermissions(alert: true, badge: true, sound: true); await flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation<IOSFlutterLocalNotificationsPlugin>()?.requestPermissions(alert: true, badge: true, sound: true);
} else if (Platform.isAndroid) { } else if (Platform.isAndroid) {
AndroidFlutterLocalNotificationsPlugin? androidImplementation = flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation<AndroidFlutterLocalNotificationsPlugin>(); AndroidFlutterLocalNotificationsPlugin? androidImplementation = flutterLocalNotificationsPlugin.resolvePlatformSpecificImplementation<AndroidFlutterLocalNotificationsPlugin>();
bool? granted = await androidImplementation?.requestNotificationsPermission(); bool? granted = await androidImplementation?.requestNotificationsPermission();
if (granted == false) { if (granted == false) {
if (kDebugMode) { if (kDebugMode) {

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

@ -1,6 +1,6 @@
// DO NOT EDIT. This is code generated via package:easy_localization/generate.dart // 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'; import 'dart:ui';
@ -14,7 +14,7 @@ class CodegenLoader extends AssetLoader{
return Future.value(mapLocales[locale.toString()]); return Future.value(mapLocales[locale.toString()]);
} }
static const Map<String,dynamic> ar_SA = { static const Map<String,dynamic> _ar_SA = {
"mohemm": "Mohemm", "mohemm": "Mohemm",
"english": "English", "english": "English",
"arabic": "عربي", "arabic": "عربي",
@ -116,6 +116,7 @@ class CodegenLoader extends AssetLoader{
"reject": "يرفض", "reject": "يرفض",
"approve": "يوافق", "approve": "يوافق",
"cancel": "إلغاء", "cancel": "إلغاء",
"generate": "يولد",
"requestedItems": "العناصر المطلوبة", "requestedItems": "العناصر المطلوبة",
"request": "طلب", "request": "طلب",
"myRequest": "طلبي", "myRequest": "طلبي",
@ -560,10 +561,9 @@ class CodegenLoader extends AssetLoader{
"missingDocuments": "مستندات مفقودة", "missingDocuments": "مستندات مفقودة",
"uploadedDocuments": "المستندات التي تم تحميلها", "uploadedDocuments": "المستندات التي تم تحميلها",
"addAtLeastOneAttachment": "الرجاء إضافة مرفق واحد على الأقل.", "addAtLeastOneAttachment": "الرجاء إضافة مرفق واحد على الأقل.",
"open": "يفتح",
"youCannotJoinTheMarathon": "لا يمكنك الانضمام إلى الماراثون لأنك تجاوزت الحد الزمني",
"pleaseClickButtonToJoinMarathon": "الرجاء الضغط على الزر أدناه للانضمام إلى الماراثون", "pleaseClickButtonToJoinMarathon": "الرجاء الضغط على الزر أدناه للانضمام إلى الماراثون",
"generate": "يولد", "youCannotJoinTheMarathon": "لا يمكنك الانضمام إلى الماراثون لأنك تجاوزت الحد الزمني",
"open": "يفتح",
"paymentRequest": "طلب الدفع", "paymentRequest": "طلب الدفع",
"paymentDetails": "تفاصيل الدفع", "paymentDetails": "تفاصيل الدفع",
"requestNo": "رقم الطلب", "requestNo": "رقم الطلب",
@ -627,10 +627,15 @@ class CodegenLoader extends AssetLoader{
"members": "الأعضاء", "members": "الأعضاء",
"searchByUserName": "البحث بواسطة اسم المستخدم", "searchByUserName": "البحث بواسطة اسم المستخدم",
"shareScreen": "مشاركة الشاشة", "shareScreen": "مشاركة الشاشة",
"start":"يبدأ", "start": "يبدأ",
"about":"عن" "about": "عن",
"explore": "يستكشف",
"mazaya": "مازيا",
"benefits": "فوائد",
"mazayaDesc": "اكتشف الخصومات والعروض الخاصة المتاحة للموظفين",
"viewallofferMazaya": "أعرض كل المزايا"
}; };
static const Map<String,dynamic> en_US = { static const Map<String,dynamic> _en_US = {
"mohemm": "Mohemm", "mohemm": "Mohemm",
"english": "English", "english": "English",
"arabic": "عربي", "arabic": "عربي",
@ -725,6 +730,7 @@ static const Map<String,dynamic> en_US = {
"whatsapp": "Whatsapp", "whatsapp": "Whatsapp",
"reject": "Reject", "reject": "Reject",
"approve": "Approve", "approve": "Approve",
"generate": "Generate",
"cancel": "Cancel", "cancel": "Cancel",
"requestedItems": "Requested Items", "requestedItems": "Requested Items",
"request": "Request", "request": "Request",
@ -1197,7 +1203,6 @@ static const Map<String,dynamic> en_US = {
"pleaseClickButtonToJoinMarathon": "Press the button below to join the Marathon.", "pleaseClickButtonToJoinMarathon": "Press the button below to join the Marathon.",
"youCannotJoinTheMarathon": "You cannot join the Marathon because you have exceeded the time limit.", "youCannotJoinTheMarathon": "You cannot join the Marathon because you have exceeded the time limit.",
"requesterOperatingUnit": "Requester Operating Unit", "requesterOperatingUnit": "Requester Operating Unit",
"generate": "Generate",
"paymentRequest": "Pay Request", "paymentRequest": "Pay Request",
"paymentDetails": "Payment Details", "paymentDetails": "Payment Details",
"requestNo": "Request No", "requestNo": "Request No",
@ -1243,8 +1248,13 @@ static const Map<String,dynamic> en_US = {
"qtyReceived": "Qty. Received", "qtyReceived": "Qty. Received",
"bonusQty": "Bonus Qty.", "bonusQty": "Bonus Qty.",
"balQty": "Bal. Qty.", "balQty": "Bal. Qty.",
"start":"Start", "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"
}; };
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};
} }

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

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

@ -1,6 +1,7 @@
class Advertisement { class Advertisement {
int? advertisementId; int? advertisementId;
String? advertisementTitle; String? advertisementTitle;
String? advertisementTitleAr;
int? durationInSeconds; int? durationInSeconds;
bool? showDelete; bool? showDelete;
dynamic acknowledgment; dynamic acknowledgment;
@ -16,6 +17,7 @@ class Advertisement {
Advertisement({ Advertisement({
this.advertisementId, this.advertisementId,
this.advertisementTitle, this.advertisementTitle,
this.advertisementTitleAr,
this.durationInSeconds, this.durationInSeconds,
this.showDelete, this.showDelete,
this.acknowledgment, this.acknowledgment,
@ -34,6 +36,7 @@ class Advertisement {
Advertisement.fromJson(Map<String, dynamic> json) { Advertisement.fromJson(Map<String, dynamic> json) {
advertisementId = json['advertisementId']; advertisementId = json['advertisementId'];
advertisementTitle = json['advertisementTitle']; advertisementTitle = json['advertisementTitle'];
advertisementTitleAr = json['advertisementTitleAr'];
durationInSeconds = json['durationInSeconds']; durationInSeconds = json['durationInSeconds'];
showDelete = json['showDelete']; showDelete = json['showDelete'];
acknowledgment = json['acknowledgment']; acknowledgment = json['acknowledgment'];
@ -63,6 +66,7 @@ class Advertisement {
Map<String, dynamic> data = Map<String, dynamic>(); Map<String, dynamic> data = Map<String, dynamic>();
data['advertisementId'] = this.advertisementId; data['advertisementId'] = this.advertisementId;
data['advertisementTitle'] = this.advertisementTitle; data['advertisementTitle'] = this.advertisementTitle;
data['advertisementTitleAr'] = this.advertisementTitleAr;
data['durationInSeconds'] = this.durationInSeconds; data['durationInSeconds'] = this.durationInSeconds;
data['showDelete'] = this.showDelete; data['showDelete'] = this.showDelete;
data['acknowledgment'] = this.acknowledgment; data['acknowledgment'] = this.acknowledgment;

@ -93,6 +93,12 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
Future<void> getUserAutoLoginToken() async { Future<void> getUserAutoLoginToken() async {
userLoginToken.UserAutoLoginModel userLoginResponse = await ChatApiClient().getUserLoginToken(); userLoginToken.UserAutoLoginModel userLoginResponse = await ChatApiClient().getUserLoginToken();
if (userLoginResponse.StatusCode == 500) {
disbaleChatForThisUser = true;
notifyListeners();
}
if (userLoginResponse.response != null) { if (userLoginResponse.response != null) {
AppState().setchatUserDetails = userLoginResponse; AppState().setchatUserDetails = userLoginResponse;
} else { } else {
@ -399,8 +405,8 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
if (data.first.userChatReplyResponse != null) { if (data.first.userChatReplyResponse != null) {
if (data.first.fileTypeResponse != null) { if (data.first.fileTypeResponse != null) {
if (data.first.userChatReplyResponse!.fileTypeId == 12 || data.first.userChatReplyResponse!.fileTypeId == 4 || data.first.userChatReplyResponse!.fileTypeId == 3) { if (data.first.userChatReplyResponse!.fileTypeId == 12 || data.first.userChatReplyResponse!.fileTypeId == 4 || data.first.userChatReplyResponse!.fileTypeId == 3) {
data.first.userChatReplyResponse!.image = data.first.userChatReplyResponse!.image = await ChatApiClient()
await ChatApiClient().downloadURL(fileName: data.first.userChatReplyResponse!.contant!, fileTypeDescription: data.first.fileTypeResponse!.fileTypeDescription ?? "image/jpg", fileSource: 1); .downloadURL(fileName: data.first.userChatReplyResponse!.contant!, fileTypeDescription: data.first.fileTypeResponse!.fileTypeDescription ?? "image/jpg", fileSource: 1);
data.first.userChatReplyResponse!.isImageLoaded = true; data.first.userChatReplyResponse!.isImageLoaded = true;
} }
} }
@ -476,8 +482,8 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
if (data.first.groupChatReplyResponse != null) { if (data.first.groupChatReplyResponse != null) {
if (data.first.fileTypeResponse != null) { if (data.first.fileTypeResponse != null) {
if (data.first.groupChatReplyResponse!.fileTypeId == 12 || data.first.groupChatReplyResponse!.fileTypeId == 4 || data.first.groupChatReplyResponse!.fileTypeId == 3) { if (data.first.groupChatReplyResponse!.fileTypeId == 12 || data.first.groupChatReplyResponse!.fileTypeId == 4 || data.first.groupChatReplyResponse!.fileTypeId == 3) {
data.first.groupChatReplyResponse!.image = data.first.groupChatReplyResponse!.image = await ChatApiClient()
await ChatApiClient().downloadURL(fileName: data.first.groupChatReplyResponse!.contant!, fileTypeDescription: data.first.fileTypeResponse!.fileTypeDescription ?? "image/jpg", fileSource: 2); .downloadURL(fileName: data.first.groupChatReplyResponse!.contant!, fileTypeDescription: data.first.fileTypeResponse!.fileTypeDescription ?? "image/jpg", fileSource: 2);
data.first.groupChatReplyResponse!.isImageLoaded = true; data.first.groupChatReplyResponse!.isImageLoaded = true;
} }
} }
@ -1653,7 +1659,7 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
void sRecoding() async { void sRecoding() async {
isVoiceMsg = true; isVoiceMsg = true;
recorderController.reset(); recorderController.reset();
await recorderController.record(path); await recorderController.record(path: path);
_recodeDuration = 0; _recodeDuration = 0;
_startTimer(); _startTimer();
isRecoding = !isRecoding; isRecoding = !isRecoding;
@ -1685,7 +1691,7 @@ class ChatProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
File file = File(path!); File file = File(path!);
file.readAsBytesSync(); file.readAsBytesSync();
path = file.path; path = file.path;
await playerController.preparePlayer(file.path, 1.0); await playerController.preparePlayer(path:file.path, volume: 1.0);
_timer?.cancel(); _timer?.cancel();
notifyListeners(); notifyListeners();
} }

@ -300,7 +300,7 @@ class DashboardProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
logger.wtf(ex); logger.wtf(ex);
isEventLoadingLoading = false; isEventLoadingLoading = false;
notifyListeners(); notifyListeners();
Utils.handleException(ex, null, null); // Utils.handleException(ex, null, null);
} }
} }

@ -16,84 +16,36 @@ class AppTheme {
}, },
), ),
hintColor: Colors.grey[400], hintColor: Colors.grey[400],
colorScheme: ColorScheme.fromSwatch( colorScheme: ColorScheme.fromSwatch(accentColor: MyColors.backgroundColor).copyWith(surfaceTint : Colors.transparent),
accentColor: MyColors.backgroundColor,
errorColor: const Color.fromRGBO(235, 80, 60, 1.0),
),
disabledColor: Colors.grey[300], disabledColor: Colors.grey[300],
// errorColor: const Color.fromRGBO(235, 80, 60, 1.0),
applyElevationOverlayColor: false,
scaffoldBackgroundColor: MyColors.backgroundColor, scaffoldBackgroundColor: MyColors.backgroundColor,
textSelectionTheme: const TextSelectionThemeData(cursorColor: Colors.grey, selectionColor: Color.fromRGBO(80, 100, 253, 0.5), selectionHandleColor: Colors.grey), textSelectionTheme: const TextSelectionThemeData(cursorColor: Colors.grey, selectionColor: Color.fromRGBO(80, 100, 253, 0.5), selectionHandleColor: Colors.grey),
canvasColor: Colors.white, canvasColor: Colors.white,
// backgroundColor: const Color.fromRGBO(255, 255, 255, 1),
highlightColor: Colors.grey[100]!.withOpacity(0.4), highlightColor: Colors.grey[100]!.withOpacity(0.4),
splashColor: Colors.transparent, splashColor: Colors.transparent,
primaryColor: primaryColor, primaryColor: primaryColor,
primaryColorDark: primaryColor, primaryColorDark: primaryColor,
buttonTheme: ButtonThemeData( // toggleableActiveColor: secondaryColor,
buttonColor: Colors.black,
),
switchTheme: SwitchThemeData(
thumbColor: MaterialStateProperty.resolveWith<Color?>(
(Set<MaterialState> states) {
if (states.contains(MaterialState.disabled)) {
return null;
}
if (states.contains(MaterialState.selected)) {
return secondaryColor;
}
return null;
}),
trackColor: MaterialStateProperty.resolveWith<Color?>(
(Set<MaterialState> states) {
if (states.contains(MaterialState.disabled)) {
return null;
}
if (states.contains(MaterialState.selected)) {
return secondaryColor;
}
return null;
}),
),
radioTheme: RadioThemeData(
fillColor: MaterialStateProperty.resolveWith<Color?>(
(Set<MaterialState> states) {
if (states.contains(MaterialState.disabled)) {
return null;
}
if (states.contains(MaterialState.selected)) {
return secondaryColor;
}
return null;
}),
),
checkboxTheme: CheckboxThemeData(
fillColor: MaterialStateProperty.resolveWith<Color?>(
(Set<MaterialState> states) {
if (states.contains(MaterialState.disabled)) {
return null;
}
if (states.contains(MaterialState.selected)) {
return secondaryColor;
}
return null;
}),
),
indicatorColor: secondaryColor, indicatorColor: secondaryColor,
bottomSheetTheme: const BottomSheetThemeData( bottomSheetTheme: const BottomSheetThemeData(
backgroundColor: Color(0xFFE0E0E0), backgroundColor: Color(0xFFE0E0E0),
), ),
primaryTextTheme: const TextTheme(
// bodyText2: TextStyle(color: Colors.white),
),
iconTheme: const IconThemeData(color: MyColors.darkIconColor), iconTheme: const IconThemeData(color: MyColors.darkIconColor),
textTheme: const TextTheme( textTheme: const TextTheme(
bodyMedium: TextStyle(color: Colors.black, letterSpacing: 0.6), // bodyText1: TextStyle(color: Colors.black, letterSpacing: 0.6),
headlineSmall: TextStyle(color: Colors.white, letterSpacing: 0.6), // headline1: TextStyle(color: Colors.white, letterSpacing: 0.6),
headlineMedium: TextStyle(color: Colors.white, letterSpacing: 0.6), // headline2: TextStyle(color: Colors.white, letterSpacing: 0.6),
), ),
floatingActionButtonTheme: const FloatingActionButtonThemeData(highlightElevation: 2, disabledElevation: 0, elevation: 2), floatingActionButtonTheme: const FloatingActionButtonThemeData(highlightElevation: 2, disabledElevation: 0, elevation: 2),
appBarTheme: AppBarTheme(
appBarTheme: AppBarTheme(
systemOverlayStyle: const SystemUiOverlayStyle(
statusBarBrightness: Brightness.light,
),
color: const Color(0xff515A5D), color: const Color(0xff515A5D),
systemOverlayStyle: const SystemUiOverlayStyle(statusBarBrightness: Brightness.light),
elevation: 0.0, elevation: 0.0,
actionsIconTheme: IconThemeData( actionsIconTheme: IconThemeData(
color: Colors.grey[800], color: Colors.grey[800],

@ -301,6 +301,7 @@ class _MonthlyAttendanceScreenState extends State<MonthlyAttendanceScreen> {
monthCellBuilder: (build, details) { monthCellBuilder: (build, details) {
if (details.date.month == formattedDate.month && details.date.year == formattedDate.year) { if (details.date.month == formattedDate.month && details.date.year == formattedDate.year) {
int val = details.date.day; int val = details.date.day;
int index = val-1;
//check day is off //check day is off
// if (getDayHoursTypeDetailsList.isNotEmpty) { // if (getDayHoursTypeDetailsList.isNotEmpty) {
// bool isDayIsOff = getDayHoursTypeDetailsList[val - 1].aTTENDEDFLAG == 'N' && getDayHoursTypeDetailsList[val - 1].dAYTYPE == 'OFF'; // bool isDayIsOff = getDayHoursTypeDetailsList[val - 1].aTTENDEDFLAG == 'N' && getDayHoursTypeDetailsList[val - 1].dAYTYPE == 'OFF';
@ -310,9 +311,9 @@ class _MonthlyAttendanceScreenState extends State<MonthlyAttendanceScreen> {
getDayHoursTypeDetailsList.where((GetDayHoursTypeDetailsList element) => DateFormat("MM/dd/yyyy", "en_US").parse(element.sCHEDULEDATE!).day == details.date.day).toList(); getDayHoursTypeDetailsList.where((GetDayHoursTypeDetailsList element) => DateFormat("MM/dd/yyyy", "en_US").parse(element.sCHEDULEDATE!).day == details.date.day).toList();
if (getDayHours.isNotEmpty) { if (getDayHours.isNotEmpty) {
bool isDayIsOff = getDayHoursTypeDetailsList[0].aTTENDEDFLAG == 'N' && getDayHoursTypeDetailsList[0].dAYTYPE == 'OFF'; bool isDayIsOff = getDayHoursTypeDetailsList[index].aTTENDEDFLAG == 'N' && getDayHoursTypeDetailsList[index].dAYTYPE == 'OFF';
bool isDayIsPresent = getDayHoursTypeDetailsList[0].aTTENDEDFLAG == 'Y'; bool isDayIsPresent = getDayHoursTypeDetailsList[index].aTTENDEDFLAG == 'Y';
bool isDayIsAbsent = getDayHoursTypeDetailsList[0].aTTENDEDFLAG == 'N' && getDayHoursTypeDetailsList[0].aBSENTFLAG == 'Y'; bool isDayIsAbsent = getDayHoursTypeDetailsList[index].aTTENDEDFLAG == 'N' && getDayHoursTypeDetailsList[index].aBSENTFLAG == 'Y';
if (isDayIsOff) { if (isDayIsOff) {
return Container( return Container(

@ -32,8 +32,11 @@ class _ChatHomeState extends State<ChatHome> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
data = Provider.of<ChatProviderModel>(context, listen: false);
data.registerEvents(); if (chatHubConnection.state == HubConnectionState.Connected) {
data = Provider.of<ChatProviderModel>(context, listen: false);
data.registerEvents();
}
} }
@override @override
@ -47,7 +50,6 @@ class _ChatHomeState extends State<ChatHome> {
data.getUserAutoLoginToken().whenComplete(() async { data.getUserAutoLoginToken().whenComplete(() async {
await data.buildHubConnection(); await data.buildHubConnection();
data.getUserRecentChats(); data.getUserRecentChats();
}); });
return; return;
} }
@ -57,7 +59,7 @@ class _ChatHomeState extends State<ChatHome> {
// String isAppOpendByChat = await Utils.getStringFromPrefs("isAppOpendByChat"); // String isAppOpendByChat = await Utils.getStringFromPrefs("isAppOpendByChat");
// String notificationData = await Utils.getStringFromPrefs("notificationData"); // String notificationData = await Utils.getStringFromPrefs("notificationData");
// if (isAppOpendByChat != "null" || isAppOpendByChat == "true" && notificationData != "null") { // if (isAppOpendByChat != "null" || isAppOpendByChat == "true" && notificationData != "null") {
// data.openChatByNoti(context); // data.openChatByNoti(context);
// } // }
}); });
} }

@ -214,8 +214,13 @@ class _ChatHomeScreenState extends State<ChatHomeScreen> {
}, },
), ),
floatingActionButton: FloatingActionButton( floatingActionButton: FloatingActionButton(
// <<<<<<< HEAD
// elevation: 0,
// backgroundColor : Colors.transparent,
// =======
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
elevation: 0, elevation: 0,
child: Container( child: Container(
width: 60, width: 60,
height: 60, height: 60,

@ -21,7 +21,6 @@ class BusinessCardDialog extends StatelessWidget {
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
Row( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,

@ -60,10 +60,10 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
void initState() { void initState() {
WidgetsBinding.instance.addObserver(this); WidgetsBinding.instance.addObserver(this);
super.initState(); super.initState();
cProvider = Provider.of<ChatProviderModel>(context, listen: false);
scheduleMicrotask(() { scheduleMicrotask(() {
data = Provider.of<DashboardProviderModel>(context, listen: false); data = Provider.of<DashboardProviderModel>(context, listen: false);
marathonProvider = Provider.of<MarathonProvider>(context, listen: false); marathonProvider = Provider.of<MarathonProvider>(context, listen: false);
cProvider = Provider.of<ChatProviderModel>(context, listen: false);
if (checkIfPrivilegedForChat()) { if (checkIfPrivilegedForChat()) {
_bHubCon(); _bHubCon();
} }
@ -117,6 +117,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
} }
Future<void> checkHubCon() async { Future<void> checkHubCon() async {
// chatHubConnection = await context.read<ChatProviderModel>().getHubConnection();
if (chatHubConnection.state == HubConnectionState.Connected) { if (chatHubConnection.state == HubConnectionState.Connected) {
await chatHubConnection.stop(); await chatHubConnection.stop();
await chatHubConnection.start(); await chatHubConnection.start();
@ -152,7 +153,7 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
data.fetchLeaveTicketBalance(context, DateTime.now()); data.fetchLeaveTicketBalance(context, DateTime.now());
data.fetchMenuEntries(); data.fetchMenuEntries();
data.fetchEventActivity(); data.fetchEventActivity();
data.getCategoryOffersListAPI(context); // data.getCategoryOffersListAPI(context);
marathonProvider.getMarathonDetailsFromApi(); marathonProvider.getMarathonDetailsFromApi();
marathonProvider.getMarathonTutorial(); marathonProvider.getMarathonTutorial();
if (isFromInit) { if (isFromInit) {
@ -243,440 +244,457 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return SafeArea(
key: _scaffoldState, bottom: Platform.isAndroid ? true : false,
body: Column( top: false,
children: [ child: Scaffold(
Row( key: _scaffoldState,
children: [ body: Column(
Builder( children: [
builder: (BuildContext context) { Row(
return Row( children: [
mainAxisSize: MainAxisSize.min, Builder(
children: [ builder: (BuildContext context) {
Image.memory( return Row(
Utils.dataFromBase64String(AppState().memberInformationList!.eMPLOYEEIMAGE ?? ""), mainAxisSize: MainAxisSize.min,
errorBuilder: (BuildContext context, Object error, StackTrace? stackTrace) { children: [
return SvgPicture.asset("assets/images/user.svg", height: 34, width: 34); Image.memory(
}, Utils.dataFromBase64String(AppState().memberInformationList!.eMPLOYEEIMAGE ?? ""),
width: 34, errorBuilder: (BuildContext context, Object error, StackTrace? stackTrace) {
height: 34, return SvgPicture.asset("assets/images/user.svg", height: 34, width: 34);
fit: BoxFit.cover, },
).circle(50), width: 34,
// CircularAvatar( height: 34,
// width: 34, fit: BoxFit.cover,
// height: 34, ).circle(50),
// url: "https://cdn4.iconfinder.com/data/icons/professions-2-2/151/89-512.png", // CircularAvatar(
// ), // width: 34,
8.width, // height: 34,
SvgPicture.asset("assets/images/side_nav.svg"), // url: "https://cdn4.iconfinder.com/data/icons/professions-2-2/151/89-512.png",
], // ),
).onPress(() { 8.width,
_scaffoldState.currentState!.openDrawer(); SvgPicture.asset("assets/images/side_nav.svg"),
}); ],
).onPress(() {
_scaffoldState.currentState!.openDrawer();
});
},
),
Image.asset("assets/images/logos/main_mohemm_logo.png", width: 134, height: 28).expanded,
SvgPicture.asset("assets/images/announcements.svg", matchTextDirection: true).onPress(() async {
await Navigator.pushNamed(context, AppRoutes.announcements);
}),
],
).paddingOnly(left: 21, right: 21, top: 48, bottom: 7),
Expanded(
child: SmartRefresher(
enablePullDown: true,
enablePullUp: false,
header: const MaterialClassicHeader(color: MyColors.gradiantEndColor),
controller: _refreshController,
onRefresh: () {
_onRefresh(false);
}, },
), child: SingleChildScrollView(
Image.asset("assets/images/logos/main_mohemm_logo.png", width: 134, height: 28).expanded, child: Column(
SvgPicture.asset("assets/images/announcements.svg", matchTextDirection: true).onPress(() async { children: [
await Navigator.pushNamed(context, AppRoutes.announcements); Column(
}), crossAxisAlignment: CrossAxisAlignment.start,
], children: <Widget>[
).paddingOnly(left: 21, right: 21, top: 48, bottom: 7), LocaleKeys.welcomeBack.tr().toText14(color: MyColors.grey77Color),
Expanded( (AppState().memberInformationList!.eMPLOYEENAME ?? "").toText24(isBold: true),
child: SmartRefresher( 16.height,
enablePullDown: true, Row(
enablePullUp: false, children: [
header: const MaterialClassicHeader(color: MyColors.gradiantEndColor), Expanded(
controller: _refreshController, child: AspectRatio(
onRefresh: () { aspectRatio: 159 / 159,
_onRefresh(false); child: Consumer<DashboardProviderModel>(
}, builder: (BuildContext context, DashboardProviderModel model, Widget? child) {
child: SingleChildScrollView( return (model.isAttendanceTrackingLoading
child: Column( ? GetAttendanceTrackingShimmer()
children: [ : Container(
Column( decoration: BoxDecoration(
crossAxisAlignment: CrossAxisAlignment.start, borderRadius: BorderRadius.circular(15),
children: <Widget>[ gradient: const LinearGradient(
LocaleKeys.welcomeBack.tr().toText14(color: MyColors.grey77Color), transform: GradientRotation(.46),
(AppState().memberInformationList!.eMPLOYEENAME ?? "").toText24(isBold: true), begin: Alignment.topRight,
16.height, end: Alignment.bottomLeft,
Row( colors: [MyColors.gradiantEndColor, MyColors.gradiantStartColor],
children: [ ),
Expanded(
child: AspectRatio(
aspectRatio: 159 / 159,
child: Consumer<DashboardProviderModel>(
builder: (BuildContext context, DashboardProviderModel model, Widget? child) {
return (model.isAttendanceTrackingLoading
? GetAttendanceTrackingShimmer()
: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15),
gradient: const LinearGradient(
transform: GradientRotation(.46),
begin: Alignment.topRight,
end: Alignment.bottomLeft,
colors: [MyColors.gradiantEndColor, MyColors.gradiantStartColor],
), ),
), child: Stack(
child: Stack( alignment: Alignment.center,
alignment: Alignment.center, children: [
children: [ if (model.isTimeRemainingInSeconds == 0) SvgPicture.asset("assets/images/thumb.svg"),
if (model.isTimeRemainingInSeconds == 0) SvgPicture.asset("assets/images/thumb.svg"), Column(
Column( crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: [
children: [ Expanded(
Expanded( child: Column(
child: Column( mainAxisSize: MainAxisSize.min,
mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: [
LocaleKeys.markAttendance.tr().toText14(color: Colors.white, isBold: true),
if (model.isTimeRemainingInSeconds == 0) DateTime.now().toString().split(" ")[0].toText12(color: Colors.white),
if (model.isTimeRemainingInSeconds != 0)
Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
9.height,
Directionality(
textDirection: ui.TextDirection.ltr,
child: CountdownTimer(
endTime: model.endTime,
onEnd: null,
endWidget: "00:00:00".toText14(color: Colors.white, isBold: true),
textStyle: const TextStyle(color: Colors.white, fontSize: 14, letterSpacing: -0.48, fontWeight: FontWeight.bold),
),
),
LocaleKeys.timeLeftToday.tr().toText12(color: Colors.white),
9.height,
ClipRRect(
borderRadius: const BorderRadius.all(Radius.circular(20)),
child: LinearProgressIndicator(
value: model.progress,
minHeight: 8,
valueColor: const AlwaysStoppedAnimation<Color>(Colors.white),
backgroundColor: const Color(0xff196D73),
),
),
],
),
],
).paddingOnly(top: 12, right: 15, left: 12),
),
Row(
children: [ children: [
LocaleKeys.markAttendance.tr().toText14(color: Colors.white, isBold: true), Expanded(
if (model.isTimeRemainingInSeconds == 0) DateTime.now().toString().split(" ")[0].toText12(color: Colors.white), child: Column(
if (model.isTimeRemainingInSeconds != 0)
Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
9.height, LocaleKeys.checkIn.tr().toText12(color: Colors.white),
Directionality( (model.attendanceTracking!.pSwipeIn == null ? "--:--" : model.attendanceTracking!.pSwipeIn).toString().toText14(
textDirection: ui.TextDirection.ltr, color: Colors.white,
child: CountdownTimer( isBold: true,
endTime: model.endTime,
onEnd: null,
endWidget: "00:00:00".toText14(color: Colors.white, isBold: true),
textStyle: const TextStyle(color: Colors.white, fontSize: 14, letterSpacing: -0.48, fontWeight: FontWeight.bold),
),
),
LocaleKeys.timeLeftToday.tr().toText12(color: Colors.white),
9.height,
ClipRRect(
borderRadius: const BorderRadius.all(Radius.circular(20)),
child: LinearProgressIndicator(
value: model.progress,
minHeight: 8,
valueColor: const AlwaysStoppedAnimation<Color>(Colors.white),
backgroundColor: const Color(0xff196D73),
),
), ),
4.height,
], ],
).paddingOnly(left: 12, right: 12),
),
Container(
margin: EdgeInsets.only(top: AppState().isArabic(context) ? 6 : 0),
width: 45,
height: 45,
padding: const EdgeInsets.only(left: 10, right: 10),
decoration: BoxDecoration(
color: const Color(0xff259EA4),
borderRadius: BorderRadius.only(
bottomRight: AppState().isArabic(context) ? const Radius.circular(0) : const Radius.circular(15),
bottomLeft: AppState().isArabic(context) ? const Radius.circular(15) : const Radius.circular(0),
),
), ),
child: SvgPicture.asset(model.isTimeRemainingInSeconds == 0 ? "assets/images/biometrics.svg" : "assets/images/biometrics.svg"),
).onPress(() {
showMyBottomSheet(context, callBackFunc: () {}, child: MarkAttendanceWidget(model, isFromDashboard: true));
}),
], ],
).paddingOnly(top: 12, right: 15, left: 12), ),
), ],
Row( ),
children: [ ],
Expanded( ),
child: Column( ).onPress(() {
mainAxisSize: MainAxisSize.min, Navigator.pushNamed(context, AppRoutes.todayAttendance);
crossAxisAlignment: CrossAxisAlignment.start, }))
.animatedSwither();
},
),
),
),
9.width,
Expanded(child: MenusWidget()),
],
),
],
).paddingOnly(left: 21, right: 21, top: 7, bottom: 21),
eventActivityWidget(context),
Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Directionality(
textDirection: AppState().isArabic(context) ? ui.TextDirection.rtl : ui.TextDirection.ltr,
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(20),
gradient: const LinearGradient(colors: [Color(0xFF91C481), Color(0xFF7CCED7)], begin: Alignment.centerLeft, end: Alignment.centerRight),
),
child: Padding(
padding: const EdgeInsets.all(3.0), // This creates the border width
child: Container(
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(17), // Slightly less than outer radius
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
flex: 4,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Row(
children: [
Expanded(
flex: 2,
child: RichText(
text:
AppState().isArabic(context)
? TextSpan(
children: [ children: [
LocaleKeys.checkIn.tr().toText12(color: Colors.white), TextSpan(
(model.attendanceTracking!.pSwipeIn == null ? "--:--" : model.attendanceTracking!.pSwipeIn).toString().toText14( text: 'اطلع على مميزات',
color: Colors.white, style: TextStyle(fontSize: 16, letterSpacing: -0.2, fontFamily: AppState().isArabic(context) ? 'Cairo' : 'Poppins', fontWeight: FontWeight.w700, height: 24 / 16, color: Color(0xFF5D5E5E)),
isBold: true, ),
TextSpan(
text: ' مزايا',
style: TextStyle(
fontSize: 16,
fontFamily: AppState().isArabic(context) ? 'Cairo' : 'Poppins',
fontWeight: FontWeight.w700,
letterSpacing: -0.2,
height: 24 / 16,
color: MyColors.mazayaRedColor, // Use your MAZAYA red color here if defined, e.g. MyColors.mazayaRed
),
),
],
)
: TextSpan(
children: [
TextSpan(
text: LocaleKeys.explore.tr() + ' ',
style: const TextStyle(fontSize: 16, letterSpacing: -0.2, fontFamily: 'Poppins', fontWeight: FontWeight.w700, height: 24 / 16, color: Color(0xFF5D5E5E)),
),
TextSpan(
text: LocaleKeys.mazaya.tr(),
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.w700,
fontFamily: 'Poppins',
letterSpacing: -0.2,
height: 24 / 16,
color: MyColors.mazayaRedColor, // Use your MAZAYA red color here if defined, e.g. MyColors.mazayaRed
),
),
TextSpan(
text: ' ' + LocaleKeys.benefits.tr(),
style: const TextStyle(fontSize: 16, letterSpacing: -0.2,
fontFamily: 'Poppins',fontWeight: FontWeight.w700, height: 24 / 16, color: Color(0xFF5D5E5E)),
), ),
4.height,
], ],
).paddingOnly(left: 12, right: 12),
),
Container(
margin: EdgeInsets.only(top: AppState().isArabic(context) ? 6 : 0),
width: 45,
height: 45,
padding: const EdgeInsets.only(left: 10, right: 10),
decoration: BoxDecoration(
color: Color(0xff259EA4),
borderRadius: BorderRadius.only(
bottomRight: AppState().isArabic(context) ? Radius.circular(0) : Radius.circular(15),
bottomLeft: AppState().isArabic(context) ? Radius.circular(15) : Radius.circular(0),
),
), ),
child: SvgPicture.asset(model.isTimeRemainingInSeconds == 0 ? "assets/images/biometrics.svg" : "assets/images/biometrics.svg"),
).onPress(() {
showMyBottomSheet(context, callBackFunc: () {}, child: MarkAttendanceWidget(model, isFromDashboard: true));
}),
],
),
],
), ),
], ),
), const Expanded(flex: 1, child: SizedBox()),
).onPress(() { ],
Navigator.pushNamed(context, AppRoutes.todayAttendance); ),
})) const SizedBox(height: 8),
.animatedSwither(); LocaleKeys.mazayaDesc.tr().toText11(color: const Color(0xFF5D5E5E)),
}, ],
),
),
Expanded(
flex: 2,
child: Column(
crossAxisAlignment: CrossAxisAlignment.end,
mainAxisAlignment: MainAxisAlignment.end,
children: [
SvgPicture.asset("assets/icons/mazaya_brand.svg", width: 90, height: 47),
const SizedBox(height: 28),
LocaleKeys.viewallofferMazaya.tr().toText12(isUnderLine: true, color: const Color(0xFF3B3D4A)).onPress(() {
Navigator.pushNamed(context, AppRoutes.offersAndDiscounts);
}),
],
),
),
],
).paddingOnly(left: 21, right: 21, top: 14, bottom: 14),
), ),
), ),
), ).paddingOnly(left: 21, right: 21, top: 0, bottom: 21),
9.width, ),
Expanded(child: MenusWidget()), ],
),
Container(
width: double.infinity,
padding: const EdgeInsets.only(top: 31),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: const BorderRadius.only(topRight: Radius.circular(50), topLeft: Radius.circular(50)),
border: Border.all(color: MyColors.lightGreyEDColor, width: 1),
),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
ServicesWidget(),
context.watch<MarathonProvider>().isLoading ? const MarathonBannerShimmer().paddingAll(20) : const MarathonBanner().paddingOnly(left: 21, right: 21, bottom: 8, top: 8),
// context.watch<MarathonProvider>().isTutorialLoading
// ? const MarathonBannerShimmer().paddingAll(20)
// : Container(
// padding: EdgeInsets.only(bottom: 12, top: 12),
// margin: EdgeInsets.only(left: 21, right: 21, bottom: 21, top: 8),
// width: double.infinity,
// alignment: Alignment.center,
// decoration: BoxDecoration(
// color: MyColors.backgroundBlackColor,
// borderRadius: BorderRadius.circular(20),
// border: Border.all(color: MyColors.lightGreyEDColor, width: 1),
// ),
// child: Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// mainAxisSize: MainAxisSize.min,
// children: [
// Text(
// "Tutorial:",
// style: TextStyle(
// fontSize: 11,
// fontStyle: FontStyle.italic,
// fontWeight: FontWeight.w600,
// color: MyColors.white.withOpacity(0.83),
// letterSpacing: -0.4,
// ),
// ),
// Text(
// context.read<MarathonProvider>().tutorial?.tutorialName ?? "",
// overflow: TextOverflow.ellipsis,
// style: TextStyle(
// fontStyle: FontStyle.italic,
// fontSize: 19,
// fontWeight: FontWeight.bold,
// color: MyColors.white,
// height: 32 / 22,
// ),
// ),
// ],
// ),
// ).onPress(() {
// checkERMChannel();
// // Navigator.pushNamed(context, AppRoutes.marathonTutorialScreen);
// }),
], ],
), ),
], ),
).paddingOnly(left: 21, right: 21, top: 7, bottom: 21), ],
eventActivityWidget(context), ),
),
),
),
],
),
drawer: AppDrawer(onLanguageChange: _onRefresh),
bottomNavigationBar: SizedBox(
height: Platform.isAndroid ? 70 : 100,
child: BottomNavigationBar(
items: <BottomNavigationBarItem>[
BottomNavigationBarItem(icon: SvgPicture.asset("assets/icons/home.svg", color: currentIndex == 0 ? MyColors.grey3AColor : MyColors.grey98Color).paddingAll(4), label: LocaleKeys.home.tr()),
BottomNavigationBarItem(
icon: SvgPicture.asset("assets/icons/create_req.svg", color: currentIndex == 1 ? MyColors.grey3AColor : MyColors.grey98Color).paddingAll(4),
label: LocaleKeys.mowadhafhiRequest.tr(),
),
BottomNavigationBarItem(
icon: Stack(
alignment: Alignment.centerLeft,
children: [
SvgPicture.asset("assets/icons/work_list.svg", color: currentIndex == 2 ? MyColors.grey3AColor : MyColors.grey98Color).paddingAll(4),
Consumer<DashboardProviderModel>( Consumer<DashboardProviderModel>(
builder: (BuildContext context, DashboardProviderModel model, Widget? child) { builder: (BuildContext cxt, DashboardProviderModel data, Widget? child) {
if (!model.isOffersLoading && model.getOffersList.isEmpty) { if (data.workListCounter == 0) {
return const SizedBox(); return const SizedBox();
} }
return Column( return Positioned(
mainAxisSize: MainAxisSize.min, right: 0,
crossAxisAlignment: CrossAxisAlignment.start, top: 0,
children: [ child: Container(
Row( padding: const EdgeInsets.only(left: 4, right: 4),
crossAxisAlignment: CrossAxisAlignment.center, alignment: Alignment.center,
children: [ decoration: BoxDecoration(color: MyColors.redColor, borderRadius: BorderRadius.circular(17)),
Expanded( child: data.workListCounter.toString().toText10(color: Colors.white),
child: Column( ),
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
LocaleKeys.offers.tr().toText12(),
Row(
children: [
LocaleKeys.discounts.tr().toText24(isBold: true),
6.width,
Container(
padding: const EdgeInsets.only(left: 8, right: 8),
decoration: BoxDecoration(color: MyColors.yellowColor, borderRadius: BorderRadius.circular(10)),
child: LocaleKeys.newString.tr().toText10(isBold: true),
),
],
),
],
),
),
LocaleKeys.viewAllOffers.tr().toText12(isUnderLine: true).onPress(() {
Navigator.pushNamed(context, AppRoutes.offersAndDiscounts);
}),
],
).paddingOnly(left: 21, right: 21),
Consumer<DashboardProviderModel>(
builder: (BuildContext context, DashboardProviderModel model, Widget? child) {
return SizedBox(
height: 103 + 33,
child: ListView.separated(
shrinkWrap: true,
physics: const BouncingScrollPhysics(),
padding: const EdgeInsets.only(left: 21, right: 21, top: 13),
scrollDirection: Axis.horizontal,
itemBuilder: (BuildContext cxt, int index) {
return model.isOffersLoading
? const OffersShimmerWidget()
: InkWell(
onTap: () {
navigateToDetails(data.getOffersList[index]);
},
child: SizedBox(
width: 73,
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
width: 73,
height: 73,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: const BorderRadius.all(Radius.circular(100)),
border: Border.all(color: MyColors.lightGreyE3Color, width: 1),
),
child: ClipRRect(
borderRadius: const BorderRadius.all(Radius.circular(50)),
child: Hero(
tag: "ItemImage" + data.getOffersList[index].offersDiscountId.toString()!,
transitionOnUserGestures: true,
child: Image.network(data.getOffersList[index].logo ?? "", fit: BoxFit.contain),
),
),
),
4.height,
Expanded(
child:
AppState().isArabic(context)
? data.getOffersList[index].titleAr!.toText12(isCenter: true, maxLine: 1)
: data.getOffersList[index].titleEn!.toText12(isCenter: true, maxLine: 1),
),
],
),
),
);
},
separatorBuilder: (BuildContext cxt, int index) => 8.width,
itemCount: 9,
),
);
},
),
],
); );
}, },
), ),
Container(
width: double.infinity,
padding: const EdgeInsets.only(top: 31),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: const BorderRadius.only(topRight: Radius.circular(50), topLeft: Radius.circular(50)),
border: Border.all(color: MyColors.lightGreyEDColor, width: 1),
),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
ServicesWidget(),
context.watch<MarathonProvider>().isLoading ? const MarathonBannerShimmer().paddingAll(20) : const MarathonBanner().paddingOnly(left: 21, right: 21, bottom: 8, top: 8),
// context.watch<MarathonProvider>().isTutorialLoading
// ? const MarathonBannerShimmer().paddingAll(20)
// : Container(
// padding: EdgeInsets.only(bottom: 12, top: 12),
// margin: EdgeInsets.only(left: 21, right: 21, bottom: 21, top: 8),
// width: double.infinity,
// alignment: Alignment.center,
// decoration: BoxDecoration(
// color: MyColors.backgroundBlackColor,
// borderRadius: BorderRadius.circular(20),
// border: Border.all(color: MyColors.lightGreyEDColor, width: 1),
// ),
// child: Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// mainAxisSize: MainAxisSize.min,
// children: [
// Text(
// "Tutorial:",
// style: TextStyle(
// fontSize: 11,
// fontStyle: FontStyle.italic,
// fontWeight: FontWeight.w600,
// color: MyColors.white.withOpacity(0.83),
// letterSpacing: -0.4,
// ),
// ),
// Text(
// context.read<MarathonProvider>().tutorial?.tutorialName ?? "",
// overflow: TextOverflow.ellipsis,
// style: TextStyle(
// fontStyle: FontStyle.italic,
// fontSize: 19,
// fontWeight: FontWeight.bold,
// color: MyColors.white,
// height: 32 / 22,
// ),
// ),
// ],
// ),
// ).onPress(() {
// checkERMChannel();
// // Navigator.pushNamed(context, AppRoutes.marathonTutorialScreen);
// }),
],
),
),
], ],
), ),
label: LocaleKeys.workList.tr(),
), ),
), BottomNavigationBarItem(
), icon: SvgPicture.asset("assets/icons/item_for_sale.svg", color: currentIndex == 3 ? MyColors.grey3AColor : MyColors.grey98Color).paddingAll(4),
], label: LocaleKeys.itemsForSale.tr(),
),
drawer: SafeArea(child: AppDrawer(onLanguageChange: _onRefresh)),
bottomNavigationBar: SizedBox(
height: Platform.isAndroid ? 70 : 100,
child: BottomNavigationBar(
items: <BottomNavigationBarItem>[
BottomNavigationBarItem(icon: SvgPicture.asset("assets/icons/home.svg", color: currentIndex == 0 ? MyColors.grey3AColor : MyColors.grey98Color).paddingAll(4), label: LocaleKeys.home.tr()),
BottomNavigationBarItem(
icon: SvgPicture.asset("assets/icons/create_req.svg", color: currentIndex == 1 ? MyColors.grey3AColor : MyColors.grey98Color).paddingAll(4),
label: LocaleKeys.mowadhafhiRequest.tr(),
),
BottomNavigationBarItem(
icon: Stack(
alignment: Alignment.centerLeft,
children: [
SvgPicture.asset("assets/icons/work_list.svg", color: currentIndex == 2 ? MyColors.grey3AColor : MyColors.grey98Color).paddingAll(4),
Consumer<DashboardProviderModel>(
builder: (BuildContext cxt, DashboardProviderModel data, Widget? child) {
if (data.workListCounter == 0) {
return const SizedBox();
}
return Positioned(
right: 0,
top: 0,
child: Container(
padding: const EdgeInsets.only(left: 4, right: 4),
alignment: Alignment.center,
decoration: BoxDecoration(color: MyColors.redColor, borderRadius: BorderRadius.circular(17)),
child: data.workListCounter.toString().toText10(color: Colors.white),
),
);
},
),
],
), ),
label: LocaleKeys.workList.tr(), BottomNavigationBarItem(
), icon: Stack(
BottomNavigationBarItem( alignment: Alignment.centerLeft,
icon: SvgPicture.asset("assets/icons/item_for_sale.svg", color: currentIndex == 3 ? MyColors.grey3AColor : MyColors.grey98Color).paddingAll(4), children: [
label: LocaleKeys.itemsForSale.tr(), SvgPicture.asset(
), "assets/icons/chat/chat.svg",
BottomNavigationBarItem( color:
icon: Stack( !checkIfPrivilegedForChat()
alignment: Alignment.centerLeft, ? MyColors.lightGreyE3Color
children: [ : currentIndex == 4
SvgPicture.asset( ? MyColors.grey3AColor
"assets/icons/chat/chat.svg", : cProvider.disbaleChatForThisUser
color: ? MyColors.lightGreyE3Color
!checkIfPrivilegedForChat() : MyColors.grey98Color,
? MyColors.lightGreyE3Color ).paddingAll(4),
: currentIndex == 4 Consumer<ChatProviderModel>(
? MyColors.grey3AColor builder: (BuildContext cxt, ChatProviderModel data, Widget? child) {
: cProvider.disbaleChatForThisUser return !checkIfPrivilegedForChat()
? MyColors.lightGreyE3Color ? const SizedBox()
: MyColors.grey98Color, : Positioned(
).paddingAll(4), right: 0,
Consumer<ChatProviderModel>( top: 0,
builder: (BuildContext cxt, ChatProviderModel data, Widget? child) { child: Container(
return !checkIfPrivilegedForChat() padding: const EdgeInsets.only(left: 4, right: 4),
? const SizedBox() alignment: Alignment.center,
: Positioned( decoration: BoxDecoration(color: cProvider.disbaleChatForThisUser ? MyColors.pinkDarkColor : MyColors.redColor, borderRadius: BorderRadius.circular(17)),
right: 0, child: data.chatUConvCounter.toString().toText10(color: Colors.white),
top: 0, ),
child: Container( );
padding: const EdgeInsets.only(left: 4, right: 4), },
alignment: Alignment.center, ),
decoration: BoxDecoration(color: cProvider.disbaleChatForThisUser ? MyColors.pinkDarkColor : MyColors.redColor, borderRadius: BorderRadius.circular(17)), ],
child: data.chatUConvCounter.toString().toText10(color: Colors.white), ),
), label: LocaleKeys.chat.tr(),
);
},
),
],
), ),
label: LocaleKeys.chat.tr(), ],
), currentIndex: currentIndex,
], selectedLabelStyle: const TextStyle(fontSize: 10, color: MyColors.grey3AColor, fontWeight: FontWeight.w600),
currentIndex: currentIndex, unselectedLabelStyle: const TextStyle(fontSize: 10, color: MyColors.grey98Color, fontWeight: FontWeight.w600),
selectedLabelStyle: const TextStyle(fontSize: 10, color: MyColors.grey3AColor, fontWeight: FontWeight.w600), type: BottomNavigationBarType.fixed,
unselectedLabelStyle: const TextStyle(fontSize: 10, color: MyColors.grey98Color, fontWeight: FontWeight.w600), selectedItemColor: MyColors.grey3AColor,
type: BottomNavigationBarType.fixed, backgroundColor: MyColors.backgroundColor,
selectedItemColor: MyColors.grey3AColor, selectedIconTheme: const IconThemeData(color: MyColors.grey3AColor, size: 28),
backgroundColor: MyColors.backgroundColor, unselectedIconTheme: const IconThemeData(color: MyColors.grey98Color, size: 28),
selectedIconTheme: const IconThemeData(color: MyColors.grey3AColor, size: 28), onTap: (int index) {
unselectedIconTheme: const IconThemeData(color: MyColors.grey98Color, size: 28), if (index == 1) {
onTap: (int index) { Navigator.pushNamed(context, AppRoutes.mowadhafhi);
if (index == 1) { } else if (index == 2) {
Navigator.pushNamed(context, AppRoutes.mowadhafhi); Navigator.pushNamed(context, AppRoutes.workList);
} else if (index == 2) { } else if (index == 3) {
Navigator.pushNamed(context, AppRoutes.workList); Navigator.pushNamed(context, AppRoutes.itemsForSale);
} else if (index == 3) { } else if (index == 4) {
Navigator.pushNamed(context, AppRoutes.itemsForSale); if (!cProvider.disbaleChatForThisUser && checkIfPrivilegedForChat()) {
} else if (index == 4) { Navigator.pushNamed(context, AppRoutes.chat);
if (!cProvider.disbaleChatForThisUser && checkIfPrivilegedForChat()) { }
Navigator.pushNamed(context, AppRoutes.chat);
} }
} },
}, ),
), ),
), ),
); );

@ -11,8 +11,10 @@ import 'package:mohem_flutter_app/extensions/string_extensions.dart';
import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
import 'package:mohem_flutter_app/main.dart'; import 'package:mohem_flutter_app/main.dart';
import 'package:mohem_flutter_app/models/itg/advertisement.dart' as ads; import 'package:mohem_flutter_app/models/itg/advertisement.dart' as ads;
import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
import 'package:mohem_flutter_app/widgets/button/default_button.dart'; import 'package:mohem_flutter_app/widgets/button/default_button.dart';
import 'package:mohem_flutter_app/widgets/my_video_progress_indicator.dart'; import 'package:mohem_flutter_app/widgets/my_video_progress_indicator.dart';
import 'package:url_launcher/url_launcher.dart';
import 'package:video_player/video_player.dart'; import 'package:video_player/video_player.dart';
class ITGAdsScreen extends StatefulWidget { class ITGAdsScreen extends StatefulWidget {
@ -31,6 +33,8 @@ class _ITGAdsScreenState extends State<ITGAdsScreen> {
bool isAudio = false; bool isAudio = false;
String ext = ''; String ext = '';
bool isTextURL = false;
// late File imageFile; // late File imageFile;
late String imageUrl; late String imageUrl;
ads.Advertisement? advertisementData; ads.Advertisement? advertisementData;
@ -45,23 +49,27 @@ class _ITGAdsScreenState extends State<ITGAdsScreen> {
late CountdownTimerController timerController; late CountdownTimerController timerController;
void checkFileType() { void checkFileType() {
String? rFile = advertisementData!.viewAttachFileColl!.first.base64String; if (advertisementData!.viewAttachFileColl!.first.contentType!.toLowerCase() == "text") {
try { isTextURL = true;
rFile = advertisementData!.viewAttachFileColl!.where((element) => element.languageId == AppState().getLanguageID(context)).toList().first.base64String;
} catch (ex) {}
String? rFileExt = advertisementData!.viewAttachFileColl!.first.fileName;
ext = "." + rFileExt!.split(".").last.toLowerCase();
if (ext == ".png" || ext == ".jpg" || ext == ".jpeg" || ext == ".gif") {
// await processImage();
imageUrl = rFile!;
isImage = true;
} else { } else {
if (ext == ".aac") { String? rFile = advertisementData!.viewAttachFileColl!.first.base64String;
isAudio = true; try {
rFile = advertisementData!.viewAttachFileColl!.where((element) => element.languageId == AppState().getLanguageID(context)).toList().first.base64String;
} catch (ex) {}
String? rFileExt = advertisementData!.viewAttachFileColl!.first.fileName;
ext = "." + rFileExt!.split(".").last.toLowerCase();
if (ext == ".png" || ext == ".jpg" || ext == ".jpeg" || ext == ".gif") {
// await processImage();
imageUrl = rFile!;
isImage = true;
} else {
if (ext == ".aac") {
isAudio = true;
}
isVideo = true;
_futureController = createVideoPlayer(rFile!);
} }
isVideo = true;
_futureController = createVideoPlayer(rFile!);
} }
// advertisementData?.actionButtonsColl!.forEach((element) { // advertisementData?.actionButtonsColl!.forEach((element) {
@ -132,7 +140,17 @@ class _ITGAdsScreenState extends State<ITGAdsScreen> {
timerController = CountdownTimerController(endTime: DateTime.now().millisecondsSinceEpoch + 1000 * videoDuration, onEnd: onTimerEnd); timerController = CountdownTimerController(endTime: DateTime.now().millisecondsSinceEpoch + 1000 * videoDuration, onEnd: onTimerEnd);
} }
return Scaffold( return Scaffold(
backgroundColor: Colors.black, backgroundColor: isTextURL ? Colors.white : Colors.black,
appBar: isTextURL
? AppBar(
centerTitle: true,
automaticallyImplyLeading: false,
backgroundColor: Colors.white,
title: (AppState().isArabic(context) ? advertisementData!.advertisementTitleAr! : advertisementData!.advertisementTitleAr!).toText24(color: MyColors.darkTextColor, isBold: true),
//advertisementData!.viewAttachFileColl!.first.base64String!.toText24(color: MyColors.darkTextColor, isBold: true),
)
: null,
body: Stack( body: Stack(
children: [ children: [
if (isVideo) if (isVideo)
@ -346,6 +364,45 @@ class _ITGAdsScreenState extends State<ITGAdsScreen> {
], ],
), ),
), ),
if (isTextURL)
SingleChildScrollView(
padding: const EdgeInsets.all(21),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
(AppState().isArabic(context) ? advertisementData!.viewAttachFileColl![0].base64String! : advertisementData!.viewAttachFileColl![1].base64String!)
.toText16(color: MyColors.darkTextColor),
24.height,
ListView.separated(
itemCount: advertisementData!.actionButtonsColl?.length ?? 0,
separatorBuilder: (cxt, index) => 16.height,
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
padding: EdgeInsets.zero,
itemBuilder: (cxt, index) => DefaultButton(
AppState().isArabic(context) ? advertisementData!.actionButtonsColl![index].btnTextAr : advertisementData!.actionButtonsColl![index].btnTextEn,
() async {
if (advertisementData!.actionButtonsColl![index].actionValue.toLowerCase() == "skip") {
Navigator.pop(context);
} else {
Uri uri = Uri.parse(advertisementData!.actionButtonsColl![index].iconOrImage);
// if (await canLaunchUrl(uri)) {
await launchUrl(uri, mode: LaunchMode.externalApplication).catchError((err) {
// print(err);
Utils.showToast('Could not launch');
});
Navigator.pop(context);
// } else {
// Utils.showToast('Could not launch');
// }
}
},
),
),
],
),
),
], ],
), ),
); );

@ -5,8 +5,8 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:local_auth/local_auth.dart'; import 'package:local_auth/local_auth.dart';
import 'package:local_auth_android/local_auth_android.dart';
import 'package:local_auth_darwin/local_auth_darwin.dart'; import 'package:local_auth_darwin/local_auth_darwin.dart';
import 'package:local_auth_android/local_auth_android.dart';
import 'package:mohem_flutter_app/api/login_api_client.dart'; import 'package:mohem_flutter_app/api/login_api_client.dart';
import 'package:mohem_flutter_app/app_state/app_state.dart'; import 'package:mohem_flutter_app/app_state/app_state.dart';
import 'package:mohem_flutter_app/classes/colors.dart'; import 'package:mohem_flutter_app/classes/colors.dart';
@ -66,16 +66,17 @@ class _VerifyLastLoginScreenState extends State<VerifyLastLoginScreen> {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
surfaceTintColor: Colors.transparent,
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
automaticallyImplyLeading: false, automaticallyImplyLeading: false,
title: title: (mobileLoginInfoListModel?.businessCardPrivilege ?? false)
(mobileLoginInfoListModel?.businessCardPrivilege ?? false) ? LocaleKeys.viewBusinessCard.tr().toText12(color: MyColors.textMixColor, isUnderLine: true).onPress(() {
? LocaleKeys.viewBusinessCard.tr().toText12(color: MyColors.textMixColor, isUnderLine: true).onPress(() { showMDialog(context, child: const BusinessCardDialog());
showMDialog(context, child: const BusinessCardDialog()); })
}) : Container(),
: Container(),
actions: [ actions: [
Center( Center(
child: LocaleKeys.employeeDigitalID.tr().toText12(color: MyColors.textMixColor, isUnderLine: true).onPress(() { child: LocaleKeys.employeeDigitalID.tr().toText12(color: MyColors.textMixColor, isUnderLine: true).onPress(() {
showMDialog(context, child: EmployeeDigitialIdDialog()); showMDialog(context, child: EmployeeDigitialIdDialog());
}), }),
@ -111,7 +112,7 @@ class _VerifyLastLoginScreenState extends State<VerifyLastLoginScreen> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [LocaleKeys.lastLoginDetails.tr().toText16(), DateUtil.formatDateToDate(DateUtil.convertStringToDate(mobileLoginInfoListModel!.editedOn!), false).toText12()], children: [LocaleKeys.lastLoginDetails.tr().toText16(), DateUtil.formatDateToDate(DateUtil.convertStringToDate(mobileLoginInfoListModel!.editedOn ?? DateTime.now().toString()), false).toText12()],
), ),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -206,18 +207,25 @@ class _VerifyLastLoginScreenState extends State<VerifyLastLoginScreen> {
} }
Future<bool> loginWithFaceIDAndBiometrics() async { Future<bool> loginWithFaceIDAndBiometrics() async {
IOSAuthMessages iosStrings = const IOSAuthMessages(
cancelButton: 'cancel', IOSAuthMessages iosStrings = const IOSAuthMessages(cancelButton: 'cancel', goToSettingsButton: 'settings', goToSettingsDescription: 'Please set up your Touch ID.', lockOut: 'Please reenable your Touch ID');
goToSettingsButton: 'settings',
goToSettingsDescription: 'Please set up your Touch ID.', // IOSAuthMessages iosStrings = const IOSAuthMessages(
lockOut: 'Please reenable your Touch ID', // cancelButton: 'cancel',
); // goToSettingsButton: 'settings',
// goToSettingsDescription: 'Please set up your Touch ID.',
// lockOut: 'Please reenable your Touch ID',
// );
bool authenticated = false; bool authenticated = false;
try { try {
authenticated = await auth.authenticate( authenticated = await auth.authenticate(localizedReason: 'Scan your fingerprint to authenticate', options: const AuthenticationOptions(
localizedReason: 'Scan your fingerprint to authenticate', useErrorDialogs: true, stickyAuth: true, biometricOnly: true,
options: const AuthenticationOptions(useErrorDialogs: true, stickyAuth: true, biometricOnly: true), ),
authMessages: [iosStrings, const AndroidAuthMessages()], authMessages: [
iosStrings,
const AndroidAuthMessages(),
],
); );
} on PlatformException catch (e) { } on PlatformException catch (e) {
print(e); print(e);
@ -228,48 +236,60 @@ class _VerifyLastLoginScreenState extends State<VerifyLastLoginScreen> {
} }
Widget _loginOptionButton(String _title, String _icon, int _flag, int? _loginIndex) { Widget _loginOptionButton(String _title, String _icon, int _flag, int? _loginIndex) {
bool isDisable = // <<<<<<< HEAD
(_flag == 3 && !checkBiometricIsAvailable(BiometricType.face) || bool isDisable = false;
_flag == 4 && !checkBiometricIsAvailable(BiometricType.fingerprint) && _flag == 4 && !checkBiometricIsAvailable(BiometricType.strong)); if(_flag >= 3 && _flag <= 4) {
bool isFaceEnabled = (_flag == 3 && (checkBiometricIsAvailable(BiometricType.face) ||
checkBiometricIsAvailable(BiometricType.weak)));
bool isThumbEnabled =
(_flag == 4 && (checkBiometricIsAvailable(BiometricType.fingerprint) ||
checkBiometricIsAvailable(BiometricType.strong)));
isDisable = !(isFaceEnabled || isThumbEnabled);
}
// =======
// bool isDisable = (_flag == 3 && !checkBiometricIsAvailable(BiometricType.face) ||
// _flag == 4 && !checkBiometricIsAvailable(BiometricType.fingerprint) && _flag == 4 && !checkBiometricIsAvailable(BiometricType.face));
// // >>>>>>> master
return InkWell( return InkWell(
onTap: onTap: isDisable
isDisable ? null
? null : () async {
: () async { if (_flag == 0) {
if (_flag == 0) { setState(() {
setState(() { // isMoreOption = true;
// isMoreOption = true; });
}); } else {
} else { if (_flag == 3 || _flag == 4) {
if (_flag == 3 || _flag == 4) { bool authenticateWithFaceAndTouchID = await loginWithFaceIDAndBiometrics();
bool authenticateWithFaceAndTouchID = await loginWithFaceIDAndBiometrics(); if (!authenticateWithFaceAndTouchID) {
if (!authenticateWithFaceAndTouchID) { return;
return; } else {
if (mobileLoginInfoListModel!.loginType == 3 || mobileLoginInfoListModel!.loginType == 4) {
// bool authenticateWithFaceAndTouchID = await loginWithFaceIDAndBiometrics();
// if (!authenticateWithFaceAndTouchID) {
// return;
// } else {
// performApiCall(_title, _icon, _flag, isDirectLogin: true);
// }
performApiCall(_title, _icon, _flag, _flag, isDirectLogin: true);
} else { } else {
if (mobileLoginInfoListModel!.loginType == 3 || mobileLoginInfoListModel!.loginType == 4) { isNeedVerifyWithFaceIDAndBiometrics = true;
// bool authenticateWithFaceAndTouchID = await loginWithFaceIDAndBiometrics(); selectedFlag = _flag;
// if (!authenticateWithFaceAndTouchID) { setState(() {
// return; return;
// } else { });
// performApiCall(_title, _icon, _flag, isDirectLogin: true);
// }
performApiCall(_title, _icon, _flag, _flag, isDirectLogin: true);
} else {
isNeedVerifyWithFaceIDAndBiometrics = true;
selectedFlag = _flag;
setState(() {
return;
});
}
} }
} else {
if (isNeedVerifyWithFaceIDAndBiometrics)
performApiCall(_title, _icon, selectedFlag, _flag);
else
performApiCall(_title, _icon, _flag, _flag);
} }
} else {
if (isNeedVerifyWithFaceIDAndBiometrics)
performApiCall(_title, _icon, selectedFlag, _flag);
else
performApiCall(_title, _icon, _flag, _flag);
} }
}, }
},
child: Container( child: Container(
padding: const EdgeInsets.only(left: 20, right: 20, bottom: 15, top: 28), padding: const EdgeInsets.only(left: 20, right: 20, bottom: 15, top: 28),
decoration: BoxDecoration( decoration: BoxDecoration(
@ -393,15 +413,15 @@ class _VerifyLastLoginScreenState extends State<VerifyLastLoginScreen> {
} }
} }
// //
// formatDate(date) { // formatDate(date) {
// return date; // return date;
// return DateFormat('MMM dd, yyy, kk:mm').format(date); // return DateFormat('MMM dd, yyy, kk:mm').format(date);
// } // }
// //
// showLoader(bool isTrue) { // showLoader(bool isTrue) {
// setState(() { // setState(() {
// // isLoading = isTrue; // // isLoading = isTrue;
// }); // });
// } // }
} }

@ -4,9 +4,9 @@ import 'package:easy_localization/src/public_ext.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:local_auth/local_auth.dart';
import 'package:local_auth_darwin/local_auth_darwin.dart'; import 'package:local_auth_darwin/local_auth_darwin.dart';
import 'package:local_auth_android/local_auth_android.dart'; import 'package:local_auth_android/local_auth_android.dart';
import 'package:local_auth/local_auth.dart';
import 'package:mohem_flutter_app/api/login_api_client.dart'; import 'package:mohem_flutter_app/api/login_api_client.dart';
import 'package:mohem_flutter_app/app_state/app_state.dart'; import 'package:mohem_flutter_app/app_state/app_state.dart';
import 'package:mohem_flutter_app/classes/colors.dart'; import 'package:mohem_flutter_app/classes/colors.dart';
@ -518,14 +518,11 @@ class _VerifyLoginScreenState extends State<VerifyLoginScreen> {
const IOSAuthMessages(cancelButton: 'cancel', goToSettingsButton: 'settings', goToSettingsDescription: 'Please set up your Touch ID.', lockOut: 'Please reenable your Touch ID'); const IOSAuthMessages(cancelButton: 'cancel', goToSettingsButton: 'settings', goToSettingsDescription: 'Please set up your Touch ID.', lockOut: 'Please reenable your Touch ID');
bool authenticated = false; bool authenticated = false;
try { try {
authenticated = await auth.authenticate( authenticated = await auth.authenticate(localizedReason: 'Scan your fingerprint to authenticate',
localizedReason: 'Scan your fingerprint to authenticate', options: const AuthenticationOptions(useErrorDialogs: true, stickyAuth: true, biometricOnly: true,), authMessages: [
options: const AuthenticationOptions( iosStrings,
useErrorDialogs: true, const AndroidAuthMessages(),
stickyAuth: true, ],);
biometricOnly: true,
),
authMessages: [iosStrings, const AndroidAuthMessages()]);
} on PlatformException catch (e) { } on PlatformException catch (e) {
print(e); print(e);
Utils.hideLoading(context); Utils.hideLoading(context);
@ -535,25 +532,17 @@ class _VerifyLoginScreenState extends State<VerifyLoginScreen> {
} }
Widget _loginOptionButton(String _title, String _icon, int _flag, int? _loginIndex) { Widget _loginOptionButton(String _title, String _icon, int _flag, int? _loginIndex) {
bool isDisable = (_flag == 3 && !checkBiometricIsAvailable(BiometricType.face) || bool isDisable = false;
_flag == 4 && !checkBiometricIsAvailable(BiometricType.fingerprint) && _flag == 4 && !checkBiometricIsAvailable(BiometricType.strong)); if(_flag >= 3 && _flag <= 4) {
// bool isDisable = false; bool isFaceEnabled = (_flag == 3 && (checkBiometricIsAvailable(BiometricType.face) ||
// switch (_flag) { checkBiometricIsAvailable(BiometricType.weak)));
// case 3:
// isDisable = !(checkBiometricIsAvailable(BiometricType.face) || bool isThumbEnabled =
// checkBiometricIsAvailable(BiometricType.weak)); (_flag == 4 && (checkBiometricIsAvailable(BiometricType.fingerprint) ||
// break; checkBiometricIsAvailable(BiometricType.strong)));
// case 4:
// isDisable = !(checkBiometricIsAvailable(BiometricType.fingerprint) || isDisable = !(isFaceEnabled || isThumbEnabled);
// checkBiometricIsAvailable(BiometricType.strong)); }
// break;
// }
// // bool isDisable = ((_flag == 3 &&
// // (!checkBiometricIsAvailable(BiometricType.face) ||
// // !checkBiometricIsAvailable(BiometricType.weak))) ||
// // (_flag == 4 &&
// // (!checkBiometricIsAvailable(BiometricType.fingerprint) ||
// // !checkBiometricIsAvailable(BiometricType.strong))));
return InkWell( return InkWell(
onTap: isDisable onTap: isDisable
? null ? null

@ -61,13 +61,7 @@ class _OffersAndDiscountsDetailsState extends State<OffersAndDiscountsDetails> {
// transitionOnUserGestures: true, // transitionOnUserGestures: true,
child: RepaintBoundary( child: RepaintBoundary(
key: _globalKey, key: _globalKey,
child: ClipRRect( child: ClipRRect(borderRadius: BorderRadius.circular(6), child: Image.network(getOffersList[0].bannerImage ?? "", fit: BoxFit.contain)).paddingAll(12),
borderRadius: BorderRadius.circular(6),
child: Image.network(
getOffersList[0].bannerImage ?? "",
fit: BoxFit.contain,
),
).paddingAll(12),
), ),
), ),
8.height, 8.height,
@ -87,19 +81,20 @@ class _OffersAndDiscountsDetailsState extends State<OffersAndDiscountsDetails> {
children: [ children: [
getOffersList[0].discountDescription!.toText16(isBold: true), getOffersList[0].discountDescription!.toText16(isBold: true),
InkWell( InkWell(
onTap: () { onTap: () {
_shareOfferAsImage(); _shareOfferAsImage();
}, },
child: const Icon(Icons.share, color: MyColors.darkIconColor).paddingOnly(bottom: 4)) child: const Icon(Icons.share, color: MyColors.darkIconColor).paddingOnly(bottom: 4),
),
], ],
).paddingOnly(left: 8, right: 8), ).paddingOnly(left: 8, right: 8),
getOffersList[0].isHasLocation == "true" getOffersList[0].isHasLocation == "true"
? InkWell( ? InkWell(
onTap: () {}, onTap: () {},
child: Row( child: Row(
children: [const Icon(Icons.map_sharp, color: MyColors.darkIconColor).paddingOnly(bottom: 4), "Offer Location".toText16(isUnderLine: true).paddingOnly(left: 8)], children: [const Icon(Icons.map_sharp, color: MyColors.darkIconColor).paddingOnly(bottom: 4), "Offer Location".toText16(isUnderLine: true).paddingOnly(left: 8)],
).paddingOnly(left: 8, right: 8, top: 8), ).paddingOnly(left: 8, right: 8, top: 8),
) )
: 12.height, : 12.height,
], ],
).objectContainerView().paddingOnly(left: 21, right: 21, top: 21), ).objectContainerView().paddingOnly(left: 21, right: 21, top: 21),
@ -134,11 +129,7 @@ class _OffersAndDiscountsDetailsState extends State<OffersAndDiscountsDetails> {
} }
void _scrollToTop() { void _scrollToTop() {
_scrollController.animateTo( _scrollController.animateTo(0, duration: const Duration(milliseconds: 500), curve: Curves.linear);
0,
duration: const Duration(milliseconds: 500),
curve: Curves.linear,
);
} }
List<Widget> getItemsForSaleWidgets() { List<Widget> getItemsForSaleWidgets() {
@ -157,16 +148,7 @@ class _OffersAndDiscountsDetailsState extends State<OffersAndDiscountsDetails> {
Hero( Hero(
tag: "ItemImage" + getOffersList.offersDiscountId.toString(), tag: "ItemImage" + getOffersList.offersDiscountId.toString(),
transitionOnUserGestures: true, transitionOnUserGestures: true,
child: AspectRatio( child: AspectRatio(aspectRatio: 148 / 127, child: ClipRRect(borderRadius: BorderRadius.circular(6), child: Image.network(getOffersList.bannerImage ?? "", fit: BoxFit.contain))),
aspectRatio: 148 / 127,
child: ClipRRect(
borderRadius: BorderRadius.circular(6),
child: Image.network(
getOffersList.bannerImage ?? "",
fit: BoxFit.contain,
),
),
),
), ),
5.height, 5.height,
getOffersList.titleEn!.toText16(isBold: true, color: const Color(0xff2B353E), maxlines: 1), getOffersList.titleEn!.toText16(isBold: true, color: const Color(0xff2B353E), maxlines: 1),
@ -180,10 +162,7 @@ class _OffersAndDiscountsDetailsState extends State<OffersAndDiscountsDetails> {
// 16.height, // 16.height,
getOffersList.discountDescription!.toText14(isBold: true, maxlines: 1), getOffersList.discountDescription!.toText14(isBold: true, maxlines: 1),
8.height, 8.height,
Row( Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [checkDate(getOffersList.endDate!), SvgPicture.asset("assets/images/arrow_next.svg").paddingOnly(bottom: 4)]),
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [checkDate(getOffersList.endDate!), SvgPicture.asset("assets/images/arrow_next.svg").paddingOnly(bottom: 4)],
),
], ],
).objectContainerView().onPress(() { ).objectContainerView().onPress(() {
this.getOffersList[0] = getOffersList; this.getOffersList[0] = getOffersList;

@ -39,7 +39,7 @@ class _OffersAndDiscountsHomeState extends State<OffersAndDiscountsHome> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.white,
appBar: AppBarWidget(context, title: LocaleKeys.offerAndDiscounts.tr(), showHomeButton: true), appBar: AppBarWidget(context, title: LocaleKeys.offerAndDiscounts.tr(), showHomeButton: true, showLogo: true, logoPath: "assets/icons/mazaya_brand.svg"),
body: SingleChildScrollView( body: SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,

@ -211,7 +211,7 @@ class _ItemHistoryScreenState extends State<ItemHistoryScreen> {
interval: 1, interval: 1,
getTitlesWidget: (double value, TitleMeta meta) { getTitlesWidget: (double value, TitleMeta meta) {
return SideTitleWidget( return SideTitleWidget(
meta: meta, axisSide: meta.axisSide,
child: Text(reversedList[int.parse(meta.formattedValue)].cREATIONDATE!, style: TextStyle(fontSize: 10)), child: Text(reversedList[int.parse(meta.formattedValue)].cREATIONDATE!, style: TextStyle(fontSize: 10)),
); );
})), })),
@ -222,7 +222,7 @@ class _ItemHistoryScreenState extends State<ItemHistoryScreen> {
interval: 1, interval: 1,
getTitlesWidget: (double value, TitleMeta meta) { getTitlesWidget: (double value, TitleMeta meta) {
return SideTitleWidget( return SideTitleWidget(
meta: meta, axisSide: meta.axisSide,
child: Text(meta.formattedValue, style: TextStyle(fontSize: 10)), child: Text(meta.formattedValue, style: TextStyle(fontSize: 10)),
); );
})), })),
@ -233,7 +233,7 @@ class _ItemHistoryScreenState extends State<ItemHistoryScreen> {
reservedSize: 15, reservedSize: 15,
getTitlesWidget: (double value, TitleMeta meta) { getTitlesWidget: (double value, TitleMeta meta) {
return SideTitleWidget( return SideTitleWidget(
meta: meta, axisSide: meta.axisSide,
child: Text("", style: TextStyle(fontSize: 10)), child: Text("", style: TextStyle(fontSize: 10)),
); );
})), })),

File diff suppressed because one or more lines are too long

@ -2,6 +2,7 @@ import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/app_state/app_state.dart'; import 'package:mohem_flutter_app/app_state/app_state.dart';
import 'package:mohem_flutter_app/classes/colors.dart'; import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/classes/date_uitl.dart';
import 'package:mohem_flutter_app/extensions/int_extensions.dart'; import 'package:mohem_flutter_app/extensions/int_extensions.dart';
import 'package:mohem_flutter_app/extensions/string_extensions.dart'; import 'package:mohem_flutter_app/extensions/string_extensions.dart';
import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
@ -28,7 +29,7 @@ class ApprovalLevelfragment extends StatelessWidget {
itemCount: wFHistory.length, itemCount: wFHistory.length,
padding: const EdgeInsets.all(21), padding: const EdgeInsets.all(21),
itemBuilder: (context, index) { itemBuilder: (context, index) {
return showItem(context, wFHistory[index]); return showItem(context, wFHistory[index], index);
}, },
separatorBuilder: (BuildContext context, int index) { separatorBuilder: (BuildContext context, int index) {
return 12.height; return 12.height;
@ -37,7 +38,7 @@ class ApprovalLevelfragment extends StatelessWidget {
); );
} }
Widget showItem(BuildContext context, WFHistory history) { Widget showItem(BuildContext context, WFHistory history, int index) {
return Container( return Container(
width: double.infinity, width: double.infinity,
decoration: BoxDecoration( decoration: BoxDecoration(
@ -89,7 +90,9 @@ class ApprovalLevelfragment extends StatelessWidget {
8.width, 8.width,
if (history.date!.isNotEmpty) history.date!.toText12(color: MyColors.lightTextColor), if (history.date!.isNotEmpty) history.date!.toText12(color: MyColors.lightTextColor),
], ],
) ),
10.height,
getActionDuration(index).toText11(maxLine: 1, color: const Color(0xff1FA269))
], ],
), ),
) )
@ -143,8 +146,34 @@ class ApprovalLevelfragment extends StatelessWidget {
); );
} }
String getActionDuration(int index) {
if (wFHistory[index].action!.toLowerCase() == "submit" || wFHistory[index].action!.toLowerCase() == "submitted") {
return "";
// DateTime dateTimeFrom = DateUtil.convertSimpleStringDateToDate(wFHistory[index].date!);
// Duration duration = DateTime.now().difference(dateTimeFrom);
// return "Action duration: " + DateUtil.formatDuration(duration);
} else if (wFHistory[index].employeeID == AppState().memberInformationList?.eMPLOYEENUMBER) {
if (wFHistory[index + 1].date!.isEmpty || wFHistory[index + 1].date! == "") {
return "";
} else {
DateTime dateTimeFrom = DateUtil.convertSimpleStringDateToDate(wFHistory[index + 1].date!, isITG: true);
Duration duration = DateTime.now().difference(dateTimeFrom);
return "Action duration: " + DateUtil.formatDuration(duration);
}
} else {
if (wFHistory[index].date!.isEmpty || wFHistory[index].action!.toLowerCase() == "NO ACTION" || wFHistory[index + 1].date! == "") {
return "";
} else {
DateTime dateTimeTo = DateUtil.convertSimpleStringDateToDate(wFHistory[index].date!);
DateTime dateTimeFrom = DateUtil.convertSimpleStringDateToDate(wFHistory[index + 1].date!);
Duration duration = dateTimeTo.difference(dateTimeFrom);
return "Action duration: " + DateUtil.formatDuration(duration);
}
}
}
Color getStatusColor(String code) { Color getStatusColor(String code) {
if (code.toLowerCase() == "submit") { if (code.toLowerCase() == "submit" || code.toLowerCase() == "submitted") {
return MyColors.grey3AColor; return MyColors.grey3AColor;
} else if (code.toLowerCase() == "pending") { } else if (code.toLowerCase() == "pending") {
return MyColors.yellowColor; return MyColors.yellowColor;
@ -152,7 +181,7 @@ class ApprovalLevelfragment extends StatelessWidget {
return MyColors.redColor; return MyColors.redColor;
} else if (code.toLowerCase() == "approved" || code.toLowerCase() == "auto-approve" || code.toLowerCase() == "auto-approved" || code.toLowerCase() == "doable" || code.toLowerCase() == "answer") { } else if (code.toLowerCase() == "approved" || code.toLowerCase() == "auto-approve" || code.toLowerCase() == "auto-approved" || code.toLowerCase() == "doable" || code.toLowerCase() == "answer") {
return MyColors.greenColor; return MyColors.greenColor;
} else if (code.toLowerCase() == "requested information" || code.toLowerCase() == "assign" || code.toLowerCase() == "reassign") { } else if (code.toLowerCase() == "requested information" || code.toLowerCase() == "request information" || code.toLowerCase() == "assign" || code.toLowerCase() == "reassign") {
return MyColors.orange; return MyColors.orange;
} else { } else {
return MyColors.whiteColor; return MyColors.whiteColor;

File diff suppressed because one or more lines are too long

@ -1,4 +1,5 @@
import 'dart:collection'; import 'dart:collection';
import 'dart:convert';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -32,8 +33,16 @@ class DelegateSheet extends StatefulWidget {
VoidCallback callBackFunc; VoidCallback callBackFunc;
List<NotificationGetRespondAttributesList> getNotificationRespondAttributes; List<NotificationGetRespondAttributesList> getNotificationRespondAttributes;
DelegateSheet( DelegateSheet({
{required this.title, required this.apiMode, this.notificationID, this.actionHistoryList, this.wFHistory, required this.callBackFunc, this.getNotificationRespondAttributes = const []}); super.key,
required this.title,
required this.apiMode,
this.notificationID,
this.actionHistoryList,
this.wFHistory,
required this.callBackFunc,
this.getNotificationRespondAttributes = const <NotificationGetRespondAttributesList>[],
});
@override @override
State<DelegateSheet> createState() => _DelegateSheetState(); State<DelegateSheet> createState() => _DelegateSheetState();
@ -46,8 +55,8 @@ class _DelegateSheetState extends State<DelegateSheet> {
String? selectedFavLetter; String? selectedFavLetter;
String selectedType = "Workflow"; String selectedType = "Workflow";
String inputRes = ""; String inputRes = "";
List<String>? favLetters;
List<GetFavoriteReplacements>? favUsersList; List<GetFavoriteReplacements>? favUsersList;
List<GetFavoriteReplacements>? filteredFavUsersList = <GetFavoriteReplacements>[];
List<ReplacementList>? replacementList; List<ReplacementList>? replacementList;
bool isImageLoaded = false; bool isImageLoaded = false;
@ -57,14 +66,14 @@ class _DelegateSheetState extends State<DelegateSheet> {
super.initState(); super.initState();
if (widget.wFHistory != null) { if (widget.wFHistory != null) {
widget.wFHistory = widget.wFHistory!.reversed.toList(); widget.wFHistory = widget.wFHistory!.reversed.toList();
var ids = widget.wFHistory!.map((e) => e.employeeID).toSet(); Set<String?> ids = widget.wFHistory!.map((WFHistory e) => e.employeeID).toSet();
widget.wFHistory!.retainWhere((x) => ids.remove(x.employeeID)); widget.wFHistory!.retainWhere((WFHistory x) => ids.remove(x.employeeID));
} }
if (widget.actionHistoryList != null) { if (widget.actionHistoryList != null) {
widget.actionHistoryList = widget.actionHistoryList!.reversed.toList(); widget.actionHistoryList = widget.actionHistoryList!.reversed.toList();
var ids = widget.actionHistoryList!.map((e) => e.uSERNAME).toSet(); Set<String?> ids = widget.actionHistoryList!.map((GetActionHistoryList e) => e.uSERNAME).toSet();
widget.actionHistoryList!.retainWhere((x) => ids.remove(x.uSERNAME)); widget.actionHistoryList!.retainWhere((GetActionHistoryList x) => ids.remove(x.uSERNAME));
} }
} }
@ -73,36 +82,96 @@ class _DelegateSheetState extends State<DelegateSheet> {
super.dispose(); super.dispose();
} }
Future fetchFavLetters({bool isNeedLoading = true}) async { Future<void> fetchFavUsers({bool isNeedLoading = true}) async {
favLetters = []; favUsersList = <GetFavoriteReplacements>[];
filteredFavUsersList = <GetFavoriteReplacements>[];
if (isNeedLoading) Utils.showLoading(context); if (isNeedLoading) Utils.showLoading(context);
List<GetFavoriteReplacements>? favList = await WorkListApiClient().getFavoriteReplacementWithoutImage();
List<String> result = []; try {
favList!.forEach((element) { List<GetFavoriteReplacements>? favList = await WorkListApiClient().getFavoriteReplacementWithoutImage();
result.add(element.employeeDisplayName![0]); favUsersList = favList;
});
favLetters = LinkedHashSet<String>.from(result).toList(); if (favUsersList != null && favUsersList!.isNotEmpty) {
if (isNeedLoading) Utils.hideLoading(context); favUsersList!.sort((GetFavoriteReplacements a, GetFavoriteReplacements b) => (a.employeeDisplayName ?? '').toLowerCase().compareTo((b.employeeDisplayName ?? '').toLowerCase()));
setState(() { filteredFavUsersList = favUsersList;
favLetters!.sort((a, b) {
return a.toLowerCase().compareTo(b.toLowerCase()); if (isNeedLoading) Utils.hideLoading(context);
}); setState(() {});
}); _fetchAndAttachUserImages();
return null; } else {
if (isNeedLoading) Utils.hideLoading(context);
setState(() {});
}
} catch (e) {
if (isNeedLoading) Utils.hideLoading(context);
setState(() {});
}
} }
Future fetchFavUsersList({bool isNeedLoading = true}) async { Future<void> _fetchAndAttachUserImages() async {
if (isNeedLoading) Utils.showLoading(context); try {
favUsersList = await WorkListApiClient().getFavoriteReplacementWithImage(selectedFavLetter ?? ""); List<GetFavoriteReplacements>? tempList = await WorkListApiClient().getFavoriteReplacementWithImageNew("");
if (isNeedLoading) Utils.hideLoading(context);
setState(() {}); if (tempList != null && tempList.isNotEmpty && favUsersList != null) {
fetchFavUsersListNew(isNeedLoading: false); for (GetFavoriteReplacements element in favUsersList!) {
return null; for (GetFavoriteReplacements element2 in tempList) {
if (element.userName == element2.userName && element2.employeeImage != null && element2.employeeImage!.isNotEmpty) {
element.employeeImage = element2.employeeImage;
}
}
}
filteredFavUsersList = favUsersList;
setState(() {});
}
} catch (e) {}
} }
// Future<void> fetchFavUsers({bool isNeedLoading = true}) async {
// favUsersList = <GetFavoriteReplacements>[];
// if (isNeedLoading) Utils.showLoading(context);
//
// try {
// List<GetFavoriteReplacements>? favList = await WorkListApiClient().getFavoriteReplacementWithoutImage();
// favUsersList = favList;
//
// if (favUsersList != null && favUsersList!.isNotEmpty) {
// setState(() {
// favUsersList!.sort((GetFavoriteReplacements a, GetFavoriteReplacements b) => (a.employeeDisplayName ?? '').toLowerCase().compareTo((b.employeeDisplayName ?? '').toLowerCase()));
// });
// if (isNeedLoading) Utils.hideLoading(context);
//
// List<GetFavoriteReplacements>? tempList = await WorkListApiClient().getFavoriteReplacementWithImageNew("");
// if (tempList != null && tempList.isNotEmpty) {
// for (GetFavoriteReplacements element in favUsersList!) {
// for (GetFavoriteReplacements element2 in tempList) {
// if (element.userName == element2.userName) {
// if (element2.employeeImage != null && element2.employeeImage!.isNotEmpty) {
// element.employeeImage = element2.employeeImage;
// }
// }
// }
// }
// setState(() {});
// }
// }
// } catch (e) {
// // if (isNeedLoading) Utils.hideLoading(context);
// }
// }
// Future fetchFavUsersList({bool isNeedLoading = true}) async {
// if (isNeedLoading) Utils.showLoading(context);
// favUsersList = await WorkListApiClient().getFavoriteReplacementWithImage(selectedFavLetter ?? "");
// if (isNeedLoading) Utils.hideLoading(context);
// setState(() {});
// fetchFavUsersListNew(isNeedLoading: false);
// return null;
// }
Future fetchFavUsersListNew({bool isNeedLoading = true}) async { Future fetchFavUsersListNew({bool isNeedLoading = true}) async {
if (isNeedLoading) Utils.showLoading(context); if (isNeedLoading) Utils.showLoading(context);
favUsersList = await WorkListApiClient().getFavoriteReplacementWithImageNew(selectedFavLetter ?? ""); filteredFavUsersList = await WorkListApiClient().getFavoriteReplacementWithImageNew(selectedFavLetter ?? "");
if (isNeedLoading) Utils.hideLoading(context); if (isNeedLoading) Utils.hideLoading(context);
setState(() { setState(() {
isImageLoaded = true; isImageLoaded = true;
@ -112,18 +181,10 @@ class _DelegateSheetState extends State<DelegateSheet> {
void fetchChangeFav({required String email, required String employeName, required String image, required String userName, bool isFav = false, bool isNeedToRefresh = false}) async { void fetchChangeFav({required String email, required String employeName, required String image, required String userName, bool isFav = false, bool isNeedToRefresh = false}) async {
Utils.showLoading(context); Utils.showLoading(context);
favLetters = null; GenericResponseModel model = await WorkListApiClient().changeFavoriteReplacements(email: email, employeName: employeName, image: image, userName: userName, isFav: isFav);
selectedFavLetter = null;
GenericResponseModel model = await WorkListApiClient().changeFavoriteReplacements(
email: email,
employeName: employeName,
image: image,
userName: userName,
isFav: isFav,
);
if (isNeedToRefresh) { if (isNeedToRefresh) {
await fetchFavLetters(isNeedLoading: false); await fetchFavUsers(isNeedLoading: false);
if (favLetters != null) await fetchFavUsersList(isNeedLoading: false); // if (favUsersList != null) await fetchFavUsersList(isNeedLoading: false);
} }
Utils.hideLoading(context); Utils.hideLoading(context);
@ -137,44 +198,58 @@ class _DelegateSheetState extends State<DelegateSheet> {
userName: selectedType == "Employee Name" ? inputRes : "", userName: selectedType == "Employee Name" ? inputRes : "",
email: selectedType == "Employee Email" ? inputRes : "", email: selectedType == "Employee Email" ? inputRes : "",
); );
if (isNeedLoading) Utils.hideLoading(context); if (isNeedLoading) Utils.hideLoading(context);
setState(() {}); setState(() {});
return null; return null;
} }
Future<void> searchFavUser() async {
if (favUsersList != null && favUsersList!.isNotEmpty) {
// if (inputRes.length > 0) {
filteredFavUsersList =
favUsersList!.where((GetFavoriteReplacements element) {
String query = inputRes.toLowerCase();
return (element.employeeDisplayName != null && element.employeeDisplayName!.toLowerCase().startsWith(query)) ||
(element.userName != null && element.userName!.toLowerCase().contains(query)) ||
(element.emailAddress != null && element.emailAddress!.toLowerCase().contains(query));
}).toList();
// } else {
// filteredFavUsersList = favUsersList;
// }
} else {
filteredFavUsersList = <GetFavoriteReplacements>[];
}
setState(() {});
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return SizedBox(
width: double.infinity, width: double.infinity,
height: MediaQuery.of(context).size.height - 80, height: MediaQuery.of(context).size.height - 80,
child: Column( child: Column(
children: [ children: <Widget>[
Expanded( Expanded(
child: SingleChildScrollView( child: SingleChildScrollView(
child: Padding( child: Padding(
padding: const EdgeInsets.all(21), padding: const EdgeInsets.all(21),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: <Widget>[
widget.title.toText24(isBold: true), widget.title.toText24(isBold: true),
21.height, 21.height,
LocaleKeys.search.tr().toText16(), LocaleKeys.search.tr().toText16(),
11.height, 11.height,
Column( Column(
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: <Widget>[
Container( Container(
padding: EdgeInsets.only(left: 8, right: 4, top: 6, bottom: 6), padding: const EdgeInsets.only(left: 8, right: 4, top: 6, bottom: 6),
decoration: BoxDecoration( decoration: BoxDecoration(borderRadius: BorderRadius.circular(15), color: Colors.transparent, border: Border.all(color: const Color(0xffefefef), width: 1)),
borderRadius: BorderRadius.circular(15),
color: Colors.transparent,
border: Border.all(
color: Color(0xffefefef),
width: 1,
),
),
child: Row( child: Row(
children: [ children: <Widget>[
Expanded( Expanded(
child: InputWidget( child: InputWidget(
"Search By " + selectedType, "Search By " + selectedType,
@ -185,29 +260,18 @@ class _DelegateSheetState extends State<DelegateSheet> {
verticalPadding: 3, verticalPadding: 3,
isInputTypeNum: selectedType == "Employee ID" ? true : false, isInputTypeNum: selectedType == "Employee ID" ? true : false,
isEnable: isNeedEnableTextField, isEnable: isNeedEnableTextField,
onChange: (v) { onChange: (String v) {
inputRes = v; inputRes = v;
if (selectedType == "Favorites") {
searchFavUser();
}
}, },
), ),
), ),
Container(height: 36, width: 1, color: const Color(0xffE5E5E5)),
Container( Container(
height: 36, padding: const EdgeInsets.all(8),
width: 1, child: Row(children: <Widget>[selectedType.toText12(), 4.width, const Icon(Icons.keyboard_arrow_down, color: Colors.black, size: 16)]),
color: Color(0xffE5E5E5),
),
Container(
padding: EdgeInsets.all(8),
child: Row(
children: [
selectedType.toText12(),
4.width,
const Icon(
Icons.keyboard_arrow_down,
color: Colors.black,
size: 16,
),
],
),
).onPress(() { ).onPress(() {
showMyBottomSheet( showMyBottomSheet(
context, context,
@ -219,19 +283,17 @@ class _DelegateSheetState extends State<DelegateSheet> {
if (value == "Workflow") { if (value == "Workflow") {
setState(() { setState(() {
isNeedEnableTextField = false; isNeedEnableTextField = false;
selectedFavLetter = null; // selectedFavLetter = null;
favLetters = null; filteredFavUsersList = null;
favUsersList = null;
}); });
} else if (value == "Favorites") { } else if (value == "Favorites") {
isNeedEnableTextField = false; isNeedEnableTextField = true;
fetchFavLetters(); fetchFavUsers();
} else { } else {
setState(() { setState(() {
isNeedEnableTextField = true; isNeedEnableTextField = true;
selectedFavLetter = null; // selectedFavLetter = null;
favLetters = null; filteredFavUsersList = null;
favUsersList = null;
}); });
} }
}, },
@ -241,143 +303,105 @@ class _DelegateSheetState extends State<DelegateSheet> {
], ],
), ),
), ),
if (isNeedEnableTextField) if (isNeedEnableTextField && selectedType != "Favorites")
TextButton( TextButton(
onPressed: () { onPressed: () {
fetchUserByInput(); fetchUserByInput();
}, },
child: const Text( child: const Text("Search", style: TextStyle(color: Colors.blue, decoration: TextDecoration.underline)),
"Search", ),
style: TextStyle(
color: Colors.blue,
decoration: TextDecoration.underline,
),
),
)
], ],
), ),
if (!isNeedEnableTextField) 12.height, if (!isNeedEnableTextField) 12.height,
Row( Row(
children: [ children: <Widget>[
Expanded( Expanded(
child: Container( child: SizedBox(
width: double.infinity, width: double.infinity,
child: selectedFavLetter == null && favLetters != null child:
? Container( // selectedFavLetter == null && favLetters != null
width: double.infinity, // ? Container(width: double.infinity, alignment: Alignment.center, child: "Please select letter to see Fav results".toText12())
alignment: Alignment.center, // :
child: "Please select letter to see Fav results".toText12(), filteredFavUsersList != null && selectedType == "Favorites"
)
: favUsersList != null
? ListView.separated( ? ListView.separated(
itemBuilder: (context, index) { itemBuilder: (BuildContext context, int index) {
return showFavUserItem(favUsersList![index]); return showFavUserItem(filteredFavUsersList![index]);
}, },
separatorBuilder: (context, index) { separatorBuilder: (BuildContext context, int index) {
return Container( return Container(color: MyColors.borderColor, width: double.infinity, height: 1, margin: const EdgeInsets.only(top: 8, bottom: 8)).onPress(() {});
color: MyColors.borderColor, },
width: double.infinity, physics: const NeverScrollableScrollPhysics(),
height: 1, shrinkWrap: true,
margin: EdgeInsets.only(top: 8, bottom: 8), itemCount: filteredFavUsersList!.length,
).onPress(() {}); padding: const EdgeInsets.only(top: 8, bottom: 8),
}, )
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemCount: favUsersList!.length,
padding: EdgeInsets.only(top: 8, bottom: 8),
)
: isNeedEnableTextField && replacementList == null : isNeedEnableTextField && replacementList == null
? Container( ? Container(width: double.infinity, alignment: Alignment.center, child: "Search User".toText12())
width: double.infinity, : isNeedEnableTextField && replacementList!.isEmpty
alignment: Alignment.center, ? Container(width: double.infinity, alignment: Alignment.center, child: "No Data Found".toText12())
child: "Search User".toText12(), : isNeedEnableTextField
) ? ListView.separated(
: isNeedEnableTextField && replacementList!.length == 0 itemBuilder: (BuildContext context, int index) {
? Container( return showInputUserItem(replacementList![index]);
width: double.infinity, },
alignment: Alignment.center, separatorBuilder: (BuildContext context, int index) {
child: "No Data Found".toText12(), return Container(color: MyColors.borderE3Color, width: double.infinity, height: 1, margin: const EdgeInsets.only(top: 8, bottom: 8));
) },
: isNeedEnableTextField physics: const NeverScrollableScrollPhysics(),
? ListView.separated( shrinkWrap: true,
itemBuilder: (context, index) { itemCount: replacementList!.length,
return showInputUserItem(replacementList![index]); padding: const EdgeInsets.only(top: 8, bottom: 8),
}, )
separatorBuilder: (context, index) { : (widget.wFHistory != null
return Container( ? ListView.separated(
color: MyColors.borderE3Color, itemBuilder: (BuildContext context, int index) {
width: double.infinity, return showItgItem(widget.wFHistory![index]);
height: 1, },
margin: EdgeInsets.only(top: 8, bottom: 8), separatorBuilder: (BuildContext context, int index) {
); return Container(color: MyColors.borderE3Color, width: double.infinity, height: 1, margin: const EdgeInsets.only(top: 8, bottom: 8));
}, },
physics: NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true, shrinkWrap: true,
itemCount: replacementList!.length, itemCount: widget.wFHistory!.length,
padding: EdgeInsets.only(top: 8, bottom: 8), padding: const EdgeInsets.only(top: 8, bottom: 8),
) )
: (widget.wFHistory != null : ListView.separated(
? ListView.separated( itemBuilder: (BuildContext context, int index) {
itemBuilder: (context, index) { return showItem(widget.actionHistoryList![index]);
return showItgItem(widget.wFHistory![index]); },
}, separatorBuilder: (BuildContext context, int index) {
separatorBuilder: (context, index) { return Container(color: MyColors.borderE3Color, width: double.infinity, height: 1, margin: const EdgeInsets.only(top: 8, bottom: 8));
return Container( },
color: MyColors.borderE3Color, physics: const NeverScrollableScrollPhysics(),
width: double.infinity, shrinkWrap: true,
height: 1, itemCount: widget.actionHistoryList!.length,
margin: EdgeInsets.only(top: 8, bottom: 8), padding: const EdgeInsets.only(top: 8, bottom: 8),
); )),
},
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemCount: widget.wFHistory!.length,
padding: EdgeInsets.only(top: 8, bottom: 8),
)
: ListView.separated(
itemBuilder: (context, index) {
return showItem(widget.actionHistoryList![index]);
},
separatorBuilder: (context, index) {
return Container(
color: MyColors.borderE3Color,
width: double.infinity,
height: 1,
margin: EdgeInsets.only(top: 8, bottom: 8),
);
},
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemCount: widget.actionHistoryList!.length,
padding: EdgeInsets.only(top: 8, bottom: 8),
)),
), ),
), ),
if (favLetters != null) // if (favLetters != null)
Container( // SizedBox(
width: 30, // width: 30,
// color: Colors.red, // // color: Colors.red,
child: ListView.separated( // child: ListView.separated(
itemBuilder: (context, index) { // itemBuilder: (BuildContext context, int index) {
return Container( // return Container(
padding: EdgeInsets.all(8), // padding: const EdgeInsets.all(8),
alignment: Alignment.center, // alignment: Alignment.center,
child: favLetters![index].toText14(color: selectedFavLetter == favLetters![index] ? MyColors.gradiantStartColor : Colors.black), // child: favLetters![index].toText14(color: selectedFavLetter == favLetters![index] ? MyColors.gradiantStartColor : Colors.black),
).onPress(() { // ).onPress(() {
selectedFavLetter = favLetters![index].toUpperCase(); // selectedFavLetter = favLetters![index].toUpperCase();
fetchFavUsersList(); // fetchFavUsersList();
}); // });
}, // },
separatorBuilder: (context, index) { // separatorBuilder: (BuildContext context, int index) {
return SizedBox( // return const SizedBox(height: 0);
height: 0, // },
); // physics: const NeverScrollableScrollPhysics(),
}, // shrinkWrap: true,
physics: NeverScrollableScrollPhysics(), // itemCount: favLetters!.length,
shrinkWrap: true, // ),
itemCount: favLetters!.length, // ),
),
),
], ],
), ),
], ],
@ -385,22 +409,15 @@ class _DelegateSheetState extends State<DelegateSheet> {
), ),
), ),
), ),
Container( Container(width: double.infinity, height: 1, color: MyColors.borderColor),
width: double.infinity,
height: 1,
color: MyColors.borderColor,
),
DefaultButton( DefaultButton(
"Cancel", "Cancel",
() { () {
Navigator.pop(context); Navigator.pop(context);
}, },
textColor: Colors.black, textColor: Colors.black,
colors: [ colors: const <Color>[Color(0xffE6E6E6), Color(0xffE6E6E6)],
Color(0xffE6E6E6), ).insideContainer,
Color(0xffE6E6E6),
],
).insideContainer
], ],
), ),
); );
@ -410,25 +427,22 @@ class _DelegateSheetState extends State<DelegateSheet> {
return InkWell( return InkWell(
onTap: () { onTap: () {
Navigator.pop(context); Navigator.pop(context);
showMyBottomSheet(context, showMyBottomSheet(
callBackFunc: widget.callBackFunc, context,
child: SelectedItemSheet( callBackFunc: widget.callBackFunc,
"Comment", child: SelectedItemSheet(
apiMode: widget.apiMode, "Comment",
actionHistoryList: actionHistory, apiMode: widget.apiMode,
notificationID: widget.notificationID, actionHistoryList: actionHistory,
isITGRequest: widget.wFHistory != null, notificationID: widget.notificationID,
getNotificationRespondAttributes: widget.getNotificationRespondAttributes, isITGRequest: widget.wFHistory != null,
)); getNotificationRespondAttributes: widget.getNotificationRespondAttributes,
),
);
}, },
child: Row( child: Row(
children: [ children: <Widget>[
CircularAvatar( CircularAvatar(url: actionHistory.eMPLOYEEIMAGE ?? "", height: 30, width: 30, isImageBase64: true),
url: actionHistory.eMPLOYEEIMAGE ?? "",
height: 30,
width: 30,
isImageBase64: true,
),
9.width, 9.width,
(actionHistory.nAME ?? "").toText12().expanded, (actionHistory.nAME ?? "").toText12().expanded,
IconButton( IconButton(
@ -444,12 +458,8 @@ class _DelegateSheetState extends State<DelegateSheet> {
isFav: true, isFav: true,
); );
}, },
icon: Icon( icon: Icon(Icons.star, size: 16, color: (actionHistory.isFavorite ?? false) ? MyColors.yellowColor : MyColors.borderColor),
Icons.star, ),
size: 16,
color: (actionHistory.isFavorite ?? false) ? MyColors.yellowColor : MyColors.borderColor,
),
)
], ],
), ),
); );
@ -459,25 +469,18 @@ class _DelegateSheetState extends State<DelegateSheet> {
return InkWell( return InkWell(
onTap: () { onTap: () {
Navigator.pop(context); Navigator.pop(context);
showMyBottomSheet(context, showMyBottomSheet(
callBackFunc: widget.callBackFunc, context,
child: SelectedItgItemSheet( callBackFunc: widget.callBackFunc,
"Comment", child: SelectedItgItemSheet(
apiMode: widget.apiMode, "Comment",
wfHistory: wfHistory, apiMode: widget.apiMode,
// notificationID: widget.notificationID, wfHistory: wfHistory,
)); // notificationID: widget.notificationID,
},
child: Row(
children: [
CircularAvatar(
height: 30,
width: 30,
), ),
9.width, );
(wfHistory.name ?? "").toText12().expanded, },
], child: Row(children: <Widget>[CircularAvatar(height: 30, width: 30), 9.width, (wfHistory.name ?? "").toText12().expanded]),
),
); );
} }
@ -485,47 +488,31 @@ class _DelegateSheetState extends State<DelegateSheet> {
return InkWell( return InkWell(
onTap: () { onTap: () {
Navigator.pop(context); Navigator.pop(context);
showMyBottomSheet(context, showMyBottomSheet(
callBackFunc: widget.callBackFunc, context,
child: SelectedItemSheet( callBackFunc: widget.callBackFunc,
"Comment", child: SelectedItemSheet(
apiMode: widget.apiMode, "Comment",
favoriteReplacements: actionHistory, apiMode: widget.apiMode,
notificationID: widget.notificationID, favoriteReplacements: actionHistory,
isITGRequest: widget.wFHistory != null, notificationID: widget.notificationID,
getNotificationRespondAttributes: widget.getNotificationRespondAttributes, isITGRequest: widget.wFHistory != null,
)); getNotificationRespondAttributes: widget.getNotificationRespondAttributes,
),
);
}, },
child: Row( child: Row(
children: [ children: <Widget>[
actionHistory.employeeImage != "" actionHistory.employeeImage != "" && actionHistory.employeeImage != null
? CircularAvatar( ? CircularAvatar(url: actionHistory.employeeImage, height: 40, width: 40, isImageBase64: (actionHistory.employeeImage != null || actionHistory.employeeImage!.isNotEmpty) ? true : false)
url: actionHistory.employeeImage,
height: 40,
width: 40,
isImageBase64: (actionHistory.employeeImage != null || actionHistory.employeeImage!.isNotEmpty) ? true : false,
)
: isImageLoaded : isImageLoaded
? CircularAvatar( ? CircularAvatar(height: 40, width: 40, isImageBase64: false)
height: 40, : ClipRRect(
width: 40, borderRadius: const BorderRadius.all(Radius.circular(50)),
isImageBase64: false, child: Image.network("https://play-lh.googleusercontent.com/NPo88ojmhah4HDiposucJmfQIop4z4xc8kqJK9ITO9o-yCab2zxIp7PPB_XPj2iUojo", fit: BoxFit.cover, height: 40, width: 40).toShimmer(),
) ),
: ClipRRect(
borderRadius: const BorderRadius.all(
Radius.circular(50),
),
child: Image.network(
"https://play-lh.googleusercontent.com/NPo88ojmhah4HDiposucJmfQIop4z4xc8kqJK9ITO9o-yCab2zxIp7PPB_XPj2iUojo",
fit: BoxFit.cover,
height: 40,
width: 40,
).toShimmer(),
),
16.width, 16.width,
Expanded( Expanded(child: (actionHistory.employeeDisplayName ?? "").toText12()),
child: (actionHistory.employeeDisplayName ?? "").toText12(),
),
IconButton( IconButton(
onPressed: () { onPressed: () {
fetchChangeFav( fetchChangeFav(
@ -537,12 +524,8 @@ class _DelegateSheetState extends State<DelegateSheet> {
isNeedToRefresh: true, isNeedToRefresh: true,
); );
}, },
icon: Icon( icon: const Icon(Icons.star, size: 16, color: MyColors.yellowColor),
Icons.star, ),
size: 16,
color: MyColors.yellowColor,
),
)
], ],
), ),
); );
@ -552,29 +535,24 @@ class _DelegateSheetState extends State<DelegateSheet> {
return InkWell( return InkWell(
onTap: () { onTap: () {
Navigator.pop(context); Navigator.pop(context);
showMyBottomSheet(context, showMyBottomSheet(
callBackFunc: widget.callBackFunc, context,
child: SelectedItemSheet( callBackFunc: widget.callBackFunc,
LocaleKeys.comments.tr(), child: SelectedItemSheet(
apiMode: widget.apiMode, LocaleKeys.comments.tr(),
replacementList: actionHistory, apiMode: widget.apiMode,
notificationID: widget.notificationID, replacementList: actionHistory,
isITGRequest: widget.wFHistory != null, notificationID: widget.notificationID,
getNotificationRespondAttributes: widget.getNotificationRespondAttributes, isITGRequest: widget.wFHistory != null,
)); getNotificationRespondAttributes: widget.getNotificationRespondAttributes,
),
);
}, },
child: Row( child: Row(
children: [ children: <Widget>[
CircularAvatar( CircularAvatar(url: actionHistory.employeeImage, height: 30, width: 30, isImageBase64: actionHistory.employeeImage != null ? true : false),
url: actionHistory.employeeImage,
height: 30,
width: 30,
isImageBase64: actionHistory.employeeImage != null ? true : false,
),
16.width, 16.width,
Expanded( Expanded(child: (actionHistory.employeeDisplayName ?? "").toText12()),
child: (actionHistory.employeeDisplayName ?? "").toText12(),
),
IconButton( IconButton(
onPressed: () { onPressed: () {
actionHistory.isFavorite = !(actionHistory.isFavorite ?? false); actionHistory.isFavorite = !(actionHistory.isFavorite ?? false);
@ -587,12 +565,8 @@ class _DelegateSheetState extends State<DelegateSheet> {
isNeedToRefresh: false, isNeedToRefresh: false,
); );
}, },
icon: Icon( icon: Icon(Icons.star, size: 16, color: (actionHistory.isFavorite ?? false) ? MyColors.yellowColor : MyColors.borderColor),
Icons.star, ),
size: 16,
color: (actionHistory.isFavorite ?? false) ? MyColors.yellowColor : MyColors.borderColor,
),
)
], ],
), ),
); );

@ -61,6 +61,7 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
int animationIndex = 0; int animationIndex = 0;
PageController controller = PageController(); PageController controller = PageController();
bool showFabOptions = false; bool showFabOptions = false;
bool isShowActions = false;
WorkListResponseModel? workListData; WorkListResponseModel? workListData;
MemberInformationListModel? memberInformationListModel; MemberInformationListModel? memberInformationListModel;
@ -144,7 +145,7 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
getEitNotificationBody(); getEitNotificationBody();
} else if (workListData!.rEQUESTTYPE == "CEI") { } else if (workListData!.rEQUESTTYPE == "CEI") {
getCEINotificationBody(); getCEINotificationBody();
}else if (workListData!.rEQUESTTYPE == "PHONE_NUMBERS") { } else if (workListData!.rEQUESTTYPE == "PHONE_NUMBERS") {
getPhonesNotificationBody(); getPhonesNotificationBody();
} else if (workListData!.rEQUESTTYPE == "BASIC_DETAILS") { } else if (workListData!.rEQUESTTYPE == "BASIC_DETAILS") {
getBasicDetNtfBody(); getBasicDetNtfBody();
@ -286,6 +287,7 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
: ActionsFragment( : ActionsFragment(
workListData!.nOTIFICATIONID, workListData!.nOTIFICATIONID,
actionHistoryList, actionHistoryList,
isShowActions,
voidCallback: reloadWorkList, voidCallback: reloadWorkList,
) )
: showLoadingAnimation(), : showLoadingAnimation(),
@ -297,50 +299,52 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
], ],
).expanded, ).expanded,
if (isApproveAvailable || isRejectAvailable || isCloseAvailable) if (isApproveAvailable || isRejectAvailable || isCloseAvailable)
Container( SafeArea(
padding: const EdgeInsets.only(top: 14, bottom: 14, left: 21, right: 21), child: Container(
decoration: const BoxDecoration( padding: const EdgeInsets.only(top: 14, bottom: 14, left: 21, right: 21),
color: Colors.white, decoration: const BoxDecoration(
border: Border( color: Colors.white,
top: BorderSide(color: MyColors.lightGreyEFColor, width: 1.0), border: Border(
top: BorderSide(color: MyColors.lightGreyEFColor, width: 1.0),
),
),
child: Row(
children: [
if (isRejectAvailable)
DefaultButton(
LocaleKeys.reject.tr(),
() => performAction(rejectAction),
colors: const [Color(0xffE47A7E), Color(0xffDE6D71)],
).expanded,
if (isApproveAvailable && isRejectAvailable) 8.width,
if (isApproveAvailable)
DefaultButton(
LocaleKeys.approve.tr(),
() => performAction(approveAction),
colors: const [Color(0xff28C884), Color(0xff1BB271)],
).expanded,
if (isCloseAvailable)
DefaultButton(
LocaleKeys.ok.tr(),
() => performAction("CLOSE"),
colors: const [Color(0xff32D892), Color(0xff1AB170)],
).expanded,
8.width,
Container(
height: 43,
width: 43,
decoration: const BoxDecoration(
shape: BoxShape.circle,
color: MyColors.lightGreyE6Color,
),
child: Icon(showFabOptions ? Icons.more_vert_rounded : Icons.more_horiz_rounded, color: MyColors.darkIconColor),
).onPress(() {
setState(() {
showFabOptions = true;
});
})
],
), ),
),
child: Row(
children: [
if (isRejectAvailable)
DefaultButton(
LocaleKeys.reject.tr(),
() => performAction(rejectAction),
colors: const [Color(0xffE47A7E), Color(0xffDE6D71)],
).expanded,
if (isApproveAvailable && isRejectAvailable) 8.width,
if (isApproveAvailable)
DefaultButton(
LocaleKeys.approve.tr(),
() => performAction(approveAction),
colors: const [Color(0xff28C884), Color(0xff1BB271)],
).expanded,
if (isCloseAvailable)
DefaultButton(
LocaleKeys.ok.tr(),
() => performAction("CLOSE"),
colors: const [Color(0xff32D892), Color(0xff1AB170)],
).expanded,
8.width,
Container(
height: 43,
width: 43,
decoration: const BoxDecoration(
shape: BoxShape.circle,
color: MyColors.lightGreyE6Color,
),
child: Icon(showFabOptions ? Icons.more_vert_rounded : Icons.more_horiz_rounded, color: MyColors.darkIconColor),
).onPress(() {
setState(() {
showFabOptions = true;
});
})
],
), ),
) )
], ],
@ -679,10 +683,17 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
} }
void performAction(String actionMode, {String? title}) { void performAction(String actionMode, {String? title}) {
String question = "";
if (actionMode == "ANSWER_INFO") {
List<GetActionHistoryList> list = actionHistoryList.where((element) => element.aCTIONCODE == "REQUEST_INFO").toList();
if (list.isNotEmpty) {
question = "${list.first.aCTION}: ${list.first.nOTE}";
}
}
showDialog( showDialog(
context: context, context: context,
builder: (BuildContext cxt) => AcceptRejectInputDialog( builder: (BuildContext cxt) => AcceptRejectInputDialog(
message: title != null ? null : LocaleKeys.requestedItems.tr(), message: question,
title: title, title: title,
notificationGetRespond: notificationNoteInput, notificationGetRespond: notificationNoteInput,
actionMode: actionMode, actionMode: actionMode,
@ -704,7 +715,6 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
"P_NOTIFICATION_ID": workListData!.nOTIFICATIONID, "P_NOTIFICATION_ID": workListData!.nOTIFICATIONID,
"RespondAttributeList": responseAttribute, "RespondAttributeList": responseAttribute,
}; };
if (actionMode == "APPROVED" || if (actionMode == "APPROVED" ||
actionMode == "APPROVE" || actionMode == "APPROVE" ||
actionMode == "CLOSE" || actionMode == "CLOSE" ||
@ -1069,6 +1079,14 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
} }
return false; return false;
}); });
if(notificationButtonsList.any((GetNotificationButtonsList element) => element.bUTTONACTION == "DELEGATE" || element.bUTTONACTION == "REQUEST_INFO" )) {
isShowActions = true;
} else {
isShowActions = false;
}
} }
apiCallCount--; apiCallCount--;
if (apiCallCount == 0) { if (apiCallCount == 0) {
@ -1102,7 +1120,7 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
try { try {
isAttachmentLoaded = false; isAttachmentLoaded = false;
getAttachmentList.clear(); getAttachmentList.clear();
List<GetAttachementList> _getAttachmentList = await WorkListApiClient().getAttachments(workListData!.nOTIFICATIONID!); List<GetAttachementList> _getAttachmentList = await WorkListApiClient().getAttachments(workListData!.nOTIFICATIONID!);
if (!isAttachmentLoaded) { if (!isAttachmentLoaded) {
getAttachmentList = _getAttachmentList; getAttachmentList = _getAttachmentList;
} }

@ -17,8 +17,9 @@ class ActionsFragment extends StatelessWidget {
int? notificationID; int? notificationID;
List<GetActionHistoryList> actionHistoryList; List<GetActionHistoryList> actionHistoryList;
VoidCallback voidCallback; VoidCallback voidCallback;
bool isShowActions = false;
ActionsFragment(this.notificationID, this.actionHistoryList, {Key? key, required this.voidCallback}) : super(key: key); ActionsFragment(this.notificationID, this.actionHistoryList, this.isShowActions, {Key? key, required this.voidCallback}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -113,42 +114,41 @@ class ActionsFragment extends StatelessWidget {
], ],
).paddingOnly(top: 19, left: 16, right: 16, bottom: 12), ).paddingOnly(top: 19, left: 16, right: 16, bottom: 12),
Container(width: double.infinity, height: 1, color: MyColors.lightGreyEFColor), Container(width: double.infinity, height: 1, color: MyColors.lightGreyEFColor),
Row( isShowActions
children: [ ? Row(
LocaleKeys.request_info.tr().toText12(color: MyColors.grey67Color).center.paddingOnly(top: 6, bottom: 6).onPress(() { children: [
showMyBottomSheet( LocaleKeys.request_info.tr().toText12(color: MyColors.grey67Color).center.paddingOnly(top: 6, bottom: 6).onPress(() {
context, showMyBottomSheet(
callBackFunc: voidCallback, context,
child: SelectedItemSheet(LocaleKeys.request_info.tr(), apiMode: "REQUEST_INFO", notificationID: notificationID, actionHistoryList: actionHistory),
);
}).expanded,
Container(width: 1, height: 30, color: MyColors.lightGreyEFColor),
LocaleKeys.delegate.tr().toText12(color: MyColors.gradiantEndColor).center.paddingOnly(top: 6, bottom: 6).onPress(() {
if (actionHistory.uSERNAME == AppState().memberInformationList?.eMPLOYEENUMBER) {
showMyBottomSheet(context,
callBackFunc: voidCallback, callBackFunc: voidCallback,
child: DelegateSheet( child: SelectedItemSheet(LocaleKeys.request_info.tr(), apiMode: "REQUEST_INFO", notificationID: notificationID, actionHistoryList: actionHistory),
title: LocaleKeys.delegate.tr(), );
apiMode: "DELEGATE", }).expanded,
notificationID: notificationID, Container(width: 1, height: 30, color: MyColors.lightGreyEFColor),
actionHistoryList: actionHistoryList, LocaleKeys.delegate.tr().toText12(color: MyColors.gradiantEndColor).center.paddingOnly(top: 6, bottom: 6).onPress(() {
if (actionHistory.uSERNAME == AppState().memberInformationList?.eMPLOYEENUMBER) {
showMyBottomSheet(
context,
callBackFunc: voidCallback, callBackFunc: voidCallback,
)); child: DelegateSheet(
return; title: LocaleKeys.delegate.tr(),
} apiMode: "DELEGATE",
showMyBottomSheet( notificationID: notificationID,
context, actionHistoryList: actionHistoryList,
callBackFunc: voidCallback, callBackFunc: voidCallback,
child: SelectedItemSheet( ),
LocaleKeys.comments.tr(), );
apiMode: "DELEGATE", return;
actionHistoryList: actionHistory, }
notificationID: notificationID, showMyBottomSheet(
), context,
); callBackFunc: voidCallback,
}).expanded, child: SelectedItemSheet(LocaleKeys.comments.tr(), apiMode: "DELEGATE", actionHistoryList: actionHistory, notificationID: notificationID),
], );
), }).expanded,
],
)
: const SizedBox(),
], ],
), ),
], ],

@ -760,6 +760,18 @@ class InfoFragment extends StatelessWidget {
ItemDetailViewCol( ItemDetailViewCol(
LocaleKeys.requesterPayrollName.tr(), data.paymentDetailsList![0].requesterPayrollName ?? ""), LocaleKeys.requesterPayrollName.tr(), data.paymentDetailsList![0].requesterPayrollName ?? ""),
), ),
ItemDetailGrid(
ItemDetailViewCol( LocaleKeys.preparePositionName.tr(),
data.paymentDetailsList![0].preparePositionName ?? ""),
ItemDetailViewCol(
LocaleKeys.requesterPositionName.tr(), data.paymentDetailsList![0].requesterPositionName ?? ""),
),
ItemDetailGrid(
ItemDetailViewCol( LocaleKeys.prepareEmpName.tr(),
data.paymentDetailsList![0].prepareEmployeeName ?? ""),
ItemDetailViewCol(
LocaleKeys.requesterPayrollName.tr(), data.paymentDetailsList![0].requesterPayrollName ?? ""),
),
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol( LocaleKeys.preparePositionName.tr(), ItemDetailViewCol( LocaleKeys.preparePositionName.tr(),
data.paymentDetailsList![0].preparePositionName ?? ""), data.paymentDetailsList![0].preparePositionName ?? ""),
@ -897,15 +909,18 @@ class InfoFragment extends StatelessWidget {
), ),
ItemDetailGrid( ItemDetailGrid(
ItemDetailViewCol(LocaleKeys.invoiceDate.tr(), ItemDetailViewCol(LocaleKeys.invoiceDate.tr(),
DateUtil.formatDateToDate( DateUtil.formatDateToDate(
DateUtil.convertStringToDate( data.refundInvoiceList![0].invoicedDate), false)?? ""), DateUtil.convertStringToDate( data.refundInvoiceList![0].invoicedDate), false)?? ""),
ItemDetailViewCol( LocaleKeys.refundInvoice.tr(), data.refundInvoiceList![0].invoiceNumber ?? ItemDetailViewCol( LocaleKeys.refundInvoice.tr(), data.refundInvoiceList![0].invoiceNumber ??
"" ), "" ),
), ),
], ],
).objectContainerView(), ).objectContainerView(),
],
],
); );
} }
} }

@ -1,22 +1,27 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:mohem_flutter_app/classes/colors.dart'; import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/config/routes.dart'; import 'package:mohem_flutter_app/config/routes.dart';
import 'package:mohem_flutter_app/extensions/int_extensions.dart'; import 'package:mohem_flutter_app/extensions/int_extensions.dart';
import 'package:mohem_flutter_app/extensions/string_extensions.dart'; import 'package:mohem_flutter_app/extensions/string_extensions.dart';
import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
AppBar AppBarWidget(BuildContext context, AppBar AppBarWidget(
{required String title, BuildContext context, {
bool showHomeButton = true, required String title,
bool showWorkListSettingButton = false, bool showHomeButton = true,
bool showMemberButton = false, bool showLogo = false,
List<Widget>? actions, String? logoPath,
void Function()? onHomeTapped, bool showWorkListSettingButton = false,
void Function()? onBackTapped}) { bool showMemberButton = false,
List<Widget>? actions,
void Function()? onHomeTapped,
void Function()? onBackTapped,
}) {
return AppBar( return AppBar(
leadingWidth: 0, leadingWidth: 0,
automaticallyImplyLeading: false, automaticallyImplyLeading: false,
surfaceTintColor: Colors.transparent,
title: Row( title: Row(
children: [ children: [
GestureDetector( GestureDetector(
@ -26,8 +31,10 @@ AppBar AppBarWidget(BuildContext context,
}, context), }, context),
child: const Icon(Icons.arrow_back_ios, color: MyColors.darkIconColor), child: const Icon(Icons.arrow_back_ios, color: MyColors.darkIconColor),
), ),
if (showLogo) 4.width,
if (showLogo) SvgPicture.asset(logoPath!),
4.width, 4.width,
title.toText24(color: MyColors.darkTextColor, isBold: true).expanded, if (!showLogo)title.toText24(color: MyColors.darkTextColor, isBold: true).expanded,
], ],
), ),
centerTitle: false, centerTitle: false,
@ -55,7 +62,7 @@ AppBar AppBarWidget(BuildContext context,
}, },
icon: const Icon(Icons.people, color: MyColors.textMixColor), icon: const Icon(Icons.people, color: MyColors.textMixColor),
), ),
...actions ?? [] ...actions ?? [],
], ],
); );
} }

@ -13,6 +13,8 @@ AppBar ChatAppBarWidget(BuildContext context,
{required String title, bool showHomeButton = true, ChatUser? chatUser, bool showTyping = false, List<Widget>? actions, void Function()? onHomeTapped, void Function()? onBackTapped}) { {required String title, bool showHomeButton = true, ChatUser? chatUser, bool showTyping = false, List<Widget>? actions, void Function()? onHomeTapped, void Function()? onBackTapped}) {
return AppBar( return AppBar(
leadingWidth: 0, leadingWidth: 0,
automaticallyImplyLeading: false,
surfaceTintColor: Colors.transparent,
title: Consumer<ChatProviderModel>(builder: (BuildContext cxt, ChatProviderModel data, Widget? child) { title: Consumer<ChatProviderModel>(builder: (BuildContext cxt, ChatProviderModel data, Widget? child) {
return Row( return Row(
children: [ children: [

@ -159,7 +159,7 @@ class _BottomSheet extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
padding: const EdgeInsets.symmetric(vertical: 12.0), padding: const EdgeInsets.symmetric(vertical: 12.0),
decoration: BoxDecoration(color: Theme.of(context).scaffoldBackgroundColor, borderRadius: const BorderRadius.only(topLeft: Radius.circular(16.0), topRight: Radius.circular(16.0))), decoration: BoxDecoration( borderRadius: const BorderRadius.only(topLeft: Radius.circular(16.0), topRight: Radius.circular(16.0))),
child: SafeArea( child: SafeArea(
top: false, top: false,
child: Column( child: Column(

@ -53,8 +53,9 @@ class ItemDetailViewGridItem extends StatelessWidget {
final String? type; final String? type;
final bool isNeedToShowEmptyDivider; final bool isNeedToShowEmptyDivider;
final int maxLine; final int maxLine;
final bool showSpaceAfterLine;
ItemDetailViewGridItem(this.index, this.title, this.value, {Key? key, this.isNeedToShowEmptyDivider = false, this.type = "", this.maxLine = 6}) : super(key: key); ItemDetailViewGridItem(this.index, this.title, this.value, {Key? key, this.isNeedToShowEmptyDivider = false, this.showSpaceAfterLine = false, this.type = "", this.maxLine = 6}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -92,7 +93,7 @@ class ItemDetailViewGridItem extends StatelessWidget {
: (value!.isEmpty ? "--" : value).toString().toText12Auto(color: MyColors.normalTextColor, maxLine: maxLine) : (value!.isEmpty ? "--" : value).toString().toText12Auto(color: MyColors.normalTextColor, maxLine: maxLine)
: Container(), : Container(),
], ],
), ).paddingOnly(top: showSpaceAfterLine ? 16 : 0),
); );
} }
} }

@ -44,7 +44,7 @@ class Location {
AppPermissions.location((granted) { AppPermissions.location((granted) {
if (granted) { if (granted) {
Geolocator.getCurrentPosition(desiredAccuracy: LocationAccuracy.lowest, timeLimit: const Duration(seconds: 10)).then((value) { Geolocator.getCurrentPosition(desiredAccuracy: LocationAccuracy.medium, timeLimit: const Duration(seconds: 10)).then((value) {
done(value); done(value);
}).catchError((err) { }).catchError((err) {
errorCallBack(); errorCallBack();

@ -78,11 +78,10 @@ class _NfcLayoutState extends State<NfcLayout> {
} }
Widget scanNfc() { Widget scanNfc() {
return SizedBox( return Container(
width: MediaQuery.sizeOf(context).width, key: ValueKey(1),
width: double.infinity,
child: Column( child: Column(
key: ValueKey(1),
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(
@ -140,9 +139,8 @@ class _NfcLayoutState extends State<NfcLayout> {
Widget doneNfc() { Widget doneNfc() {
return Container( return Container(
width: MediaQuery.sizeOf(context).width, key: ValueKey(2),
child: Column( child: Column(
key: ValueKey(2),
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: <Widget>[ children: <Widget>[
SizedBox( SizedBox(

@ -1,8 +1,8 @@
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mobile_scanner/mobile_scanner.dart';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/widgets/button/default_button.dart'; import 'package:mohem_flutter_app/widgets/button/default_button.dart';
import 'package:qr_code_scanner/qr_code_scanner.dart';
class QrScannerDialog extends StatefulWidget { class QrScannerDialog extends StatefulWidget {
@override @override
@ -11,8 +11,9 @@ class QrScannerDialog extends StatefulWidget {
class _QrScannerDialogState extends State<QrScannerDialog> { class _QrScannerDialogState extends State<QrScannerDialog> {
final GlobalKey qrKey = GlobalKey(debugLabel: 'QR'); final GlobalKey qrKey = GlobalKey(debugLabel: 'QR');
Barcode? result; // Barcode? result;
QRViewController? controller; // QRViewController? controller;
Barcode? _barcode;
bool isPicked = false; bool isPicked = false;
@override @override
@ -26,10 +27,7 @@ class _QrScannerDialogState extends State<QrScannerDialog> {
children: [ children: [
Expanded( Expanded(
flex: 1, flex: 1,
child: QRView( child: MobileScanner(key : qrKey,onDetect: _handleBarcode),
key: qrKey,
onQRViewCreated: _onQRViewCreated,
),
), ),
// Expanded( // Expanded(
// flex: 1, // flex: 1,
@ -55,25 +53,25 @@ class _QrScannerDialogState extends State<QrScannerDialog> {
); );
} }
void _onQRViewCreated(QRViewController controller) { void _handleBarcode(BarcodeCapture barcodes) {
this.controller = controller; // this.controller = controller;
Barcode? data = barcodes.barcodes.firstOrNull;
controller.scannedDataStream.listen((scanData) { if(data == null || isPicked) {
return;
}
// controller.scannedDataStream.listen((scanData) {
setState(() { setState(() {
result = scanData; // result = scanData;
if (!isPicked) {
isPicked = true; isPicked = true;
Navigator.pop(context, result!.code); Navigator.pop(context, data.displayValue);
}
}); });
}); // });
controller.pauseCamera(); // controller.pauseCamera();
controller.resumeCamera(); // controller.resumeCamera();
} }
@override @override
void dispose() { void dispose() {
controller?.dispose();
super.dispose(); super.dispose();
} }
} }

@ -16,8 +16,9 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at # Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
#version: 3.3.01+300040
version: 3.7.98+3 version: 3.6.8+300078
#version: 3.9.1+1
environment: environment:
sdk: ^3.7.0 sdk: ^3.7.0
@ -40,13 +41,13 @@ dependencies:
injector: ^2.0.0 injector: ^2.0.0
provider: ^6.0.1 provider: ^6.0.1
easy_localization: ^3.0.0 easy_localization: ^3.0.0
http: ^1.3.0 http: ^1.4.0
permission_handler: ^12.0.1 permission_handler: ^12.0.1
flutter_svg: any flutter_svg: any
sizer: ^2.0.15 sizer: ^2.0.15
local_auth: ^2.3.0 local_auth: ^2.3.0
fluttertoast: ^8.0.8 fluttertoast: ^8.0.8
syncfusion_flutter_calendar: ^28.2.4 syncfusion_flutter_calendar: ^29.1.38
# flutter_calendar_carousel: ^2.1.0 # flutter_calendar_carousel: ^2.1.0
pie_chart: ^5.1.0 pie_chart: ^5.1.0
shared_preferences: ^2.0.12 shared_preferences: ^2.0.12
@ -56,7 +57,8 @@ dependencies:
flutter_countdown_timer: ^4.1.0 flutter_countdown_timer: ^4.1.0
platform_device_id_plus: ^1.0.7 platform_device_id_plus: ^1.0.7
image_picker: ^0.8.5+3 device_info_plus: ^11.5.0
image_picker: ^1.1.2
file_picker: ^8.3.1 file_picker: ^8.3.1
geolocator: ^9.0.2 geolocator: ^9.0.2
month_year_picker: ^0.5.0+1 month_year_picker: ^0.5.0+1
@ -65,15 +67,16 @@ dependencies:
open_filex: ^4.6.0 open_filex: ^4.6.0
wifi_iot: ^0.3.19+1 wifi_iot: ^0.3.19+1
flutter_html: ^3.0.0-alpha.6 flutter_html: ^3.0.0-alpha.6
mobile_scanner: ^6.0.10
# flutter_barcode_scanner: ^2.0.0 # flutter_barcode_scanner: ^2.0.0
qr_code_scanner: ^1.0.1 # qr_code_scanner: ^1.0.1
# qr_flutter: ^4.0.0 # qr_flutter: ^4.0.0
url_launcher: ^6.0.15 url_launcher: ^6.0.15
share_plus: ^11.0.0 share_plus: ^11.0.0
flutter_rating_bar: ^4.0.1 flutter_rating_bar: ^4.0.1
auto_size_text: ^3.0.0 auto_size_text: ^3.0.0
pull_to_refresh: ^2.0.0 pull_to_refresh: ^2.0.0
fl_chart: ^0.70.2 fl_chart: ^0.66.0
# lottie json animations # lottie json animations
lottie: any lottie: any
# Marathon Card Swipe # Marathon Card Swipe
@ -89,12 +92,13 @@ dependencies:
logging: ^1.0.1 logging: ^1.0.1
swipe_to: ^1.0.2 swipe_to: ^1.0.2
flutter_webrtc: ^0.12.11 flutter_webrtc: ^0.12.11
camera: ^0.10.3 # camera: ^0.10.3
camera: ^0.11.2
flutter_local_notifications: ^18.0.1 flutter_local_notifications: ^18.0.1
#firebase_analytics: any #firebase_analytics: any
#Chat Voice Message Recoding & Play #Chat Voice Message Recoding & Play
audio_waveforms: ^0.1.5+1 audio_waveforms: ^1.3.0
rxdart: ^0.27.7 rxdart: ^0.27.7
#Encryption #Encryption
@ -108,7 +112,7 @@ dependencies:
#Huawei Dependencies #Huawei Dependencies
# huawei_hmsavailability: ^6.6.0+300 # huawei_hmsavailability: ^6.6.0+300
# huawei_location: 6.0.0+302 # huawei_location: 6.0.0+302
huawei_location: ^6.11.0+301 huawei_location: ^6.14.2+301
# huawei_push: ^6.7.0+300 # huawei_push: ^6.7.0+300
huawei_map: huawei_map:
@ -122,14 +126,15 @@ dependencies:
firebase_crashlytics: ^4.3.9 firebase_crashlytics: ^4.3.9
#Items for sale Image Carousel Slider #Items for sale Image Carousel Slider
carousel_slider: ^5.0.0 carousel_slider: ^5.1.1
#Huawei Specified #Huawei Specified
# store_checker: ^1.1.0 # store_checker: ^1.1.0
google_api_availability: ^5.0.1 google_api_availability: ^5.0.1
google_maps_flutter_web: ^0.5.4
in_app_update: 4.1.0 in_app_update: 4.1.0
flutter_inappwebview: ^6.1.5 flutter_inappwebview: ^6.1.5
flutter_blurhash: ^0.8.0
#todo its for temporary purpose, later will remove this. #todo its for temporary purpose, later will remove this.
dotted_border: ^2.0.0+3 dotted_border: ^2.0.0+3

Loading…
Cancel
Save