Merge branch 'Amjad_search' into 'master'

patient screen Modify

See merge request Cloud_Solution/doctor_app_flutter!81
merge-requests/82/merge
amjad nabil amireh 6 years ago
commit 0c5503b4f9

@ -338,14 +338,14 @@ class _PatientsScreenState extends State<PatientsScreen> {
), ),
SizedBox(height: 10.0), SizedBox(height: 10.0),
Container( Container(
width: SizeConfig.screenWidth * 0.80, width: SizeConfig.screenWidth * 0.9,
child: TextField( child: TextField(
controller: _controller, controller: _controller,
onChanged: (String str) { onChanged: (String str) {
this.searchData(str); this.searchData(str);
}, },
decoration: buildInputDecoration( decoration: buildInputDecoration(
context, 'Search Patient'), context, 'Search '),
), ),
), ),
SizedBox( SizedBox(
@ -385,9 +385,9 @@ class _PatientsScreenState extends State<PatientsScreen> {
url + url +
avatarMale, avatarMale,
height: height:
100.0, 80.0,
width: width:
100.0, 80.0,
semanticsLabel: semanticsLabel:
'Male Logo') 'Male Logo')
] ]
@ -402,7 +402,11 @@ class _PatientsScreenState extends State<PatientsScreen> {
semanticsLabel: semanticsLabel:
'Female Logo') 'Female Logo')
], ],
), ),
SizedBox(
width: 10,
),
Column( Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment CrossAxisAlignment
@ -412,7 +416,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
item.firstName + item.firstName +
" " + " " +
item.lastName, item.lastName,
fontSize: 2.5 * fontSize: 2.0 *
SizeConfig SizeConfig
.textMultiplier, .textMultiplier,
fontWeight: fontWeight:
@ -437,12 +441,10 @@ class _PatientsScreenState extends State<PatientsScreen> {
backGroundcolor: backGroundcolor:
Colors.white, Colors.white,
), ),
SizedBox(
height: 8, // SizedBox(
), // height: 8,
SizedBox( // ),
height: 8,
),
AppText( AppText(
"Age:" + "Age:" +
item.age item.age
@ -566,7 +568,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
Widget _locationBar(BuildContext _context) { Widget _locationBar(BuildContext _context) {
return Container( return Container(
height: MediaQuery.of(context).size.height * 0.065, height: MediaQuery.of(context).size.height * 0.065,
width: SizeConfig.screenWidth * 0.80, width: SizeConfig.screenWidth * 0.9,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color(0Xffffffff), borderRadius: BorderRadius.circular(20)), color: Color(0Xffffffff), borderRadius: BorderRadius.circular(20)),
child: Row( child: Row(
@ -575,30 +577,35 @@ class _PatientsScreenState extends State<PatientsScreen> {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: _locations.map((item) { children: _locations.map((item) {
bool _isActive = _locations[_activeLocation] == item ? true : false; bool _isActive = _locations[_activeLocation] == item ? true : false;
return Column(mainAxisSize: MainAxisSize.min, children: <Widget>[ return Column(mainAxisSize: MainAxisSize.min,
children: <Widget>[
InkWell( InkWell(
child: Container( child: Center(
height: 40, child: Container(
width: 80, height: 40,
decoration: BoxDecoration( width: 90,
borderRadius: BorderRadius.circular(50), decoration: BoxDecoration(
color: _isActive ? Hexcolor("#B8382B") : Colors.white, borderRadius: BorderRadius.circular(50),
), color: _isActive ? Hexcolor("#B8382B") : Colors.white,
child: Center(
child: Text(
item,
style: TextStyle(
fontSize: 15,
color: _isActive
? Colors.white
: Colors.black, //Colors.black,
// backgroundColor:_isActive
// ? Hexcolor("#B8382B")
// : Colors.white,//sideColor,
fontWeight: FontWeight.bold),
), ),
)), child: Center(
child: Text(
item,
style: TextStyle(
fontSize: 12,
color: _isActive
? Colors.white
: Colors.black, //Colors.black,
// backgroundColor:_isActive
// ? Hexcolor("#B8382B")
// : Colors.white,//sideColor,
fontWeight: FontWeight.bold,
),
),
)),
),
onTap: () { onTap: () {
print(_locations.indexOf(item)); print(_locations.indexOf(item));
@ -606,7 +613,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
setState(() { setState(() {
_activeLocation = _locations.indexOf(item); _activeLocation = _locations.indexOf(item);
// sideColor=Colors.redAccent;
}); });
}), }),
_isActive _isActive
@ -616,7 +623,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
color: Colors.white), color: Colors.white),
alignment: Alignment.center, alignment: Alignment.center,
height: 3, height: 3,
width: 80, width: 90,
) )
: Container() : Container()
]); ]);

Loading…
Cancel
Save