2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Migrate to null safety

Browse source
This commit is contained in:
Krille Fear 2022-01-29 12:35:03 +01:00 • committed by Christian Pauly
commit 55f0300f9f
163 changed files with 1759 additions and 1903 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/pages/user_bottom_sheet/user_bottom_sheet.dart
View file

@ -12,13 +12,13 @@ import 'user_bottom_sheet_view.dart';
class UserBottomSheet extends StatefulWidget {
final User user;
final Function onMention;
final Function? onMention;
final BuildContext outerContext;
const UserBottomSheet({
Key key,
@required this.user,
@required this.outerContext,
Key? key,
required this.user,
required this.outerContext,
this.onMention,
}) : super(key: key);
@ -33,15 +33,15 @@ class UserBottomSheetController extends State<UserBottomSheet> {
() async => (await showOkCancelAlertDialog(
useRootNavigator: false,
context: context,
title: L10n.of(context).areYouSure,
okLabel: L10n.of(context).yes,
cancelLabel: L10n.of(context).no,
title: L10n.of(context)!.areYouSure,
okLabel: L10n.of(context)!.yes,
cancelLabel: L10n.of(context)!.no,
) ==
OkCancelResult.ok);
switch (action) {
case 'mention':
Navigator.of(context, rootNavigator: false).pop();
widget.onMention();
widget.onMention!();
break;
case 'ban':
if (await _askConfirmation()) {
@ -90,7 +90,7 @@ class UserBottomSheetController extends State<UserBottomSheet> {
);
if (roomIdResult.error != null) return;
VRouter.of(widget.outerContext)
.toSegments(['rooms', roomIdResult.result]);
.toSegments(['rooms', roomIdResult.result!]);
Navigator.of(context, rootNavigator: false).pop();
break;
case 'ignore':

24
lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart
View file

@ -15,7 +15,7 @@ import 'user_bottom_sheet.dart';
class UserBottomSheetView extends StatelessWidget {
final UserBottomSheetController controller;
const UserBottomSheetView(this.controller, {Key key}) : super(key: key);
const UserBottomSheetView(this.controller, {Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
@ -38,7 +38,7 @@ class UserBottomSheetView extends StatelessWidget {
leading: IconButton(
icon: const Icon(Icons.arrow_downward_outlined),
onPressed: Navigator.of(context, rootNavigator: false).pop,
tooltip: L10n.of(context).close,
tooltip: L10n.of(context)!.close,
),
title: Text(user.calcDisplayname()),
actions: [
@ -49,7 +49,7 @@ class UserBottomSheetView extends StatelessWidget {
PopupMenuItem(
value: 'mention',
child: _TextWithIcon(
L10n.of(context).mention,
L10n.of(context)!.mention,
Icons.alternate_email_outlined,
),
),
@ -57,7 +57,7 @@ class UserBottomSheetView extends StatelessWidget {
PopupMenuItem(
value: 'message',
child: _TextWithIcon(
L10n.of(context).sendAMessage,
L10n.of(context)!.sendAMessage,
Icons.send_outlined,
),
),
@ -65,7 +65,7 @@ class UserBottomSheetView extends StatelessWidget {
PopupMenuItem(
value: 'permission',
child: _TextWithIcon(
L10n.of(context).setPermissionsLevel,
L10n.of(context)!.setPermissionsLevel,
Icons.edit_attributes_outlined,
),
),
@ -73,7 +73,7 @@ class UserBottomSheetView extends StatelessWidget {
PopupMenuItem(
value: 'kick',
child: _TextWithIcon(
L10n.of(context).kickFromChat,
L10n.of(context)!.kickFromChat,
Icons.exit_to_app_outlined,
),
),
@ -81,7 +81,7 @@ class UserBottomSheetView extends StatelessWidget {
PopupMenuItem(
value: 'ban',
child: _TextWithIcon(
L10n.of(context).banFromChat,
L10n.of(context)!.banFromChat,
Icons.warning_sharp,
),
)
@ -90,7 +90,7 @@ class UserBottomSheetView extends StatelessWidget {
PopupMenuItem(
value: 'unban',
child: _TextWithIcon(
L10n.of(context).unbanFromChat,
L10n.of(context)!.unbanFromChat,
Icons.warning_outlined,
),
),
@ -98,7 +98,7 @@ class UserBottomSheetView extends StatelessWidget {
PopupMenuItem(
value: 'ignore',
child: _TextWithIcon(
L10n.of(context).ignore,
L10n.of(context)!.ignore,
Icons.block,
),
),
@ -111,13 +111,13 @@ class UserBottomSheetView extends StatelessWidget {
children: [
Expanded(
child: ContentBanner(
user.avatarUrl,
mxContent: user.avatarUrl,
defaultIcon: Icons.person_outline,
client: client,
),
),
ListTile(
title: Text(L10n.of(context).username),
title: Text(L10n.of(context)!.username),
subtitle: Text(user.id),
trailing: Icon(Icons.adaptive.share_outlined),
onTap: () => FluffyShare.share(
@ -150,7 +150,7 @@ class _TextWithIcon extends StatelessWidget {
const _TextWithIcon(
this.text,
this.iconData, {
Key key,
Key? key,
}) : super(key: key);
@override