Merge branch 'hot_fixes' into 'diplomatic-quarter-live'

hot fixing

See merge request Cloud_Solution/diplomatic-quarter!223
merge-update-with-lab-changes
Mohammad Aljammal 5 years ago
commit 4f59bd38df

Binary file not shown.

After

Width:  |  Height:  |  Size: 147 KiB

@ -24,7 +24,7 @@ class MyApp extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final themeNotifier = Provider.of<ThemeNotifier>(context); final themeNotifier = Provider.of<ThemeNotifier>(context);
precacheImage(AssetImage('assets/images/powerd-by.jpg'), context);
return LayoutBuilder( return LayoutBuilder(
builder: (context, constraints) { builder: (context, constraints) {
return OrientationBuilder( return OrientationBuilder(

@ -143,7 +143,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
_firebaseMessaging.setAutoInitEnabled(true); _firebaseMessaging.setAutoInitEnabled(true);
locationUtils = locationUtils =
new LocationUtils(isShowConfirmDialog: false, context: context); new LocationUtils(isShowConfirmDialog: true, context: context);
WidgetsBinding.instance WidgetsBinding.instance
.addPostFrameCallback((_) => locationUtils.getCurrentLocation()); .addPostFrameCallback((_) => locationUtils.getCurrentLocation());

@ -633,10 +633,11 @@ class _ConfirmLogin extends State<ConfirmLogin> {
return InkWell( return InkWell(
onTap: () => {authenticateUser(4, true)}, onTap: () => {authenticateUser(4, true)},
child: RoundedContainer( child: RoundedContainer(
height: 140,
borderColor: Colors.grey, borderColor: Colors.grey,
showBorder: true, showBorder: true,
child: Padding( child: Padding(
padding: EdgeInsets.fromLTRB(30, 15, 30, 15), padding: EdgeInsets.fromLTRB(5, 15, 5, 15),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
@ -659,6 +660,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
return InkWell( return InkWell(
onTap: () => {authenticateUser(1, true)}, onTap: () => {authenticateUser(1, true)},
child: RoundedContainer( child: RoundedContainer(
height: 140,
borderColor: Colors.grey, borderColor: Colors.grey,
showBorder: true, showBorder: true,
child: Padding( child: Padding(
@ -693,13 +695,14 @@ class _ConfirmLogin extends State<ConfirmLogin> {
return InkWell( return InkWell(
onTap: () => {authenticateUser(2, BiometricType.fingerprint.index)}, onTap: () => {authenticateUser(2, BiometricType.fingerprint.index)},
child: RoundedContainer( child: RoundedContainer(
height: 140,
backgroundColor: BiometricType.fingerprint.index == 1 backgroundColor: BiometricType.fingerprint.index == 1
? Colors.white ? Colors.white
: Colors.white.withOpacity(.7), : Colors.white.withOpacity(.7),
borderColor: Colors.grey, borderColor: Colors.grey,
showBorder: true, showBorder: true,
child: Padding( child: Padding(
padding: EdgeInsets.fromLTRB(30, 15, 30, 15), padding: EdgeInsets.fromLTRB(5, 15, 5, 15),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(
@ -722,13 +725,14 @@ class _ConfirmLogin extends State<ConfirmLogin> {
return InkWell( return InkWell(
onTap: () => {authenticateUser(3, BiometricType.face.index)}, onTap: () => {authenticateUser(3, BiometricType.face.index)},
child: RoundedContainer( child: RoundedContainer(
height: 140,
backgroundColor: checkIfBiometricAvailable(BiometricType.face) backgroundColor: checkIfBiometricAvailable(BiometricType.face)
? Colors.white ? Colors.white
: Colors.white.withOpacity(.7), : Colors.white.withOpacity(.7),
borderColor: Colors.grey, borderColor: Colors.grey,
showBorder: true, showBorder: true,
child: Padding( child: Padding(
padding: EdgeInsets.fromLTRB(30, 15, 30, 15), padding: EdgeInsets.fromLTRB(5, 15, 5, 15),
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
@ -757,13 +761,14 @@ class _ConfirmLogin extends State<ConfirmLogin> {
}) })
}, },
child: RoundedContainer( child: RoundedContainer(
height: 140,
backgroundColor: BiometricType.fingerprint.index == 1 backgroundColor: BiometricType.fingerprint.index == 1
? Colors.white ? Colors.white
: Colors.white.withOpacity(.7), : Colors.white.withOpacity(.7),
borderColor: Colors.grey, borderColor: Colors.grey,
showBorder: true, showBorder: true,
child: Padding( child: Padding(
padding: EdgeInsets.fromLTRB(5, 0, 5, 5), padding: EdgeInsets.fromLTRB(5, 15, 5, 15),
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Image.asset( Image.asset(

@ -372,8 +372,7 @@ class _MedicalProfilePageState extends State<MedicalProfilePage> {
.insuranceApproval, .insuranceApproval,
imagePath: imagePath:
'insurance_approvals_icon.png', 'insurance_approvals_icon.png',
subTitle: TranslationBase.of(context) subTitle: '',//TranslationBase.of(context).insuranceApprovalSubtitle,
.insuranceApprovalSubtitle,
), ),
), ),
), ),
@ -384,7 +383,8 @@ class _MedicalProfilePageState extends State<MedicalProfilePage> {
) )
], ],
), ),
) ),
SizedBox(height: 20,),
], ],
), ),
if (model.user != null && model.isLogin) if (model.user != null && model.isLogin)

@ -2,6 +2,7 @@ import 'dart:async';
import 'package:diplomaticquarterapp/pages/landing/landing_page.dart'; import 'package:diplomaticquarterapp/pages/landing/landing_page.dart';
import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart'; import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -11,6 +12,7 @@ import 'core/service/AuthenticatedUserObject.dart';
import 'core/viewModels/project_view_model.dart'; import 'core/viewModels/project_view_model.dart';
import 'locator.dart'; import 'locator.dart';
import 'models/Authentication/authenticated_user.dart'; import 'models/Authentication/authenticated_user.dart';
import 'widgets/transitions/slide_up_page.dart';
AppSharedPreferences sharedPref = new AppSharedPreferences(); AppSharedPreferences sharedPref = new AppSharedPreferences();
AuthenticatedUserObject authenticatedUserObject = AuthenticatedUserObject authenticatedUserObject =
@ -27,14 +29,11 @@ class _SplashScreenState extends State<SplashScreen> {
void initState() { void initState() {
super.initState(); super.initState();
Timer( Timer(
Duration(seconds: 1, milliseconds: 500), Duration(seconds: 1, milliseconds: 800),
() { () {
Provider.of<ProjectViewModel>(context, listen: false).loadSharedPrefLanguage().then((value) { Provider.of<ProjectViewModel>(context, listen: false).loadSharedPrefLanguage().then((value) {
Navigator.of(context).pushReplacement( Navigator.of(context).pushReplacement(FadePage(page: LandingPage()));
MaterialPageRoute(
builder: (BuildContext context) => LandingPage(),
),
);
}); });
}, },
); );
@ -48,28 +47,7 @@ class _SplashScreenState extends State<SplashScreen> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.white,
body: Column( body: Image.asset('assets/images/powerd-by.jpg',fit: BoxFit.fitWidth,width: MediaQuery.of(context).size.width,),
crossAxisAlignment: CrossAxisAlignment.center,
children: [
SizedBox(height: MediaQuery.of(context).size.height * 0.35,),
Padding(
padding: const EdgeInsets.all(25.0),
child: Image.asset('assets/images/DQ/DQ_logo.png'),
),
SizedBox(height: MediaQuery.of(context).size.height * 0.30,),
Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
Text(TranslationBase.of(context).poweredBy),
Image.asset(
'assets/images/cs_logo_container.png',
width: 80,
)
],
)
],
),
); );
} }
} }

@ -53,40 +53,42 @@ class _MobileNo extends State<MobileNo> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Container( Expanded(
margin: EdgeInsets.only(bottom: 10.0), child: Container(
height: 60.0, margin: EdgeInsets.only(bottom: 10.0),
decoration: BoxDecoration( height: 60.0,
color: Colors.white, decoration: BoxDecoration(
border: Border.all( color: Colors.white,
color: Colors.grey[400], border: Border.all(
width: 1.0, color: Colors.grey[400],
width: 1.0,
),
borderRadius: BorderRadius.circular(10),
), ),
borderRadius: BorderRadius.circular(10), width: MediaQuery.of(context).size.width * 0.89,
), child: Padding(
width: MediaQuery.of(context).size.width * 0.89, padding: EdgeInsets.all(10),
child: Padding( child: DropdownButtonHideUnderline(
padding: EdgeInsets.all(10), child: DropdownButton(
child: DropdownButtonHideUnderline( isExpanded: true,
child: DropdownButton( value: _selectedType,
isExpanded: true, iconSize: 40,
value: _selectedType, elevation: 16,
iconSize: 40, onChanged: (value) => {
elevation: 16, widget.onCountryChange(value),
onChanged: (value) => { setState(() {
widget.onCountryChange(value), countryCode = value;
setState(() { _selectedType = value;
countryCode = value; })
_selectedType = value; },
}) items: widget.countries
}, .map<DropdownMenuItem<String>>((Countries value) {
items: widget.countries return DropdownMenuItem<String>(
.map<DropdownMenuItem<String>>((Countries value) { value: value.code,
return DropdownMenuItem<String>( child: Text(projectProvider.isArabic == true ? value.name_ar : value.name),
value: value.code, );
child: Text(projectProvider.isArabic == true ? value.name_ar : value.name), }).toList())))),
); ),
}).toList())))),
], ],
), ),
Directionality( Directionality(

Loading…
Cancel
Save