SolarNetwork/App
3
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

♻️ Refactored poll editor

Browse Source
This commit is contained in:
LittleSheep
2025-11-16 22:15:10 +08:00
parent 3ffa730505
commit c247cdf81c
6 changed files with 130 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/i18n/en-US.json
View File

@@ -1327,5 +1327,7 @@
"pinnedPosts": "Pinned Posts", "pinnedPosts": "Pinned Posts",
"thoughtUnpaidHint": "Thinking unavaiable due to unpaid orders", "thoughtUnpaidHint": "Thinking unavaiable due to unpaid orders",
"more": "More", "more": "More",
"collapse": "Collapse" "collapse": "Collapse",
"pollConfirmDiscard": "Are you sure you want to leave? All the poll data you're editing will not be saved.",
"discard": "Discard"
} }

24
lib/route.dart
View File

@@ -44,7 +44,6 @@ import 'package:island/screens/discovery/feeds/feed_marketplace.dart';
import 'package:island/screens/discovery/feeds/feed_detail.dart'; import 'package:island/screens/discovery/feeds/feed_detail.dart';
import 'package:island/screens/creators/poll/poll_list.dart'; import 'package:island/screens/creators/poll/poll_list.dart';
import 'package:island/screens/creators/webfeed/webfeed_list.dart'; import 'package:island/screens/creators/webfeed/webfeed_list.dart';
import 'package:island/screens/poll/poll_editor.dart';
import 'package:island/screens/posts/compose.dart'; import 'package:island/screens/posts/compose.dart';
import 'package:island/screens/posts/compose_article.dart'; import 'package:island/screens/posts/compose_article.dart';
import 'package:island/screens/posts/post_detail.dart'; import 'package:island/screens/posts/post_detail.dart';
@@ -486,28 +485,7 @@ final routerProvider = Provider<GoRouter>((ref) {
return CreatorPollListScreen(pubName: name); return CreatorPollListScreen(pubName: name);
}, },
), ),
// Poll routes
GoRoute(
name: 'creatorPollNew',
path: ':name/polls/new',
builder: (context, state) {
final name = state.pathParameters['name']!;
// initialPollId left null for create; initialPublisher prefilled
return PollEditorScreen(initialPublisher: name);
},
),
GoRoute(
name: 'creatorPollEdit',
path: ':name/polls/:id/edit',
builder: (context, state) {
final name = state.pathParameters['name']!;
final id = state.pathParameters['id']!;
return PollEditorScreen(
initialPollId: id,
initialPublisher: name,
);
},
),
GoRoute( GoRoute(
name: 'creatorStickers', name: 'creatorStickers',
path: ':name/stickers', path: ':name/stickers',

31
lib/screens/creators/poll/poll_list.dart
View File

@@ -1,10 +1,10 @@
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gap/gap.dart'; import 'package:gap/gap.dart';
import 'package:go_router/go_router.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:island/models/poll.dart'; import 'package:island/models/poll.dart';
import 'package:island/pods/network.dart'; import 'package:island/pods/network.dart';
import 'package:island/screens/poll/poll_editor.dart';
import 'package:island/widgets/app_scaffold.dart'; import 'package:island/widgets/app_scaffold.dart';
import 'package:island/widgets/poll/poll_feedback.dart'; import 'package:island/widgets/poll/poll_feedback.dart';
import 'package:material_symbols_icons/symbols.dart'; import 'package:material_symbols_icons/symbols.dart';
@@ -73,10 +73,14 @@ class CreatorPollListScreen extends HookConsumerWidget {
final String pubName; final String pubName;
Future<void> _createPoll(BuildContext context) async { Future<void> _createPoll(BuildContext context) async {
final result = await GoRouter.of( final result = await showModalBottomSheet<SnPollWithStats>(
context, context: context,
).pushNamed('creatorPollNew', pathParameters: {'name': pubName}); isScrollControlled: true,
if (result is SnPollWithStats && context.mounted) { isDismissible: false,
enableDrag: false,
builder: (context) => PollEditorScreen(initialPublisher: pubName),
);
if (result != null && context.mounted) {
Navigator.of(context).maybePop(result); Navigator.of(context).maybePop(result);
} }
} }
@@ -176,11 +180,20 @@ class _CreatorPollItem extends HookConsumerWidget {
Text('edit').tr(), Text('edit').tr(),
], ],
), ),
onTap: () { onTap: () async {
GoRouter.of(context).pushNamed( final result = await showModalBottomSheet<SnPoll>(
'creatorPollEdit', context: context,
pathParameters: {'name': pubName, 'id': pollWithStats.id}, isScrollControlled: true,
isDismissible: false,
builder:
(context) => PollEditorScreen(
initialPublisher: pubName,
initialPollId: pollWithStats.id,
),
); );
if (result != null && context.mounted) {
ref.invalidate(pollListNotifierProvider(pubName));
}
}, },
), ),
PopupMenuItem( PopupMenuItem(

61
lib/screens/poll/poll_editor.dart
View File

@@ -8,7 +8,7 @@ import 'package:island/pods/network.dart';
import 'package:island/talker.dart'; import 'package:island/talker.dart';
import 'package:island/widgets/alert.dart'; import 'package:island/widgets/alert.dart';
import 'package:island/models/poll.dart'; import 'package:island/models/poll.dart';
import 'package:island/widgets/app_scaffold.dart'; import 'package:island/widgets/content/sheet.dart';
import 'package:styled_widget/styled_widget.dart'; import 'package:styled_widget/styled_widget.dart';
import 'package:uuid/uuid.dart'; import 'package:uuid/uuid.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
@@ -393,7 +393,7 @@ class PollEditorScreen extends ConsumerWidget {
showSnackBar(isUpdate ? 'pollUpdated'.tr() : 'pollCreated'.tr()); showSnackBar(isUpdate ? 'pollUpdated'.tr() : 'pollCreated'.tr());
if (!context.mounted) return; if (!context.mounted) return;
Navigator.of(context).maybePop(res.data); Navigator.of(context).maybePop(SnPoll.fromJson(res.data));
} catch (e) { } catch (e) {
showErrorAlert(e); showErrorAlert(e);
} }
@@ -415,23 +415,46 @@ class PollEditorScreen extends ConsumerWidget {
}); });
} }
return AppScaffold( return SheetScaffold(
isNoBackground: false, titleText: model.id == null ? 'pollCreate'.tr() : 'pollEdit'.tr(),
appBar: AppBar( actions: [
title: Text(model.id == null ? 'pollCreate'.tr() : 'pollEdit'.tr()), if (kDebugMode)
actions: [ IconButton(
if (kDebugMode) tooltip: 'pollPreviewJsonDebug'.tr(),
IconButton( onPressed: () {
tooltip: 'pollPreviewJsonDebug'.tr(), _showDebugPreview(context, model);
onPressed: () { },
_showDebugPreview(context, model); icon: const Icon(Icons.visibility_outlined),
}, ),
icon: const Icon(Icons.visibility_outlined), ],
), heightFactor: 0.9,
const Gap(8), onClose: () async {
], final confirmed = await showDialog<bool>(
), context: context,
body: Column( builder:
(ctx) => AlertDialog(
title: Text('confirm'.tr()),
content: Text('pollConfirmDiscard'.tr()),
actions: [
TextButton(
onPressed: () => Navigator.of(ctx).pop(false),
child: Text('cancel'.tr()),
),
TextButton(
onPressed: () => Navigator.of(ctx).pop(true),
style: TextButton.styleFrom(
foregroundColor: Theme.of(ctx).colorScheme.error,
),
child: Text('discard'.tr()),
),
],
),
);
if (confirmed == true) {
Navigator.of(context).pop();
}
},
child: Column(
children: [ children: [
Expanded( Expanded(
child: ConstrainedBox( child: ConstrainedBox(

106
lib/widgets/post/compose_poll.dart
View File

@@ -2,11 +2,12 @@ import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:gap/gap.dart'; import 'package:gap/gap.dart';
import 'package:go_router/go_router.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:island/models/poll.dart'; import 'package:island/models/poll.dart';
import 'package:island/models/publisher.dart'; import 'package:island/models/publisher.dart';
import 'package:island/screens/creators/poll/poll_list.dart'; import 'package:island/screens/creators/poll/poll_list.dart';
import 'package:island/screens/poll/poll_editor.dart';
import 'package:island/widgets/content/cloud_files.dart';
import 'package:island/widgets/content/sheet.dart'; import 'package:island/widgets/content/sheet.dart';
import 'package:material_symbols_icons/symbols.dart'; import 'package:material_symbols_icons/symbols.dart';
import 'package:riverpod_paging_utils/riverpod_paging_utils.dart'; import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
@@ -15,14 +16,13 @@ import 'package:island/widgets/post/publishers_modal.dart';
/// Bottom sheet for selecting or creating a poll. Returns SnPoll via Navigator.pop. /// Bottom sheet for selecting or creating a poll. Returns SnPoll via Navigator.pop.
class ComposePollSheet extends HookConsumerWidget { class ComposePollSheet extends HookConsumerWidget {
/// Optional publisher name to filter polls and prefill creation. final SnPublisher? pub;
final String? pubName;
const ComposePollSheet({super.key, this.pubName}); const ComposePollSheet({super.key, this.pub});
@override @override
Widget build(BuildContext context, WidgetRef ref) { Widget build(BuildContext context, WidgetRef ref) {
final selectedPublisher = useState<String?>(pubName); final selectedPublisher = useState<SnPublisher?>(pub);
final isPushing = useState(false); final isPushing = useState(false);
final errorText = useState<String?>(null); final errorText = useState<String?>(null);
@@ -46,10 +46,11 @@ class ComposePollSheet extends HookConsumerWidget {
children: [ children: [
// Link/Select existing poll list // Link/Select existing poll list
PagingHelperView( PagingHelperView(
provider: pollListNotifierProvider(pubName), provider: pollListNotifierProvider(pub?.name),
futureRefreshable: pollListNotifierProvider(pubName).future, futureRefreshable:
pollListNotifierProvider(pub?.name).future,
notifierRefreshable: notifierRefreshable:
pollListNotifierProvider(pubName).notifier, pollListNotifierProvider(pub?.name).notifier,
contentBuilder: contentBuilder:
(data, widgetCount, endItemView) => ListView.builder( (data, widgetCount, endItemView) => ListView.builder(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
@@ -81,38 +82,48 @@ class ComposePollSheet extends HookConsumerWidget {
Text( Text(
'pollCreateNewHint', 'pollCreateNewHint',
).tr().fontSize(13).opacity(0.85).padding(bottom: 8), ).tr().fontSize(13).opacity(0.85).padding(bottom: 8),
ListTile( Card(
title: Text( child: ListTile(
selectedPublisher.value == null shape: RoundedRectangleBorder(
? 'publisher'.tr() borderRadius: const BorderRadius.all(
: '@${selectedPublisher.value}', Radius.circular(8),
), ),
subtitle: Text( ),
selectedPublisher.value == null title: Text(
? 'publisherHint'.tr() selectedPublisher.value == null
: 'selected'.tr(), ? 'publisher'.tr()
), : selectedPublisher.value!.nick,
leading: const Icon(Symbols.account_circle), ),
trailing: const Icon(Symbols.chevron_right), subtitle: Text(
onTap: () async { selectedPublisher.value == null
final picked = ? 'publisherHint'.tr()
await showModalBottomSheet<SnPublisher>( : '@${selectedPublisher.value?.name}',
context: context, ),
isScrollControlled: true, leading:
builder: (context) => const PublisherModal(), selectedPublisher.value == null
); ? const Icon(Symbols.account_circle)
if (picked != null) { : ProfilePictureWidget(
try { file: selectedPublisher.value?.picture,
final name = picked.name; ),
if (name.isNotEmpty) { trailing: const Icon(Symbols.chevron_right),
selectedPublisher.value = name; onTap: () async {
final picked =
await showModalBottomSheet<SnPublisher>(
context: context,
isScrollControlled: true,
builder:
(context) => const PublisherModal(),
);
if (picked != null) {
try {
selectedPublisher.value = picked;
errorText.value = null; errorText.value = null;
} catch (_) {
// ignore
} }
} catch (_) {
// ignore
} }
} },
}, ),
), ),
if (errorText.value != null) if (errorText.value != null)
Padding( Padding(
@@ -146,8 +157,7 @@ class ComposePollSheet extends HookConsumerWidget {
isPushing.value isPushing.value
? null ? null
: () async { : () async {
final pub = selectedPublisher.value ?? ''; if (pub == null) {
if (pub.isEmpty) {
errorText.value = errorText.value =
'publisherCannotBeEmpty'.tr(); 'publisherCannotBeEmpty'.tr();
return; return;
@@ -155,12 +165,18 @@ class ComposePollSheet extends HookConsumerWidget {
errorText.value = null; errorText.value = null;
isPushing.value = true; isPushing.value = true;
// Push to creatorPollNew route and await result // Show modal bottom sheet with poll editor and await result
final result = await GoRouter.of( final result =
context, await showModalBottomSheet<SnPoll>(
).push<SnPoll>( context: context,
'/creators/$pub/polls/new', isScrollControlled: true,
); isDismissible: false,
enableDrag: false,
builder:
(context) => PollEditorScreen(
initialPublisher: pub?.name,
),
);
if (result == null) { if (result == null) {
isPushing.value = false; isPushing.value = false;

2
lib/widgets/post/compose_shared.dart
View File

@@ -611,7 +611,7 @@ class ComposeLogic {
context: context, context: context,
useRootNavigator: true, useRootNavigator: true,
isScrollControlled: true, isScrollControlled: true,
builder: (context) => const ComposePollSheet(), builder: (context) => ComposePollSheet(pub: state.currentPublisher.value),
); );
if (poll == null) return; if (poll == null) return;