diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index c107bb60..c59078fa 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -63,9 +63,9 @@ - + android:resource="@drawable/notification_icon" /> --> diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml index 0ef02154..a402b78e 100644 --- a/android/app/src/profile/AndroidManifest.xml +++ b/android/app/src/profile/AndroidManifest.xml @@ -3,11 +3,11 @@ - + + android:name="com.google.firebase.messaging.default_notification_icon" + android:resource="@drawable/notification_icon" /> - + android:name="com.google.firebase.messaging.default_notification_channel_id" + android:value="@string/default_notification_channel_id" /> + \ No newline at end of file diff --git a/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart b/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart index 66e9ebc3..c1f544bc 100644 --- a/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart +++ b/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart @@ -109,7 +109,7 @@ class _BottomArrowLinkedLocalsComponentWidgetState return { 'error': false, 'error_msg': FFLocalizations.of(context).getVariableText( - ptText: "Vinculo Ativado com Sucesso", + ptText: "Vínculo Ativado com Sucesso", enText: "Link Activated Successfully") }; } else { @@ -118,7 +118,7 @@ class _BottomArrowLinkedLocalsComponentWidgetState } catch (e, s) { DialogUtil.errorDefault(context); LogUtil.requestAPIFailed( - 'responderVinculo.php', '', 'Responder Vinculo', e, s); + 'responderVinculo.php', '', 'Responder Vínculo', e, s); return { 'error': true, 'error_msg': FFLocalizations.of(context).getVariableText( @@ -187,9 +187,9 @@ class _BottomArrowLinkedLocalsComponentWidgetState showAlertDialog( context, FFLocalizations.of(context).getVariableText( - ptText: 'Ativar VInculo', enText: 'Activate Link'), + ptText: 'Ativar Vínculo', enText: 'Activate Link'), FFLocalizations.of(context).getVariableText( - ptText: 'Deseja Aceitar o Vinculo a $localName?', + ptText: 'Deseja aceitar o vínculo a $localName?', enText: 'Do you wish to accept the link to $localName?'), () async { var response = await _fetchResponseLink('A', local['CLI_ID']); diff --git a/lib/components/organism_components/local_profile_component/local_profile_component_widget.dart b/lib/components/organism_components/local_profile_component/local_profile_component_widget.dart index c6cf3123..0b9e4aaf 100644 --- a/lib/components/organism_components/local_profile_component/local_profile_component_widget.dart +++ b/lib/components/organism_components/local_profile_component/local_profile_component_widget.dart @@ -125,9 +125,11 @@ class _LocalProfileComponentWidgetState ), Text( valueOrDefault( - functions.convertToUppercase(AppState().local), - 'NOME DO LOCAL', - ), + functions.convertToUppercase(AppState().local), + FFLocalizations.of(context).getVariableText( + ptText: 'SEM LOCAL VINCULADO', + enText: 'NO LINKED LOCAL', + )), style: FlutterFlowTheme.of(context).labelMedium.override( fontFamily: 'Nunito', color: FlutterFlowTheme.of(context).info, 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 e6b5b298..33dce883 100644 --- a/lib/components/organism_components/menu_component/menu_component_widget.dart +++ b/lib/components/organism_components/menu_component/menu_component_widget.dart @@ -155,8 +155,8 @@ class _MenuComponentWidgetState extends State { setState(() {}); }, title: FFLocalizations.of(context).getVariableText( - ptText: 'Convidar\nVisitantes', - enText: 'Invite\nVisitors', + ptText: 'Convidar\nVisitante', + enText: 'Invite\nVisitor', ), ), MenuButtonWidget( @@ -394,8 +394,8 @@ class _MenuComponentWidgetState extends State { setState(() {}); }, title: FFLocalizations.of(context).getVariableText( - ptText: 'Convidar Visitantes', - enText: 'Invite Visitors', + ptText: 'Convidar Visitante', + enText: 'Invite Visitor', ), ), MenuCardItem( diff --git a/lib/flutter_flow/internationalization.dart b/lib/flutter_flow/internationalization.dart index d8ffe95f..88c34cc6 100644 --- a/lib/flutter_flow/internationalization.dart +++ b/lib/flutter_flow/internationalization.dart @@ -211,7 +211,7 @@ final kTranslationsMap = >>[ 'en': 'Register', }, 'megskb6s': { - 'pt': 'Cadastro Visitante', + 'pt': 'Cadastrar Visitante', 'en': 'Visitor Registration', }, 'xtcz66ar': { diff --git a/lib/pages/home_page/home_page_widget.dart b/lib/pages/home_page/home_page_widget.dart index c75c038a..346e3f35 100644 --- a/lib/pages/home_page/home_page_widget.dart +++ b/lib/pages/home_page/home_page_widget.dart @@ -51,7 +51,7 @@ class _HomePageWidgetState extends State { } else { final errorMsg = response.jsonBody['error_msg']; if (errorMsg != - r'''Usuario nao possui vinculo ativo com esse condominio''') { + r'''Usuario nao possui vínculo ativo com esse condominio''') { log(errorMsg); await DialogUtil.warningDefault(context) .whenComplete(() => checkData()); diff --git a/lib/pages/reception_page/reception_page_widget.dart b/lib/pages/reception_page/reception_page_widget.dart index 97b6aeb9..c76d1b8b 100644 --- a/lib/pages/reception_page/reception_page_widget.dart +++ b/lib/pages/reception_page/reception_page_widget.dart @@ -85,7 +85,7 @@ class _ReceptionPageWidgetState extends State { child: Tooltip( message: FFLocalizations.of(context).getVariableText( ptText: - 'Seu identificador é utilizado para efetuar\no vinculo do seu APP com o condominio.', + 'Seu identificador é utilizado para efetuar\no vínculo do seu APP com o condominio.', enText: 'My Identifier'), textStyle: FlutterFlowTheme.of(context) .labelSmall diff --git a/lib/pages/register_visitor_page/register_visitor_page_widget.dart b/lib/pages/register_visitor_page/register_visitor_page_widget.dart index d0ed87d2..6b9ec906 100644 --- a/lib/pages/register_visitor_page/register_visitor_page_widget.dart +++ b/lib/pages/register_visitor_page/register_visitor_page_widget.dart @@ -60,7 +60,7 @@ class _RegisterVisitorPageWidgetState extends State { ), title: Text( FFLocalizations.of(context).getText( - 'megskb6s' /* Cadastro Visitante */, + 'megskb6s' /* Cadastrar Visitante */, ), style: FlutterFlowTheme.of(context).headlineMedium.override( fontFamily: FlutterFlowTheme.of(context).headlineMediumFamily, diff --git a/pubspec.lock b/pubspec.lock index 60aaa29c..90250518 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1518,10 +1518,10 @@ packages: dependency: transitive description: name: vm_service - sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "14.2.4" + version: "14.2.5" web: dependency: transitive description: