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 @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
FocusScopeNode currentFocus = FocusScope.of(context);
if (!currentFocus.hasPrimaryFocus) {
currentFocus.unfocus();
}
projectsProvider = Provider.of(context); projectsProvider = Provider.of(context);
return SafeArea( return SafeArea(
bottom: true, bottom: true,

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

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

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

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

Loading…
Cancel
Save