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

hot fixing

See merge request Cloud_Solution/diplomatic-quarter!223

lib/main.dart

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

lib/pages/landing/landing_page.dart

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

lib/pages/login/confirm-login.dart

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

lib/pages/medical/medical_profile_page.dart

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

lib/splashPage.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'package:diplomaticquarterapp/pages/landing/landing_page.dart';
 import 'package:diplomaticquarterapp/uitl/app_shared_preferences.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
+import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
@@ -11,6 +12,7 @@ import 'core/service/AuthenticatedUserObject.dart';
 import 'core/viewModels/project_view_model.dart';
 import 'locator.dart';
 import 'models/Authentication/authenticated_user.dart';
+import 'widgets/transitions/slide_up_page.dart';
 
 AppSharedPreferences sharedPref = new AppSharedPreferences();
 AuthenticatedUserObject authenticatedUserObject =
@@ -27,14 +29,11 @@ class _SplashScreenState extends State<SplashScreen> {
   void initState() {
     super.initState();
     Timer(
-      Duration(seconds: 1, milliseconds: 500),
+      Duration(seconds: 1, milliseconds: 800),
       () {
         Provider.of<ProjectViewModel>(context, listen: false).loadSharedPrefLanguage().then((value) {
-          Navigator.of(context).pushReplacement(
-            MaterialPageRoute(
-              builder: (BuildContext context) => LandingPage(),
-            ),
-          );
+          Navigator.of(context).pushReplacement(FadePage(page: LandingPage()));
+
         });
       },
     );
@@ -48,28 +47,7 @@ class _SplashScreenState extends State<SplashScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       backgroundColor: Colors.white,
-      body: Column(
-        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,
-              )
-            ],
-          )
-        ],
-      ),
+      body: Image.asset('assets/images/powerd-by.jpg',fit: BoxFit.fitWidth,width: MediaQuery.of(context).size.width,),
     );
   }
 }

lib/widgets/mobile-no/mobile_no.dart

@@ -53,7 +53,8 @@ class _MobileNo extends State<MobileNo> {
       Row(
         mainAxisAlignment: MainAxisAlignment.center,
         children: <Widget>[
-          Container(
+          Expanded(
+            child: Container(
                 margin: EdgeInsets.only(bottom: 10.0),
                 height: 60.0,
                 decoration: BoxDecoration(
@@ -87,6 +88,7 @@ class _MobileNo extends State<MobileNo> {
                                 child: Text(projectProvider.isArabic == true ? value.name_ar : value.name),
                               );
                             }).toList())))),
+          ),
         ],
       ),
         Directionality(