Solar/App
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

✨ Better reaction panel

Browse Source
This commit is contained in:
LittleSheep
2024-11-23 18:04:30 +08:00
parent b8a1e5b5c0
commit 0ed8c2373d
13 changed files with 95 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/widgets/attachment/attachment_item.dart
View File

@ -232,7 +232,7 @@ class _AttachmentItemContentVideoState
)
else
const Center(
child: Icon(Icons.movie, size: 64),
child: Icon(Symbols.movie, size: 64),
),
Align(
alignment: Alignment.bottomCenter,
@ -397,7 +397,7 @@ class _AttachmentItemContentAudioState
)
else
const Center(
child: Icon(Icons.radio, size: 64),
child: Icon(Symbols.radio, size: 64),
),
Align(
alignment: Alignment.bottomCenter,
@ -485,7 +485,7 @@ class _AttachmentItemContentAudioState
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
const Icon(Icons.audio_file, size: 32),
const Icon(Symbols.audio_file, size: 32),
const Gap(8),
Text(
widget.data.alt,
@ -554,8 +554,8 @@ class _AttachmentItemContentAudioState
const Gap(16),
IconButton.filled(
icon: _isPlaying
? const Icon(Icons.pause)
: const Icon(Icons.play_arrow),
? const Icon(Symbols.pause)
: const Icon(Symbols.play_arrow),
onPressed: () {
_audioPlayer!.playOrPause();
},

3
lib/widgets/post/post_comment_list.dart
View File

@ -98,6 +98,9 @@ class PostCommentSliverListState extends State<PostCommentSliverList> {
child: PostItem(
data: _posts[idx],
maxWidth: widget.maxWidth,
onChanged: (data) {
setState(() => _posts[idx] = data);
},
),
onTap: () {
GoRouter.of(context).pushNamed(

17
lib/widgets/post/post_item.dart
View File

@ -106,9 +106,14 @@ class _PostBottomAction extends StatelessWidget {
children: [
Icon(Symbols.add_reaction, size: 20, color: iconColor),
const Gap(8),
if (data.totalDownvote > 0 || data.totalUpvote > 0)
Text('postReactionPoints').plural(
data.totalUpvote - data.totalDownvote,
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(),
@ -119,12 +124,12 @@ class _PostBottomAction extends StatelessWidget {
context: context,
builder: (context) => PostReactionPopup(
data: data,
onChanged: (value, isPositive, delta) {
onChanged: (value, attr, delta) {
onChanged(data.copyWith(
totalUpvote: isPositive
totalUpvote: attr == 1
? data.totalUpvote + delta
: data.totalUpvote,
totalDownvote: !isPositive
totalDownvote: attr == 2
? data.totalDownvote + delta
: data.totalDownvote,
metric: data.metric.copyWith(reactionList: value),

35
lib/widgets/post/post_reaction.dart
View File

@ -11,7 +11,7 @@ import 'package:surface/widgets/dialog.dart';
class PostReactionPopup extends StatefulWidget {
final SnPost data;
final Function(Map<String, int> value, bool isPositive, int delta)? onChanged;
final Function(Map<String, int> value, int attr, int delta)? onChanged;
const PostReactionPopup({super.key, required this.data, this.onChanged});
@override
@ -43,7 +43,7 @@ class _PostReactionPopupState extends State<PostReactionPopup> {
if (widget.onChanged != null) {
widget.onChanged!(
_reactions,
kTemplateReactions[symbol]!.attitude == 1,
kTemplateReactions[symbol]!.attitude,
1,
);
}
@ -54,7 +54,7 @@ class _PostReactionPopupState extends State<PostReactionPopup> {
if (widget.onChanged != null) {
widget.onChanged!(
_reactions,
kTemplateReactions[symbol]!.attitude == 1,
kTemplateReactions[symbol]!.attitude,
-1,
);
}
@ -89,11 +89,36 @@ class _PostReactionPopupState extends State<PostReactionPopup> {
.textStyle(Theme.of(context).textTheme.titleLarge!),
],
).padding(horizontal: 20, top: 16, bottom: 12),
Container(
color: Theme.of(context).colorScheme.surfaceContainer,
child: Row(
children: [
const Icon(Symbols.thumb_up, size: 16),
const Gap(8),
Text('postReactionUpvote').plural(widget.data.totalUpvote),
const Gap(24),
const Icon(Symbols.thumb_down, size: 16),
const Gap(8),
Text('postReactionDownvote').plural(widget.data.totalDownvote),
const Gap(24),
Icon(
widget.data.totalUpvote >= widget.data.totalDownvote
? Symbols.trending_up
: Symbols.trending_down,
size: 16,
),
const Gap(8),
Text('postReactionSocialPoint').plural(
widget.data.totalUpvote - widget.data.totalDownvote,
),
],
).padding(vertical: 8, horizontal: 24),
),
Expanded(
child: GridView.count(
child: GridView.extent(
crossAxisSpacing: 4,
mainAxisSpacing: 4,
crossAxisCount: 4,
maxCrossAxisExtent: 120,
children: kTemplateReactions.entries.map((e) {
return InkWell(
onTap: () {