From 250996dd64d4a7a26fa7b9517098bb574b0ad094 Mon Sep 17 00:00:00 2001 From: "J. A. Messias" Date: Thu, 12 Sep 2024 14:34:59 -0300 Subject: [PATCH] fix pets menu item and logs --- lib/app_state.dart | 18 ++++++++++++- .../menu_component/menu_component_model.dart | 25 +++++++++++-------- .../menu_component/menu_component_widget.dart | 4 +-- lib/pages/home_page/home_page_widget.dart | 3 +++ lib/pages/pets_page/pets_page_widget.dart | 1 - lib/shared/utils/validator_util.dart | 1 - 6 files changed, 37 insertions(+), 15 deletions(-) diff --git a/lib/app_state.dart b/lib/app_state.dart index b01723f7..8d469e35 100644 --- a/lib/app_state.dart +++ b/lib/app_state.dart @@ -160,12 +160,17 @@ class AppState extends ChangeNotifier { await _safeInitAsync(() async { _whatsapp = await secureStorage.getBool('whatsapp') ?? _whatsapp; }); + await _safeInitAsync(() async { + _pets = await secureStorage.getBool('pets') ?? _pets; + }); await _safeInitAsync(() async { _haveLocal = await secureStorage.getBool('ff_have_local') ?? _haveLocal; }); await _safeInitAsync(() async { - _isRequestOSNotification = await secureStorage.getBool('ff_request_os_notification') ?? _isRequestOSNotification; + _isRequestOSNotification = + await secureStorage.getBool('ff_request_os_notification') ?? + _isRequestOSNotification; }); } @@ -181,10 +186,21 @@ class AppState extends ChangeNotifier { _isRequestOSNotification = value; secureStorage.setBool('ff_request_os_notification', value); } + void deleteIsRequestOSNotification() { secureStorage.delete(key: 'ff_request_os_notification'); } + bool _pets = false; + bool get pets => _pets; + set pets(bool value) { + _pets = value; + secureStorage.setBool('pets', value); + } + + void deletePets() { + secureStorage.delete(key: 'pets'); + } bool _whatsapp = false; bool get whatsapp => _whatsapp; diff --git a/lib/components/organism_components/menu_component/menu_component_model.dart b/lib/components/organism_components/menu_component/menu_component_model.dart index 2d50a70f..b92b303c 100644 --- a/lib/components/organism_components/menu_component/menu_component_model.dart +++ b/lib/components/organism_components/menu_component/menu_component_model.dart @@ -358,15 +358,20 @@ class MenuComponentModel extends FlutterFlowModel { } Future petsAction(BuildContext context) async { - context.push( - '/petsPage', - extra: { - kTransitionInfoKey: const TransitionInfo( - hasTransition: true, - transitionType: PageTransitionType.scale, - alignment: Alignment.bottomCenter, - ), - }, - ); + bool isPet = AppState().pets; + if (isPet) { + context.push( + '/petsPage', + extra: { + kTransitionInfoKey: const TransitionInfo( + hasTransition: true, + transitionType: PageTransitionType.scale, + alignment: Alignment.bottomCenter, + ), + }, + ); + } else { + DialogUnavailable.unavailableFeature(context); + } } } diff --git a/lib/components/organism_components/menu_component/menu_component_widget.dart b/lib/components/organism_components/menu_component/menu_component_widget.dart index faaf0bfd..fd4ea8e5 100644 --- a/lib/components/organism_components/menu_component/menu_component_widget.dart +++ b/lib/components/organism_components/menu_component/menu_component_widget.dart @@ -232,7 +232,7 @@ class _MenuComponentWidgetState extends State { }, title: FFLocalizations.of(context).getVariableText( enText: 'Pets\nRegister', - ptText: 'Cadastro\nde Pet', + ptText: 'Cadastrar\nPet', ), ), MenuButtonWidget( @@ -368,7 +368,7 @@ class _MenuComponentWidgetState extends State { }, title: FFLocalizations.of(context).getVariableText( enText: 'Pets\nRegister', - ptText: 'Cadastro\nde Pet', + ptText: 'Cadastrar\nPet', ), ), MenuCardItem( diff --git a/lib/pages/home_page/home_page_widget.dart b/lib/pages/home_page/home_page_widget.dart index f9ec154b..b7fd9894 100644 --- a/lib/pages/home_page/home_page_widget.dart +++ b/lib/pages/home_page/home_page_widget.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'dart:developer'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; @@ -46,8 +47,10 @@ class _HomePageWidgetState extends State { final errorMsg = response.jsonBody['error_msg']; if (error == false) { + log(response.jsonBody.toString()); AppState().whatsapp = response.jsonBody['whatsapp'] ?? false; AppState().provisional = response.jsonBody['provisional'] ?? false; + AppState().pets = response.jsonBody['pet'] ?? false; AppState().name = response.jsonBody['visitado']['VDO_NOME']; safeSetState(() {}); return; diff --git a/lib/pages/pets_page/pets_page_widget.dart b/lib/pages/pets_page/pets_page_widget.dart index 56637526..c9542b06 100644 --- a/lib/pages/pets_page/pets_page_widget.dart +++ b/lib/pages/pets_page/pets_page_widget.dart @@ -10,7 +10,6 @@ import 'package:flutter/services.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:http/http.dart'; import 'package:hub/backend/api_requests/api_calls.dart'; -import 'package:hub/backend/api_requests/api_service.dart'; import 'package:hub/components/atomic_components/shared_components_atoms/appbar.dart'; import 'package:hub/components/atomic_components/shared_components_atoms/custom_datepicker.dart'; diff --git a/lib/shared/utils/validator_util.dart b/lib/shared/utils/validator_util.dart index 662aaa39..aaa09bd5 100644 --- a/lib/shared/utils/validator_util.dart +++ b/lib/shared/utils/validator_util.dart @@ -33,7 +33,6 @@ class ValidatorUtil { DateTime dateTime = dateFormat.parse(value); String date = dateTime.toIso8601String() + 'Z'; date = date.substring(0, 11) + '03:00:00.000Z'; - log('date: $date'); return date; }