Compare commits
No commits in common. "9f8c8923d97b15b50ef9a198184d831a6b8b8488" and "d6013078bd123204fb1cf7e5c9a416f2dfd05394" have entirely different histories.
9f8c8923d9
...
d6013078bd
@ -449,7 +449,7 @@ class _PostListWidgetState extends State<_PostListWidget> {
|
|||||||
data: ele.toJson(),
|
data: ele.toJson(),
|
||||||
createdAt: ele.createdAt)),
|
createdAt: ele.createdAt)),
|
||||||
);
|
);
|
||||||
_hasLoadedAll = _feed.length >= postCount;
|
_hasLoadedAll = postCount >= _feed.length;
|
||||||
|
|
||||||
if (mounted) setState(() => _isBusy = false);
|
if (mounted) setState(() => _isBusy = false);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -151,7 +151,6 @@ class PostCommentSliverListState extends State<PostCommentSliverList> {
|
|||||||
},
|
},
|
||||||
),
|
),
|
||||||
onTap: () {
|
onTap: () {
|
||||||
Navigator.pop(context);
|
|
||||||
GoRouter.of(context).pushNamed(
|
GoRouter.of(context).pushNamed(
|
||||||
'postDetail',
|
'postDetail',
|
||||||
pathParameters: {'slug': _posts[idx].id.toString()},
|
pathParameters: {'slug': _posts[idx].id.toString()},
|
||||||
@ -226,9 +225,6 @@ class _PostCommentListPopupState extends State<PostCommentListPopup> {
|
|||||||
onPost: () {
|
onPost: () {
|
||||||
_childListKey.currentState!.refresh();
|
_childListKey.currentState!.refresh();
|
||||||
},
|
},
|
||||||
onExpand: () {
|
|
||||||
Navigator.pop(context);
|
|
||||||
},
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@ -103,7 +103,7 @@ class OpenablePostItem extends StatelessWidget {
|
|||||||
transitionType: ContainerTransitionType.fade,
|
transitionType: ContainerTransitionType.fade,
|
||||||
closedElevation: 0,
|
closedElevation: 0,
|
||||||
closedColor: Theme.of(context).colorScheme.surface.withOpacity(
|
closedColor: Theme.of(context).colorScheme.surface.withOpacity(
|
||||||
cfg.prefs.getBool(kAppBackgroundStoreKey) == true ? 0 : 1,
|
cfg.prefs.getBool(kAppBackgroundStoreKey) == true ? 0.75 : 1,
|
||||||
),
|
),
|
||||||
closedShape: const RoundedRectangleBorder(
|
closedShape: const RoundedRectangleBorder(
|
||||||
borderRadius: BorderRadius.all(Radius.circular(16)),
|
borderRadius: BorderRadius.all(Radius.circular(16)),
|
||||||
@ -122,7 +122,6 @@ class PostItem extends StatefulWidget {
|
|||||||
final bool showMenu;
|
final bool showMenu;
|
||||||
final bool showFullPost;
|
final bool showFullPost;
|
||||||
final bool showAvatar;
|
final bool showAvatar;
|
||||||
final bool showCompactAvatar;
|
|
||||||
final bool showExpandableComments;
|
final bool showExpandableComments;
|
||||||
final double? maxWidth;
|
final double? maxWidth;
|
||||||
final Function(SnPost data)? onChanged;
|
final Function(SnPost data)? onChanged;
|
||||||
@ -138,7 +137,6 @@ class PostItem extends StatefulWidget {
|
|||||||
this.showMenu = true,
|
this.showMenu = true,
|
||||||
this.showFullPost = false,
|
this.showFullPost = false,
|
||||||
this.showAvatar = true,
|
this.showAvatar = true,
|
||||||
this.showCompactAvatar = false,
|
|
||||||
this.showExpandableComments = false,
|
this.showExpandableComments = false,
|
||||||
this.maxWidth,
|
this.maxWidth,
|
||||||
this.onChanged,
|
this.onChanged,
|
||||||
@ -299,180 +297,185 @@ class _PostItemState extends State<PostItem> {
|
|||||||
crossAxisAlignment: CrossAxisAlignment.center,
|
crossAxisAlignment: CrossAxisAlignment.center,
|
||||||
children: [
|
children: [
|
||||||
Container(
|
Container(
|
||||||
constraints: BoxConstraints(
|
constraints:
|
||||||
maxWidth: widget.maxWidth ?? double.infinity,
|
BoxConstraints(maxWidth: widget.maxWidth ?? double.infinity),
|
||||||
),
|
|
||||||
child: Column(
|
child: Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
Row(
|
Expanded(
|
||||||
children: [
|
child: Column(
|
||||||
if (widget.showAvatar)
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
_PostAvatar(
|
children: [
|
||||||
data: widget.data,
|
|
||||||
isCompact: false,
|
|
||||||
),
|
|
||||||
if (widget.showAvatar) const Gap(12),
|
|
||||||
Expanded(
|
|
||||||
child: Row(
|
|
||||||
children: [
|
|
||||||
if (widget.showCompactAvatar)
|
|
||||||
_PostAvatar(
|
|
||||||
data: widget.data,
|
|
||||||
isCompact: true,
|
|
||||||
),
|
|
||||||
if (widget.showAvatar) const Gap(8),
|
|
||||||
_PostContentHeader(
|
|
||||||
isRelativeDate: !widget.showFullPost,
|
|
||||||
isCompact: false,
|
|
||||||
data: widget.data,
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
_PostActionPopup(
|
|
||||||
data: widget.data,
|
|
||||||
isAuthor: isAuthor,
|
|
||||||
onShare: () => _doShare(context),
|
|
||||||
onShareImage: () => _doShareViaPicture(context),
|
|
||||||
onSelectAnswer: widget.onSelectAnswer,
|
|
||||||
onDeleted: () {
|
|
||||||
widget.onDeleted?.call();
|
|
||||||
},
|
|
||||||
onTranslate: () {
|
|
||||||
_translateText();
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
const Gap(8),
|
|
||||||
if (widget.data.preload?.thumbnail != null)
|
|
||||||
Container(
|
|
||||||
margin: const EdgeInsets.only(bottom: 8),
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
borderRadius: const BorderRadius.all(
|
|
||||||
Radius.circular(8),
|
|
||||||
),
|
|
||||||
border: Border.all(
|
|
||||||
color: Theme.of(context).dividerColor,
|
|
||||||
width: 1,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
child: AspectRatio(
|
|
||||||
aspectRatio: 16 / 9,
|
|
||||||
child: ClipRRect(
|
|
||||||
borderRadius: const BorderRadius.all(
|
|
||||||
Radius.circular(8),
|
|
||||||
),
|
|
||||||
child: AutoResizeUniversalImage(
|
|
||||||
sn.getAttachmentUrl(
|
|
||||||
widget.data.preload!.thumbnail!.rid,
|
|
||||||
),
|
|
||||||
fit: BoxFit.cover,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
if (widget.data.preload?.video != null)
|
|
||||||
_PostVideoPlayer(data: widget.data).padding(bottom: 8),
|
|
||||||
if (widget.data.type == 'question')
|
|
||||||
_PostQuestionHint(data: widget.data).padding(bottom: 8),
|
|
||||||
if (_displayDescription.isNotEmpty || _displayTitle.isNotEmpty)
|
|
||||||
_PostHeadline(
|
|
||||||
title: _displayTitle,
|
|
||||||
description: _displayDescription,
|
|
||||||
data: widget.data,
|
|
||||||
isEnlarge:
|
|
||||||
widget.data.type == 'article' && widget.showFullPost,
|
|
||||||
).padding(bottom: 8),
|
|
||||||
if (widget.data.type == 'article' && !widget.showFullPost)
|
|
||||||
Text('postArticle')
|
|
||||||
.tr()
|
|
||||||
.fontSize(13)
|
|
||||||
.opacity(0.75)
|
|
||||||
.padding(bottom: 8),
|
|
||||||
if ((_displayText.isNotEmpty) &&
|
|
||||||
(widget.showFullPost || widget.data.type != 'article'))
|
|
||||||
_PostContentBody(
|
|
||||||
text: _displayText,
|
|
||||||
data: widget.data,
|
|
||||||
isSelectable: widget.showFullPost,
|
|
||||||
isEnlarge:
|
|
||||||
widget.data.type == 'article' && widget.showFullPost,
|
|
||||||
).padding(bottom: 6),
|
|
||||||
if (widget.data.visibility > 0)
|
|
||||||
_PostVisibilityHint(data: widget.data).padding(
|
|
||||||
vertical: 4,
|
|
||||||
),
|
|
||||||
if (widget.data.body['content_truncated'] == true)
|
|
||||||
_PostTruncatedHint(data: widget.data).padding(
|
|
||||||
vertical: 4,
|
|
||||||
),
|
|
||||||
if (widget.data.tags.isNotEmpty)
|
|
||||||
_PostTagsList(data: widget.data).padding(top: 4, bottom: 6),
|
|
||||||
Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
spacing: 4,
|
|
||||||
children: [
|
|
||||||
if (widget.showViews)
|
|
||||||
Row(
|
Row(
|
||||||
children: [
|
children: [
|
||||||
Icon(Symbols.play_circle, size: 20),
|
if (widget.showAvatar)
|
||||||
const Gap(4),
|
_PostAvatar(
|
||||||
Text('postViews').plural(widget.data.totalViews),
|
data: widget.data,
|
||||||
],
|
isCompact: false,
|
||||||
).opacity(0.75),
|
),
|
||||||
if (_isTranslating)
|
if (widget.showAvatar) const Gap(12),
|
||||||
AnimateWidgetExtensions(Row(
|
Expanded(
|
||||||
children: [
|
child: _PostContentHeader(
|
||||||
Icon(Symbols.translate, size: 20),
|
isRelativeDate: !widget.showFullPost,
|
||||||
const Gap(4),
|
isCompact: false,
|
||||||
Text('translating').tr(),
|
data: widget.data,
|
||||||
],
|
),
|
||||||
))
|
|
||||||
.animate(onPlay: (e) => e.repeat())
|
|
||||||
.fadeIn(duration: 500.ms, curve: Curves.easeOut)
|
|
||||||
.then()
|
|
||||||
.fadeOut(
|
|
||||||
duration: 500.ms,
|
|
||||||
delay: 1000.ms,
|
|
||||||
curve: Curves.easeIn,
|
|
||||||
),
|
),
|
||||||
if (_isTranslated)
|
_PostActionPopup(
|
||||||
InkWell(
|
data: widget.data,
|
||||||
child: Row(
|
isAuthor: isAuthor,
|
||||||
children: [
|
onShare: () => _doShare(context),
|
||||||
Icon(Symbols.translate, size: 20),
|
onShareImage: () => _doShareViaPicture(context),
|
||||||
const Gap(4),
|
onSelectAnswer: widget.onSelectAnswer,
|
||||||
Text('translated').tr(),
|
onDeleted: () {
|
||||||
],
|
widget.onDeleted?.call();
|
||||||
).opacity(0.75),
|
},
|
||||||
onTap: () {
|
onTranslate: () {
|
||||||
setState(() {
|
_translateText();
|
||||||
_displayText = widget.data.body['content'] ?? '';
|
},
|
||||||
_displayTitle = widget.data.body['title'] ?? '';
|
),
|
||||||
_displayDescription =
|
],
|
||||||
widget.data.body['description'] ?? '';
|
|
||||||
_isTranslated = false;
|
|
||||||
});
|
|
||||||
},
|
|
||||||
),
|
),
|
||||||
if (widget.data.repostTo != null)
|
const Gap(8),
|
||||||
_PostQuoteContent(child: widget.data.repostTo!).padding(
|
if (widget.data.preload?.thumbnail != null)
|
||||||
top: 4,
|
Container(
|
||||||
bottom: widget.data.preload?.attachments?.isNotEmpty ??
|
margin: const EdgeInsets.only(bottom: 8),
|
||||||
false
|
decoration: BoxDecoration(
|
||||||
? 12
|
borderRadius: const BorderRadius.all(
|
||||||
: 0,
|
Radius.circular(8),
|
||||||
|
),
|
||||||
|
border: Border.all(
|
||||||
|
color: Theme.of(context).dividerColor,
|
||||||
|
width: 1,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
child: AspectRatio(
|
||||||
|
aspectRatio: 16 / 9,
|
||||||
|
child: ClipRRect(
|
||||||
|
borderRadius: const BorderRadius.all(
|
||||||
|
Radius.circular(8),
|
||||||
|
),
|
||||||
|
child: AutoResizeUniversalImage(
|
||||||
|
sn.getAttachmentUrl(
|
||||||
|
widget.data.preload!.thumbnail!.rid,
|
||||||
|
),
|
||||||
|
fit: BoxFit.cover,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (widget.data.preload?.video != null)
|
||||||
|
_PostVideoPlayer(data: widget.data).padding(bottom: 8),
|
||||||
|
if (widget.data.type == 'question')
|
||||||
|
_PostQuestionHint(data: widget.data).padding(bottom: 8),
|
||||||
|
if (_displayDescription.isNotEmpty ||
|
||||||
|
_displayTitle.isNotEmpty)
|
||||||
|
_PostHeadline(
|
||||||
|
title: _displayTitle,
|
||||||
|
description: _displayDescription,
|
||||||
|
data: widget.data,
|
||||||
|
isEnlarge: widget.data.type == 'article' &&
|
||||||
|
widget.showFullPost,
|
||||||
|
).padding(bottom: 8),
|
||||||
|
if (widget.data.type == 'article' && !widget.showFullPost)
|
||||||
|
Text('postArticle')
|
||||||
|
.tr()
|
||||||
|
.fontSize(13)
|
||||||
|
.opacity(0.75)
|
||||||
|
.padding(bottom: 8),
|
||||||
|
if ((_displayText.isNotEmpty) &&
|
||||||
|
(widget.showFullPost ||
|
||||||
|
widget.data.type != 'article'))
|
||||||
|
_PostContentBody(
|
||||||
|
text: _displayText,
|
||||||
|
data: widget.data,
|
||||||
|
isSelectable: widget.showFullPost,
|
||||||
|
isEnlarge: widget.data.type == 'article' &&
|
||||||
|
widget.showFullPost,
|
||||||
|
).padding(bottom: 6),
|
||||||
|
if (widget.data.visibility > 0)
|
||||||
|
_PostVisibilityHint(data: widget.data).padding(
|
||||||
|
vertical: 4,
|
||||||
|
),
|
||||||
|
if (widget.data.body['content_truncated'] == true)
|
||||||
|
_PostTruncatedHint(data: widget.data).padding(
|
||||||
|
vertical: 4,
|
||||||
|
),
|
||||||
|
if (widget.data.tags.isNotEmpty)
|
||||||
|
_PostTagsList(data: widget.data)
|
||||||
|
.padding(top: 4, bottom: 6),
|
||||||
|
Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
spacing: 4,
|
||||||
|
children: [
|
||||||
|
if (widget.showViews)
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Icon(Symbols.play_circle, size: 20),
|
||||||
|
const Gap(4),
|
||||||
|
Text('postViews')
|
||||||
|
.plural(widget.data.totalViews),
|
||||||
|
],
|
||||||
|
).opacity(0.75),
|
||||||
|
if (_isTranslating)
|
||||||
|
AnimateWidgetExtensions(Row(
|
||||||
|
children: [
|
||||||
|
Icon(Symbols.translate, size: 20),
|
||||||
|
const Gap(4),
|
||||||
|
Text('translating').tr(),
|
||||||
|
],
|
||||||
|
))
|
||||||
|
.animate(onPlay: (e) => e.repeat())
|
||||||
|
.fadeIn(duration: 500.ms, curve: Curves.easeOut)
|
||||||
|
.then()
|
||||||
|
.fadeOut(
|
||||||
|
duration: 500.ms,
|
||||||
|
delay: 1000.ms,
|
||||||
|
curve: Curves.easeIn,
|
||||||
|
),
|
||||||
|
if (_isTranslated)
|
||||||
|
InkWell(
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
Icon(Symbols.translate, size: 20),
|
||||||
|
const Gap(4),
|
||||||
|
Text('translated').tr(),
|
||||||
|
],
|
||||||
|
).opacity(0.75),
|
||||||
|
onTap: () {
|
||||||
|
setState(() {
|
||||||
|
_displayText =
|
||||||
|
widget.data.body['content'] ?? '';
|
||||||
|
_displayTitle =
|
||||||
|
widget.data.body['title'] ?? '';
|
||||||
|
_displayDescription =
|
||||||
|
widget.data.body['description'] ?? '';
|
||||||
|
_isTranslated = false;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
),
|
||||||
|
if (widget.data.repostTo != null)
|
||||||
|
_PostQuoteContent(child: widget.data.repostTo!)
|
||||||
|
.padding(
|
||||||
|
top: 4,
|
||||||
|
bottom: widget.data.preload?.attachments
|
||||||
|
?.isNotEmpty ??
|
||||||
|
false
|
||||||
|
? 12
|
||||||
|
: 0,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
).padding(
|
||||||
|
bottom:
|
||||||
|
widget.showViews || _isTranslated || _isTranslating
|
||||||
|
? 8
|
||||||
|
: 0,
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
).padding(
|
),
|
||||||
bottom: widget.showViews || _isTranslated || _isTranslating
|
).padding(horizontal: 12, top: 8),
|
||||||
? 8
|
|
||||||
: 0,
|
|
||||||
),
|
|
||||||
],
|
],
|
||||||
).padding(horizontal: 12, top: 8),
|
),
|
||||||
),
|
),
|
||||||
if (displayableAttachments?.isNotEmpty ?? false)
|
if (displayableAttachments?.isNotEmpty ?? false)
|
||||||
AttachmentList(
|
AttachmentList(
|
||||||
@ -506,7 +509,6 @@ class _PostItemState extends State<PostItem> {
|
|||||||
_PostCommentIntent(
|
_PostCommentIntent(
|
||||||
data: widget.data,
|
data: widget.data,
|
||||||
showAvatar: widget.showAvatar,
|
showAvatar: widget.showAvatar,
|
||||||
maxWidth: widget.maxWidth ?? double.infinity,
|
|
||||||
).padding(left: 12, right: 12)
|
).padding(left: 12, right: 12)
|
||||||
else
|
else
|
||||||
_PostFeaturedComment(data: widget.data, maxWidth: widget.maxWidth)
|
_PostFeaturedComment(data: widget.data, maxWidth: widget.maxWidth)
|
||||||
@ -556,22 +558,10 @@ class _PostItemState extends State<PostItem> {
|
|||||||
Row(
|
Row(
|
||||||
children: [
|
children: [
|
||||||
Expanded(
|
Expanded(
|
||||||
child: Row(
|
child: _PostContentHeader(
|
||||||
children: [
|
isRelativeDate: !widget.showFullPost,
|
||||||
if (widget.showCompactAvatar)
|
isCompact: true,
|
||||||
_PostAvatar(
|
data: widget.data,
|
||||||
data: widget.data,
|
|
||||||
isCompact: true,
|
|
||||||
),
|
|
||||||
if (widget.showCompactAvatar) const Gap(8),
|
|
||||||
Expanded(
|
|
||||||
child: _PostContentHeader(
|
|
||||||
isRelativeDate: !widget.showFullPost,
|
|
||||||
isCompact: true,
|
|
||||||
data: widget.data,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
_PostActionPopup(
|
_PostActionPopup(
|
||||||
@ -588,7 +578,7 @@ class _PostItemState extends State<PostItem> {
|
|||||||
},
|
},
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
).padding(bottom: widget.showCompactAvatar ? 4 : 0),
|
),
|
||||||
if (widget.data.preload?.thumbnail != null)
|
if (widget.data.preload?.thumbnail != null)
|
||||||
Container(
|
Container(
|
||||||
margin: const EdgeInsets.only(bottom: 8),
|
margin: const EdgeInsets.only(bottom: 8),
|
||||||
@ -765,28 +755,19 @@ class _PostItemState extends State<PostItem> {
|
|||||||
if (widget.showExpandableComments)
|
if (widget.showExpandableComments)
|
||||||
_PostCommentIntent(
|
_PostCommentIntent(
|
||||||
data: widget.data,
|
data: widget.data,
|
||||||
maxWidth: (widget.maxWidth ?? double.infinity) -
|
|
||||||
(widget.showAvatar ? 72 : 24),
|
|
||||||
showAvatar: widget.showAvatar,
|
showAvatar: widget.showAvatar,
|
||||||
).padding(left: widget.showAvatar ? 60 : 12, right: 12)
|
).padding(left: widget.showAvatar ? 60 : 12, right: 12)
|
||||||
else if (widget.showComments)
|
else if (widget.showComments)
|
||||||
_PostFeaturedComment(data: widget.data, maxWidth: widget.maxWidth)
|
_PostFeaturedComment(data: widget.data, maxWidth: widget.maxWidth)
|
||||||
.padding(left: widget.showAvatar ? 60 : 12, right: 12),
|
.padding(left: widget.showAvatar ? 60 : 12, right: 12),
|
||||||
if (widget.showReactions)
|
if (widget.showReactions)
|
||||||
Container(
|
Padding(
|
||||||
constraints: BoxConstraints(
|
padding: const EdgeInsets.only(top: 4),
|
||||||
maxWidth: widget.maxWidth ?? double.infinity,
|
child: _PostReactionList(
|
||||||
),
|
data: widget.data,
|
||||||
child: Padding(
|
padding:
|
||||||
padding: const EdgeInsets.only(top: 4),
|
EdgeInsets.only(left: widget.showAvatar ? 60 : 12, right: 12),
|
||||||
child: _PostReactionList(
|
onChanged: _onChanged,
|
||||||
data: widget.data,
|
|
||||||
padding: EdgeInsets.only(
|
|
||||||
left: widget.showAvatar ? 60 : 12,
|
|
||||||
right: 12,
|
|
||||||
),
|
|
||||||
onChanged: _onChanged,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
@ -1571,24 +1552,19 @@ class _PostContentHeader extends StatelessWidget {
|
|||||||
if (isCompact) {
|
if (isCompact) {
|
||||||
return Row(
|
return Row(
|
||||||
children: [
|
children: [
|
||||||
Flexible(
|
Text(data.publisher.nick).bold(),
|
||||||
child: Text(
|
|
||||||
data.publisher.nick,
|
|
||||||
maxLines: 1,
|
|
||||||
).bold(),
|
|
||||||
),
|
|
||||||
const Gap(4),
|
const Gap(4),
|
||||||
Flexible(
|
Row(
|
||||||
child: Text(
|
children: [
|
||||||
isRelativeDate
|
Text(
|
||||||
? RelativeTime(context)
|
isRelativeDate
|
||||||
.format((data.publishedAt ?? data.createdAt).toLocal())
|
? RelativeTime(context)
|
||||||
: DateFormat('y/M/d HH:mm')
|
.format((data.publishedAt ?? data.createdAt).toLocal())
|
||||||
.format((data.publishedAt ?? data.createdAt).toLocal()),
|
: DateFormat('y/M/d HH:mm')
|
||||||
maxLines: 1,
|
.format((data.publishedAt ?? data.createdAt).toLocal()),
|
||||||
overflow: TextOverflow.fade,
|
).fontSize(13),
|
||||||
).fontSize(13).opacity(0.8),
|
],
|
||||||
),
|
).opacity(0.8),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
@ -1607,10 +1583,7 @@ class _PostContentHeader extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
Row(
|
Row(
|
||||||
children: [
|
children: [
|
||||||
Text(
|
Text('@${data.publisher.name}').fontSize(13),
|
||||||
'@${data.publisher.name}',
|
|
||||||
maxLines: 1,
|
|
||||||
).fontSize(13),
|
|
||||||
const Gap(4),
|
const Gap(4),
|
||||||
Text(
|
Text(
|
||||||
isRelativeDate
|
isRelativeDate
|
||||||
@ -1618,8 +1591,6 @@ class _PostContentHeader extends StatelessWidget {
|
|||||||
.format((data.publishedAt ?? data.createdAt).toLocal())
|
.format((data.publishedAt ?? data.createdAt).toLocal())
|
||||||
: DateFormat('y/M/d HH:mm')
|
: DateFormat('y/M/d HH:mm')
|
||||||
.format((data.publishedAt ?? data.createdAt).toLocal()),
|
.format((data.publishedAt ?? data.createdAt).toLocal()),
|
||||||
maxLines: 1,
|
|
||||||
overflow: TextOverflow.fade,
|
|
||||||
).fontSize(13),
|
).fontSize(13),
|
||||||
],
|
],
|
||||||
).opacity(0.8),
|
).opacity(0.8),
|
||||||
@ -1885,12 +1856,7 @@ class _PostTruncatedHint extends StatelessWidget {
|
|||||||
class _PostCommentIntent extends StatefulWidget {
|
class _PostCommentIntent extends StatefulWidget {
|
||||||
final SnPost data;
|
final SnPost data;
|
||||||
final bool showAvatar;
|
final bool showAvatar;
|
||||||
final double maxWidth;
|
const _PostCommentIntent({required this.data, this.showAvatar = false});
|
||||||
const _PostCommentIntent({
|
|
||||||
required this.data,
|
|
||||||
this.showAvatar = false,
|
|
||||||
required this.maxWidth,
|
|
||||||
});
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
State<_PostCommentIntent> createState() => _PostCommentIntentState();
|
State<_PostCommentIntent> createState() => _PostCommentIntentState();
|
||||||
@ -1929,69 +1895,54 @@ class _PostCommentIntentState extends State<_PostCommentIntent> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Container(
|
return Column(
|
||||||
constraints: BoxConstraints(maxWidth: widget.maxWidth),
|
children: [
|
||||||
child: Column(
|
if (_comments.isNotEmpty)
|
||||||
children: [
|
Card(
|
||||||
if (_comments.isNotEmpty)
|
elevation: 4,
|
||||||
Card(
|
margin: EdgeInsets.zero,
|
||||||
elevation: 4,
|
child: Column(
|
||||||
margin: EdgeInsets.zero,
|
spacing: 8,
|
||||||
child: Column(
|
children: [
|
||||||
spacing: 8,
|
for (final ele in _comments)
|
||||||
children: [
|
PostItem(
|
||||||
for (final ele in _comments)
|
data: ele,
|
||||||
InkWell(
|
showAvatar: false,
|
||||||
borderRadius: const BorderRadius.all(Radius.circular(8)),
|
showExpandableComments: true,
|
||||||
child: PostItem(
|
showReactions: false,
|
||||||
data: ele,
|
showViews: false,
|
||||||
showAvatar: false,
|
maxWidth: double.infinity,
|
||||||
showCompactAvatar: true,
|
).padding(vertical: 8, left: 6),
|
||||||
showExpandableComments: true,
|
],
|
||||||
showReactions: false,
|
),
|
||||||
showViews: false,
|
).padding(vertical: 8),
|
||||||
maxWidth: double.infinity,
|
Row(
|
||||||
).padding(vertical: 8, left: 6),
|
children: [
|
||||||
onTap: () {
|
Transform.flip(
|
||||||
GoRouter.of(context).pushNamed(
|
flipX: true,
|
||||||
'postDetail',
|
child: const Icon(Symbols.comment, size: 20),
|
||||||
pathParameters: {'slug': ele.id.toString()},
|
),
|
||||||
extra: ele,
|
const Gap(4),
|
||||||
);
|
Text('postCommentsDetailed'.plural(widget.data.metric.replyCount)),
|
||||||
},
|
if (widget.data.metric.replyCount > 0 && !_isAllLoaded)
|
||||||
),
|
SizedBox(
|
||||||
],
|
width: 20,
|
||||||
),
|
height: 20,
|
||||||
).padding(vertical: 8),
|
child: IconButton(
|
||||||
Row(
|
visualDensity: VisualDensity(horizontal: -4, vertical: -4),
|
||||||
children: [
|
constraints: const BoxConstraints(),
|
||||||
Transform.flip(
|
padding: EdgeInsets.zero,
|
||||||
flipX: true,
|
icon: const Icon(Symbols.expand_more, size: 18),
|
||||||
child: const Icon(Symbols.comment, size: 20),
|
onPressed: _isBusy
|
||||||
),
|
? null
|
||||||
const Gap(4),
|
: () {
|
||||||
Text(
|
_fetchComments();
|
||||||
'postCommentsDetailed'.plural(widget.data.metric.replyCount)),
|
},
|
||||||
if (widget.data.metric.replyCount > 0 && !_isAllLoaded)
|
),
|
||||||
SizedBox(
|
).padding(left: 8),
|
||||||
width: 20,
|
],
|
||||||
height: 20,
|
).opacity(0.75).padding(horizontal: widget.showAvatar ? 4 : 0),
|
||||||
child: IconButton(
|
],
|
||||||
visualDensity: VisualDensity(horizontal: -4, vertical: -4),
|
|
||||||
constraints: const BoxConstraints(),
|
|
||||||
padding: EdgeInsets.zero,
|
|
||||||
icon: const Icon(Symbols.expand_more, size: 18),
|
|
||||||
onPressed: _isBusy
|
|
||||||
? null
|
|
||||||
: () {
|
|
||||||
_fetchComments();
|
|
||||||
},
|
|
||||||
),
|
|
||||||
).padding(left: 8),
|
|
||||||
],
|
|
||||||
).opacity(0.75).padding(horizontal: widget.showAvatar ? 4 : 0),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,7 +9,6 @@ import 'package:styled_widget/styled_widget.dart';
|
|||||||
import 'package:surface/controllers/post_write_controller.dart';
|
import 'package:surface/controllers/post_write_controller.dart';
|
||||||
import 'package:surface/providers/config.dart';
|
import 'package:surface/providers/config.dart';
|
||||||
import 'package:surface/providers/sn_network.dart';
|
import 'package:surface/providers/sn_network.dart';
|
||||||
import 'package:surface/screens/post/post_editor.dart';
|
|
||||||
import 'package:surface/types/post.dart';
|
import 'package:surface/types/post.dart';
|
||||||
import 'package:surface/widgets/account/account_image.dart';
|
import 'package:surface/widgets/account/account_image.dart';
|
||||||
import 'package:surface/widgets/dialog.dart';
|
import 'package:surface/widgets/dialog.dart';
|
||||||
@ -18,10 +17,8 @@ import 'package:surface/widgets/loading_indicator.dart';
|
|||||||
class PostMiniEditor extends StatefulWidget {
|
class PostMiniEditor extends StatefulWidget {
|
||||||
final int? postReplyId;
|
final int? postReplyId;
|
||||||
final Function? onPost;
|
final Function? onPost;
|
||||||
final Function? onExpand;
|
|
||||||
|
|
||||||
const PostMiniEditor(
|
const PostMiniEditor({super.key, this.postReplyId, this.onPost});
|
||||||
{super.key, this.postReplyId, this.onPost, this.onExpand});
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
State<PostMiniEditor> createState() => _PostMiniEditorState();
|
State<PostMiniEditor> createState() => _PostMiniEditorState();
|
||||||
@ -217,16 +214,12 @@ class _PostMiniEditorState extends State<PostMiniEditor> {
|
|||||||
onPressed: () {
|
onPressed: () {
|
||||||
GoRouter.of(context).pushNamed(
|
GoRouter.of(context).pushNamed(
|
||||||
'postEditor',
|
'postEditor',
|
||||||
extra: PostEditorExtra(
|
|
||||||
text: _writeController.contentController.text,
|
|
||||||
),
|
|
||||||
queryParameters: {
|
queryParameters: {
|
||||||
if (widget.postReplyId != null)
|
if (widget.postReplyId != null)
|
||||||
'replying': widget.postReplyId.toString(),
|
'replying': widget.postReplyId.toString(),
|
||||||
'mode': 'stories',
|
'mode': 'stories',
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
widget.onExpand?.call();
|
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
TextButton.icon(
|
TextButton.icon(
|
||||||
|
|||||||
@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
|
|||||||
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
||||||
# In Windows, build-name is used as the major, minor, and patch parts
|
# In Windows, build-name is used as the major, minor, and patch parts
|
||||||
# of the product and file versions while build-number is used as the build suffix.
|
# of the product and file versions while build-number is used as the build suffix.
|
||||||
version: 2.4.2+82
|
version: 2.4.2+81
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: ^3.5.4
|
sdk: ^3.5.4
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user