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

refactor: Null safe dependencies

Browse source
This commit is contained in:
Christian Pauly 2021-04-21 14:19:54 +02:00
commit 1a477adcb1
34 changed files with 320 additions and 381 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/views/ui/chat_details_ui.dart
View file

@ -241,8 +241,8 @@ class ChatDetailsUI extends StatelessWidget {
),
if (room.canChangeHistoryVisibility)
PopupMenuItem<HistoryVisibility>(
value: HistoryVisibility.world_readable,
child: Text(HistoryVisibility.world_readable
value: HistoryVisibility.worldReadable,
child: Text(HistoryVisibility.worldReadable
.getLocalizedString(
MatrixLocals(L10n.of(context)))),
),
@ -269,9 +269,9 @@ class ChatDetailsUI extends StatelessWidget {
<PopupMenuEntry<GuestAccess>>[
if (room.canChangeGuestAccess)
PopupMenuItem<GuestAccess>(
value: GuestAccess.can_join,
value: GuestAccess.canJoin,
child: Text(
GuestAccess.can_join.getLocalizedString(
GuestAccess.canJoin.getLocalizedString(
MatrixLocals(L10n.of(context))),
),
),

2
lib/views/ui/chat_ui.dart
View file

@ -431,7 +431,7 @@ class ChatUI extends StatelessWidget {
final emojis = List<String>.from(AppEmojis.emojis);
final allReactionEvents = controller.selectedEvents.first
.aggregatedEvents(
controller.timeline, RelationshipTypes.Reaction)
controller.timeline, RelationshipTypes.reaction)
?.where((event) =>
event.senderId == event.room.client.userID &&
event.type == 'm.reaction');

2
lib/views/ui/settings_emotes_ui.dart
View file

@ -425,7 +425,7 @@ class _EmoteImage extends StatelessWidget {
method: ThumbnailMethod.scale,
);
return CachedNetworkImage(
imageUrl: url,
imageUrl: url.toString(),
fit: BoxFit.contain,
width: size,
height: size,

7
lib/views/ui/settings_ui.dart
View file

@ -16,7 +16,7 @@ import 'package:fluffychat/utils/sentry_controller.dart';
import 'package:flutter/material.dart';
import 'package:flutter_app_lock/flutter_app_lock.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:flutter_screen_lock/lock_screen.dart';
import 'package:flutter_screen_lock/functions.dart';
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:image_picker/image_picker.dart';
import 'package:url_launcher/url_launcher.dart';
@ -296,11 +296,10 @@ class _SettingsState extends State<Settings> {
await FlutterSecureStorage().read(key: SettingKeys.appLockKey);
if (currentLock?.isNotEmpty ?? false) {
var unlocked = false;
await showLockScreen(
await screenLock(
context: context,
correctString: currentLock,
onUnlocked: () => unlocked = true,
canBiometric: true,
didConfirmed: (_) => unlocked = true,
);
if (unlocked != true) return;
}