Compare commits
	
		
			11 Commits
		
	
	
		
			3.2.0+124
			...
			f478ea8b84
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| f478ea8b84 | |||
| 0f481aff5b | |||
| 7a31663310 | |||
| 0239c53c04 | |||
| 16987c758e | |||
| 3a36915140 | |||
| 4bde708878 | |||
| 2f0cf560f8 | |||
| cf355a95fd | |||
| 2f43073172 | |||
| 8236d31ecc | 
							
								
								
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -12,6 +12,9 @@ | ||||
| .swiftpm/ | ||||
| migrate_working_dir/ | ||||
|  | ||||
| # Inno Setup | ||||
| Installer/ | ||||
|  | ||||
| # IntelliJ related | ||||
| *.iml | ||||
| *.ipr | ||||
|   | ||||
| @@ -573,6 +573,7 @@ | ||||
|   "keyboardShortcuts": "Keyboard Shortcuts", | ||||
|   "share": "Share", | ||||
|   "sharePost": "Share Post", | ||||
|   "sharePostPhoto": "Share Post as Photo", | ||||
|   "quickActions": "Quick Actions", | ||||
|   "post": "Post", | ||||
|   "copy": "Copy", | ||||
| @@ -760,6 +761,7 @@ | ||||
|   "pollsRecent": "Recent Polls", | ||||
|   "pollCreateNew": "Create New", | ||||
|   "pollCreateNewHint": "Create a new poll for your post. Pick a publisher and continue.", | ||||
|   "pollQuestions": "Questions", | ||||
|   "publisher": "Publisher", | ||||
|   "publisherHint": "Enter the publisher name", | ||||
|   "publisherCannotBeEmpty": "Publisher cannot be empty", | ||||
| @@ -792,5 +794,47 @@ | ||||
|   "joinedAt": "Joined at {}", | ||||
|   "searchAccounts": "Search accounts...", | ||||
|   "webFeeds": "Web Feeds", | ||||
|   "polls": "Polls" | ||||
| } | ||||
|   "polls": "Polls", | ||||
|   "sharePostSlogan": "Explore more on the Solar Network", | ||||
|   "filesListAdditional": { | ||||
|     "one": "+{} file remaining", | ||||
|     "other": "+{} files remaining" | ||||
|   }, | ||||
|   "pollAnswerSubmitted": "Poll answer has been submitted.", | ||||
|   "modifyAnswers": "Modify Answers", | ||||
|   "back": "Back", | ||||
|   "submit": "Submit", | ||||
|   "pollOptionDefaultLabel": "Option 1", | ||||
|   "pollUpdated": "Poll updated.", | ||||
|   "pollCreated": "Poll created.", | ||||
|   "pollCreate": "Create Poll", | ||||
|   "pollEdit": "Edit Poll", | ||||
|   "pollPreviewJsonDebug": "Debug Preview", | ||||
|   "pollTitleRequired": "Title is required", | ||||
|   "pollEndDateOptional": "End date & time (optional)", | ||||
|   "notSet": "Not set", | ||||
|   "pick": "Pick", | ||||
|   "clear": "Clear", | ||||
|   "questions": "Questions", | ||||
|   "pollAddQuestion": "Add question", | ||||
|   "pollQuestionTypeSingleChoice": "Single choice", | ||||
|   "pollQuestionTypeMultipleChoice": "Multiple choice", | ||||
|   "pollQuestionTypeFreeText": "Free text", | ||||
|   "pollQuestionTypeYesNo": "Yes / No", | ||||
|   "pollQuestionTypeRating": "Rating", | ||||
|   "pollNoQuestionsYet": "No questions yet", | ||||
|   "pollNoQuestionsHint": "Use \"Add question\" to start building your poll.", | ||||
|   "pollDebugPreview": "Debug Preview", | ||||
|   "pollUntitledQuestion": "Untitled question", | ||||
|   "moveUp": "Move up", | ||||
|   "moveDown": "Move down", | ||||
|   "required": "Required", | ||||
|   "pollQuestionTitle": "Question title", | ||||
|   "pollQuestionTitleRequired": "Question title is required", | ||||
|   "pollQuestionDescriptionOptional": "Question description (optional)", | ||||
|   "options": "Options", | ||||
|   "pollAddOption": "Add option", | ||||
|   "pollOptionLabel": "Option label", | ||||
|   "pollLongTextAnswerPreview": "Long text answer (preview)", | ||||
|   "pollShortTextAnswerPreview": "Short text answer (preview)" | ||||
| } | ||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -62,12 +62,16 @@ void main() async { | ||||
|       FirebaseMessaging.onBackgroundMessage( | ||||
|         _firebaseMessagingBackgroundHandler, | ||||
|       ); | ||||
|       FlutterError.onError = | ||||
|       // Although previous if case checked this. Still check is web or not | ||||
|       // Otherwise the web platform will broke due to there is no Platform api on the web | ||||
|       if (kIsWeb || !Platform.isWindows) { | ||||
|         FlutterError.onError = | ||||
|           FirebaseCrashlytics.instance.recordFlutterFatalError; | ||||
|       PlatformDispatcher.instance.onError = (error, stack) { | ||||
|         FirebaseCrashlytics.instance.recordError(error, stack, fatal: true); | ||||
|         return true; | ||||
|       }; | ||||
|         PlatformDispatcher.instance.onError = (error, stack) { | ||||
|           FirebaseCrashlytics.instance.recordError(error, stack, fatal: true); | ||||
|           return true; | ||||
|         }; | ||||
|       } | ||||
|     } | ||||
|  | ||||
|     log("[SplashScreen] Firebase is ready!"); | ||||
|   | ||||
| @@ -8,7 +8,7 @@ part 'poll.g.dart'; | ||||
| sealed class SnPollWithStats with _$SnPollWithStats { | ||||
|   const factory SnPollWithStats({ | ||||
|     required Map<String, dynamic>? userAnswer, | ||||
|     required Map<String, dynamic> stats, | ||||
|     @Default({}) Map<String, dynamic> stats, | ||||
|     required String id, | ||||
|     required List<SnPollQuestion> questions, | ||||
|     String? title, | ||||
|   | ||||
| @@ -213,7 +213,7 @@ return $default(_that.userAnswer,_that.stats,_that.id,_that.questions,_that.titl | ||||
| @JsonSerializable() | ||||
|  | ||||
| class _SnPollWithStats implements SnPollWithStats { | ||||
|   const _SnPollWithStats({required final  Map<String, dynamic>? userAnswer, required final  Map<String, dynamic> stats, required this.id, required final  List<SnPollQuestion> questions, this.title, this.description, this.endedAt, required this.publisherId, required this.createdAt, required this.updatedAt, this.deletedAt}): _userAnswer = userAnswer,_stats = stats,_questions = questions; | ||||
|   const _SnPollWithStats({required final  Map<String, dynamic>? userAnswer, final  Map<String, dynamic> stats = const {}, required this.id, required final  List<SnPollQuestion> questions, this.title, this.description, this.endedAt, required this.publisherId, required this.createdAt, required this.updatedAt, this.deletedAt}): _userAnswer = userAnswer,_stats = stats,_questions = questions; | ||||
|   factory _SnPollWithStats.fromJson(Map<String, dynamic> json) => _$SnPollWithStatsFromJson(json); | ||||
|  | ||||
|  final  Map<String, dynamic>? _userAnswer; | ||||
| @@ -226,7 +226,7 @@ class _SnPollWithStats implements SnPollWithStats { | ||||
| } | ||||
|  | ||||
|  final  Map<String, dynamic> _stats; | ||||
| @override Map<String, dynamic> get stats { | ||||
| @override@JsonKey() Map<String, dynamic> get stats { | ||||
|   if (_stats is EqualUnmodifiableMapView) return _stats; | ||||
|   // ignore: implicit_dynamic_type | ||||
|   return EqualUnmodifiableMapView(_stats); | ||||
|   | ||||
| @@ -9,7 +9,7 @@ part of 'poll.dart'; | ||||
| _SnPollWithStats _$SnPollWithStatsFromJson(Map<String, dynamic> json) => | ||||
|     _SnPollWithStats( | ||||
|       userAnswer: json['user_answer'] as Map<String, dynamic>?, | ||||
|       stats: json['stats'] as Map<String, dynamic>, | ||||
|       stats: json['stats'] as Map<String, dynamic>? ?? const {}, | ||||
|       id: json['id'] as String, | ||||
|       questions: | ||||
|           (json['questions'] as List<dynamic>) | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| import 'package:firebase_analytics/firebase_analytics.dart'; | ||||
| import 'package:firebase_analytics/observer.dart'; | ||||
|  | ||||
| import 'package:flutter/material.dart'; | ||||
| import 'package:go_router/go_router.dart'; | ||||
| import 'package:hooks_riverpod/hooks_riverpod.dart'; | ||||
|   | ||||
| @@ -166,7 +166,7 @@ class AccountConnectionNewSheet extends HookConsumerWidget { | ||||
|               webAuthenticationOptions: WebAuthenticationOptions( | ||||
|                 clientId: 'dev.solsynth.solarpass', | ||||
|                 redirectUri: Uri.parse( | ||||
|                   'https://nt.solian.app/auth/callback/apple', | ||||
|                   'https://id.solian.app/auth/callback/apple', | ||||
|                 ), | ||||
|               ), | ||||
|             ); | ||||
|   | ||||
| @@ -2,6 +2,7 @@ import 'package:dio/dio.dart'; | ||||
| import 'package:easy_localization/easy_localization.dart'; | ||||
| import 'package:flutter/foundation.dart'; | ||||
| import 'package:flutter/material.dart'; | ||||
| import 'package:flutter_hooks/flutter_hooks.dart'; | ||||
| import 'package:go_router/go_router.dart'; | ||||
| import 'package:gap/gap.dart'; | ||||
| import 'package:hooks_riverpod/hooks_riverpod.dart'; | ||||
| @@ -262,6 +263,10 @@ class AccountProfileScreen extends HookConsumerWidget { | ||||
|     } | ||||
|  | ||||
|     final user = ref.watch(userInfoProvider); | ||||
|     final isCurrentUser = useMemoized( | ||||
|       () => user.value?.id == account.value?.id, | ||||
|       [user, account], | ||||
|     ); | ||||
|  | ||||
|     Widget accountBasicInfo(SnAccount data) => Padding( | ||||
|       padding: const EdgeInsets.fromLTRB(24, 24, 24, 8), | ||||
| @@ -589,7 +594,7 @@ class AccountProfileScreen extends HookConsumerWidget { | ||||
|                           child: CustomScrollView( | ||||
|                             slivers: [ | ||||
|                               SliverGap(24), | ||||
|                               if (user.value != null) | ||||
|                               if (user.value != null && !isCurrentUser) | ||||
|                                 SliverToBoxAdapter(child: accountAction(data)), | ||||
|                               SliverToBoxAdapter( | ||||
|                                 child: Card( | ||||
| @@ -686,7 +691,7 @@ class AccountProfileScreen extends HookConsumerWidget { | ||||
|                             data, | ||||
|                           ).padding(horizontal: 4), | ||||
|                         ), | ||||
|                         if (user.value != null) | ||||
|                         if (user.value != null && !isCurrentUser) | ||||
|                           SliverToBoxAdapter( | ||||
|                             child: accountAction(data).padding(horizontal: 4), | ||||
|                           ), | ||||
|   | ||||
| @@ -14,17 +14,19 @@ part 'poll_list.g.dart'; | ||||
|  | ||||
| @riverpod | ||||
| class PollListNotifier extends _$PollListNotifier | ||||
|     with CursorPagingNotifierMixin<SnPoll> { | ||||
|     with CursorPagingNotifierMixin<SnPollWithStats> { | ||||
|   static const int _pageSize = 20; | ||||
|  | ||||
|   @override | ||||
|   Future<CursorPagingData<SnPoll>> build(String? pubName) { | ||||
|   Future<CursorPagingData<SnPollWithStats>> build(String? pubName) { | ||||
|     // immediately load first page | ||||
|     return fetch(cursor: null); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   Future<CursorPagingData<SnPoll>> fetch({required String? cursor}) async { | ||||
|   Future<CursorPagingData<SnPollWithStats>> fetch({ | ||||
|     required String? cursor, | ||||
|   }) async { | ||||
|     final client = ref.read(apiClientProvider); | ||||
|     final offset = cursor == null ? 0 : int.parse(cursor); | ||||
|  | ||||
| @@ -42,7 +44,7 @@ class PollListNotifier extends _$PollListNotifier | ||||
|     ); | ||||
|     final total = int.parse(response.headers.value('X-Total') ?? '0'); | ||||
|     final List<dynamic> data = response.data; | ||||
|     final items = data.map((json) => SnPoll.fromJson(json)).toList(); | ||||
|     final items = data.map((json) => SnPollWithStats.fromJson(json)).toList(); | ||||
|  | ||||
|     final hasMore = offset + items.length < total; | ||||
|     final nextCursor = hasMore ? (offset + items.length).toString() : null; | ||||
| @@ -55,6 +57,13 @@ class PollListNotifier extends _$PollListNotifier | ||||
|   } | ||||
| } | ||||
|  | ||||
| @riverpod | ||||
| Future<SnPollWithStats> pollWithStats(Ref ref, String id) async { | ||||
|   final apiClient = ref.watch(apiClientProvider); | ||||
|   final resp = await apiClient.get('/sphere/polls/$id'); | ||||
|   return SnPollWithStats.fromJson(resp.data); | ||||
| } | ||||
|  | ||||
| class CreatorPollListScreen extends HookConsumerWidget { | ||||
|   const CreatorPollListScreen({super.key, required this.pubName}); | ||||
|  | ||||
| @@ -64,7 +73,7 @@ class CreatorPollListScreen extends HookConsumerWidget { | ||||
|     final result = await GoRouter.of( | ||||
|       context, | ||||
|     ).pushNamed('creatorPollNew', pathParameters: {'name': pubName}); | ||||
|     if (result is SnPoll && context.mounted) { | ||||
|     if (result is SnPollWithStats && context.mounted) { | ||||
|       Navigator.of(context).maybePop(result); | ||||
|     } | ||||
|   } | ||||
| @@ -92,8 +101,11 @@ class CreatorPollListScreen extends HookConsumerWidget { | ||||
|                       if (index == widgetCount - 1) { | ||||
|                         return endItemView; | ||||
|                       } | ||||
|                       final poll = data.items[index]; | ||||
|                       return _CreatorPollItem(poll: poll, pubName: pubName); | ||||
|                       final pollWithStats = data.items[index]; | ||||
|                       return _CreatorPollItem( | ||||
|                         pollWithStats: pollWithStats, | ||||
|                         pubName: pubName, | ||||
|                       ); | ||||
|                     }, | ||||
|                   ), | ||||
|             ), | ||||
| @@ -106,14 +118,14 @@ class CreatorPollListScreen extends HookConsumerWidget { | ||||
|  | ||||
| class _CreatorPollItem extends StatelessWidget { | ||||
|   final String pubName; | ||||
|   const _CreatorPollItem({required this.poll, required this.pubName}); | ||||
|   const _CreatorPollItem({required this.pollWithStats, required this.pubName}); | ||||
|  | ||||
|   final SnPoll poll; | ||||
|   final SnPollWithStats pollWithStats; | ||||
|  | ||||
|   @override | ||||
|   Widget build(BuildContext context) { | ||||
|     final theme = Theme.of(context); | ||||
|     final ended = poll.endedAt; | ||||
|     final ended = pollWithStats.endedAt; | ||||
|     final endedText = | ||||
|         ended == null | ||||
|             ? 'No end' | ||||
| @@ -123,15 +135,16 @@ class _CreatorPollItem extends StatelessWidget { | ||||
|       margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 6), | ||||
|       clipBehavior: Clip.antiAlias, | ||||
|       child: ListTile( | ||||
|         title: Text(poll.title ?? 'Untitled poll'), | ||||
|         title: Text(pollWithStats.title ?? 'Untitled poll'), | ||||
|         subtitle: Column( | ||||
|           crossAxisAlignment: CrossAxisAlignment.start, | ||||
|           children: [ | ||||
|             if (poll.description != null && poll.description!.isNotEmpty) | ||||
|             if (pollWithStats.description != null && | ||||
|                 pollWithStats.description!.isNotEmpty) | ||||
|               Padding( | ||||
|                 padding: const EdgeInsets.only(top: 4), | ||||
|                 child: Text( | ||||
|                   poll.description!, | ||||
|                   pollWithStats.description!, | ||||
|                   maxLines: 2, | ||||
|                   overflow: TextOverflow.ellipsis, | ||||
|                 ), | ||||
| @@ -139,7 +152,7 @@ class _CreatorPollItem extends StatelessWidget { | ||||
|             Padding( | ||||
|               padding: const EdgeInsets.only(top: 4), | ||||
|               child: Text( | ||||
|                 'Questions: ${poll.questions.length} · Ends: $endedText', | ||||
|                 'Questions: ${pollWithStats.questions.length} · Ends: $endedText', | ||||
|                 style: theme.textTheme.bodySmall, | ||||
|               ), | ||||
|             ), | ||||
| @@ -159,7 +172,7 @@ class _CreatorPollItem extends StatelessWidget { | ||||
|                   onTap: () { | ||||
|                     GoRouter.of(context).pushNamed( | ||||
|                       'creatorPollEdit', | ||||
|                       pathParameters: {'name': pubName, 'id': poll.id}, | ||||
|                       pathParameters: {'name': pubName, 'id': pollWithStats.id}, | ||||
|                     ); | ||||
|                   }, | ||||
|                 ), | ||||
| @@ -170,8 +183,7 @@ class _CreatorPollItem extends StatelessWidget { | ||||
|             context: context, | ||||
|             useRootNavigator: true, | ||||
|             isScrollControlled: true, | ||||
|             builder: | ||||
|                 (context) => PollFeedbackSheet(pollId: poll.id, poll: poll), | ||||
|             builder: (context) => PollFeedbackSheet(pollId: pollWithStats.id), | ||||
|           ); | ||||
|         }, | ||||
|       ), | ||||
|   | ||||
| @@ -6,7 +6,7 @@ part of 'poll_list.dart'; | ||||
| // RiverpodGenerator | ||||
| // ************************************************************************** | ||||
|  | ||||
| String _$pollListNotifierHash() => r'd3da24ff6bbb8f35b06d57fc41625dc0312508e4'; | ||||
| String _$pollWithStatsHash() => r'6bb910046ce1e09368f9922dbec52fdc2cc86740'; | ||||
|  | ||||
| /// Copied from Dart SDK | ||||
| class _SystemHash { | ||||
| @@ -29,11 +29,133 @@ class _SystemHash { | ||||
|   } | ||||
| } | ||||
|  | ||||
| /// See also [pollWithStats]. | ||||
| @ProviderFor(pollWithStats) | ||||
| const pollWithStatsProvider = PollWithStatsFamily(); | ||||
|  | ||||
| /// See also [pollWithStats]. | ||||
| class PollWithStatsFamily extends Family<AsyncValue<SnPollWithStats>> { | ||||
|   /// See also [pollWithStats]. | ||||
|   const PollWithStatsFamily(); | ||||
|  | ||||
|   /// See also [pollWithStats]. | ||||
|   PollWithStatsProvider call(String id) { | ||||
|     return PollWithStatsProvider(id); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   PollWithStatsProvider getProviderOverride( | ||||
|     covariant PollWithStatsProvider provider, | ||||
|   ) { | ||||
|     return call(provider.id); | ||||
|   } | ||||
|  | ||||
|   static const Iterable<ProviderOrFamily>? _dependencies = null; | ||||
|  | ||||
|   @override | ||||
|   Iterable<ProviderOrFamily>? get dependencies => _dependencies; | ||||
|  | ||||
|   static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null; | ||||
|  | ||||
|   @override | ||||
|   Iterable<ProviderOrFamily>? get allTransitiveDependencies => | ||||
|       _allTransitiveDependencies; | ||||
|  | ||||
|   @override | ||||
|   String? get name => r'pollWithStatsProvider'; | ||||
| } | ||||
|  | ||||
| /// See also [pollWithStats]. | ||||
| class PollWithStatsProvider extends AutoDisposeFutureProvider<SnPollWithStats> { | ||||
|   /// See also [pollWithStats]. | ||||
|   PollWithStatsProvider(String id) | ||||
|     : this._internal( | ||||
|         (ref) => pollWithStats(ref as PollWithStatsRef, id), | ||||
|         from: pollWithStatsProvider, | ||||
|         name: r'pollWithStatsProvider', | ||||
|         debugGetCreateSourceHash: | ||||
|             const bool.fromEnvironment('dart.vm.product') | ||||
|                 ? null | ||||
|                 : _$pollWithStatsHash, | ||||
|         dependencies: PollWithStatsFamily._dependencies, | ||||
|         allTransitiveDependencies: | ||||
|             PollWithStatsFamily._allTransitiveDependencies, | ||||
|         id: id, | ||||
|       ); | ||||
|  | ||||
|   PollWithStatsProvider._internal( | ||||
|     super._createNotifier, { | ||||
|     required super.name, | ||||
|     required super.dependencies, | ||||
|     required super.allTransitiveDependencies, | ||||
|     required super.debugGetCreateSourceHash, | ||||
|     required super.from, | ||||
|     required this.id, | ||||
|   }) : super.internal(); | ||||
|  | ||||
|   final String id; | ||||
|  | ||||
|   @override | ||||
|   Override overrideWith( | ||||
|     FutureOr<SnPollWithStats> Function(PollWithStatsRef provider) create, | ||||
|   ) { | ||||
|     return ProviderOverride( | ||||
|       origin: this, | ||||
|       override: PollWithStatsProvider._internal( | ||||
|         (ref) => create(ref as PollWithStatsRef), | ||||
|         from: from, | ||||
|         name: null, | ||||
|         dependencies: null, | ||||
|         allTransitiveDependencies: null, | ||||
|         debugGetCreateSourceHash: null, | ||||
|         id: id, | ||||
|       ), | ||||
|     ); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   AutoDisposeFutureProviderElement<SnPollWithStats> createElement() { | ||||
|     return _PollWithStatsProviderElement(this); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   bool operator ==(Object other) { | ||||
|     return other is PollWithStatsProvider && other.id == id; | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   int get hashCode { | ||||
|     var hash = _SystemHash.combine(0, runtimeType.hashCode); | ||||
|     hash = _SystemHash.combine(hash, id.hashCode); | ||||
|  | ||||
|     return _SystemHash.finish(hash); | ||||
|   } | ||||
| } | ||||
|  | ||||
| @Deprecated('Will be removed in 3.0. Use Ref instead') | ||||
| // ignore: unused_element | ||||
| mixin PollWithStatsRef on AutoDisposeFutureProviderRef<SnPollWithStats> { | ||||
|   /// The parameter `id` of this provider. | ||||
|   String get id; | ||||
| } | ||||
|  | ||||
| class _PollWithStatsProviderElement | ||||
|     extends AutoDisposeFutureProviderElement<SnPollWithStats> | ||||
|     with PollWithStatsRef { | ||||
|   _PollWithStatsProviderElement(super.provider); | ||||
|  | ||||
|   @override | ||||
|   String get id => (origin as PollWithStatsProvider).id; | ||||
| } | ||||
|  | ||||
| String _$pollListNotifierHash() => r'd5b822e737788be8982f5cb3b501d460441930c1'; | ||||
|  | ||||
| abstract class _$PollListNotifier | ||||
|     extends BuildlessAutoDisposeAsyncNotifier<CursorPagingData<SnPoll>> { | ||||
|     extends | ||||
|         BuildlessAutoDisposeAsyncNotifier<CursorPagingData<SnPollWithStats>> { | ||||
|   late final String? pubName; | ||||
|  | ||||
|   FutureOr<CursorPagingData<SnPoll>> build(String? pubName); | ||||
|   FutureOr<CursorPagingData<SnPollWithStats>> build(String? pubName); | ||||
| } | ||||
|  | ||||
| /// See also [PollListNotifier]. | ||||
| @@ -42,7 +164,7 @@ const pollListNotifierProvider = PollListNotifierFamily(); | ||||
|  | ||||
| /// See also [PollListNotifier]. | ||||
| class PollListNotifierFamily | ||||
|     extends Family<AsyncValue<CursorPagingData<SnPoll>>> { | ||||
|     extends Family<AsyncValue<CursorPagingData<SnPollWithStats>>> { | ||||
|   /// See also [PollListNotifier]. | ||||
|   const PollListNotifierFamily(); | ||||
|  | ||||
| @@ -78,7 +200,7 @@ class PollListNotifierProvider | ||||
|     extends | ||||
|         AutoDisposeAsyncNotifierProviderImpl< | ||||
|           PollListNotifier, | ||||
|           CursorPagingData<SnPoll> | ||||
|           CursorPagingData<SnPollWithStats> | ||||
|         > { | ||||
|   /// See also [PollListNotifier]. | ||||
|   PollListNotifierProvider(String? pubName) | ||||
| @@ -109,7 +231,7 @@ class PollListNotifierProvider | ||||
|   final String? pubName; | ||||
|  | ||||
|   @override | ||||
|   FutureOr<CursorPagingData<SnPoll>> runNotifierBuild( | ||||
|   FutureOr<CursorPagingData<SnPollWithStats>> runNotifierBuild( | ||||
|     covariant PollListNotifier notifier, | ||||
|   ) { | ||||
|     return notifier.build(pubName); | ||||
| @@ -134,7 +256,7 @@ class PollListNotifierProvider | ||||
|   @override | ||||
|   AutoDisposeAsyncNotifierProviderElement< | ||||
|     PollListNotifier, | ||||
|     CursorPagingData<SnPoll> | ||||
|     CursorPagingData<SnPollWithStats> | ||||
|   > | ||||
|   createElement() { | ||||
|     return _PollListNotifierProviderElement(this); | ||||
| @@ -157,7 +279,7 @@ class PollListNotifierProvider | ||||
| @Deprecated('Will be removed in 3.0. Use Ref instead') | ||||
| // ignore: unused_element | ||||
| mixin PollListNotifierRef | ||||
|     on AutoDisposeAsyncNotifierProviderRef<CursorPagingData<SnPoll>> { | ||||
|     on AutoDisposeAsyncNotifierProviderRef<CursorPagingData<SnPollWithStats>> { | ||||
|   /// The parameter `pubName` of this provider. | ||||
|   String? get pubName; | ||||
| } | ||||
| @@ -166,7 +288,7 @@ class _PollListNotifierProviderElement | ||||
|     extends | ||||
|         AutoDisposeAsyncNotifierProviderElement< | ||||
|           PollListNotifier, | ||||
|           CursorPagingData<SnPoll> | ||||
|           CursorPagingData<SnPollWithStats> | ||||
|         > | ||||
|     with PollListNotifierRef { | ||||
|   _PollListNotifierProviderElement(super.provider); | ||||
|   | ||||
| @@ -11,6 +11,7 @@ import 'package:island/widgets/alert.dart'; | ||||
| import 'package:island/models/poll.dart'; | ||||
| import 'package:island/widgets/app_scaffold.dart'; | ||||
| import 'package:uuid/uuid.dart'; | ||||
| import 'package:easy_localization/easy_localization.dart'; | ||||
|  | ||||
| class PollEditorState { | ||||
|   String? id; // for editing | ||||
| @@ -110,7 +111,7 @@ class PollEditor extends Notifier<PollEditorState> { | ||||
|               ? [ | ||||
|                 SnPollOption( | ||||
|                   id: const Uuid().v4(), | ||||
|                   label: 'Option 1', | ||||
|                   label: 'pollOptionDefaultLabel'.tr(), | ||||
|                   order: 0, | ||||
|                 ), | ||||
|               ] | ||||
| @@ -191,7 +192,7 @@ class PollEditor extends Notifier<PollEditorState> { | ||||
|                 : [ | ||||
|                   SnPollOption( | ||||
|                     id: const Uuid().v4(), | ||||
|                     label: 'Option 1', | ||||
|                     label: 'pollOptionDefaultLabel'.tr(), | ||||
|                     order: 0, | ||||
|                   ), | ||||
|                 ]) | ||||
| @@ -389,7 +390,7 @@ class PollEditorScreen extends ConsumerWidget { | ||||
|                 data: body, | ||||
|               )); | ||||
|  | ||||
|       showSnackBar(isUpdate ? 'Poll updated.' : 'Poll created.'); | ||||
|       showSnackBar(isUpdate ? 'pollUpdated'.tr() : 'pollCreated'.tr()); | ||||
|  | ||||
|       if (!context.mounted) return; | ||||
|       Navigator.of(context).maybePop(res.data); | ||||
| @@ -416,11 +417,11 @@ class PollEditorScreen extends ConsumerWidget { | ||||
|  | ||||
|     return AppScaffold( | ||||
|       appBar: AppBar( | ||||
|         title: Text(model.id == null ? 'Create Poll' : 'Edit Poll'), | ||||
|         title: Text(model.id == null ? 'pollCreate'.tr() : 'pollEdit'.tr()), | ||||
|         actions: [ | ||||
|           if (kDebugMode) | ||||
|             IconButton( | ||||
|               tooltip: 'Preview JSON (debug)', | ||||
|               tooltip: 'pollPreviewJsonDebug'.tr(), | ||||
|               onPressed: () { | ||||
|                 _showDebugPreview(context, model); | ||||
|               }, | ||||
| @@ -439,8 +440,8 @@ class PollEditorScreen extends ConsumerWidget { | ||||
|                 children: [ | ||||
|                   TextFormField( | ||||
|                     initialValue: model.title ?? '', | ||||
|                     decoration: const InputDecoration( | ||||
|                       labelText: 'Title', | ||||
|                     decoration: InputDecoration( | ||||
|                       labelText: 'title'.tr(), | ||||
|                       border: OutlineInputBorder( | ||||
|                         borderRadius: BorderRadius.all(Radius.circular(16)), | ||||
|                       ), | ||||
| @@ -452,7 +453,7 @@ class PollEditorScreen extends ConsumerWidget { | ||||
|                         (_) => FocusManager.instance.primaryFocus?.unfocus(), | ||||
|                     validator: (v) { | ||||
|                       if (v == null || v.trim().isEmpty) { | ||||
|                         return 'Title is required'; | ||||
|                         return 'pollTitleRequired'.tr(); | ||||
|                       } | ||||
|                       return null; | ||||
|                     }, | ||||
| @@ -460,8 +461,8 @@ class PollEditorScreen extends ConsumerWidget { | ||||
|                   const Gap(12), | ||||
|                   TextFormField( | ||||
|                     initialValue: model.description ?? '', | ||||
|                     decoration: const InputDecoration( | ||||
|                       labelText: 'Description', | ||||
|                     decoration: InputDecoration( | ||||
|                       labelText: 'description'.tr(), | ||||
|                       alignLabelWithHint: true, | ||||
|                       border: OutlineInputBorder( | ||||
|                         borderRadius: BorderRadius.all(Radius.circular(16)), | ||||
| @@ -482,7 +483,7 @@ class PollEditorScreen extends ConsumerWidget { | ||||
|                   Row( | ||||
|                     children: [ | ||||
|                       Text( | ||||
|                         'Questions', | ||||
|                         'questions'.tr(), | ||||
|                         style: Theme.of(context).textTheme.titleLarge, | ||||
|                       ), | ||||
|                       const Spacer(), | ||||
| @@ -495,7 +496,7 @@ class PollEditorScreen extends ConsumerWidget { | ||||
|                                   : controller.open(); | ||||
|                             }, | ||||
|                             icon: const Icon(Icons.add), | ||||
|                             label: const Text('Add question'), | ||||
|                             label: Text('pollAddQuestion'.tr()), | ||||
|                           ); | ||||
|                         }, | ||||
|                         menuChildren: | ||||
| @@ -514,9 +515,9 @@ class PollEditorScreen extends ConsumerWidget { | ||||
|                   const Gap(8), | ||||
|                   if (model.questions.isEmpty) | ||||
|                     _EmptyState( | ||||
|                       title: 'No questions yet', | ||||
|                       title: 'pollNoQuestionsYet'.tr(), | ||||
|                       subtitle: | ||||
|                           'Use "Add question" to start building your poll.', | ||||
|                           'pollNoQuestionsHint'.tr(), | ||||
|                     ) | ||||
|                   else | ||||
|                     ReorderableListView.builder( | ||||
| @@ -585,7 +586,7 @@ class PollEditorScreen extends ConsumerWidget { | ||||
|                   Navigator.of(context).maybePop(); | ||||
|                 }, | ||||
|                 icon: const Icon(Icons.close), | ||||
|                 label: const Text('Cancel'), | ||||
|                 label: Text('cancel'.tr()), | ||||
|               ), | ||||
|               const Spacer(), | ||||
|               FilledButton.icon( | ||||
| @@ -593,7 +594,7 @@ class PollEditorScreen extends ConsumerWidget { | ||||
|                   _submitPoll(context, ref); | ||||
|                 }, | ||||
|                 icon: const Icon(Icons.cloud_upload_outlined), | ||||
|                 label: Text(model.id == null ? 'Create' : 'Update'), | ||||
|                 label: Text(model.id == null ? 'create'.tr() : 'update'.tr()), | ||||
|               ), | ||||
|             ], | ||||
|           ), | ||||
| @@ -637,14 +638,14 @@ class PollEditorScreen extends ConsumerWidget { | ||||
|       context: context, | ||||
|       builder: | ||||
|           (_) => AlertDialog( | ||||
|             title: const Text('Debug Preview'), | ||||
|             title: Text('pollDebugPreview'.tr()), | ||||
|             content: SingleChildScrollView( | ||||
|               child: SelectableText(buf.toString()), | ||||
|             ), | ||||
|             actions: [ | ||||
|               TextButton( | ||||
|                 onPressed: () => Navigator.of(context).pop(), | ||||
|                 child: const Text('Close'), | ||||
|                 child: Text('close'.tr()), | ||||
|               ), | ||||
|             ], | ||||
|           ), | ||||
| @@ -673,15 +674,15 @@ IconData _iconForType(SnPollQuestionType t) { | ||||
| String _labelForType(SnPollQuestionType t) { | ||||
|   switch (t) { | ||||
|     case SnPollQuestionType.singleChoice: | ||||
|       return 'Single choice'; | ||||
|       return 'pollQuestionTypeSingleChoice'.tr(); | ||||
|     case SnPollQuestionType.multipleChoice: | ||||
|       return 'Multiple choice'; | ||||
|       return 'pollQuestionTypeMultipleChoice'.tr(); | ||||
|     case SnPollQuestionType.freeText: | ||||
|       return 'Free text'; | ||||
|       return 'pollQuestionTypeFreeText'.tr(); | ||||
|     case SnPollQuestionType.yesNo: | ||||
|       return 'Yes / No'; | ||||
|       return 'pollQuestionTypeYesNo'.tr(); | ||||
|     case SnPollQuestionType.rating: | ||||
|       return 'Rating'; | ||||
|       return 'pollQuestionTypeRating'.tr(); | ||||
|   } | ||||
| } | ||||
|  | ||||
| @@ -698,8 +699,8 @@ class _EndDatePicker extends StatelessWidget { | ||||
|       children: [ | ||||
|         Expanded( | ||||
|           child: InputDecorator( | ||||
|             decoration: const InputDecoration( | ||||
|               labelText: 'End date & time (optional)', | ||||
|             decoration: InputDecoration( | ||||
|               labelText: 'pollEndDateOptional'.tr(), | ||||
|               border: OutlineInputBorder( | ||||
|                 borderRadius: BorderRadius.all(Radius.circular(16)), | ||||
|               ), | ||||
| @@ -711,7 +712,7 @@ class _EndDatePicker extends StatelessWidget { | ||||
|                 Icon(Icons.event, color: Theme.of(context).colorScheme.primary), | ||||
|                 Text( | ||||
|                   value == null | ||||
|                       ? 'Not set' | ||||
|                       ? 'notSet'.tr() | ||||
|                       : MaterialLocalizations.of( | ||||
|                         context, | ||||
|                       ).formatFullDate(value!), | ||||
| @@ -759,12 +760,12 @@ class _EndDatePicker extends StatelessWidget { | ||||
|                     ); | ||||
|                     onChanged(dt); | ||||
|                   }, | ||||
|                   child: const Text('Pick'), | ||||
|                   child: Text('pick'.tr()), | ||||
|                 ), | ||||
|                 if (value != null) | ||||
|                   TextButton( | ||||
|                     onPressed: () => onChanged(null), | ||||
|                     child: const Text('Clear'), | ||||
|                     child: Text('clear'.tr()), | ||||
|                   ), | ||||
|               ], | ||||
|             ), | ||||
| @@ -799,7 +800,7 @@ class _QuestionHeader extends StatelessWidget { | ||||
|         child: const Icon(Icons.drag_handle), | ||||
|       ), | ||||
|       title: Text( | ||||
|         question.title.isEmpty ? 'Untitled question' : question.title, | ||||
|         question.title.isEmpty ? 'pollUntitledQuestion'.tr() : question.title, | ||||
|         maxLines: 1, | ||||
|         overflow: TextOverflow.ellipsis, | ||||
|       ), | ||||
| @@ -808,17 +809,17 @@ class _QuestionHeader extends StatelessWidget { | ||||
|         spacing: 4, | ||||
|         children: [ | ||||
|           IconButton( | ||||
|             tooltip: 'Move up', | ||||
|             tooltip: 'moveUp'.tr(), | ||||
|             onPressed: onMoveUp, | ||||
|             icon: const Icon(Icons.arrow_upward), | ||||
|           ), | ||||
|           IconButton( | ||||
|             tooltip: 'Move down', | ||||
|             tooltip: 'moveDown'.tr(), | ||||
|             onPressed: onMoveDown, | ||||
|             icon: const Icon(Icons.arrow_downward), | ||||
|           ), | ||||
|           IconButton( | ||||
|             tooltip: 'Delete', | ||||
|             tooltip: 'delete'.tr(), | ||||
|             onPressed: onDelete, | ||||
|             icon: const Icon(Icons.delete_outline), | ||||
|             color: Theme.of(context).colorScheme.error, | ||||
| @@ -853,7 +854,7 @@ class _QuestionEditor extends ConsumerWidget { | ||||
|               onChanged: (t) => notifier.setQuestionType(index, t), | ||||
|             ), | ||||
|             FilterChip( | ||||
|               label: const Text('Required'), | ||||
|               label: Text('required'.tr()), | ||||
|               selected: question.isRequired, | ||||
|               onSelected: (v) => notifier.setQuestionRequired(index, v), | ||||
|               avatar: Icon( | ||||
| @@ -867,8 +868,8 @@ class _QuestionEditor extends ConsumerWidget { | ||||
|         const Gap(12), | ||||
|         TextFormField( | ||||
|           initialValue: question.title, | ||||
|           decoration: const InputDecoration( | ||||
|             labelText: 'Question title', | ||||
|           decoration: InputDecoration( | ||||
|             labelText: 'pollQuestionTitle'.tr(), | ||||
|             border: OutlineInputBorder( | ||||
|               borderRadius: BorderRadius.all(Radius.circular(16)), | ||||
|             ), | ||||
| @@ -879,7 +880,7 @@ class _QuestionEditor extends ConsumerWidget { | ||||
|           onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(), | ||||
|           validator: (v) { | ||||
|             if (v == null || v.trim().isEmpty) { | ||||
|               return 'Question title is required'; | ||||
|               return 'pollQuestionTitleRequired'.tr(); | ||||
|             } | ||||
|             return null; | ||||
|           }, | ||||
| @@ -887,8 +888,8 @@ class _QuestionEditor extends ConsumerWidget { | ||||
|         const Gap(12), | ||||
|         TextFormField( | ||||
|           initialValue: question.description ?? '', | ||||
|           decoration: const InputDecoration( | ||||
|             labelText: 'Question description (optional)', | ||||
|           decoration: InputDecoration( | ||||
|             labelText: 'pollQuestionDescriptionOptional'.tr(), | ||||
|             border: OutlineInputBorder( | ||||
|               borderRadius: BorderRadius.all(Radius.circular(16)), | ||||
|             ), | ||||
| @@ -902,7 +903,7 @@ class _QuestionEditor extends ConsumerWidget { | ||||
|         ), | ||||
|         if (question.options != null) ...[ | ||||
|           const Gap(16), | ||||
|           Text('Options', style: Theme.of(context).textTheme.titleMedium), | ||||
|           Text('options'.tr(), style: Theme.of(context).textTheme.titleMedium), | ||||
|           const Gap(8), | ||||
|           _OptionsEditor(index: index, options: question.options!), | ||||
|           const Gap(4), | ||||
| @@ -911,7 +912,7 @@ class _QuestionEditor extends ConsumerWidget { | ||||
|             child: OutlinedButton.icon( | ||||
|               onPressed: () => notifier.addOption(index), | ||||
|               icon: const Icon(Icons.add), | ||||
|               label: const Text('Add option'), | ||||
|               label: Text('pollAddOption'.tr()), | ||||
|             ), | ||||
|           ), | ||||
|         ], | ||||
| @@ -937,8 +938,8 @@ class _QuestionTypePicker extends StatelessWidget { | ||||
|   Widget build(BuildContext context) { | ||||
|     return DropdownButtonFormField<SnPollQuestionType>( | ||||
|       value: value, | ||||
|       decoration: const InputDecoration( | ||||
|         labelText: 'Type', | ||||
|       decoration: InputDecoration( | ||||
|         labelText: 'Type'.tr(), | ||||
|         border: OutlineInputBorder( | ||||
|           borderRadius: BorderRadius.all(Radius.circular(16)), | ||||
|         ), | ||||
| @@ -987,8 +988,8 @@ class _OptionsEditor extends ConsumerWidget { | ||||
|                   child: TextFormField( | ||||
|                     key: ValueKey(options[i].id), | ||||
|                     initialValue: options[i].label, | ||||
|                     decoration: const InputDecoration( | ||||
|                       labelText: 'Option label', | ||||
|                     decoration: InputDecoration( | ||||
|                       labelText: 'pollOptionLabel'.tr(), | ||||
|                       border: OutlineInputBorder( | ||||
|                         borderRadius: BorderRadius.all(Radius.circular(16)), | ||||
|                       ), | ||||
| @@ -1003,7 +1004,7 @@ class _OptionsEditor extends ConsumerWidget { | ||||
|                 SizedBox( | ||||
|                   width: 40, | ||||
|                   child: IconButton( | ||||
|                     tooltip: 'Move up', | ||||
|                     tooltip: 'moveUp'.tr(), | ||||
|                     onPressed: | ||||
|                         i > 0 ? () => notifier.moveOptionUp(index, i) : null, | ||||
|                     icon: const Icon(Icons.arrow_upward), | ||||
| @@ -1012,7 +1013,7 @@ class _OptionsEditor extends ConsumerWidget { | ||||
|                 SizedBox( | ||||
|                   width: 40, | ||||
|                   child: IconButton( | ||||
|                     tooltip: 'Move down', | ||||
|                     tooltip: 'moveDown'.tr(), | ||||
|                     onPressed: | ||||
|                         i < options.length - 1 | ||||
|                             ? () => notifier.moveOptionDown(index, i) | ||||
| @@ -1023,7 +1024,7 @@ class _OptionsEditor extends ConsumerWidget { | ||||
|                 SizedBox( | ||||
|                   width: 40, | ||||
|                   child: IconButton( | ||||
|                     tooltip: 'Delete', | ||||
|                     tooltip: 'delete'.tr(), | ||||
|                     onPressed: () => notifier.removeOption(index, i), | ||||
|                     icon: const Icon(Icons.close), | ||||
|                   ), | ||||
| @@ -1048,7 +1049,7 @@ class _TextAnswerPreview extends StatelessWidget { | ||||
|       maxLines: long ? 4 : 1, | ||||
|       decoration: InputDecoration( | ||||
|         labelText: | ||||
|             long ? 'Long text answer (preview)' : 'Short text answer (preview)', | ||||
|             long ? 'pollLongTextAnswerPreview'.tr() : 'pollShortTextAnswerPreview'.tr(), | ||||
|         border: const OutlineInputBorder( | ||||
|           borderRadius: BorderRadius.all(Radius.circular(16)), | ||||
|         ), | ||||
| @@ -1082,9 +1083,9 @@ class _EmptyState extends StatelessWidget { | ||||
|             child: Column( | ||||
|               crossAxisAlignment: CrossAxisAlignment.start, | ||||
|               children: [ | ||||
|                 Text(title, style: Theme.of(context).textTheme.titleMedium), | ||||
|                 Text('pollNoQuestionsYet'.tr(), style: Theme.of(context).textTheme.titleMedium), | ||||
|                 const Gap(4), | ||||
|                 Text(subtitle, style: Theme.of(context).textTheme.bodyMedium), | ||||
|                 Text('pollNoQuestionsHint'.tr(), style: Theme.of(context).textTheme.bodyMedium), | ||||
|               ], | ||||
|             ), | ||||
|           ), | ||||
|   | ||||
| @@ -69,7 +69,7 @@ void showLoadingModal(BuildContext context) { | ||||
|                 child: Column( | ||||
|                   mainAxisSize: MainAxisSize.min, | ||||
|                   children: [ | ||||
|                     CircularProgressIndicator(year2023: true), | ||||
|                     CircularProgressIndicator(year2023: false), | ||||
|                     const Gap(24), | ||||
|                     Text('loading'.tr()), | ||||
|                   ], | ||||
|   | ||||
| @@ -31,6 +31,7 @@ class CloudFileList extends HookConsumerWidget { | ||||
|   final bool disableZoomIn; | ||||
|   final bool disableConstraint; | ||||
|   final EdgeInsets? padding; | ||||
|   final bool isColumn; | ||||
|   const CloudFileList({ | ||||
|     super.key, | ||||
|     required this.files, | ||||
| @@ -40,6 +41,7 @@ class CloudFileList extends HookConsumerWidget { | ||||
|     this.disableZoomIn = false, | ||||
|     this.disableConstraint = false, | ||||
|     this.padding, | ||||
|     this.isColumn = false, | ||||
|   }); | ||||
|  | ||||
|   double calculateAspectRatio() { | ||||
| @@ -63,6 +65,74 @@ class CloudFileList extends HookConsumerWidget { | ||||
|     ); | ||||
|  | ||||
|     if (files.isEmpty) return const SizedBox.shrink(); | ||||
|  | ||||
|     if (isColumn) { | ||||
|       final children = <Widget>[]; | ||||
|       const maxFiles = 2; | ||||
|       final filesToShow = files.take(maxFiles).toList(); | ||||
|  | ||||
|       for (var i = 0; i < filesToShow.length; i++) { | ||||
|         final file = filesToShow[i]; | ||||
|         final isImage = file.mimeType?.startsWith('image') ?? false; | ||||
|         final isAudio = file.mimeType?.startsWith('audio') ?? false; | ||||
|         final widgetItem = ClipRRect( | ||||
|           borderRadius: const BorderRadius.all(Radius.circular(8)), | ||||
|           child: _CloudFileListEntry( | ||||
|             file: file, | ||||
|             heroTag: heroTags[i], | ||||
|             isImage: isImage, | ||||
|             disableZoomIn: disableZoomIn, | ||||
|             onTap: () { | ||||
|               if (!isImage) { | ||||
|                 return; | ||||
|               } | ||||
|               if (!disableZoomIn) { | ||||
|                 context.pushTransparentRoute( | ||||
|                   CloudFileZoomIn(item: file, heroTag: heroTags[i]), | ||||
|                   rootNavigator: true, | ||||
|                 ); | ||||
|               } | ||||
|             }, | ||||
|           ), | ||||
|         ); | ||||
|  | ||||
|         Widget item; | ||||
|         if (isAudio) { | ||||
|           item = SizedBox(height: 120, child: widgetItem); | ||||
|         } else { | ||||
|           item = AspectRatio( | ||||
|             aspectRatio: file.fileMeta?['ratio'] as double? ?? 1.0, | ||||
|             child: widgetItem, | ||||
|           ); | ||||
|         } | ||||
|         children.add(item); | ||||
|         if (i < filesToShow.length - 1) { | ||||
|           children.add(const Gap(8)); | ||||
|         } | ||||
|       } | ||||
|  | ||||
|       if (files.length > maxFiles) { | ||||
|         children.add(const Gap(8)); | ||||
|         children.add( | ||||
|           Text( | ||||
|             'filesListAdditional'.plural(files.length - filesToShow.length), | ||||
|             textAlign: TextAlign.center, | ||||
|             style: Theme.of(context).textTheme.bodyMedium?.copyWith( | ||||
|               color: Theme.of(context).colorScheme.onSurface.withOpacity(0.7), | ||||
|             ), | ||||
|           ), | ||||
|         ); | ||||
|       } | ||||
|  | ||||
|       return Padding( | ||||
|         padding: padding ?? EdgeInsets.zero, | ||||
|         child: Column( | ||||
|           mainAxisSize: MainAxisSize.min, | ||||
|           crossAxisAlignment: CrossAxisAlignment.stretch, | ||||
|           children: children, | ||||
|         ), | ||||
|       ); | ||||
|     } | ||||
|     if (files.length == 1) { | ||||
|       final isImage = files.first.mimeType?.startsWith('image') ?? false; | ||||
|       final isAudio = files.first.mimeType?.startsWith('audio') ?? false; | ||||
|   | ||||
| @@ -1,9 +1,14 @@ | ||||
| import 'package:easy_localization/easy_localization.dart'; | ||||
| import 'package:flutter/material.dart'; | ||||
| import 'package:gap/gap.dart'; | ||||
| import 'package:hooks_riverpod/hooks_riverpod.dart'; | ||||
| import 'package:island/models/poll.dart'; | ||||
| import 'package:island/pods/network.dart'; | ||||
| import 'package:island/screens/creators/poll/poll_list.dart'; | ||||
| import 'package:island/services/time.dart'; | ||||
| import 'package:island/widgets/content/sheet.dart'; | ||||
| import 'package:island/widgets/poll/poll_stats_widget.dart'; | ||||
| import 'package:island/widgets/response.dart'; | ||||
| import 'package:riverpod_annotation/riverpod_annotation.dart'; | ||||
| import 'package:riverpod_paging_utils/riverpod_paging_utils.dart'; | ||||
| import 'package:styled_widget/styled_widget.dart'; | ||||
| @@ -52,59 +57,60 @@ class PollFeedbackNotifier extends _$PollFeedbackNotifier | ||||
| class PollFeedbackSheet extends HookConsumerWidget { | ||||
|   final String pollId; | ||||
|   final String? title; | ||||
|   final SnPoll poll; | ||||
|   final Map<String, dynamic>? stats; // stats object similar to PollSubmit | ||||
|   const PollFeedbackSheet({ | ||||
|     super.key, | ||||
|     required this.pollId, | ||||
|     required this.poll, | ||||
|     this.title, | ||||
|     this.stats, | ||||
|   }); | ||||
|   const PollFeedbackSheet({super.key, required this.pollId, this.title}); | ||||
|  | ||||
|   @override | ||||
|   Widget build(BuildContext context, WidgetRef ref) { | ||||
|     final poll = ref.watch(pollWithStatsProvider(pollId)); | ||||
|  | ||||
|     return SheetScaffold( | ||||
|       titleText: title ?? 'Poll feedback', | ||||
|       child: Column( | ||||
|         crossAxisAlignment: CrossAxisAlignment.stretch, | ||||
|         children: [ | ||||
|           _PollHeader(poll: poll, stats: stats), | ||||
|           const Divider(height: 1), | ||||
|           Expanded( | ||||
|             child: PagingHelperView( | ||||
|               provider: pollFeedbackNotifierProvider(pollId), | ||||
|               futureRefreshable: pollFeedbackNotifierProvider(pollId).future, | ||||
|               notifierRefreshable: | ||||
|                   pollFeedbackNotifierProvider(pollId).notifier, | ||||
|               contentBuilder: | ||||
|                   (data, widgetCount, endItemView) => ListView.separated( | ||||
|                     padding: const EdgeInsets.symmetric(vertical: 4), | ||||
|                     itemCount: widgetCount, | ||||
|                     itemBuilder: (context, index) { | ||||
|                       if (index == widgetCount - 1) { | ||||
|                         // Provided by PagingHelperView to indicate end/loading | ||||
|                         return endItemView; | ||||
|                       } | ||||
|                       final answer = data.items[index]; | ||||
|                       return _PollAnswerTile(answer: answer, poll: poll); | ||||
|                     }, | ||||
|                     separatorBuilder: | ||||
|                         (context, index) => | ||||
|                             const Divider(height: 1).padding(vertical: 4), | ||||
|                   ), | ||||
|       child: poll.when( | ||||
|         data: | ||||
|             (data) => CustomScrollView( | ||||
|               slivers: [ | ||||
|                 SliverToBoxAdapter(child: _PollHeader(poll: data)), | ||||
|                 SliverToBoxAdapter(child: const Divider(height: 1)), | ||||
|                 SliverGap(4), | ||||
|                 PagingHelperSliverView( | ||||
|                   provider: pollFeedbackNotifierProvider(pollId), | ||||
|                   futureRefreshable: | ||||
|                       pollFeedbackNotifierProvider(pollId).future, | ||||
|                   notifierRefreshable: | ||||
|                       pollFeedbackNotifierProvider(pollId).notifier, | ||||
|                   contentBuilder: | ||||
|                       (val, widgetCount, endItemView) => SliverList.separated( | ||||
|                         itemCount: widgetCount, | ||||
|                         itemBuilder: (context, index) { | ||||
|                           if (index == widgetCount - 1) { | ||||
|                             // Provided by PagingHelperView to indicate end/loading | ||||
|                             return endItemView; | ||||
|                           } | ||||
|                           final answer = val.items[index]; | ||||
|                           return _PollAnswerTile(answer: answer, poll: data); | ||||
|                         }, | ||||
|                         separatorBuilder: | ||||
|                             (context, index) => | ||||
|                                 const Divider(height: 1).padding(vertical: 4), | ||||
|                       ), | ||||
|                 ), | ||||
|                 SliverGap(4 + MediaQuery.of(context).padding.bottom), | ||||
|               ], | ||||
|             ), | ||||
|           ), | ||||
|         ], | ||||
|         error: | ||||
|             (err, _) => ResponseErrorWidget( | ||||
|               error: err, | ||||
|               onRetry: () => ref.invalidate(pollWithStatsProvider(pollId)), | ||||
|             ), | ||||
|         loading: () => ResponseLoadingWidget(), | ||||
|       ), | ||||
|     ); | ||||
|   } | ||||
| } | ||||
|  | ||||
| class _PollHeader extends StatelessWidget { | ||||
|   const _PollHeader({required this.poll, this.stats}); | ||||
|   final SnPoll poll; | ||||
|   final Map<String, dynamic>? stats; | ||||
|   const _PollHeader({required this.poll}); | ||||
|   final SnPollWithStats poll; | ||||
|  | ||||
|   @override | ||||
|   Widget build(BuildContext context) { | ||||
| @@ -112,18 +118,32 @@ class _PollHeader extends StatelessWidget { | ||||
|  | ||||
|     return Column( | ||||
|       crossAxisAlignment: CrossAxisAlignment.start, | ||||
|       spacing: 12, | ||||
|       children: [ | ||||
|         if (poll.title != null) | ||||
|           Text(poll.title!, style: theme.textTheme.titleLarge), | ||||
|         if (poll.description != null) | ||||
|           Padding( | ||||
|             padding: const EdgeInsets.only(top: 2), | ||||
|             child: Text( | ||||
|               poll.description!, | ||||
|               style: theme.textTheme.bodyMedium?.copyWith( | ||||
|                 color: theme.textTheme.bodyMedium?.color?.withOpacity(0.7), | ||||
|               ), | ||||
|             ), | ||||
|         if (poll.title != null || (poll.description?.isNotEmpty ?? false)) | ||||
|           Column( | ||||
|             crossAxisAlignment: CrossAxisAlignment.start, | ||||
|             children: [ | ||||
|               if (poll.title != null) | ||||
|                 Text(poll.title!, style: theme.textTheme.titleLarge), | ||||
|               if (poll.description?.isNotEmpty ?? false) | ||||
|                 Text( | ||||
|                   poll.description!, | ||||
|                   style: theme.textTheme.bodyMedium?.copyWith( | ||||
|                     color: theme.textTheme.bodyMedium?.color?.withOpacity(0.7), | ||||
|                   ), | ||||
|                 ), | ||||
|             ], | ||||
|           ), | ||||
|         Text('pollQuestions').tr().fontSize(17).bold(), | ||||
|         for (final q in poll.questions) | ||||
|           Column( | ||||
|             crossAxisAlignment: CrossAxisAlignment.start, | ||||
|             children: [ | ||||
|               if (q.title.isNotEmpty) Text(q.title).bold(), | ||||
|               if (q.description?.isNotEmpty ?? false) Text(q.description!), | ||||
|               PollStatsWidget(question: q, stats: poll.stats), | ||||
|             ], | ||||
|           ), | ||||
|       ], | ||||
|     ).padding(horizontal: 20, vertical: 16); | ||||
| @@ -132,7 +152,7 @@ class _PollHeader extends StatelessWidget { | ||||
|  | ||||
| class _PollAnswerTile extends StatelessWidget { | ||||
|   final SnPollAnswer answer; | ||||
|   final SnPoll poll; | ||||
|   final SnPollWithStats poll; | ||||
|   const _PollAnswerTile({required this.answer, required this.poll}); | ||||
|  | ||||
|   String _formatPerQuestionAnswer( | ||||
|   | ||||
							
								
								
									
										233
									
								
								lib/widgets/poll/poll_stats_widget.dart
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										233
									
								
								lib/widgets/poll/poll_stats_widget.dart
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,233 @@ | ||||
| import 'package:flutter/material.dart'; | ||||
| import 'package:island/models/poll.dart'; | ||||
|  | ||||
| class PollStatsWidget extends StatelessWidget { | ||||
|   const PollStatsWidget({ | ||||
|     super.key, | ||||
|     required this.question, | ||||
|     required this.stats, | ||||
|   }); | ||||
|  | ||||
|   final SnPollQuestion question; | ||||
|   final Map<String, dynamic>? stats; | ||||
|  | ||||
|   @override | ||||
|   Widget build(BuildContext context) { | ||||
|     if (stats == null) return const SizedBox.shrink(); | ||||
|     final raw = stats![question.id]; | ||||
|     if (raw == null) return const SizedBox.shrink(); | ||||
|  | ||||
|     Widget? body; | ||||
|  | ||||
|     switch (question.type) { | ||||
|       case SnPollQuestionType.rating: | ||||
|         // rating: avg score (double or int) | ||||
|         final avg = (raw['rating'] as num?)?.toDouble(); | ||||
|         if (avg == null) break; | ||||
|         final theme = Theme.of(context); | ||||
|         body = Row( | ||||
|           mainAxisAlignment: MainAxisAlignment.start, | ||||
|           children: [ | ||||
|             Icon(Icons.star, color: Colors.amber.shade600, size: 18), | ||||
|             const SizedBox(width: 6), | ||||
|             Text( | ||||
|               avg.toStringAsFixed(1), | ||||
|               style: theme.textTheme.labelMedium?.copyWith( | ||||
|                 color: theme.colorScheme.onSurfaceVariant, | ||||
|               ), | ||||
|             ), | ||||
|           ], | ||||
|         ); | ||||
|         break; | ||||
|  | ||||
|       case SnPollQuestionType.yesNo: | ||||
|         // yes/no: map {true: count, false: count} | ||||
|         if (raw is Map) { | ||||
|           final int yes = | ||||
|               (raw[true] is int) | ||||
|                   ? raw[true] as int | ||||
|                   : int.tryParse('${raw[true]}') ?? 0; | ||||
|           final int no = | ||||
|               (raw[false] is int) | ||||
|                   ? raw[false] as int | ||||
|                   : int.tryParse('${raw[false]}') ?? 0; | ||||
|           final total = (yes + no).clamp(0, 1 << 31); | ||||
|           final yesPct = total == 0 ? 0.0 : yes / total; | ||||
|           final noPct = total == 0 ? 0.0 : no / total; | ||||
|           final theme = Theme.of(context); | ||||
|           body = Column( | ||||
|             crossAxisAlignment: CrossAxisAlignment.start, | ||||
|             children: [ | ||||
|               _BarStatRow( | ||||
|                 label: 'Yes', | ||||
|                 count: yes, | ||||
|                 fraction: yesPct, | ||||
|                 color: Colors.green.shade600, | ||||
|               ), | ||||
|               const SizedBox(height: 6), | ||||
|               _BarStatRow( | ||||
|                 label: 'No', | ||||
|                 count: no, | ||||
|                 fraction: noPct, | ||||
|                 color: Colors.red.shade600, | ||||
|               ), | ||||
|               const SizedBox(height: 4), | ||||
|               Text( | ||||
|                 'Total: $total', | ||||
|                 style: theme.textTheme.labelSmall?.copyWith( | ||||
|                   color: theme.colorScheme.onSurfaceVariant, | ||||
|                 ), | ||||
|               ), | ||||
|             ], | ||||
|           ); | ||||
|         } | ||||
|         break; | ||||
|  | ||||
|       case SnPollQuestionType.singleChoice: | ||||
|       case SnPollQuestionType.multipleChoice: | ||||
|         // map optionId -> count | ||||
|         if (raw is Map) { | ||||
|           final options = [...?question.options] | ||||
|             ..sort((a, b) => a.order.compareTo(b.order)); | ||||
|           final List<_OptionCount> items = []; | ||||
|           int total = 0; | ||||
|           for (final opt in options) { | ||||
|             final dynamic v = raw[opt.id]; | ||||
|             final int count = v is int ? v : int.tryParse('$v') ?? 0; | ||||
|             total += count; | ||||
|             items.add(_OptionCount(id: opt.id, label: opt.label, count: count)); | ||||
|           } | ||||
|           if (items.isNotEmpty) { | ||||
|             items.sort( | ||||
|               (a, b) => b.count.compareTo(a.count), | ||||
|             ); // show highest first | ||||
|           } | ||||
|           body = Column( | ||||
|             crossAxisAlignment: CrossAxisAlignment.start, | ||||
|             children: [ | ||||
|               for (final it in items) | ||||
|                 Padding( | ||||
|                   padding: const EdgeInsets.only(bottom: 6), | ||||
|                   child: _BarStatRow( | ||||
|                     label: it.label, | ||||
|                     count: it.count, | ||||
|                     fraction: total == 0 ? 0 : it.count / total, | ||||
|                   ), | ||||
|                 ), | ||||
|               if (items.isNotEmpty) | ||||
|                 Text( | ||||
|                   'Total: $total', | ||||
|                   style: Theme.of(context).textTheme.labelSmall?.copyWith( | ||||
|                     color: Theme.of(context).colorScheme.onSurfaceVariant, | ||||
|                   ), | ||||
|                 ), | ||||
|             ], | ||||
|           ); | ||||
|         } | ||||
|         break; | ||||
|  | ||||
|       case SnPollQuestionType.freeText: | ||||
|         // No stats | ||||
|         break; | ||||
|     } | ||||
|  | ||||
|     if (body == null) return Text('No stats available'); | ||||
|  | ||||
|     return Padding( | ||||
|       padding: const EdgeInsets.only(top: 8), | ||||
|       child: DecoratedBox( | ||||
|         decoration: BoxDecoration( | ||||
|           color: Theme.of(context).colorScheme.surfaceVariant.withOpacity(0.35), | ||||
|           borderRadius: BorderRadius.circular(8), | ||||
|         ), | ||||
|         child: Padding( | ||||
|           padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10), | ||||
|           child: Column( | ||||
|             crossAxisAlignment: CrossAxisAlignment.start, | ||||
|             children: [ | ||||
|               Text( | ||||
|                 'Stats', | ||||
|                 style: Theme.of(context).textTheme.labelLarge?.copyWith( | ||||
|                   color: Theme.of(context).colorScheme.onSurfaceVariant, | ||||
|                 ), | ||||
|               ), | ||||
|               const SizedBox(height: 8), | ||||
|               body, | ||||
|             ], | ||||
|           ), | ||||
|         ), | ||||
|       ), | ||||
|     ); | ||||
|   } | ||||
| } | ||||
|  | ||||
| class _OptionCount { | ||||
|   final String id; | ||||
|   final String label; | ||||
|   final int count; | ||||
|   const _OptionCount({ | ||||
|     required this.id, | ||||
|     required this.label, | ||||
|     required this.count, | ||||
|   }); | ||||
| } | ||||
|  | ||||
| class _BarStatRow extends StatelessWidget { | ||||
|   const _BarStatRow({ | ||||
|     required this.label, | ||||
|     required this.count, | ||||
|     required this.fraction, | ||||
|     this.color, | ||||
|   }); | ||||
|  | ||||
|   final String label; | ||||
|   final int count; | ||||
|   final double fraction; | ||||
|   final Color? color; | ||||
|  | ||||
|   @override | ||||
|   Widget build(BuildContext context) { | ||||
|     final barColor = color ?? Theme.of(context).colorScheme.primary; | ||||
|     final bgColor = Theme.of( | ||||
|       context, | ||||
|     ).colorScheme.surfaceVariant.withOpacity(0.6); | ||||
|     final fg = | ||||
|         (fraction.isNaN || fraction.isInfinite) | ||||
|             ? 0.0 | ||||
|             : fraction.clamp(0.0, 1.0); | ||||
|  | ||||
|     return Column( | ||||
|       crossAxisAlignment: CrossAxisAlignment.start, | ||||
|       children: [ | ||||
|         Text('$label · $count', style: Theme.of(context).textTheme.labelMedium), | ||||
|         const SizedBox(height: 4), | ||||
|         LayoutBuilder( | ||||
|           builder: (context, constraints) { | ||||
|             final width = constraints.maxWidth; | ||||
|             final filled = width * fg; | ||||
|             return Stack( | ||||
|               children: [ | ||||
|                 Container( | ||||
|                   height: 8, | ||||
|                   width: width, | ||||
|                   decoration: BoxDecoration( | ||||
|                     color: bgColor, | ||||
|                     borderRadius: BorderRadius.circular(999), | ||||
|                   ), | ||||
|                 ), | ||||
|                 Container( | ||||
|                   height: 8, | ||||
|                   width: filled, | ||||
|                   decoration: BoxDecoration( | ||||
|                     color: barColor, | ||||
|                     borderRadius: BorderRadius.circular(999), | ||||
|                   ), | ||||
|                 ), | ||||
|               ], | ||||
|             ); | ||||
|           }, | ||||
|         ), | ||||
|       ], | ||||
|     ); | ||||
|   } | ||||
| } | ||||
| @@ -1,9 +1,11 @@ | ||||
| import 'package:flutter/material.dart'; | ||||
| import 'package:flutter/services.dart'; | ||||
| import 'package:easy_localization/easy_localization.dart'; | ||||
| import 'package:flutter_riverpod/flutter_riverpod.dart'; | ||||
| import 'package:island/models/poll.dart'; | ||||
| import 'package:island/pods/network.dart'; | ||||
| import 'package:island/widgets/alert.dart'; | ||||
| import 'package:island/widgets/poll/poll_stats_widget.dart'; | ||||
|  | ||||
| class PollSubmit extends ConsumerStatefulWidget { | ||||
|   const PollSubmit({ | ||||
| @@ -14,6 +16,7 @@ class PollSubmit extends ConsumerStatefulWidget { | ||||
|     this.initialAnswers, | ||||
|     this.onCancel, | ||||
|     this.showProgress = true, | ||||
|     this.isReadonly = false, | ||||
|   }); | ||||
|  | ||||
|   final SnPollWithStats poll; | ||||
| @@ -31,6 +34,8 @@ class PollSubmit extends ConsumerStatefulWidget { | ||||
|   /// Whether to show a progress indicator (e.g., "2 / N"). | ||||
|   final bool showProgress; | ||||
|  | ||||
|   final bool isReadonly; | ||||
|  | ||||
|   @override | ||||
|   ConsumerState<PollSubmit> createState() => _PollSubmitState(); | ||||
| } | ||||
| @@ -39,6 +44,7 @@ class _PollSubmitState extends ConsumerState<PollSubmit> { | ||||
|   late final List<SnPollQuestion> _questions; | ||||
|   int _index = 0; | ||||
|   bool _submitting = false; | ||||
|   bool _isModifying = false; // New state to track if user is modifying answers | ||||
|  | ||||
|   /// Collected answers, keyed by questionId | ||||
|   late Map<String, dynamic> _answers; | ||||
| @@ -59,7 +65,14 @@ class _PollSubmitState extends ConsumerState<PollSubmit> { | ||||
|     _questions = [...widget.poll.questions] | ||||
|       ..sort((a, b) => a.order.compareTo(b.order)); | ||||
|     _answers = Map<String, dynamic>.from(widget.initialAnswers ?? {}); | ||||
|     _loadCurrentIntoLocalState(); | ||||
|     if (!widget.isReadonly) { | ||||
|       _loadCurrentIntoLocalState(); | ||||
|       // If initial answers are provided, set _isModifying to false initially | ||||
|       // so the "Modify" button is shown. | ||||
|       if (widget.initialAnswers != null && widget.initialAnswers!.isNotEmpty) { | ||||
|         _isModifying = false; | ||||
|       } | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   @override | ||||
| @@ -74,7 +87,11 @@ class _PollSubmitState extends ConsumerState<PollSubmit> { | ||||
|           [...widget.poll.questions] | ||||
|             ..sort((a, b) => a.order.compareTo(b.order)), | ||||
|         ); | ||||
|       _loadCurrentIntoLocalState(); | ||||
|       if (!widget.isReadonly) { | ||||
|         _loadCurrentIntoLocalState(); | ||||
|         // If poll ID changes, reset modification state | ||||
|         _isModifying = false; | ||||
|       } | ||||
|     } | ||||
|   } | ||||
|  | ||||
| @@ -196,7 +213,7 @@ class _PollSubmitState extends ConsumerState<PollSubmit> { | ||||
|       // Only call onSubmit after server accepts | ||||
|       widget.onSubmit(Map<String, dynamic>.unmodifiable(_answers)); | ||||
|  | ||||
|       showSnackBar('Poll answer has been submitted.'); | ||||
|       showSnackBar('pollAnswerSubmitted'.tr()); | ||||
|       HapticFeedback.heavyImpact(); | ||||
|     } catch (e) { | ||||
|       showErrorAlert(e); | ||||
| @@ -268,7 +285,8 @@ class _PollSubmitState extends ConsumerState<PollSubmit> { | ||||
|               ], | ||||
|             ), | ||||
|           ), | ||||
|         if (widget.showProgress) | ||||
|         if (widget.showProgress && | ||||
|             _isModifying) // Only show progress when modifying | ||||
|           Text( | ||||
|             '${_index + 1} / ${_questions.length}', | ||||
|             style: Theme.of(context).textTheme.labelMedium, | ||||
| @@ -310,154 +328,13 @@ class _PollSubmitState extends ConsumerState<PollSubmit> { | ||||
|   } | ||||
|  | ||||
|   Widget _buildStats(BuildContext context, SnPollQuestion q) { | ||||
|     if (widget.stats == null) return const SizedBox.shrink(); | ||||
|     final raw = widget.stats![q.id]; | ||||
|     if (raw == null) return const SizedBox.shrink(); | ||||
|  | ||||
|     Widget? body; | ||||
|  | ||||
|     switch (q.type) { | ||||
|       case SnPollQuestionType.rating: | ||||
|         // rating: avg score (double or int) | ||||
|         final avg = (raw['rating'] as num?)?.toDouble(); | ||||
|         if (avg == null) break; | ||||
|         final theme = Theme.of(context); | ||||
|         body = Row( | ||||
|           mainAxisAlignment: MainAxisAlignment.start, | ||||
|           children: [ | ||||
|             Icon(Icons.star, color: Colors.amber.shade600, size: 18), | ||||
|             const SizedBox(width: 6), | ||||
|             Text( | ||||
|               avg.toStringAsFixed(1), | ||||
|               style: theme.textTheme.labelMedium?.copyWith( | ||||
|                 color: theme.colorScheme.onSurfaceVariant, | ||||
|               ), | ||||
|             ), | ||||
|           ], | ||||
|         ); | ||||
|         break; | ||||
|  | ||||
|       case SnPollQuestionType.yesNo: | ||||
|         // yes/no: map {true: count, false: count} | ||||
|         if (raw is Map) { | ||||
|           final int yes = | ||||
|               (raw[true] is int) | ||||
|                   ? raw[true] as int | ||||
|                   : int.tryParse('${raw[true]}') ?? 0; | ||||
|           final int no = | ||||
|               (raw[false] is int) | ||||
|                   ? raw[false] as int | ||||
|                   : int.tryParse('${raw[false]}') ?? 0; | ||||
|           final total = (yes + no).clamp(0, 1 << 31); | ||||
|           final yesPct = total == 0 ? 0.0 : yes / total; | ||||
|           final noPct = total == 0 ? 0.0 : no / total; | ||||
|           final theme = Theme.of(context); | ||||
|           body = Column( | ||||
|             crossAxisAlignment: CrossAxisAlignment.start, | ||||
|             children: [ | ||||
|               _BarStatRow( | ||||
|                 label: 'Yes', | ||||
|                 count: yes, | ||||
|                 fraction: yesPct, | ||||
|                 color: Colors.green.shade600, | ||||
|               ), | ||||
|               const SizedBox(height: 6), | ||||
|               _BarStatRow( | ||||
|                 label: 'No', | ||||
|                 count: no, | ||||
|                 fraction: noPct, | ||||
|                 color: Colors.red.shade600, | ||||
|               ), | ||||
|               const SizedBox(height: 4), | ||||
|               Text( | ||||
|                 'Total: $total', | ||||
|                 style: theme.textTheme.labelSmall?.copyWith( | ||||
|                   color: theme.colorScheme.onSurfaceVariant, | ||||
|                 ), | ||||
|               ), | ||||
|             ], | ||||
|           ); | ||||
|         } | ||||
|         break; | ||||
|  | ||||
|       case SnPollQuestionType.singleChoice: | ||||
|       case SnPollQuestionType.multipleChoice: | ||||
|         // map optionId -> count | ||||
|         if (raw is Map) { | ||||
|           final options = [...?q.options] | ||||
|             ..sort((a, b) => a.order.compareTo(b.order)); | ||||
|           final List<_OptionCount> items = []; | ||||
|           int total = 0; | ||||
|           for (final opt in options) { | ||||
|             final dynamic v = raw[opt.id]; | ||||
|             final int count = v is int ? v : int.tryParse('$v') ?? 0; | ||||
|             total += count; | ||||
|             items.add(_OptionCount(id: opt.id, label: opt.label, count: count)); | ||||
|           } | ||||
|           if (items.isNotEmpty) { | ||||
|             items.sort( | ||||
|               (a, b) => b.count.compareTo(a.count), | ||||
|             ); // show highest first | ||||
|           } | ||||
|           body = Column( | ||||
|             crossAxisAlignment: CrossAxisAlignment.start, | ||||
|             children: [ | ||||
|               for (final it in items) | ||||
|                 Padding( | ||||
|                   padding: const EdgeInsets.only(bottom: 6), | ||||
|                   child: _BarStatRow( | ||||
|                     label: it.label, | ||||
|                     count: it.count, | ||||
|                     fraction: total == 0 ? 0 : it.count / total, | ||||
|                   ), | ||||
|                 ), | ||||
|               if (items.isNotEmpty) | ||||
|                 Text( | ||||
|                   'Total: $total', | ||||
|                   style: Theme.of(context).textTheme.labelSmall?.copyWith( | ||||
|                     color: Theme.of(context).colorScheme.onSurfaceVariant, | ||||
|                   ), | ||||
|                 ), | ||||
|             ], | ||||
|           ); | ||||
|         } | ||||
|         break; | ||||
|  | ||||
|       case SnPollQuestionType.freeText: | ||||
|         // No stats | ||||
|         break; | ||||
|     } | ||||
|  | ||||
|     if (body == null) return const SizedBox.shrink(); | ||||
|  | ||||
|     return Padding( | ||||
|       padding: const EdgeInsets.only(top: 8), | ||||
|       child: DecoratedBox( | ||||
|         decoration: BoxDecoration( | ||||
|           color: Theme.of(context).colorScheme.surfaceVariant.withOpacity(0.35), | ||||
|           borderRadius: BorderRadius.circular(8), | ||||
|         ), | ||||
|         child: Padding( | ||||
|           padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10), | ||||
|           child: Column( | ||||
|             crossAxisAlignment: CrossAxisAlignment.start, | ||||
|             children: [ | ||||
|               Text( | ||||
|                 'Stats', | ||||
|                 style: Theme.of(context).textTheme.labelLarge?.copyWith( | ||||
|                   color: Theme.of(context).colorScheme.onSurfaceVariant, | ||||
|                 ), | ||||
|               ), | ||||
|               const SizedBox(height: 8), | ||||
|               body, | ||||
|             ], | ||||
|           ), | ||||
|         ), | ||||
|       ), | ||||
|     ); | ||||
|     return PollStatsWidget(question: q, stats: widget.stats); | ||||
|   } | ||||
|  | ||||
|   Widget _buildBody(BuildContext context) { | ||||
|     if (widget.initialAnswers != null && !widget.isReadonly && !_isModifying) { | ||||
|       return const SizedBox.shrink(); // Collapse input fields if already submitted and not modifying | ||||
|     } | ||||
|     final q = _current; | ||||
|     switch (q.type) { | ||||
|       case SnPollQuestionType.singleChoice: | ||||
| @@ -517,9 +394,9 @@ class _PollSubmitState extends ConsumerState<PollSubmit> { | ||||
|       children: [ | ||||
|         Expanded( | ||||
|           child: SegmentedButton<bool>( | ||||
|             segments: const [ | ||||
|               ButtonSegment(value: true, label: Text('Yes')), | ||||
|               ButtonSegment(value: false, label: Text('No')), | ||||
|             segments: [ | ||||
|               ButtonSegment(value: true, label: Text('yes'.tr())), | ||||
|               ButtonSegment(value: false, label: Text('no'.tr())), | ||||
|             ], | ||||
|             selected: _yesNoSelected == null ? {} : {_yesNoSelected!}, | ||||
|             onSelectionChanged: (sel) { | ||||
| @@ -568,12 +445,39 @@ class _PollSubmitState extends ConsumerState<PollSubmit> { | ||||
|     final isLast = _index == _questions.length - 1; | ||||
|     final canProceed = _isCurrentAnswered() && !_submitting; | ||||
|  | ||||
|     if (widget.initialAnswers != null && !_isModifying && !widget.isReadonly) { | ||||
|       // If poll is submitted and not in modification mode, show "Modify" button | ||||
|       return FilledButton.icon( | ||||
|         icon: const Icon(Icons.edit), | ||||
|         label: Text('modifyAnswers'.tr()), | ||||
|         onPressed: () { | ||||
|           setState(() { | ||||
|             _isModifying = true; | ||||
|             _index = 0; // Reset to first question for modification | ||||
|             _loadCurrentIntoLocalState(); | ||||
|           }); | ||||
|         }, | ||||
|       ); | ||||
|     } | ||||
|  | ||||
|     return Row( | ||||
|       children: [ | ||||
|         OutlinedButton.icon( | ||||
|           icon: const Icon(Icons.arrow_back), | ||||
|           label: Text(_index == 0 ? 'Cancel' : 'Back'), | ||||
|           onPressed: _submitting ? null : _back, | ||||
|           label: Text(_index == 0 ? 'cancel'.tr() : 'back'.tr()), | ||||
|           onPressed: | ||||
|               _submitting | ||||
|                   ? null | ||||
|                   : () { | ||||
|                     if (_index == 0 && _isModifying) { | ||||
|                       // If at first question and in modification mode, go back to submitted view | ||||
|                       setState(() { | ||||
|                         _isModifying = false; | ||||
|                       }); | ||||
|                     } else { | ||||
|                       _back(); | ||||
|                     } | ||||
|                   }, | ||||
|         ), | ||||
|         const Spacer(), | ||||
|         FilledButton.icon( | ||||
| @@ -585,19 +489,188 @@ class _PollSubmitState extends ConsumerState<PollSubmit> { | ||||
|                     child: CircularProgressIndicator(strokeWidth: 2), | ||||
|                   ) | ||||
|                   : Icon(isLast ? Icons.check : Icons.arrow_forward), | ||||
|           label: Text(isLast ? 'Submit' : 'Next'), | ||||
|           label: Text(isLast ? 'submit'.tr() : 'next'.tr()), | ||||
|           onPressed: canProceed ? _next : null, | ||||
|         ), | ||||
|       ], | ||||
|     ); | ||||
|   } | ||||
|  | ||||
|   Widget _buildSubmittedView(BuildContext context) { | ||||
|     return Column( | ||||
|       crossAxisAlignment: CrossAxisAlignment.start, | ||||
|       children: [ | ||||
|         if (widget.poll.title != null || widget.poll.description != null) | ||||
|           Padding( | ||||
|             padding: const EdgeInsets.only(bottom: 12), | ||||
|             child: Column( | ||||
|               crossAxisAlignment: CrossAxisAlignment.start, | ||||
|               children: [ | ||||
|                 if (widget.poll.title?.isNotEmpty ?? false) | ||||
|                   Text( | ||||
|                     widget.poll.title!, | ||||
|                     style: Theme.of(context).textTheme.titleLarge, | ||||
|                   ), | ||||
|                 if (widget.poll.description?.isNotEmpty ?? false) | ||||
|                   Padding( | ||||
|                     padding: const EdgeInsets.only(top: 4), | ||||
|                     child: Text( | ||||
|                       widget.poll.description!, | ||||
|                       style: Theme.of(context).textTheme.bodyMedium?.copyWith( | ||||
|                         color: Theme.of( | ||||
|                           context, | ||||
|                         ).textTheme.bodyMedium?.color?.withOpacity(0.7), | ||||
|                       ), | ||||
|                     ), | ||||
|                   ), | ||||
|               ], | ||||
|             ), | ||||
|           ), | ||||
|         for (final q in _questions) | ||||
|           Padding( | ||||
|             padding: const EdgeInsets.only(bottom: 16.0), | ||||
|             child: Column( | ||||
|               crossAxisAlignment: CrossAxisAlignment.start, | ||||
|               children: [ | ||||
|                 Row( | ||||
|                   children: [ | ||||
|                     Expanded( | ||||
|                       child: Text( | ||||
|                         q.title, | ||||
|                         style: Theme.of(context).textTheme.titleMedium, | ||||
|                       ), | ||||
|                     ), | ||||
|                     if (q.isRequired) | ||||
|                       Padding( | ||||
|                         padding: const EdgeInsets.only(left: 8), | ||||
|                         child: Text( | ||||
|                           '*', | ||||
|                           style: Theme.of( | ||||
|                             context, | ||||
|                           ).textTheme.titleMedium?.copyWith( | ||||
|                             color: Theme.of(context).colorScheme.error, | ||||
|                           ), | ||||
|                         ), | ||||
|                       ), | ||||
|                   ], | ||||
|                 ), | ||||
|                 if (q.description != null) | ||||
|                   Padding( | ||||
|                     padding: const EdgeInsets.only(top: 4), | ||||
|                     child: Text( | ||||
|                       q.description!, | ||||
|                       style: Theme.of(context).textTheme.bodySmall?.copyWith( | ||||
|                         color: Theme.of( | ||||
|                           context, | ||||
|                         ).textTheme.bodySmall?.color?.withOpacity(0.7), | ||||
|                       ), | ||||
|                     ), | ||||
|                   ), | ||||
|                 _buildStats(context, q), | ||||
|               ], | ||||
|             ), | ||||
|           ), | ||||
|       ], | ||||
|     ); | ||||
|   } | ||||
|  | ||||
|   Widget _buildReadonlyView(BuildContext context) { | ||||
|     return Column( | ||||
|       crossAxisAlignment: CrossAxisAlignment.start, | ||||
|       children: [ | ||||
|         if (widget.poll.title != null || widget.poll.description != null) | ||||
|           Padding( | ||||
|             padding: const EdgeInsets.only(bottom: 12), | ||||
|             child: Column( | ||||
|               crossAxisAlignment: CrossAxisAlignment.start, | ||||
|               children: [ | ||||
|                 if (widget.poll.title != null) | ||||
|                   Text( | ||||
|                     widget.poll.title!, | ||||
|                     style: Theme.of(context).textTheme.titleLarge, | ||||
|                   ), | ||||
|                 if (widget.poll.description != null) | ||||
|                   Padding( | ||||
|                     padding: const EdgeInsets.only(top: 4), | ||||
|                     child: Text( | ||||
|                       widget.poll.description!, | ||||
|                       style: Theme.of(context).textTheme.bodyMedium?.copyWith( | ||||
|                         color: Theme.of( | ||||
|                           context, | ||||
|                         ).textTheme.bodyMedium?.color?.withOpacity(0.7), | ||||
|                       ), | ||||
|                     ), | ||||
|                   ), | ||||
|               ], | ||||
|             ), | ||||
|           ), | ||||
|         for (final q in _questions) | ||||
|           Padding( | ||||
|             padding: const EdgeInsets.only(bottom: 16.0), | ||||
|             child: Column( | ||||
|               crossAxisAlignment: CrossAxisAlignment.start, | ||||
|               children: [ | ||||
|                 Row( | ||||
|                   children: [ | ||||
|                     Expanded( | ||||
|                       child: Text( | ||||
|                         q.title, | ||||
|                         style: Theme.of(context).textTheme.titleMedium, | ||||
|                       ), | ||||
|                     ), | ||||
|                     if (q.isRequired) | ||||
|                       Padding( | ||||
|                         padding: const EdgeInsets.only(left: 8), | ||||
|                         child: Text( | ||||
|                           '*', | ||||
|                           style: Theme.of( | ||||
|                             context, | ||||
|                           ).textTheme.titleMedium?.copyWith( | ||||
|                             color: Theme.of(context).colorScheme.error, | ||||
|                           ), | ||||
|                         ), | ||||
|                       ), | ||||
|                   ], | ||||
|                 ), | ||||
|                 if (q.description != null) | ||||
|                   Padding( | ||||
|                     padding: const EdgeInsets.only(top: 4), | ||||
|                     child: Text( | ||||
|                       q.description!, | ||||
|                       style: Theme.of(context).textTheme.bodySmall?.copyWith( | ||||
|                         color: Theme.of( | ||||
|                           context, | ||||
|                         ).textTheme.bodySmall?.color?.withOpacity(0.7), | ||||
|                       ), | ||||
|                     ), | ||||
|                   ), | ||||
|                 _buildStats(context, q), | ||||
|               ], | ||||
|             ), | ||||
|           ), | ||||
|       ], | ||||
|     ); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   Widget build(BuildContext context) { | ||||
|     if (_questions.isEmpty) { | ||||
|       return const SizedBox.shrink(); | ||||
|     } | ||||
|  | ||||
|     // If poll is already submitted and not in readonly mode, and not in modification mode, show submitted view | ||||
|     if (widget.initialAnswers != null && !widget.isReadonly && !_isModifying) { | ||||
|       return Column( | ||||
|         crossAxisAlignment: CrossAxisAlignment.stretch, | ||||
|         children: [_buildSubmittedView(context), _buildNavBar(context)], | ||||
|       ); | ||||
|     } | ||||
|  | ||||
|     // If poll is in readonly mode, show readonly view | ||||
|     if (widget.isReadonly) { | ||||
|       return _buildReadonlyView(context); | ||||
|     } | ||||
|  | ||||
|     return Column( | ||||
|       crossAxisAlignment: CrossAxisAlignment.stretch, | ||||
|       children: [ | ||||
| @@ -617,77 +690,6 @@ class _PollSubmitState extends ConsumerState<PollSubmit> { | ||||
|   } | ||||
| } | ||||
|  | ||||
| class _OptionCount { | ||||
|   final String id; | ||||
|   final String label; | ||||
|   final int count; | ||||
|   const _OptionCount({ | ||||
|     required this.id, | ||||
|     required this.label, | ||||
|     required this.count, | ||||
|   }); | ||||
| } | ||||
|  | ||||
| class _BarStatRow extends StatelessWidget { | ||||
|   const _BarStatRow({ | ||||
|     required this.label, | ||||
|     required this.count, | ||||
|     required this.fraction, | ||||
|     this.color, | ||||
|   }); | ||||
|  | ||||
|   final String label; | ||||
|   final int count; | ||||
|   final double fraction; | ||||
|   final Color? color; | ||||
|  | ||||
|   @override | ||||
|   Widget build(BuildContext context) { | ||||
|     final barColor = color ?? Theme.of(context).colorScheme.primary; | ||||
|     final bgColor = Theme.of( | ||||
|       context, | ||||
|     ).colorScheme.surfaceVariant.withOpacity(0.6); | ||||
|     final fg = | ||||
|         (fraction.isNaN || fraction.isInfinite) | ||||
|             ? 0.0 | ||||
|             : fraction.clamp(0.0, 1.0); | ||||
|  | ||||
|     return Column( | ||||
|       crossAxisAlignment: CrossAxisAlignment.start, | ||||
|       children: [ | ||||
|         Text('$label · $count', style: Theme.of(context).textTheme.labelMedium), | ||||
|         const SizedBox(height: 4), | ||||
|         LayoutBuilder( | ||||
|           builder: (context, constraints) { | ||||
|             final width = constraints.maxWidth; | ||||
|             final filled = width * fg; | ||||
|             return Stack( | ||||
|               children: [ | ||||
|                 Container( | ||||
|                   height: 8, | ||||
|                   width: width, | ||||
|                   decoration: BoxDecoration( | ||||
|                     color: bgColor, | ||||
|                     borderRadius: BorderRadius.circular(999), | ||||
|                   ), | ||||
|                 ), | ||||
|                 Container( | ||||
|                   height: 8, | ||||
|                   width: filled, | ||||
|                   decoration: BoxDecoration( | ||||
|                     color: barColor, | ||||
|                     borderRadius: BorderRadius.circular(999), | ||||
|                   ), | ||||
|                 ), | ||||
|               ], | ||||
|             ); | ||||
|           }, | ||||
|         ), | ||||
|       ], | ||||
|     ); | ||||
|   } | ||||
| } | ||||
|  | ||||
| /// Simple fade/slide transition between questions. | ||||
| class _AnimatedStep extends StatelessWidget { | ||||
|   const _AnimatedStep({super.key, required this.child}); | ||||
|   | ||||
| @@ -186,10 +186,9 @@ class ComposePollSheet extends HookConsumerWidget { | ||||
|     ); | ||||
|   } | ||||
|  | ||||
|   Widget? _buildPollSubtitle(SnPoll poll) { | ||||
|   Widget? _buildPollSubtitle(SnPollWithStats poll) { | ||||
|     try { | ||||
|       final SnPoll dyn = poll; | ||||
|       final List<SnPollQuestion> options = dyn.questions; | ||||
|       final List<SnPollQuestion> options = poll.questions; | ||||
|       if (options.isEmpty) return null; | ||||
|       final preview = options.take(3).map((e) => e.title).join(' · '); | ||||
|       if (preview.trim().isEmpty) return null; | ||||
|   | ||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -7,11 +7,9 @@ import 'package:island/models/post.dart'; | ||||
| import 'package:island/pods/network.dart'; | ||||
| import 'package:island/services/time.dart'; | ||||
| import 'package:island/widgets/alert.dart'; | ||||
| import 'package:island/widgets/content/cloud_file_collection.dart'; | ||||
| import 'package:island/widgets/content/markdown.dart'; | ||||
| import 'package:island/widgets/post/post_item.dart'; | ||||
| import 'package:island/widgets/post/post_shared.dart'; | ||||
| import 'package:material_symbols_icons/symbols.dart'; | ||||
| import 'package:styled_widget/styled_widget.dart'; | ||||
| import 'package:super_context_menu/super_context_menu.dart'; | ||||
|  | ||||
| class PostItemCreator extends HookConsumerWidget { | ||||
| @@ -81,7 +79,6 @@ class PostItemCreator extends HookConsumerWidget { | ||||
|               title: 'copyLink'.tr(), | ||||
|               image: MenuImage.icon(Symbols.link), | ||||
|               callback: () { | ||||
|                 // Copy post link to clipboard | ||||
|                 context.pushNamed( | ||||
|                   'postDetail', | ||||
|                   pathParameters: {'id': item.id}, | ||||
| @@ -105,8 +102,9 @@ class PostItemCreator extends HookConsumerWidget { | ||||
|             child: Column( | ||||
|               crossAxisAlignment: CrossAxisAlignment.start, | ||||
|               children: [ | ||||
|                 _buildPostHeader(context), | ||||
|                 _buildPostContent(context), | ||||
|                 PostHeader(item: item), | ||||
|                 PostBody(item: item), | ||||
|                 ReferencedPostWidget(item: item), | ||||
|                 const Gap(16), | ||||
|                 _buildAnalyticsSection(context), | ||||
|               ], | ||||
| @@ -117,128 +115,12 @@ class PostItemCreator extends HookConsumerWidget { | ||||
|     ); | ||||
|   } | ||||
|  | ||||
|   Widget _buildPostHeader(BuildContext context) { | ||||
|     return Column( | ||||
|       crossAxisAlignment: CrossAxisAlignment.start, | ||||
|       children: [ | ||||
|         // Post ID and timestamp row | ||||
|         Row( | ||||
|           children: [ | ||||
|             Container( | ||||
|               padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), | ||||
|               decoration: BoxDecoration( | ||||
|                 color: Theme.of(context).colorScheme.primaryContainer, | ||||
|                 borderRadius: BorderRadius.circular(4), | ||||
|               ), | ||||
|               child: Text( | ||||
|                 'ID: ${item.id.substring(0, 6)}', | ||||
|                 style: TextStyle( | ||||
|                   fontSize: 12, | ||||
|                   fontWeight: FontWeight.bold, | ||||
|                   color: Theme.of(context).colorScheme.onPrimaryContainer, | ||||
|                 ), | ||||
|               ), | ||||
|             ), | ||||
|             const Spacer(), | ||||
|             Icon( | ||||
|               _getVisibilityIcon(item.visibility), | ||||
|               size: 16, | ||||
|               color: Theme.of(context).colorScheme.secondary, | ||||
|             ), | ||||
|             const SizedBox(width: 4), | ||||
|             Text( | ||||
|               _getVisibilityText(item.visibility).tr(), | ||||
|               style: TextStyle( | ||||
|                 fontSize: 12, | ||||
|                 color: Theme.of(context).colorScheme.secondary, | ||||
|               ), | ||||
|             ), | ||||
|             const Gap(8), | ||||
|             Text( | ||||
|               item.publishedAt?.formatSystem() ?? '', | ||||
|               style: TextStyle( | ||||
|                 fontSize: 12, | ||||
|                 color: Theme.of(context).colorScheme.secondary, | ||||
|               ), | ||||
|             ), | ||||
|           ], | ||||
|         ), | ||||
|         const Gap(8), | ||||
|  | ||||
|         // Title and description | ||||
|         if (item.title?.isNotEmpty ?? false) | ||||
|           Text( | ||||
|             item.title!, | ||||
|             style: Theme.of( | ||||
|               context, | ||||
|             ).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold), | ||||
|           ), | ||||
|         if (item.description?.isNotEmpty ?? false) | ||||
|           Text( | ||||
|             item.description!, | ||||
|             style: Theme.of(context).textTheme.bodyMedium?.copyWith( | ||||
|               color: Theme.of(context).colorScheme.onSurfaceVariant, | ||||
|             ), | ||||
|           ).padding(top: 4), | ||||
|       ], | ||||
|     ); | ||||
|   } | ||||
|  | ||||
|   Widget _buildPostContent(BuildContext context) { | ||||
|     return Column( | ||||
|       crossAxisAlignment: CrossAxisAlignment.start, | ||||
|       children: [ | ||||
|         // Content preview | ||||
|         if (item.content?.isNotEmpty ?? false) | ||||
|           Container( | ||||
|             margin: const EdgeInsets.only(top: 12), | ||||
|             child: MarkdownTextContent(content: item.content!), | ||||
|           ), | ||||
|  | ||||
|         // Attachments | ||||
|         if (item.attachments.isNotEmpty) | ||||
|           CloudFileList( | ||||
|             files: item.attachments, | ||||
|             maxWidth: MediaQuery.of(context).size.width * 0.85, | ||||
|             padding: EdgeInsets.only(top: 8), | ||||
|           ), | ||||
|  | ||||
|         // Reference post indicator | ||||
|         if (item.repliedPost != null || item.forwardedPost != null) | ||||
|           Container( | ||||
|             margin: const EdgeInsets.only(top: 8), | ||||
|             child: Row( | ||||
|               children: [ | ||||
|                 Icon( | ||||
|                   item.repliedPost != null ? Symbols.reply : Symbols.forward, | ||||
|                   size: 16, | ||||
|                   color: Theme.of(context).colorScheme.secondary, | ||||
|                 ), | ||||
|                 const Gap(4), | ||||
|                 Text( | ||||
|                   item.repliedPost != null | ||||
|                       ? 'repliedTo'.tr() | ||||
|                       : 'forwarded'.tr(), | ||||
|                   style: TextStyle( | ||||
|                     fontSize: 12, | ||||
|                     color: Theme.of(context).colorScheme.secondary, | ||||
|                   ), | ||||
|                 ), | ||||
|               ], | ||||
|             ), | ||||
|           ), | ||||
|       ], | ||||
|     ); | ||||
|   } | ||||
|  | ||||
|   Widget _buildAnalyticsSection(BuildContext context) { | ||||
|     return Column( | ||||
|       crossAxisAlignment: CrossAxisAlignment.start, | ||||
|       children: [ | ||||
|         Text('Analytics', style: Theme.of(context).textTheme.titleSmall), | ||||
|         const Gap(8), | ||||
|  | ||||
|         // Engagement metrics in a card | ||||
|         Card( | ||||
|           elevation: 1, | ||||
|           margin: EdgeInsets.zero, | ||||
| @@ -279,15 +161,9 @@ class PostItemCreator extends HookConsumerWidget { | ||||
|           ), | ||||
|         ), | ||||
|         const Gap(16), | ||||
|  | ||||
|         // Reactions summary | ||||
|         if (item.reactionsCount.isNotEmpty) _buildReactionsSection(context), | ||||
|  | ||||
|         // Metadata section | ||||
|         if (item.meta != null && item.meta!.isNotEmpty) | ||||
|           _buildMetadataSection(context), | ||||
|  | ||||
|         // Creation and modification timestamps | ||||
|         const Gap(16), | ||||
|         Row( | ||||
|           mainAxisAlignment: MainAxisAlignment.spaceBetween, | ||||
| @@ -425,31 +301,3 @@ class PostItemCreator extends HookConsumerWidget { | ||||
|     ); | ||||
|   } | ||||
| } | ||||
|  | ||||
| // Helper method to get the appropriate icon for each visibility status | ||||
| IconData _getVisibilityIcon(int visibility) { | ||||
|   switch (visibility) { | ||||
|     case 1: // Friends | ||||
|       return Symbols.group; | ||||
|     case 2: // Unlisted | ||||
|       return Symbols.link_off; | ||||
|     case 3: // Private | ||||
|       return Symbols.lock; | ||||
|     default: // Public (0) or unknown | ||||
|       return Symbols.public; | ||||
|   } | ||||
| } | ||||
|  | ||||
| // Helper method to get the translation key for each visibility status | ||||
| String _getVisibilityText(int visibility) { | ||||
|   switch (visibility) { | ||||
|     case 1: // Friends | ||||
|       return 'postVisibilityFriends'; | ||||
|     case 2: // Unlisted | ||||
|       return 'postVisibilityUnlisted'; | ||||
|     case 3: // Private | ||||
|       return 'postVisibilityPrivate'; | ||||
|     default: // Public (0) or unknown | ||||
|       return 'postVisibilityPublic'; | ||||
|   } | ||||
| } | ||||
|   | ||||
							
								
								
									
										135
									
								
								lib/widgets/post/post_item_screenshot.dart
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										135
									
								
								lib/widgets/post/post_item_screenshot.dart
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,135 @@ | ||||
| import 'package:collection/collection.dart'; | ||||
| import 'package:easy_localization/easy_localization.dart'; | ||||
| import 'package:flutter/material.dart'; | ||||
| import 'package:gap/gap.dart'; | ||||
| import 'package:hooks_riverpod/hooks_riverpod.dart'; | ||||
| import 'package:island/models/post.dart'; | ||||
| import 'package:island/widgets/post/post_shared.dart'; | ||||
| import 'package:qr_flutter/qr_flutter.dart'; | ||||
| import 'package:styled_widget/styled_widget.dart'; | ||||
|  | ||||
| class PostItemScreenshot extends ConsumerWidget { | ||||
|   final SnPost item; | ||||
|   final EdgeInsets? padding; | ||||
|   final bool isFullPost; | ||||
|   final bool isShowReference; | ||||
|   const PostItemScreenshot({ | ||||
|     super.key, | ||||
|     required this.item, | ||||
|     this.padding, | ||||
|     this.isFullPost = false, | ||||
|     this.isShowReference = true, | ||||
|   }); | ||||
|  | ||||
|   @override | ||||
|   Widget build(BuildContext context, WidgetRef ref) { | ||||
|     final renderingPadding = | ||||
|         padding ?? const EdgeInsets.symmetric(horizontal: 8, vertical: 8); | ||||
|  | ||||
|     final mostReaction = | ||||
|         item.reactionsCount.isEmpty | ||||
|             ? null | ||||
|             : item.reactionsCount.entries | ||||
|                 .sortedBy((e) => e.value) | ||||
|                 .map((e) => e.key) | ||||
|                 .last; | ||||
|  | ||||
|     final isDark = MediaQuery.of(context).platformBrightness == Brightness.dark; | ||||
|  | ||||
|     return Material( | ||||
|       elevation: 0, | ||||
|       color: Theme.of(context).colorScheme.surface, | ||||
|       child: Column( | ||||
|         mainAxisSize: MainAxisSize.min, | ||||
|         crossAxisAlignment: CrossAxisAlignment.start, | ||||
|         children: [ | ||||
|           Gap(renderingPadding.vertical), | ||||
|           PostHeader( | ||||
|             item: item, | ||||
|             isFullPost: isFullPost, | ||||
|             isInteractive: false, | ||||
|             renderingPadding: renderingPadding, | ||||
|             isRelativeTime: false, | ||||
|             trailing: | ||||
|                 mostReaction != null | ||||
|                     ? Row( | ||||
|                       children: [ | ||||
|                         Text( | ||||
|                           kReactionTemplates[mostReaction]?.icon ?? '', | ||||
|                           style: const TextStyle(fontSize: 20), | ||||
|                         ), | ||||
|                         const Gap(4), | ||||
|                         Text( | ||||
|                           'x${item.reactionsCount[mostReaction]}', | ||||
|                           style: const TextStyle(fontSize: 11), | ||||
|                         ), | ||||
|                       ], | ||||
|                     ) | ||||
|                     : null, | ||||
|           ), | ||||
|           PostBody( | ||||
|             item: item, | ||||
|             renderingPadding: renderingPadding, | ||||
|             isFullPost: isFullPost, | ||||
|             isTextSelectable: false, | ||||
|             isInteractive: false, | ||||
|           ), | ||||
|           if (isShowReference) | ||||
|             ReferencedPostWidget( | ||||
|               item: item, | ||||
|               isInteractive: false, | ||||
|               renderingPadding: renderingPadding, | ||||
|             ), | ||||
|           Container( | ||||
|             color: Theme.of(context).colorScheme.surfaceContainerLow, | ||||
|             margin: const EdgeInsets.only(top: 8), | ||||
|             padding: EdgeInsets.symmetric( | ||||
|               horizontal: renderingPadding.horizontal, | ||||
|               vertical: 4, | ||||
|             ), | ||||
|             child: Row( | ||||
|               children: [ | ||||
|                 SizedBox( | ||||
|                   width: 44, | ||||
|                   height: 44, | ||||
|                   child: Image.asset( | ||||
|                     'assets/icons/icon${isDark ? '-dark' : ''}.png', | ||||
|                     width: 40, | ||||
|                     height: 40, | ||||
|                   ), | ||||
|                 ).padding(vertical: 8, right: 12), | ||||
|                 Expanded( | ||||
|                   child: Column( | ||||
|                     crossAxisAlignment: CrossAxisAlignment.start, | ||||
|                     children: [ | ||||
|                       const Text( | ||||
|                         'Solar Network', | ||||
|                         style: TextStyle( | ||||
|                           fontSize: 14, | ||||
|                           fontWeight: FontWeight.bold, | ||||
|                         ), | ||||
|                       ), | ||||
|                       const Text( | ||||
|                         'sharePostSlogan', | ||||
|                         style: TextStyle(fontSize: 12), | ||||
|                       ).tr().opacity(0.9), | ||||
|                     ], | ||||
|                   ), | ||||
|                 ), | ||||
|                 QrImageView( | ||||
|                   data: 'https://solian.app/posts/${item.id}', | ||||
|                   version: QrVersions.auto, | ||||
|                   size: 60, | ||||
|                   errorCorrectionLevel: QrErrorCorrectLevel.M, | ||||
|                   backgroundColor: Colors.transparent, | ||||
|                   foregroundColor: Theme.of(context).colorScheme.onSurface, | ||||
|                   padding: const EdgeInsets.all(8), | ||||
|                 ), | ||||
|               ], | ||||
|             ), | ||||
|           ), | ||||
|         ], | ||||
|       ), | ||||
|     ); | ||||
|   } | ||||
| } | ||||
							
								
								
									
										841
									
								
								lib/widgets/post/post_shared.dart
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										841
									
								
								lib/widgets/post/post_shared.dart
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,841 @@ | ||||
| import 'dart:math' as math; | ||||
| import 'package:easy_localization/easy_localization.dart'; | ||||
| import 'package:flutter/material.dart'; | ||||
| import 'package:flutter_hooks/flutter_hooks.dart'; | ||||
| import 'package:gap/gap.dart'; | ||||
| import 'package:go_router/go_router.dart'; | ||||
| import 'package:hooks_riverpod/hooks_riverpod.dart'; | ||||
| import 'package:island/models/embed.dart'; | ||||
| import 'package:island/models/poll.dart'; | ||||
| import 'package:island/models/post.dart'; | ||||
| import 'package:island/pods/network.dart'; | ||||
| import 'package:island/services/responsive.dart'; | ||||
| import 'package:island/services/time.dart'; | ||||
| import 'package:island/utils/mapping.dart'; | ||||
| import 'package:island/widgets/account/account_name.dart'; | ||||
| import 'package:island/widgets/alert.dart'; | ||||
| import 'package:island/widgets/content/cloud_file_collection.dart'; | ||||
| import 'package:island/widgets/content/cloud_files.dart'; | ||||
| import 'package:island/widgets/content/embed/link.dart'; | ||||
| import 'package:island/widgets/content/markdown.dart'; | ||||
| import 'package:island/widgets/poll/poll_submit.dart'; | ||||
| import 'package:island/widgets/post/post_replies_sheet.dart'; | ||||
| import 'package:material_symbols_icons/symbols.dart'; | ||||
| import 'package:riverpod_annotation/riverpod_annotation.dart'; | ||||
| import 'package:styled_widget/styled_widget.dart'; | ||||
|  | ||||
| part 'post_shared.g.dart'; | ||||
|  | ||||
| @riverpod | ||||
| Future<SnPost?> postFeaturedReply(Ref ref, String id) async { | ||||
|   final client = ref.watch(apiClientProvider); | ||||
|   try { | ||||
|     final resp = await client.get('/sphere/posts/$id/replies/featured'); | ||||
|     return SnPost.fromJson(resp.data); | ||||
|   } catch (_) { | ||||
|     return null; | ||||
|   } | ||||
| } | ||||
|  | ||||
| class PostVisibilityHelpers { | ||||
|   static IconData getVisibilityIcon(int visibility) { | ||||
|     switch (visibility) { | ||||
|       case 1: | ||||
|         return Symbols.group; | ||||
|       case 2: | ||||
|         return Symbols.link_off; | ||||
|       case 3: | ||||
|         return Symbols.lock; | ||||
|       default: | ||||
|         return Symbols.public; | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   static String getVisibilityText(int visibility) { | ||||
|     switch (visibility) { | ||||
|       case 1: | ||||
|         return 'postVisibilityFriends'; | ||||
|       case 2: | ||||
|         return 'postVisibilityUnlisted'; | ||||
|       case 3: | ||||
|         return 'postVisibilityPrivate'; | ||||
|       default: | ||||
|         return 'postVisibilityPublic'; | ||||
|     } | ||||
|   } | ||||
| } | ||||
|  | ||||
| class PostReplyPreview extends HookConsumerWidget { | ||||
|   final SnPost parent; | ||||
|   final bool isOpenable; | ||||
|   final bool isCompact; | ||||
|   final bool isAutoload; | ||||
|   final VoidCallback? onOpen; | ||||
|   const PostReplyPreview({ | ||||
|     super.key, | ||||
|     required this.parent, | ||||
|     this.isOpenable = false, | ||||
|     this.isCompact = false, | ||||
|     this.isAutoload = true, | ||||
|     this.onOpen, | ||||
|   }); | ||||
|  | ||||
|   @override | ||||
|   Widget build(BuildContext context, WidgetRef ref) { | ||||
|     final posts = useState<List<SnPost>>([]); | ||||
|     final loading = useState(false); | ||||
|  | ||||
|     Future<void> fetchMoreReplies({int pageSize = 3}) async { | ||||
|       final client = ref.read(apiClientProvider); | ||||
|       loading.value = true; | ||||
|  | ||||
|       try { | ||||
|         final response = await client.get( | ||||
|           '/sphere/posts/${parent.id}/replies', | ||||
|           queryParameters: {'offset': posts.value.length, 'take': pageSize}, | ||||
|         ); | ||||
|         try { | ||||
|           posts.value = [ | ||||
|             ...posts.value, | ||||
|             ...response.data.map((e) => SnPost.fromJson(e)), | ||||
|           ]; | ||||
|         } catch (_) { | ||||
|           // ignore disposed | ||||
|         } | ||||
|       } catch (err) { | ||||
|         showErrorAlert(err); | ||||
|       } finally { | ||||
|         try { | ||||
|           loading.value = false; | ||||
|         } catch (_) { | ||||
|           // ignore disposed | ||||
|         } | ||||
|       } | ||||
|     } | ||||
|  | ||||
|     useEffect(() { | ||||
|       if (isAutoload) fetchMoreReplies(); | ||||
|       return null; | ||||
|     }, [parent]); | ||||
|  | ||||
|     final featuredReply = | ||||
|         isOpenable ? null : ref.watch(PostFeaturedReplyProvider(parent.id)); | ||||
|  | ||||
|     final itemWidget = | ||||
|         isOpenable | ||||
|             ? Column( | ||||
|               children: [ | ||||
|                 for (final post in posts.value) | ||||
|                   Column( | ||||
|                     children: [ | ||||
|                       InkWell( | ||||
|                         child: Row( | ||||
|                           crossAxisAlignment: CrossAxisAlignment.start, | ||||
|                           spacing: 8, | ||||
|                           children: [ | ||||
|                             ProfilePictureWidget( | ||||
|                               file: post.publisher.picture, | ||||
|                               radius: 12, | ||||
|                             ).padding(top: 4), | ||||
|                             if (post.content?.isNotEmpty ?? false) | ||||
|                               Expanded( | ||||
|                                 child: MarkdownTextContent( | ||||
|                                   content: post.content!, | ||||
|                                 ).padding(top: 2), | ||||
|                               ) | ||||
|                             else | ||||
|                               Expanded( | ||||
|                                 child: Text( | ||||
|                                   'postHasAttachments', | ||||
|                                 ).plural(post.attachments.length), | ||||
|                               ), | ||||
|                           ], | ||||
|                         ), | ||||
|                         onTap: () { | ||||
|                           onOpen?.call(); | ||||
|                           context.pushNamed( | ||||
|                             'postDetail', | ||||
|                             pathParameters: {'id': post.id}, | ||||
|                           ); | ||||
|                         }, | ||||
|                       ), | ||||
|                       if (post.repliesCount > 0) | ||||
|                         PostReplyPreview( | ||||
|                           parent: post, | ||||
|                           isOpenable: true, | ||||
|                           isCompact: true, | ||||
|                           isAutoload: false, | ||||
|                           onOpen: onOpen, | ||||
|                         ).padding(left: 24), | ||||
|                     ], | ||||
|                   ), | ||||
|                 if (loading.value) | ||||
|                   Row( | ||||
|                     spacing: 8, | ||||
|                     children: [ | ||||
|                       SizedBox( | ||||
|                         width: 16, | ||||
|                         height: 16, | ||||
|                         child: CircularProgressIndicator(), | ||||
|                       ), | ||||
|                       Text('loading').tr(), | ||||
|                     ], | ||||
|                   ) | ||||
|                 else if (posts.value.length < parent.repliesCount) | ||||
|                   InkWell( | ||||
|                     child: Row( | ||||
|                       spacing: 8, | ||||
|                       children: [ | ||||
|                         const Icon(Symbols.keyboard_arrow_down, size: 20), | ||||
|                         Text('repliesLoadMore').tr(), | ||||
|                       ], | ||||
|                     ), | ||||
|                     onTap: () { | ||||
|                       fetchMoreReplies(); | ||||
|                     }, | ||||
|                   ), | ||||
|               ], | ||||
|             ) | ||||
|             : (featuredReply!).map( | ||||
|               data: | ||||
|                   (data) => Row( | ||||
|                     crossAxisAlignment: CrossAxisAlignment.center, | ||||
|                     spacing: 8, | ||||
|                     children: [ | ||||
|                       ProfilePictureWidget( | ||||
|                         file: data.value?.publisher.picture, | ||||
|                         radius: 12, | ||||
|                       ).padding(top: 4), | ||||
|                       if (data.value?.content?.isNotEmpty ?? false) | ||||
|                         Expanded( | ||||
|                           child: MarkdownTextContent( | ||||
|                             content: data.value!.content!, | ||||
|                           ), | ||||
|                         ) | ||||
|                       else | ||||
|                         Expanded( | ||||
|                           child: Text( | ||||
|                             'postHasAttachments', | ||||
|                           ).plural(data.value?.attachments.length ?? 0), | ||||
|                         ), | ||||
|                     ], | ||||
|                   ), | ||||
|               error: | ||||
|                   (e) => Row( | ||||
|                     spacing: 8, | ||||
|                     children: [ | ||||
|                       const Icon(Symbols.close, size: 18), | ||||
|                       Text(e.error.toString()), | ||||
|                     ], | ||||
|                   ), | ||||
|               loading: | ||||
|                   (_) => Row( | ||||
|                     spacing: 8, | ||||
|                     children: [ | ||||
|                       SizedBox( | ||||
|                         width: 16, | ||||
|                         height: 16, | ||||
|                         child: CircularProgressIndicator(), | ||||
|                       ), | ||||
|                       Text('loading').tr(), | ||||
|                     ], | ||||
|                   ), | ||||
|             ); | ||||
|  | ||||
|     final contentWidget = | ||||
|         isCompact | ||||
|             ? itemWidget | ||||
|             : Container( | ||||
|               padding: EdgeInsets.symmetric(horizontal: 16, vertical: 12), | ||||
|               decoration: BoxDecoration( | ||||
|                 color: Theme.of(context).colorScheme.surfaceContainerLow, | ||||
|                 border: Border.all( | ||||
|                   color: Theme.of(context).dividerColor.withOpacity(0.5), | ||||
|                 ), | ||||
|                 borderRadius: BorderRadius.all(Radius.circular(8)), | ||||
|               ), | ||||
|               child: Column( | ||||
|                 crossAxisAlignment: CrossAxisAlignment.stretch, | ||||
|                 spacing: 4, | ||||
|                 children: [ | ||||
|                   Text('repliesCount') | ||||
|                       .plural(parent.repliesCount) | ||||
|                       .fontSize(15) | ||||
|                       .bold() | ||||
|                       .padding(horizontal: 5), | ||||
|                   itemWidget, | ||||
|                 ], | ||||
|               ), | ||||
|             ); | ||||
|  | ||||
|     return InkWell( | ||||
|       borderRadius: const BorderRadius.all(Radius.circular(8)), | ||||
|       onTap: () { | ||||
|         showModalBottomSheet( | ||||
|           context: context, | ||||
|           isScrollControlled: true, | ||||
|           useRootNavigator: true, | ||||
|           builder: (context) => PostRepliesSheet(post: parent), | ||||
|         ); | ||||
|       }, | ||||
|       child: contentWidget, | ||||
|     ); | ||||
|   } | ||||
| } | ||||
|  | ||||
| class PostTruncateHint extends StatelessWidget { | ||||
|   final bool isCompact; | ||||
|   final EdgeInsets? margin; | ||||
|   final bool withArrow; | ||||
|  | ||||
|   const PostTruncateHint({ | ||||
|     super.key, | ||||
|     this.isCompact = false, | ||||
|     this.margin, | ||||
|     this.withArrow = false, | ||||
|   }); | ||||
|  | ||||
|   @override | ||||
|   Widget build(BuildContext context) { | ||||
|     return Container( | ||||
|       margin: margin ?? EdgeInsets.only(top: isCompact ? 4 : 8), | ||||
|       padding: EdgeInsets.symmetric( | ||||
|         horizontal: isCompact ? 8 : 12, | ||||
|         vertical: isCompact ? 4 : 8, | ||||
|       ), | ||||
|       decoration: BoxDecoration( | ||||
|         color: Theme.of(context).colorScheme.surfaceVariant.withOpacity(0.3), | ||||
|         borderRadius: BorderRadius.circular(8), | ||||
|         border: Border.all( | ||||
|           color: Theme.of(context).colorScheme.outline.withOpacity(0.2), | ||||
|         ), | ||||
|       ), | ||||
|       child: Row( | ||||
|         mainAxisSize: MainAxisSize.min, | ||||
|         children: [ | ||||
|           Icon( | ||||
|             Symbols.more_horiz, | ||||
|             size: isCompact ? 14 : 16, | ||||
|             color: Theme.of(context).colorScheme.secondary, | ||||
|           ), | ||||
|           SizedBox(width: isCompact ? 4 : 6), | ||||
|           Flexible( | ||||
|             child: Text( | ||||
|               'postTruncated'.tr(), | ||||
|               style: TextStyle( | ||||
|                 fontSize: isCompact ? 10 : 12, | ||||
|                 color: Theme.of(context).colorScheme.secondary, | ||||
|                 fontStyle: FontStyle.italic, | ||||
|               ), | ||||
|               maxLines: 1, | ||||
|               overflow: TextOverflow.ellipsis, | ||||
|             ), | ||||
|           ), | ||||
|           if (withArrow) ...[ | ||||
|             SizedBox(width: isCompact ? 3 : 4), | ||||
|             Icon( | ||||
|               Symbols.arrow_forward, | ||||
|               size: isCompact ? 12 : 14, | ||||
|               color: Theme.of(context).colorScheme.secondary, | ||||
|             ), | ||||
|           ], | ||||
|         ], | ||||
|       ), | ||||
|     ); | ||||
|   } | ||||
| } | ||||
|  | ||||
| class ReferencedPostWidget extends StatelessWidget { | ||||
|   final SnPost item; | ||||
|   final bool isInteractive; | ||||
|   final EdgeInsets renderingPadding; | ||||
|  | ||||
|   const ReferencedPostWidget({ | ||||
|     super.key, | ||||
|     required this.item, | ||||
|     this.isInteractive = true, | ||||
|     this.renderingPadding = EdgeInsets.zero, | ||||
|   }); | ||||
|  | ||||
|   @override | ||||
|   Widget build(BuildContext context) { | ||||
|     final referencePost = item.repliedPost ?? item.forwardedPost; | ||||
|     if (referencePost == null) return const SizedBox.shrink(); | ||||
|  | ||||
|     final isReply = item.repliedPost != null; | ||||
|  | ||||
|     final content = Container( | ||||
|       padding: EdgeInsets.symmetric( | ||||
|         horizontal: renderingPadding.horizontal, | ||||
|         vertical: 8, | ||||
|       ), | ||||
|       margin: EdgeInsets.only( | ||||
|         top: 8, | ||||
|         left: renderingPadding.vertical, | ||||
|         right: renderingPadding.vertical, | ||||
|       ), | ||||
|       decoration: BoxDecoration( | ||||
|         color: Theme.of(context).colorScheme.surfaceVariant.withOpacity(0.5), | ||||
|         borderRadius: BorderRadius.circular(12), | ||||
|         border: Border.all( | ||||
|           color: Theme.of(context).dividerColor.withOpacity(0.5), | ||||
|         ), | ||||
|       ), | ||||
|       child: Column( | ||||
|         crossAxisAlignment: CrossAxisAlignment.start, | ||||
|         children: [ | ||||
|           Row( | ||||
|             children: [ | ||||
|               Icon( | ||||
|                 isReply ? Symbols.reply : Symbols.forward, | ||||
|                 size: 16, | ||||
|                 color: Theme.of(context).colorScheme.secondary, | ||||
|               ), | ||||
|               const SizedBox(width: 6), | ||||
|               Text( | ||||
|                 isReply ? 'repliedTo'.tr() : 'forwarded'.tr(), | ||||
|                 style: TextStyle( | ||||
|                   color: Theme.of(context).colorScheme.secondary, | ||||
|                   fontWeight: FontWeight.w500, | ||||
|                   fontSize: 12, | ||||
|                 ), | ||||
|               ), | ||||
|             ], | ||||
|           ), | ||||
|           const SizedBox(height: 8), | ||||
|           Row( | ||||
|             crossAxisAlignment: CrossAxisAlignment.start, | ||||
|             children: [ | ||||
|               ProfilePictureWidget( | ||||
|                 fileId: referencePost.publisher.picture?.id, | ||||
|                 radius: 16, | ||||
|               ), | ||||
|               const SizedBox(width: 8), | ||||
|               Expanded( | ||||
|                 child: Column( | ||||
|                   crossAxisAlignment: CrossAxisAlignment.start, | ||||
|                   children: [ | ||||
|                     Text( | ||||
|                       referencePost.publisher.nick, | ||||
|                       style: const TextStyle( | ||||
|                         fontWeight: FontWeight.bold, | ||||
|                         fontSize: 14, | ||||
|                       ), | ||||
|                     ), | ||||
|                     if (referencePost.visibility != 0) | ||||
|                       Row( | ||||
|                         mainAxisSize: MainAxisSize.min, | ||||
|                         children: [ | ||||
|                           Icon( | ||||
|                             PostVisibilityHelpers.getVisibilityIcon( | ||||
|                               referencePost.visibility, | ||||
|                             ), | ||||
|                             size: 12, | ||||
|                             color: Theme.of(context).colorScheme.secondary, | ||||
|                           ), | ||||
|                           const SizedBox(width: 4), | ||||
|                           Text( | ||||
|                             PostVisibilityHelpers.getVisibilityText( | ||||
|                               referencePost.visibility, | ||||
|                             ).tr(), | ||||
|                             style: TextStyle( | ||||
|                               fontSize: 10, | ||||
|                               color: Theme.of(context).colorScheme.secondary, | ||||
|                             ), | ||||
|                           ), | ||||
|                         ], | ||||
|                       ).padding(top: 2, bottom: 2), | ||||
|                     if (referencePost.title?.isNotEmpty ?? false) | ||||
|                       Text( | ||||
|                         referencePost.title!, | ||||
|                         style: TextStyle( | ||||
|                           fontWeight: FontWeight.bold, | ||||
|                           fontSize: 13, | ||||
|                           color: Theme.of(context).colorScheme.onSurface, | ||||
|                         ), | ||||
|                       ).padding(top: 2, bottom: 2), | ||||
|                     if (referencePost.description?.isNotEmpty ?? false) | ||||
|                       Text( | ||||
|                         referencePost.description!, | ||||
|                         style: TextStyle( | ||||
|                           fontSize: 12, | ||||
|                           color: Theme.of(context).colorScheme.onSurfaceVariant, | ||||
|                         ), | ||||
|                         maxLines: 2, | ||||
|                         overflow: TextOverflow.ellipsis, | ||||
|                       ).padding(bottom: 2), | ||||
|                     if (referencePost.content?.isNotEmpty ?? false) | ||||
|                       MarkdownTextContent( | ||||
|                         content: referencePost.content!, | ||||
|                         textStyle: const TextStyle(fontSize: 14), | ||||
|                         isSelectable: false, | ||||
|                         linesMargin: | ||||
|                             referencePost.type == 0 | ||||
|                                 ? const EdgeInsets.only(bottom: 4) | ||||
|                                 : null, | ||||
|                         attachments: item.attachments, | ||||
|                       ).padding(bottom: 4), | ||||
|                     if (referencePost.isTruncated) | ||||
|                       const PostTruncateHint( | ||||
|                         isCompact: true, | ||||
|                         margin: EdgeInsets.only(top: 4, bottom: 8), | ||||
|                       ), | ||||
|                     if (referencePost.attachments.isNotEmpty && | ||||
|                         referencePost.type != 1) | ||||
|                       Row( | ||||
|                         mainAxisSize: MainAxisSize.min, | ||||
|                         children: [ | ||||
|                           Icon( | ||||
|                             Symbols.attach_file, | ||||
|                             size: 12, | ||||
|                             color: Theme.of(context).colorScheme.secondary, | ||||
|                           ), | ||||
|                           const SizedBox(width: 4), | ||||
|                           Text( | ||||
|                             'postHasAttachments'.plural( | ||||
|                               referencePost.attachments.length, | ||||
|                             ), | ||||
|                             style: TextStyle( | ||||
|                               color: Theme.of(context).colorScheme.secondary, | ||||
|                               fontSize: 12, | ||||
|                             ), | ||||
|                           ), | ||||
|                         ], | ||||
|                       ).padding(vertical: 2), | ||||
|                   ], | ||||
|                 ), | ||||
|               ), | ||||
|             ], | ||||
|           ), | ||||
|         ], | ||||
|       ), | ||||
|     ); | ||||
|  | ||||
|     if (!isInteractive) { | ||||
|       return content; | ||||
|     } | ||||
|  | ||||
|     return content.gestures( | ||||
|       onTap: | ||||
|           () => context.pushNamed( | ||||
|             'postDetail', | ||||
|             pathParameters: {'id': referencePost.id}, | ||||
|           ), | ||||
|     ); | ||||
|   } | ||||
| } | ||||
|  | ||||
| class PostHeader extends StatelessWidget { | ||||
|   final SnPost item; | ||||
|   final bool isFullPost; | ||||
|   final Widget? trailing; | ||||
|   final bool isInteractive; | ||||
|   final EdgeInsets renderingPadding; | ||||
|   final bool isRelativeTime; | ||||
|  | ||||
|   const PostHeader({ | ||||
|     super.key, | ||||
|     required this.item, | ||||
|     this.isFullPost = false, | ||||
|     this.trailing, | ||||
|     this.isInteractive = true, | ||||
|     this.renderingPadding = EdgeInsets.zero, | ||||
|     this.isRelativeTime = true, | ||||
|   }); | ||||
|  | ||||
|   @override | ||||
|   Widget build(BuildContext context) { | ||||
|     return Row( | ||||
|       crossAxisAlignment: CrossAxisAlignment.center, | ||||
|       spacing: 12, | ||||
|       children: [ | ||||
|         GestureDetector( | ||||
|           onTap: | ||||
|               isInteractive | ||||
|                   ? () { | ||||
|                     context.pushNamed( | ||||
|                       'publisherProfile', | ||||
|                       pathParameters: {'name': item.publisher.name}, | ||||
|                     ); | ||||
|                   } | ||||
|                   : null, | ||||
|           child: ProfilePictureWidget(file: item.publisher.picture, radius: 16), | ||||
|         ), | ||||
|         Expanded( | ||||
|           child: Column( | ||||
|             mainAxisSize: MainAxisSize.min, | ||||
|             crossAxisAlignment: CrossAxisAlignment.start, | ||||
|             children: [ | ||||
|               Row( | ||||
|                 spacing: 4, | ||||
|                 children: [ | ||||
|                   Text(item.publisher.nick).bold(), | ||||
|                   if (item.publisher.verification != null) | ||||
|                     VerificationMark(mark: item.publisher.verification!), | ||||
|                   Text('@${item.publisher.name}').fontSize(11), | ||||
|                 ], | ||||
|               ), | ||||
|               Row( | ||||
|                 spacing: 6, | ||||
|                 crossAxisAlignment: CrossAxisAlignment.end, | ||||
|                 children: [ | ||||
|                   Text( | ||||
|                     !isFullPost && isRelativeTime | ||||
|                         ? (item.publishedAt ?? item.createdAt)!.formatRelative( | ||||
|                           context, | ||||
|                         ) | ||||
|                         : (item.publishedAt ?? item.createdAt)!.formatSystem(), | ||||
|                   ).fontSize(10), | ||||
|                   if (item.editedAt != null) | ||||
|                     Text( | ||||
|                       'editedAt'.tr( | ||||
|                         args: [ | ||||
|                           !isFullPost && isRelativeTime | ||||
|                               ? item.editedAt!.formatRelative(context) | ||||
|                               : item.editedAt!.formatSystem(), | ||||
|                         ], | ||||
|                       ), | ||||
|                     ).fontSize(10), | ||||
|                   if (item.visibility != 0) | ||||
|                     Text( | ||||
|                       PostVisibilityHelpers.getVisibilityText( | ||||
|                         item.visibility, | ||||
|                       ).tr(), | ||||
|                     ).fontSize(10), | ||||
|                 ], | ||||
|               ), | ||||
|             ], | ||||
|           ), | ||||
|         ), | ||||
|         if (trailing != null) trailing!, | ||||
|       ], | ||||
|     ).padding(horizontal: renderingPadding.horizontal, bottom: 4); | ||||
|   } | ||||
| } | ||||
|  | ||||
| class PostBody extends ConsumerWidget { | ||||
|   final SnPost item; | ||||
|   final bool isFullPost; | ||||
|   final bool isTextSelectable; | ||||
|   final Widget? translationSection; | ||||
|   final bool isInteractive; | ||||
|   final EdgeInsets renderingPadding; | ||||
|  | ||||
|   const PostBody({ | ||||
|     super.key, | ||||
|     required this.item, | ||||
|     this.isFullPost = false, | ||||
|     this.isTextSelectable = true, | ||||
|     this.translationSection, | ||||
|     this.isInteractive = true, | ||||
|     this.renderingPadding = EdgeInsets.zero, | ||||
|   }); | ||||
|  | ||||
|   @override | ||||
|   Widget build(BuildContext context, WidgetRef ref) { | ||||
|     return Column( | ||||
|       crossAxisAlignment: CrossAxisAlignment.start, | ||||
|       children: [ | ||||
|         if (!isFullPost && item.type == 1) | ||||
|           Container( | ||||
|             decoration: BoxDecoration( | ||||
|               color: Theme.of(context).colorScheme.surfaceContainerHigh, | ||||
|               border: Border.all( | ||||
|                 color: Theme.of(context).dividerColor.withOpacity(0.5), | ||||
|               ), | ||||
|               borderRadius: const BorderRadius.all(Radius.circular(8)), | ||||
|             ), | ||||
|             padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), | ||||
|             margin: EdgeInsets.only( | ||||
|               top: 4, | ||||
|               left: renderingPadding.horizontal, | ||||
|               right: renderingPadding.vertical, | ||||
|             ), | ||||
|             child: Column( | ||||
|               mainAxisSize: MainAxisSize.min, | ||||
|               crossAxisAlignment: CrossAxisAlignment.stretch, | ||||
|               children: [ | ||||
|                 Align( | ||||
|                   alignment: Alignment.centerLeft, | ||||
|                   child: Badge( | ||||
|                     label: const Text('postArticle').tr(), | ||||
|                     backgroundColor: Theme.of(context).colorScheme.primary, | ||||
|                     textColor: Theme.of(context).colorScheme.onPrimary, | ||||
|                   ), | ||||
|                 ), | ||||
|                 const Gap(4), | ||||
|                 if (item.title != null) | ||||
|                   Text( | ||||
|                     item.title!, | ||||
|                     style: Theme.of(context).textTheme.titleMedium!.copyWith( | ||||
|                       fontWeight: FontWeight.bold, | ||||
|                     ), | ||||
|                   ), | ||||
|                 if (item.description != null) | ||||
|                   Text( | ||||
|                     item.description!, | ||||
|                     style: Theme.of(context).textTheme.bodyMedium, | ||||
|                   ) | ||||
|                 else | ||||
|                   MarkdownTextContent(content: '${item.content!}...'), | ||||
|               ], | ||||
|             ), | ||||
|           ) | ||||
|         else if ((item.content?.isNotEmpty ?? false) || | ||||
|             (item.title?.isNotEmpty ?? false) || | ||||
|             (item.description?.isNotEmpty ?? false)) | ||||
|           Padding( | ||||
|             padding: EdgeInsets.only( | ||||
|               left: renderingPadding.horizontal, | ||||
|               right: renderingPadding.horizontal, | ||||
|             ), | ||||
|             child: Column( | ||||
|               crossAxisAlignment: CrossAxisAlignment.stretch, | ||||
|               children: [ | ||||
|                 if ((item.title?.isNotEmpty ?? false) || | ||||
|                     (item.description?.isNotEmpty ?? false)) | ||||
|                   Column( | ||||
|                     crossAxisAlignment: CrossAxisAlignment.start, | ||||
|                     children: [ | ||||
|                       if (item.title?.isNotEmpty ?? false) | ||||
|                         Text( | ||||
|                           item.title!, | ||||
|                           style: Theme.of(context).textTheme.titleMedium! | ||||
|                               .copyWith(fontWeight: FontWeight.bold), | ||||
|                         ), | ||||
|                       if (item.description?.isNotEmpty ?? false) | ||||
|                         Text( | ||||
|                           item.description!, | ||||
|                           style: Theme.of(context).textTheme.bodyMedium, | ||||
|                         ), | ||||
|                     ], | ||||
|                   ).padding(bottom: 4), | ||||
|                 MarkdownTextContent( | ||||
|                   content: | ||||
|                       item.isTruncated ? '${item.content!}...' : item.content!, | ||||
|                   isSelectable: isTextSelectable, | ||||
|                 ), | ||||
|                 if (translationSection != null) translationSection!, | ||||
|               ], | ||||
|             ), | ||||
|           ), | ||||
|         if (item.isTruncated && item.type != 1) | ||||
|           PostTruncateHint( | ||||
|             isCompact: true, | ||||
|             withArrow: isInteractive, | ||||
|             margin: EdgeInsets.only( | ||||
|               top: 4, | ||||
|               bottom: 4, | ||||
|               left: renderingPadding.horizontal, | ||||
|               right: renderingPadding.horizontal, | ||||
|             ), | ||||
|           ), | ||||
|         if (item.attachments.isNotEmpty && item.type != 1) | ||||
|           CloudFileList( | ||||
|             files: item.attachments, | ||||
|             isColumn: !isInteractive, | ||||
|             padding: EdgeInsets.symmetric( | ||||
|               horizontal: renderingPadding.horizontal, | ||||
|               vertical: 4, | ||||
|             ), | ||||
|           ), | ||||
|         if (item.tags.isNotEmpty || item.categories.isNotEmpty) | ||||
|           Column( | ||||
|             mainAxisSize: MainAxisSize.min, | ||||
|             crossAxisAlignment: CrossAxisAlignment.start, | ||||
|             spacing: 2, | ||||
|             children: [ | ||||
|               if (item.tags.isNotEmpty) | ||||
|                 Wrap( | ||||
|                   runAlignment: WrapAlignment.center, | ||||
|                   spacing: 8, | ||||
|                   children: [ | ||||
|                     const Icon(Symbols.label, size: 16).padding(top: 2), | ||||
|                     for (final tag | ||||
|                         in isFullPost ? item.tags : item.tags.take(3)) | ||||
|                       InkWell( | ||||
|                         onTap: | ||||
|                             isInteractive | ||||
|                                 ? () { | ||||
|                                   GoRouter.of(context).pushNamed( | ||||
|                                     'postTagDetail', | ||||
|                                     pathParameters: {'slug': tag.slug}, | ||||
|                                   ); | ||||
|                                 } | ||||
|                                 : null, | ||||
|                         child: Text('#${tag.name ?? tag.slug}'), | ||||
|                       ), | ||||
|                     if (!isFullPost && item.tags.length > 3) | ||||
|                       Text('+${item.tags.length - 3}').opacity(0.6), | ||||
|                   ], | ||||
|                 ), | ||||
|               if (item.categories.isNotEmpty) | ||||
|                 Wrap( | ||||
|                   runAlignment: WrapAlignment.center, | ||||
|                   spacing: 8, | ||||
|                   children: [ | ||||
|                     const Icon(Symbols.category, size: 16).padding(top: 2), | ||||
|                     for (final category | ||||
|                         in isFullPost | ||||
|                             ? item.categories | ||||
|                             : item.categories.take(2)) | ||||
|                       InkWell( | ||||
|                         onTap: | ||||
|                             isInteractive | ||||
|                                 ? () { | ||||
|                                   GoRouter.of(context).pushNamed( | ||||
|                                     'postCategoryDetail', | ||||
|                                     pathParameters: {'slug': category.slug}, | ||||
|                                   ); | ||||
|                                 } | ||||
|                                 : null, | ||||
|                         child: Text(category.categoryDisplayTitle), | ||||
|                       ), | ||||
|                     if (!isFullPost && item.categories.length > 2) | ||||
|                       Text('+${item.categories.length - 2}').opacity(0.6), | ||||
|                   ], | ||||
|                 ), | ||||
|             ], | ||||
|           ).padding(horizontal: renderingPadding.horizontal + 4, top: 4), | ||||
|         if (item.meta?['embeds'] != null) | ||||
|           ...((item.meta!['embeds'] as List<dynamic>) | ||||
|               .map((embedData) => convertMapKeysToSnakeCase(embedData)) | ||||
|               .map( | ||||
|                 (embedData) => switch (embedData['type']) { | ||||
|                   'link' => EmbedLinkWidget( | ||||
|                     link: SnScrappedLink.fromJson(embedData), | ||||
|                     maxWidth: math.min( | ||||
|                       MediaQuery.of(context).size.width, | ||||
|                       kWideScreenWidth, | ||||
|                     ), | ||||
|                     margin: EdgeInsets.only( | ||||
|                       top: 4, | ||||
|                       bottom: 4, | ||||
|                       left: renderingPadding.horizontal, | ||||
|                       right: renderingPadding.horizontal, | ||||
|                     ), | ||||
|                   ), | ||||
|                   'poll' => Card( | ||||
|                     margin: EdgeInsets.symmetric( | ||||
|                       horizontal: renderingPadding.horizontal, | ||||
|                       vertical: 8, | ||||
|                     ), | ||||
|                     child: | ||||
|                         embedData['poll'] == null | ||||
|                             ? const Text('Poll was not loaded...') | ||||
|                             : PollSubmit( | ||||
|                               initialAnswers: | ||||
|                                   embedData['poll']?['user_answer']?['answer'], | ||||
|                               stats: embedData['poll']?['stats'], | ||||
|                               poll: SnPollWithStats.fromJson(embedData['poll']), | ||||
|                               onSubmit: (_) {}, | ||||
|                               isReadonly: !isInteractive, | ||||
|                             ).padding(horizontal: 16, vertical: 12), | ||||
|                   ), | ||||
|                   _ => Text('Unable show embed: ${embedData['type']}'), | ||||
|                 }, | ||||
|               )), | ||||
|       ], | ||||
|     ); | ||||
|   } | ||||
| } | ||||
| @@ -1,6 +1,6 @@ | ||||
| // GENERATED CODE - DO NOT MODIFY BY HAND | ||||
| 
 | ||||
| part of 'post_item.dart'; | ||||
| part of 'post_shared.dart'; | ||||
| 
 | ||||
| // ************************************************************************** | ||||
| // RiverpodGenerator | ||||
							
								
								
									
										32
									
								
								pubspec.lock
									
									
									
									
									
								
							
							
						
						
									
										32
									
								
								pubspec.lock
									
									
									
									
									
								
							| @@ -313,6 +313,14 @@ packages: | ||||
|       url: "https://pub.dev" | ||||
|     source: hosted | ||||
|     version: "2.0.1" | ||||
|   console: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: console | ||||
|       sha256: e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a | ||||
|       url: "https://pub.dev" | ||||
|     source: hosted | ||||
|     version: "4.1.0" | ||||
|   convert: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -1109,6 +1117,14 @@ packages: | ||||
|       url: "https://pub.dev" | ||||
|     source: hosted | ||||
|     version: "3.0.1" | ||||
|   get_it: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|       name: get_it | ||||
|       sha256: a4292e7cf67193f8e7c1258203104eb2a51ec8b3a04baa14695f4064c144297b | ||||
|       url: "https://pub.dev" | ||||
|     source: hosted | ||||
|     version: "8.2.0" | ||||
|   glob: | ||||
|     dependency: transitive | ||||
|     description: | ||||
| @@ -1581,6 +1597,14 @@ packages: | ||||
|       url: "https://pub.dev" | ||||
|     source: hosted | ||||
|     version: "3.0.0" | ||||
|   msix: | ||||
|     dependency: "direct dev" | ||||
|     description: | ||||
|       name: msix | ||||
|       sha256: f88033fcb9e0dd8de5b18897cbebbd28ea30596810f4a7c86b12b0c03ace87e5 | ||||
|       url: "https://pub.dev" | ||||
|     source: hosted | ||||
|     version: "3.16.12" | ||||
|   native_exif: | ||||
|     dependency: "direct main" | ||||
|     description: | ||||
| @@ -2021,6 +2045,14 @@ packages: | ||||
|       url: "https://pub.dev" | ||||
|     source: hosted | ||||
|     version: "2.1.0" | ||||
|   screenshot: | ||||
|     dependency: "direct main" | ||||
|     description: | ||||
|       name: screenshot | ||||
|       sha256: "63817697a7835e6ce82add4228e15d233b74d42975c143ad8cfe07009fab866b" | ||||
|       url: "https://pub.dev" | ||||
|     source: hosted | ||||
|     version: "3.0.0" | ||||
|   scroll_to_index: | ||||
|     dependency: transitive | ||||
|     description: | ||||
|   | ||||
							
								
								
									
										10
									
								
								pubspec.yaml
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								pubspec.yaml
									
									
									
									
									
								
							| @@ -137,6 +137,7 @@ dependencies: | ||||
|   firebase_crashlytics: ^5.0.0 | ||||
|   firebase_analytics: ^12.0.0 | ||||
|   material_color_utilities: ^0.11.1 | ||||
|   screenshot: ^3.0.0 | ||||
|  | ||||
| dev_dependencies: | ||||
|   flutter_test: | ||||
| @@ -156,6 +157,7 @@ dev_dependencies: | ||||
|   riverpod_lint: ^2.6.5 | ||||
|   drift_dev: ^2.28.0 | ||||
|   flutter_launcher_icons: ^0.14.4 | ||||
|   msix: ^3.16.12 | ||||
|  | ||||
| # For information on the generic Dart part of this file, see the | ||||
| # following page: https://dart.dev/tools/pub/pubspec | ||||
| @@ -225,3 +227,11 @@ flutter_native_splash: | ||||
|   image_dark: "assets/icons/icon-dark.png" | ||||
|   color: "#ffffff" | ||||
|   color_dark: "#121212" | ||||
|  | ||||
| msix_config: | ||||
|   display_name: Solian | ||||
|   publisher_display_name: Solsynth LLC | ||||
|   identity_name: dev.solian.app | ||||
|   msix_version: 3.2.0.0 | ||||
|   logo_path: .\assets\icons\icon.png | ||||
|   capabilities: internetClientServer, location, microphone, webcam | ||||
							
								
								
									
										19
									
								
								setup.iss
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										19
									
								
								setup.iss
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,19 @@ | ||||
|   [Setup] | ||||
|    AppName=Solian | ||||
|    AppVersion=3.2.0 | ||||
|    DefaultDirName={pf}\Solian | ||||
|    DefaultGroupName=Solian | ||||
|    OutputDir=C:\Development\Solian\Installer | ||||
|    OutputBaseFilename=Solian | ||||
|    Compression=lzma | ||||
|    SolidCompression=yes | ||||
|  | ||||
|    [Files] | ||||
|    Source: "C:\Development\Solian\build\windows\x64\runner\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs | ||||
|  | ||||
|    [Icons] | ||||
|    Name: "{group}\Solian"; Filename: "{app}\Solian.exe" | ||||
|    Name: "{group}\Uninstall Solian"; Filename: "{uninstallexe}" | ||||
|  | ||||
|    [Run] | ||||
|    Filename: "{app}\Solian.exe"; Description: "Launch Solian"; Flags: nowait postinstall skipifsilent | ||||
		Reference in New Issue
	
	Block a user