diff --git a/lib/src/widgets/buttons/cancel_button.dart b/lib/src/widgets/buttons/cancel_button.dart index 82cc50c..02b744c 100644 --- a/lib/src/widgets/buttons/cancel_button.dart +++ b/lib/src/widgets/buttons/cancel_button.dart @@ -14,7 +14,7 @@ class CancelButton extends StatelessWidget { onPressed: () { Navigator.pop(context); }, - title: context.translate('pages.general.buttons.cancel'), + title: context.translate('page.general.buttons.cancel'), backgroundColor: theme.currentColorScheme.tertiary, foregroundColor: theme.currentColorScheme.error, borderColor: theme.currentColorScheme.error, diff --git a/lib/src/widgets/buttons/delete_button.dart b/lib/src/widgets/buttons/delete_button.dart index a9a1154..d72993e 100644 --- a/lib/src/widgets/buttons/delete_button.dart +++ b/lib/src/widgets/buttons/delete_button.dart @@ -14,7 +14,7 @@ class DeleteButton extends StatelessWidget { final AmbitoTheme theme = getTheme(context); return WidgetOutlineButton( onPressed: onPressed, - title: context.translate('pages.general.buttons.delete'), + title: context.translate('page.general.buttons.delete'), backgroundColor: theme.currentColorScheme.error, foregroundColor: theme.currentColorScheme.onError, borderColor: theme.currentColorScheme.error, diff --git a/lib/src/widgets/buttons/save_button.dart b/lib/src/widgets/buttons/save_button.dart index c2a8df5..c64ee70 100644 --- a/lib/src/widgets/buttons/save_button.dart +++ b/lib/src/widgets/buttons/save_button.dart @@ -14,7 +14,7 @@ class SaveButton extends StatelessWidget { final AmbitoTheme theme = getTheme(context); return WidgetOutlineButton( onPressed: onPressed, - title: context.translate('pages.general.buttons.save'), + title: context.translate('page.general.buttons.save'), backgroundColor: theme.currentColorScheme.secondary, foregroundColor: theme.currentColorScheme.onPrimary, borderColor: theme.currentColorScheme.secondary, diff --git a/lib/src/widgets/dialogs/edit_entity_dialog/edit_area_dialog.dart b/lib/src/widgets/dialogs/edit_entity_dialog/edit_area_dialog.dart index 976fd86..815bc87 100644 --- a/lib/src/widgets/dialogs/edit_entity_dialog/edit_area_dialog.dart +++ b/lib/src/widgets/dialogs/edit_entity_dialog/edit_area_dialog.dart @@ -57,7 +57,7 @@ class EditAreaDialog extends StatelessWidget { theme.verticalSpacer, const TextHeadline( text: - 'pages.dashboard.business.area.title_edit_area'), + 'page.dashboard.business.area.title_edit_area'), theme.verticalSpacer, SaveButtonsGroup(onPressed: () { Area area = isar.areas.get(id)!; diff --git a/lib/src/widgets/map/map_widget.dart b/lib/src/widgets/map/map_widget.dart index 17e5820..377ad58 100644 --- a/lib/src/widgets/map/map_widget.dart +++ b/lib/src/widgets/map/map_widget.dart @@ -1,4 +1,7 @@ import 'dart:async'; +import 'dart:collection'; +import 'dart:io'; +import 'dart:math' as Math; import 'package:flutter/material.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; @@ -17,6 +20,9 @@ class MapWidgetState extends State { final Completer _controller = Completer(); + final con = GoogleMap + + static CameraPosition _initialPos = const CameraPosition( target: LatLng(0, 0), zoom: 14.4746, @@ -39,18 +45,20 @@ class MapWidgetState extends State { borderRadius: BorderRadius.circular(10.0), child: SizedBox( width: double.infinity, - height: 525, - child: GoogleMap( - mapToolbarEnabled: true, - mapType: MapType.hybrid, - markers: widget.markers ?? {}, - polygons: widget.polygons ?? {}, - initialCameraPosition: _initialPos, - onMapCreated: (GoogleMapController controller) { - _controller.complete(controller); - }, + height: 550, + child: GoogleMap( + mapToolbarEnabled: true, + mapType: MapType.hybrid, + markers: widget.markers ?? {}, + polygons: widget.polygons ?? {}, + initialCameraPosition: _initialPos, + onMapCreated: (GoogleMapController controller) { + _controller.complete(controller); + }, + ), ), - ), ); } + + }