Merge branch 'develop' into 'master'

Develop

See merge request Cloud_Solution/doctor_app_flutter!12
merge-requests/13/merge
ibrahim albitar 6 years ago
commit 93d2ec15aa

@ -28,8 +28,8 @@ class MyApp extends StatelessWidget {
title: 'Flutter Demo', title: 'Flutter Demo',
theme: ThemeData( theme: ThemeData(
primarySwatch: Colors.blue, primarySwatch: Colors.blue,
primaryColor: Hexcolor('#B8382C'), primaryColor: Color(0xff58434F),
buttonColor: Hexcolor('#B8382C'), buttonColor: Color(0xff58434F),
fontFamily: 'WorkSans',), fontFamily: 'WorkSans',),
initialRoute: INIT_ROUTE, initialRoute: INIT_ROUTE,
routes: routes, routes: routes,

@ -1,6 +1,12 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/widgets/shared/app_buttons_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart'; import 'package:flutter/rendering.dart';
import 'package:hexcolor/hexcolor.dart';
import '../../lookups/patient_lookup.dart'; import '../../lookups/patient_lookup.dart';
import '../../models/patient_model.dart'; import '../../models/patient_model.dart';
@ -54,389 +60,385 @@ class _PatientSearchScreenState extends State<PatientSearchScreen> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return AppScaffold(
appBar: AppBar( appBarTitle: "SEARCH FOR PATIENT",
title: Text("Search Patient"), body: ListView(
), children: <Widget>[
body: SingleChildScrollView( RoundedContainer(
child: LayoutBuilder(builder: (ctx, constraints) { child: Column(
var smallScreenSize = 660; children: <Widget>[
bool isSmallScreen = constraints.maxWidth <= smallScreenSize; Icon(
return Container( Icons.search,
padding: EdgeInsets.all(15), size: SizeConfig.imageSizeMultiplier * 15,
width: constraints.maxWidth * 0.9, ),
child: Form( Container(
key: _patientSearchForm, padding: EdgeInsets.all(15),
child: Column( width: SizeConfig.screenWidth * 1,
crossAxisAlignment: CrossAxisAlignment.start, child: Form(
children: <Widget>[ key: _patientSearchForm,
Text( child: Column(
'Patiant Type', crossAxisAlignment: CrossAxisAlignment.start,
style: TextStyle(fontSize: 16), children: <Widget>[
), SizedBox(
SizedBox( height: 5,
height: 10, ),
), RoundedContainer(
Container( margin: 0,
decoration: BoxDecoration( showBorder: true,
borderRadius: BorderRadius.all(Radius.circular(10.0)), raduis: 30,
border: borderColor: Color(0xff707070),
Border.all(color: Theme.of(context).primaryColor), width: double.infinity,
), child: Padding(
width: double.infinity, padding: EdgeInsets.only(
child: DropdownButton( top: SizeConfig.widthMultiplier * 0.9,
value: _selectedType, bottom: SizeConfig.widthMultiplier * 0.9,
iconSize: 24, right: SizeConfig.widthMultiplier * 3,
elevation: 16, left: SizeConfig.widthMultiplier * 3),
selectedItemBuilder: (BuildContext context) { child: Row(
return PATIENT_TYPE.map((item) { mainAxisSize: MainAxisSize.max,
return Text(item['text'], textAlign: TextAlign.end); children: <Widget>[
}).toList(); Expanded(
}, // add Expanded to have your dropdown button fill remaining space
onChanged: (String newValue) => { child: DropdownButton(
setState(() { isExpanded: true,
_selectedType = newValue; value: _selectedType,
}) iconSize: 40,
}, elevation: 16,
items: PATIENT_TYPE.map((item) { selectedItemBuilder:
return DropdownMenuItem( (BuildContext context) {
child: Text( return PATIENT_TYPE.map((item) {
'${item['text']}', return Row(
textAlign: TextAlign.end, mainAxisSize: MainAxisSize.max,
children: <Widget>[
AppText(
item['text'],
fontSize:
SizeConfig.textMultiplier *
2.1,
),
],
);
}).toList();
},
onChanged: (String newValue) => {
setState(() {
_selectedType = newValue;
})
},
items: PATIENT_TYPE.map((item) {
return DropdownMenuItem(
child: Text(
'${item['text']}',
textAlign: TextAlign.end,
),
value: item['val'],
);
}).toList(),
),
),
],
),
), ),
value: item['val'],
);
}).toList(),
),
),
SizedBox(
height: 10,
),
Text(
'First Name',
style: TextStyle(fontSize: 16),
),
SizedBox(
height: 10,
),
TextFormField(
decoration: InputDecoration(
hintText: 'First Name',
hintStyle: TextStyle(
fontSize: isSmallScreen
? 14
: constraints.maxWidth * 0.024),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(20)),
borderSide: BorderSide(color: Hexcolor('#CCCCCC')),
), ),
focusedBorder: OutlineInputBorder( SizedBox(
borderRadius: height: 10,
BorderRadius.all(Radius.circular(10.0)),
borderSide: BorderSide(
color: Theme.of(context).primaryColor),
)
//BorderRadius.all(Radius.circular(20));
), ),
onSaved: (value) { TextFormField(
_patientSearchFormValues.FirstName = value; decoration: InputDecoration(
}, hintText: 'First Name',
validator: (value) { hintStyle: TextStyle(
if (value.isEmpty) { fontSize: SizeConfig.textMultiplier * 2),
return 'Please enter some text'; enabledBorder: OutlineInputBorder(
} borderRadius:
return null; BorderRadius.all(Radius.circular(30)),
}, borderSide:
), BorderSide(color: Color(0xff707070)),
SizedBox( ),
height: 10, focusedBorder: OutlineInputBorder(
), borderRadius:
Text( BorderRadius.all(Radius.circular(30)),
'Middle Name', borderSide: BorderSide(
style: TextStyle(fontSize: 16), color: Theme.of(context).primaryColor),
), )
SizedBox( //BorderRadius.all(Radius.circular(20));
height: 10, ),
), onSaved: (value) {
TextFormField( _patientSearchFormValues.FirstName = value;
decoration: InputDecoration( },
hintText: 'Middle Name', validator: (value) {
hintStyle: TextStyle( if (value.isEmpty) {
fontSize: isSmallScreen return 'Please enter some text';
? 14 }
: constraints.maxWidth * 0.024), return null;
enabledBorder: OutlineInputBorder( },
borderRadius: BorderRadius.all(Radius.circular(20)),
borderSide: BorderSide(color: Hexcolor('#CCCCCC')),
), ),
focusedBorder: OutlineInputBorder( SizedBox(
borderRadius: height: 10,
BorderRadius.all(Radius.circular(10.0)),
borderSide: BorderSide(
color: Theme.of(context).primaryColor),
)
//BorderRadius.all(Radius.circular(20));
), ),
validator: (value) { TextFormField(
if (value.isEmpty) { decoration: InputDecoration(
return 'Please enter some text'; hintText: 'Middle Name',
} hintStyle: TextStyle(
return null; fontSize: SizeConfig.textMultiplier * 2),
}, enabledBorder: OutlineInputBorder(
onSaved: (value) { borderRadius:
_patientSearchFormValues.MiddleName = value; BorderRadius.all(Radius.circular(30)),
}, borderSide:
), BorderSide(color: Color(0xff707070)),
SizedBox( ),
height: 10, focusedBorder: OutlineInputBorder(
), borderRadius:
Text( BorderRadius.all(Radius.circular(30)),
'Last Name', borderSide: BorderSide(
style: TextStyle(fontSize: 16), color: Theme.of(context).primaryColor),
), )
SizedBox( //BorderRadius.all(Radius.circular(20));
height: 10, ),
), validator: (value) {
TextFormField( if (value.isEmpty) {
decoration: InputDecoration( return 'Please enter some text';
hintText: 'Last Name', }
hintStyle: TextStyle( return null;
fontSize: isSmallScreen },
? 14 onSaved: (value) {
: constraints.maxWidth * 0.024), _patientSearchFormValues.MiddleName = value;
enabledBorder: OutlineInputBorder( },
borderRadius: BorderRadius.all(Radius.circular(20)),
borderSide: BorderSide(color: Hexcolor('#CCCCCC')),
), ),
focusedBorder: OutlineInputBorder( SizedBox(
borderRadius: height: 10,
BorderRadius.all(Radius.circular(10.0)),
borderSide: BorderSide(
color: Theme.of(context).primaryColor),
)
//BorderRadius.all(Radius.circular(20));
), ),
validator: (value) { TextFormField(
if (value.isEmpty) { decoration: InputDecoration(
return 'Please enter some text'; hintText: 'Last Name',
} hintStyle: TextStyle(
return null; fontSize: SizeConfig.textMultiplier * 2),
}, enabledBorder: OutlineInputBorder(
onSaved: (value) { borderRadius:
_patientSearchFormValues.LastName = value; BorderRadius.all(Radius.circular(30)),
}, borderSide:
), BorderSide(color: Color(0xff707070)),
SizedBox( ),
height: 10, focusedBorder: OutlineInputBorder(
), borderRadius:
Text( BorderRadius.all(Radius.circular(30.0)),
'Phone Number', borderSide: BorderSide(
style: TextStyle(fontSize: 16), color: Theme.of(context).primaryColor),
), )
SizedBox( //BorderRadius.all(Radius.circular(20));
height: 10, ),
), validator: (value) {
TextFormField( if (value.isEmpty) {
keyboardType: TextInputType.number, return 'Please enter some text';
decoration: InputDecoration( }
hintText: 'Phone Number', return null;
hintStyle: TextStyle( },
fontSize: isSmallScreen onSaved: (value) {
? 14 _patientSearchFormValues.LastName = value;
: constraints.maxWidth * 0.024), },
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(20)),
borderSide: BorderSide(color: Hexcolor('#CCCCCC')),
), ),
focusedBorder: OutlineInputBorder( SizedBox(
borderRadius: height: 10,
BorderRadius.all(Radius.circular(10.0)),
borderSide: BorderSide(
color: Theme.of(context).primaryColor),
)
//BorderRadius.all(Radius.circular(20));
), ),
validator: (value) { TextFormField(
if (value.isEmpty) { keyboardType: TextInputType.number,
return 'Please enter some text'; decoration: InputDecoration(
} hintText: 'Phone Number',
return null; hintStyle: TextStyle(
}, fontSize: SizeConfig.textMultiplier * 2),
onSaved: (value) { enabledBorder: OutlineInputBorder(
_patientSearchFormValues.PatientMobileNumber = value; borderRadius:
}, BorderRadius.all(Radius.circular(30)),
), borderSide:
SizedBox( BorderSide(color: Color(0xff707070)),
height: 10, ),
), focusedBorder: OutlineInputBorder(
// Container(child: GridView(gridDelegate: null,),) borderRadius:
SizedBox( BorderRadius.all(Radius.circular(30.0)),
height: 10, borderSide: BorderSide(
), color: Theme.of(context).primaryColor),
Text( )
'Patiant ID', //BorderRadius.all(Radius.circular(20));
style: TextStyle(fontSize: 16), ),
), validator: (value) {
SizedBox( if (value.isEmpty) {
height: 10, return 'Please enter some text';
), }
TextFormField( return null;
keyboardType: TextInputType.number, },
decoration: InputDecoration( onSaved: (value) {
hintText: 'Patiant ID', _patientSearchFormValues.PatientMobileNumber =
hintStyle: TextStyle( value;
fontSize: isSmallScreen },
? 14 ),
: constraints.maxWidth * 0.024), SizedBox(
enabledBorder: OutlineInputBorder( height: 10,
borderRadius: ),
BorderRadius.all(Radius.circular(20)), TextFormField(
borderSide: keyboardType: TextInputType.number,
BorderSide(color: Hexcolor('#CCCCCC')), decoration: InputDecoration(
), hintText: 'Patiant ID',
focusedBorder: OutlineInputBorder( hintStyle: TextStyle(
borderRadius: fontSize: SizeConfig.textMultiplier * 2),
BorderRadius.all(Radius.circular(10.0)), enabledBorder: OutlineInputBorder(
borderSide: BorderSide( borderRadius:
color: Theme.of(context).primaryColor), BorderRadius.all(Radius.circular(30)),
) borderSide:
//BorderRadius.all(Radius.circular(20)); BorderSide(color: Color(0xff707070)),
),
focusedBorder: OutlineInputBorder(
borderRadius:
BorderRadius.all(Radius.circular(30.0)),
borderSide: BorderSide(
color: Theme.of(context).primaryColor),
)
//BorderRadius.all(Radius.circular(20));
),
validator: (value) {
if (value.isEmpty) {
return 'Please enter some text';
}
return null;
},
onSaved: (value) {
_patientSearchFormValues.PatientID =
int.parse(value);
}),
SizedBox(
height: 10,
),
TextFormField(
keyboardType: TextInputType.number,
decoration: InputDecoration(
hintText: 'Patiant File',
hintStyle: TextStyle(
fontSize: SizeConfig.textMultiplier * 2),
enabledBorder: OutlineInputBorder(
borderRadius:
BorderRadius.all(Radius.circular(30)),
borderSide:
BorderSide(color: Color(0xff707070)),
),
focusedBorder: OutlineInputBorder(
borderRadius:
BorderRadius.all(Radius.circular(30.0)),
borderSide: BorderSide(
color: Theme.of(context).primaryColor),
)
//BorderRadius.all(Radius.circular(20));
),
validator: (value) {
if (value.isEmpty) {
return 'Please enter some text';
}
return null;
},
onSaved: (value) {
// _patientSearchFormValues. = value;
},
),
(!(_selectedType == '3' || _selectedType == '5'))
? DynamicElements(_patientSearchFormValues)
: SizedBox(
height: 0,
),
SizedBox(
height: 10,
),
RoundedContainer(
margin: 0,
showBorder: true,
raduis: 30,
borderColor: Color(0xff707070),
width: double.infinity,
child: Padding(
padding: EdgeInsets.only(
top: SizeConfig.widthMultiplier * 0.9,
bottom: SizeConfig.widthMultiplier * 0.9,
right: SizeConfig.widthMultiplier * 3,
left: SizeConfig.widthMultiplier * 3),
child: Row(
mainAxisSize: MainAxisSize.max,
children: <Widget>[
Expanded(
// add Expanded to have your dropdown button fill remaining space
child: DropdownButton(
isExpanded: true,
value: _selectedLocation,
iconSize: 40,
elevation: 16,
selectedItemBuilder:
(BuildContext context) {
return LOCATIONS.map((item) {
return Row(
mainAxisSize: MainAxisSize.max,
children: <Widget>[
AppText(
item['text'],
fontSize:
SizeConfig.textMultiplier *
2.1,
),
],
);
}).toList();
},
onChanged: (String newValue) => {
setState(() {
_selectedLocation = newValue;
})
},
items: LOCATIONS.map((item) {
return DropdownMenuItem(
child: Text(
'${item['text']}',
textAlign: TextAlign.end,
),
value: item['val'],
);
}).toList(),
),
),
],
),
), ),
validator: (value) {
if (value.isEmpty) {
return 'Please enter some text';
}
return null;
},
onSaved: (value) {
_patientSearchFormValues.PatientID = int.parse(value);
}),
SizedBox(
height: 10,
),
Text(
'Patiant File',
style: TextStyle(fontSize: 16),
),
SizedBox(
height: 10,
),
TextFormField(
keyboardType: TextInputType.number,
decoration: InputDecoration(
hintText: 'Patiant File',
hintStyle: TextStyle(
fontSize: isSmallScreen
? 14
: constraints.maxWidth * 0.024),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(20)),
borderSide: BorderSide(color: Hexcolor('#CCCCCC')),
), ),
focusedBorder: OutlineInputBorder( Container(
borderRadius: child: Row(
BorderRadius.all(Radius.circular(10.0)), mainAxisAlignment: MainAxisAlignment.start,
borderSide: BorderSide( children: <Widget>[
color: Theme.of(context).primaryColor), Checkbox(
) value: true,
//BorderRadius.all(Radius.circular(20)); activeColor: Color(0xffFFDDD9),
onChanged: (bool newValue) {}),
AppText('Only Arrived Patient',
fontSize: SizeConfig.textMultiplier * 2),
])),
SizedBox(
height: 10,
), ),
validator: (value) { ],
if (value.isEmpty) {
return 'Please enter some text';
}
return null;
},
onSaved: (value) {
// _patientSearchFormValues. = value;
},
),
(!(_selectedType=='3' ||_selectedType=='5'))? DynamicElements(_patientSearchFormValues): SizedBox(
height: 0,
),
SizedBox(
height: 10,
),
Text(
'Patiant',
style: TextStyle(fontSize: 16),
),
SizedBox(
height: 10,
),
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(10.0)),
border:
Border.all(color: Theme.of(context).primaryColor),
),
width: double.infinity,
child: DropdownButton(
value: _selectedLocation,
iconSize: 24,
elevation: 16,
selectedItemBuilder: (BuildContext context) {
return LOCATIONS.map((item) {
return Text(item['text']);
}).toList();
},
onChanged: (String newValue) => {
setState(() {
_selectedLocation = newValue;
})
},
items: LOCATIONS.map((item) {
return DropdownMenuItem(
child: Text('${item['text']}'),
value: item['val'],
);
}).toList(),
), ),
), ),
SizedBox( )
height: 10, ],
), ),
Row( ),
mainAxisAlignment: MainAxisAlignment.center, Container(
children: <Widget>[ margin: EdgeInsets.all(SizeConfig.widthMultiplier * 5),
RaisedButton( child: Wrap(
onPressed: () { alignment: WrapAlignment.center,
_saveForm(); children: <Widget>[
}, AppButton(
textColor: Colors.white, title: "Search",
elevation: 0.0, color: Color(0xff58434F),
padding: const EdgeInsets.all(0.0), onPressed: () {
shape: RoundedRectangleBorder( print("Tapped Me");
borderRadius: BorderRadius.circular(10), },
side: BorderSide( ),
width: 0.5, color: Hexcolor('#CCCCCC'))), ],
child: Container(
padding: const EdgeInsets.all(10.0),
height: 50,
width: 200,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: <Widget>[
Text('Search',
textAlign: TextAlign.center,
style: TextStyle(
fontSize: isSmallScreen
? 20
: constraints.maxWidth * 0.020)),
Icon(Icons.search)
],
),
),
)
],
)
],
),
), ),
); )
}), ],
)); ));
} }
} }

@ -0,0 +1,63 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/drawer_item_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart';
import 'package:flutter/material.dart';
class ProfileScreen extends StatefulWidget {
ProfileScreen({Key key, this.title}) : super(key: key);
final String title;
@override
_ProfileScreenState createState() => _ProfileScreenState();
}
class _ProfileScreenState extends State<ProfileScreen> {
@override
Widget build(BuildContext context) {
return AppScaffold(
appBarTitle:'Profile',
body:ListView(
padding: EdgeInsets.zero,
children: <Widget>[
Container(
height: SizeConfig.heightMultiplier * 30,
child: DrawerHeader(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
CircleAvatar(
radius: SizeConfig.imageSizeMultiplier * 12,
backgroundImage: NetworkImage(
"https://p.kindpng.com/picc/s/404-4042774_profile-photo-circle-circle-profile-picture-png-transparent.png"),
backgroundColor: Colors.transparent,
),
Padding(
padding: EdgeInsets.only(top: 10),
child: AppText(
"Dr. Chris evans",
fontWeight: FontWeight.bold,
fontSize: SizeConfig.textMultiplier * 3,
)),
AppText("Director of medical records",)
],
),
),
),
RoundedContainer(child: ListView(children: <Widget>[
DrawerItem("Gender", Icons.person_pin, color: Colors.black, subTitle: "Male",),
DrawerItem("Clinic", Icons.build, color: Colors.black, subTitle: "Neurology Clinic",),
DrawerItem("Hospital", Icons.local_hospital, color: Colors.black, subTitle: "Al-Takkassussi",),
DrawerItem("Speciality", Icons.crop_square, color: Colors.black, subTitle: "being great",),
],),
width: SizeConfig.screenWidth*0.70,
height: SizeConfig.screenHeight*0.40,
),
]
));
}
}

@ -0,0 +1,8 @@
extension Extension on Object {
bool isNullOrEmpty() => this == null || this == '';
bool isNullEmptyOrFalse() => this == null || this == '' || !this;
bool isNullEmptyZeroOrFalse() =>
this == null || this == '' || !this || this == 0;
}

@ -45,13 +45,7 @@ class _DynamicElementsState extends State<DynamicElements> {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
SizedBox(
height: 10,
),
Text(
'From',
style: TextStyle(fontSize: 16),
),
SizedBox( SizedBox(
height: 10, height: 10,
), ),
@ -59,16 +53,16 @@ class _DynamicElementsState extends State<DynamicElements> {
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
controller: _fromDateController, controller: _fromDateController,
decoration: InputDecoration( decoration: InputDecoration(
hintText: '3/11/2020', hintText: 'From',
hintStyle: TextStyle( hintStyle: TextStyle(
fontSize: fontSize:
isSmallScreen ? 14 : constraints.maxWidth * 0.024), isSmallScreen ? 14 : constraints.maxWidth * 0.024),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(20)), borderRadius: BorderRadius.all(Radius.circular(30)),
borderSide: BorderSide(color: Hexcolor('#CCCCCC')), borderSide: BorderSide(color: Color(0xff707070)),
), ),
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(10.0)), borderRadius: BorderRadius.all(Radius.circular(30.0)),
borderSide: borderSide:
BorderSide(color: Theme.of(context).primaryColor), BorderSide(color: Theme.of(context).primaryColor),
) )
@ -87,13 +81,7 @@ class _DynamicElementsState extends State<DynamicElements> {
widget._patientSearchFormValues.From = value; widget._patientSearchFormValues.From = value;
}, },
), ),
SizedBox(
height: 10,
),
Text(
'TO',
style: TextStyle(fontSize: 16),
),
SizedBox( SizedBox(
height: 10, height: 10,
), ),
@ -101,16 +89,16 @@ class _DynamicElementsState extends State<DynamicElements> {
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
controller: _toDateController, controller: _toDateController,
decoration: InputDecoration( decoration: InputDecoration(
hintText: '3/11/2020', hintText: 'TO',
hintStyle: TextStyle( hintStyle: TextStyle(
fontSize: fontSize:
isSmallScreen ? 14 : constraints.maxWidth * 0.024), isSmallScreen ? 14 : constraints.maxWidth * 0.024),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(20)), borderRadius: BorderRadius.all(Radius.circular(30)),
borderSide: BorderSide(color: Hexcolor('#CCCCCC')), borderSide: BorderSide(color: Color(0xff707070)),
), ),
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.all(Radius.circular(10.0)), borderRadius: BorderRadius.all(Radius.circular(30.0)),
borderSide: borderSide:
BorderSide(color: Theme.of(context).primaryColor), BorderSide(color: Theme.of(context).primaryColor),
) )
@ -129,29 +117,7 @@ class _DynamicElementsState extends State<DynamicElements> {
widget._patientSearchFormValues.To = value; widget._patientSearchFormValues.To = value;
}, },
), ),
SizedBox(
height: 10,
),
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(10.0)),
border: Border.all(color: Theme.of(context).primaryColor),
),
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
Checkbox(
value: true,
activeColor: Theme.of(context).primaryColor,
onChanged: (bool newValue) {}),
Text('Only Arrived Patient',
style: TextStyle(
fontSize: isSmallScreen
? 18
: constraints.maxWidth * 0.018)),
],
),
)
], ],
); );
}, },

@ -0,0 +1,58 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'app_texts_widget.dart';
class AppButton extends StatefulWidget {
final GestureTapCallback onPressed;
final String title;
final IconData icon;
final Color color;
AppButton({@required this.onPressed, this.title, this.icon, this.color});
_AppButtonState createState() => _AppButtonState();
}
class _AppButtonState extends State<AppButton>{
@override
Widget build(BuildContext context) {
return
RawMaterialButton(
fillColor: widget.color,
splashColor: widget.color,
child: Padding(
padding: EdgeInsets.only(
top: 10,
bottom: 10,
right: SizeConfig.widthMultiplier * 15,
left: SizeConfig.widthMultiplier* 15
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
/*Icon(
widget.icon,
color: Colors.white,
),
SizedBox(
width: 10.0,
),*/
AppText(
widget.title,
color: Colors.white,
fontSize: SizeConfig.textMultiplier * 2.5,
fontWeight: FontWeight.bold,
),
],
),
),
onPressed: widget.onPressed,
shape: const StadiumBorder(),
);
}
}

@ -40,7 +40,7 @@ class AppScaffold extends StatelessWidget {
textTheme: TextTheme( textTheme: TextTheme(
title: TextStyle( title: TextStyle(
color: Colors.black, fontWeight: FontWeight.bold)), color: Colors.black, fontWeight: FontWeight.bold)),
title: Text(appBarTitle), title: Text(appBarTitle.toUpperCase()),
leading: Builder(builder: (BuildContext context) { leading: Builder(builder: (BuildContext context) {
return new GestureDetector( return new GestureDetector(
onTap: () { onTap: () {

@ -1,6 +1,8 @@
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../util/extenstions.dart';
// OWNER : Ibrahim albitar // OWNER : Ibrahim albitar
// DATE : 12-04-2020 // DATE : 12-04-2020
@ -17,6 +19,7 @@ class AppText extends StatefulWidget {
final double marginRight; final double marginRight;
final double marginBottom; final double marginBottom;
final double marginLeft; final double marginLeft;
final bool visibility;
AppText(this.data, AppText(this.data,
{this.color = Colors.black, {this.color = Colors.black,
@ -27,7 +30,8 @@ class AppText extends StatefulWidget {
this.marginTop = 0, this.marginTop = 0,
this.marginRight = 0, this.marginRight = 0,
this.marginBottom = 0, this.marginBottom = 0,
this.marginLeft = 0,}); this.marginLeft = 0,
this.visibility = true});
@override @override
_AppTextState createState() => _AppTextState(); _AppTextState createState() => _AppTextState();
@ -37,20 +41,23 @@ class _AppTextState extends State<AppText> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Visibility(
margin: widget.margin != null ? EdgeInsets.all(widget.margin) : EdgeInsets.only( visible: widget.visibility,
top: widget.marginTop, child: Container(
right: widget.marginRight, margin: widget.margin != null ? EdgeInsets.all(widget.margin) : EdgeInsets.only(
bottom: widget.marginBottom, top: widget.marginTop,
left: widget.marginLeft right: widget.marginRight,
), bottom: widget.marginBottom,
child: Text( left: widget.marginLeft
widget.data, ),
style: TextStyle( child: Text(
color: widget.color, widget.data,
fontWeight: widget.fontWeight, style: TextStyle(
fontSize: widget.fontSize ?? (SizeConfig.textMultiplier * 2), color: widget.color,
fontFamily: widget.fontFamily), fontWeight: widget.fontWeight,
fontSize: widget.fontSize ?? (SizeConfig.textMultiplier * 2),
fontFamily: widget.fontFamily),
),
), ),
); );
} }

@ -2,6 +2,7 @@ import 'dart:ui';
import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../util/extenstions.dart';
import '../shared/app_texts_widget.dart'; import '../shared/app_texts_widget.dart';
@ -12,9 +13,12 @@ import '../shared/app_texts_widget.dart';
class DrawerItem extends StatefulWidget { class DrawerItem extends StatefulWidget {
final String title; final String title;
final String subTitle;
final IconData icon; final IconData icon;
final Color color;
DrawerItem(this.title, this.icon);
DrawerItem(this.title, this.icon,{this.color, this.subTitle = ''});
@override @override
_DrawerItemState createState() => _DrawerItemState(); _DrawerItemState createState() => _DrawerItemState();
@ -30,15 +34,27 @@ class _DrawerItemState extends State<DrawerItem> {
children: <Widget>[ children: <Widget>[
Icon( Icon(
widget.icon, widget.icon,
color: Colors.white, color: widget.color??Colors.white,
size: SizeConfig.imageSizeMultiplier * 7, size: SizeConfig.imageSizeMultiplier * 7,
), ),
AppText( Column(
widget.title, crossAxisAlignment: CrossAxisAlignment.start,
color: Colors.white, children: <Widget>[
fontWeight: FontWeight.bold, AppText(
margin: 10, widget.title,
fontSize: SizeConfig.textMultiplier * 2.5, color: widget.color??Colors.white,
fontWeight: FontWeight.bold,
margin: 5,
fontSize: SizeConfig.textMultiplier * 2.5,
),
AppText(
widget.subTitle,
visibility: !widget.subTitle.isNullOrEmpty(),
color: widget.color??Colors.white,
marginLeft: 5,
fontSize: SizeConfig.textMultiplier * 2.5,
),
],
), ),
], ],
)); ));

@ -14,7 +14,7 @@ description: A new Flutter project.
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ">=2.1.0 <3.0.0" sdk: ">=2.6.0 <3.0.0"
dependencies: dependencies:
flutter: flutter:

Loading…
Cancel
Save