Merge branch 'development' into 'master'

Development

See merge request Cloud_Solution/driver-app!88
merge-requests/90/merge
Mohammad Aljammal 5 years ago
commit 682a5e8d61

@ -184,50 +184,50 @@ class LoginPage extends StatelessWidget {
} }
return null; return null;
}, },
onSaved: (value) { onSaved: (value) {
loginRequest.userID = loginRequest.userID = int.parse(value.trim());
int.parse(value.trim()); },
},
),
),
SizedBox(
height: 20,
),
Container(
child: TextFields(
borderRadiusValue: 6,
hintText:
TranslationBase.of(context).enterPassword,
validator: (value) {
if (value.isEmpty) {
return TranslationBase.of(context)
.pleaseEnterPassword;
}
return null;
},
onSaved: (value) {
loginRequest.password = value;
},
type: 'password',
),
), ),
SizedBox( ),
height: 25, SizedBox(
), height: 20,
Row( ),
mainAxisAlignment: MainAxisAlignment.end, Container(
children: <Widget>[ child: TextFields(
Text( borderRadiusValue: 6,
TranslationBase.of(context).forgotPassword, hintText:
style: TextStyle( TranslationBase.of(context).enterPassword,
fontSize: 14, validator: (value) {
color: Theme.of(context).primaryColor), if (value.isEmpty) {
), return TranslationBase.of(context)
], .pleaseEnterPassword;
}
return null;
},
onSaved: (value) {
loginRequest.password = value;
},
type: 'password',
), ),
], ),
), SizedBox(
height: 25,
),
//ToDo when forget page functions ready
// Row(
// mainAxisAlignment: MainAxisAlignment.end,
// children: <Widget>[
// Text(
// TranslationBase.of(context).forgotPassword,
// style: TextStyle(
// fontSize: 14,
// color: Theme.of(context).primaryColor),
// ),
// ],
// ),
],
), ),
),
], ],
), ),
), ),

@ -7,7 +7,7 @@ class DistanceInKilometers extends StatelessWidget {
Key key, Key key,
}) : super(key: key); }) : super(key: key);
final double distanceInKilometers; final dynamic distanceInKilometers;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {

Loading…
Cancel
Save