resolve conflits

lib/components/templates_components/details_component/details_component_widget.dart

@@ -67,7 +67,9 @@ class _DetailsComponentWidgetState extends State<DetailsComponentWidget> {
     // CachedNetworkImage.evictFromCache(widget.imagePath ?? '');
     final double limitedBodyFontSize =
         LimitedFontSizeUtil.getBodyFontSize(context);
-    return Container(
+    return Material(
+      type: MaterialType.transparency,
+      child: Container(
         constraints: BoxConstraints(
           maxWidth: MediaQuery.of(context).size.width,
           maxHeight: MediaQuery.of(context).size.height,
@@ -143,7 +145,8 @@ class _DetailsComponentWidgetState extends State<DetailsComponentWidget> {
                                   fontWeight: FontWeight.bold,
                                   color: FlutterFlowTheme.of(context).info,
                                   letterSpacing: 0.0,
-                                useGoogleFonts: GoogleFonts.asMap().containsKey(
+                                  useGoogleFonts:
+                                      GoogleFonts.asMap().containsKey(
                                     FlutterFlowTheme.of(context)
                                         .labelMediumFamily,
                                   ),
@@ -156,7 +159,8 @@ class _DetailsComponentWidgetState extends State<DetailsComponentWidget> {
                                       .labelMediumFamily,
                                   color: FlutterFlowTheme.of(context).info,
                                   letterSpacing: 0.0,
-                                useGoogleFonts: GoogleFonts.asMap().containsKey(
+                                  useGoogleFonts:
+                                      GoogleFonts.asMap().containsKey(
                                     FlutterFlowTheme.of(context)
                                         .labelMediumFamily,
                                   ),
@@ -179,7 +183,8 @@ class _DetailsComponentWidgetState extends State<DetailsComponentWidget> {
                                 color: FlutterFlowTheme.of(context).info,
                                 letterSpacing: 0.0,
                                 useGoogleFonts: GoogleFonts.asMap().containsKey(
-                                FlutterFlowTheme.of(context).labelMediumFamily,
+                                  FlutterFlowTheme.of(context)
+                                      .labelMediumFamily,
                                 ),
                                 fontSize: limitedBodyFontSize,
                               ),
@@ -295,6 +300,7 @@ class _DetailsComponentWidgetState extends State<DetailsComponentWidget> {
             ],
           ),
         ),
+      ),
     );
   }
 }

lib/features/backend/api_requests/api_calls.dart

@@ -79,6 +79,9 @@ class FreAccessWSGlobal extends Api {
   static UpdateVehicle updateVehicle = UpdateVehicle();
   static DeleteVehicle deleteVehicle = DeleteVehicle();
   static CancelDeleteVehicle cancelDelete = CancelDeleteVehicle();
+  static GetPDF getPDF = GetPDF();
+  static GetCategories getCategories = GetCategories();
+  static GetDocuments getDocuments = GetDocuments();
 }
 
 class CancelDeleteVehicle {
@@ -88,7 +91,7 @@ class CancelDeleteVehicle {
     required final String model,
     required final String color,
   }) async {
-    final String baseUrl = PhpGroup.getBaseUrl();
+    final String baseUrl = FreAccessWSGlobal.getBaseUrl();
     final String devUUID =
         (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
     final String userUUID =
@@ -130,7 +133,7 @@ class DeleteVehicle {
     required final String model,
     required final String color,
   }) async {
-    final String baseUrl = PhpGroup.getBaseUrl();
+    final String baseUrl = FreAccessWSGlobal.getBaseUrl();
     final String devUUID =
         (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
     final String userUUID =
@@ -173,7 +176,7 @@ class RegisterVehicle {
     final String? color,
     final String? model,
   }) async {
-    final String baseUrl = PhpGroup.getBaseUrl();
+    final String baseUrl = FreAccessWSGlobal.getBaseUrl();
 
     final String devUUID =
         (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
@@ -217,7 +220,7 @@ class UpdateVehicle {
     final String? color,
     final String? model,
   }) async {
-    final String baseUrl = PhpGroup.getBaseUrl();
+    final String baseUrl = FreAccessWSGlobal.getBaseUrl();
     final String devUUID =
         (await StorageHelper().get(ProfileStorageKey.devUUID.key)) ?? '';
     final String userUUID =

lib/features/notification/deep_link_service.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:developer';
 import 'package:app_links/app_links.dart';
 import 'package:flutter/material.dart';
 import 'package:hub/features/storage/index.dart';

lib/initialization.dart

@@ -1,3 +1,5 @@
+import 'dart:developer';
+
 import 'package:app_tracking_transparency/app_tracking_transparency.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_crashlytics/firebase_crashlytics.dart';

lib/pages/vehicles_on_the_property/vehicle_history_screen.dart

@@ -10,7 +10,7 @@ class VehicleHistoryScreen extends StatefulWidget {
 
 class _VehicleHistoryScreenState extends State<VehicleHistoryScreen>
     with Pageable {
-  final apiCall = PhpGroup.getVehiclesByProperty;
+  final apiCall = FreAccessWSGlobal.getVehiclesByProperty;
   int totalOwnerVehicles = 0;
   final PagingController<int, dynamic> _pagingController =
       PagingController<int, dynamic>(firstPageKey: 1);

lib/pages/vehicles_on_the_property/vehicle_model.dart

@@ -7,8 +7,8 @@ import 'package:hub/features/backend/index.dart';
 import 'package:hub/features/storage/index.dart';
 import 'package:hub/flutter_flow/index.dart';
 import 'package:hub/pages/vehicles_on_the_property/vehicles_on_the_property.dart';
-import 'package:hub/shared/extensions/index.dart';
+import 'package:hub/shared/extensions.dart';
-import 'package:hub/shared/utils/index.dart';
+import 'package:hub/shared/utils.dart';
 
 /// [VehicleModel] is a class that contains the business logic of the vehicle page.
 class VehicleModel extends FlutterFlowModel<VehiclePage>
@@ -196,7 +196,7 @@ mixin class _BaseVehiclePage {
 /// [_VehicleRegisterScreenModel] is a mixin that contains the business logic of the vehicle register page.
 mixin _VehicleRegisterScreenModel on _BaseVehiclePage {
   Future<void> registerVehicle() async {
-    final response = await PhpGroup.registerVehicle.call(
+    final response = await FreAccessWSGlobal.registerVehicle.call(
       licensePlate: textFieldControllerLicensePlate!.text,
       color: textFieldControllerColor!.text,
       model: textFieldControllerModel!.text,
@@ -218,7 +218,7 @@ mixin _VehicleRegisterScreenModel on _BaseVehiclePage {
 /// [_VehicleUpdateScreenModel] is a mixin that contains the business logic of the vehicle update page.
 mixin _VehicleUpdateScreenModel on _BaseVehiclePage {
   Future<void> updateVehicle() async {
-    final response = await PhpGroup.updateVehicle.call(
+    final response = await FreAccessWSGlobal.updateVehicle.call(
       licensePlate: textFieldControllerLicensePlate!.text,
       color: textFieldControllerColor!.text,
       model: textFieldControllerModel!.text,
@@ -403,7 +403,7 @@ mixin _VehicleHistoryScreenModel on _BaseVehiclePage {
 
   Future<bool> processDeleteRequest(dynamic item) async {
     log('processDeleteRequest -> item[$item]');
-    bool result = await PhpGroup.deleteVehicle
+    bool result = await FreAccessWSGlobal.deleteVehicle
         .call(
       vehicleId: item['vehicleId'],
       licensePlate: item['licensePlate'],
@@ -493,7 +493,7 @@ mixin _VehicleHistoryScreenModel on _BaseVehiclePage {
   }
 
   Future<ApiCallResponse> processCancelDeleteRequest(dynamic item) async {
-    return await PhpGroup.deleteVehicle.call(
+    return await FreAccessWSGlobal.deleteVehicle.call(
       vehicleId: item['vehicleId'],
       licensePlate: item['licensePlate'],
       model: item['model'],
@@ -502,7 +502,7 @@ mixin _VehicleHistoryScreenModel on _BaseVehiclePage {
   }
 
   Future<ApiCallResponse> processCancelUpdateRequest(dynamic item) async {
-    return await PhpGroup.deleteVehicle.call(
+    return await FreAccessWSGlobal.deleteVehicle.call(
       vehicleId: item['vehicleId'],
       licensePlate: item['licensePlate'],
       model: item['model'],
@@ -511,7 +511,7 @@ mixin _VehicleHistoryScreenModel on _BaseVehiclePage {
   }
 
   Future<ApiCallResponse> processCancelCreateRequest(dynamic item) async {
-    return await PhpGroup.cancelDelete.call(
+    return await FreAccessWSGlobal.cancelDelete.call(
       vehicleId: item['vehicleId'],
       licensePlate: item['licensePlate'],
       model: item['model'],

lib/pages/vehicles_on_the_property/vehicles_on_the_property.dart

@@ -13,7 +13,7 @@ import 'package:hub/features/backend/index.dart';
 import 'package:hub/features/module/index.dart';
 import 'package:hub/flutter_flow/index.dart';
 import 'package:hub/pages/vehicles_on_the_property/vehicle_model.dart';
-import 'package:hub/shared/extensions/index.dart';
+import 'package:hub/shared/extensions.dart';
 import 'package:hub/shared/mixins/pageable_mixin.dart';
 import 'package:hub/shared/utils/dialog_util.dart';
 import 'package:hub/shared/utils/license_util.dart';

pubspec.yaml

@@ -3,7 +3,6 @@ name: hub
 description: .   # Descrição do projeto (adicione mais detalhes se necessário)
 publish_to: "none"   # Destino de publicação
 
-publish_to: "none"
 
 version: 1.4.0+27