diff --git a/lib/Screens/Main/components/body.dart b/lib/Screens/Main/components/body.dart index 1cf0b55..2b31484 100644 --- a/lib/Screens/Main/components/body.dart +++ b/lib/Screens/Main/components/body.dart @@ -2,17 +2,18 @@ import 'package:auto_size_text/auto_size_text.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; +import 'package:manager_app/Models/managerContext.dart'; import 'package:manager_app/Models/menu.dart'; import 'package:manager_app/Models/menuSection.dart'; import 'package:manager_app/Screens/Configurations/configurations_screen.dart'; import 'package:manager_app/Screens/Devices/devices_screen.dart'; import 'package:manager_app/Screens/Main/components/background.dart'; import 'package:manager_app/Screens/Resources/resources_screen.dart'; +import 'package:manager_app/Screens/login_screen.dart'; import 'package:manager_app/app_context.dart'; +import 'package:manager_app/constants.dart'; import 'package:provider/provider.dart'; -import '../../../constants.dart'; - class Body extends StatefulWidget { Body({Key key}) : super(key: key); @@ -119,10 +120,37 @@ class _BodyState extends State { Container( child: Padding( padding: const EdgeInsets.all(8.0), - child: AutoSizeText( - appContext.getContext().email, - style: new TextStyle(color: kBodyTextColor, fontSize: 20, fontWeight: FontWeight.w300, fontFamily: "Helvetica"), - maxLines: 1, + child: Column( + children: [ + AutoSizeText( + appContext.getContext().email, + style: new TextStyle(color: kBodyTextColor, fontSize: 20, fontWeight: FontWeight.w300, fontFamily: "Helvetica"), + maxLines: 1, + ), + IconButton( + icon: Icon(Icons.logout), + onPressed: () { + setState(() { + print("Logout"); + ManagerAppContext managerAppContext = appContext.getContext(); + managerAppContext.token = null; + appContext.setContext(managerAppContext); + + Navigator.pushAndRemoveUntil( + context, + MaterialPageRoute( + builder: (context) { + return LoginScreen(); + }, + ), + (Route route) => false // For pushAndRemoveUntil + ); + + }); + }, + color: kPrimaryColor, + ), + ], ), ) ) diff --git a/lib/Screens/Resources/new_resource_popup.dart b/lib/Screens/Resources/new_resource_popup.dart index 7930e67..feb951f 100644 --- a/lib/Screens/Resources/new_resource_popup.dart +++ b/lib/Screens/Resources/new_resource_popup.dart @@ -116,7 +116,6 @@ void create(ResourceDetailDTO resourceDetailDTO, File file, AppContext appContex ); ManagerAppContext managerAppContext = appContext.getContext(); - print(managerAppContext.token.accessToken); request.headers["authorization"]="Bearer ${managerAppContext.token.accessToken}"; request.fields['label'] = resourceDetailDTO.label; request.fields['type'] = ResourceType.image.toString();