HyperNet/Surface
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

💄 Use bottom modal sheet instead of popover

Browse Source 
✨ Show strike on user profile page
This commit is contained in:
LittleSheep 2025-04-02 00:51:46 +08:00
parent cf34a285b4
commit d5cf2478d8
5 changed files with 234 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/screens/account/profile_page.dart
View File

@ -15,6 +15,7 @@ import 'package:surface/providers/experience.dart';
import 'package:surface/providers/relationship.dart'; import 'package:surface/providers/relationship.dart';
import 'package:surface/providers/sn_network.dart'; import 'package:surface/providers/sn_network.dart';
import 'package:surface/screens/abuse_report.dart'; import 'package:surface/screens/abuse_report.dart';
import 'package:surface/screens/account/punishments.dart';
import 'package:surface/types/account.dart'; import 'package:surface/types/account.dart';
import 'package:surface/types/check_in.dart'; import 'package:surface/types/check_in.dart';
import 'package:surface/types/post.dart'; import 'package:surface/types/post.dart';
@ -457,7 +458,7 @@ class _UserScreenState extends State<UserScreen>
], ],
).padding(right: 8), ).padding(right: 8),
if (_account!.profile!.description.isNotEmpty) if (_account!.profile!.description.isNotEmpty)
const Gap(12) const Gap(4)
else else
const Gap(8), const Gap(8),
if (_account!.profile!.description.isNotEmpty) if (_account!.profile!.description.isNotEmpty)
@ -503,14 +504,15 @@ class _UserScreenState extends State<UserScreen>
], ],
).padding(vertical: 8, horizontal: 12), ).padding(vertical: 8, horizontal: 12),
), ),
const Gap(8), if (_account!.badges.isNotEmpty) const Gap(8),
Wrap( if (_account!.badges.isNotEmpty)
spacing: 4, Wrap(
runSpacing: 4, spacing: 4,
children: _account!.badges runSpacing: 4,
.map((ele) => AccountBadge(badge: ele)) children: _account!.badges
.toList(), .map((ele) => AccountBadge(badge: ele))
).padding(horizontal: 8), .toList(),
).padding(horizontal: 8),
const Gap(8), const Gap(8),
Column( Column(
children: [ children: [
@ -619,6 +621,17 @@ class _UserScreenState extends State<UserScreen>
], ],
).padding(all: 16), ).padding(all: 16),
), ),
if (_account?.punishments.isNotEmpty ?? false)
SliverToBoxAdapter(child: const Divider()),
if (_account?.punishments.isNotEmpty ?? false)
SliverToBoxAdapter(
child: Column(
children: [
for (final ele in _account!.punishments)
PunishmentInfoCard(ele: ele),
],
),
),
if (_account?.profile?.links.isNotEmpty ?? false) if (_account?.profile?.links.isNotEmpty ?? false)
SliverToBoxAdapter(child: const Divider()), SliverToBoxAdapter(child: const Divider()),
if (_account?.profile?.links.isNotEmpty ?? false) if (_account?.profile?.links.isNotEmpty ?? false)

148
lib/screens/account/punishments.dart
View File

@ -107,74 +107,7 @@ class _PunishmentsScreenState extends State<PunishmentsScreen> {
itemCount: _punishments?.length ?? 0, itemCount: _punishments?.length ?? 0,
itemBuilder: (context, index) { itemBuilder: (context, index) {
final ele = _punishments![index]; final ele = _punishments![index];
return Card( return PunishmentInfoCard(ele: ele);
margin: EdgeInsets.symmetric(horizontal: 8),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Icon(kPunishmentIcons[ele.type], size: 20),
const Gap(6),
Expanded(
child: Text('punishmentType${ele.type}')
.tr()
.fontSize(16)
.bold(),
),
],
),
Text(ele.reason),
const Gap(4),
Text(
'punishmentCreatedAt'.tr(args: [
DateFormat().format(
ele.createdAt.toLocal(),
)
]),
).opacity(0.8),
Text(
ele.expiredAt == null
? 'punishmentExpiredNever'.tr()
: 'punishmentExpiredAt'.tr(args: [
DateFormat().format(
ele.expiredAt!.toLocal(),
)
]),
).opacity(0.8),
const Gap(8),
if (ele.moderator != null)
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('punishmentModerator').tr().opacity(0.75),
InkWell(
child: Row(
children: [
AccountImage(
content: ele.moderator!.avatar,
radius: 8,
),
const Gap(4),
Text(ele.moderator?.nick ?? 'unknown'),
],
),
onTap: () {
GoRouter.of(context).pushNamed(
'accountProfilePage',
pathParameters: {
'name': ele.moderator!.name,
},
);
},
),
],
)
else
Text('punishmentMadeBySystem').tr().opacity(0.75),
],
).padding(horizontal: 24, vertical: 16),
);
}, },
separatorBuilder: (_, __) => const Gap(8), separatorBuilder: (_, __) => const Gap(8),
), ),
@ -185,3 +118,82 @@ class _PunishmentsScreenState extends State<PunishmentsScreen> {
); );
} }
} }
class PunishmentInfoCard extends StatelessWidget {
const PunishmentInfoCard({
super.key,
required this.ele,
});
final SnPunishment ele;
@override
Widget build(BuildContext context) {
return Card(
margin: EdgeInsets.symmetric(horizontal: 8),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Icon(kPunishmentIcons[ele.type], size: 20),
const Gap(6),
Expanded(
child:
Text('punishmentType${ele.type}').tr().fontSize(16).bold(),
),
],
),
Text(ele.reason),
const Gap(4),
Text(
'punishmentCreatedAt'.tr(args: [
DateFormat().format(
ele.createdAt.toLocal(),
)
]),
).opacity(0.8),
Text(
ele.expiredAt == null
? 'punishmentExpiredNever'.tr()
: 'punishmentExpiredAt'.tr(args: [
DateFormat().format(
ele.expiredAt!.toLocal(),
)
]),
).opacity(0.8),
const Gap(8),
if (ele.moderator != null)
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('punishmentModerator').tr().opacity(0.75),
InkWell(
child: Row(
children: [
AccountImage(
content: ele.moderator!.avatar,
radius: 8,
),
const Gap(4),
Text(ele.moderator?.nick ?? 'unknown'),
],
),
onTap: () {
GoRouter.of(context).pushNamed(
'accountProfilePage',
pathParameters: {
'name': ele.moderator!.name,
},
);
},
),
],
)
else
Text('punishmentMadeBySystem').tr().opacity(0.75),
],
).padding(horizontal: 24, vertical: 16),
);
}
}

8
lib/widgets/account/account_popover.dart
View File

@ -39,7 +39,9 @@ class AccountPopoverCard extends StatelessWidget {
), ),
), ),
), ),
).padding(all: 16), ).padding(all: 16)
else
const Gap(16),
// Top padding // Top padding
Row( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -89,7 +91,9 @@ class AccountPopoverCard extends StatelessWidget {
data.profile?.description ?? '', data.profile?.description ?? '',
maxLines: 2, maxLines: 2,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
).padding(horizontal: 26, bottom: 8), ).padding(horizontal: 26, bottom: 8)
else
const Gap(12),
Row( Row(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [

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

@ -12,7 +12,6 @@ import 'package:go_router/go_router.dart';
import 'package:google_fonts/google_fonts.dart'; import 'package:google_fonts/google_fonts.dart';
import 'package:material_symbols_icons/symbols.dart'; import 'package:material_symbols_icons/symbols.dart';
import 'package:path_provider/path_provider.dart'; import 'package:path_provider/path_provider.dart';
import 'package:popover/popover.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:qr_flutter/qr_flutter.dart'; import 'package:qr_flutter/qr_flutter.dart';
import 'package:relative_time/relative_time.dart'; import 'package:relative_time/relative_time.dart';
@ -1274,20 +1273,11 @@ class _PostAvatar extends StatelessWidget {
), ),
), ),
onTap: () { onTap: () {
showPopover( showModalBottomSheet(
backgroundColor: Theme.of(context).colorScheme.surface,
context: context, context: context,
transition: PopoverTransition.other, builder: (context) => PublisherPopoverCard(
bodyBuilder: (context) => SizedBox( data: data.publisher,
width: math.min(400, MediaQuery.of(context).size.width - 10),
child: PublisherPopoverCard(
data: data.publisher,
),
), ),
direction: PopoverDirection.bottom,
arrowHeight: 5,
arrowWidth: 15,
arrowDxOffset: -190,
); );
}, },
); );

234
lib/widgets/post/publisher_popover.dart
View File

@ -24,125 +24,137 @@ class PublisherPopoverCard extends StatelessWidget {
final user = data.type == 0 ? ud.getFromCache(data.accountId) : null; final user = data.type == 0 ? ud.getFromCache(data.accountId) : null;
return Column( return SingleChildScrollView(
crossAxisAlignment: CrossAxisAlignment.start, child: Column(
mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
if (data.banner.isNotEmpty) if (data.banner.isNotEmpty)
Container( ClipRRect(
color: Theme.of(context).colorScheme.surfaceContainer, borderRadius: BorderRadius.circular(16),
child: AspectRatio( child: Container(
aspectRatio: 16 / 7, color: Theme.of(context).colorScheme.surfaceContainer,
child: AutoResizeUniversalImage( child: AspectRatio(
sn.getAttachmentUrl(data.banner), aspectRatio: 16 / 7,
fit: BoxFit.cover, child: AutoResizeUniversalImage(
sn.getAttachmentUrl(data.banner),
fit: BoxFit.cover,
),
),
), ),
), ).padding(all: 16)
), else
// Top padding // Top padding
Gap(16),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AccountImage(
content: data.avatar,
radius: 20,
borderRadius: data.type == 1 ? 8 : 20,
),
Gap(16), Gap(16),
Expanded( Row(
child: Column( crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: [
mainAxisSize: MainAxisSize.min, AccountImage(
children: [ content: data.avatar,
Text(data.nick).bold(), radius: 20,
Text('@${data.name}').fontSize(13).opacity(0.75), borderRadius: data.type == 1 ? 8 : 20,
],
), ),
), Gap(16),
IconButton( Expanded(
onPressed: () { child: Column(
Navigator.pop(context); crossAxisAlignment: CrossAxisAlignment.start,
GoRouter.of(context).pushNamed( mainAxisSize: MainAxisSize.min,
'postPublisher', children: [
pathParameters: {'name': data.name}, Text(data.nick).bold(),
); Text('@${data.name}').fontSize(13).opacity(0.75),
}, ],
icon: const Icon(Symbols.chevron_right), ),
padding: EdgeInsets.zero,
visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
),
const Gap(8)
],
).padding(horizontal: 16),
if (user != null && user.badges.isNotEmpty)
Wrap(
spacing: 4,
children: user.badges
.map(
(ele) => AccountBadge(badge: ele),
)
.toList(),
).padding(horizontal: 24, top: 16),
const Gap(16),
if (data.description.isNotEmpty)
Text(
data.description,
maxLines: 2,
overflow: TextOverflow.ellipsis,
).padding(horizontal: 26, bottom: 20),
Row(
children: [
Expanded(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text('publisherSocialPoint').tr().fontSize(13).opacity(0.75),
Text((data.totalUpvote - data.totalDownvote).toString()),
],
), ),
), IconButton(
SizedBox( onPressed: () {
height: 20, Navigator.pop(context);
child: const VerticalDivider( GoRouter.of(context).pushNamed(
thickness: 1, 'postPublisher',
pathParameters: {'name': data.name},
);
},
icon: const Icon(Symbols.chevron_right),
padding: EdgeInsets.zero,
visualDensity:
const VisualDensity(horizontal: -4, vertical: -4),
), ),
).padding(horizontal: 8), const Gap(8)
Expanded( ],
child: Column( ).padding(horizontal: 16),
mainAxisSize: MainAxisSize.min, if (user != null && user.badges.isNotEmpty)
crossAxisAlignment: CrossAxisAlignment.center, Wrap(
children: [ spacing: 4,
Text('publisherTotalUpvote').tr().fontSize(13).opacity(0.75), children: user.badges
Text(data.totalUpvote.toString()), .map(
], (ele) => AccountBadge(badge: ele),
)
.toList(),
).padding(horizontal: 24, top: 16),
const Gap(16),
if (data.description.isNotEmpty)
Text(
data.description,
maxLines: 2,
overflow: TextOverflow.ellipsis,
).padding(horizontal: 26, bottom: 20),
Row(
children: [
Expanded(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text('publisherSocialPoint')
.tr()
.fontSize(13)
.opacity(0.75),
Text((data.totalUpvote - data.totalDownvote).toString()),
],
),
), ),
), SizedBox(
SizedBox( height: 20,
height: 20, child: const VerticalDivider(
child: const VerticalDivider( thickness: 1,
thickness: 1, ),
).padding(horizontal: 8),
Expanded(
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text('publisherTotalUpvote')
.tr()
.fontSize(13)
.opacity(0.75),
Text(data.totalUpvote.toString()),
],
),
), ),
).padding(horizontal: 8), SizedBox(
Expanded( height: 20,
child: Column( child: const VerticalDivider(
mainAxisSize: MainAxisSize.min, thickness: 1,
crossAxisAlignment: CrossAxisAlignment.center, ),
children: [ ).padding(horizontal: 8),
Text('publisherTotalDownvote') Expanded(
.tr() child: Column(
.fontSize(13) mainAxisSize: MainAxisSize.min,
.opacity(0.75), crossAxisAlignment: CrossAxisAlignment.center,
Text(data.totalDownvote.toString()), children: [
], Text('publisherTotalDownvote')
.tr()
.fontSize(13)
.opacity(0.75),
Text(data.totalDownvote.toString()),
],
),
), ),
), ],
], ).padding(horizontal: 16),
).padding(horizontal: 16), // Bottom padding
// Bottom padding const Gap(64),
const Gap(16), ],
], ),
); );
} }
} }