Skip to content

Commit c84463e

Browse files
committed
Merge remote-tracking branch 'origin/main'
2 parents 01284fb + b07c5d3 commit c84463e

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

dplanner/lib/widgets/post_card.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,7 @@ class PostCard extends StatelessWidget {
155155
),
156156
),
157157
Text(
158-
DateFormat('M월 d일')
159-
.add_jm()
158+
DateFormat('M월 d일 HH:mm')
160159
.format(rxPost.value.createdTime),
161160
style: const TextStyle(
162161
color: AppColor.textColor,

dplanner/lib/widgets/post_content.dart

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ class PostContent extends StatelessWidget {
319319
],
320320
),
321321
Text(
322-
DateFormat('M월 d일').add_jm().format(post.createdTime),
322+
DateFormat('M월 d일 HH:mm').format(post.createdTime),
323323
style: const TextStyle(
324324
color: AppColor.textColor,
325325
fontWeight: FontWeight.normal,
@@ -355,8 +355,10 @@ class PostContent extends StatelessWidget {
355355
),
356356
SelectableLinkify(
357357
onOpen: (link) async {
358-
if(!await launchUrl(Uri.parse(link.url))) {
359-
snackBar(title: "해당 링크로 이동하지 못했습니다", content: "잠시 후 다시 시도해 주세요");
358+
if (!await launchUrl(Uri.parse(link.url))) {
359+
snackBar(
360+
title: "해당 링크로 이동하지 못했습니다",
361+
content: "잠시 후 다시 시도해 주세요");
360362
}
361363
},
362364
text: post.content,
@@ -365,10 +367,10 @@ class PostContent extends StatelessWidget {
365367
fontWeight: FontWeight.normal,
366368
fontSize: 15,
367369
),
368-
linkStyle: const TextStyle(
369-
decorationColor: AppColor.hyperLink
370-
),
371-
contextMenuBuilder: (BuildContext context, EditableTextState editableTextState) {
370+
linkStyle:
371+
const TextStyle(decorationColor: AppColor.hyperLink),
372+
contextMenuBuilder: (BuildContext context,
373+
EditableTextState editableTextState) {
372374
return AdaptiveTextSelectionToolbar.editableText(
373375
editableTextState: editableTextState,
374376
);

0 commit comments

Comments
 (0)