Merge branch 'development_sikander' into 'master'

Development sikander

See merge request Cloud_Solution/mohemm-flutter-app!112

lib/extensions/widget_extensions.dart

@@ -58,7 +58,7 @@ extension WidgetExtensions on Widget {
           ),
         ],
       ),
-      alignment: center == true ? Alignment.center : null,
+      alignment: center ? Alignment.center : null,
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         mainAxisSize: MainAxisSize.min,

lib/generated_plugin_registrant.dart

@@ -16,7 +16,6 @@ import 'package:image_picker_for_web/image_picker_for_web.dart';
 import 'package:shared_preferences_web/shared_preferences_web.dart';
 import 'package:url_launcher_web/url_launcher_web.dart';
 import 'package:video_player_web/video_player_web.dart';
-import 'package:wakelock_web/wakelock_web.dart';
 
 import 'package:flutter_web_plugins/flutter_web_plugins.dart';
 
@@ -32,6 +31,5 @@ void registerPlugins(Registrar registrar) {
   SharedPreferencesPlugin.registerWith(registrar);
   UrlLauncherPlugin.registerWith(registrar);
   VideoPlayerPlugin.registerWith(registrar);
-  WakelockWeb.registerWith(registrar);
   registrar.registerMessageHandler();
 }

lib/ui/profile/personal_info.dart

@@ -21,29 +21,30 @@ class PersonalInfo extends StatelessWidget {
         title: LocaleKeys.profile_personalInformation.tr(),
       ),
       backgroundColor: MyColors.backgroundColor,
-      body: SizedBox(
-        width: MediaQuery.of(context).size.width,
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          // mainAxisSize: MainAxisSize.min,
-          mainAxisAlignment: MainAxisAlignment.start,
-          children: [
-            LocaleKeys.category.tr().toText13(color: MyColors.lightGrayColor),
-            (memberInformationList.eMPLOYMENTCATEGORYMEANING ?? "").toText16(),
-            20.height,
-            LocaleKeys.address.tr().toText13(color: MyColors.lightGrayColor),
-            (memberInformationList.lOCATIONNAME ?? "").toText16(),
-            20.height,
-            LocaleKeys.phoneNumber.tr().toText13(color: MyColors.lightGrayColor),
-            (memberInformationList.eMPLOYEEMOBILENUMBER ?? "").toText16(),
-            20.height,
-            LocaleKeys.businessGroup.tr().toText13(color: MyColors.lightGrayColor),
-            (memberInformationList.bUSINESSGROUPNAME ?? "").toText16(),
-            20.height,
-            LocaleKeys.Payroll.tr().toText13(color: MyColors.lightGrayColor),
-            (memberInformationList.pAYROLLNAME ?? "").toText16(),
-          ],
-        ).objectContainerView().paddingAll(21),
+      body: ListView(
+        children: [
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisSize: MainAxisSize.min,
+            mainAxisAlignment: MainAxisAlignment.start,
+            children: [
+              LocaleKeys.category.tr().toText13(color: MyColors.lightGrayColor),
+              (memberInformationList.eMPLOYMENTCATEGORYMEANING ?? "").toText16(),
+              12.height,
+              LocaleKeys.address.tr().toText13(color: MyColors.lightGrayColor),
+              (memberInformationList.lOCATIONNAME ?? "").toText16(),
+              12.height,
+              LocaleKeys.phoneNumber.tr().toText13(color: MyColors.lightGrayColor),
+              (memberInformationList.eMPLOYEEMOBILENUMBER ?? "").toText16(),
+              12.height,
+              LocaleKeys.businessGroup.tr().toText13(color: MyColors.lightGrayColor),
+              (memberInformationList.bUSINESSGROUPNAME ?? "").toText16(),
+              12.height,
+              LocaleKeys.Payroll.tr().toText13(color: MyColors.lightGrayColor),
+              (memberInformationList.pAYROLLNAME ?? "").toText16(),
+            ],
+          ).objectContainerView(center: false).paddingAll(21),
+        ],
       ),
     );
   }

lib/ui/profile/profile_screen.dart

@@ -1,4 +1,3 @@
-import 'dart:convert';
 import 'dart:io';
 import 'dart:ui';
 
@@ -76,15 +75,13 @@ class _ProfileScreenState extends State<ProfileScreen> {
                 Row(
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
-                    IconButton(
-                      onPressed: () {
-                        Navigator.pop(context);
-                      },
-                      icon: const Icon(
-                        Icons.arrow_back_ios,
-                        color: Colors.white,
-                      ),
-                    ),
+                    CircleAvatar(
+                      radius: 18,
+                      backgroundColor: Colors.black.withOpacity(.21),
+                      child: const Icon(Icons.arrow_back_ios_rounded, color: Colors.white, size: 18).paddingOnly(right: 4),
+                    ).onPress(() {
+                      Navigator.pop(context);
+                    }),
                     InkWell(
                       onTap: () {
                         // startImageSheet();

lib/ui/profile/widgets/profile_panel.dart

@@ -51,8 +51,8 @@ class ProfilePanel extends StatelessWidget {
       : ClipOval(
           child: Image.memory(
             Utils.dataFromBase64String(memberInformationList.eMPLOYEEIMAGE!),
-            width: 75,
-            height: 75,
+            width: 68,
+            height: 68,
             fit: BoxFit.fill,
           ),
         );