From 80266df85d869061a4512944f9f04206b716c67c Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Wed, 31 Aug 2022 19:54:22 +0200 Subject: [PATCH] chore: Update to flutter 3.3.0 --- .gitlab-ci.yml | 2 +- lib/pages/bootstrap/bootstrap_dialog.dart | 2 +- lib/pages/chat/events/message_content.dart | 2 +- lib/pages/login/login_view.dart | 2 +- lib/utils/matrix_sdk_extensions.dart/fluffybox_database.dart | 1 - .../flutter_hive_collections_database.dart | 1 - 6 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index daa11d07..7bb69cfb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - FLUTTER_VERSION: 3.0.5 + FLUTTER_VERSION: 3.3.0 image: cirrusci/flutter:${FLUTTER_VERSION} diff --git a/lib/pages/bootstrap/bootstrap_dialog.dart b/lib/pages/bootstrap/bootstrap_dialog.dart index 09c221a5..2e3931b9 100644 --- a/lib/pages/bootstrap/bootstrap_dialog.dart +++ b/lib/pages/bootstrap/bootstrap_dialog.dart @@ -335,7 +335,7 @@ class BootstrapDialogState extends State { const SizedBox(height: 16), ElevatedButton.icon( style: ElevatedButton.styleFrom( - onPrimary: Colors.red, + foregroundColor: Colors.red, ), icon: const Icon(Icons.delete_outlined), label: Text(L10n.of(context)!.recoveryKeyLost), diff --git a/lib/pages/chat/events/message_content.dart b/lib/pages/chat/events/message_content.dart index 20fb76b9..3e0c8b88 100644 --- a/lib/pages/chat/events/message_content.dart +++ b/lib/pages/chat/events/message_content.dart @@ -265,7 +265,7 @@ class _ButtonContent extends StatelessWidget { icon: icon, label: Text(label, overflow: TextOverflow.ellipsis), style: OutlinedButton.styleFrom( - primary: textColor, + foregroundColor: textColor, backgroundColor: Colors.white.withAlpha(64), ), ); diff --git a/lib/pages/login/login_view.dart b/lib/pages/login/login_view.dart index e31b83f3..40c80853 100644 --- a/lib/pages/login/login_view.dart +++ b/lib/pages/login/login_view.dart @@ -130,7 +130,7 @@ class LoginView extends StatelessWidget { child: ElevatedButton( onPressed: controller.loading ? () {} : controller.passwordForgotten, - style: ElevatedButton.styleFrom(onPrimary: Colors.red), + style: ElevatedButton.styleFrom(foregroundColor: Colors.red), child: Text(L10n.of(context)!.passwordForgotten), ), ), diff --git a/lib/utils/matrix_sdk_extensions.dart/fluffybox_database.dart b/lib/utils/matrix_sdk_extensions.dart/fluffybox_database.dart index 7435b516..5aff92d4 100644 --- a/lib/utils/matrix_sdk_extensions.dart/fluffybox_database.dart +++ b/lib/utils/matrix_sdk_extensions.dart/fluffybox_database.dart @@ -2,7 +2,6 @@ import 'dart:convert'; import 'dart:io'; -import 'dart:typed_data'; import 'package:flutter/foundation.dart' hide Key; import 'package:flutter/services.dart'; diff --git a/lib/utils/matrix_sdk_extensions.dart/flutter_hive_collections_database.dart b/lib/utils/matrix_sdk_extensions.dart/flutter_hive_collections_database.dart index aee23b20..900fd269 100644 --- a/lib/utils/matrix_sdk_extensions.dart/flutter_hive_collections_database.dart +++ b/lib/utils/matrix_sdk_extensions.dart/flutter_hive_collections_database.dart @@ -1,6 +1,5 @@ import 'dart:convert'; import 'dart:io'; -import 'dart:typed_data'; import 'package:flutter/foundation.dart' hide Key; import 'package:flutter/services.dart';