jantunesmessias
/
flutter-freaccess-hub
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix/fd-1047

This commit is contained in:
J. A. Messias 2024-12-19 16:43:55 -03:00
parent 926944b178 a60f27c8bb
commit 002e62b86e
6 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart
View File

@ -138,6 +138,8 @@ class _BottomArrowLinkedLocalsComponentWidgetState
return null;
}
static Future<void> _handleError(
BuildContext context, String errorMsg) async {
static Future<void> _handleError(
BuildContext context, String errorMsg) async {
await DialogUtil.error(context, errorMsg);

13
lib/features/local/data/data_sources/locals_remote_data_source.dart
View File

@ -20,7 +20,7 @@ abstract class LocalsRemoteDataSource {
Future<bool> processLocals(BuildContext context);
Future<bool> processData(BuildContext context);
Future<bool> selectLocal(BuildContext context, ApiCallResponse? response);
Future<void> detachLocal(BuildContext context);
Future<bool> detachLocal(BuildContext context);
}
class LocalsRemoteDataSourceImpl implements LocalsRemoteDataSource {
@ -213,15 +213,15 @@ class LocalsRemoteDataSourceImpl implements LocalsRemoteDataSource {
}
@override
Future<void> detachLocal(BuildContext context) async {
Future<bool> detachLocal(BuildContext context) async {
String content;
try {
content = FFLocalizations.of(context).getVariableText(
enText: 'Device unlinked successfully',
ptText: 'Dispositivo desvinculado com sucesso',
);
await PhpGroup.resopndeVinculo.call(tarefa: 'I').then((value) async {
final bool status =
await PhpGroup.resopndeVinculo.call(tarefa: 'I').then((value) async {
if (value.jsonBody['error'] == false) {
await StorageHelper().set(ProfileStorageKey.clientName.key, '');
await StorageHelper().set(ProfileStorageKey.ownerName.key, '');
@ -230,7 +230,9 @@ class LocalsRemoteDataSourceImpl implements LocalsRemoteDataSource {
context.go('/homePage',
extra: {'update': LocalsRepositoryImpl().update});
SnackBarUtil.showSnackBar(context, content);
return true;
}
return false;
}).catchError((err, stack) {
context.pop();
content = FFLocalizations.of(context).getVariableText(
@ -238,7 +240,9 @@ class LocalsRemoteDataSourceImpl implements LocalsRemoteDataSource {
ptText: 'Erro ao desvincular dispositivo',
);
SnackBarUtil.showSnackBar(context, content, isError: true);
return false;
});
return status;
} catch (err, stack) {
context.pop();
log(err.toString(), stackTrace: stack);
@ -247,6 +251,7 @@ class LocalsRemoteDataSourceImpl implements LocalsRemoteDataSource {
ptText: 'Erro ao desvincular dispositivo',
);
SnackBarUtil.showSnackBar(context, content, isError: true);
return false;
}
}
}

9
lib/features/local/data/repositories/locals_repository_impl.dart
View File

@ -7,6 +7,7 @@ import 'package:hub/features/menu/index.dart';
import 'package:hub/features/module/data/index.dart';
import 'package:hub/features/notification/index.dart';
import 'package:hub/features/storage/index.dart';
import 'package:hub/flutter_flow/index.dart';
import 'package:hub/shared/utils/dialog_util.dart';
import 'package:rxdart/rxdart.dart';
@ -89,7 +90,11 @@ class LocalsRepositoryImpl implements LocalsRepository {
@override
Future<void> unlinkLocal(BuildContext context) async {
await remoteDataSource.detachLocal(context);
await select(context);
final bool response = await remoteDataSource.detachLocal(context);
if (!response) return;
unselect();
context.pop();
context.go('/homePage', extra: {'update': update});
await update(context);
}
}

8
lib/features/menu/presentation/mappers/menu_entry.dart
View File

@ -45,8 +45,8 @@ class MenuEntry implements BaseModule {
key: 'FRE-HUB-FASTPASS',
icon: Icons.attach_email_outlined,
name: FFLocalizations.of(navigatorKey.currentContext!).getVariableText(
ptText: 'Fast Pass',
enText: 'Fast Pass',
ptText: 'Convidar Visitante',
enText: 'Invite Visitor',
),
route: '/fastPassPage',
types: [MenuEntryType.Home, MenuEntryType.Drawer],
@ -213,8 +213,8 @@ class MenuEntry implements BaseModule {
key: 'FRE-HUB-SETTINGS',
icon: Icons.settings,
name: FFLocalizations.of(navigatorKey.currentContext!).getVariableText(
ptText: 'Configurações',
enText: 'Settings',
ptText: 'Opções do Sistema',
enText: 'System Settings',
),
route: '/preferencesSettings',
types: [MenuEntryType.Home, MenuEntryType.Drawer],

8
lib/features/notification/notification_service.dart
View File

@ -44,7 +44,7 @@ Future<void> onMessageReceived(
switch (handleClick) {
case 'visit_request':
showDialog(
context: StorageHelper().context!,
context: navigatorKey.currentContext!,
barrierColor: Colors.transparent,
barrierDismissible: true,
builder: (BuildContext context) {
@ -167,7 +167,7 @@ Future<void> onMessageReceived(
break;
case 'access':
showDialog(
context: StorageHelper().context!,
context: navigatorKey.currentContext!,
barrierColor: Colors.transparent,
barrierDismissible: true,
builder: (BuildContext context) {
@ -228,7 +228,7 @@ Future<void> onMessageReceived(
break;
case 'mensagem':
showDialog(
context: StorageHelper().context!,
context: navigatorKey.currentContext!,
barrierColor: Colors.transparent,
barrierDismissible: true,
builder: (BuildContext context) {
@ -252,7 +252,7 @@ Future<void> onMessageReceived(
break;
case 'enroll_cond':
await StorageHelper().set(SecureStorageKey.haveLocal.value, true);
StorageHelper().context!.go('/homePage');
navigatorKey.currentContext!.go('/homePage');
break;
default:
break;

5
lib/pages/preferences_settings_page/preferences_settings_model.dart
View File

@ -1,5 +1,3 @@
import 'dart:developer';
import 'package:flutter/material.dart';
import 'package:hub/components/templates_components/change_passs_qr_code_pass_key_template_component/change_pass_widget.dart';
import 'package:hub/features/auth/index.dart';
@ -24,9 +22,6 @@ class PreferencesPageModel with ChangeNotifier {
late bool isPanic = false;
Future<void> _initialize() async {
log(
'TESTE:' + '${await StorageHelper().get(LocalsStorageKey.notify.key)}',
);
isFingerprint =
await StorageHelper().get(LocalsStorageKey.fingerprint.key) == 'true';
isPerson = await StorageHelper().get(LocalsStorageKey.person.key) == 'true';