mirror of
https://gitlab.com/veilid/veilidchat.git
synced 2024-10-01 06:55:46 -04:00
Merge branch 'kyanha-dartfix' into 'main'
Changes from `dart fix --apply` See merge request veilid/veilidchat!3
This commit is contained in:
commit
52af4a79ff
@ -28,6 +28,51 @@ class ChatComponent extends ConsumerStatefulWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
ChatComponentState createState() => ChatComponentState();
|
ChatComponentState createState() => ChatComponentState();
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<ActiveAccountInfo>('activeAccountInfo', activeAccountInfo));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<TypedKey>('activeChat', activeChat));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<proto.Contact>('activeChatContact', activeChatContact));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<TypedKey>('activeChat', activeChat));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<proto.Contact>('activeChatContact', activeChatContact));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<TypedKey>('activeChat', activeChat));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<proto.Contact>('activeChatContact', activeChatContact));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<TypedKey>('activeChat', activeChat));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<proto.Contact>('activeChatContact', activeChatContact));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class ChatComponentState extends ConsumerState<ChatComponent> {
|
class ChatComponentState extends ConsumerState<ChatComponent> {
|
||||||
|
@ -79,4 +79,29 @@ class ChatSingleContactListWidget extends ConsumerWidget {
|
|||||||
).paddingAll(8))))
|
).paddingAll(8))))
|
||||||
.paddingLTRB(8, 8, 8, 65);
|
.paddingLTRB(8, 8, 8, 65);
|
||||||
}
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<IMap<proto.TypedKey, proto.Contact>>('contactMap', contactMap));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(IterableProperty<proto.Chat>('chatList', chatList));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(IterableProperty<proto.Chat>('chatList', chatList));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(IterableProperty<proto.Chat>('chatList', chatList));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(IterableProperty<proto.Chat>('chatList', chatList));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -18,6 +18,11 @@ class ContactInvitationListWidget extends ConsumerStatefulWidget {
|
|||||||
@override
|
@override
|
||||||
ContactInvitationListWidgetState createState() =>
|
ContactInvitationListWidgetState createState() =>
|
||||||
ContactInvitationListWidgetState();
|
ContactInvitationListWidgetState();
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(IterableProperty<proto.ContactInvitationRecord>('contactInvitationRecordList', contactInvitationRecordList));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class ContactInvitationListWidgetState
|
class ContactInvitationListWidgetState
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
import 'dart:typed_data';
|
|
||||||
|
|
||||||
import 'package:awesome_extensions/awesome_extensions.dart';
|
import 'package:awesome_extensions/awesome_extensions.dart';
|
||||||
import 'package:flutter/foundation.dart';
|
import 'package:flutter/foundation.dart';
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
import 'dart:math';
|
|
||||||
import 'dart:typed_data';
|
import 'dart:typed_data';
|
||||||
|
|
||||||
import 'package:awesome_extensions/awesome_extensions.dart';
|
import 'package:awesome_extensions/awesome_extensions.dart';
|
||||||
@ -8,10 +7,10 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:flutter/scheduler.dart';
|
import 'package:flutter/scheduler.dart';
|
||||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||||
import 'package:flutter_translate/flutter_translate.dart';
|
import 'package:flutter_translate/flutter_translate.dart';
|
||||||
|
import 'package:image/image.dart' as img;
|
||||||
|
import 'package:mobile_scanner/mobile_scanner.dart';
|
||||||
import 'package:pasteboard/pasteboard.dart';
|
import 'package:pasteboard/pasteboard.dart';
|
||||||
import 'package:zxing2/qrcode.dart';
|
import 'package:zxing2/qrcode.dart';
|
||||||
import 'package:mobile_scanner/mobile_scanner.dart';
|
|
||||||
import 'package:image/image.dart' as img;
|
|
||||||
|
|
||||||
import '../tools/tools.dart';
|
import '../tools/tools.dart';
|
||||||
import 'invite_dialog.dart';
|
import 'invite_dialog.dart';
|
||||||
@ -390,4 +389,9 @@ class ScanInviteDialogState extends ConsumerState<ScanInviteDialog> {
|
|||||||
inviteControlIsValid: inviteControlIsValid,
|
inviteControlIsValid: inviteControlIsValid,
|
||||||
buildInviteControl: buildInviteControl);
|
buildInviteControl: buildInviteControl);
|
||||||
}
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<bool>('scanned', scanned));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -84,9 +84,9 @@ class HomePageState extends ConsumerState<HomePage>
|
|||||||
// ignore: prefer_expression_function_bodies
|
// ignore: prefer_expression_function_bodies
|
||||||
Widget buildAccountList() {
|
Widget buildAccountList() {
|
||||||
return const Column(children: [
|
return const Column(children: [
|
||||||
Center(child: Text("Small Profile")),
|
Center(child: Text('Small Profile')),
|
||||||
Center(child: Text("Contact invitations")),
|
Center(child: Text('Contact invitations')),
|
||||||
Center(child: Text("Contacts"))
|
Center(child: Text('Contacts'))
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -95,7 +95,7 @@ class HomePageState extends ConsumerState<HomePage>
|
|||||||
IList<LocalAccount> localAccounts,
|
IList<LocalAccount> localAccounts,
|
||||||
// ignore: prefer_expression_function_bodies
|
// ignore: prefer_expression_function_bodies
|
||||||
) {
|
) {
|
||||||
return const Center(child: Text("unlock account"));
|
return const Center(child: Text('unlock account'));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// We have an active, unlocked, user login
|
/// We have an active, unlocked, user login
|
||||||
|
@ -30,6 +30,51 @@ class AccountPage extends ConsumerStatefulWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
AccountPageState createState() => AccountPageState();
|
AccountPageState createState() => AccountPageState();
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(IterableProperty<LocalAccount>('localAccounts', localAccounts));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<TypedKey>('activeUserLogin', activeUserLogin));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<proto.Account>('account', account));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<TypedKey>('activeUserLogin', activeUserLogin));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<proto.Account>('account', account));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<TypedKey>('activeUserLogin', activeUserLogin));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<proto.Account>('account', account));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<TypedKey>('activeUserLogin', activeUserLogin));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<proto.Account>('account', account));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class AccountPageState extends ConsumerState<AccountPage> {
|
class AccountPageState extends ConsumerState<AccountPage> {
|
||||||
|
@ -39,6 +39,51 @@ class MainPager extends ConsumerStatefulWidget {
|
|||||||
|
|
||||||
static MainPagerState? of(BuildContext context) =>
|
static MainPagerState? of(BuildContext context) =>
|
||||||
context.findAncestorStateOfType<MainPagerState>();
|
context.findAncestorStateOfType<MainPagerState>();
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(IterableProperty<LocalAccount>('localAccounts', localAccounts));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<TypedKey>('activeUserLogin', activeUserLogin));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<proto.Account>('account', account));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<TypedKey>('activeUserLogin', activeUserLogin));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<proto.Account>('account', account));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<TypedKey>('activeUserLogin', activeUserLogin));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<proto.Account>('account', account));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<TypedKey>('activeUserLogin', activeUserLogin));
|
||||||
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<proto.Account>('account', account));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class MainPagerState extends ConsumerState<MainPager>
|
class MainPagerState extends ConsumerState<MainPager>
|
||||||
@ -199,7 +244,7 @@ class MainPagerState extends ConsumerState<MainPager>
|
|||||||
height: 200,
|
height: 200,
|
||||||
child: Center(
|
child: Center(
|
||||||
child: Text(
|
child: Text(
|
||||||
"Group and custom chat functionality is not available yet")));
|
'Group and custom chat functionality is not available yet')));
|
||||||
}
|
}
|
||||||
|
|
||||||
Widget _bottomSheetBuilder(BuildContext context) {
|
Widget _bottomSheetBuilder(BuildContext context) {
|
||||||
@ -289,4 +334,9 @@ class MainPagerState extends ConsumerState<MainPager>
|
|||||||
floatingActionButtonLocation: FloatingActionButtonLocation.endDocked,
|
floatingActionButtonLocation: FloatingActionButtonLocation.endDocked,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<PreloadPageController>('pageController', pageController));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -23,6 +23,11 @@ class BackgroundTicker extends ConsumerStatefulWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
BackgroundTickerState createState() => BackgroundTickerState();
|
BackgroundTickerState createState() => BackgroundTickerState();
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(ObjectFlagProperty<Widget Function(BuildContext p1)>.has('builder', builder));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class BackgroundTickerState extends ConsumerState<BackgroundTicker> {
|
class BackgroundTickerState extends ConsumerState<BackgroundTicker> {
|
||||||
|
@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:mobile_scanner/mobile_scanner.dart';
|
import 'package:mobile_scanner/mobile_scanner.dart';
|
||||||
|
|
||||||
class ScannerErrorWidget extends StatelessWidget {
|
class ScannerErrorWidget extends StatelessWidget {
|
||||||
const ScannerErrorWidget({Key? key, required this.error}) : super(key: key);
|
const ScannerErrorWidget({required this.error, super.key});
|
||||||
|
|
||||||
final MobileScannerException error;
|
final MobileScannerException error;
|
||||||
|
|
||||||
@ -48,4 +48,9 @@ class ScannerErrorWidget extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@override
|
||||||
|
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
|
||||||
|
super.debugFillProperties(properties);
|
||||||
|
properties.add(DiagnosticsProperty<MobileScannerException>('error', error));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user