Skip to content

Commit

Permalink
feat: flutter 3.13.7
Browse files Browse the repository at this point in the history
  • Loading branch information
drminh2807 committed Oct 19, 2023
1 parent 53d4a70 commit 13dc43d
Show file tree
Hide file tree
Showing 93 changed files with 177 additions and 166 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
name: Build

env:
FLUTTER_VERSION: 3.10.6
FLUTTER_VERSION: 3.13.7

jobs:
build_debug_mobile:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ on:
pull_request:

env:
FLUTTER_VERSION: 3.10.6
FLUTTER_VERSION: 3.13.7
LIBOLM_VERSION: 3.2.15

name: Deploying on GitHub Pages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
- "v*.*.*"

env:
FLUTTER_VERSION: 3.10.6
FLUTTER_VERSION: 3.13.7

name: Release app

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
name: Tests

env:
FLUTTER_VERSION: 3.10.6
FLUTTER_VERSION: 3.13.7

jobs:
code_analyze:
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variables:
FLUTTER_VERSION: 3.10.6
FLUTTER_VERSION: 3.13.7

image:
name: cirrusci/flutter:${FLUTTER_VERSION}
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Specify versions
ARG FLUTTER_VERSION=3.10.6
ARG FLUTTER_VERSION=3.13.7
ARG OLM_VERSION=3.2.15

# Building libolm
Expand Down
2 changes: 1 addition & 1 deletion ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1240;
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1430;
ORGANIZATIONNAME = "";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1430"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion lib/di/global/network_di.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class NetworkDI extends BaseDI {
void _bindBaseOption(GetIt get) {
final headers = {
HttpHeaders.acceptHeader: acceptHeaderDefault,
HttpHeaders.contentTypeHeader: contentTypeHeaderDefault
HttpHeaders.contentTypeHeader: contentTypeHeaderDefault,
};

get.registerLazySingleton<DioCacheOption>(
Expand Down
10 changes: 5 additions & 5 deletions lib/domain/model/preview_file/supported_preview_file_types.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class SupportedPreviewFileTypes {
'application/vnd.oasis.opendocument.text-master',
'application/msword',
'application/vnd.ms-works',
'docx'
'docx',
];

static const pdfMimeTypes = ['application/pdf', 'application/rtf'];
Expand All @@ -37,14 +37,14 @@ class SupportedPreviewFileTypes {
'application/vnd.oasis.opendocument.spreadsheet-template',
'application/vnd.oasis.opendocument.chart',
'application/vnd.oasis.opendocument.formula',
'application/vnd.ms-excel'
'application/vnd.ms-excel',
];

static const pptMimeTypes = [
'application/vnd.openxmlformats-officedocument.presentationml.presentation',
'application/vnd.oasis.opendocument.presentation',
'application/vnd.oasis.opendocument.presentation-template',
'application/vnd.ms-powerpoint'
'application/vnd.ms-powerpoint',
];

static const zipMimeTypes = [
Expand All @@ -54,7 +54,7 @@ class SupportedPreviewFileTypes {
'application/x-compressed',
'application/x-zip-compressed',
'application/java-archive',
'application/zip'
'application/zip',
];

static const iOSSupportedTypes = {
Expand Down Expand Up @@ -144,7 +144,7 @@ class SupportedPreviewFileTypes {
'docm',
'dot',
'dotx',
'dotm'
'dotm',
];

static const pdfFileTypes = ['pdf'];
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/archive/archive_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class ArchiveView extends StatelessWidget {
label: Text(L10n.of(context)!.clearArchive),
icon: const Icon(Icons.cleaning_services_outlined),
),
)
),
],
),
body: Builder(
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/bootstrap/bootstrap_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ class BootstrapDialogState extends State<BootstrapDialog> {
);
}
},
)
),
],
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/chat/add_widget_tile_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class AddWidgetTileView extends StatelessWidget {
child: Text(L10n.of(context)!.addWidget),
),
],
)
),
],
);
}
Expand Down
4 changes: 2 additions & 2 deletions lib/pages/chat/chat.dart
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ class ChatController extends State<Chat>
fileInfos: [
FileInfo.fromMatrixFile(
shareFile!,
)
),
],
);
}
Expand Down Expand Up @@ -657,7 +657,7 @@ class ChatController extends State<Chat>
MatrixVideoFile(
bytes: bytes,
name: file.path,
)
),
],
room: room!,
),
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/chat/chat_input_row_mobile.dart
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class ChatInputRowMobile extends StatelessWidget {
KeyBoardShortcuts(
keysToPress: {
LogicalKeyboardKey.altLeft,
LogicalKeyboardKey.keyE
LogicalKeyboardKey.keyE,
},
onKeysPressed: onEmojiAction,
helpLabel: L10n.of(context)!.emojis,
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/chat/chat_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ class _SearchMenuItem extends StatelessWidget {
),
],
),
)
),
],
onSelected: (item) {
switch (item) {
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/chat/events/audio_player.dart
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
),
),
),
)
),
],
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/chat/events/cute_events.dart
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class _CuteContentState extends State<CuteContent> {
widget.event.text,
style: const TextStyle(fontSize: 150),
),
if (label != null) Text(label)
if (label != null) Text(label),
],
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/chat/events/encrypted_mixin.dart
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ mixin EncryptedMixin {
event.calcLocalizedBodyFallback(
MatrixLocals(l10n),
),
)
),
],
),
),
Expand Down
8 changes: 4 additions & 4 deletions lib/pages/chat/events/message/message.dart
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class Message extends StatelessWidget {
EventTypes.Message,
EventTypes.Sticker,
EventTypes.Encrypted,
EventTypes.CallInvite
EventTypes.CallInvite,
}.contains(event.type)) {
if (event.type.startsWith('m.call.')) {
return Container();
Expand Down Expand Up @@ -288,7 +288,7 @@ class Message extends StatelessWidget {
'msgtype':
'm.text',
'body':
'...'
'...',
},
senderId:
event.senderId,
Expand Down Expand Up @@ -485,7 +485,7 @@ class Message extends StatelessWidget {
timeline,
RelationshipTypes.reaction,
))
const SizedBox(height: 24)
const SizedBox(height: 24),
],
),
if (event.hasAggregatedEvents(
Expand Down Expand Up @@ -747,7 +747,7 @@ class ReplyIconWidget extends StatelessWidget {
if (!isOwnMessage)
const SizedBox(
width: 12.0,
)
),
],
),
);
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/chat/events/message_content.dart
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class MessageContent extends StatelessWidget with PlayVideoActionMixin {
Padding(
padding: const EdgeInsets.symmetric(vertical: 4),
child: endOfBubbleWidget,
)
),
],
);

Expand Down
2 changes: 1 addition & 1 deletion lib/pages/chat/events/message_reactions.dart
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ class _AdaptableReactorsDialog extends StatelessWidget {
runSpacing: 4.0,
alignment: WrapAlignment.center,
children: <Widget>[
for (var reactor in reactionEntry!.reactors!)
for (final reactor in reactionEntry!.reactors!)
Chip(
avatar: Avatar(
mxContent: reactor.avatarUrl,
Expand Down
4 changes: 2 additions & 2 deletions lib/pages/chat/events/sending_image_info_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class SendingImageInfoWidget extends StatelessWidget {
Icons.close,
color: LinagoraRefColors.material().primary[100],
),
]
],
],
);
},
Expand Down Expand Up @@ -106,7 +106,7 @@ class SendingImageInfoWidget extends StatelessWidget {
cacheWidth: displayImageInfo.size.width.toInt(),
fit: BoxFit.cover,
filterQuality: FilterQuality.medium,
)
),
],
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/chat/events/sending_video_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class SendingVideoWidget extends StatelessWidget with PlayVideoActionMixin {
InkWell(
onTap: () => _onPlayVideo(context),
child: const _PlayVideoButton(),
)
),
] else if (value == SendingVideoStatus.error) ...[
const SizedBox(
width: MessageContentStyle.videoCenterButtonSize,
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/chat/events/verification_request_content.dart
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class VerificationRequestContent extends StatelessWidget {
: (started
? L10n.of(context)!.loadingPleaseWait
: L10n.of(context)!.newVerificationRequest)),
)
),
],
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/chat/group_chat_empty_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class GroupChatEmptyView extends StatelessWidget {
color: LinagoraRefColors.material().neutral[40],
),
),
const Spacer()
const Spacer(),
],
),
const SizedBox(height: 8),
Expand Down
3 changes: 3 additions & 0 deletions lib/pages/chat/input_bar/input_bar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,9 @@ class InputBar extends StatelessWidget with PasteImageMixin {
editableTextState
.selectAll(SelectionChangedCause.toolbar);
},
onLiveTextInput: () {
// FIXME: Need to hadle live text input
},
);
}
: null,
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/chat/input_bar/input_bar_shortcut.dart
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class InputBarShortcuts extends StatelessWidget {
flutter.LogicalKeyboardKey.enter,
): () {
onSubmitted?.call(controller?.text ?? '');
}
},
},
child: child,
);
Expand Down
4 changes: 2 additions & 2 deletions lib/pages/chat/others_group_chat_empty_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ class OthersGroupChatEmptyView extends StatelessWidget {
fontSize: 14,
color: LinagoraRefColors.material().neutral[60],
),
)
),
],
),
)
),
],
),
);
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/chat/reactions_picker.dart
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class ReactionsPicker extends StatelessWidget {
),
onTap: () =>
controller.pickEmojiReactionAction(allReactionEvents),
)
),
],
);
},
Expand Down
8 changes: 4 additions & 4 deletions lib/pages/chat_details/chat_details.dart
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class ChatDetailsController extends State<ChatDetails>
L10n.of(context)!,
),
),
)
),
],
);
if (input == null) return;
Expand Down Expand Up @@ -247,7 +247,7 @@ class ChatDetailsController extends State<ChatDetails>
suffixText: domain,
hintText: L10n.of(context)!.alias,
initialText: room.canonicalAlias.localpart,
)
),
],
);
if (input == null) return;
Expand All @@ -272,7 +272,7 @@ class ChatDetailsController extends State<ChatDetails>
initialText: room.topic,
minLines: 1,
maxLines: 4,
)
),
],
);
if (input == null) return;
Expand Down Expand Up @@ -439,7 +439,7 @@ class ChatDetailsController extends State<ChatDetails>
builder: (_) => InvitationSelection(
roomId: roomId!,
),
)
),
},
);
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class ChatDetailsPageViewBuilder extends StatelessWidget {
physics: const NeverScrollableScrollPhysics(),
children: pages.map((page) => page.child).toList(),
),
)
),
],
);
}
Expand Down
Loading

0 comments on commit 13dc43d

Please sign in to comment.