Merge branch 'DistanceInKilometers' into 'development'

fix issues related to DistanceInKilometers

See merge request Cloud_Solution/driver-app!87
merge-requests/88/head
Elham 6 years ago
commit 8113d2db19

@ -185,8 +185,7 @@ class LoginPage extends StatelessWidget {
return null; return null;
}, },
onSaved: (value) { onSaved: (value) {
loginRequest.userID = loginRequest.userID = int.parse(value.trim());
int.parse(value.trim());
}, },
), ),
), ),
@ -214,17 +213,18 @@ class LoginPage extends StatelessWidget {
SizedBox( SizedBox(
height: 25, height: 25,
), ),
Row( //ToDo when forget page functions ready
mainAxisAlignment: MainAxisAlignment.end, // Row(
children: <Widget>[ // mainAxisAlignment: MainAxisAlignment.end,
Text( // children: <Widget>[
TranslationBase.of(context).forgotPassword, // Text(
style: TextStyle( // TranslationBase.of(context).forgotPassword,
fontSize: 14, // style: TextStyle(
color: Theme.of(context).primaryColor), // 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