GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-12-25 06:52:35 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'krille/flutter-update' into 'main'

Browse Source 
chore: Update to flutter 3.3.0

See merge request famedly/fluffychat!1002
This commit is contained in:
Krille Fear 2022-08-31 18:08:28 +00:00
commit 89b3c82ee6
6 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -1,5 +1,5 @@
variables: variables:
FLUTTER_VERSION: 3.0.5 FLUTTER_VERSION: 3.3.0
image: cirrusci/flutter:${FLUTTER_VERSION} image: cirrusci/flutter:${FLUTTER_VERSION}

2
lib/pages/bootstrap/bootstrap_dialog.dart
View File

@ -335,7 +335,7 @@ class BootstrapDialogState extends State<BootstrapDialog> {
const SizedBox(height: 16), const SizedBox(height: 16),
ElevatedButton.icon( ElevatedButton.icon(
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
onPrimary: Colors.red, foregroundColor: Colors.red,
), ),
icon: const Icon(Icons.delete_outlined), icon: const Icon(Icons.delete_outlined),
label: Text(L10n.of(context)!.recoveryKeyLost), label: Text(L10n.of(context)!.recoveryKeyLost),

2
lib/pages/chat/events/message_content.dart
View File

@ -265,7 +265,7 @@ class _ButtonContent extends StatelessWidget {
icon: icon, icon: icon,
label: Text(label, overflow: TextOverflow.ellipsis), label: Text(label, overflow: TextOverflow.ellipsis),
style: OutlinedButton.styleFrom( style: OutlinedButton.styleFrom(
primary: textColor, foregroundColor: textColor,
backgroundColor: Colors.white.withAlpha(64), backgroundColor: Colors.white.withAlpha(64),
), ),
); );

2
lib/pages/login/login_view.dart
View File

@ -130,7 +130,7 @@ class LoginView extends StatelessWidget {
child: ElevatedButton( child: ElevatedButton(
onPressed: onPressed:
controller.loading ? () {} : controller.passwordForgotten, controller.loading ? () {} : controller.passwordForgotten,
style: ElevatedButton.styleFrom(onPrimary: Colors.red), style: ElevatedButton.styleFrom(foregroundColor: Colors.red),
child: Text(L10n.of(context)!.passwordForgotten), child: Text(L10n.of(context)!.passwordForgotten),
), ),
), ),

1
lib/utils/matrix_sdk_extensions.dart/fluffybox_database.dart
View File

@ -2,7 +2,6 @@
import 'dart:convert'; import 'dart:convert';
import 'dart:io'; import 'dart:io';
import 'dart:typed_data';
import 'package:flutter/foundation.dart' hide Key; import 'package:flutter/foundation.dart' hide Key;
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';

1
lib/utils/matrix_sdk_extensions.dart/flutter_hive_collections_database.dart
View File

@ -1,6 +1,5 @@
import 'dart:convert'; import 'dart:convert';
import 'dart:io'; import 'dart:io';
import 'dart:typed_data';
import 'package:flutter/foundation.dart' hide Key; import 'package:flutter/foundation.dart' hide Key;
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';