improvements

merge-requests/112/head
Sikander Saleem 3 years ago
parent 86d6b57cbc
commit 9602e95fe7

@ -2,9 +2,9 @@ import 'package:mohem_flutter_app/ui/marathon/widgets/question_card.dart';
class ApiConsts { class ApiConsts {
//static String baseUrl = "http://10.200.204.20:2801/"; // Local server //static String baseUrl = "http://10.200.204.20:2801/"; // Local server
static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server // static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
// static String baseUrl = "https://erptstapp.srca.org.sa"; // SRCA server // static String baseUrl = "https://erptstapp.srca.org.sa"; // SRCA server
// 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
// static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server // static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server
static String utilitiesRest = baseUrlServices + "Utilities.svc/REST/"; static String utilitiesRest = baseUrlServices + "Utilities.svc/REST/";

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

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

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

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

Loading…
Cancel
Save