From 16f1442564cf4cbc2721e69ee1ab1dea40d435cf Mon Sep 17 00:00:00 2001 From: reinjens Date: Tue, 17 Dec 2024 13:19:09 +0100 Subject: [PATCH] Stammdaten --- lib/main.dart | 4 +- lib/src/entity/area/area.dart | 2 +- lib/src/entity/cart/cart_datasource.dart | 22 +++++----- lib/src/entity/entities.dart | 2 - .../entity/measure/measure_repository.dart | 2 +- lib/src/extensions/extensions.dart | 2 - lib/src/packages/ambito_api/restclient.dart | 2 - .../packages/ambito_theme/ambito_theme.dart | 8 ++-- .../pages/calendar/calendar_page_year.dart | 4 +- lib/src/pages/cart/cart_page.dart | 2 +- .../dashboard/areas/dashboard_areas_page.dart | 22 +++++----- .../layouts/normal_layout_dashboard_page.dart | 2 +- .../layouts/small_layout_dashboard_page.dart | 3 +- .../master_data/master_data_page.dart | 2 +- .../dashboard/parts/parts_dashboard_page.dart | 6 +-- lib/src/pages/error/error_page.dart | 4 +- .../categories/measure_categories_page.dart | 4 +- .../measure/detail/cards/_main_card.dart | 4 +- .../measure/detail/cards/_sidebar_card.dart | 2 +- .../detail/cards/main/combined_card.dart | 4 +- .../detail/cards/main/gallery_card.dart | 4 +- .../detail/cards/main/simple_text_card.dart | 4 +- .../cards/main/sublevel_months_card.dart | 3 +- .../main/sublevel_unordered_list_card.dart | 40 +++++++++---------- .../cards/main/unordered_list_card.dart | 4 +- .../measure/detail/cards/material_card.dart | 5 +-- .../measure/groups/measure_groups_page.dart | 2 +- lib/src/pages/measure/measure_page.dart | 2 +- lib/src/widgets/cards/card_measure.dart | 2 +- .../edit_area_notice_dialog.dart | 4 +- lib/src/widgets/map/marker_generator.dart | 2 +- 31 files changed, 82 insertions(+), 93 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index c4cdb19..45096dc 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -52,8 +52,8 @@ void main() async { for (final cart in carts) { CartRepository().put(Cart.fromJson(cart)); } - var cart_elements = await BaseApi().getContent('cart_element', false); - for (final element in cart_elements) { + var cartElements = await BaseApi().getContent('cart_element', false); + for (final element in cartElements) { CartRepository().putElement(CartElement.fromJson(element)); } /*for (final cart in carts) { diff --git a/lib/src/entity/area/area.dart b/lib/src/entity/area/area.dart index cc13e70..c5bd71e 100644 --- a/lib/src/entity/area/area.dart +++ b/lib/src/entity/area/area.dart @@ -53,7 +53,7 @@ extension AreaExtension on Area { id.toString(), ), strokeColor: const Color(0xFF60845E), - fillColor: const Color(0xff87A34E).withOpacity(.7), + fillColor: const Color(0xff87A34E).withValues(alpha: .7), strokeWidth: 2, points: points, ); diff --git a/lib/src/entity/cart/cart_datasource.dart b/lib/src/entity/cart/cart_datasource.dart index 39355ff..32fb76c 100644 --- a/lib/src/entity/cart/cart_datasource.dart +++ b/lib/src/entity/cart/cart_datasource.dart @@ -57,21 +57,19 @@ class CartDataSource extends DataGridSource { final AmbitoTheme theme = getTheme(context); double completePrice = double.tryParse(row - .getCells() - .where((cell) => cell.columnName == 'Richtpreis') - .first - .value - .toString() ?? - '0.0') ?? + .getCells() + .where((cell) => cell.columnName == 'Richtpreis') + .first + .value + .toString()) ?? 0; int amount = int.tryParse(row - .getCells() - .where((cell) => cell.columnName == 'Menge') - .first - .value - .toString() ?? - '0') ?? + .getCells() + .where((cell) => cell.columnName == 'Menge') + .first + .value + .toString()) ?? 0; if (amount > 1) { diff --git a/lib/src/entity/entities.dart b/lib/src/entity/entities.dart index 2b9331d..78641f5 100644 --- a/lib/src/entity/entities.dart +++ b/lib/src/entity/entities.dart @@ -1,5 +1,3 @@ -library ambito_entities; - export '_general/file/file_part.dart'; export '_general/file/thumbnail.dart'; export '_general/file/thumbnails.dart'; diff --git a/lib/src/entity/measure/measure_repository.dart b/lib/src/entity/measure/measure_repository.dart index fb4251d..0abf4c6 100644 --- a/lib/src/entity/measure/measure_repository.dart +++ b/lib/src/entity/measure/measure_repository.dart @@ -283,7 +283,7 @@ class MeasureRepository extends BaseDB { .getTypeDetailsForType(measureType?.measureType ?? ''); // Save preferences and populate combined map prefs.setBool('extended_json', true).then((_) { - _mergeToCombinedMap(combined, measureGeneral?.toJson()); + _mergeToCombinedMap(combined, measureGeneral.toJson()); _mergeToCombinedMap(combined, measureDetails?.toJson()); _mergeToCombinedMap(combined, measureType?.toJson()); _mergeToCombinedMap(combined, measureTypesDetails?.toJson()); diff --git a/lib/src/extensions/extensions.dart b/lib/src/extensions/extensions.dart index af0e29a..070b442 100644 --- a/lib/src/extensions/extensions.dart +++ b/lib/src/extensions/extensions.dart @@ -1,5 +1,3 @@ -library ambito_extensions; - import 'package:flutter/material.dart'; import 'package:flutter_i18n/flutter_i18n.dart'; diff --git a/lib/src/packages/ambito_api/restclient.dart b/lib/src/packages/ambito_api/restclient.dart index 2ae96fa..9e39cc6 100644 --- a/lib/src/packages/ambito_api/restclient.dart +++ b/lib/src/packages/ambito_api/restclient.dart @@ -1,5 +1,3 @@ -library vyc_api; - import 'dart:async'; import 'dart:convert'; diff --git a/lib/src/packages/ambito_theme/ambito_theme.dart b/lib/src/packages/ambito_theme/ambito_theme.dart index 951c660..92981d1 100644 --- a/lib/src/packages/ambito_theme/ambito_theme.dart +++ b/lib/src/packages/ambito_theme/ambito_theme.dart @@ -37,10 +37,10 @@ final actionGroupColors = { }; final actionAreaColors = { - 'Landschaft': const Color(0xffeebb4b).withOpacity(.1), - 'Weinberg': const Color(0xff88a44e).withOpacity(.1), - 'Betriebsfläche': const Color(0xff96172f).withOpacity(.1), - 'Betriebsstätte': const Color(0xffCCCDCC).withOpacity(.1), + 'Landschaft': const Color(0xffeebb4b)..withValues(alpha: .1), + 'Weinberg': const Color(0xff88a44e)..withValues(alpha: .1), + 'Betriebsfläche': const Color(0xff96172f)..withValues(alpha: .1), + 'Betriebsstätte': const Color(0xffCCCDCC)..withValues(alpha: .1), }; final actionAreaFGColors = { diff --git a/lib/src/pages/calendar/calendar_page_year.dart b/lib/src/pages/calendar/calendar_page_year.dart index 5accc42..f72b712 100644 --- a/lib/src/pages/calendar/calendar_page_year.dart +++ b/lib/src/pages/calendar/calendar_page_year.dart @@ -186,7 +186,7 @@ class CalendarPageYearState extends State { ), horizontalInside: BorderSide( width: 1, - color: Colors.black.withOpacity(.6), + color: Colors.black..withValues(alpha: .6), ), verticalInside: const BorderSide( width: 0, @@ -216,7 +216,7 @@ class CalendarPageYearState extends State { ), horizontalInside: BorderSide( width: 1, - color: Colors.black.withOpacity(.6), + color: Colors.black..withValues(alpha: .6), ), verticalInside: const BorderSide( width: 0, diff --git a/lib/src/pages/cart/cart_page.dart b/lib/src/pages/cart/cart_page.dart index 6b0dff9..515913b 100644 --- a/lib/src/pages/cart/cart_page.dart +++ b/lib/src/pages/cart/cart_page.dart @@ -162,7 +162,7 @@ class CartPageState extends State { ], ), theme.verticalSpacerSmall, - gridWidget(elements ?? [], key), + gridWidget(elements, key), theme.verticalSpacer, Row( children: [ diff --git a/lib/src/pages/dashboard/areas/dashboard_areas_page.dart b/lib/src/pages/dashboard/areas/dashboard_areas_page.dart index dff4001..053d760 100644 --- a/lib/src/pages/dashboard/areas/dashboard_areas_page.dart +++ b/lib/src/pages/dashboard/areas/dashboard_areas_page.dart @@ -164,11 +164,11 @@ class DashboardAreasPageState extends State { color: theme.currentColorScheme.secondary), ), onPressed: () async { - final TextEditingController _controllerName = + final TextEditingController controllerName = TextEditingController(); - final TextEditingController _controllerSize = + final TextEditingController controllerSize = TextEditingController(); - final TextEditingController _controllerDescription = + final TextEditingController controllerDescription = TextEditingController(); await showDialog( context: context, @@ -245,8 +245,8 @@ class DashboardAreasPageState extends State { backgroundColor: theme .currentColorScheme .surface - .withOpacity( - .1), + ..withValues( + alpha: .1), foregroundColor: theme .currentColorScheme .primary, @@ -309,7 +309,7 @@ class DashboardAreasPageState extends State { ..id = isar.areas .autoIncrement() ..description = - _controllerDescription + controllerDescription .value .text ..business = [ @@ -321,11 +321,11 @@ class DashboardAreasPageState extends State { .name! ] ..name = - _controllerName + controllerName .value .text ..size = - _controllerSize + controllerSize .value .text; await BaseApi() @@ -382,7 +382,7 @@ class DashboardAreasPageState extends State { child: TextField( controller: - _controllerName, + controllerName, maxLines: 1, decoration: InputDecoration( @@ -424,7 +424,7 @@ class DashboardAreasPageState extends State { child: TextField( controller: - _controllerSize, + controllerSize, maxLines: 1, decoration: InputDecoration( @@ -467,7 +467,7 @@ class DashboardAreasPageState extends State { theme.verticalSpacer, TextField( controller: - _controllerDescription, + controllerDescription, maxLines: 5, decoration: InputDecoration( diff --git a/lib/src/pages/dashboard/layouts/normal_layout_dashboard_page.dart b/lib/src/pages/dashboard/layouts/normal_layout_dashboard_page.dart index e70a49b..e52d499 100644 --- a/lib/src/pages/dashboard/layouts/normal_layout_dashboard_page.dart +++ b/lib/src/pages/dashboard/layouts/normal_layout_dashboard_page.dart @@ -38,7 +38,7 @@ extension NormalLayoutDashboardPage on DashboardPageState { height: 250, child: Card( elevation: 0, - color: const Color(0xff666666).withOpacity(.1), + color: const Color(0xff666666).withValues(alpha: .1), child: Column( children: [ ClipRRect( diff --git a/lib/src/pages/dashboard/layouts/small_layout_dashboard_page.dart b/lib/src/pages/dashboard/layouts/small_layout_dashboard_page.dart index 7b2da1c..d86dac6 100644 --- a/lib/src/pages/dashboard/layouts/small_layout_dashboard_page.dart +++ b/lib/src/pages/dashboard/layouts/small_layout_dashboard_page.dart @@ -43,7 +43,8 @@ extension SmallLayoutDashboardPage on DashboardPageState { Container( height: 80, decoration: BoxDecoration( - color: theme.currentColorScheme.outline.withOpacity(.6), + color: theme.currentColorScheme.outline + ..withValues(alpha: .6), borderRadius: const BorderRadius.only( bottomLeft: Radius.circular(10), bottomRight: Radius.circular(10)), diff --git a/lib/src/pages/dashboard/master_data/master_data_page.dart b/lib/src/pages/dashboard/master_data/master_data_page.dart index cf8afbb..287d486 100644 --- a/lib/src/pages/dashboard/master_data/master_data_page.dart +++ b/lib/src/pages/dashboard/master_data/master_data_page.dart @@ -146,7 +146,7 @@ class MasterDataPageState extends State { ..value = business!.name ]; - final ret = await BaseApi().patchContent( + await BaseApi().patchContent( 'login', login!.id, changedlogin.toJson(), diff --git a/lib/src/pages/dashboard/parts/parts_dashboard_page.dart b/lib/src/pages/dashboard/parts/parts_dashboard_page.dart index bc3a07f..5ffe359 100644 --- a/lib/src/pages/dashboard/parts/parts_dashboard_page.dart +++ b/lib/src/pages/dashboard/parts/parts_dashboard_page.dart @@ -17,7 +17,7 @@ extension PartsDashboardPage on DashboardPageState { width: double.infinity, child: Card( elevation: 0, - color: orangeColors['primary']?.withOpacity(0.1), + color: orangeColors['primary']?..withValues(alpha: 0.1), child: Padding( padding: const EdgeInsets.all(16), child: Column( @@ -85,7 +85,7 @@ extension PartsDashboardPage on DashboardPageState { width: double.infinity, child: Card( elevation: 0, - color: greenColors['primary']?.withOpacity(0.3), + color: greenColors['primary']?..withValues(alpha: 0.3), child: Padding( padding: const EdgeInsets.all(16), child: Column( @@ -222,7 +222,7 @@ extension PartsDashboardPage on DashboardPageState { width: 532, child: Card( elevation: 0, - color: Theme.of(context).colorScheme.outline.withOpacity(.1), + color: Theme.of(context).colorScheme.outline..withValues(alpha: .1), child: Padding( padding: const EdgeInsets.all(16), child: Column( diff --git a/lib/src/pages/error/error_page.dart b/lib/src/pages/error/error_page.dart index 788094c..836a174 100644 --- a/lib/src/pages/error/error_page.dart +++ b/lib/src/pages/error/error_page.dart @@ -29,7 +29,7 @@ class ErrorPage extends StatelessWidget { width: 1152, child: Card( elevation: 0, - color: theme.currentColorScheme.outline.withOpacity(.1), + color: theme.currentColorScheme.outline..withValues(alpha: .1), child: Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -49,7 +49,7 @@ class ErrorPage extends StatelessWidget { Widget _smallCard(AmbitoTheme theme) { return Card( elevation: 0, - color: theme.currentColorScheme.outline.withOpacity(.1), + color: theme.currentColorScheme.outline..withValues(alpha: .1), child: Column( mainAxisSize: MainAxisSize.min, children: [ diff --git a/lib/src/pages/measure/categories/measure_categories_page.dart b/lib/src/pages/measure/categories/measure_categories_page.dart index 0b2faf6..f3ac98c 100644 --- a/lib/src/pages/measure/categories/measure_categories_page.dart +++ b/lib/src/pages/measure/categories/measure_categories_page.dart @@ -97,8 +97,8 @@ class MeasureCategoriesPageState extends State { decoration: BoxDecoration( borderRadius: const BorderRadius.all(Radius.circular(8)), - color: - theme.currentColorScheme.onSurface.withOpacity(.1), + color: theme.currentColorScheme.onSurface + ..withValues(alpha: .1), ), width: Breakpoint.fromContext(context).width, child: Padding( diff --git a/lib/src/pages/measure/detail/cards/_main_card.dart b/lib/src/pages/measure/detail/cards/_main_card.dart index 444198b..cecec41 100644 --- a/lib/src/pages/measure/detail/cards/_main_card.dart +++ b/lib/src/pages/measure/detail/cards/_main_card.dart @@ -29,8 +29,8 @@ class MainCard extends StatelessWidget { contentPadding: const EdgeInsets.only(left: 16), elevation: 0, expandedTextColor: theme.currentColorScheme.outline, - baseColor: theme.currentColorScheme.outline.withOpacity(.1), - expandedColor: theme.currentColorScheme.outline.withOpacity(.1), + baseColor: theme.currentColorScheme.outline..withValues(alpha: .1), + expandedColor: theme.currentColorScheme.outline..withValues(alpha: .1), title: Text( context.translate(title), style: theme.currentThemeData.textTheme.labelMedium diff --git a/lib/src/pages/measure/detail/cards/_sidebar_card.dart b/lib/src/pages/measure/detail/cards/_sidebar_card.dart index 8ce3fed..17c8aac 100644 --- a/lib/src/pages/measure/detail/cards/_sidebar_card.dart +++ b/lib/src/pages/measure/detail/cards/_sidebar_card.dart @@ -26,7 +26,7 @@ class SideBarCard extends StatelessWidget { borderRadius: BorderRadius.circular(8), ), elevation: 0, - color: greenColors['primary']!.withOpacity(.1), + color: greenColors['primary']!..withValues(alpha: .1), child: Padding( padding: const EdgeInsets.all(16), child: Column( diff --git a/lib/src/pages/measure/detail/cards/main/combined_card.dart b/lib/src/pages/measure/detail/cards/main/combined_card.dart index 0eda75c..0fb0847 100644 --- a/lib/src/pages/measure/detail/cards/main/combined_card.dart +++ b/lib/src/pages/measure/detail/cards/main/combined_card.dart @@ -30,8 +30,8 @@ class CombinedCard extends StatelessWidget { contentPadding: const EdgeInsets.only(left: 16), elevation: 0, expandedTextColor: theme.currentColorScheme.outline, - baseColor: theme.currentColorScheme.outline.withOpacity(.1), - expandedColor: theme.currentColorScheme.outline.withOpacity(.1), + baseColor: theme.currentColorScheme.outline..withValues(alpha: .1), + expandedColor: theme.currentColorScheme.outline..withValues(alpha: .1), title: Text( title, style: theme.currentThemeData.textTheme.labelMedium diff --git a/lib/src/pages/measure/detail/cards/main/gallery_card.dart b/lib/src/pages/measure/detail/cards/main/gallery_card.dart index d61d131..cc9ed3c 100644 --- a/lib/src/pages/measure/detail/cards/main/gallery_card.dart +++ b/lib/src/pages/measure/detail/cards/main/gallery_card.dart @@ -31,8 +31,8 @@ class GalleryCard extends StatelessWidget { contentPadding: const EdgeInsets.only(left: 16), elevation: 0, expandedTextColor: theme.currentColorScheme.outline, - baseColor: theme.currentColorScheme.outline.withOpacity(.1), - expandedColor: theme.currentColorScheme.outline.withOpacity(.1), + baseColor: theme.currentColorScheme.outline..withValues(alpha: .1), + expandedColor: theme.currentColorScheme.outline..withValues(alpha: .1), title: Text( title, style: theme.currentThemeData.textTheme.labelMedium diff --git a/lib/src/pages/measure/detail/cards/main/simple_text_card.dart b/lib/src/pages/measure/detail/cards/main/simple_text_card.dart index f3d8828..656ac54 100644 --- a/lib/src/pages/measure/detail/cards/main/simple_text_card.dart +++ b/lib/src/pages/measure/detail/cards/main/simple_text_card.dart @@ -30,8 +30,8 @@ class SimpleTextCard extends StatelessWidget { contentPadding: const EdgeInsets.only(left: 16), elevation: 0, expandedTextColor: theme.currentColorScheme.outline, - baseColor: theme.currentColorScheme.outline.withOpacity(.1), - expandedColor: theme.currentColorScheme.outline.withOpacity(.1), + baseColor: theme.currentColorScheme.outline..withValues(alpha: .1), + expandedColor: theme.currentColorScheme.outline..withValues(alpha: .1), title: Text( title, style: theme.currentThemeData.textTheme.labelMedium diff --git a/lib/src/pages/measure/detail/cards/main/sublevel_months_card.dart b/lib/src/pages/measure/detail/cards/main/sublevel_months_card.dart index d4ae2c8..0dbae34 100644 --- a/lib/src/pages/measure/detail/cards/main/sublevel_months_card.dart +++ b/lib/src/pages/measure/detail/cards/main/sublevel_months_card.dart @@ -26,7 +26,8 @@ class SublevelMonthsCard extends StatelessWidget { labelPadding: EdgeInsets.zero, backgroundColor: active ? theme.currentColorScheme.secondary - : theme.currentColorScheme.outline.withOpacity(.1), + : theme.currentColorScheme.outline + ..withValues(alpha: .1), label: Text( label, style: theme.currentThemeData.textTheme.bodyLarge?.copyWith( diff --git a/lib/src/pages/measure/detail/cards/main/sublevel_unordered_list_card.dart b/lib/src/pages/measure/detail/cards/main/sublevel_unordered_list_card.dart index fdd0c6f..a54efbf 100644 --- a/lib/src/pages/measure/detail/cards/main/sublevel_unordered_list_card.dart +++ b/lib/src/pages/measure/detail/cards/main/sublevel_unordered_list_card.dart @@ -36,28 +36,26 @@ class SublevelUnorderedListCard extends StatelessWidget { title, style: theme.currentThemeData.textTheme.labelMedium, ), - ...text! - .map( - (item) => Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - const Align( - alignment: Alignment.center, - child: Icon(Icons.circle, size: 4), - ), - theme.horizontalSpacerSmall, - Expanded( - child: Text( - item, - softWrap: true, - maxLines: 2, - style: theme.bodyMedium, - ), - ), - ], + ...text!.map( + (item) => Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Align( + alignment: Alignment.center, + child: Icon(Icons.circle, size: 4), ), - ) - .toList(), + theme.horizontalSpacerSmall, + Expanded( + child: Text( + item, + softWrap: true, + maxLines: 2, + style: theme.bodyMedium, + ), + ), + ], + ), + ), ], ), ), diff --git a/lib/src/pages/measure/detail/cards/main/unordered_list_card.dart b/lib/src/pages/measure/detail/cards/main/unordered_list_card.dart index a605d16..bce34e2 100644 --- a/lib/src/pages/measure/detail/cards/main/unordered_list_card.dart +++ b/lib/src/pages/measure/detail/cards/main/unordered_list_card.dart @@ -30,8 +30,8 @@ class UnorderedListCard extends StatelessWidget { contentPadding: const EdgeInsets.only(left: 16), elevation: 0, expandedTextColor: theme.currentColorScheme.outline, - baseColor: theme.currentColorScheme.outline.withOpacity(.1), - expandedColor: theme.currentColorScheme.outline.withOpacity(.1), + baseColor: theme.currentColorScheme.outline..withValues(alpha: .1), + expandedColor: theme.currentColorScheme.outline..withValues(alpha: .1), title: Text( title, style: theme.currentThemeData.textTheme.labelMedium diff --git a/lib/src/pages/measure/detail/cards/material_card.dart b/lib/src/pages/measure/detail/cards/material_card.dart index 1df0fd0..99327d9 100644 --- a/lib/src/pages/measure/detail/cards/material_card.dart +++ b/lib/src/pages/measure/detail/cards/material_card.dart @@ -34,10 +34,7 @@ class MaterialCard extends StatelessWidget { theme.verticalSpacer, if (massnahme.costs != null) Text( - context.translate( - 'page.actionDetailPage.material.suggested_price') + - massnahme.costs + - ' €', + '${context.translate('page.actionDetailPage.material.suggested_price')} ${massnahme.costs} €', style: theme.bodyMedium.copyWith(fontWeight: FontWeight.bold), ), theme.verticalSpacer, diff --git a/lib/src/pages/measure/groups/measure_groups_page.dart b/lib/src/pages/measure/groups/measure_groups_page.dart index 39b5f61..331da63 100644 --- a/lib/src/pages/measure/groups/measure_groups_page.dart +++ b/lib/src/pages/measure/groups/measure_groups_page.dart @@ -103,7 +103,7 @@ class MeasureGroupsPageState extends State { borderRadius: const BorderRadius.all(Radius.circular(8)), color: - theme.currentColorScheme.onSurface.withOpacity(.1), + theme.currentColorScheme.onSurface..withValues(alpha:.1), ), width: Breakpoint.fromContext(context).width, child: Padding( diff --git a/lib/src/pages/measure/measure_page.dart b/lib/src/pages/measure/measure_page.dart index e2c8c3a..d393714 100644 --- a/lib/src/pages/measure/measure_page.dart +++ b/lib/src/pages/measure/measure_page.dart @@ -273,7 +273,7 @@ class MeasuresPageState extends State { width: double.infinity, child: Card( elevation: 0, - color: theme.currentColorScheme.outline.withOpacity(.1), + color: theme.currentColorScheme.outline..withValues(alpha: .1), child: Row( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start, diff --git a/lib/src/widgets/cards/card_measure.dart b/lib/src/widgets/cards/card_measure.dart index e60f562..368f88f 100644 --- a/lib/src/widgets/cards/card_measure.dart +++ b/lib/src/widgets/cards/card_measure.dart @@ -43,7 +43,7 @@ class CardMeasure extends StatelessWidget { context, title: group!.name!, image: group!.image, - color: actionGroupColors[group!.name!]!.withOpacity(0.1), + color: actionGroupColors[group!.name!]!..withValues(alpha: 0.1), titleColor: actionGroupColors[group!.name!]!, description: group!.description! + ListRepository() diff --git a/lib/src/widgets/dialogs/edit_field_dialog/edit_area_notice_dialog.dart b/lib/src/widgets/dialogs/edit_field_dialog/edit_area_notice_dialog.dart index e28b841..354f63e 100644 --- a/lib/src/widgets/dialogs/edit_field_dialog/edit_area_notice_dialog.dart +++ b/lib/src/widgets/dialogs/edit_field_dialog/edit_area_notice_dialog.dart @@ -73,8 +73,8 @@ class EditAreaNoticeDialog extends StatelessWidget { Navigator.pop(context); }, title: 'Abbrechen', - backgroundColor: - theme.currentColorScheme.surface.withOpacity(.1), + backgroundColor: theme.currentColorScheme.surface + ..withValues(alpha: .1), foregroundColor: theme.currentColorScheme.primary, borderColor: theme.currentColorScheme.primary, ), diff --git a/lib/src/widgets/map/marker_generator.dart b/lib/src/widgets/map/marker_generator.dart index 43aef82..95fd555 100644 --- a/lib/src/widgets/map/marker_generator.dart +++ b/lib/src/widgets/map/marker_generator.dart @@ -5,7 +5,7 @@ import 'package:flutter/material.dart'; import 'package:google_maps_flutter/google_maps_flutter.dart'; class MarkerGenerator { - final _markerSize; + final double _markerSize; double _circleStrokeWidth = 0; double _circleOffset = 0; double _outlineCircleWidth = 0;