♻️ Upgrade network

niuhuan · Oct 26, 2023 · b2931a0 · b2931a0
1 parent 170b4b7
commit b2931a0
Show file tree

Hide file tree

Showing 7 changed files with 94 additions and 42 deletions.
diff --git a/ci/version.code.txt b/ci/version.code.txt
@@ -1 +1 @@
-v1.4.9
+v1.5.1
diff --git a/ci/version.info.txt b/ci/version.info.txt
@@ -1,5 +1,6 @@
-v1.4.9
+v1.5.1
 
-- [x] ✨ Display actors
-- [x] ♻️ Hidden comment's html tags 
-- [x] ✨ Search from title
+- [x] ♻️ Network
+- [x] 🐛 Fix copy error
+- [x] ♻️ Title words setting
+- [x] ♻️ Login error tips
diff --git a/lib/configs/configs.dart b/lib/configs/configs.dart
@@ -7,6 +7,7 @@ import 'package:jasmine/configs/pager_column_number.dart';
 import 'package:jasmine/configs/pager_cover_rate.dart';
 import 'package:jasmine/configs/passed.dart';
 import 'package:jasmine/configs/proxy.dart';
+import 'package:jasmine/configs/search_title_words.dart';
 import 'package:jasmine/configs/theme.dart';
 import 'package:jasmine/configs/using_right_click_pop.dart';
 import 'package:jasmine/configs/volume_key_control.dart';
@@ -64,4 +65,5 @@ Future initConfigs() async {
   await initExportRename();
   await initLogin();
   await initDisplayJmcode();
+  await initSearchTitleWords();
 }
diff --git a/lib/configs/search_title_words.dart b/lib/configs/search_title_words.dart
@@ -0,0 +1,45 @@
+/// 自动全屏
+
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+
+import '../basic/commons.dart';
+import '../basic/methods.dart';
+
+const _propertyName = "searchTitleWords";
+late bool _searchTitleWords;
+
+Future<void> initSearchTitleWords() async {
+  _searchTitleWords =
+      (await methods.loadProperty(_propertyName)) == "true";
+}
+
+bool currentSearchTitleWords() {
+  return _searchTitleWords;
+}
+
+Future<void> _chooseSearchTitleWords(BuildContext context) async {
+  String? result = await chooseListDialog<String>(context,
+      title: "标题中的关键字", values: ["是", "否"]);
+  if (result != null) {
+    var target = result == "是";
+    await methods.saveProperty(_propertyName, "$target");
+    _searchTitleWords = target;
+  }
+}
+
+Widget searchTitleWordsSetting() {
+  return StatefulBuilder(
+    builder: (BuildContext context, void Function(void Function()) setState) {
+      return ListTile(
+        title: const Text("标题中的关键字"),
+        subtitle: Text(_searchTitleWords ? "是" : "否"),
+        onTap: () async {
+          await _chooseSearchTitleWords(context);
+          setState(() {});
+        },
+      );
+    },
+  );
+}
diff --git a/lib/screens/components/comic_info_card.dart b/lib/screens/components/comic_info_card.dart
@@ -5,6 +5,7 @@ import 'package:jasmine/basic/entities.dart';
 import 'package:jasmine/screens/comic_search_screen.dart';
 
 import '../../configs/display_jmcode.dart';
+import '../../configs/search_title_words.dart';
 import 'images.dart';
 
 class ComicInfoCard extends StatelessWidget {
@@ -51,42 +52,42 @@ class ComicInfoCard extends StatelessWidget {
               children: [
                 ...link
                     ? [
-                        Text.rich(TextSpan(children: [
-                          true
-                              ? TextSpan(
-                                  style: titleStyle,
-                                  children: titleProcess(comic.name, context),
-                                  recognizer: LongPressGestureRecognizer()
-                                    ..onLongPress = () {
-                                      confirmCopy(context, comic.name);
-                                    },
-                                )
-                              : TextSpan(
-                                  text: comic.name,
-                                  style: titleStyle,
-                                  children: [],
-                                  recognizer: LongPressGestureRecognizer()
-                                    ..onLongPress = () {
-                                      confirmCopy(context, comic.name);
-                                    },
-                                ),
-                          ...currentDisplayJmcode()
-                              ? [
-                                  TextSpan(
-                                    text: "  (JM${comic.id})",
-                                    style: TextStyle(
-                                      fontSize: 13,
-                                      color: Colors.orange.shade700,
-                                    ),
-                                    recognizer: LongPressGestureRecognizer()
-                                      ..onLongPress = () {
-                                        confirmCopy(context, "JM${comic.id}");
-                                      },
-                                  ),
-                                ]
-                              : [],
-                        ])),
-                      ]
+                  Text.rich(TextSpan(children: [
+                    currentSearchTitleWords()
+                        ? TextSpan(
+                      style: titleStyle,
+                      children: titleProcess(comic.name, context),
+                      recognizer: LongPressGestureRecognizer()
+                        ..onLongPress = () {
+                          confirmCopy(context, comic.name);
+                        },
+                    )
+                        : TextSpan(
+                      text: comic.name,
+                      style: titleStyle,
+                      children: [],
+                      recognizer: LongPressGestureRecognizer()
+                        ..onLongPress = () {
+                          confirmCopy(context, comic.name);
+                        },
+                    ),
+                    ...currentDisplayJmcode()
+                        ? [
+                      TextSpan(
+                        text: "  (JM${comic.id})",
+                        style: TextStyle(
+                          fontSize: 13,
+                          color: Colors.orange.shade700,
+                        ),
+                        recognizer: LongPressGestureRecognizer()
+                          ..onLongPress = () {
+                            confirmCopy(context, "JM${comic.id}");
+                          },
+                      ),
+                    ]
+                        : [],
+                  ])),
+                ]
                     : [Text(comic.name, style: titleStyle)],
                 Container(height: 4),
                 link

diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
@@ -12,6 +12,7 @@ import '../configs/download_and_export_to.dart';
 import '../configs/export_rename.dart';
 import '../configs/no_animation.dart';
 import '../configs/proxy.dart';
+import '../configs/search_title_words.dart';
 import '../configs/theme.dart';
 import '../configs/using_right_click_pop.dart';
 import '../configs/volume_key_control.dart';
@@ -85,6 +86,8 @@ class _SettingsState extends State<SettingsScreen> {
             title: const Text("导出下载到目录(即使没有下载完)"),
           ),
           const Divider(),
+          searchTitleWordsSetting(),
+          const Divider(),
         ],
       ),
     );

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,7 +3,7 @@ description: jasmine comic browser
 
 publish_to: 'none'
 
-version: 1.4.8+18
+version: 1.5.1+19
 
 environment:
   sdk: ">=2.15.1 <3.0.0"