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 c605ce5a..4b3bb3a7 100644 --- a/lib/components/organism_components/menu_component/menu_component_model.dart +++ b/lib/components/organism_components/menu_component/menu_component_model.dart @@ -109,16 +109,8 @@ class MenuComponentModel extends FlutterFlowModel { }); /// ABOUT THE PROPERTY - if (options.contains(MenuOption.AboutProperty)) - addMenuEntry(Icons.home, 'About Property', 'Sobre a Propriedade', () async { - if (await StorageHelper().get(SQLiteStorageKey.whatsapp.value, Storage.SQLiteStorage) == 'true') - await open(context, '/aboutProperty'); - else - DialogUnavailable.unavailableFeature(context); - safeSetState; - }); if (options.contains(MenuOption.PetsOnTheProperty)) - addMenuEntry(Icons.pets, 'My Pets', 'Meus Pets', () async { + addMenuEntry(Icons.pets, 'Pets', 'Pets', () async { if (await StorageHelper().get(SQLiteStorageKey.pets.value, Storage.SQLiteStorage) == 'true') await open(context, '/petsOnThePropertyPage'); else @@ -126,12 +118,12 @@ class MenuComponentModel extends FlutterFlowModel { safeSetState; }); if (options.contains(MenuOption.ResidentsOnTheProperty)) - addMenuEntry(Icons.groups, 'Live With Me', 'Moram Comigo', () async { + addMenuEntry(Icons.groups, 'Residents', 'Moradores', () async { await open(context, '/peopleOnThePropertyPage'); safeSetState; }); if (options.contains(MenuOption.VehiclesOnTheProperty)) - addMenuEntry(Symbols.directions_car, 'My Vehicles', 'Meus Veículos', () async { + addMenuEntry(Symbols.directions_car, 'Vehicles', 'Veículos', () async { await open(context, '/vehiclesOnThePropertyPage'); safeSetState; }); @@ -189,6 +181,14 @@ class MenuComponentModel extends FlutterFlowModel { }); /// ABOUT THE SYSTEM + if (options.contains(MenuOption.AboutProperty)) + addMenuEntry(Icons.home, 'About Property', 'Sobre a Propriedade', () async { + if (await StorageHelper().get(SQLiteStorageKey.whatsapp.value, Storage.SQLiteStorage) == 'true') + await open(context, '/aboutProperty'); + else + DialogUnavailable.unavailableFeature(context); + safeSetState; + }); if (options.contains(MenuOption.SettingsOnTheApp)) addMenuEntry(Icons.settings, 'System Settings', 'Opções do Sistema', () async { await open(context, '/preferencesSettings'); diff --git a/lib/components/templates_components/card_item_template_component/card_item_template_component_widget.dart b/lib/components/templates_components/card_item_template_component/card_item_template_component_widget.dart index 1f38aa99..e4cdb519 100644 --- a/lib/components/templates_components/card_item_template_component/card_item_template_component_widget.dart +++ b/lib/components/templates_components/card_item_template_component/card_item_template_component_widget.dart @@ -167,7 +167,7 @@ class _CardItemTemplateComponentWidgetState extends State Scaffold(body: const PetsHistoryScreen())), + builder: (context, params) => Scaffold(body: const PetsHistoryScreen(isApp: true))), FFRoute( name: 'vehiclesOnThePropertyPage', path: '/vehiclesOnThePropertyPage', diff --git a/lib/pages/people_on_the_property_page/people_on_the_property_page_widget.dart b/lib/pages/people_on_the_property_page/people_on_the_property_page_widget.dart index 37aace3e..82d70229 100644 --- a/lib/pages/people_on_the_property_page/people_on_the_property_page_widget.dart +++ b/lib/pages/people_on_the_property_page/people_on_the_property_page_widget.dart @@ -120,7 +120,7 @@ class _PeopleOnThePropertyPageState extends State with return AppBar( backgroundColor: FlutterFlowTheme.of(context).primaryBackground, automaticallyImplyLeading: false, - title: Text(FFLocalizations.of(context).getVariableText(ptText: 'Moram Comigo', enText: 'People on the property'), + title: Text(FFLocalizations.of(context).getVariableText(ptText: 'Moradores', enText: 'Residents'), style: FlutterFlowTheme.of(context).headlineMedium.override( fontFamily: 'Nunito', color: FlutterFlowTheme.of(context).primaryText, diff --git a/lib/pages/pets_on_the_property_page/pets_history_screen.dart b/lib/pages/pets_on_the_property_page/pets_history_screen.dart index e902bd2f..a547372c 100644 --- a/lib/pages/pets_on_the_property_page/pets_history_screen.dart +++ b/lib/pages/pets_on_the_property_page/pets_history_screen.dart @@ -14,7 +14,8 @@ import 'package:hub/shared/utils/dialog_util.dart'; import 'package:hub/shared/utils/log_util.dart'; class PetsHistoryScreen extends StatefulWidget { - const PetsHistoryScreen({super.key, this.model}); + const PetsHistoryScreen({super.key, this.model, required this.isApp}); + final bool isApp; final PetsPageModel? model; @override _PetsHistoryScreenState createState() => _PetsHistoryScreenState(); @@ -58,7 +59,7 @@ class _PetsHistoryScreenState extends State with TickerProvid @override Widget build(BuildContext context) => Scaffold( backgroundColor: FlutterFlowTheme.of(context).primaryBackground, - appBar: _appBar(context), + appBar: widget.isApp ? _appBar(context) : null, body: Column( mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.start, @@ -125,7 +126,7 @@ class _PetsHistoryScreenState extends State with TickerProvid return AppBar( backgroundColor: FlutterFlowTheme.of(context).primaryBackground, automaticallyImplyLeading: false, - title: Text(FFLocalizations.of(context).getVariableText(enText: 'My Pets', ptText: 'Meus Pets'), + title: Text(FFLocalizations.of(context).getVariableText(enText: 'Pets', ptText: 'Pets'), style: FlutterFlowTheme.of(context).headlineMedium.override( fontFamily: 'Nunito', color: FlutterFlowTheme.of(context).primaryText, diff --git a/lib/pages/pets_page/pets_page_widget.dart b/lib/pages/pets_page/pets_page_widget.dart index cf48754f..48ed3198 100644 --- a/lib/pages/pets_page/pets_page_widget.dart +++ b/lib/pages/pets_page/pets_page_widget.dart @@ -94,7 +94,7 @@ class _PetsPageWidgetState extends State with SingleTickerProvid labelTab2: FFLocalizations.of(context).getVariableText(ptText: 'Consultar', enText: 'History'), controller: _model.tabBarController, widget1: _model.isEditing ? _buildEditForm(context) : _buildRegisterForm(context), - widget2: PetsHistoryScreen(model: _model), + widget2: PetsHistoryScreen(model: _model, isApp: false), onEditingChanged: onEditingChanged, ); } diff --git a/lib/pages/vehicles_on_the_property/vehicles_on_the_property.dart b/lib/pages/vehicles_on_the_property/vehicles_on_the_property.dart index abe6b8c1..186a8fa0 100644 --- a/lib/pages/vehicles_on_the_property/vehicles_on_the_property.dart +++ b/lib/pages/vehicles_on_the_property/vehicles_on_the_property.dart @@ -116,7 +116,7 @@ class _VehicleOnThePropertyState extends State with Ticker return AppBar( backgroundColor: FlutterFlowTheme.of(context).primaryBackground, automaticallyImplyLeading: false, - title: Text(FFLocalizations.of(context).getVariableText(enText: 'My Vehicles', ptText: 'Meus Veículos'), + title: Text(FFLocalizations.of(context).getVariableText(enText: 'Vehicles', ptText: 'Veículos'), style: FlutterFlowTheme.of(context).headlineMedium.override( fontFamily: 'Nunito', color: FlutterFlowTheme.of(context).primaryText, @@ -206,7 +206,7 @@ class _VehicleOnThePropertyState extends State with Ticker Widget _item(BuildContext context, dynamic uItem) { return CardItemTemplateComponentWidget( - imagePath: '', + imagePath: null, labelsHashMap: { '${FFLocalizations.of(context).getVariableText(ptText: "Placa", enText: "License Plate")}:': uItem['licensePlate'] ?? '',