Full-support of post visibility

This commit is contained in:
LittleSheep 2024-12-05 23:37:56 +08:00
parent d0a4eeb2b2
commit c603b3fcb0
5 changed files with 248 additions and 2 deletions

View File

@ -71,6 +71,13 @@
"postVisibilitySelected": "Selected User", "postVisibilitySelected": "Selected User",
"postVisibilityFiltered": "Unselected User", "postVisibilityFiltered": "Unselected User",
"postVisibilityNone": "Only Me", "postVisibilityNone": "Only Me",
"postVisibleUsers": "Visible Users",
"postInvisibleUsers": "Invisible Users",
"postSelectedUsers": {
"zero": "No user",
"one": "{} user",
"other": "{} users"
},
"fieldUsername": "Username", "fieldUsername": "Username",
"fieldNickname": "Nickname", "fieldNickname": "Nickname",
"fieldEmail": "Email address", "fieldEmail": "Email address",
@ -260,6 +267,7 @@
"other": "Marked {} notifications as read." "other": "Marked {} notifications as read."
}, },
"notificationMarkOneReadPrompt": "Marked notification {} as read.", "notificationMarkOneReadPrompt": "Marked notification {} as read.",
"search": "Search",
"postSearchResult": { "postSearchResult": {
"zero": "No results", "zero": "No results",
"one": "{} result", "one": "{} result",

View File

@ -128,6 +128,13 @@
"postVisibilitySelected": "选定的用户可见", "postVisibilitySelected": "选定的用户可见",
"postVisibilityFiltered": "选定用户不可见", "postVisibilityFiltered": "选定用户不可见",
"postVisibilityNone": "仅自己可见", "postVisibilityNone": "仅自己可见",
"postVisibleUsers": "可见的用户",
"postInvisibleUsers": "不可见的用户",
"postSelectedUsers": {
"zero": "未选择用户",
"one": "选择了 {} 个用户",
"other": "选择了 {} 个用户"
},
"postEditingNotice": "你正在修改由 {} 发布的帖子。", "postEditingNotice": "你正在修改由 {} 发布的帖子。",
"postReplyingNotice": "你正在回复由 {} 发布的帖子。", "postReplyingNotice": "你正在回复由 {} 发布的帖子。",
"postRepostingNotice": "你正在转发由 {} 发布的帖子。", "postRepostingNotice": "你正在转发由 {} 发布的帖子。",
@ -260,6 +267,7 @@
"other": "已将 {} 个通知标记为已读。" "other": "已将 {} 个通知标记为已读。"
}, },
"notificationMarkOneReadPrompt": "已将通知 {} 标记为已读。", "notificationMarkOneReadPrompt": "已将通知 {} 标记为已读。",
"search": "搜索",
"postSearchResult": { "postSearchResult": {
"zero": "没有搜索到结果", "zero": "没有搜索到结果",
"one": "搜索到 {} 个结果", "one": "搜索到 {} 个结果",

View File

@ -173,6 +173,8 @@ class PostWriteController extends ChangeNotifier {
SnPost? editingPost, repostingPost, replyingPost; SnPost? editingPost, repostingPost, replyingPost;
int visibility = 0; int visibility = 0;
List<int> visibleUsers = List.empty();
List<int> invisibleUsers = List.empty();
List<String> tags = List.empty(); List<String> tags = List.empty();
List<PostWriteMedia> attachments = List.empty(growable: true); List<PostWriteMedia> attachments = List.empty(growable: true);
DateTime? publishedAt, publishedUntil; DateTime? publishedAt, publishedUntil;
@ -197,6 +199,8 @@ class PostWriteController extends ChangeNotifier {
contentController.text = post.body['content'] ?? ''; contentController.text = post.body['content'] ?? '';
publishedAt = post.publishedAt; publishedAt = post.publishedAt;
publishedUntil = post.publishedUntil; publishedUntil = post.publishedUntil;
visibleUsers = List.from(post.visibleUsersList ?? []);
invisibleUsers = List.from(post.invisibleUsersList ?? []);
visibility = post.visibility; visibility = post.visibility;
tags = List.from(post.tags.map((ele) => ele.alias)); tags = List.from(post.tags.map((ele) => ele.alias));
attachments.addAll( attachments.addAll(
@ -296,6 +300,8 @@ class PostWriteController extends ChangeNotifier {
.toList(), .toList(),
'tags': tags.map((ele) => {'alias': ele}).toList(), 'tags': tags.map((ele) => {'alias': ele}).toList(),
'visibility': visibility, 'visibility': visibility,
'visible_users_list': visibleUsers,
'invisible_users_list': invisibleUsers,
if (publishedAt != null) if (publishedAt != null)
'published_at': publishedAt!.toUtc().toIso8601String(), 'published_at': publishedAt!.toUtc().toIso8601String(),
if (publishedUntil != null) if (publishedUntil != null)
@ -367,6 +373,16 @@ class PostWriteController extends ChangeNotifier {
notifyListeners(); notifyListeners();
} }
void setVisibleUsers(List<int> value) {
visibleUsers = value;
notifyListeners();
}
void setInvisibleUsers(List<int> value) {
invisibleUsers = value;
notifyListeners();
}
void setIsBusy(bool value) { void setIsBusy(bool value) {
isBusy = value; isBusy = value;
notifyListeners(); notifyListeners();

View File

@ -0,0 +1,163 @@
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:styled_widget/styled_widget.dart';
import 'package:surface/providers/sn_network.dart';
import 'package:surface/providers/user_directory.dart';
import 'package:surface/types/account.dart';
import 'package:surface/widgets/account/account_image.dart';
class AccountSelect extends StatefulWidget {
final String title;
final Widget? Function(SnAccount item)? trailingBuilder;
final List<int>? initialSelection;
final Function(List<SnAccount>)? onMultipleSelect;
const AccountSelect({
super.key,
required this.title,
this.trailingBuilder,
this.initialSelection,
this.onMultipleSelect,
});
@override
State<AccountSelect> createState() => _AccountSelectState();
}
class _AccountSelectState extends State<AccountSelect> {
final TextEditingController _probeController = TextEditingController();
final List<SnAccount> _relativeUsers = List.empty(growable: true);
final List<SnAccount> _pendingUsers = List.empty(growable: true);
final List<SnAccount> _selectedUsers = List.empty(growable: true);
int _accountId = 0;
Future<void> _revertSelectedUsers() async {
if (widget.initialSelection?.isEmpty ?? true) return;
final ud = context.read<UserDirectoryProvider>();
final result = await ud.listAccount(widget.initialSelection!);
setState(() {
_selectedUsers.addAll(result.where((ele) => ele != null).cast());
});
}
Future<void> _getFriends() async {
final sn = context.read<SnNetworkProvider>();
final resp = await sn.client.get('/cgi/id/users/me/relations?status=1');
setState(() {
_relativeUsers.addAll(
resp.data?.map((e) => SnRelationship.fromJson(e)) ?? [],
);
});
}
Future<void> _searchAccount() async {
if (_probeController.text.isEmpty) return;
final sn = context.read<SnNetworkProvider>();
final resp = await sn.client.get(
'/cgi/id/users/search?probe=${_probeController.text}',
);
setState(() {
_pendingUsers.clear();
_pendingUsers.addAll(
resp.data.map((e) => SnAccount.fromJson(e)).toList().cast<SnAccount>(),
);
});
}
bool _checkSelected(SnAccount item) {
return _selectedUsers.any((x) => x.id == item.id);
}
@override
void initState() {
super.initState();
_getFriends();
_revertSelectedUsers();
}
@override
void dispose() {
super.dispose();
_probeController.dispose();
}
@override
Widget build(BuildContext context) {
return SizedBox(
height: MediaQuery.of(context).size.height * 0.85,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
widget.title,
style: Theme.of(context).textTheme.headlineSmall,
).padding(left: 24, right: 24, top: 16, bottom: 16),
Container(
color: Theme.of(context).colorScheme.secondaryContainer,
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 16),
child: TextField(
controller: _probeController,
decoration: InputDecoration(
isCollapsed: true,
border: InputBorder.none,
hintText: 'search'.tr(),
),
onSubmitted: (_) {
_searchAccount();
},
),
),
Expanded(
child: ListView.builder(
itemCount: _pendingUsers.isEmpty
? _relativeUsers.length
: _pendingUsers.length,
itemBuilder: (context, index) {
var user = _pendingUsers.isEmpty
? _relativeUsers[index]
: _pendingUsers[index];
return ListTile(
title: Text(user.nick),
subtitle: Text(user.name),
leading: AccountImage(content: user.avatar),
trailing: widget.trailingBuilder != null
? widget.trailingBuilder!(user)
: _checkSelected(user)
? const Icon(Icons.check)
: null,
onTap: user.id == _accountId
? null
: () {
if (widget.onMultipleSelect == null) {
Navigator.pop(context, user);
return;
}
setState(() {
final idx = _selectedUsers
.indexWhere((x) => x.id == user.id);
if (idx != -1) {
_selectedUsers.removeAt(idx);
} else {
_selectedUsers.add(user);
}
});
widget.onMultipleSelect!(_selectedUsers);
},
);
},
),
),
],
),
);
}
}

View File

@ -6,6 +6,7 @@ import 'package:gap/gap.dart';
import 'package:material_symbols_icons/symbols.dart'; import 'package:material_symbols_icons/symbols.dart';
import 'package:styled_widget/styled_widget.dart'; import 'package:styled_widget/styled_widget.dart';
import 'package:surface/controllers/post_write_controller.dart'; import 'package:surface/controllers/post_write_controller.dart';
import 'package:surface/widgets/account/account_select.dart';
import 'package:surface/widgets/post/post_tags_field.dart'; import 'package:surface/widgets/post/post_tags_field.dart';
class PostMetaEditor extends StatelessWidget { class PostMetaEditor extends StatelessWidget {
@ -15,8 +16,8 @@ class PostMetaEditor extends StatelessWidget {
static Map<int, String> kPostVisibilityLevel = { static Map<int, String> kPostVisibilityLevel = {
0: 'postVisibilityAll', 0: 'postVisibilityAll',
1: 'postVisibilityFriends', 1: 'postVisibilityFriends',
// 2: 'postVisibilitySelected', TODO impl user selection 2: 'postVisibilitySelected',
// 3: 'postVisibilityFiltered', TODO impl user filter selection 3: 'postVisibilityFiltered',
4: 'postVisibilityNone', 4: 'postVisibilityNone',
}; };
@ -50,6 +51,32 @@ class PostMetaEditor extends StatelessWidget {
return picked; return picked;
} }
void _selectVisibleUser(BuildContext context) {
showModalBottomSheet(
context: context,
builder: (context) => AccountSelect(
title: 'postVisibleUsers'.tr(),
initialSelection: controller.visibleUsers,
onMultipleSelect: (value) {
controller.setVisibleUsers(value.map((ele) => ele.id).toList());
},
),
);
}
void _selectInvisibleUser(BuildContext context) {
showModalBottomSheet(
context: context,
builder: (context) => AccountSelect(
title: 'postInvisibleUsers'.tr(),
initialSelection: controller.invisibleUsers,
onMultipleSelect: (value) {
controller.setInvisibleUsers(value.map((ele) => ele.id).toList());
},
),
);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final dateFormatter = DateFormat('y/M/d HH:mm:ss'); final dateFormatter = DateFormat('y/M/d HH:mm:ss');
@ -127,6 +154,30 @@ class PostMetaEditor extends StatelessWidget {
), ),
), ),
), ),
if (controller.visibility == 2)
ListTile(
contentPadding: const EdgeInsets.symmetric(horizontal: 24),
leading: Icon(Symbols.person),
trailing: Icon(Symbols.chevron_right),
title: Text('postVisibleUsers').tr(),
subtitle: Text('postSelectedUsers')
.plural(controller.visibleUsers.length),
onTap: () {
_selectVisibleUser(context);
},
),
if (controller.visibility == 3)
ListTile(
contentPadding: const EdgeInsets.symmetric(horizontal: 24),
leading: Icon(Symbols.person),
trailing: Icon(Symbols.chevron_right),
title: Text('postInvisibleUsers').tr(),
subtitle: Text('postSelectedUsers')
.plural(controller.invisibleUsers.length),
onTap: () {
_selectInvisibleUser(context);
},
),
ListTile( ListTile(
leading: const Icon(Symbols.event_available), leading: const Icon(Symbols.event_available),
title: Text('postPublishedAt').tr(), title: Text('postPublishedAt').tr(),