multi mention

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
This commit is contained in:
bggRGjQaUbCoE
2025-07-09 18:29:03 +08:00
parent b32922af8f
commit dfb823c30c
10 changed files with 170 additions and 80 deletions

View File

@@ -1,4 +1,7 @@
class MentionItem { import 'package:PiliPlus/pages/common/multi_select_controller.dart'
show MultiSelectData;
class MentionItem with MultiSelectData {
String? face; String? face;
int? fans; int? fans;
String? name; String? name;

View File

@@ -2,7 +2,8 @@ import 'package:PiliPlus/models/model_owner.dart';
import 'package:PiliPlus/models_new/fav/fav_detail/cnt_info.dart'; import 'package:PiliPlus/models_new/fav/fav_detail/cnt_info.dart';
import 'package:PiliPlus/models_new/fav/fav_detail/ogv.dart'; import 'package:PiliPlus/models_new/fav/fav_detail/ogv.dart';
import 'package:PiliPlus/models_new/fav/fav_detail/ugc.dart'; import 'package:PiliPlus/models_new/fav/fav_detail/ugc.dart';
import 'package:PiliPlus/pages/common/multi_select_controller.dart'; import 'package:PiliPlus/pages/common/multi_select_controller.dart'
show MultiSelectData;
class FavDetailItemModel with MultiSelectData { class FavDetailItemModel with MultiSelectData {
int? id; int? id;

View File

@@ -1,4 +1,5 @@
import 'package:PiliPlus/pages/common/multi_select_controller.dart'; import 'package:PiliPlus/pages/common/multi_select_controller.dart'
show MultiSelectData;
class FavNoteItemModel with MultiSelectData { class FavNoteItemModel with MultiSelectData {
FavNoteItemModel({ FavNoteItemModel({

View File

@@ -11,7 +11,8 @@ import 'package:PiliPlus/models_new/fav/fav_pgc/rights.dart';
import 'package:PiliPlus/models_new/fav/fav_pgc/section.dart'; import 'package:PiliPlus/models_new/fav/fav_pgc/section.dart';
import 'package:PiliPlus/models_new/fav/fav_pgc/series.dart'; import 'package:PiliPlus/models_new/fav/fav_pgc/series.dart';
import 'package:PiliPlus/models_new/fav/fav_pgc/stat.dart'; import 'package:PiliPlus/models_new/fav/fav_pgc/stat.dart';
import 'package:PiliPlus/pages/common/multi_select_controller.dart'; import 'package:PiliPlus/pages/common/multi_select_controller.dart'
show MultiSelectData;
class FavPgcItemModel with MultiSelectData { class FavPgcItemModel with MultiSelectData {
int? seasonId; int? seasonId;

View File

@@ -1,5 +1,6 @@
import 'package:PiliPlus/models_new/history/history.dart'; import 'package:PiliPlus/models_new/history/history.dart';
import 'package:PiliPlus/pages/common/multi_select_controller.dart'; import 'package:PiliPlus/pages/common/multi_select_controller.dart'
show MultiSelectData;
class HistoryItemModel with MultiSelectData { class HistoryItemModel with MultiSelectData {
String? title; String? title;

View File

@@ -1,11 +1,11 @@
import 'package:PiliPlus/pages/common/multi_select_controller.dart';
import 'package:PiliPlus/models_new/later/bangumi.dart'; import 'package:PiliPlus/models_new/later/bangumi.dart';
import 'package:PiliPlus/models_new/later/dimension.dart'; import 'package:PiliPlus/models_new/later/dimension.dart';
import 'package:PiliPlus/models_new/later/owner.dart'; import 'package:PiliPlus/models_new/later/owner.dart';
import 'package:PiliPlus/models_new/later/page.dart'; import 'package:PiliPlus/models_new/later/page.dart';
import 'package:PiliPlus/models_new/later/rights.dart'; import 'package:PiliPlus/models_new/later/rights.dart';
import 'package:PiliPlus/models_new/later/stat.dart'; import 'package:PiliPlus/models_new/later/stat.dart';
import 'package:PiliPlus/pages/common/multi_select_controller.dart'
show MultiSelectData;
class LaterItemModel with MultiSelectData { class LaterItemModel with MultiSelectData {
int? aid; int? aid;

View File

@@ -240,24 +240,33 @@ abstract class CommonRichTextPubPageState<T extends CommonRichTextPubPage>
double _mentionOffset = 0; double _mentionOffset = 0;
Future<void> onMention([bool fromClick = false]) async { Future<void> onMention([bool fromClick = false]) async {
controller.keepChatPanel(); controller.keepChatPanel();
await DynMentionPanel.onDynMention( final res = await DynMentionPanel.onDynMention(
context, context,
offset: _mentionOffset, offset: _mentionOffset,
callback: (offset) => _mentionOffset = offset, callback: (offset) => _mentionOffset = offset,
).then((MentionItem? res) { );
if (res != null) { if (res != null) {
onInsertText( if (res is MentionItem) {
'@${res.name} ', _onInsertUser(res, fromClick);
RichTextType.at, } else if (res is Iterable<MentionItem>) {
rawText: res.name, for (var e in res) {
id: res.uid, _onInsertUser(e, fromClick);
fromClick: fromClick, }
);
} }
}); }
controller.restoreChatPanel(); controller.restoreChatPanel();
} }
void _onInsertUser(MentionItem e, bool fromClick) {
onInsertText(
'@${e.name} ',
RichTextType.at,
rawText: e.name,
id: e.uid,
fromClick: fromClick,
);
}
void onInsertText( void onInsertText(
String text, String text,
RichTextType type, { RichTextType type, {

View File

@@ -1,6 +1,7 @@
import 'package:PiliPlus/http/dynamics.dart'; import 'package:PiliPlus/http/dynamics.dart';
import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/models_new/dynamic/dyn_mention/group.dart'; import 'package:PiliPlus/models_new/dynamic/dyn_mention/group.dart';
import 'package:PiliPlus/models_new/dynamic/dyn_mention/item.dart';
import 'package:PiliPlus/pages/common/common_list_controller.dart'; import 'package:PiliPlus/pages/common/common_list_controller.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
@@ -12,12 +13,26 @@ class DynMentionController
final RxBool enableClear = false.obs; final RxBool enableClear = false.obs;
final RxBool showBtn = false.obs;
Set<MentionItem>? mentionList;
void updateBtn() {
showBtn.value = mentionList?.isNotEmpty == true;
}
@override @override
void onInit() { void onInit() {
super.onInit(); super.onInit();
queryData(); queryData();
} }
@override
Future<void> onRefresh() {
mentionList?.clear();
showBtn.value = false;
return super.onRefresh();
}
@override @override
Future<LoadingState<List<MentionGroup>?>> customGetData() => Future<LoadingState<List<MentionGroup>?>> customGetData() =>
DynamicsHttp.dynMention(keyword: controller.text); DynamicsHttp.dynMention(keyword: controller.text);
@@ -26,6 +41,17 @@ class DynMentionController
void onClose() { void onClose() {
focusNode.dispose(); focusNode.dispose();
controller.dispose(); controller.dispose();
mentionList?.clear();
mentionList = null;
super.onClose(); super.onClose();
} }
void onCheck(bool? value, MentionItem item) {
if (value == true) {
(mentionList ??= <MentionItem>{}).add(item);
} else {
mentionList!.remove(item);
}
updateBtn();
}
} }

View File

@@ -8,7 +8,6 @@ import 'package:PiliPlus/common/widgets/loading_widget/http_error.dart';
import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart'; import 'package:PiliPlus/common/widgets/loading_widget/loading_widget.dart';
import 'package:PiliPlus/http/loading_state.dart'; import 'package:PiliPlus/http/loading_state.dart';
import 'package:PiliPlus/models_new/dynamic/dyn_mention/group.dart'; import 'package:PiliPlus/models_new/dynamic/dyn_mention/group.dart';
import 'package:PiliPlus/models_new/dynamic/dyn_mention/item.dart';
import 'package:PiliPlus/pages/dynamics_mention/controller.dart'; import 'package:PiliPlus/pages/dynamics_mention/controller.dart';
import 'package:PiliPlus/pages/dynamics_mention/widgets/item.dart'; import 'package:PiliPlus/pages/dynamics_mention/widgets/item.dart';
import 'package:PiliPlus/utils/extension.dart'; import 'package:PiliPlus/utils/extension.dart';
@@ -26,12 +25,12 @@ class DynMentionPanel extends StatefulWidget {
final ScrollController? scrollController; final ScrollController? scrollController;
final ValueChanged<double>? callback; final ValueChanged<double>? callback;
static Future<MentionItem?> onDynMention( static Future onDynMention(
BuildContext context, { BuildContext context, {
double offset = 0, double offset = 0,
ValueChanged<double>? callback, ValueChanged<double>? callback,
}) { }) {
return showModalBottomSheet<MentionItem?>( return showModalBottomSheet(
context: Get.context!, context: Get.context!,
useSafeArea: true, useSafeArea: true,
isScrollControlled: true, isScrollControlled: true,
@@ -89,6 +88,8 @@ class _DynMentionPanelState extends State<DynMentionPanel> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final theme = Theme.of(context); final theme = Theme.of(context);
final padding = MediaQuery.paddingOf(context).bottom;
final viewInset = MediaQuery.viewInsetsOf(context).bottom;
return Column( return Column(
children: [ children: [
SizedBox( SizedBox(
@@ -163,30 +164,64 @@ class _DynMentionPanelState extends State<DynMentionPanel> {
), ),
), ),
Expanded( Expanded(
child: NotificationListener<ScrollNotification>( child: Stack(
onNotification: (notification) { clipBehavior: Clip.none,
if (notification is UserScrollNotification) { children: [
if (_controller.focusNode.hasFocus) { NotificationListener<ScrollNotification>(
_controller.focusNode.unfocus(); onNotification: (notification) {
} if (notification is UserScrollNotification) {
} else if (notification is ScrollEndNotification) { if (_controller.focusNode.hasFocus) {
widget.callback?.call(notification.metrics.pixels); _controller.focusNode.unfocus();
} }
return false; } else if (notification is ScrollEndNotification) {
}, widget.callback?.call(notification.metrics.pixels);
child: CustomScrollView( }
controller: widget.scrollController, return false;
slivers: [ },
Obx(() => _buildBody(theme, _controller.loadingState.value)), child: CustomScrollView(
SliverToBoxAdapter( controller: widget.scrollController,
child: SizedBox( slivers: [
height: MediaQuery.paddingOf(context).bottom + Obx(() =>
MediaQuery.viewInsetsOf(context).bottom + _buildBody(theme, _controller.loadingState.value)),
80, SliverToBoxAdapter(
), child: SizedBox(
height: padding + viewInset + 80,
),
),
],
), ),
], ),
), Obx(() {
return Positioned(
right: 16,
bottom: padding +
16 +
(_controller.showBtn.value ? viewInset : 0),
child: AnimatedSlide(
offset: _controller.showBtn.value
? Offset.zero
: const Offset(0, 3),
duration: const Duration(milliseconds: 120),
child: FloatingActionButton(
onPressed: () {
if (_controller.mentionList.isNullOrEmpty) {
_controller.showBtn.value = false;
return;
}
Get.back(result: _controller.mentionList!.toSet());
for (var e in _controller.mentionList!) {
e.checked = null;
}
_controller
..mentionList!.clear()
..showBtn.value = false;
},
child: const Icon(Icons.check),
),
),
);
}),
],
), ),
), ),
], ],
@@ -200,42 +235,44 @@ class _DynMentionPanelState extends State<DynMentionPanel> {
padding: const EdgeInsets.only(top: 8), padding: const EdgeInsets.only(top: 8),
sliver: linearLoading, sliver: linearLoading,
), ),
Success<List<MentionGroup>?>(:var response) => Success<List<MentionGroup>?>(:var response) => response?.isNotEmpty ==
response?.isNotEmpty == true true
? SliverMainAxisGroup( ? SliverMainAxisGroup(
slivers: response!.map((group) { slivers: response!.map((group) {
if (group.items.isNullOrEmpty) { if (group.items.isNullOrEmpty) {
return const SliverToBoxAdapter(); return const SliverToBoxAdapter();
} }
return SliverMainAxisGroup( return SliverMainAxisGroup(
slivers: [ slivers: [
SliverPersistentHeader( SliverPersistentHeader(
pinned: true, pinned: true,
delegate: CustomSliverPersistentHeaderDelegate( delegate: CustomSliverPersistentHeaderDelegate(
extent: 40, extent: 40,
bgColor: theme.colorScheme.surface, bgColor: theme.colorScheme.surface,
child: Container( child: Container(
height: 40, height: 40,
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
padding: const EdgeInsets.symmetric(horizontal: 16), padding: const EdgeInsets.symmetric(horizontal: 16),
child: Text(group.groupName!), child: Text(group.groupName!),
),
), ),
), ),
SliverList.builder( ),
itemCount: group.items!.length, SliverList.builder(
itemBuilder: (context, index) { itemCount: group.items!.length,
return DynMentionItem( itemBuilder: (context, index) {
item: group.items![index], final item = group.items![index];
onTap: (e) => Get.back(result: e), return DynMentionItem(
); item: item,
}, onTap: () => Get.back(result: item),
), onCheck: (value) => _controller.onCheck(value, item),
], );
); },
}).toList(), ),
) ],
: HttpError(onReload: _controller.onReload), );
}).toList(),
)
: HttpError(onReload: _controller.onReload),
Error(:var errMsg) => HttpError( Error(:var errMsg) => HttpError(
errMsg: errMsg, errMsg: errMsg,
onReload: _controller.onReload, onReload: _controller.onReload,

View File

@@ -9,10 +9,12 @@ class DynMentionItem extends StatelessWidget {
super.key, super.key,
required this.item, required this.item,
required this.onTap, required this.onTap,
required this.onCheck,
}); });
final MentionItem item; final MentionItem item;
final ValueChanged<MentionItem> onTap; final VoidCallback onTap;
final ValueChanged<bool?> onCheck;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@@ -20,7 +22,7 @@ class DynMentionItem extends StatelessWidget {
type: MaterialType.transparency, type: MaterialType.transparency,
child: ListTile( child: ListTile(
dense: true, dense: true,
onTap: () => onTap(item), onTap: onTap,
leading: NetworkImgLayer( leading: NetworkImgLayer(
src: item.face, src: item.face,
width: 42, width: 42,
@@ -35,6 +37,15 @@ class DynMentionItem extends StatelessWidget {
'${NumUtil.numFormat(item.fans)}粉丝', '${NumUtil.numFormat(item.fans)}粉丝',
style: TextStyle(color: Theme.of(context).colorScheme.outline), style: TextStyle(color: Theme.of(context).colorScheme.outline),
), ),
trailing: Checkbox(
tristate: false,
value: item.checked ?? false,
onChanged: (value) {
item.checked = value;
(context as Element).markNeedsBuild();
onCheck(value);
},
),
), ),
); );
} }