Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal

* 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  fixed suggestions

lib/ui/login/login_screen.dart

@@ -8,6 +8,7 @@ import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 
 // import 'package:huawei_hmsavailability/huawei_hmsavailability.dart';
 import 'package:mohem_flutter_app/api/login_api_client.dart';
@@ -499,7 +500,7 @@ class _LoginScreenState extends State<LoginScreen> {
     }
   }
 
-  Widget _buildCtaCard({required BuildContext context, required IconData icon, required String title, required String subtitle, required VoidCallback onTap}) {
+  Widget _buildCtaCard({bool isSVG = false, required String iconPath, required BuildContext context, required String title, required String subtitle, required VoidCallback onTap}) {
     bool isRtl = Directionality.of(context) == ui.TextDirection.rtl || AppState().isArabic(context);
 
     return InkWell(
@@ -510,14 +511,14 @@ class _LoginScreenState extends State<LoginScreen> {
         padding: const EdgeInsets.all(14),
         decoration: BoxDecoration(color: const Color(0xFFEAF8F4), borderRadius: BorderRadius.circular(14), border: Border.all(color: const Color(0xFFB8E8DB), width: 1.0)),
         child: Row(
-          crossAxisAlignment: CrossAxisAlignment.center,
+          crossAxisAlignment: CrossAxisAlignment.start,
           children: <Widget>[
             Container(
               width: 40,
               height: 40,
-              decoration: const BoxDecoration(color: Colors.white, shape: BoxShape.circle),
+              decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(10)),
               alignment: Alignment.center,
-              child: Icon(icon, color: const Color(0xFF168A89), size: 22),
+              child: isSVG ? SvgPicture.asset(iconPath, height: 22, width: 22).paddingOnly(top: 2, left: 3, right: 3) : Image.asset(iconPath, height: 22, width: 22).paddingOnly(top: 2),
             ),
             const SizedBox(width: 12),
             Expanded(
@@ -541,7 +542,8 @@ class _LoginScreenState extends State<LoginScreen> {
   Widget _buildDependentCtaCard(BuildContext context) {
     return _buildCtaCard(
       context: context,
-      icon: Icons.person_outline_rounded,
+      isSVG: true,
+      iconPath: 'assets/icons/mazaya_brand.svg',
       title: LocaleKeys.joinMazaya.tr(),
       subtitle: LocaleKeys.joinMazayaSubtitle.tr(),
       onTap: () => _switchToMode(MemberType.dependent),
@@ -549,9 +551,11 @@ class _LoginScreenState extends State<LoginScreen> {
   }
 
   Widget _buildEmployeeCtaCard(BuildContext context) {
+    int channel = AppState().postParamsObject?.channel ?? 31;
+
     return _buildCtaCard(
       context: context,
-      icon: Icons.badge_outlined,
+      iconPath: channel == 31 ? 'assets/images/logos/mohem_logo.png' : 'assets/images/logos/hmg_mohem_logo.png',
       title: LocaleKeys.continueAsEmployee.tr(),
       subtitle: LocaleKeys.continueAsEmployeeSubtitle.tr(),
       onTap: () => _switchToMode(MemberType.employee),

pubspec.yaml

@@ -56,7 +56,7 @@ dependencies:
   logger: ^1.1.0
   flutter_countdown_timer: ^4.1.0
 
-#  platform_device_id_plus: ^1.0.7
+  #  platform_device_id_plus: ^1.0.7
   mobile_device_identifier: ^0.0.3
   device_info_plus: ^11.5.0
   image_picker: ^1.1.2
@@ -64,13 +64,13 @@ dependencies:
   geolocator: ^9.0.2
   month_year_picker: ^0.5.0+1
   month_picker_dialog: ^6.0.3
-#  open_file: ^3.2.1
+  #  open_file: ^3.2.1
   open_filex: ^4.6.0
   wifi_iot: ^0.3.19+1
   flutter_html: ^3.0.0-alpha.6
   mobile_scanner: ^6.0.10
   #  flutter_barcode_scanner: ^2.0.0
-#  qr_code_scanner: ^1.0.1
+  #  qr_code_scanner: ^1.0.1
   #  qr_flutter: ^4.0.0
   url_launcher: ^6.0.15
   share_plus: ^11.0.0
@@ -93,7 +93,7 @@ dependencies:
   logging: ^1.0.1
   swipe_to: ^1.0.2
   flutter_webrtc: ^0.12.11
-#  camera: ^0.10.3
+  #  camera: ^0.10.3
   camera: ^0.11.2
   flutter_local_notifications: ^18.0.1
   #firebase_analytics: any
@@ -116,9 +116,9 @@ dependencies:
 
   #Huawei Dependencies
   #  huawei_hmsavailability: ^6.6.0+300
-#  huawei_location: 6.0.0+302
+  #  huawei_location: 6.0.0+302
   huawei_location: ^6.14.2+301
-#  huawei_push: ^6.7.0+300
+  #  huawei_push: ^6.7.0+300
 
   huawei_map:
     git: