diff --git a/lib/pages/authentication/login_page.dart b/lib/pages/authentication/login_page.dart index 79046f7..69c4075 100644 --- a/lib/pages/authentication/login_page.dart +++ b/lib/pages/authentication/login_page.dart @@ -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: [ - 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: [ +// Text( +// TranslationBase.of(context).forgotPassword, +// style: TextStyle( +// fontSize: 14, +// color: Theme.of(context).primaryColor), +// ), +// ], +// ), + ], ), + ), ], ), ), diff --git a/lib/widgets/delivery/distance_in_kilometers.dart b/lib/widgets/delivery/distance_in_kilometers.dart index 745aaef..70e0ecd 100644 --- a/lib/widgets/delivery/distance_in_kilometers.dart +++ b/lib/widgets/delivery/distance_in_kilometers.dart @@ -7,7 +7,7 @@ class DistanceInKilometers extends StatelessWidget { Key key, }) : super(key: key); - final double distanceInKilometers; + final dynamic distanceInKilometers; @override Widget build(BuildContext context) {