From 0951f1c50ab196fff6a6e30cf1df0716d3a74d9e Mon Sep 17 00:00:00 2001 From: "J. A. Messias" Date: Wed, 11 Dec 2024 16:22:20 -0300 Subject: [PATCH] =?UTF-8?q?fix:=20add=20=20sobre=20o=20sistema=20na=20tela?= =?UTF-8?q?=20de=20configura=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../preferences_settings_model.dart | 15 +++----------- .../preferences_settings_widget.dart | 20 ++++++++----------- .../menu/presentation/mappers/menu_entry.dart | 20 +++++++++---------- .../modules/domain/entities/license.dart | 6 +++--- 4 files changed, 24 insertions(+), 37 deletions(-) diff --git a/lib/pages/preferences_settings_page/preferences_settings_model.dart b/lib/pages/preferences_settings_page/preferences_settings_model.dart index 2f8adda5..6f52a602 100644 --- a/lib/pages/preferences_settings_page/preferences_settings_model.dart +++ b/lib/pages/preferences_settings_page/preferences_settings_model.dart @@ -9,6 +9,7 @@ import 'package:hub/shared/components/molecules/locals/index.dart'; import 'package:hub/shared/helpers/storage/base_storage.dart'; import 'package:hub/shared/helpers/storage/storage_helper.dart'; import 'package:hub/shared/services/authentication/authentication_service.dart'; +import 'package:hub/shared/utils/path_util.dart'; import 'package:share_plus/share_plus.dart'; import '../../shared/utils/snackbar_util.dart'; @@ -238,18 +239,8 @@ class PreferencesPageModel with ChangeNotifier { showAlertDialog(context, title, content, onConfirm); } - void logout(BuildContext context) async { - final String title = FFLocalizations.of(context).getVariableText( - enText: 'Logout', - ptText: 'Sair', - ); - final String content = FFLocalizations.of(context).getVariableText( - enText: 'Are you sure you want to logout?', - ptText: 'Tem certeza que deseja sair?', - ); - onConfirm() async => AuthenticationService.signOut(context); - - showAlertDialog(context, title, content, onConfirm); + void navAboutSystem(BuildContext context) async { + PathUtil.nav('/aboutSystemPage'); } void localUnlink(BuildContext context) { diff --git a/lib/pages/preferences_settings_page/preferences_settings_widget.dart b/lib/pages/preferences_settings_page/preferences_settings_widget.dart index 26f0f719..227c953d 100644 --- a/lib/pages/preferences_settings_page/preferences_settings_widget.dart +++ b/lib/pages/preferences_settings_page/preferences_settings_widget.dart @@ -29,9 +29,7 @@ class _PreferencesPageWidgetState extends State { create: (_) => PreferencesPageModel(), child: Consumer( builder: (context, model, child) => GestureDetector( - onTap: () => model.unfocusNode.canRequestFocus - ? FocusScope.of(context).requestFocus(model.unfocusNode) - : FocusScope.of(context).unfocus(), + onTap: () => model.unfocusNode.canRequestFocus ? FocusScope.of(context).requestFocus(model.unfocusNode) : FocusScope.of(context).unfocus(), child: Scaffold( backgroundColor: FlutterFlowTheme.of(context).primaryBackground, appBar: AppBar( @@ -77,7 +75,7 @@ class _PreferencesPageWidgetState extends State { Expanded( flex: 2, child: ListView.builder( - itemCount: 8, + itemCount: 9, padding: const EdgeInsets.symmetric(horizontal: 20.0), physics: const AlwaysScrollableScrollPhysics(), itemBuilder: (BuildContext context, int index) { @@ -175,12 +173,12 @@ class _PreferencesPageWidgetState extends State { ); break; case 8: - icon = Icons.logout; - onPressed = () => model.logout(context); + icon = Icons.info_outline; + onPressed = () => model.navAboutSystem(context); isEnabled = false; content = FFLocalizations.of(context).getVariableText( - ptText: 'Sair da conta', - enText: 'Logout', + ptText: 'Sobre o Sistema', + enText: 'About the System', ); break; default: @@ -205,12 +203,10 @@ class _PreferencesPageWidgetState extends State { child: Row( children: [ CircleAvatar( - backgroundColor: - isEnabled ? FlutterFlowTheme.of(context).primary : FlutterFlowTheme.of(context).alternate, + backgroundColor: isEnabled ? FlutterFlowTheme.of(context).primary : FlutterFlowTheme.of(context).alternate, child: Icon( icon, - color: - isEnabled ? FlutterFlowTheme.of(context).primaryBackground : FlutterFlowTheme.of(context).primary, + color: isEnabled ? FlutterFlowTheme.of(context).primaryBackground : FlutterFlowTheme.of(context).primary, ), ), const SizedBox(width: 8.0), diff --git a/lib/shared/components/molecules/menu/presentation/mappers/menu_entry.dart b/lib/shared/components/molecules/menu/presentation/mappers/menu_entry.dart index ac0bec64..6d7ac800 100644 --- a/lib/shared/components/molecules/menu/presentation/mappers/menu_entry.dart +++ b/lib/shared/components/molecules/menu/presentation/mappers/menu_entry.dart @@ -218,16 +218,6 @@ class MenuEntry implements BaseModule { route: '/preferencesSettings', types: [MenuEntryType.Home, MenuEntryType.Drawer], ), - MenuEntry( - key: 'FRE-HUB-LOGOUT', - icon: Icons.exit_to_app, - name: FFLocalizations.of(navigatorKey.currentContext!).getVariableText( - ptText: 'Sair', - enText: 'Logout', - ), - route: '/WelcomePage', - types: [MenuEntryType.Drawer], - ), MenuEntry( key: 'FRE-HUB-ABOUT-SYSTEM', icon: Icons.info_outline, @@ -238,6 +228,16 @@ class MenuEntry implements BaseModule { route: '/aboutSystemPage', types: [MenuEntryType.Drawer], ), + MenuEntry( + key: 'FRE-HUB-LOGOUT', + icon: Icons.exit_to_app, + name: FFLocalizations.of(navigatorKey.currentContext!).getVariableText( + ptText: 'Sair', + enText: 'Logout', + ), + route: '/WelcomePage', + types: [MenuEntryType.Drawer], + ), ]; static List getEntriesByType(MenuEntryType type) { diff --git a/lib/shared/components/molecules/modules/domain/entities/license.dart b/lib/shared/components/molecules/modules/domain/entities/license.dart index e60e7c1c..045e5559 100644 --- a/lib/shared/components/molecules/modules/domain/entities/license.dart +++ b/lib/shared/components/molecules/modules/domain/entities/license.dart @@ -238,19 +238,19 @@ class License { quantity: 0, ), Module( - key: LicenseKeys.logout.value, + key: LicenseKeys.about.value, display: ModuleStatus.active.key, expirationDate: '', startDate: '', quantity: 0, ), Module( - key: LicenseKeys.about.value, + key: LicenseKeys.logout.value, display: ModuleStatus.active.key, expirationDate: '', startDate: '', quantity: 0, - ) + ), ]); } }