✨ Quoted (repost) post

✨ Sensitive content blur
2024-11-13 22:05:40 +08:00 · 2024-11-13 21:36:28 +08:00
13 changed files with 456 additions and 210 deletions
--- a/assets/translations/en-US.json
+++ b/assets/translations/en-US.json
@ -125,5 +125,9 @@
  "settingsNetworkServerResetDescription": "Reset to the official server address of Solar Network.",
  "settingsNetworkServerPreset": "Present HyperNet Server",
  "settingsNetworkServerPresetDescription": "You can choose one of our preset HyperNet server addresses from the list on the right.",
-  "settingsNetworkServerSaved": "Server address saved."
+  "settingsNetworkServerSaved": "Server address saved.",
+  "sensitiveContent": "Sensitive Content",
+  "sensitiveContentCollapsed": "Sensitive content has been collapsed.",
+  "sensitiveContentDescription": "This content has been marked as sensitive, and may not be suitable for all viewers.",
+  "sensitiveContentReveal": "Reveal"
 }
--- a/assets/translations/zh-CN.json
+++ b/assets/translations/zh-CN.json
@ -125,5 +125,9 @@
  "settingsNetworkServerResetDescription": "重设为 Solar Network 的服务器地址。",
  "settingsNetworkServerPreset": "预设的 HyperNet 服务器",
  "settingsNetworkServerPresetDescription": "你可以在旁边的列表中选择我们提供的预设 HyperNet 服务器地址。",
-  "settingsNetworkServerSaved": "服务器地址已保存。"
+  "settingsNetworkServerSaved": "服务器地址已保存。",
+  "sensitiveContent": "敏感内容",
+  "sensitiveContentCollapsed": "敏感内容已折叠。",
+  "sensitiveContentDescription": "此内容已被标记，可能不适合所有人查看。",
+  "sensitiveContentReveal": "显示内容"
 }
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@ -161,7 +161,6 @@
 				64FBE78F9C282712818D6D95 /* Pods-RunnerTests.release.xcconfig */,
 				96081771773FA019A97CCC3F /* Pods-RunnerTests.profile.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@ -474,6 +473,7 @@
 				DEVELOPMENT_TEAM = W7HPZ53V6B;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = Solian;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@ -657,6 +657,7 @@
 				DEVELOPMENT_TEAM = W7HPZ53V6B;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = Solian;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@ -680,6 +681,7 @@
 				DEVELOPMENT_TEAM = W7HPZ53V6B;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = Solian;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>Surface</string>
+	<string>Solian</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@ -13,7 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>surface</string>
+	<string>Solian</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
--- a/lib/screens/post/post_detail.dart
+++ b/lib/screens/post/post_detail.dart
@ -47,13 +47,11 @@ class _PostDetailScreenState extends State<PostDetailScreen> {
        resp.data['body']['attachments']?.cast<String>() ?? [],
      );
      if (!mounted) return;
-      setState(() {
      _data = SnPost.fromJson(resp.data).copyWith(
        preload: SnPostPreload(
          attachments: attachments,
        ),
      );
-      });
    } catch (err) {
      context.showErrorDialog(err);
    } finally {
@ -87,13 +85,19 @@ class _PostDetailScreenState extends State<PostDetailScreen> {
          },
        ),
        flexibleSpace: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
          children: [
+            if (_data?.body['title'] != null)
              Text(_data?.body['title'] ?? 'postNoun'.tr())
                  .textStyle(Theme.of(context).textTheme.titleLarge!)
                  .textColor(Colors.white),
-            Text('postDetail')
-                .tr()
-                .textColor(Colors.white.withAlpha((255 * 0.9).round())),
+            if (_data?.body['title'] != null)
+              Text('postDetail'.tr())
+                  .textColor(Colors.white.withAlpha((255 * 0.9).round()))
+            else
+              Text('postDetail'.tr())
+                  .textStyle(Theme.of(context).textTheme.titleLarge!)
+                  .textColor(Colors.white),
          ],
        ).padding(top: math.max(MediaQuery.of(context).padding.top, 8)),
      ),
@ -104,7 +108,10 @@ class _PostDetailScreenState extends State<PostDetailScreen> {
          ),
          if (_data != null)
            SliverToBoxAdapter(
-              child: PostItem(data: _data!, showComments: false),
+              child: PostItem(
+                data: _data!,
+                showComments: false,
+              ),
            ),
          const SliverToBoxAdapter(child: Divider(height: 1)),
          if (_data != null)
--- a/lib/types/post.dart
+++ b/lib/types/post.dart
@ -20,13 +20,13 @@ class SnPost with _$SnPost {
    required String? aliasPrefix,
    required List<dynamic> tags,
    required List<dynamic> categories,
-    required dynamic replies,
-    required dynamic replyId,
-    required dynamic repostId,
-    required dynamic replyTo,
-    required dynamic repostTo,
-    required dynamic visibleUsersList,
-    required dynamic invisibleUsersList,
+    required List<SnPost>? replies,
+    required int? replyId,
+    required int? repostId,
+    required SnPost? replyTo,
+    required SnPost? repostTo,
+    required List<int>? visibleUsersList,
+    required List<int>? invisibleUsersList,
    required int visibility,
    required DateTime? editedAt,
    required DateTime? pinnedAt,
--- a/lib/types/post.freezed.dart
+++ b/lib/types/post.freezed.dart
@ -31,13 +31,13 @@ mixin _$SnPost {
  String? get aliasPrefix => throw _privateConstructorUsedError;
  List<dynamic> get tags => throw _privateConstructorUsedError;
  List<dynamic> get categories => throw _privateConstructorUsedError;
-  dynamic get replies => throw _privateConstructorUsedError;
-  dynamic get replyId => throw _privateConstructorUsedError;
-  dynamic get repostId => throw _privateConstructorUsedError;
-  dynamic get replyTo => throw _privateConstructorUsedError;
-  dynamic get repostTo => throw _privateConstructorUsedError;
-  dynamic get visibleUsersList => throw _privateConstructorUsedError;
-  dynamic get invisibleUsersList => throw _privateConstructorUsedError;
+  List<SnPost>? get replies => throw _privateConstructorUsedError;
+  int? get replyId => throw _privateConstructorUsedError;
+  int? get repostId => throw _privateConstructorUsedError;
+  SnPost? get replyTo => throw _privateConstructorUsedError;
+  SnPost? get repostTo => throw _privateConstructorUsedError;
+  List<int>? get visibleUsersList => throw _privateConstructorUsedError;
+  List<int>? get invisibleUsersList => throw _privateConstructorUsedError;
  int get visibility => throw _privateConstructorUsedError;
  DateTime? get editedAt => throw _privateConstructorUsedError;
  DateTime? get pinnedAt => throw _privateConstructorUsedError;
@ -78,13 +78,13 @@ abstract class $SnPostCopyWith<$Res> {
      String? aliasPrefix,
      List<dynamic> tags,
      List<dynamic> categories,
-      dynamic replies,
-      dynamic replyId,
-      dynamic repostId,
-      dynamic replyTo,
-      dynamic repostTo,
-      dynamic visibleUsersList,
-      dynamic invisibleUsersList,
+      List<SnPost>? replies,
+      int? replyId,
+      int? repostId,
+      SnPost? replyTo,
+      SnPost? repostTo,
+      List<int>? visibleUsersList,
+      List<int>? invisibleUsersList,
      int visibility,
      DateTime? editedAt,
      DateTime? pinnedAt,
@ -99,6 +99,8 @@ abstract class $SnPostCopyWith<$Res> {
      SnMetric metric,
      SnPostPreload? preload});

+  $SnPostCopyWith<$Res>? get replyTo;
+  $SnPostCopyWith<$Res>? get repostTo;
  $SnPublisherCopyWith<$Res> get publisher;
  $SnMetricCopyWith<$Res> get metric;
  $SnPostPreloadCopyWith<$Res>? get preload;
@ -199,31 +201,31 @@ class _$SnPostCopyWithImpl<$Res, $Val extends SnPost>
      replies: freezed == replies
          ? _value.replies
          : replies // ignore: cast_nullable_to_non_nullable
-              as dynamic,
+              as List<SnPost>?,
      replyId: freezed == replyId
          ? _value.replyId
          : replyId // ignore: cast_nullable_to_non_nullable
-              as dynamic,
+              as int?,
      repostId: freezed == repostId
          ? _value.repostId
          : repostId // ignore: cast_nullable_to_non_nullable
-              as dynamic,
+              as int?,
      replyTo: freezed == replyTo
          ? _value.replyTo
          : replyTo // ignore: cast_nullable_to_non_nullable
-              as dynamic,
+              as SnPost?,
      repostTo: freezed == repostTo
          ? _value.repostTo
          : repostTo // ignore: cast_nullable_to_non_nullable
-              as dynamic,
+              as SnPost?,
      visibleUsersList: freezed == visibleUsersList
          ? _value.visibleUsersList
          : visibleUsersList // ignore: cast_nullable_to_non_nullable
-              as dynamic,
+              as List<int>?,
      invisibleUsersList: freezed == invisibleUsersList
          ? _value.invisibleUsersList
          : invisibleUsersList // ignore: cast_nullable_to_non_nullable
-              as dynamic,
+              as List<int>?,
      visibility: null == visibility
          ? _value.visibility
          : visibility // ignore: cast_nullable_to_non_nullable
@ -279,6 +281,34 @@ class _$SnPostCopyWithImpl<$Res, $Val extends SnPost>
    ) as $Val);
  }

+  /// Create a copy of SnPost
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $SnPostCopyWith<$Res>? get replyTo {
+    if (_value.replyTo == null) {
+      return null;
+    }
+
+    return $SnPostCopyWith<$Res>(_value.replyTo!, (value) {
+      return _then(_value.copyWith(replyTo: value) as $Val);
+    });
+  }
+
+  /// Create a copy of SnPost
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @pragma('vm:prefer-inline')
+  $SnPostCopyWith<$Res>? get repostTo {
+    if (_value.repostTo == null) {
+      return null;
+    }
+
+    return $SnPostCopyWith<$Res>(_value.repostTo!, (value) {
+      return _then(_value.copyWith(repostTo: value) as $Val);
+    });
+  }
+
  /// Create a copy of SnPost
  /// with the given fields replaced by the non-null parameter values.
  @override
@ -333,13 +363,13 @@ abstract class _$$SnPostImplCopyWith<$Res> implements $SnPostCopyWith<$Res> {
      String? aliasPrefix,
      List<dynamic> tags,
      List<dynamic> categories,
-      dynamic replies,
-      dynamic replyId,
-      dynamic repostId,
-      dynamic replyTo,
-      dynamic repostTo,
-      dynamic visibleUsersList,
-      dynamic invisibleUsersList,
+      List<SnPost>? replies,
+      int? replyId,
+      int? repostId,
+      SnPost? replyTo,
+      SnPost? repostTo,
+      List<int>? visibleUsersList,
+      List<int>? invisibleUsersList,
      int visibility,
      DateTime? editedAt,
      DateTime? pinnedAt,
@ -354,6 +384,10 @@ abstract class _$$SnPostImplCopyWith<$Res> implements $SnPostCopyWith<$Res> {
      SnMetric metric,
      SnPostPreload? preload});

+  @override
+  $SnPostCopyWith<$Res>? get replyTo;
+  @override
+  $SnPostCopyWith<$Res>? get repostTo;
  @override
  $SnPublisherCopyWith<$Res> get publisher;
  @override
@ -453,33 +487,33 @@ class __$$SnPostImplCopyWithImpl<$Res>
          : categories // ignore: cast_nullable_to_non_nullable
              as List<dynamic>,
      replies: freezed == replies
-          ? _value.replies
+          ? _value._replies
          : replies // ignore: cast_nullable_to_non_nullable
-              as dynamic,
+              as List<SnPost>?,
      replyId: freezed == replyId
          ? _value.replyId
          : replyId // ignore: cast_nullable_to_non_nullable
-              as dynamic,
+              as int?,
      repostId: freezed == repostId
          ? _value.repostId
          : repostId // ignore: cast_nullable_to_non_nullable
-              as dynamic,
+              as int?,
      replyTo: freezed == replyTo
          ? _value.replyTo
          : replyTo // ignore: cast_nullable_to_non_nullable
-              as dynamic,
+              as SnPost?,
      repostTo: freezed == repostTo
          ? _value.repostTo
          : repostTo // ignore: cast_nullable_to_non_nullable
-              as dynamic,
+              as SnPost?,
      visibleUsersList: freezed == visibleUsersList
-          ? _value.visibleUsersList
+          ? _value._visibleUsersList
          : visibleUsersList // ignore: cast_nullable_to_non_nullable
-              as dynamic,
+              as List<int>?,
      invisibleUsersList: freezed == invisibleUsersList
-          ? _value.invisibleUsersList
+          ? _value._invisibleUsersList
          : invisibleUsersList // ignore: cast_nullable_to_non_nullable
-              as dynamic,
+              as List<int>?,
      visibility: null == visibility
          ? _value.visibility
          : visibility // ignore: cast_nullable_to_non_nullable
@ -551,13 +585,13 @@ class _$SnPostImpl extends _SnPost {
      required this.aliasPrefix,
      required final List<dynamic> tags,
      required final List<dynamic> categories,
-      required this.replies,
+      required final List<SnPost>? replies,
      required this.replyId,
      required this.repostId,
      required this.replyTo,
      required this.repostTo,
-      required this.visibleUsersList,
-      required this.invisibleUsersList,
+      required final List<int>? visibleUsersList,
+      required final List<int>? invisibleUsersList,
      required this.visibility,
      required this.editedAt,
      required this.pinnedAt,
@ -574,6 +608,9 @@ class _$SnPostImpl extends _SnPost {
      : _body = body,
        _tags = tags,
        _categories = categories,
+        _replies = replies,
+        _visibleUsersList = visibleUsersList,
+        _invisibleUsersList = invisibleUsersList,
        super._();

  factory _$SnPostImpl.fromJson(Map<String, dynamic> json) =>
@ -619,20 +656,46 @@ class _$SnPostImpl extends _SnPost {
    return EqualUnmodifiableListView(_categories);
  }

+  final List<SnPost>? _replies;
  @override
-  final dynamic replies;
+  List<SnPost>? get replies {
+    final value = _replies;
+    if (value == null) return null;
+    if (_replies is EqualUnmodifiableListView) return _replies;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(value);
+  }
+
  @override
-  final dynamic replyId;
+  final int? replyId;
  @override
-  final dynamic repostId;
+  final int? repostId;
  @override
-  final dynamic replyTo;
+  final SnPost? replyTo;
  @override
-  final dynamic repostTo;
+  final SnPost? repostTo;
+  final List<int>? _visibleUsersList;
  @override
-  final dynamic visibleUsersList;
+  List<int>? get visibleUsersList {
+    final value = _visibleUsersList;
+    if (value == null) return null;
+    if (_visibleUsersList is EqualUnmodifiableListView)
+      return _visibleUsersList;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(value);
+  }
+
+  final List<int>? _invisibleUsersList;
  @override
-  final dynamic invisibleUsersList;
+  List<int>? get invisibleUsersList {
+    final value = _invisibleUsersList;
+    if (value == null) return null;
+    if (_invisibleUsersList is EqualUnmodifiableListView)
+      return _invisibleUsersList;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(value);
+  }
+
  @override
  final int visibility;
  @override
@ -687,15 +750,17 @@ class _$SnPostImpl extends _SnPost {
            const DeepCollectionEquality().equals(other._tags, _tags) &&
            const DeepCollectionEquality()
                .equals(other._categories, _categories) &&
-            const DeepCollectionEquality().equals(other.replies, replies) &&
-            const DeepCollectionEquality().equals(other.replyId, replyId) &&
-            const DeepCollectionEquality().equals(other.repostId, repostId) &&
-            const DeepCollectionEquality().equals(other.replyTo, replyTo) &&
-            const DeepCollectionEquality().equals(other.repostTo, repostTo) &&
+            const DeepCollectionEquality().equals(other._replies, _replies) &&
+            (identical(other.replyId, replyId) || other.replyId == replyId) &&
+            (identical(other.repostId, repostId) ||
+                other.repostId == repostId) &&
+            (identical(other.replyTo, replyTo) || other.replyTo == replyTo) &&
+            (identical(other.repostTo, repostTo) ||
+                other.repostTo == repostTo) &&
            const DeepCollectionEquality()
-                .equals(other.visibleUsersList, visibleUsersList) &&
+                .equals(other._visibleUsersList, _visibleUsersList) &&
            const DeepCollectionEquality()
-                .equals(other.invisibleUsersList, invisibleUsersList) &&
+                .equals(other._invisibleUsersList, _invisibleUsersList) &&
            (identical(other.visibility, visibility) ||
                other.visibility == visibility) &&
            (identical(other.editedAt, editedAt) ||
@ -736,13 +801,13 @@ class _$SnPostImpl extends _SnPost {
        aliasPrefix,
        const DeepCollectionEquality().hash(_tags),
        const DeepCollectionEquality().hash(_categories),
-        const DeepCollectionEquality().hash(replies),
-        const DeepCollectionEquality().hash(replyId),
-        const DeepCollectionEquality().hash(repostId),
-        const DeepCollectionEquality().hash(replyTo),
-        const DeepCollectionEquality().hash(repostTo),
-        const DeepCollectionEquality().hash(visibleUsersList),
-        const DeepCollectionEquality().hash(invisibleUsersList),
+        const DeepCollectionEquality().hash(_replies),
+        replyId,
+        repostId,
+        replyTo,
+        repostTo,
+        const DeepCollectionEquality().hash(_visibleUsersList),
+        const DeepCollectionEquality().hash(_invisibleUsersList),
        visibility,
        editedAt,
        pinnedAt,
@ -787,13 +852,13 @@ abstract class _SnPost extends SnPost {
      required final String? aliasPrefix,
      required final List<dynamic> tags,
      required final List<dynamic> categories,
-      required final dynamic replies,
-      required final dynamic replyId,
-      required final dynamic repostId,
-      required final dynamic replyTo,
-      required final dynamic repostTo,
-      required final dynamic visibleUsersList,
-      required final dynamic invisibleUsersList,
+      required final List<SnPost>? replies,
+      required final int? replyId,
+      required final int? repostId,
+      required final SnPost? replyTo,
+      required final SnPost? repostTo,
+      required final List<int>? visibleUsersList,
+      required final List<int>? invisibleUsersList,
      required final int visibility,
      required final DateTime? editedAt,
      required final DateTime? pinnedAt,
@ -834,19 +899,19 @@ abstract class _SnPost extends SnPost {
  @override
  List<dynamic> get categories;
  @override
-  dynamic get replies;
+  List<SnPost>? get replies;
  @override
-  dynamic get replyId;
+  int? get replyId;
  @override
-  dynamic get repostId;
+  int? get repostId;
  @override
-  dynamic get replyTo;
+  SnPost? get replyTo;
  @override
-  dynamic get repostTo;
+  SnPost? get repostTo;
  @override
-  dynamic get visibleUsersList;
+  List<int>? get visibleUsersList;
  @override
-  dynamic get invisibleUsersList;
+  List<int>? get invisibleUsersList;
  @override
  int get visibility;
  @override
--- a/lib/types/post.g.dart
+++ b/lib/types/post.g.dart
@ -20,13 +20,23 @@ _$SnPostImpl _$$SnPostImplFromJson(Map<String, dynamic> json) => _$SnPostImpl(
      aliasPrefix: json['alias_prefix'] as String?,
      tags: json['tags'] as List<dynamic>,
      categories: json['categories'] as List<dynamic>,
-      replies: json['replies'],
-      replyId: json['reply_id'],
-      repostId: json['repost_id'],
-      replyTo: json['reply_to'],
-      repostTo: json['repost_to'],
-      visibleUsersList: json['visible_users_list'],
-      invisibleUsersList: json['invisible_users_list'],
+      replies: (json['replies'] as List<dynamic>?)
+          ?.map((e) => SnPost.fromJson(e as Map<String, dynamic>))
+          .toList(),
+      replyId: (json['reply_id'] as num?)?.toInt(),
+      repostId: (json['repost_id'] as num?)?.toInt(),
+      replyTo: json['reply_to'] == null
+          ? null
+          : SnPost.fromJson(json['reply_to'] as Map<String, dynamic>),
+      repostTo: json['repost_to'] == null
+          ? null
+          : SnPost.fromJson(json['repost_to'] as Map<String, dynamic>),
+      visibleUsersList: (json['visible_users_list'] as List<dynamic>?)
+          ?.map((e) => (e as num).toInt())
+          .toList(),
+      invisibleUsersList: (json['invisible_users_list'] as List<dynamic>?)
+          ?.map((e) => (e as num).toInt())
+          .toList(),
      visibility: (json['visibility'] as num).toInt(),
      editedAt: json['edited_at'] == null
          ? null
@ -68,11 +78,11 @@ Map<String, dynamic> _$$SnPostImplToJson(_$SnPostImpl instance) =>
      'alias_prefix': instance.aliasPrefix,
      'tags': instance.tags,
      'categories': instance.categories,
-      'replies': instance.replies,
+      'replies': instance.replies?.map((e) => e.toJson()).toList(),
      'reply_id': instance.replyId,
      'repost_id': instance.repostId,
-      'reply_to': instance.replyTo,
-      'repost_to': instance.repostTo,
+      'reply_to': instance.replyTo?.toJson(),
+      'repost_to': instance.repostTo?.toJson(),
      'visible_users_list': instance.visibleUsersList,
      'invisible_users_list': instance.invisibleUsersList,
      'visibility': instance.visibility,
--- a/lib/widgets/attachment/attachment_detail.dart
+++ b/lib/widgets/attachment/attachment_detail.dart
@ -28,6 +28,9 @@ class AttachmentDetailPopup extends StatelessWidget {
        tag: 'attachment-${data.rid}-${heroTag ?? uuid.v4()}',
        child: PhotoView(
          key: Key('attachment-detail-${data.rid}-$heroTag'),
+          backgroundDecoration: BoxDecoration(
+            color: Colors.black.withOpacity(0.7),
+          ),
          imageProvider: UniversalImage.provider(
            sn.getAttachmentUrl(data.rid),
          ),
--- a/lib/widgets/attachment/attachment_item.dart
+++ b/lib/widgets/attachment/attachment_item.dart
@ -1,6 +1,12 @@
+import 'dart:ui';
+
 import 'package:dismissible_page/dismissible_page.dart';
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
+import 'package:material_symbols_icons/symbols.dart';
 import 'package:provider/provider.dart';
+import 'package:styled_widget/styled_widget.dart';
 import 'package:surface/providers/sn_network.dart';
 import 'package:surface/types/attachment.dart';
 import 'package:surface/widgets/attachment/attachment_detail.dart';
@ -23,15 +29,11 @@ class AttachmentItem extends StatelessWidget {
      case 'image':
        return Hero(
          tag: 'attachment-${data.rid}-$heroTag',
-          child: LayoutBuilder(builder: (context, constraints) {
-            return UniversalImage(
+          child: AutoResizeUniversalImage(
            sn.getAttachmentUrl(data.rid),
            key: Key('attachment-${data.rid}-$heroTag'),
            fit: BoxFit.cover,
-              cacheHeight: constraints.maxHeight,
-              cacheWidth: constraints.maxWidth,
-            );
-          }),
+          ),
        );
      default:
        return const Placeholder();
@ -43,6 +45,12 @@ class AttachmentItem extends StatelessWidget {
    final uuid = Uuid();
    final heroTag = uuid.v4();

+    if (data.isMature) {
+      return _AttachmentItemSensitiveBlur(
+        child: _buildContent(context, heroTag),
+      );
+    }
+
    if (isExpandable) {
      return GestureDetector(
        child: _buildContent(context, heroTag),
@ -58,3 +66,87 @@ class AttachmentItem extends StatelessWidget {
    return _buildContent(context, heroTag);
  }
 }
+
+class _AttachmentItemSensitiveBlur extends StatefulWidget {
+  final Widget child;
+  const _AttachmentItemSensitiveBlur({super.key, required this.child});
+
+  @override
+  State<_AttachmentItemSensitiveBlur> createState() =>
+      _AttachmentItemSensitiveBlurState();
+}
+
+class _AttachmentItemSensitiveBlurState
+    extends State<_AttachmentItemSensitiveBlur> {
+  bool _doesShow = false;
+
+  @override
+  Widget build(BuildContext context) {
+    return Stack(
+      children: [
+        widget.child,
+        ClipRect(
+          child: BackdropFilter(
+            filter: ImageFilter.blur(sigmaX: 40, sigmaY: 40),
+            child: Container(
+              color: Colors.black.withOpacity(0.5),
+              alignment: Alignment.center,
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  const Icon(
+                    Symbols.visibility_off,
+                    color: Colors.white,
+                    size: 32,
+                  ),
+                  const Gap(8),
+                  Text('sensitiveContent')
+                      .tr()
+                      .fontSize(20)
+                      .textColor(Colors.white)
+                      .bold(),
+                  Text('sensitiveContentDescription')
+                      .tr()
+                      .fontSize(14)
+                      .textColor(Colors.white.withOpacity(0.8)),
+                  const Gap(16),
+                  InkWell(
+                    child: Text('sensitiveContentReveal')
+                        .tr()
+                        .textColor(Colors.white),
+                    onTap: () {
+                      setState(() => _doesShow = !_doesShow);
+                    },
+                  ),
+                ],
+              ),
+            ),
+          ),
+        )
+            .opacity(_doesShow ? 0 : 1, animate: true)
+            .animate(const Duration(milliseconds: 300), Curves.easeInOut),
+        if (_doesShow)
+          Positioned(
+            top: 0,
+            left: 0,
+            child: InkWell(
+              child: Icon(
+                Symbols.visibility_off,
+                color: Colors.white,
+                shadows: [
+                  BoxShadow(
+                    color: Colors.black.withOpacity(0.5),
+                    blurRadius: 3,
+                    offset: Offset(0, 1.5),
+                  ),
+                ],
+              ).padding(all: 12),
+              onTap: () {
+                setState(() => _doesShow = !_doesShow);
+              },
+            ),
+          ),
+      ],
+    );
+  }
+}
--- a/lib/widgets/post/post_item.dart
+++ b/lib/widgets/post/post_item.dart
@ -38,6 +38,11 @@ class PostItem extends StatelessWidget {
      children: [
        _PostContentHeader(data: data).padding(horizontal: 12, vertical: 8),
        _PostContentBody(data: data.body).padding(horizontal: 16, bottom: 6),
+        if (data.repostTo != null)
+          _PostQuoteContent(child: data.repostTo!).padding(
+            horizontal: 8,
+            bottom: 4,
+          ),
        if (data.preload?.attachments?.isNotEmpty ?? true)
          AttachmentList(
            data: data.preload!.attachments!,
@ -148,7 +153,13 @@ class _PostBottomAction extends StatelessWidget {

 class _PostContentHeader extends StatelessWidget {
  final SnPost data;
-  const _PostContentHeader({required this.data});
+  final bool isCompact;
+  final bool showActions;
+  const _PostContentHeader({
+    required this.data,
+    this.isCompact = false,
+    this.showActions = true,
+  });

  @override
  Widget build(BuildContext context) {
@ -157,8 +168,28 @@ class _PostContentHeader extends StatelessWidget {

    return Row(
      children: [
-        AccountImage(content: data.publisher.avatar),
-        const Gap(12),
+        AccountImage(
+          content: data.publisher.avatar,
+          radius: isCompact ? 12 : 20,
+        ),
+        Gap(isCompact ? 8 : 12),
+        if (isCompact)
+          Row(
+            children: [
+              Text(data.publisher.nick).bold(),
+              const Gap(4),
+              Row(
+                children: [
+                  Text('@${data.publisher.name}').fontSize(13),
+                  const Gap(4),
+                  Text(RelativeTime(context).format(
+                    data.publishedAt ?? data.createdAt,
+                  )).fontSize(13),
+                ],
+              ).opacity(0.8),
+            ],
+          )
+        else
          Expanded(
            child: Column(
              crossAxisAlignment: CrossAxisAlignment.start,
@ -176,6 +207,7 @@ class _PostContentHeader extends StatelessWidget {
              ],
            ),
          ),
+        if (showActions)
          PopupMenuButton(
            icon: const Icon(Symbols.more_horiz),
            style: const ButtonStyle(
@ -269,3 +301,29 @@ class _PostContentBody extends StatelessWidget {
    return MarkdownTextContent(content: data['content']);
  }
 }
+
+class _PostQuoteContent extends StatelessWidget {
+  final SnPost child;
+  const _PostQuoteContent({super.key, required this.child});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: BoxDecoration(
+        borderRadius: const BorderRadius.all(Radius.circular(8)),
+        border: Border.all(
+          color: Theme.of(context).dividerColor,
+          width: 1,
+        ),
+      ),
+      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+      child: Column(
+        children: [
+          _PostContentHeader(data: child, isCompact: true, showActions: false)
+              .padding(bottom: 4),
+          _PostContentBody(data: child.body),
+        ],
+      ),
+    );
+  }
+}
--- a/pubspec.lock
+++ b/pubspec.lock
@ -5,23 +5,23 @@ packages:
    dependency: transitive
    description:
      name: _fe_analyzer_shared
-      sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
+      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
      url: "https://pub.dev"
    source: hosted
-    version: "76.0.0"
+    version: "72.0.0"
  _macros:
    dependency: transitive
    description: dart
    source: sdk
-    version: "0.3.3"
+    version: "0.3.2"
  analyzer:
    dependency: transitive
    description:
      name: analyzer
-      sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
+      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
      url: "https://pub.dev"
    source: hosted
-    version: "6.11.0"
+    version: "6.7.0"
  animations:
    dependency: "direct main"
    description:
@ -202,10 +202,10 @@ packages:
    dependency: "direct main"
    description:
      name: collection
-      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
      url: "https://pub.dev"
    source: hosted
-    version: "1.19.0"
+    version: "1.18.0"
  connectivity_plus:
    dependency: transitive
    description:
@ -790,18 +790,18 @@ packages:
    dependency: transitive
    description:
      name: leak_tracker
-      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
      url: "https://pub.dev"
    source: hosted
-    version: "10.0.8"
+    version: "10.0.5"
  leak_tracker_flutter_testing:
    dependency: transitive
    description:
      name: leak_tracker_flutter_testing
-      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.9"
+    version: "3.0.5"
  leak_tracker_testing:
    dependency: transitive
    description:
@ -838,10 +838,10 @@ packages:
    dependency: transitive
    description:
      name: macros
-      sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
+      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
      url: "https://pub.dev"
    source: hosted
-    version: "0.1.3-main.0"
+    version: "0.1.2-main.4"
  markdown:
    dependency: "direct main"
    description:
@ -1150,7 +1150,7 @@ packages:
    dependency: transitive
    description: flutter
    source: sdk
-    version: "0.0.0"
+    version: "0.0.99"
  source_gen:
    dependency: transitive
    description:
@ -1227,10 +1227,10 @@ packages:
    dependency: transitive
    description:
      name: stack_trace
-      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
      url: "https://pub.dev"
    source: hosted
-    version: "1.12.0"
+    version: "1.11.1"
  stream_channel:
    dependency: transitive
    description:
@ -1251,10 +1251,10 @@ packages:
    dependency: transitive
    description:
      name: string_scanner
-      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.0"
+    version: "1.2.0"
  styled_widget:
    dependency: "direct main"
    description:
@ -1291,10 +1291,10 @@ packages:
    dependency: transitive
    description:
      name: test_api
-      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.3"
+    version: "0.7.2"
  timing:
    dependency: transitive
    description:
@ -1411,10 +1411,10 @@ packages:
    dependency: transitive
    description:
      name: vm_service
-      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
      url: "https://pub.dev"
    source: hosted
-    version: "14.3.0"
+    version: "14.2.5"
  watcher:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -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
 # 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.
-version: 1.0.0+1
+version: 2.0.0+1

 environment:
  sdk: ^3.5.4
@ -167,3 +167,4 @@ flutter_native_splash:
  branding: "assets/icon/branding-light.png"
  branding_dark: "assets/icon/branding-dark.png"
  branding_bottom_padding: 24
+
Author	SHA1	Message	Date
LittleSheep	af044a86bc	✨ Quoted (repost) post	2024-11-13 22:05:40 +08:00
LittleSheep	4884d04a51	✨ Sensitive content blur	2024-11-13 21:36:28 +08:00