Merge branch 'development' into 'master'

Development

See merge request Cloud_Solution/doctor_app_flutter!113
merge-requests/115/head
Mohammad Aljammal 6 years ago
commit 446e09a1fc

@ -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,

@ -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',

@ -54,19 +54,22 @@ class _LoginFormState extends State<LoginForm> {
void initState() {
super.initState();
initPlatformState();
}
@override
void didChangeDependencies() {
super.didChangeDependencies();
if (_isInit) {
if (projectsList.length == 0) {
getProjectsList();
}
if (projectsList.length == 0) {
getProjectsList();
}
}
_isInit = false;
}
@override
Widget build(BuildContext context) {
final focusPass = FocusNode();

@ -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(

@ -291,23 +291,18 @@ class PatientProfileButton extends StatelessWidget {
navigator(context, this.route);
},
child: Column(children: <Widget>[
Expanded(
flex: 1,
child: Expanded(
child: Container(
alignment: Alignment.topLeft,
padding: EdgeInsets.all(5),
child: new AppText(
this.name,
color: Colors.red,
fontWeight: FontWeight.w600,
textAlign: TextAlign.left,
fontSize: SizeConfig.textMultiplier * 2,
),
)),
Container(
alignment: Alignment.topLeft,
padding: EdgeInsets.all(5),
child: new AppText(
this.name,
color: Colors.red,
fontWeight: FontWeight.w600,
textAlign: TextAlign.left,
fontSize: SizeConfig.textMultiplier * 2,
),
),
Expanded(
flex: 1,
Container(
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[

Loading…
Cancel
Save