diff --git a/lib/common/widgets/avatar.dart b/lib/common/widgets/avatar.dart index adb52db7..69991ff9 100644 --- a/lib/common/widgets/avatar.dart +++ b/lib/common/widgets/avatar.dart @@ -37,7 +37,7 @@ class Avatar extends StatelessWidget { : _BadgeType.none, badgeSize = badgeSize ?? size / 3; - static final showDynDecorate = GStorage.showDynDecorate; + static bool showDynDecorate = GStorage.showDynDecorate; @override Widget build(BuildContext context) { diff --git a/lib/models/dynamics/result.dart b/lib/models/dynamics/result.dart index 038f5dc3..6fd1442c 100644 --- a/lib/models/dynamics/result.dart +++ b/lib/models/dynamics/result.dart @@ -1,6 +1,6 @@ import 'dart:convert'; -import 'package:PiliPlus/utils/storage.dart'; +import 'package:PiliPlus/common/widgets/avatar.dart'; class DynamicsDataModel { DynamicsDataModel({ @@ -137,13 +137,11 @@ class ModuleAuthorModel { pubTs = json['pub_ts'] == 0 ? null : json['pub_ts']; type = json['type']; vip = json['vip']; - if (showDynDecorate) { + if (Avatar.showDynDecorate) { decorate = json['decorate']; pendant = json['pendant']; } } - - static bool showDynDecorate = GStorage.showDynDecorate; } // 单个动态详情 - 动态信息 diff --git a/lib/pages/setting/widgets/model.dart b/lib/pages/setting/widgets/model.dart index 40f82cdb..d947edc7 100644 --- a/lib/pages/setting/widgets/model.dart +++ b/lib/pages/setting/widgets/model.dart @@ -1,6 +1,7 @@ import 'dart:io'; import 'dart:math'; +import 'package:PiliPlus/common/widgets/avatar.dart'; import 'package:PiliPlus/common/widgets/refresh_indicator.dart' show kDragContainerExtentPercentage, displacement; import 'package:PiliPlus/http/reply.dart'; @@ -14,7 +15,6 @@ import 'package:PiliPlus/models/common/reply_sort_type.dart'; import 'package:PiliPlus/models/common/super_resolution_type.dart'; import 'package:PiliPlus/models/common/theme_type.dart'; import 'package:PiliPlus/models/common/up_panel_position.dart'; -import 'package:PiliPlus/models/dynamics/result.dart'; import 'package:PiliPlus/models/live/quality.dart'; import 'package:PiliPlus/models/video/play/CDN.dart'; import 'package:PiliPlus/models/video/play/quality.dart'; @@ -2031,7 +2031,7 @@ List get extraSettings => [ leading: Icon(MdiIcons.stickerCircleOutline), setKey: SettingBoxKey.showDynDecorate, defaultVal: true, - onChanged: (value) => ModuleAuthorModel.showDynDecorate = value, + onChanged: (value) => Avatar.showDynDecorate = value, ), SettingsModel( settingsType: SettingsType.sw1tch, diff --git a/lib/pages/video/detail/reply/widgets/reply_item_grpc.dart b/lib/pages/video/detail/reply/widgets/reply_item_grpc.dart index 7b712156..e1e4f73d 100644 --- a/lib/pages/video/detail/reply/widgets/reply_item_grpc.dart +++ b/lib/pages/video/detail/reply/widgets/reply_item_grpc.dart @@ -8,7 +8,6 @@ import 'package:PiliPlus/common/widgets/report.dart'; import 'package:PiliPlus/grpc/app/main/community/reply/v1/reply.pb.dart'; import 'package:PiliPlus/http/init.dart'; import 'package:PiliPlus/http/video.dart'; -import 'package:PiliPlus/models/dynamics/result.dart'; import 'package:PiliPlus/common/widgets/save_panel.dart'; import 'package:PiliPlus/pages/video/detail/reply/widgets/zan_grpc.dart'; import 'package:PiliPlus/utils/extension.dart'; @@ -104,8 +103,7 @@ class ReplyItemGrpc extends StatelessWidget { Widget _buildContent(context) { return Column( children: [ - if (ModuleAuthorModel.showDynDecorate && - replyItem.member.hasGarbCardImage()) + if (Avatar.showDynDecorate && replyItem.member.hasGarbCardImage()) Stack( clipBehavior: Clip.none, children: [