diff --git a/lib/common/widgets/dynamic_sliver_app_bar/dynamic_sliver_app_bar.dart b/lib/common/widgets/dynamic_sliver_app_bar/dynamic_sliver_app_bar.dart index bd57d4466..f54770199 100644 --- a/lib/common/widgets/dynamic_sliver_app_bar/dynamic_sliver_app_bar.dart +++ b/lib/common/widgets/dynamic_sliver_app_bar/dynamic_sliver_app_bar.dart @@ -358,7 +358,11 @@ class DynamicFlexibleSpaceBar extends StatelessWidget { final CollapseMode collapseMode; - double _getCollapsePadding(double t, FlexibleSpaceBarSettings settings) { + static double _getCollapsePadding( + CollapseMode collapseMode, + double t, + FlexibleSpaceBarSettings settings, + ) { switch (collapseMode) { case CollapseMode.pin: return -(settings.maxExtent - settings.currentExtent); @@ -406,7 +410,7 @@ class DynamicFlexibleSpaceBar extends StatelessWidget { ? 1.0 : 1.0 - Interval(fadeStart, fadeEnd).transform(t); - topPadding = _getCollapsePadding(t, settings); + topPadding = _getCollapsePadding(collapseMode, t, settings); } return ClipRect( diff --git a/lib/models_new/live/live_feed_index/card_data_list_item.dart b/lib/models_new/live/live_feed_index/card_data_list_item.dart index 2d4639161..066924d78 100644 --- a/lib/models_new/live/live_feed_index/card_data_list_item.dart +++ b/lib/models_new/live/live_feed_index/card_data_list_item.dart @@ -7,7 +7,8 @@ class CardLiveItem { String? uname; String? face; String? cover; - String? systemCover; + String? _systemCover; + String? get systemCover => _systemCover ?? cover; String? title; int? liveTime; String? areaName; @@ -23,7 +24,7 @@ class CardLiveItem { this.uname, this.face, this.cover, - this.systemCover, + String? systemCover, this.title, this.liveTime, this.areaName, @@ -32,7 +33,7 @@ class CardLiveItem { this.areaV2ParentName, this.areaV2ParentId, this.watchedShow, - }); + }) : _systemCover = noneNullOrEmptyString(systemCover); factory CardLiveItem.fromJson(Map json) => CardLiveItem( roomid: json['roomid'] ?? json['id'], @@ -40,7 +41,7 @@ class CardLiveItem { uname: json['uname'] as String?, face: json['face'] as String?, cover: json['cover'] as String?, - systemCover: noneNullOrEmptyString(json['system_cover']), + systemCover: json['system_cover'], title: json['title'] as String?, liveTime: json['live_time'] as int?, areaName: json['area_name'] as String?, diff --git a/lib/pages/live/widgets/live_item_app.dart b/lib/pages/live/widgets/live_item_app.dart index 388d63712..77be142a8 100644 --- a/lib/pages/live/widgets/live_item_app.dart +++ b/lib/pages/live/widgets/live_item_app.dart @@ -42,9 +42,7 @@ class LiveCardVApp extends StatelessWidget { clipBehavior: Clip.none, children: [ NetworkImgLayer( - src: showFirstFrame - ? (item.systemCover ?? item.cover) - : item.cover, + src: showFirstFrame ? item.systemCover : item.cover, width: maxWidth, height: maxHeight, type: .emote,