Merge branch 'development' into 'master'

Development

See merge request Cloud_Solution/doctor_app_flutter!113

lib/screens/dashboard_screen.dart

@@ -37,6 +37,11 @@ class _DashboardScreenState extends State<DashboardScreen> {
 
   @override
   Widget build(BuildContext context) {
+    FocusScopeNode currentFocus = FocusScope.of(context);
+
+    if (!currentFocus.hasPrimaryFocus) {
+      currentFocus.unfocus();
+    }
     projectsProvider = Provider.of(context);
     return SafeArea(
       bottom: true,

lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart

@@ -99,7 +99,7 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
                                               vitalSignDetails.bodyMeasurements
                                         });
                                   },
-                                  child: Expanded(
+                                  child: Container(
                                     child: VitalSignItem(
                                       des: 'Body Measurements',
                                       url: url + 'heartbeat.png',
@@ -118,7 +118,7 @@ class _VitalSignDetailsScreenState extends State<VitalSignDetailsScreen> {
                                           
                                         });
                                   },
-                                  child: Expanded(
+                                  child: Container(
                                     child: VitalSignItem(
                                       des: 'Temperature',
                                       url: url + 'heartbeat.png',

lib/widgets/auth/login_form.dart

@@ -54,6 +54,8 @@ class _LoginFormState extends State<LoginForm> {
   void initState() {
     super.initState();
     initPlatformState();
+
+  
   }
 
   @override
@@ -67,6 +69,7 @@ class _LoginFormState extends State<LoginForm> {
     _isInit = false;
   }
 
+
   @override
   Widget build(BuildContext context) {
     final focusPass = FocusNode();

lib/widgets/patients/profile/patient_profile_widget.dart

@@ -36,8 +36,7 @@ class PatientProfileWidget extends StatelessWidget {
       SliverList(
         delegate: SliverChildListDelegate(
           [
-            Expanded(
-              flex: 1,
+            Container(
               child: Row(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: <Widget>[
@@ -78,7 +77,7 @@ class PatientProfileWidget extends StatelessWidget {
       ),
       SliverPadding(
           padding: const EdgeInsets.fromLTRB(20, 30, 15, 10),
-          sliver: ProfileMedicalInfoWidget())
+          sliver: ProfileMedicalInfoWidget(patient: patient,))
     ]);
 
     // Container(

lib/widgets/patients/profile/profile_medical_info_widget.dart

@@ -291,10 +291,7 @@ class PatientProfileButton extends StatelessWidget {
           navigator(context, this.route);
         },
         child: Column(children: <Widget>[
-          Expanded(
-            flex: 1,
-            child: Expanded(
-                child: Container(
+          Container(
             alignment: Alignment.topLeft,
             padding: EdgeInsets.all(5),
             child: new AppText(
@@ -304,10 +301,8 @@ class PatientProfileButton extends StatelessWidget {
               textAlign: TextAlign.left,
               fontSize: SizeConfig.textMultiplier * 2,
             ),
-            )),
           ),
-          Expanded(
-              flex: 1,
+          Container(
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.end,
                 children: <Widget>[