Merge branch 'master' into development_mirza

ios/Runner/AppDelegate.swift

@@ -1,6 +1,7 @@
 import UIKit
 import Flutter
 import Firebase
+import flutter_local_notifications
 
 
 @UIApplicationMain
@@ -9,7 +10,14 @@ import Firebase
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
-   FirebaseApp.configure()
+     FirebaseApp.configure()
+     FlutterLocalNotificationsPlugin.setPluginRegistrantCallback { (registry) in
+           GeneratedPluginRegistrant.register(with: registry)
+       }
+
+       if #available(iOS 10.0, *) {
+         UNUserNotificationCenter.current().delegate = self as UNUserNotificationCenterDelegate
+       }
     GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }

lib/api/api_client.dart

@@ -87,13 +87,12 @@ class ApiClient {
       if (!kReleaseMode) {
         logger.i("res: " + response.body);
       }
+
       var jsonData = jsonDecode(response.body);
-      if (jsonData["MessageStatus"] == 2) {
+      if (jsonData["IsAuthenticated"] != null) {
-        AppState().setIsAuthenticated = false;
+        AppState().setIsAuthenticated = jsonData["IsAuthenticated"];
       }
-
+      if (jsonData["ErrorMessage"] == null) {
-
-      if (jsonData["ErrorMessage"] == null && jsonData["MessageStatus"] == 1) {
         return factoryConstructor(jsonData);
       } else {
         APIError? apiError;

lib/app_state/app_state.dart

@@ -77,7 +77,7 @@ class AppState {
 
   bool get getIsDemoMarathon => _isDemoMarathon;
 
-  final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 3.9, mobileType: Platform.isAndroid ? "android" : "ios");
+  final PostParamsModel _postParamsInitConfig = PostParamsModel(channel: 31, versionID: 4.0, mobileType: Platform.isAndroid ? "android" : "ios");
 
   void setPostParamsInitConfig() {
     isAuthenticated = false;

lib/generated/codegen_loader.g.dart

@@ -533,6 +533,9 @@ class CodegenLoader extends AssetLoader{
   "startingIn": "يبدأ في",
   "youAreOutOfContest": "أنت خارج المسابقة.",
   "winners": "الفائزين!!!",
+  "expireAfter": "تنتهي بعد",
+  "oneWeek": "أسبوع 1",
+  "twoWeek": "2 أسبوع",
   "noUpcoming": "لا يوجد قادم",
   "fakeLocation": ".لقد تتبعنا أنك تحاول استخدام موقع مزيف! يعتبر هذا مخالفة وقد تم إخطار الموارد البشرية",
   "noWinner": "حزين! لم يفز أحد اليوم.",
@@ -1058,6 +1061,9 @@ static const Map<String,dynamic> en_US = {
   "startingIn": "Starting in",
   "youAreOutOfContest": "You are out of the contest.",
   "winners": "WINNERS!!!",
+  "expireAfter": "Expires After",
+  "oneWeek": "1 Week",
+  "twoWeek": "2 Week",
   "noUpcoming": "There is no upcoming",
   "fakeLocation": "We traced out that you try to use a fake location! This is considered a violation, and HR has been notified.",
   "noWinner": "Sad! No one won today.",

lib/generated/locale_keys.g.dart

@@ -1,6 +1,6 @@
 // DO NOT EDIT. This is code generated via package:easy_localization/generate.dart
 
-abstract class LocaleKeys {
+abstract class  LocaleKeys {
   static const mohemm = 'mohemm';
   static const english = 'english';
   static const arabic = 'arabic';
@@ -250,7 +250,7 @@ abstract class LocaleKeys {
   static const Payroll = 'Payroll';
   static const civilIdentityNumber = 'civilIdentityNumber';
   static const dateOfBirth = 'dateOfBirth';
-  static const maritalStatus = 'maritalStatus ';
+  static const maritalStatus  = 'maritalStatus ';
   static const fullName = 'fullName';
   static const remove = 'remove';
   static const submit = 'submit';
@@ -280,7 +280,7 @@ abstract class LocaleKeys {
   static const enterNewInfo = 'enterNewInfo';
   static const endDate = 'endDate';
   static const removeThisMember = 'removeThisMember';
-  static const wantUpdateThisMember = 'wantUpdateThisMember ';
+  static const wantUpdateThisMember  = 'wantUpdateThisMember ';
   static const addNewFamilyMember = 'addNewFamilyMember';
   static const addRow = 'addRow';
   static const pleaseSelect = 'pleaseSelect';
@@ -503,12 +503,13 @@ abstract class LocaleKeys {
   static const startingIn = 'startingIn';
   static const youAreOutOfContest = 'youAreOutOfContest';
   static const winners = 'winners';
-  static const noUpcoming = 'noUpcoming';
-  static const fakeLocation = 'fakeLocation';
   static const expireAfter = 'expireAfter';
   static const oneWeek = 'oneWeek';
   static const twoWeek = 'twoWeek';
+  static const noUpcoming = 'noUpcoming';
+  static const fakeLocation = 'fakeLocation';
   static const noWinner = 'noWinner';
   static const myTeam = 'myTeam';
   static const youCanPlayDemo = 'youCanPlayDemo';
+
 }

lib/provider/dashboard_provider_model.dart

@@ -190,7 +190,7 @@ class DashboardProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
       accrualList = await DashboardApiClient().getAccrualBalances(DateFormat("MM/dd/yyyy").format(date));
       isLeaveTicketBalanceLoading = false;
       leaveBalanceAccrual = accrualList![0];
-      ticketBalance = (accrualList![1].accrualNetEntitlement ?? 0.0) + (accrualList![2].accrualNetEntitlement ?? 0.0);
+      ticketBalance = (accrualList![1].accrualNetEntitlement ?? 0.0) + (accrualList![2].accrualNetEntitlement ?? 0.0) + (accrualList![3].accrualNetEntitlement ?? 0.0);
       notifyListeners();
     } catch (ex) {
       isLeaveTicketBalanceLoading = false;

lib/ui/landing/widget/menus_widget.dart

@@ -96,7 +96,7 @@ class MenusWidget extends StatelessWidget {
                         Row(
                           children: [
                             Expanded(
-                              child: data.leaveBalance.toString().toText16(color: Colors.white, isBold: true, maxlines: 1),
+                              child: data.leaveBalance.toStringAsFixed(2).toText16(color: Colors.white, isBold: true, maxlines: 1),
                             ),
                             RotatedBox(quarterTurns: AppState().isArabic(context) ? 2 : 4, child: SvgPicture.asset("assets/images/arrow_next.svg", color: Colors.white)),
                           ],
@@ -123,7 +123,7 @@ class MenusWidget extends StatelessWidget {
                         Row(
                           children: [
                             Expanded(
-                              child: data.ticketBalance.toString().toText16(color: Colors.white, isBold: true, maxlines: 1),
+                              child: data.ticketBalance.toStringAsFixed(2).toText16(color: Colors.white, isBold: true, maxlines: 1),
                             ),
                             RotatedBox(quarterTurns: AppState().isArabic(context) ? 2 : 4, child: SvgPicture.asset("assets/images/arrow_next.svg", color: Colors.white)),
                           ],

lib/ui/login/login_screen.dart

@@ -95,6 +95,12 @@ class _LoginScreenState extends State<LoginScreen> {
     try {
       Utils.showLoading(context);
       await Firebase.initializeApp();
+      // await FirebaseMessaging.instance.setForegroundNotificationPresentationOptions(
+      //   alert: true,
+      //   badge: true,
+      //   sound: true,
+      // );
+      // await FirebaseMessaging.instance.requestPermission();
       _firebaseMessaging = FirebaseMessaging.instance;
       firebaseToken = await _firebaseMessaging.getToken();
       AppNotifications().init(firebaseToken);
@@ -166,8 +172,8 @@ class _LoginScreenState extends State<LoginScreen> {
       isAppOpenBySystem = (ModalRoute.of(context)!.settings.arguments ?? true) as bool;
       if (!kReleaseMode) {
         // username.text = "15444"; // Maha User
-        username.text = "15153"; // Tamer User
+        // username.text = "15153"; // Tamer User
-        password.text = "Abcd@12345";
+        // password.text = "Abcd@12345";
 
         // username.text = "206535"; // Hashim User
         // password.text = "Namira786";

lib/ui/login/verify_last_login_screen.dart

@@ -324,20 +324,22 @@ class _VerifyLastLoginScreenState extends State<VerifyLastLoginScreen> {
 
   Future<void> performApiCall(String _title, String _icon, int _flag, int sendVerificationFlat, {bool isDirectLogin = false}) async {
     try {
-      if (isDirectLogin)
+      if (isDirectLogin) {
         setState(() {
           Utils.showLoading(context);
         });
-      else
+      } else {
         Utils.showLoading(context);
+      }
       await LoginApiClient().checkMobileAppVersion();
       await LoginApiClient().memberLogin(AppState().getUserName!, AppState().password!);
-      if (!isDirectLogin)
+      if (!isDirectLogin) {
         BasicMemberInformationModel? memberInformationModel =
             await LoginApiClient().mohemmSendActivationCodeByOTPNotificationType(0, AppState().memberLoginList?.pMOBILENUMBER, sendVerificationFlat, AppState().getUserName);
+      }
       if (isDirectLogin) performDirectApiCall(_title, _icon, _flag, "", null);
       if (!isDirectLogin) Utils.hideLoading(context);
-      if (!isDirectLogin)
+      if (!isDirectLogin) {
         OtpDialog(
           context,
           sendVerificationFlat,
@@ -353,6 +355,7 @@ class _VerifyLastLoginScreenState extends State<VerifyLastLoginScreen> {
             performApiCall(_title, _icon, _flag, sendVerificationFlat, isDirectLogin: isDirectLogin);
           },
         ).displayDialog(context);
+      }
     } catch (ex) {
       Utils.hideLoading(context);
       Utils.handleException(ex, context, null);
@@ -372,6 +375,7 @@ class _VerifyLastLoginScreenState extends State<VerifyLastLoginScreen> {
           mobileLoginInfoListModel!.deviceToken!,
           Platform.isAndroid ? "android" : "ios");
       AppState().setMemberInformationListModel = genericResponseModel!.memberInformationList?.first;
+      AppState().setPrivilegeListModel = genericResponseModel!.privilegeList ?? [];
       if (genericResponseModel.errorMessage != null) {
         Utils.showToast(genericResponseModel.errorMessage ?? "");
         //  Navigator.pop(context);

pubspec.yaml

@@ -93,7 +93,7 @@ dependencies:
   flutter_webrtc: ^0.9.16
   camera: ^0.10.0+4
   flutter_local_notifications: any
-  firebase_analytics: any
+  #firebase_analytics: any
 
   #Chat Voice Message Recoding & Play
   audio_waveforms: ^0.1.5+1