Merge branch 'development' into 'master'

Development

See merge request Cloud_Solution/driver-app!81
master_hussam
Elham 6 years ago
commit 80b9eea5ea

@ -79,4 +79,8 @@ class AuthenticationViewModel with ChangeNotifier {
notifyListeners(); notifyListeners();
} }
} }
logout() async {
await sharedPref.clear();
}
} }

@ -1,17 +1,21 @@
import 'package:driverapp/core/viewModels/authentication_view_model.dart';
import 'package:driverapp/pages/authentication/login_page.dart';
import 'package:driverapp/uitl/translations_delegate_base.dart'; import 'package:driverapp/uitl/translations_delegate_base.dart';
import 'package:driverapp/widgets/others/app_scaffold_widget.dart'; import 'package:driverapp/widgets/others/app_scaffold_widget.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
class SettingPage extends StatelessWidget { class SettingPage extends StatelessWidget {
final String driverName;//_authenticationViewModel.user.userName final String driverName; //_authenticationViewModel.user.userName
final int driverID; final int driverID;
AuthenticationViewModel _authenticationViewModel;
SettingPage({this.driverName, this.driverID}); SettingPage({this.driverName, this.driverID});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
_authenticationViewModel = Provider.of(context);
return AppScaffold( return AppScaffold(
isShowAppBar: true, isShowAppBar: true,
appBarColor: Color(0xff30B7B9), appBarColor: Color(0xff30B7B9),
@ -73,6 +77,15 @@ class SettingPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[ children: <Widget>[
InkWell( InkWell(
onTap: () async {
await _authenticationViewModel.logout();
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => LoginPage()
),
);
},
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[

@ -34,7 +34,7 @@ class _SplashScreenPageState extends State<SplashScreenPage> {
body: SingleChildScrollView( body: SingleChildScrollView(
child: Center( child: Center(
child: Column( child: Column(
// mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: <Widget>[ children: <Widget>[
FractionallySizedBox( FractionallySizedBox(
widthFactor: 0.80, widthFactor: 0.80,
@ -49,16 +49,16 @@ class _SplashScreenPageState extends State<SplashScreenPage> {
Container( Container(
child: Icon( child: Icon(
DriverApp.logo, DriverApp.logo,
size: 110, size: 120,
color: Colors.white, color: Colors.white,
), ),
margin: EdgeInsets.only( margin: EdgeInsets.only(
right: projectViewModel.isArabic right: projectViewModel.isArabic
? 0 ? 0
: MediaQuery.of(context).size.width * 0.15, : MediaQuery.of(context).size.width * 0.20,
left: !projectViewModel.isArabic left: !projectViewModel.isArabic
? 0 ? 0
: MediaQuery.of(context).size.width * 0.15), : MediaQuery.of(context).size.width * 0.10),
), ),
], ],
), ),
@ -92,7 +92,7 @@ class _SplashScreenPageState extends State<SplashScreenPage> {
], ],
), ),
SizedBox( SizedBox(
height: 280, height: 100,
) )
], ],
), ),

Loading…
Cancel
Save