Merge pull request #119 from venera-app/dev

v1.1.3
venera-app · Dec 26, 2024 · a5c745f · a5c745f
2 parents 18f450a + d27efb1
commit a5c745f
Show file tree

Hide file tree

Showing 23 changed files with 471 additions and 290 deletions.
diff --git a/debian/gui/venera.desktop b/debian/gui/venera.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Version={{Version}}
 Name=Venera
 GenericName=Venera
 Comment=venera

diff --git a/lib/components/comic.dart b/lib/components/comic.dart
@@ -342,30 +342,50 @@ class ComicTile extends StatelessWidget {
   }
 
   List<String> _splitText(String text) {
-    // split text by space, comma. text in brackets will be kept together.
+    // split text by comma, brackets
     var words = <String>[];
     var buffer = StringBuffer();
     var inBracket = false;
+    String? prevBracket;
     for (var i = 0; i < text.length; i++) {
       var c = text[i];
       if (c == '[' || c == '(') {
-        inBracket = true;
+        if (inBracket) {
+          buffer.write(c);
+        } else {
+          if (buffer.isNotEmpty) {
+            words.add(buffer.toString().trim());
+            buffer.clear();
+          }
+          inBracket = true;
+          prevBracket = c;
+        }
       } else if (c == ']' || c == ')') {
-        inBracket = false;
-      } else if (c == ' ' || c == ',') {
+        if (prevBracket == '[' && c == ']' || prevBracket == '(' && c == ')') {
+          if (buffer.isNotEmpty) {
+            words.add(buffer.toString().trim());
+            buffer.clear();
+          }
+          inBracket = false;
+        } else {
+          buffer.write(c);
+        }
+      } else if (c == ',') {
         if (inBracket) {
           buffer.write(c);
         } else {
-          words.add(buffer.toString());
+          words.add(buffer.toString().trim());
           buffer.clear();
         }
       } else {
         buffer.write(c);
       }
     }
     if (buffer.isNotEmpty) {
-      words.add(buffer.toString());
+      words.add(buffer.toString().trim());
     }
+    words.removeWhere((element) => element == "");
+    words = words.toSet().toList();
     return words;
   }
 
@@ -383,26 +403,33 @@ class ComicTile extends StatelessWidget {
         return StatefulBuilder(builder: (context, setState) {
           return ContentDialog(
             title: 'Block'.tl,
-            content: Wrap(
-              runSpacing: 8,
-              spacing: 8,
-              children: [
-                for (var word in all)
-                  OptionChip(
-                    text: word,
-                    isSelected: words.contains(word),
-                    onTap: () {
-                      setState(() {
-                        if (!words.contains(word)) {
-                          words.add(word);
-                        } else {
-                          words.remove(word);
-                        }
-                      });
-                    },
-                  ),
-              ],
-            ).paddingHorizontal(16),
+            content: ConstrainedBox(
+              constraints: BoxConstraints(
+                maxHeight: math.min(400, context.height - 136),
+              ),
+              child: SingleChildScrollView(
+                child: Wrap(
+                  runSpacing: 8,
+                  spacing: 8,
+                  children: [
+                    for (var word in all)
+                      OptionChip(
+                        text: word,
+                        isSelected: words.contains(word),
+                        onTap: () {
+                          setState(() {
+                            if (!words.contains(word)) {
+                              words.add(word);
+                            } else {
+                              words.remove(word);
+                            }
+                          });
+                        },
+                      ),
+                  ],
+                ),
+              ).paddingHorizontal(16),
+            ),
             actions: [
               Button.filled(
                 onPressed: () {
@@ -833,6 +860,7 @@ class ComicList extends StatefulWidget {
     this.menuBuilder,
     this.controller,
     this.refreshHandlerCallback,
+    this.enablePageStorage = false,
   });
 
   final Future<Res<List<Comic>>> Function(int page)? loadPage;
@@ -851,6 +879,8 @@ class ComicList extends StatefulWidget {
 
   final void Function(VoidCallback c)? refreshHandlerCallback;
 
+  final bool enablePageStorage;
+
   @override
   State<ComicList> createState() => ComicListState();
 }
@@ -868,6 +898,8 @@ class ComicListState extends State<ComicList> {
 
   String? _nextUrl;
 
+  late bool enablePageStorage = widget.enablePageStorage;
+
   Map<String, dynamic> get state => {
     'maxPage': _maxPage,
     'data': _data,
@@ -878,7 +910,7 @@ class ComicListState extends State<ComicList> {
   };
 
   void restoreState(Map<String, dynamic>? state) {
-    if (state == null) {
+    if (state == null || !enablePageStorage) {
       return;
     }
     _maxPage = state['maxPage'];
@@ -892,7 +924,9 @@ class ComicListState extends State<ComicList> {
   }
 
   void storeState() {
-    PageStorage.of(context).writeState(context, state);
+    if(enablePageStorage) {
+      PageStorage.of(context).writeState(context, state);
+    }
   }
 
   void refresh() {
@@ -1122,7 +1156,7 @@ class ComicListState extends State<ComicList> {
       );
     }
     return SmoothCustomScrollView(
-      key: const PageStorageKey('scroll'),
+      key: enablePageStorage ? PageStorageKey('scroll$_page') : null,
       controller: widget.controller,
       slivers: [
         if (widget.leadingSliver != null) widget.leadingSliver!,

diff --git a/lib/components/message.dart b/lib/components/message.dart
@@ -290,6 +290,7 @@ class ContentDialog extends StatelessWidget {
           : const EdgeInsets.symmetric(horizontal: 16),
       elevation: 2,
       shadowColor: context.colorScheme.shadow,
+      backgroundColor: context.colorScheme.surface,
       child: AnimatedSize(
         duration: const Duration(milliseconds: 200),
         alignment: Alignment.topCenter,

diff --git a/lib/foundation/app.dart b/lib/foundation/app.dart
@@ -10,7 +10,7 @@ export "widget_utils.dart";
 export "context.dart";
 
 class _App {
-  final version = "1.1.2";
+  final version = "1.1.3";
 
   bool get isAndroid => Platform.isAndroid;
 

diff --git a/lib/foundation/history.dart b/lib/foundation/history.dart
@@ -201,8 +201,6 @@ class HistoryManager with ChangeNotifier {
 
   Map<String, bool>? _cachedHistory;
 
-  static const _kMaxHistoryLength = 200;
-
   Future<void> init() async {
     _db = sqlite3.open("${App.dataPath}/history.db");
 
@@ -228,12 +226,6 @@ class HistoryManager with ChangeNotifier {
   ///
   /// This function would be called when user start reading.
   Future<void> addHistory(History newItem) async {
-    while(count() >= _kMaxHistoryLength) {
-      _db.execute("""
-        delete from history
-        where time == (select min(time) from history);
-      """);
-    }
     _db.execute("""
         insert or replace into history (id, title, subtitle, cover, time, type, ep, page, readEpisode, max_page)
         values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?);