Hydrogen/Solian
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

✨ Better channel list

Browse Source
This commit is contained in:
LittleSheep
2024-05-30 22:02:54 +08:00
parent 30b05e440c
commit 2716690c41
5 changed files with 162 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

180
lib/widgets/channel/channel_list.dart
View File

@ -5,72 +5,146 @@ import 'package:solian/models/channel.dart';
import 'package:solian/router.dart';
import 'package:solian/widgets/account/account_avatar.dart';
class ChannelListWidget extends StatelessWidget {
class ChannelListWidget extends StatefulWidget {
final List<Channel> channels;
final int selfId;
final bool noCategory;
const ChannelListWidget(
{super.key, required this.channels, required this.selfId});
const ChannelListWidget({
super.key,
required this.channels,
required this.selfId,
this.noCategory = false,
});
@override
Widget build(BuildContext context) {
return SliverList.builder(
itemCount: channels.length,
itemBuilder: (context, index) {
final element = channels[index];
State<ChannelListWidget> createState() => _ChannelListWidgetState();
}
if (element.type == 1) {
final otherside = element.members!
.where((e) => e.account.externalId != selfId)
.first;
class _ChannelListWidgetState extends State<ChannelListWidget> {
final List<Channel> _globalChannels = List.empty(growable: true);
final List<Channel> _directMessages = List.empty(growable: true);
final Map<String, List<Channel>> _inRealms = {};
return ListTile(
leading: AccountAvatar(
content: otherside.account.avatar,
bgColor: Colors.indigo,
feColor: Colors.white,
),
contentPadding: const EdgeInsets.symmetric(horizontal: 24),
title: Text(otherside.account.nick),
subtitle: Text(
'channelDirectDescription'
.trParams({'username': '@${otherside.account.name}'}),
),
onTap: () {
AppRouter.instance.pushNamed(
'channelChat',
pathParameters: {'alias': element.alias},
queryParameters: {
if (element.realmId != null) 'realm': element.realm!.alias,
},
);
void mapChannels() {
_inRealms.clear();
_globalChannels.clear();
_directMessages.clear();
if (widget.noCategory) {
_globalChannels.addAll(widget.channels);
return;
}
for (final channel in widget.channels) {
if (channel.realmId != null) {
if (_inRealms[channel.alias] == null) {
_inRealms[channel.alias] = List.empty(growable: true);
}
_inRealms[channel.alias]!.add(channel);
} else if (channel.type == 1) {
_directMessages.add(channel);
} else {
_globalChannels.add(channel);
}
}
}
@override
void didUpdateWidget(covariant ChannelListWidget oldWidget) {
setState(() => mapChannels());
super.didUpdateWidget(oldWidget);
}
Widget buildItem(Channel element) {
if (element.type == 1) {
final otherside = element.members!
.where((e) => e.account.externalId != widget.selfId)
.first;
return ListTile(
leading: AccountAvatar(
content: otherside.account.avatar,
bgColor: Colors.indigo,
feColor: Colors.white,
),
contentPadding: const EdgeInsets.symmetric(horizontal: 24),
title: Text(otherside.account.nick),
subtitle: Text(
'channelDirectDescription'
.trParams({'username': '@${otherside.account.name}'}),
),
onTap: () {
AppRouter.instance.pushNamed(
'channelChat',
pathParameters: {'alias': element.alias},
queryParameters: {
if (element.realmId != null) 'realm': element.realm!.alias,
},
);
}
},
);
}
return ListTile(
leading: const CircleAvatar(
backgroundColor: Colors.indigo,
child: FaIcon(
FontAwesomeIcons.hashtag,
color: Colors.white,
size: 16,
),
),
contentPadding: const EdgeInsets.symmetric(horizontal: 24),
title: Text(element.name),
subtitle: Text(element.description),
onTap: () {
AppRouter.instance.pushNamed(
'channelChat',
pathParameters: {'alias': element.alias},
queryParameters: {
if (element.realmId != null) 'realm': element.realm!.alias,
},
);
return ListTile(
leading: const CircleAvatar(
backgroundColor: Colors.indigo,
child: FaIcon(
FontAwesomeIcons.hashtag,
color: Colors.white,
size: 16,
),
),
contentPadding: const EdgeInsets.symmetric(horizontal: 24),
title: Text(element.name),
subtitle: Text(element.description),
onTap: () {
AppRouter.instance.pushNamed(
'channelChat',
pathParameters: {'alias': element.alias},
queryParameters: {
if (element.realmId != null) 'realm': element.realm!.alias,
},
);
},
);
}
@override
Widget build(BuildContext context) {
if (widget.noCategory) {
return SliverList.builder(
itemCount: _globalChannels.length,
itemBuilder: (context, index) {
final element = _globalChannels[index];
return buildItem(element);
},
);
}
return SliverList.list(
children: [
..._globalChannels.map((e) => buildItem(e)),
if (_directMessages.isNotEmpty)
ExpansionTile(
tilePadding: const EdgeInsets.symmetric(horizontal: 24),
title: Text('channelCategoryDirect'.tr),
subtitle: Text('channelCategoryDirectHint'.tr),
children: _directMessages.map((e) => buildItem(e)).toList(),
),
..._inRealms.entries.map((element) {
return ExpansionTile(
tilePadding: const EdgeInsets.symmetric(horizontal: 24),
title: Text(element.value.first.realm!.name),
subtitle: Text(
element.value.first.realm!.description,
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
children: element.value.map((e) => buildItem(e)).toList(),
);
}),
],
);
}
}

9
lib/widgets/chat/chat_message_input.dart
View File

@ -12,6 +12,7 @@ import 'package:uuid/uuid.dart';
class ChatMessageInput extends StatefulWidget {
final Message? edit;
final Message? reply;
final String? placeholder;
final Channel channel;
final String realm;
final Function(Message) onSent;
@ -20,6 +21,7 @@ class ChatMessageInput extends StatefulWidget {
super.key,
this.edit,
this.reply,
this.placeholder,
required this.channel,
required this.realm,
required this.onSent,
@ -145,9 +147,10 @@ class _ChatMessageInputState extends State<ChatMessageInput> {
autocorrect: true,
keyboardType: TextInputType.text,
decoration: InputDecoration.collapsed(
hintText: 'messageInputPlaceholder'.trParams(
{'channel': '#${widget.channel.alias}'},
),
hintText: widget.placeholder ??
'messageInputPlaceholder'.trParams(
{'channel': '#${widget.channel.alias}'},
),
),
onSubmitted: (_) => sendMessage(),
onTapOutside: (_) =>