tweaks (#1187)

* opt: marquee

* fix: bangumi seek

* opt: post panel

* opt: remove deprecated code

* opt: singleton dynController

* fix: music scheme

* feat: MemberVideo jump keep position

* tweak

lib/common/widgets/dialog/report.dart

@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 
-void autoWrapReportDialog(
+Future<void> autoWrapReportDialog(
   BuildContext context,
   Map<String, Map<int, String>> options,
   Future<Map> Function(int reasonType, String? reasonDesc, bool banUid)
@@ -14,30 +14,30 @@ void autoWrapReportDialog(
   String? reasonDesc;
   bool banUid = false;
   late final key = GlobalKey<FormState>();
-  showDialog(
+  return showDialog(
     context: context,
-    builder: (context) => StatefulBuilder(
-      builder: (context, setState) {
-        return AlertDialog(
-          title: const Text('举报'),
-          titlePadding: const EdgeInsets.only(left: 22, top: 16, right: 22),
-          contentPadding: const EdgeInsets.symmetric(vertical: 5),
-          actionsPadding: const EdgeInsets.only(
-            left: 16,
-            right: 16,
-            bottom: 10,
-          ),
-          content: Form(
-            key: key,
-            child: Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Flexible(
-                  child: SingleChildScrollView(
-                    child: AnimatedSize(
-                      duration: const Duration(milliseconds: 200),
-                      child: Column(
+    builder: (context) {
+      return AlertDialog(
+        title: const Text('举报'),
+        titlePadding: const EdgeInsets.only(left: 22, top: 16, right: 22),
+        contentPadding: const EdgeInsets.symmetric(vertical: 5),
+        actionsPadding: const EdgeInsets.only(
+          left: 16,
+          right: 16,
+          bottom: 10,
+        ),
+        content: Form(
+          key: key,
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Flexible(
+                child: SingleChildScrollView(
+                  child: AnimatedSize(
+                    duration: const Duration(milliseconds: 200),
+                    child: Builder(
+                      builder: (context) => Column(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
                           const Padding(
@@ -48,13 +48,20 @@ void autoWrapReportDialog(
                             ),
                             child: Text('请选择举报的理由：'),
                           ),
-                          ...options.entries.map(
-                            (entry) => WrapRadioOptionsGroup<int>(
-                              groupTitle: entry.key,
-                              options: entry.value,
-                              selectedValue: reasonType,
-                              onChanged: (value) =>
-                                  setState(() => reasonType = value),
+                          RadioGroup(
+                            onChanged: (value) {
+                              reasonType = value;
+                              (context as Element).markNeedsBuild();
+                            },
+                            groupValue: reasonType,
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: options.entries.map((entry) {
+                                return WrapRadioOptionsGroup<int>(
+                                  groupTitle: entry.key,
+                                  options: entry.value,
+                                );
+                              }).toList(),
                             ),
                           ),
                           if (reasonType == 0)
@@ -66,51 +73,51 @@ void autoWrapReportDialog(
                     ),
                   ),
                 ),
-                Padding(
-                  padding: const EdgeInsets.only(left: 14, top: 6),
-                  child: CheckBoxText(
-                    text: '拉黑该用户',
-                    onChanged: (value) => banUid = value,
-                  ),
+              ),
+              Padding(
+                padding: const EdgeInsets.only(left: 14, top: 6),
+                child: CheckBoxText(
+                  text: '拉黑该用户',
+                  onChanged: (value) => banUid = value,
                 ),
-              ],
+              ),
+            ],
+          ),
+        ),
+        actions: [
+          TextButton(
+            onPressed: Get.back,
+            child: Text(
+              '取消',
+              style: TextStyle(color: Theme.of(context).colorScheme.outline),
             ),
           ),
-          actions: [
-            TextButton(
-              onPressed: Get.back,
-              child: Text(
-                '取消',
-                style: TextStyle(color: Theme.of(context).colorScheme.outline),
-              ),
-            ),
-            TextButton(
-              onPressed: () async {
-                if (reasonType == null ||
-                    (reasonType == 0 && key.currentState?.validate() != true)) {
-                  return;
+          TextButton(
+            onPressed: () async {
+              if (reasonType == null ||
+                  (reasonType == 0 && key.currentState?.validate() != true)) {
+                return;
+              }
+              SmartDialog.showLoading();
+              try {
+                final data = await onSuccess(reasonType!, reasonDesc, banUid);
+                SmartDialog.dismiss();
+                if (data['code'] == 0) {
+                  Get.back();
+                  SmartDialog.showToast('举报成功');
+                } else {
+                  SmartDialog.showToast(data['message']);
                 }
-                SmartDialog.showLoading();
-                try {
-                  final data = await onSuccess(reasonType!, reasonDesc, banUid);
-                  SmartDialog.dismiss();
-                  if (data['code'] == 0) {
-                    Get.back();
-                    SmartDialog.showToast('举报成功');
-                  } else {
-                    SmartDialog.showToast(data['message']);
-                  }
-                } catch (e) {
-                  SmartDialog.dismiss();
-                  SmartDialog.showToast('提交失败：$e');
-                }
-              },
-              child: const Text('确定'),
-            ),
-          ],
-        );
-      },
-    ),
+              } catch (e) {
+                SmartDialog.dismiss();
+                SmartDialog.showToast('提交失败：$e');
+              }
+            },
+            child: const Text('确定'),
+          ),
+        ],
+      );
+    },
   );
 }
 
@@ -186,8 +193,8 @@ class _CheckBoxTextState extends State<CheckBoxText> {
       onTap: () {
         setState(() {
           _selected = !_selected;
+          widget.onChanged(_selected);
         });
-        widget.onChanged(_selected);
       },
       child: Padding(
         padding: const EdgeInsets.all(4),

lib/common/widgets/dialog/report_member.dart

@@ -1,126 +1,124 @@
-import 'package:PiliPlus/common/widgets/radio_widget.dart';
 import 'package:PiliPlus/http/member.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 
-class MemberReportPanel extends StatefulWidget {
-  const MemberReportPanel({
-    super.key,
-    required this.name,
-    required this.mid,
-  });
+Future<void> showMemberReportDialog(
+  BuildContext context, {
+  required Object? name,
+  required Object mid,
+}) {
+  final List<bool> reasonList = List.generate(3, (_) => false);
+  final Set<int> reason = {};
+  int? reasonV2;
 
-  final dynamic name;
-  final dynamic mid;
-
-  @override
-  State<MemberReportPanel> createState() => _MemberReportPanelState();
-}
-
-class _MemberReportPanelState extends State<MemberReportPanel> {
-  final List<bool> _reasonList = List.generate(3, (_) => false);
-  final Set<int> _reason = {};
-  int? _reasonV2;
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-    return SingleChildScrollView(
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Text(
-            '举报: ${widget.name}',
-            style: const TextStyle(fontSize: 18),
-          ),
-          const SizedBox(height: 4),
-          Text('uid: ${widget.mid}'),
-          const SizedBox(height: 10),
-          const Text('举报内容（必选，可多选）'),
-          ...List.generate(
-            3,
-            (index) => _checkBoxWidget(
-              _reasonList[index],
-              (value) {
-                setState(() => _reasonList[index] = value);
-                if (value) {
-                  _reason.add(index + 1);
-                } else {
-                  _reason.remove(index + 1);
-                }
-              },
-              const ['头像违规', '昵称违规', '签名违规'][index],
+  return showDialog(
+    context: context,
+    builder: (context) {
+      final theme = Theme.of(context);
+      return AlertDialog(
+        clipBehavior: Clip.hardEdge,
+        contentPadding: const EdgeInsets.symmetric(
+          horizontal: 20,
+          vertical: 16,
+        ),
+        titleTextStyle: theme.textTheme.bodyMedium,
+        title: Column(
+          spacing: 4,
+          children: [
+            Text(
+              '举报: $name',
+              style: const TextStyle(fontSize: 18),
             ),
-          ),
-          const Text('举报理由（单选，非必选）'),
-          ...List.generate(
-            5,
-            (index) => RadioWidget<int>(
-              value: index,
-              groupValue: _reasonV2,
-              onChanged: (value) {
-                setState(() => _reasonV2 = value);
-              },
-              title: const ['色情低俗', '不实信息', '违禁', '人身攻击', '赌博诈骗'][index],
-            ),
-          ),
-          const SizedBox(height: 10),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.end,
+            Text('uid: $mid'),
+          ],
+        ),
+        content: SingleChildScrollView(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              TextButton(
-                onPressed: Get.back,
-                child: Text(
-                  '取消',
-                  style: TextStyle(color: theme.colorScheme.outline),
+              const Text('举报内容（必选，可多选）'),
+              ...List.generate(
+                3,
+                (index) => Builder(
+                  builder: (context) => CheckboxListTile(
+                    dense: true,
+                    value: reasonList[index],
+                    controlAffinity: ListTileControlAffinity.leading,
+                    contentPadding: EdgeInsets.zero,
+                    onChanged: (value) {
+                      reasonList[index] = value!;
+                      if (value) {
+                        reason.add(index + 1);
+                      } else {
+                        reason.remove(index + 1);
+                      }
+                      (context as Element).markNeedsBuild();
+                    },
+                    title: Text(const ['头像违规', '昵称违规', '签名违规'][index]),
+                  ),
                 ),
               ),
-              TextButton(
-                onPressed: () async {
-                  if (_reason.isEmpty) {
-                    SmartDialog.showToast('至少选择一项作为举报内容');
-                  } else {
-                    Get.back();
-                    var result = await MemberHttp.reportMember(
-                      widget.mid,
-                      reason: _reason.join(','),
-                      reasonV2: _reasonV2 != null ? _reasonV2! + 1 : null,
-                    );
-                    if (result['msg'] is String && result['msg'].isNotEmpty) {
-                      SmartDialog.showToast(result['msg']);
-                    } else {
-                      SmartDialog.showToast('举报失败');
-                    }
-                  }
-                },
-                child: const Text('确定'),
+              const Text('举报理由（单选，非必选）'),
+              Builder(
+                builder: (context) => RadioGroup<int>(
+                  onChanged: (v) {
+                    reasonV2 = v;
+                    (context as Element).markNeedsBuild();
+                  },
+                  groupValue: reasonV2,
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: List.generate(
+                      5,
+                      (index) => RadioListTile<int>(
+                        toggleable: true,
+                        controlAffinity: ListTileControlAffinity.leading,
+                        contentPadding: const EdgeInsets.only(left: 4),
+                        dense: true,
+                        value: index,
+                        title: Text(
+                          const ['色情低俗', '不实信息', '违禁', '人身攻击', '赌博诈骗'][index],
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
               ),
             ],
           ),
-        ],
-      ),
-    );
-  }
-}
-
-Widget _checkBoxWidget(
-  bool defValue,
-  ValueChanged onChanged,
-  String title,
-) {
-  return InkWell(
-    onTap: () => onChanged(!defValue),
-    child: Row(
-      children: [
-        Checkbox(
-          value: defValue,
-          onChanged: onChanged,
-          materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
         ),
-        Text(title),
-      ],
-    ),
+        actions: [
+          TextButton(
+            onPressed: Get.back,
+            child: Text(
+              '取消',
+              style: TextStyle(color: theme.colorScheme.outline),
+            ),
+          ),
+          TextButton(
+            onPressed: () async {
+              if (reason.isEmpty) {
+                SmartDialog.showToast('至少选择一项作为举报内容');
+              } else {
+                Get.back();
+                var result = await MemberHttp.reportMember(
+                  mid,
+                  reason: reason.join(','),
+                  reasonV2: reasonV2 != null ? reasonV2! + 1 : null,
+                );
+                if (result['msg'] is String && result['msg'].isNotEmpty) {
+                  SmartDialog.showToast(result['msg']);
+                } else {
+                  SmartDialog.showToast('举报失败');
+                }
+              }
+            },
+            child: const Text('确定'),
+          ),
+        ],
+      );
+    },
   );
 }