Merge branch 'login_page' into 'development'

Login page

See merge request Cloud_Solution/driver-app!6
merge-requests/10/merge
Elham 6 years ago
commit 74763c85a2

@ -16,7 +16,7 @@ class AuthenticationViewModel extends BaseViewModel {
if (state == ViewState.Busy || state == ViewState.BusyLocal) {
return APP_STATUS.LOADING;
} else {
if (user != null) {
if ( user != null) {
return APP_STATUS.AUTHENTICATED;
} else {
return APP_STATUS.UNAUTHENTICATED;

@ -13,6 +13,7 @@ import 'package:driverapp/widgets/data_display/circle-container.dart';
import 'package:driverapp/widgets/input/text_field.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/widgets.dart';
import 'package:provider/provider.dart';
@ -28,9 +29,8 @@ class LoginPage extends StatelessWidget {
duration: Duration(microseconds: 350),
child: BaseView<AuthenticationViewModel>(
builder: (_, model, widget) => Scaffold(
//baseViewModel: model,
body: Center(
body: SingleChildScrollView(
child: Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
@ -144,11 +144,13 @@ class LoginPage extends StatelessWidget {
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
Text(
Expanded(
child: Text(
TranslationBase.of(context).enterCredentialsMsg,
style: TextStyle(
fontSize: 13, color: Colors.grey),
),
),
SizedBox(
height: 10,
)
@ -160,7 +162,6 @@ class LoginPage extends StatelessWidget {
),
Container(
child: TextFields(
onChanged: (value) => {},
hintText: TranslationBase.of(context).enterId,
validator: (value) {
if (value.isEmpty) {
@ -180,7 +181,6 @@ class LoginPage extends StatelessWidget {
Container(
child: TextFields(
borderRadiusValue: 6,
onChanged: (value) => {},
hintText:
TranslationBase.of(context).enterPassword,
validator: (value) {
@ -220,13 +220,9 @@ class LoginPage extends StatelessWidget {
),
SizedBox(
height: 10,
)
],
),
),
bottomSheet: Container(
),Container(
margin: EdgeInsets.all(10),
height: MediaQuery.of(context).size.height * 0.12,
height: MediaQuery.of(context).size.height * 0.22,
child: Column(
children: <Widget>[
SecondaryButton(
@ -241,7 +237,12 @@ class LoginPage extends StatelessWidget {
height: 30,
)
],
)),
))
],
),
),
),
),
),
);
@ -253,7 +254,6 @@ class LoginPage extends StatelessWidget {
await model.login(loginRequest);
if (model.state == ViewState.ErrorLocal) {
Utils.showErrorToast(model.error);
// Show error
} else {
Navigator.push(
context, MaterialPageRoute(builder: (context) => DashboardScreen()));

Loading…
Cancel
Save