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

🐛 Fix attachments can't be zoom

Browse Source
This commit is contained in:
LittleSheep 2025-04-02 00:31:00 +08:00
parent a75083d916
commit cf34a285b4
8 changed files with 257 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/providers/sn_network.dart
View File

@ -249,8 +249,11 @@ class SnNetworkProvider {
return null;
}
String getAttachmentUrl(String ky) {
String getAttachmentUrl(String ky, {bool preview = true}) {
if (ky.startsWith("http")) return ky;
if (!preview) {
return '${client.options.baseUrl}/cgi/uc/attachments/$ky?preview=false';
}
return '${client.options.baseUrl}/cgi/uc/attachments/$ky';
}

1
lib/types/account.dart
View File

@ -22,6 +22,7 @@ abstract class SnAccount with _$SnAccount {
required String language,
required SnAccountProfile? profile,
@Default([]) List<SnAccountBadge> badges,
@Default([]) List<SnPunishment> punishments,
required DateTime? suspendedAt,
required int? affiliatedId,
required int? affiliatedTo,

34
lib/types/account.freezed.dart
View File

@ -29,6 +29,7 @@ mixin _$SnAccount {
String get language;
SnAccountProfile? get profile;
List<SnAccountBadge> get badges;
List<SnPunishment> get punishments;
DateTime? get suspendedAt;
int? get affiliatedId;
int? get affiliatedTo;
@ -69,6 +70,8 @@ mixin _$SnAccount {
other.language == language) &&
(identical(other.profile, profile) || other.profile == profile) &&
const DeepCollectionEquality().equals(other.badges, badges) &&
const DeepCollectionEquality()
.equals(other.punishments, punishments) &&
(identical(other.suspendedAt, suspendedAt) ||
other.suspendedAt == suspendedAt) &&
(identical(other.affiliatedId, affiliatedId) ||
@ -99,6 +102,7 @@ mixin _$SnAccount {
language,
profile,
const DeepCollectionEquality().hash(badges),
const DeepCollectionEquality().hash(punishments),
suspendedAt,
affiliatedId,
affiliatedTo,
@ -108,7 +112,7 @@ mixin _$SnAccount {
@override
String toString() {
return 'SnAccount(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, confirmedAt: $confirmedAt, contacts: $contacts, avatar: $avatar, banner: $banner, name: $name, nick: $nick, permNodes: $permNodes, language: $language, profile: $profile, badges: $badges, suspendedAt: $suspendedAt, affiliatedId: $affiliatedId, affiliatedTo: $affiliatedTo, automatedBy: $automatedBy, automatedId: $automatedId)';
return 'SnAccount(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, confirmedAt: $confirmedAt, contacts: $contacts, avatar: $avatar, banner: $banner, name: $name, nick: $nick, permNodes: $permNodes, language: $language, profile: $profile, badges: $badges, punishments: $punishments, suspendedAt: $suspendedAt, affiliatedId: $affiliatedId, affiliatedTo: $affiliatedTo, automatedBy: $automatedBy, automatedId: $automatedId)';
}
}
@ -132,6 +136,7 @@ abstract mixin class $SnAccountCopyWith<$Res> {
String language,
SnAccountProfile? profile,
List<SnAccountBadge> badges,
List<SnPunishment> punishments,
DateTime? suspendedAt,
int? affiliatedId,
int? affiliatedTo,
@ -167,6 +172,7 @@ class _$SnAccountCopyWithImpl<$Res> implements $SnAccountCopyWith<$Res> {
Object? language = null,
Object? profile = freezed,
Object? badges = null,
Object? punishments = null,
Object? suspendedAt = freezed,
Object? affiliatedId = freezed,
Object? affiliatedTo = freezed,
@ -230,6 +236,10 @@ class _$SnAccountCopyWithImpl<$Res> implements $SnAccountCopyWith<$Res> {
? _self.badges
: badges // ignore: cast_nullable_to_non_nullable
as List<SnAccountBadge>,
punishments: null == punishments
? _self.punishments
: punishments // ignore: cast_nullable_to_non_nullable
as List<SnPunishment>,
suspendedAt: freezed == suspendedAt
? _self.suspendedAt
: suspendedAt // ignore: cast_nullable_to_non_nullable
@ -286,6 +296,7 @@ class _SnAccount extends SnAccount {
required this.language,
required this.profile,
final List<SnAccountBadge> badges = const [],
final List<SnPunishment> punishments = const [],
required this.suspendedAt,
required this.affiliatedId,
required this.affiliatedTo,
@ -294,6 +305,7 @@ class _SnAccount extends SnAccount {
: _contacts = contacts,
_permNodes = permNodes,
_badges = badges,
_punishments = punishments,
super._();
factory _SnAccount.fromJson(Map<String, dynamic> json) =>
_$SnAccountFromJson(json);
@ -350,6 +362,15 @@ class _SnAccount extends SnAccount {
return EqualUnmodifiableListView(_badges);
}
final List<SnPunishment> _punishments;
@override
@JsonKey()
List<SnPunishment> get punishments {
if (_punishments is EqualUnmodifiableListView) return _punishments;
// ignore: implicit_dynamic_type
return EqualUnmodifiableListView(_punishments);
}
@override
final DateTime? suspendedAt;
@override
@ -401,6 +422,8 @@ class _SnAccount extends SnAccount {
other.language == language) &&
(identical(other.profile, profile) || other.profile == profile) &&
const DeepCollectionEquality().equals(other._badges, _badges) &&
const DeepCollectionEquality()
.equals(other._punishments, _punishments) &&
(identical(other.suspendedAt, suspendedAt) ||
other.suspendedAt == suspendedAt) &&
(identical(other.affiliatedId, affiliatedId) ||
@ -431,6 +454,7 @@ class _SnAccount extends SnAccount {
language,
profile,
const DeepCollectionEquality().hash(_badges),
const DeepCollectionEquality().hash(_punishments),
suspendedAt,
affiliatedId,
affiliatedTo,
@ -440,7 +464,7 @@ class _SnAccount extends SnAccount {
@override
String toString() {
return 'SnAccount(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, confirmedAt: $confirmedAt, contacts: $contacts, avatar: $avatar, banner: $banner, name: $name, nick: $nick, permNodes: $permNodes, language: $language, profile: $profile, badges: $badges, suspendedAt: $suspendedAt, affiliatedId: $affiliatedId, affiliatedTo: $affiliatedTo, automatedBy: $automatedBy, automatedId: $automatedId)';
return 'SnAccount(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, confirmedAt: $confirmedAt, contacts: $contacts, avatar: $avatar, banner: $banner, name: $name, nick: $nick, permNodes: $permNodes, language: $language, profile: $profile, badges: $badges, punishments: $punishments, suspendedAt: $suspendedAt, affiliatedId: $affiliatedId, affiliatedTo: $affiliatedTo, automatedBy: $automatedBy, automatedId: $automatedId)';
}
}
@ -467,6 +491,7 @@ abstract mixin class _$SnAccountCopyWith<$Res>
String language,
SnAccountProfile? profile,
List<SnAccountBadge> badges,
List<SnPunishment> punishments,
DateTime? suspendedAt,
int? affiliatedId,
int? affiliatedTo,
@ -503,6 +528,7 @@ class __$SnAccountCopyWithImpl<$Res> implements _$SnAccountCopyWith<$Res> {
Object? language = null,
Object? profile = freezed,
Object? badges = null,
Object? punishments = null,
Object? suspendedAt = freezed,
Object? affiliatedId = freezed,
Object? affiliatedTo = freezed,
@ -566,6 +592,10 @@ class __$SnAccountCopyWithImpl<$Res> implements _$SnAccountCopyWith<$Res> {
? _self._badges
: badges // ignore: cast_nullable_to_non_nullable
as List<SnAccountBadge>,
punishments: null == punishments
? _self._punishments
: punishments // ignore: cast_nullable_to_non_nullable
as List<SnPunishment>,
suspendedAt: freezed == suspendedAt
? _self.suspendedAt
: suspendedAt // ignore: cast_nullable_to_non_nullable

5
lib/types/account.g.dart
View File

@ -32,6 +32,10 @@ _SnAccount _$SnAccountFromJson(Map<String, dynamic> json) => _SnAccount(
?.map((e) => SnAccountBadge.fromJson(e as Map<String, dynamic>))
.toList() ??
const [],
punishments: (json['punishments'] as List<dynamic>?)
?.map((e) => SnPunishment.fromJson(e as Map<String, dynamic>))
.toList() ??
const [],
suspendedAt: json['suspended_at'] == null
? null
: DateTime.parse(json['suspended_at'] as String),
@ -57,6 +61,7 @@ Map<String, dynamic> _$SnAccountToJson(_SnAccount instance) =>
'language': instance.language,
'profile': instance.profile?.toJson(),
'badges': instance.badges.map((e) => e.toJson()).toList(),
'punishments': instance.punishments.map((e) => e.toJson()).toList(),
'suspended_at': instance.suspendedAt?.toIso8601String(),
'affiliated_id': instance.affiliatedId,
'affiliated_to': instance.affiliatedTo,

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

@ -22,142 +22,147 @@ class AccountPopoverCard extends StatelessWidget {
Widget build(BuildContext context) {
final sn = context.read<SnNetworkProvider>();
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
if (data.banner.isNotEmpty)
Container(
color: Theme.of(context).colorScheme.surfaceContainer,
child: AspectRatio(
aspectRatio: 16 / 7,
child: AutoResizeUniversalImage(
sn.getAttachmentUrl(data.banner),
fit: BoxFit.cover,
),
),
),
// Top padding
Gap(16),
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AccountImage(
content: data.avatar,
radius: 20,
),
Gap(16),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Text(data.nick).bold(),
Text('@${data.name}').fontSize(13).opacity(0.75),
],
),
),
IconButton(
onPressed: () {
Navigator.pop(context);
GoRouter.of(context).pushReplacementNamed(
'accountProfilePage',
pathParameters: {'name': data.name},
);
},
icon: const Icon(Symbols.chevron_right),
padding: EdgeInsets.zero,
visualDensity: const VisualDensity(horizontal: -4, vertical: -4),
),
const Gap(8)
],
).padding(horizontal: 16),
if (data.badges.isNotEmpty)
Wrap(
spacing: 4,
children: data.badges
.map(
(ele) => AccountBadge(badge: ele),
)
.toList(),
).padding(horizontal: 24, bottom: 12, top: 12),
if (data.profile?.description.isNotEmpty ?? false)
Text(
data.profile?.description ?? '',
maxLines: 2,
overflow: TextOverflow.ellipsis,
).padding(horizontal: 26, bottom: 8),
Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
const Icon(Symbols.star),
const Gap(8),
Text('Lv${getLevelFromExp(data.profile?.experience ?? 0)}'),
const Gap(8),
Text(calcLevelUpProgressLevel(data.profile?.experience ?? 0))
.fontSize(11)
.opacity(0.5),
const Gap(8),
Container(
width: double.infinity,
constraints: const BoxConstraints(maxWidth: 160),
child: LinearProgressIndicator(
value: calcLevelUpProgress(data.profile?.experience ?? 0),
borderRadius: BorderRadius.circular(8),
backgroundColor: Theme.of(context).colorScheme.surfaceContainer,
).alignment(Alignment.centerLeft),
),
],
).padding(horizontal: 24),
FutureBuilder(
future: sn.client.get('/cgi/id/users/${data.name}/status'),
builder: (context, snapshot) {
final SnAccountStatusInfo? status = snapshot.hasData
? SnAccountStatusInfo.fromJson(snapshot.data!.data)
: null;
return Row(
children: [
Icon(
(status?.isDisturbable ?? true)
? Symbols.circle
: Symbols.do_not_disturb_on,
fill: (status?.isOnline ?? false) ? 1 : 0,
size: 16,
color: (status?.isOnline ?? false)
? (status?.isDisturbable ?? true)
? Colors.green
: Colors.red
: Colors.grey,
).padding(all: 4),
const Gap(8),
Text(
status != null
? (status.status?.label.isNotEmpty ?? false)
? status.status!.label
: status.isOnline
? 'accountStatusOnline'.tr()
: 'accountStatusOffline'.tr()
: 'loading'.tr(),
return SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (data.banner.isNotEmpty)
ClipRRect(
borderRadius: BorderRadius.circular(16),
child: Container(
color: Theme.of(context).colorScheme.surfaceContainer,
child: AspectRatio(
aspectRatio: 16 / 7,
child: AutoResizeUniversalImage(
sn.getAttachmentUrl(data.banner),
fit: BoxFit.cover,
),
),
if (status != null &&
!status.isOnline &&
status.lastSeenAt != null)
),
).padding(all: 16),
// Top padding
Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AccountImage(
content: data.avatar,
radius: 20,
),
Gap(16),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
Text(data.nick).bold(),
Text('@${data.name}').fontSize(13).opacity(0.75),
],
),
),
IconButton(
onPressed: () {
Navigator.pop(context);
GoRouter.of(context).pushReplacementNamed(
'accountProfilePage',
pathParameters: {'name': data.name},
);
},
icon: const Icon(Symbols.chevron_right),
padding: EdgeInsets.zero,
visualDensity:
const VisualDensity(horizontal: -4, vertical: -4),
),
const Gap(8)
],
).padding(horizontal: 16),
if (data.badges.isNotEmpty)
Wrap(
spacing: 4,
children: data.badges
.map(
(ele) => AccountBadge(badge: ele),
)
.toList(),
).padding(horizontal: 24, bottom: 12, top: 12),
if (data.profile?.description.isNotEmpty ?? false)
Text(
data.profile?.description ?? '',
maxLines: 2,
overflow: TextOverflow.ellipsis,
).padding(horizontal: 26, bottom: 8),
Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
const Icon(Symbols.star),
const Gap(8),
Text('Lv${getLevelFromExp(data.profile?.experience ?? 0)}'),
const Gap(8),
Text(calcLevelUpProgressLevel(data.profile?.experience ?? 0))
.fontSize(11)
.opacity(0.5),
const Gap(8),
Container(
width: double.infinity,
constraints: const BoxConstraints(maxWidth: 160),
child: LinearProgressIndicator(
value: calcLevelUpProgress(data.profile?.experience ?? 0),
borderRadius: BorderRadius.circular(8),
backgroundColor:
Theme.of(context).colorScheme.surfaceContainer,
).alignment(Alignment.centerLeft),
),
],
).padding(horizontal: 24),
FutureBuilder(
future: sn.client.get('/cgi/id/users/${data.name}/status'),
builder: (context, snapshot) {
final SnAccountStatusInfo? status = snapshot.hasData
? SnAccountStatusInfo.fromJson(snapshot.data!.data)
: null;
return Row(
children: [
Icon(
(status?.isDisturbable ?? true)
? Symbols.circle
: Symbols.do_not_disturb_on,
fill: (status?.isOnline ?? false) ? 1 : 0,
size: 16,
color: (status?.isOnline ?? false)
? (status?.isDisturbable ?? true)
? Colors.green
: Colors.red
: Colors.grey,
).padding(all: 4),
const Gap(8),
Text(
'accountStatusLastSeen'.tr(args: [
status.lastSeenAt != null
? RelativeTime(context).format(
status.lastSeenAt!.toLocal(),
)
: 'unknown',
]),
).padding(left: 6).opacity(0.75),
],
).padding(horizontal: 24);
},
),
// Bottom padding
const Gap(16),
],
status != null
? (status.status?.label.isNotEmpty ?? false)
? status.status!.label
: status.isOnline
? 'accountStatusOnline'.tr()
: 'accountStatusOffline'.tr()
: 'loading'.tr(),
),
if (status != null &&
!status.isOnline &&
status.lastSeenAt != null)
Text(
'accountStatusLastSeen'.tr(args: [
status.lastSeenAt != null
? RelativeTime(context).format(
status.lastSeenAt!.toLocal(),
)
: 'unknown',
]),
).padding(left: 6).opacity(0.75),
],
).padding(horizontal: 24);
},
),
// Bottom padding
const Gap(64),
],
),
);
}
}

123
lib/widgets/attachment/attachment_list.dart
View File

@ -170,17 +170,30 @@ class _AttachmentListState extends State<AttachmentList> {
child: Column(
children: widget.data
.mapIndexed(
(idx, ele) => GestureDetector(
child: AspectRatio(
aspectRatio: ele?.data['ratio']?.toDouble() ?? 1,
child: Container(
constraints: constraints,
child: AttachmentItem(
data: ele,
heroTag: heroTags[idx],
fit: BoxFit.cover,
filterQuality: widget.filterQuality,
),
(idx, ele) => AspectRatio(
aspectRatio: ele?.data['ratio']?.toDouble() ?? 1,
child: Container(
constraints: constraints,
child: AttachmentItem(
data: ele,
heroTag: heroTags[idx],
fit: BoxFit.cover,
filterQuality: widget.filterQuality,
onZoom: () {
context.pushTransparentRoute(
AttachmentZoomView(
data: widget.data
.where((ele) =>
ele != null &&
ele.mediaType == SnMediaType.image)
.cast(),
initialIndex: idx,
heroTags: heroTags,
),
backgroundColor: Colors.black.withOpacity(0.7),
rootNavigator: true,
);
},
),
),
),
@ -211,56 +224,52 @@ class _AttachmentListState extends State<AttachmentList> {
child: AspectRatio(
aspectRatio:
(widget.data[idx]?.data['ratio'] ?? 1).toDouble(),
child: GestureDetector(
onTap: () {
if (widget.data[idx]?.mediaType !=
SnMediaType.image) {
return;
}
context.pushTransparentRoute(
AttachmentZoomView(
data: widget.data
.where((ele) =>
ele != null &&
ele.mediaType == SnMediaType.image)
.cast(),
initialIndex: idx,
heroTags: heroTags,
),
backgroundColor: Colors.black.withOpacity(0.7),
rootNavigator: true,
);
},
child: Stack(
fit: StackFit.expand,
children: [
Container(
decoration: BoxDecoration(
color: backgroundColor,
border: Border.all(
width: 1,
color: Theme.of(context).dividerColor,
),
borderRadius: AttachmentList.kDefaultRadius,
child: Stack(
fit: StackFit.expand,
children: [
Container(
decoration: BoxDecoration(
color: backgroundColor,
border: Border.all(
width: 1,
color: Theme.of(context).dividerColor,
),
child: ClipRRect(
borderRadius: AttachmentList.kDefaultRadius,
child: AttachmentItem(
data: widget.data[idx],
heroTag: heroTags[idx],
filterQuality: widget.filterQuality,
),
borderRadius: AttachmentList.kDefaultRadius,
),
child: ClipRRect(
borderRadius: AttachmentList.kDefaultRadius,
child: AttachmentItem(
data: widget.data[idx],
heroTag: heroTags[idx],
filterQuality: widget.filterQuality,
onZoom: () {
context.pushTransparentRoute(
AttachmentZoomView(
data: widget.data
.where((ele) =>
ele != null &&
ele.mediaType ==
SnMediaType.image)
.cast(),
initialIndex: idx,
heroTags: heroTags,
),
backgroundColor:
Colors.black.withOpacity(0.7),
rootNavigator: true,
);
},
),
),
Positioned(
right: 8,
bottom: 8,
child: Chip(
label: Text('${idx + 1}/${widget.data.length}'),
),
),
Positioned(
right: 8,
bottom: 8,
child: Chip(
label: Text('${idx + 1}/${widget.data.length}'),
),
],
),
),
],
),
),
);

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

@ -181,7 +181,10 @@ class _AttachmentZoomViewState extends State<AttachmentZoomView> {
scaleState == PhotoViewScaleState.initial);
},
imageProvider: UniversalImage.provider(
sn.getAttachmentUrl(widget.data.first.rid),
sn.getAttachmentUrl(
widget.data.first.rid,
preview: false,
),
),
),
);
@ -199,7 +202,10 @@ class _AttachmentZoomViewState extends State<AttachmentZoomView> {
widget.heroTags?.elementAt(idx) ?? uuid.v4();
return PhotoViewGalleryPageOptions(
imageProvider: UniversalImage.provider(
sn.getAttachmentUrl(widget.data.elementAt(idx).rid),
sn.getAttachmentUrl(
widget.data.elementAt(idx).rid,
preview: false,
),
),
heroAttributes: PhotoViewHeroAttributes(
tag: 'attachment-${widget.data.first.rid}-$heroTag',

18
lib/widgets/chat/chat_message.dart
View File

@ -1,11 +1,8 @@
import 'dart:math' as math;
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter_context_menu/flutter_context_menu.dart';
import 'package:gap/gap.dart';
import 'package:material_symbols_icons/symbols.dart';
import 'package:popover/popover.dart';
import 'package:provider/provider.dart';
import 'package:styled_widget/styled_widget.dart';
import 'package:surface/providers/config.dart';
@ -120,20 +117,9 @@ class ChatMessage extends StatelessWidget {
),
onTap: () {
if (user == null) return;
showPopover(
backgroundColor:
Theme.of(context).colorScheme.surface,
showModalBottomSheet(
context: context,
transition: PopoverTransition.other,
bodyBuilder: (context) => SizedBox(
width: math.min(
400, MediaQuery.of(context).size.width - 10),
child: AccountPopoverCard(data: user),
),
direction: PopoverDirection.bottom,
arrowHeight: 5,
arrowWidth: 15,
arrowDxOffset: -190,
builder: (context) => AccountPopoverCard(data: user),
);
},
)