diff --git a/lib/screens/notification.dart b/lib/screens/notification.dart index 28cf993..0e6d484 100644 --- a/lib/screens/notification.dart +++ b/lib/screens/notification.dart @@ -197,11 +197,24 @@ class _NotificationScreenState extends State { 'interactive.subscription' ].contains(nty.topic) && nty.metadata['related_post'] != null) - PostItem( - data: SnPost.fromJson( - nty.metadata['related_post']!, + StyledWidget(Container( + decoration: BoxDecoration( + borderRadius: const BorderRadius.all( + Radius.circular(8)), + border: Border.all( + color: Theme.of(context).dividerColor, + width: 1, + ), ), - ), + child: PostItem( + data: SnPost.fromJson( + nty.metadata['related_post']!, + ), + showComments: false, + showReactions: false, + showMenu: false, + ), + )).padding(top: 8), const Gap(8), Row( children: [ diff --git a/lib/types/post.dart b/lib/types/post.dart index c04604b..461fa37 100644 --- a/lib/types/post.dart +++ b/lib/types/post.dart @@ -18,8 +18,8 @@ class SnPost with _$SnPost { required String language, required String? alias, required String? aliasPrefix, - required List tags, - required List categories, + @Default([]) List tags, + @Default([]) List categories, required List? replies, required int? replyId, required int? repostId, diff --git a/lib/types/post.freezed.dart b/lib/types/post.freezed.dart index cd21182..2b1f72f 100644 --- a/lib/types/post.freezed.dart +++ b/lib/types/post.freezed.dart @@ -583,8 +583,8 @@ class _$SnPostImpl extends _SnPost { required this.language, required this.alias, required this.aliasPrefix, - required final List tags, - required final List categories, + final List tags = const [], + final List categories = const [], required final List? replies, required this.replyId, required this.repostId, @@ -642,6 +642,7 @@ class _$SnPostImpl extends _SnPost { final String? aliasPrefix; final List _tags; @override + @JsonKey() List get tags { if (_tags is EqualUnmodifiableListView) return _tags; // ignore: implicit_dynamic_type @@ -650,6 +651,7 @@ class _$SnPostImpl extends _SnPost { final List _categories; @override + @JsonKey() List get categories { if (_categories is EqualUnmodifiableListView) return _categories; // ignore: implicit_dynamic_type @@ -850,8 +852,8 @@ abstract class _SnPost extends SnPost { required final String language, required final String? alias, required final String? aliasPrefix, - required final List tags, - required final List categories, + final List tags, + final List categories, required final List? replies, required final int? replyId, required final int? repostId, diff --git a/lib/types/post.g.dart b/lib/types/post.g.dart index addcb8e..4150142 100644 --- a/lib/types/post.g.dart +++ b/lib/types/post.g.dart @@ -18,8 +18,8 @@ _$SnPostImpl _$$SnPostImplFromJson(Map json) => _$SnPostImpl( language: json['language'] as String, alias: json['alias'] as String?, aliasPrefix: json['alias_prefix'] as String?, - tags: json['tags'] as List, - categories: json['categories'] as List, + tags: json['tags'] as List? ?? const [], + categories: json['categories'] as List? ?? const [], replies: (json['replies'] as List?) ?.map((e) => SnPost.fromJson(e as Map)) .toList(), diff --git a/lib/widgets/post/post_item.dart b/lib/widgets/post/post_item.dart index 02b1686..a1d31e0 100644 --- a/lib/widgets/post/post_item.dart +++ b/lib/widgets/post/post_item.dart @@ -18,6 +18,7 @@ class PostItem extends StatelessWidget { final SnPost data; final bool showReactions; final bool showComments; + final bool showMenu; final double? maxWidth; final Function(SnPost data)? onChanged; const PostItem({ @@ -25,6 +26,7 @@ class PostItem extends StatelessWidget { required this.data, this.showReactions = true, this.showComments = true, + this.showMenu = true, this.maxWidth, this.onChanged, }); @@ -43,7 +45,7 @@ class PostItem extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - _PostContentHeader(data: data) + _PostContentHeader(data: data, showMenu: showMenu) .padding(horizontal: 12, vertical: 8), if (data.body['title'] != null || data.body['description'] != null) @@ -62,7 +64,7 @@ class PostItem extends StatelessWidget { ], ), ), - if (data.preload?.attachments?.isNotEmpty ?? true) + if (data.preload?.attachments?.isNotEmpty ?? false) AttachmentList( data: data.preload!.attachments!, bordered: true, @@ -107,70 +109,71 @@ class _PostBottomAction extends StatelessWidget { return Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Row( - children: [ - if (showReactions) - InkWell( - child: Row( - children: [ - Icon(Symbols.add_reaction, size: 20, color: iconColor), - const Gap(8), - if (data.totalUpvote > 0 && - data.totalUpvote >= data.totalDownvote) - Text('postReactionUpvote').plural( - data.totalUpvote, - ) - else if (data.totalDownvote > 0) - Text('postReactionDownvote').plural( - data.totalDownvote, - ) - else - Text('postReact').tr(), - ], - ).padding(horizontal: 8, vertical: 8), - onTap: () { - showModalBottomSheet( - context: context, - builder: (context) => PostReactionPopup( - data: data, - onChanged: (value, attr, delta) { - onChanged(data.copyWith( - totalUpvote: attr == 1 - ? data.totalUpvote + delta - : data.totalUpvote, - totalDownvote: attr == 2 - ? data.totalDownvote + delta - : data.totalDownvote, - metric: data.metric.copyWith(reactionList: value), - )); - }, - ), - ); - }, - ), - if (showComments) - InkWell( - child: Row( - children: [ - Icon(Symbols.comment, size: 20, color: iconColor), - const Gap(8), - Text('postComments').plural(data.metric.replyCount), - ], - ).padding(horizontal: 8, vertical: 8), - onTap: () { - showModalBottomSheet( - context: context, - useRootNavigator: true, - builder: (context) => PostCommentListPopup( - postId: data.id, - commentCount: data.metric.replyCount, - ), - ); - }, - ), - ].expand((ele) => [ele, const Gap(8)]).toList() - ..removeLast(), - ), + if (showReactions || showComments) + Row( + children: [ + if (showReactions) + InkWell( + child: Row( + children: [ + Icon(Symbols.add_reaction, size: 20, color: iconColor), + const Gap(8), + if (data.totalUpvote > 0 && + data.totalUpvote >= data.totalDownvote) + Text('postReactionUpvote').plural( + data.totalUpvote, + ) + else if (data.totalDownvote > 0) + Text('postReactionDownvote').plural( + data.totalDownvote, + ) + else + Text('postReact').tr(), + ], + ).padding(horizontal: 8, vertical: 8), + onTap: () { + showModalBottomSheet( + context: context, + builder: (context) => PostReactionPopup( + data: data, + onChanged: (value, attr, delta) { + onChanged(data.copyWith( + totalUpvote: attr == 1 + ? data.totalUpvote + delta + : data.totalUpvote, + totalDownvote: attr == 2 + ? data.totalDownvote + delta + : data.totalDownvote, + metric: data.metric.copyWith(reactionList: value), + )); + }, + ), + ); + }, + ), + if (showComments) + InkWell( + child: Row( + children: [ + Icon(Symbols.comment, size: 20, color: iconColor), + const Gap(8), + Text('postComments').plural(data.metric.replyCount), + ], + ).padding(horizontal: 8, vertical: 8), + onTap: () { + showModalBottomSheet( + context: context, + useRootNavigator: true, + builder: (context) => PostCommentListPopup( + postId: data.id, + commentCount: data.metric.replyCount, + ), + ); + }, + ), + ].expand((ele) => [ele, const Gap(8)]).toList() + ..removeLast(), + ), InkWell( child: Icon( Symbols.share, @@ -211,11 +214,11 @@ class _PostHeadline extends StatelessWidget { class _PostContentHeader extends StatelessWidget { final SnPost data; final bool isCompact; - final bool showActions; + final bool showMenu; const _PostContentHeader({ required this.data, this.isCompact = false, - this.showActions = true, + this.showMenu = true, }); @override @@ -264,7 +267,7 @@ class _PostContentHeader extends StatelessWidget { ], ), ), - if (showActions) + if (showMenu) PopupMenuButton( icon: const Icon(Symbols.more_horiz), style: const ButtonStyle( @@ -376,7 +379,7 @@ class _PostQuoteContent extends StatelessWidget { padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), child: Column( children: [ - _PostContentHeader(data: child, isCompact: true, showActions: false) + _PostContentHeader(data: child, isCompact: true, showMenu: false) .padding(bottom: 4), _PostContentBody(data: child.body), ],