Compare commits

..

3 Commits

Author SHA1 Message Date
dom
96f9972895 upgrade deps
Signed-off-by: dom <githubaccount56556@proton.me>
2026-03-13 09:49:48 +08:00
dom
6ddf282555 fix header progress
Signed-off-by: dom <githubaccount56556@proton.me>
2026-03-13 09:49:48 +08:00
dom
e98b2b69bb tweaks
Signed-off-by: dom <githubaccount56556@proton.me>
2026-03-12 17:23:51 +08:00
5 changed files with 21 additions and 19 deletions

View File

@@ -358,7 +358,11 @@ class DynamicFlexibleSpaceBar extends StatelessWidget {
final CollapseMode collapseMode; final CollapseMode collapseMode;
double _getCollapsePadding(double t, FlexibleSpaceBarSettings settings) { static double _getCollapsePadding(
CollapseMode collapseMode,
double t,
FlexibleSpaceBarSettings settings,
) {
switch (collapseMode) { switch (collapseMode) {
case CollapseMode.pin: case CollapseMode.pin:
return -(settings.maxExtent - settings.currentExtent); return -(settings.maxExtent - settings.currentExtent);
@@ -406,7 +410,7 @@ class DynamicFlexibleSpaceBar extends StatelessWidget {
? 1.0 ? 1.0
: 1.0 - Interval(fadeStart, fadeEnd).transform(t); : 1.0 - Interval(fadeStart, fadeEnd).transform(t);
topPadding = _getCollapsePadding(t, settings); topPadding = _getCollapsePadding(collapseMode, t, settings);
} }
return ClipRect( return ClipRect(

View File

@@ -7,7 +7,8 @@ class CardLiveItem {
String? uname; String? uname;
String? face; String? face;
String? cover; String? cover;
String? systemCover; String? _systemCover;
String? get systemCover => _systemCover ?? cover;
String? title; String? title;
int? liveTime; int? liveTime;
String? areaName; String? areaName;
@@ -23,7 +24,7 @@ class CardLiveItem {
this.uname, this.uname,
this.face, this.face,
this.cover, this.cover,
this.systemCover, String? systemCover,
this.title, this.title,
this.liveTime, this.liveTime,
this.areaName, this.areaName,
@@ -32,7 +33,7 @@ class CardLiveItem {
this.areaV2ParentName, this.areaV2ParentName,
this.areaV2ParentId, this.areaV2ParentId,
this.watchedShow, this.watchedShow,
}); }) : _systemCover = noneNullOrEmptyString(systemCover);
factory CardLiveItem.fromJson(Map<String, dynamic> json) => CardLiveItem( factory CardLiveItem.fromJson(Map<String, dynamic> json) => CardLiveItem(
roomid: json['roomid'] ?? json['id'], roomid: json['roomid'] ?? json['id'],
@@ -40,7 +41,7 @@ class CardLiveItem {
uname: json['uname'] as String?, uname: json['uname'] as String?,
face: json['face'] as String?, face: json['face'] as String?,
cover: json['cover'] as String?, cover: json['cover'] as String?,
systemCover: noneNullOrEmptyString(json['system_cover']), systemCover: json['system_cover'],
title: json['title'] as String?, title: json['title'] as String?,
liveTime: json['live_time'] as int?, liveTime: json['live_time'] as int?,
areaName: json['area_name'] as String?, areaName: json['area_name'] as String?,

View File

@@ -42,9 +42,7 @@ class LiveCardVApp extends StatelessWidget {
clipBehavior: Clip.none, clipBehavior: Clip.none,
children: [ children: [
NetworkImgLayer( NetworkImgLayer(
src: showFirstFrame src: showFirstFrame ? item.systemCover : item.cover,
? (item.systemCover ?? item.cover)
: item.cover,
width: maxWidth, width: maxWidth,
height: maxHeight, height: maxHeight,
type: .emote, type: .emote,

View File

@@ -767,8 +767,7 @@ class _HeaderIndicatorState extends State<HeaderIndicator> {
} }
void _updateProgress() { void _updateProgress() {
_progress = (widget.pageController.page ?? 0) / (widget.length - 1); _progress = ((widget.pageController.page ?? 0) + 1) / widget.length;
assert(_progress.isFinite && 0 <= _progress && _progress <= 1);
} }
@override @override

View File

@@ -247,10 +247,10 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: catcher_2 name: catcher_2
sha256: b74a258033627564a8554ada884f742a4086d24b18c6ee83eb243e8015c50967 sha256: "3c9bc7435d250c1a958bbc7beb2f1d960ffb6c2658f2a5afd8d8e6db15cf8708"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.1.6" version: "2.1.8"
characters: characters:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -1895,10 +1895,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vector_graphics name: vector_graphics
sha256: a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6 sha256: "7076216a10d5c390315fbe536a30f1254c341e7543e6c4c8a815e591307772b1"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.1.19" version: "1.1.20"
vector_graphics_codec: vector_graphics_codec:
dependency: transitive dependency: transitive
description: description:
@@ -1943,18 +1943,18 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
name: wakelock_plus name: wakelock_plus
sha256: "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228" sha256: e4e125b7c1a2f0e491e5452afdc0e25ab77b2d2775a7caa231fcc1c1f2162c47
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.4.0" version: "1.5.0"
wakelock_plus_platform_interface: wakelock_plus_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: wakelock_plus_platform_interface name: wakelock_plus_platform_interface
sha256: "036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2" sha256: "24b84143787220a403491c2e5de0877fbbb87baf3f0b18a2a988973863db4b03"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.3.0" version: "1.4.0"
watcher: watcher:
dependency: transitive dependency: transitive
description: description: