diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro
index 21666ee2..81587d79 100644
--- a/android/app/proguard-rules.pro
+++ b/android/app/proguard-rules.pro
@@ -24,3 +24,7 @@
-keep class com.google.gson.reflect.TypeToken { *; }
-keep class com.google.common.reflect.TypeToken { *; }
+# Additional keep rules to prevent R8 from removing necessary classes
+-dontwarn com.google.j2objc.annotations.ReflectionSupport
+-keep class com.google.j2objc.annotations.ReflectionSupport { *; }
+
diff --git a/android/proguard-rules.pro b/android/proguard-rules.pro
index 21666ee2..f4f78aa0 100644
--- a/android/proguard-rules.pro
+++ b/android/proguard-rules.pro
@@ -24,3 +24,6 @@
-keep class com.google.gson.reflect.TypeToken { *; }
-keep class com.google.common.reflect.TypeToken { *; }
+# Additional keep rules to prevent R8 from removing necessary classes
+-dontwarn com.google.j2objc.annotations.ReflectionSupport
+-keep class com.google.j2objc.annotations.ReflectionSupport { *; }
\ No newline at end of file
diff --git a/assets/images/fre.svg b/assets/images/fre.svg
deleted file mode 100644
index f9c87f4f..00000000
--- a/assets/images/fre.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
diff --git a/lib/features/home/presentation/pages/about_system.dart b/lib/features/home/presentation/pages/about_system.dart
index 0c82242e..a9d0ddb6 100644
--- a/lib/features/home/presentation/pages/about_system.dart
+++ b/lib/features/home/presentation/pages/about_system.dart
@@ -1,3 +1,5 @@
+import 'dart:developer';
+
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
@@ -26,11 +28,18 @@ class _AboutSystemPageState extends State {
try {
final PackageInfo packageInfo = await PackageInfo.fromPlatform();
setState(() {
- _appVersion = packageInfo.version;
+ _appVersion = FFLocalizations.of(context).getVariableText(
+ ptText: 'Versão do Aplicativo: ${packageInfo.version}',
+ enText: 'App Version: ${packageInfo.version}',
+ );
});
- } catch (e) {
+ } catch (e, s) {
+ log(e.toString(), stackTrace: s);
setState(() {
- _appVersion = 'Erro ao carregar versão';
+ _appVersion = FFLocalizations.of(context).getVariableText(
+ ptText: 'Versão do Aplicativo Indisponível',
+ enText: 'App Version Unavailable',
+ );
});
}
}
@@ -133,10 +142,7 @@ class _AboutSystemPageState extends State {
Widget _buildAppVersionText() {
final theme = FlutterFlowTheme.of(context);
return Text(
- FFLocalizations.of(context).getVariableText(
- ptText: 'Versão do Aplicativo: $_appVersion',
- enText: 'App Version: $_appVersion',
- ),
+ _appVersion,
style: theme.headlineMedium.override(
fontFamily: theme.headlineMediumFamily,
color: theme.primaryText,
diff --git a/lib/flutter_flow/nav/nav.dart b/lib/flutter_flow/nav/nav.dart
index ada01e71..ae2e56c4 100644
--- a/lib/flutter_flow/nav/nav.dart
+++ b/lib/flutter_flow/nav/nav.dart
@@ -14,6 +14,7 @@ import 'package:hub/pages/delivery_schedule_page/delivery_schedule_widget.dart';
import 'package:hub/pages/fast_pass_page/fast_pass_page_widget.dart';
import 'package:hub/pages/forgot_password_page/forgot_password_screen.dart';
import 'package:hub/pages/liberation_history/liberation_history_widget.dart';
+import 'package:hub/pages/message_history_page/message_history_page_widget.dart';
import 'package:hub/pages/package_order_page/package_order_page.dart';
import 'package:hub/pages/people_on_the_property_page/people_on_the_property_page_widget.dart';
import 'package:hub/pages/pets_on_the_property_page/pets_history_screen.dart';
@@ -31,6 +32,7 @@ import 'package:hub/pages/sign_up_page/sign_up_page_widget.dart';
import 'package:hub/pages/vehicles_on_the_property/vehicles_on_the_property.dart';
import 'package:hub/pages/visits_on_the_property/visits_on_the_property_screen.dart';
import 'package:hub/pages/welcome_page/welcome_page_widget.dart';
+import 'package:hub/shared/components/molecules/locals/data/repositories/locals_repository_impl.dart';
import 'package:hub/shared/components/molecules/locals/presentation/blocs/local_profile_bloc.dart';
import 'package:hub/shared/components/molecules/menu/domain/entities/menu_item.dart';
import 'package:hub/shared/components/molecules/menu/presentation/blocs/menu_bloc.dart';
@@ -113,7 +115,7 @@ GoRouter createRouter(AppStateNotifier appStateNotifier) {
create: (context) => LocalProfileBloc()..add(LocalProfileEvent()),
),
],
- child: AboutSystemPage(),
+ child: HomePageWidget(key: UniqueKey(), LocalsRepositoryImpl().update),
)
: const ReceptionPageWidget();
} else {
@@ -146,6 +148,11 @@ GoRouter createRouter(AppStateNotifier appStateNotifier) {
token: token,
);
}),
+ FFRoute(
+ name: 'aboutSystemPage',
+ path: '/aboutSystemPage',
+ builder: (context, params) => AboutSystemPage(),
+ ),
FFRoute(
name: 'homePage',
path: '/homePage',
@@ -173,11 +180,7 @@ GoRouter createRouter(AppStateNotifier appStateNotifier) {
FFRoute(name: 'petsOnThePropertyPage', path: '/petsOnThePropertyPage', builder: (context, params) => Scaffold(body: const PetsHistoryScreen(isApp: true))),
FFRoute(name: 'vehiclesOnThePropertyPage', path: '/vehiclesOnThePropertyPage', builder: (context, params) => const VehicleOnTheProperty()),
FFRoute(name: 'receptionPage', path: '/receptionPage', builder: (context, params) => const ReceptionPageWidget()),
- FFRoute(
- name: 'messageHistoryPage',
- path: '/messageHistoryPage',
- builder: (context, params) => ProvisionalHistoryPage(opt: {'filterType': '.*'}),
- ),
+ FFRoute(name: 'messageHistoryPage', path: '/messageHistoryPage', builder: (context, params) => const MessageHistoryPageWidget()),
FFRoute(name: 'registerVisitorPage', path: '/registerVisitorPage', builder: (context, params) => const RegisterVisitorPageWidget()),
FFRoute(name: 'scheduleCompleteVisitPage', path: '/scheduleCompleteVisitPage', builder: (context, params) => const ScheduleCompleteVisitPageWidget()),
FFRoute(name: 'deliverySchedule', path: '/deliverySchedule', builder: (context, params) => const DeliverySchedule()),
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 3b00c98d..8c4444ee 100644
--- a/lib/shared/components/molecules/menu/presentation/mappers/menu_entry.dart
+++ b/lib/shared/components/molecules/menu/presentation/mappers/menu_entry.dart
@@ -228,6 +228,16 @@ class MenuEntry implements BaseModule {
route: '/WelcomePage',
types: [MenuEntryType.Drawer],
),
+ MenuEntry(
+ key: 'FRE-HUB-ABOUT-SYSTEM',
+ icon: Icons.info_outline,
+ name: FFLocalizations.of(navigatorKey.currentContext!).getVariableText(
+ ptText: 'Sobre o Sistema',
+ enText: 'About the System',
+ ),
+ route: '/aboutSystemPage',
+ 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 bd90d50d..e60e7c1c 100644
--- a/lib/shared/components/molecules/modules/domain/entities/license.dart
+++ b/lib/shared/components/molecules/modules/domain/entities/license.dart
@@ -12,6 +12,7 @@ enum LicenseKeys {
openedVisits('FRE-HUB-OPENED-VISITS'),
vehicles('FRE-HUB-VEHICLES'),
residents('FRE-HUB-RESIDENTS'),
+ about('FRE-HUB-ABOUT-SYSTEM'),
pets('FRE-HUB-PETS'),
orders('FRE-HUB-ORDERS'),
completeSchedule('FRE-HUB-COMPLETE-SCHEDULE'),
@@ -243,6 +244,13 @@ class License {
startDate: '',
quantity: 0,
),
+ Module(
+ key: LicenseKeys.about.value,
+ display: ModuleStatus.active.key,
+ expirationDate: '',
+ startDate: '',
+ quantity: 0,
+ )
]);
}
}
diff --git a/pubspec.lock b/pubspec.lock
index 87e1e713..bf9b6855 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -965,10 +965,10 @@ packages:
dependency: transitive
description:
name: io
- sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
+ sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
url: "https://pub.dev"
source: hosted
- version: "1.0.4"
+ version: "1.0.5"
iregexp:
dependency: transitive
description:
@@ -1117,10 +1117,10 @@ packages:
dependency: "direct main"
description:
name: material_symbols_icons
- sha256: a783133f87c58e10b1cc19797f7c3192ff9c2bab301c4ade90312d8f2aed01b2
+ sha256: "64404f47f8e0a9d20478468e5decef867a688660bad7173adcd20418d7f892c9"
url: "https://pub.dev"
source: hosted
- version: "4.2800.2"
+ version: "4.2801.0"
maybe_just_nothing:
dependency: transitive
description:
@@ -1181,10 +1181,10 @@ packages:
dependency: transitive
description:
name: package_config
- sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
+ sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67"
url: "https://pub.dev"
source: hosted
- version: "2.1.0"
+ version: "2.1.1"
package_info_plus:
dependency: "direct main"
description:
@@ -1237,10 +1237,10 @@ packages:
dependency: "direct main"
description:
name: path_provider_android
- sha256: "8c4967f8b7cb46dc914e178daa29813d83ae502e0529d7b0478330616a691ef7"
+ sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2"
url: "https://pub.dev"
source: hosted
- version: "2.2.14"
+ version: "2.2.15"
path_provider_foundation:
dependency: "direct main"
description:
@@ -1389,10 +1389,10 @@ packages:
dependency: transitive
description:
name: pub_semver
- sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
+ sha256: "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd"
url: "https://pub.dev"
source: hosted
- version: "2.1.4"
+ version: "2.1.5"
pubspec_parse:
dependency: transitive
description:
@@ -1927,7 +1927,7 @@ packages:
source: hosted
version: "6.5.0"
yaml:
- dependency: "direct main"
+ dependency: transitive
description:
name: yaml
sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
diff --git a/pubspec.yaml b/pubspec.yaml
index bd579dbb..5bd33e9c 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -140,7 +140,6 @@ flutter:
assets:
- assets/fonts/
- assets/images/
- - assets/images/fre.svg
- assets/images/dark/
- assets/images/light/
fonts: