diff --git a/lib/common/widgets/marquee.dart b/lib/common/widgets/marquee.dart
index 08fa208ee..99dd2a09d 100644
--- a/lib/common/widgets/marquee.dart
+++ b/lib/common/widgets/marquee.dart
@@ -399,7 +399,7 @@ class _MarqueeSimulation extends Simulation {
 class ContextSingleTicker implements TickerProvider {
   Ticker? _ticker;
   BuildContext context;
-  final bool Function()? autoStart;
+  final ValueGetter<bool>? autoStart;
 
   ContextSingleTicker(this.context, {this.autoStart});
 
diff --git a/lib/pages/about/view.dart b/lib/pages/about/view.dart
index ace77d84a..3bab2a2b5 100644
--- a/lib/pages/about/view.dart
+++ b/lib/pages/about/view.dart
@@ -323,7 +323,7 @@ Future<void> showImportExportDialog<T>(
   BuildContext context, {
   required String title,
   String? label,
-  required String Function() toJson,
+  required ValueGetter<String> toJson,
   required FutureOr<bool> Function(T json) fromJson,
 }) => showDialog(
   context: context,
diff --git a/lib/pages/setting/models/model.dart b/lib/pages/setting/models/model.dart
index 9e24eceaa..6ab147e62 100644
--- a/lib/pages/setting/models/model.dart
+++ b/lib/pages/setting/models/model.dart
@@ -30,8 +30,8 @@ sealed class SettingsModel {
 class NormalModel extends SettingsModel {
   @override
   final String? title;
-  final StringGetter? getTitle;
-  final StringGetter? getSubtitle;
+  final ValueGetter<String>? getTitle;
+  final ValueGetter<String>? getSubtitle;
   final Widget Function()? getTrailing;
   final void Function(BuildContext context, void Function() setState)? onTap;
 
diff --git a/lib/pages/setting/widgets/normal_item.dart b/lib/pages/setting/widgets/normal_item.dart
index 809853929..aebd5a1df 100644
--- a/lib/pages/setting/widgets/normal_item.dart
+++ b/lib/pages/setting/widgets/normal_item.dart
@@ -1,13 +1,11 @@
 import 'package:PiliPlus/common/widgets/flutter/list_tile.dart';
 import 'package:flutter/material.dart' hide ListTile;
 
-typedef StringGetter = String Function();
-
 class NormalItem extends StatefulWidget {
   final String? title;
-  final StringGetter? getTitle;
+  final ValueGetter<String>? getTitle;
   final String? subtitle;
-  final StringGetter? getSubtitle;
+  final ValueGetter<String>? getSubtitle;
   final Widget? leading;
   final Widget Function()? getTrailing;
   final void Function(BuildContext context, void Function() setState)? onTap;
diff --git a/lib/pages/video/post_panel/popup_menu_text.dart b/lib/pages/video/post_panel/popup_menu_text.dart
index 3d22458ef..0d18d9d49 100644
--- a/lib/pages/video/post_panel/popup_menu_text.dart
+++ b/lib/pages/video/post_panel/popup_menu_text.dart
@@ -5,7 +5,7 @@ typedef PopupMenuItemSelected<T> = bool Function(T value);
 
 class PopupMenuText<T> extends StatelessWidget {
   final String title;
-  final T Function() value;
+  final ValueGetter<T> value;
   final PopupMenuItemSelected<T> onSelected;
   final PopupMenuItemBuilder<T> itemBuilder;
   final String Function(T) getSelectTitle;
diff --git a/lib/pages/video/widgets/player_focus.dart b/lib/pages/video/widgets/player_focus.dart
index ac0513099..28f6f2b82 100644
--- a/lib/pages/video/widgets/player_focus.dart
+++ b/lib/pages/video/widgets/player_focus.dart
@@ -28,8 +28,8 @@ class PlayerFocus extends StatelessWidget {
   final PlPlayerController plPlayerController;
   final CommonIntroController? introController;
   final VoidCallback onSendDanmaku;
-  final bool Function()? canPlay;
-  final bool Function()? onSkipSegment;
+  final ValueGetter<bool>? canPlay;
+  final ValueGetter<bool>? onSkipSegment;
 
   static bool _shouldHandle(LogicalKeyboardKey logicalKey) {
     return logicalKey == LogicalKeyboardKey.tab ||
diff --git a/lib/services/download/download_service.dart b/lib/services/download/download_service.dart
index d3fdb9cec..9ffbaa3c4 100644
--- a/lib/services/download/download_service.dart
+++ b/lib/services/download/download_service.dart
@@ -33,7 +33,7 @@ class DownloadService extends GetxService {
 
   final _lock = Lock();
 
-  final flagNotifier = <void Function()>{};
+  final flagNotifier = <VoidCallback>{};
   final waitDownloadQueue = RxList<BiliDownloadEntryInfo>();
   final downloadList = <BiliDownloadEntryInfo>[];
 
diff --git a/lib/utils/page_utils.dart b/lib/utils/page_utils.dart
index 7f6ec8272..a45ce5c89 100644
--- a/lib/utils/page_utils.dart
+++ b/lib/utils/page_utils.dart
@@ -649,7 +649,7 @@ abstract class PageUtils {
   static void showVideoBottomSheet(
     BuildContext context, {
     required Widget child,
-    required bool Function() isFullScreen,
+    required ValueGetter<bool> isFullScreen,
     double? padding,
   }) {
     if (!context.mounted) {