diff --git a/compass_app/app/.gitignore b/compass_app/app/.gitignore index 285c53d1a..d0809a4ef 100644 --- a/compass_app/app/.gitignore +++ b/compass_app/app/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related diff --git a/compass_app/app/lib/ui/auth/login/widgets/tilted_cards.dart b/compass_app/app/lib/ui/auth/login/widgets/tilted_cards.dart index 5acb08673..4d9e934b9 100644 --- a/compass_app/app/lib/ui/auth/login/widgets/tilted_cards.dart +++ b/compass_app/app/lib/ui/auth/login/widgets/tilted_cards.dart @@ -83,7 +83,7 @@ class _Card extends StatelessWidget { CachedNetworkImage( imageUrl: imageUrl, fit: BoxFit.cover, - color: showTitle ? Colors.black.withOpacity(0.5) : null, + color: showTitle ? Colors.black.withValues(alpha: 0.5) : null, colorBlendMode: showTitle ? BlendMode.darken : null, errorListener: imageErrorListener, ), diff --git a/compass_app/app/lib/ui/home/widgets/home_screen.dart b/compass_app/app/lib/ui/home/widgets/home_screen.dart index 5a3fce717..46a0c6833 100644 --- a/compass_app/app/lib/ui/home/widgets/home_screen.dart +++ b/compass_app/app/lib/ui/home/widgets/home_screen.dart @@ -8,6 +8,7 @@ import 'package:go_router/go_router.dart'; import '../../../domain/models/booking/booking_summary.dart'; import '../../../routing/routes.dart'; import '../../core/localization/applocalization.dart'; +import '../../core/themes/colors.dart'; import '../../core/themes/dimens.dart'; import '../../core/ui/date_format_start_end.dart'; import '../../core/ui/error_indicator.dart'; @@ -166,6 +167,18 @@ class _Booking extends StatelessWidget { key: ValueKey(booking.id), direction: DismissDirection.endToStart, confirmDismiss: confirmDismiss, + background: Container( + color: AppColors.grey1, + child: Row( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + Padding( + padding: const EdgeInsets.only(right: Dimens.paddingHorizontal), + child: Icon(Icons.delete), + ), + ], + ), + ), child: InkWell( onTap: onTap, child: Padding( diff --git a/ios_app_clip/lib/main.dart b/ios_app_clip/lib/main.dart index 07c3a2831..4e3882906 100644 --- a/ios_app_clip/lib/main.dart +++ b/ios_app_clip/lib/main.dart @@ -4,7 +4,6 @@ import 'package:device_info/device_info.dart'; import 'package:flutter/cupertino.dart'; -import 'package:flutter/material.dart'; void main() { runApp(const Demo()); diff --git a/material_3_demo/lib/color_box.dart b/material_3_demo/lib/color_box.dart index d76bd9a10..b0226810e 100644 --- a/material_3_demo/lib/color_box.dart +++ b/material_3_demo/lib/color_box.dart @@ -74,9 +74,9 @@ class _ColorBoxState extends State { // Will change from int 0-255 to double 0.0-1.0 in 3.26+ // The properties also change from red/green/blue to r/g/b // hex += (c.[r g b] * 255.0).round().toRadixString(16).padLeft(2, '0'); - hex += c.red.toRadixString(16).padLeft(2, '0'); - hex += c.green.toRadixString(16).padLeft(2, '0'); - hex += c.blue.toRadixString(16).padLeft(2, '0'); + hex += c.r.round().toRadixString(16).padLeft(2, '0'); + hex += c.g.round().toRadixString(16).padLeft(2, '0'); + hex += c.b.round().toRadixString(16).padLeft(2, '0'); final data = ClipboardData(text: hex); await Clipboard.setData(data); messenger.hideCurrentSnackBar(); diff --git a/material_3_demo/pubspec.yaml b/material_3_demo/pubspec.yaml index 2df0a17d3..45cce5d68 100644 --- a/material_3_demo/pubspec.yaml +++ b/material_3_demo/pubspec.yaml @@ -9,7 +9,6 @@ version: 1.0.0+1 environment: sdk: ^3.5.0 - flutter: ^3.19.0 dependencies: flutter: diff --git a/tool/flutter_ci_script_beta.sh b/tool/flutter_ci_script_beta.sh index c314cdd88..373901071 100755 --- a/tool/flutter_ci_script_beta.sh +++ b/tool/flutter_ci_script_beta.sh @@ -23,9 +23,8 @@ declare -ar PROJECT_NAMES=( "code_sharing/client" "code_sharing/server" "code_sharing/shared" -# @ewindmill: withOpacity is deprecated -# "compass_app/app" -# "compass_app/server" + "compass_app/app" + "compass_app/server" "context_menus" "deeplink_store_example" "desktop_photo_search/fluent_ui" @@ -41,19 +40,16 @@ declare -ar PROJECT_NAMES=( # "experimental/pedometer" "experimental/pedometer/example" "experimental/varfont_shader_puzzle" - # TODO(ewindmill): whereNotNull deprecated in dart:collection - # "experimental/web_dashboard" + "experimental/web_dashboard" "flutter_maps_firestore" "form_app" "game_template" "gemini_tasks" "google_maps" "infinite_list" - # TODO(domesticmouse): The import of 'package:flutter/material.dart' is unnecessary because all of the used elements are also provided by the import of 'package:flutter/cupertino.dart'. - # "ios_app_clip" + "ios_app_clip" "isolate_example" - # TODO(ewindmill): Color.red is deprecated and should be Color.r (same for green and blue) - # "material_3_demo" + "material_3_demo" "navigation_and_routing" "place_tracker" "platform_channels" diff --git a/tool/flutter_ci_script_master.sh b/tool/flutter_ci_script_master.sh index 7abc49091..f366eb696 100755 --- a/tool/flutter_ci_script_master.sh +++ b/tool/flutter_ci_script_master.sh @@ -23,9 +23,8 @@ declare -ar PROJECT_NAMES=( "code_sharing/client" "code_sharing/server" "code_sharing/shared" -# @ewindmill: withOpacity is deprecated -# "compass_app/app" -# "compass_app/server" + "compass_app/app" + "compass_app/server" "context_menus" "deeplink_store_example" "desktop_photo_search/fluent_ui" @@ -41,19 +40,16 @@ declare -ar PROJECT_NAMES=( # "experimental/pedometer" "experimental/pedometer/example" "experimental/varfont_shader_puzzle" - # TODO(ewindmill): whereNotNull deprecated in dart:collection - # "experimental/web_dashboard" + "experimental/web_dashboard" "flutter_maps_firestore" "form_app" "game_template" "gemini_tasks" "google_maps" "infinite_list" - # TODO(domesticmouse): The import of 'package:flutter/material.dart' is unnecessary because all of the used elements are also provided by the import of 'package:flutter/cupertino.dart'. - # "ios_app_clip" + "ios_app_clip" "isolate_example" - # TODO(ewindmill): Color.red is deprecated and should be Color.r (same for green and blue) - # "material_3_demo" + "material_3_demo" "navigation_and_routing" "place_tracker" "platform_channels"