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;
},
onSaved: (value) {
loginRequest.userID =
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',
),
onSaved: (value) {
loginRequest.userID = int.parse(value.trim());
},
),
SizedBox(
height: 25,
),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
Text(
TranslationBase.of(context).forgotPassword,
style: TextStyle(
fontSize: 14,
color: Theme.of(context).primaryColor),
),
],
),
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,
),
//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,
}) : super(key: key);
final double distanceInKilometers;
final dynamic distanceInKilometers;
@override
Widget build(BuildContext context) {

Loading…
Cancel
Save