Merge pull request #43 from miru-project/fix/ui-and-extension-setting…

…s-display-errors Fix UI and extension settings display errors
miru-project · Aug 28, 2023 · d513b85 · d513b85
2 parents 3413f00 + 73806c5
commit d513b85
Show file tree

Hide file tree

Showing 7 changed files with 84 additions and 163 deletions.
diff --git a/lib/models/extension_setting.dart b/lib/models/extension_setting.dart
@@ -30,9 +30,8 @@ class ExtensionSetting {
   late ExtensionSettingType type;
   // 描述
   String? description;
-  // 如果是 radio 类型，这里是各项选项,且必填 , 存储为 ["key:value","key:value"]
-  // 为啥不直接用 map，因为 isar 还不支持 map 类型
-  List<String>? options;
+
+  String? options;
 
   static ExtensionSettingType stringToType(String type) {
     switch (type) {

diff --git a/lib/models/extension_setting.g.dart b/lib/models/extension_setting.g.dart
diff --git a/lib/pages/detail/widgets/detail_continue_play.dart b/lib/pages/detail/widgets/detail_continue_play.dart
@@ -68,6 +68,8 @@ class _DetailContinuePlayState extends State<DetailContinuePlay> {
                 'episode': history!.episodeTitle,
               },
             ),
+            maxLines: 2,
+            overflow: TextOverflow.ellipsis,
           ),
           style: ButtonStyle(
             minimumSize: MaterialStateProperty.all(

diff --git a/lib/pages/extension_settings/view.dart b/lib/pages/extension_settings/view.dart
@@ -1,3 +1,4 @@
+import 'dart:convert';
 import 'dart:io';
 
 import 'package:flutter/material.dart';
@@ -80,14 +81,10 @@ class _ExtensionSettingsPageState extends State<ExtensionSettingsPage> {
         ));
       }
       if (setting.type == ExtensionSettingType.radio) {
-        final map = <String, String>{};
+        final map = Map<String, String>.from(jsonDecode(setting.options!));
         list.add(SettingsRadiosTile(
           title: setting.title,
           itemNameValue: () {
-            for (final item in setting.options!) {
-              final split = item.split(':');
-              map[split[0]] = split[1];
-            }
             return map;
           }(),
           buildSubtitle: () => setting.description ?? '',
@@ -101,11 +98,6 @@ class _ExtensionSettingsPageState extends State<ExtensionSettingsPage> {
             setState(() {});
           },
           buildGroupValue: () => setting.value ?? setting.defaultValue,
-          trailing: Text(
-            map.entries
-                .firstWhere((element) => element.value == setting.value)
-                .key,
-          ),
         ));
       }
       if (setting.type == ExtensionSettingType.toggle) {

diff --git a/lib/pages/watch/widgets/video/video_player.dart b/lib/pages/watch/widgets/video/video_player.dart
@@ -94,7 +94,12 @@ class _VideoPlayerState extends State<VideoPlayer> {
                           maxHeight: 200,
                           maxWidth: maxWidth,
                         ),
-                        child: _c.cuurentMessageWidget.value,
+                        child: DefaultTextStyle(
+                          style: const TextStyle(
+                            color: Colors.white,
+                          ),
+                          child: _c.cuurentMessageWidget.value!,
+                        ),
                       ).animate().fade(),
                     ),
                 ],