tweaks (#2032)

* fix: 1080p

* opt: import export

* opt: downloader

* opt: skeleton

* opt: parseColor

* tweak

* opt: sb seek

* opt: rxn

lib/common/skeleton/skeleton.dart

@@ -1,188 +1,62 @@
+import 'dart:ui' as ui;
+
 import 'package:flutter/material.dart';
 
-class Skeleton extends StatelessWidget {
+class Skeleton extends StatefulWidget {
   final Widget child;
 
-  const Skeleton({
-    required this.child,
-    super.key,
-  });
+  const Skeleton({super.key, required this.child});
 
   @override
-  Widget build(BuildContext context) {
-    final color = Theme.of(context).colorScheme.surface.withAlpha(10);
-    final shimmerGradient = LinearGradient(
-      colors: [
-        Colors.transparent,
-        color,
-        color,
-        Colors.transparent,
-      ],
-      stops: const [
-        0.1,
-        0.3,
-        0.5,
-        0.7,
-      ],
-      begin: const Alignment(-1.0, -0.3),
-      end: const Alignment(1.0, 0.9),
-      tileMode: TileMode.clamp,
-    );
-    return Shimmer(
-      linearGradient: shimmerGradient,
-      child: ShimmerLoading(
-        isLoading: true,
-        child: child,
-      ),
-    );
-  }
+  State<Skeleton> createState() => _SkeletonState();
 }
 
-class Shimmer extends StatefulWidget {
-  static ShimmerState? of(BuildContext context) {
-    return context.findAncestorStateOfType<ShimmerState>();
-  }
-
-  const Shimmer({
-    super.key,
-    required this.linearGradient,
-    this.child,
-  });
-
-  final LinearGradient linearGradient;
-  final Widget? child;
-
-  @override
-  ShimmerState createState() => ShimmerState();
-}
-
-class ShimmerState extends State<Shimmer> with SingleTickerProviderStateMixin {
-  late AnimationController _shimmerController;
+class _SkeletonState extends State<Skeleton>
+    with SingleTickerProviderStateMixin {
+  late final AnimationController _controller;
+  late Color color;
+  final matrix = Matrix4.identity();
 
   @override
   void initState() {
     super.initState();
-    _shimmerController = AnimationController.unbounded(vsync: this)
-      ..repeat(min: -0.5, max: 1.5, period: const Duration(milliseconds: 1000));
+    _controller = AnimationController.unbounded(vsync: this)
+      ..repeat(min: -0.5, max: 1.5, period: const Duration(milliseconds: 1000))
+      ..addListener(_setState);
   }
 
   @override
   void dispose() {
-    _shimmerController.dispose();
+    _controller.dispose();
     super.dispose();
   }
 
-  LinearGradient get gradient => LinearGradient(
-    colors: widget.linearGradient.colors,
-    stops: widget.linearGradient.stops,
-    begin: widget.linearGradient.begin,
-    end: widget.linearGradient.end,
-    transform: _SlidingGradientTransform(
-      slidePercent: _shimmerController.value,
-    ),
-  );
-
-  bool get isSized =>
-      (context.findRenderObject() as RenderBox?)?.hasSize ?? false;
-
-  Size get size => (context.findRenderObject() as RenderBox).size;
-
-  Offset getDescendantOffset({
-    required RenderBox descendant,
-    Offset offset = Offset.zero,
-  }) {
-    final shimmerBox = context.findRenderObject() as RenderBox;
-    return descendant.localToGlobal(offset, ancestor: shimmerBox);
+  void _setState() {
+    setState(() {});
   }
 
-  Listenable get shimmerChanges => _shimmerController;
-
-  @override
-  Widget build(BuildContext context) {
-    return widget.child ?? const SizedBox.shrink();
-  }
-}
-
-class _SlidingGradientTransform extends GradientTransform {
-  const _SlidingGradientTransform({
-    required this.slidePercent,
-  });
-
-  final double slidePercent;
-
-  @override
-  Matrix4? transform(Rect bounds, {TextDirection? textDirection}) {
-    return Matrix4.translationValues(bounds.width * slidePercent, 0.0, 0.0);
-  }
-}
-
-class ShimmerLoading extends StatefulWidget {
-  const ShimmerLoading({
-    super.key,
-    required this.isLoading,
-    required this.child,
-  });
-
-  final bool isLoading;
-  final Widget child;
-
-  @override
-  State<ShimmerLoading> createState() => _ShimmerLoadingState();
-}
-
-class _ShimmerLoadingState extends State<ShimmerLoading> {
-  Listenable? _shimmerChanges;
-
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
-    if (_shimmerChanges != null) {
-      _shimmerChanges!.removeListener(_onShimmerChange);
-    }
-    _shimmerChanges = Shimmer.of(context)?.shimmerChanges;
-    if (_shimmerChanges != null) {
-      _shimmerChanges!.addListener(_onShimmerChange);
-    }
-  }
-
-  @override
-  void dispose() {
-    _shimmerChanges?.removeListener(_onShimmerChange);
-    super.dispose();
-  }
-
-  void _onShimmerChange() {
-    if (widget.isLoading) {
-      setState(() {});
-    }
+    color = ColorScheme.of(context).surface.withAlpha(10);
   }
 
   @override
   Widget build(BuildContext context) {
-    if (!widget.isLoading) {
-      return widget.child;
-    }
-
-    final shimmer = Shimmer.of(context)!;
-    if (!shimmer.isSized) {
-      return const SizedBox.shrink();
-    }
-    final shimmerSize = shimmer.size;
-    final gradient = shimmer.gradient;
-    final offsetWithinShimmer = shimmer.getDescendantOffset(
-      descendant: context.findRenderObject() as RenderBox,
-    );
-
+    final colors = [Colors.transparent, color, color, Colors.transparent];
     return ShaderMask(
       blendMode: BlendMode.srcATop,
-      shaderCallback: (bounds) {
-        return gradient.createShader(
-          Rect.fromLTWH(
-            -offsetWithinShimmer.dx,
-            -offsetWithinShimmer.dy,
-            shimmerSize.width,
-            shimmerSize.height,
-          ),
+      shaderCallback: (Rect bounds) {
+        final width = bounds.width;
+        final height = bounds.height;
+        matrix[12] = width * _controller.value;
+        return ui.Gradient.linear(
+          Offset(0, 0.35 * height),
+          Offset(width, 0.95 * height),
+          colors,
+          const [0.1, 0.3, 0.5, 0.7],
+          TileMode.clamp,
+          matrix.storage,
         );
       },
       child: widget.child,

lib/common/widgets/dialog/export_import.dart

@@ -3,7 +3,7 @@ import 'dart:convert' show utf8, jsonDecode;
 import 'dart:io' show File;
 
 import 'package:PiliPlus/common/style.dart';
-import 'package:PiliPlus/utils/extension/context_ext.dart';
+import 'package:PiliPlus/utils/extension/theme_ext.dart';
 import 'package:PiliPlus/utils/storage_utils.dart';
 import 'package:PiliPlus/utils/utils.dart';
 import 'package:file_picker/file_picker.dart';
@@ -46,87 +46,91 @@ Future<void> importFromClipBoard<T>(
   bool showConfirmDialog = true,
 }) async {
   final data = await Clipboard.getData('text/plain');
-  if (data?.text?.isNotEmpty != true) {
-    SmartDialog.showToast('剪贴板无数据');
-    return;
-  }
-  if (!context.mounted) return;
-  final text = data!.text!;
-  late final T json;
-  late final String formatText;
-  try {
-    json = jsonDecode(text);
-    formatText = Utils.jsonEncoder.convert(json);
-  } catch (e) {
-    SmartDialog.showToast('解析json失败：$e');
-    return;
-  }
-  bool? executeImport;
-  if (showConfirmDialog) {
-    final highlight = Highlight()..registerLanguage('json', langJson);
-    final result = highlight.highlight(
-      code: formatText,
-      language: 'json',
-    );
-    late TextSpanRenderer renderer;
-    bool? isDarkMode;
-    executeImport = await showDialog(
-      context: context,
-      builder: (context) {
-        final isDark = context.isDarkMode;
-        if (isDark != isDarkMode) {
-          isDarkMode = isDark;
-          renderer = TextSpanRenderer(
-            const TextStyle(),
-            isDark ? githubDarkTheme : githubTheme,
-          );
-          result.render(renderer);
-        }
-        return AlertDialog(
-          title: Text('是否导入如下$title？'),
-          content: SingleChildScrollView(
-            child: Text.rich(renderer.span!),
-          ),
-          actions: [
-            TextButton(
-              onPressed: Get.back,
-              child: Text(
-                '取消',
-                style: TextStyle(
-                  color: Theme.of(context).colorScheme.outline,
+  if (data?.text case final text? when (text.isNotEmpty)) {
+    if (!context.mounted) return;
+    final T json;
+    final String formatText;
+    try {
+      json = jsonDecode(text);
+      formatText = Utils.jsonEncoder.convert(json);
+    } catch (e) {
+      SmartDialog.showToast('解析json失败：$e');
+      return;
+    }
+    bool? executeImport;
+    if (showConfirmDialog) {
+      final highlight = Highlight()..registerLanguage('json', langJson);
+      final result = highlight.highlight(
+        code: formatText,
+        language: 'json',
+      );
+      late TextSpanRenderer renderer;
+      bool? isDarkMode;
+      executeImport = await showDialog<bool>(
+        context: context,
+        builder: (context) {
+          final theme = Theme.of(context);
+          final isDark = theme.brightness.isDark;
+          if (isDark != isDarkMode) {
+            isDarkMode = isDark;
+            renderer = TextSpanRenderer(
+              const TextStyle(),
+              isDark ? githubDarkTheme : githubTheme,
+            );
+            result.render(renderer);
+          }
+          return AlertDialog(
+            title: Text('是否导入如下$title？'),
+            content: SingleChildScrollView(
+              child: Text.rich(renderer.span!),
+            ),
+            actions: [
+              TextButton(
+                onPressed: Get.back,
+                child: Text(
+                  '取消',
+                  style: TextStyle(
+                    color: theme.colorScheme.outline,
+                  ),
                 ),
               ),
-            ),
-            TextButton(
-              onPressed: () => Get.back(result: true),
-              child: const Text('确定'),
-            ),
-          ],
-        );
-      },
-    );
-  } else {
-    executeImport = true;
-  }
-  if (executeImport ?? false) {
-    try {
-      await onImport(json);
-      SmartDialog.showToast('导入成功');
-    } catch (e) {
-      SmartDialog.showToast('导入失败：$e');
+              TextButton(
+                onPressed: () => Get.back(result: true),
+                child: const Text('确定'),
+              ),
+            ],
+          );
+        },
+      );
+    } else {
+      executeImport = true;
     }
+    if (executeImport ?? false) {
+      try {
+        await onImport(json);
+        SmartDialog.showToast('导入成功');
+      } catch (e) {
+        SmartDialog.showToast('导入失败：$e');
+      }
+    }
+  } else {
+    SmartDialog.showToast('剪贴板无数据');
+    return;
   }
 }
 
 Future<void> importFromLocalFile<T>({
   required FutureOr<void> Function(T json) onImport,
 }) async {
-  final result = await FilePicker.pickFiles();
+  final result = await FilePicker.pickFiles(
+    type: .custom,
+    allowedExtensions: const ['json', 'txt'],
+  );
   if (result != null) {
     final path = result.files.first.path;
     if (path != null) {
       final data = await File(path).readAsString();
-      late final T json;
+      final T json;
       try {
         json = jsonDecode(data);
       } catch (e) {
@@ -172,7 +176,6 @@ void importFromInput<T>(
             json = jsonDecode(value!) as T;
             return null;
           } catch (e) {
-            if (e is FormatException) {}
             return '解析json失败：$e';
           }
         },

lib/common/widgets/select_mask.dart

@@ -2,7 +2,7 @@ import 'package:PiliPlus/common/style.dart';
 import 'package:flutter/material.dart';
 
 Widget selectMask(
-  ThemeData theme,
+  ColorScheme colorScheme,
   bool checked, {
   BorderRadiusGeometry borderRadius = Style.mdRadius,
 }) {
@@ -23,12 +23,12 @@ Widget selectMask(
           width: 34,
           height: 34,
           decoration: BoxDecoration(
-            color: theme.colorScheme.surface.withValues(alpha: 0.8),
+            color: colorScheme.surface.withValues(alpha: 0.8),
             shape: BoxShape.circle,
           ),
           child: Icon(
             Icons.done_all_outlined,
-            color: theme.colorScheme.primary,
+            color: colorScheme.primary,
             semanticLabel: '取消选择',
           ),
         ),