Git-Mirrors/veilidchat
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilidchat.git synced 2025-07-23 06:31:13 -04:00
Code Issues Projects Releases Packages Wiki Activity

cleanup

Browse source
This commit is contained in:
Christien Rioux 2023-09-21 21:00:58 -04:00
parent e369d6091a
commit 4ddfbe7746
20 changed files with 150 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/components/chat_component.dart
View file

@ -1,7 +1,6 @@
import 'dart:async';
import 'package:awesome_extensions/awesome_extensions.dart';
import 'package:fixnum/fixnum.dart';
import 'package:flutter/material.dart';
import 'package:flutter_chat_types/flutter_chat_types.dart' as types;
import 'package:flutter_chat_ui/flutter_chat_ui.dart';
@ -162,7 +161,7 @@ class ChatComponentState extends ConsumerState<ChatComponent> {
)),
Spacer(),
IconButton(
icon: Icon(Icons.close),
icon: const Icon(Icons.close),
onPressed: () async {
activeChatState.add(null);
}).paddingLTRB(16, 0, 16, 0)

2
lib/components/chat_single_contact_list_widget.dart
View file

@ -44,7 +44,7 @@ class ChatSingleContactListWidget extends ConsumerWidget {
: SearchableList<proto.Chat>(
autoFocusOnSearch: false,
initialList: chatList.toList(),
builder: (c) {
builder: (l, i, c) {
final contact = contactMap[c.remoteConversationKey];
if (contact == null) {
return const Text('...');

2
lib/components/contact_list_widget.dart
View file

@ -50,7 +50,7 @@ class ContactListWidget extends ConsumerWidget {
: SearchableList<proto.Contact>(
autoFocusOnSearch: false,
initialList: contactList.toList(),
builder: (contact) => ContactItemWidget(contact: contact),
builder: (l, i, c) => ContactItemWidget(contact: c),
filter: (value) {
final lowerValue = value.toLowerCase();
return contactList

2
lib/components/default_app_bar.dart
View file

@ -1,8 +1,6 @@
import 'package:awesome_extensions/awesome_extensions.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:flutter_translate/flutter_translate.dart';
import 'package:go_router/go_router.dart';
class DefaultAppBar extends AppBar {
DefaultAppBar(

1
lib/components/empty_chat_list_widget.dart
View file

@ -1,4 +1,3 @@
import 'package:awesome_extensions/awesome_extensions.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_translate/flutter_translate.dart';

1
lib/components/signal_strength_meter.dart
View file

@ -1,6 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_translate/flutter_translate.dart';
import 'package:signal_strength_indicator/signal_strength_indicator.dart';
import '../providers/connection_state.dart';

1
lib/pages/chat_only_page.dart
View file

@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../providers/window_control.dart';
import '../tools/tools.dart';
import 'home.dart';
class ChatOnlyPage extends ConsumerStatefulWidget {

13
lib/pages/home.dart
View file

@ -1,10 +1,6 @@
import 'dart:async';
import 'package:fast_immutable_collections/fast_immutable_collections.dart';
import 'package:flutter/material.dart';
import 'package:flutter_animate/flutter_animate.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:split_view/split_view.dart';
import '../../entities/proto.dart' as proto;
import '../components/chat_component.dart';
@ -12,8 +8,6 @@ import '../components/empty_chat_widget.dart';
import '../providers/account.dart';
import '../providers/chat.dart';
import '../providers/contact.dart';
import '../providers/contact_invite.dart';
import '../providers/conversation.dart';
import '../providers/window_control.dart';
import '../tools/tools.dart';
import 'main_pager/main_pager.dart';
@ -80,14 +74,14 @@ class HomePageState extends ConsumerState<HomePage>
// ignore: prefer_expression_function_bodies
Widget buildPhone(BuildContext context) {
return Material(
return const Material(
color: Colors.transparent, elevation: 4, child: MainPager());
}
// ignore: prefer_expression_function_bodies
Widget buildTabletLeftPane(BuildContext context) {
//
return Material(
return const Material(
color: Colors.transparent, elevation: 4, child: MainPager());
}
@ -99,11 +93,10 @@ class HomePageState extends ConsumerState<HomePage>
// ignore: prefer_expression_function_bodies
Widget buildTablet(BuildContext context) {
final theme = Theme.of(context);
final w = MediaQuery.of(context).size.width;
final children = [
ConstrainedBox(
constraints: BoxConstraints(minWidth: 300, maxWidth: 300),
constraints: const BoxConstraints(minWidth: 300, maxWidth: 300),
child: ConstrainedBox(
constraints: BoxConstraints(maxWidth: w / 2),
child: buildTabletLeftPane(context))),

2
lib/pages/main_pager/chats_page.dart
View file

@ -2,7 +2,6 @@ import 'package:awesome_extensions/awesome_extensions.dart';
import 'package:fast_immutable_collections/fast_immutable_collections.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_translate/flutter_translate.dart';
import '../../components/chat_single_contact_list_widget.dart';
import '../../components/empty_chat_list_widget.dart';
@ -11,7 +10,6 @@ import '../../entities/proto.dart' as proto;
import '../../providers/account.dart';
import '../../providers/chat.dart';
import '../../providers/contact.dart';
import '../../providers/contact_invite.dart';
import '../../providers/local_accounts.dart';
import '../../providers/logins.dart';
import '../../tools/tools.dart';

2
lib/pages/main_pager/main_pager.dart
View file

@ -11,7 +11,6 @@ import 'package:stylish_bottom_bar/model/bar_items.dart';
import 'package:stylish_bottom_bar/stylish_bottom_bar.dart';
import '../../components/bottom_sheet_action_button.dart';
import '../../components/contact_invitation_display.dart';
import '../../components/paste_invite_dialog.dart';
import '../../components/send_invite_dialog.dart';
import '../../tools/tools.dart';
@ -225,7 +224,6 @@ class MainPagerState extends ConsumerState<MainPager>
// ignore: prefer_expression_function_bodies
Widget build(BuildContext context) {
final theme = Theme.of(context);
final textTheme = theme.textTheme;
final scale = theme.extension<ScaleScheme>()!;
return Scaffold(

14
lib/pages/settings.dart
View file

@ -2,20 +2,15 @@ import 'package:animated_theme_switcher/animated_theme_switcher.dart';
import 'package:awesome_extensions/awesome_extensions.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_chat_ui/flutter_chat_ui.dart';
import 'package:flutter_form_builder/flutter_form_builder.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_translate/flutter_translate.dart';
import 'package:form_builder_validators/form_builder_validators.dart';
import '../components/default_app_bar.dart';
import '../components/signal_strength_meter.dart';
import '../entities/preferences.dart';
import '../providers/local_accounts.dart';
import '../providers/logins.dart';
import '../providers/window_control.dart';
import '../tools/tools.dart';
import '../veilid_support/veilid_support.dart';
class SettingsPage extends ConsumerStatefulWidget {
const SettingsPage({super.key});
@ -35,15 +30,6 @@ class SettingsPageState extends ConsumerState<SettingsPage> {
@override
void initState() {
super.initState();
// WidgetsBinding.instance.addPostFrameCallback((_) async {
// await ref.read(windowControlProvider.notifier).changeWindowSetup(
// TitleBarStyle.normal, OrientationCapability.normal);
// final tsinst = await ThemeService.instance;
// setState(() {
// themePreferences = tsinst.load();
// });
// });
}
List<DropdownMenuItem<dynamic>> _getThemeDropdownItems() {

2
lib/providers/chat.dart
View file

@ -1,5 +1,3 @@
import 'dart:convert';
import 'package:fast_immutable_collections/fast_immutable_collections.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';

4
lib/providers/conversation.dart
View file

@ -1,16 +1,12 @@
import 'dart:convert';
import 'package:fast_immutable_collections/fast_immutable_collections.dart';
import 'package:flutter/material.dart';
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import '../entities/identity.dart';
import '../entities/proto.dart' as proto;
import '../entities/proto.dart' show Conversation, Message;
import '../log/loggy.dart';
import '../tools/external_stream_state.dart';
import '../veilid_support/veilid_support.dart';
import 'account.dart';
import 'chat.dart';

1
lib/router/router.dart
View file

@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import '../pages/index.dart';
import 'router_notifier.dart';
part 'router.g.dart';

2
lib/router/router_notifier.dart
View file

@ -47,7 +47,7 @@ class RouterNotifier extends _$RouterNotifier implements Listenable {
// No matter where we are, if there's not
switch (state.location) {
switch (state.matchedLocation) {
case '/':
return hasAnyAccount ? '/home' : '/new_account';
case '/new_account':

21
lib/veilid_support/config.dart
View file

@ -1,4 +1,3 @@
import 'package:charcode/charcode.dart';
import 'package:veilid/veilid.dart';
Future<VeilidConfig> getVeilidChatConfig() async {
@ -19,16 +18,16 @@ Future<VeilidConfig> getVeilidChatConfig() async {
config.copyWith(blockStore: config.blockStore.copyWith(delete: true));
}
// xxx hack
config = config.copyWith(
network: config.network.copyWith(
dht: config.network.dht.copyWith(
//getValueCount: 2,
getValueFanout: 8,
getValueTimeoutMs: 5000,
//setValueCount: 2,
setValueFanout: 10,
setValueTimeoutMs: 5000)));
// // xxx hack
// config = config.copyWith(
// network: config.network.copyWith(
// dht: config.network.dht.copyWith(
// getValueCount: 3,
// getValueFanout: 8,
// getValueTimeoutMs: 5000,
// setValueCount: 4,
// setValueFanout: 10,
// setValueTimeoutMs: 5000)));
return config;
}