update README.md

continuous mode: fix floating button

README.md

@@ -7,11 +7,15 @@
 
 A comic reader that support reading local and network comics.
 
-## Current Status
+## Features
 
-The project is still under development, and the current version is not stable.
-
-Use the project at your own risk.
+- Read local comics
+- Use javascript to create comic sources
+- Read comics from network sources
+- Manage favorite comics
+- Download comics
+- View comments, tags, and other information of comics if the source supports
+- Login to comment, rate, and other operations if the source supports
 
 ## Create a new comic source
 

assets/translation.json

@@ -146,7 +146,16 @@
     "Select a cbz file." : "选择一个cbz文件",
     "A cbz file" : "一个cbz文件",
     "Fullscreen": "全屏",
-    "Exit": "退出"
+    "Exit": "退出",
+    "View more": "查看更多",
+    "Sort": "排序",
+    "Name": "名称",
+    "Date": "日期",
+    "Date Desc": "日期降序",
+    "Start": "开始",
+    "Export App Data": "导出应用数据",
+    "Import App Data": "导入应用数据",
+    "Export": "导出"
   },
   "zh_TW": {
     "Home": "首頁",
@@ -295,6 +304,15 @@
     "Select a cbz file." : "選擇一個cbz文件",
     "A cbz file" : "一個cbz文件",
     "Fullscreen": "全螢幕",
-    "Exit": "退出"
+    "Exit": "退出",
+    "View more": "查看更多",
+    "Sort": "排序",
+    "Name": "名稱",
+    "Date": "日期",
+    "Date Desc": "日期降序",
+    "Start": "開始",
+    "Export App Data": "匯出應用數據",
+    "Import App Data": "匯入應用數據",
+    "Export": "匯出"
   }
 }

lib/components/button.dart

@@ -156,7 +156,7 @@ class _ButtonState extends State<Button> {
   @override
   Widget build(BuildContext context) {
     var padding = widget.padding ??
-        const EdgeInsets.symmetric(horizontal: 16, vertical: 6);
+        const EdgeInsets.symmetric(horizontal: 16, vertical: 4);
     var width = widget.width;
     if (width != null) {
       width = width - padding.horizontal;
@@ -172,7 +172,7 @@ class _ButtonState extends State<Button> {
       child: DefaultTextStyle(
         style: TextStyle(
           color: textColor,
-          fontSize: 16,
+          fontSize: 14,
         ),
         child: isLoading
             ? CircularProgressIndicator(
@@ -210,11 +210,11 @@ class _ButtonState extends State<Button> {
           decoration: BoxDecoration(
             color: buttonColor,
             borderRadius: BorderRadius.circular(16),
-            boxShadow: (isHover && !isLoading && widget.type == ButtonType.filled)
+            boxShadow: (isHover && !isLoading && (widget.type == ButtonType.filled || widget.type == ButtonType.normal))
                 ? [
                     BoxShadow(
                       color: Colors.black.withOpacity(0.1),
-                      blurRadius: 4,
+                      blurRadius: 2,
                       offset: const Offset(0, 1),
                     )
                   ]
@@ -252,6 +252,14 @@ class _ButtonState extends State<Button> {
         return color;
       }
     }
+    if (widget.type == ButtonType.normal) {
+      var color = widget.color ?? context.colorScheme.surfaceContainer;
+      if (isHover) {
+        return color.withOpacity(0.9);
+      } else {
+        return color;
+      }
+    }
     if (isHover) {
       return context.colorScheme.outline.withOpacity(0.2);
     }

lib/components/comic.dart

@@ -872,6 +872,7 @@ class ComicListState extends State<ComicList> {
     try {
       if (widget.loadPage != null) {
         var res = await widget.loadPage!(page);
+        if(!mounted) return;
         if (res.success) {
           if (res.data.isEmpty) {
             _data[page] = const [];

lib/foundation/app.dart

@@ -10,7 +10,7 @@ export "widget_utils.dart";
 export "context.dart";
 
 class _App {
-  final version = "1.0.0";
+  final version = "1.0.1";
 
   bool get isAndroid => Platform.isAndroid;
 

lib/foundation/appdata.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 
+import 'package:flutter/foundation.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:venera/foundation/app.dart';
 import 'package:venera/utils/io.dart';
@@ -85,7 +86,7 @@ class _Appdata {
 
 final appdata = _Appdata();
 
-class _Settings {
+class _Settings with ChangeNotifier {
   _Settings();
 
   final _data = <String, dynamic>{
@@ -117,6 +118,7 @@ class _Settings {
 
   operator []=(String key, dynamic value) {
     _data[key] = value;
+    notifyListeners();
   }
 
   @override

lib/foundation/favorites.dart

@@ -83,7 +83,9 @@ class FavoriteItem implements Comic {
   int? get maxPage => null;
 
   @override
-  String get sourceKey => type == ComicType.local ? 'local' : type.comicSource?.key ?? "Unknown:${type.value}";
+  String get sourceKey => type == ComicType.local
+      ? 'local'
+      : type.comicSource?.key ?? "Unknown:${type.value}";
 
   @override
   double? get stars => null;
@@ -108,17 +110,17 @@ class FavoriteItem implements Comic {
 
   static FavoriteItem fromJson(Map<String, dynamic> json) {
     var type = json["type"] as int;
-    if(type == 0 && json['coverPath'].toString().startsWith('http')) {
+    if (type == 0 && json['coverPath'].toString().startsWith('http')) {
       type = 'picacg'.hashCode;
-    } else if(type == 1) {
+    } else if (type == 1) {
       type = 'ehentai'.hashCode;
-    } else if(type == 2) {
+    } else if (type == 2) {
       type = 'jm'.hashCode;
-    } else if(type == 3) {
+    } else if (type == 3) {
       type = 'hitomi'.hashCode;
-    } else if(type == 4) {
+    } else if (type == 4) {
       type = 'wnacg'.hashCode;
-    } else if(type == 6) {
+    } else if (type == 6) {
       type = 'nhentai'.hashCode;
     }
     return FavoriteItem(
@@ -132,21 +134,18 @@ class FavoriteItem implements Comic {
   }
 }
 
-class FavoriteItemWithFolderInfo {
-  FavoriteItem comic;
+class FavoriteItemWithFolderInfo extends FavoriteItem {
   String folder;
 
-  FavoriteItemWithFolderInfo(this.comic, this.folder);
-
-  @override
-  bool operator ==(Object other) {
-    return other is FavoriteItemWithFolderInfo &&
-        other.comic == comic &&
-        other.folder == folder;
-  }
-
-  @override
-  int get hashCode => comic.hashCode ^ folder.hashCode;
+  FavoriteItemWithFolderInfo(FavoriteItem item, this.folder)
+      : super(
+          id: item.id,
+          name: item.name,
+          coverPath: item.coverPath,
+          author: item.author,
+          type: item.type,
+          tags: item.tags,
+        );
 }
 
 class LocalFavoritesManager {
@@ -498,11 +497,11 @@ class LocalFavoritesManager {
     }
 
     bool test(FavoriteItemWithFolderInfo comic, String keyword) {
-      if (comic.comic.name.contains(keyword)) {
+      if (comic.name.contains(keyword)) {
         return true;
-      } else if (comic.comic.author.contains(keyword)) {
+      } else if (comic.author.contains(keyword)) {
         return true;
-      } else if (comic.comic.tags.any((element) => element.contains(keyword))) {
+      } else if (comic.tags.any((element) => element.contains(keyword))) {
         return true;
       }
       return false;
@@ -577,7 +576,7 @@ class LocalFavoritesManager {
   void fromJson(String json) {
     var data = jsonDecode(json);
     var folder = data["name"];
-    if(folder == null || folder is! String) {
+    if (folder == null || folder is! String) {
       throw "Invalid data";
     }
     if (folderNames.contains(folder)) {
@@ -591,10 +590,13 @@ class LocalFavoritesManager {
     for (var comic in data["comics"]) {
       try {
         addComic(folder, FavoriteItem.fromJson(comic));
-      }
-      catch(e) {
+      } catch (e) {
         Log.error("Import Data", e.toString());
       }
     }
   }
+
+  void close() {
+    _db.dispose();
+  }
 }

lib/foundation/history.dart

@@ -172,6 +172,8 @@ class HistoryManager with ChangeNotifier {
           max_page int
         );
       """);
+
+    notifyListeners();
   }
 
   /// add history. if exists, update time.
@@ -275,4 +277,8 @@ class HistoryManager with ChangeNotifier {
     """);
     return res.first[0] as int;
   }
+
+  void close() {
+    _db.dispose();
+  }
 }

lib/foundation/local.dart

@@ -166,7 +166,7 @@ class LocalManager with ChangeNotifier {
     } catch (e) {
       return e.toString();
     }
-    await Directory(path).deleteIgnoreError();
+    await Directory(path).deleteIgnoreError(recursive:true);
     path = newPath;
     return null;
   }
@@ -261,8 +261,14 @@ class LocalManager with ChangeNotifier {
     notifyListeners();
   }
 
-  List<LocalComic> getComics() {
-    final res = _db.select('SELECT * FROM comics;');
+  List<LocalComic> getComics(LocalSortType sortType) {
+    var res = _db.select('''
+      SELECT * FROM comics
+      ORDER BY 
+        ${sortType.value == 'name' ? 'title' : 'created_at'} 
+        ${sortType.value == 'time_asc' ? 'ASC' : 'DESC'}
+      ;
+    ''');
     return res.map((row) => LocalComic.fromRow(row)).toList();
   }
 
@@ -310,6 +316,15 @@ class LocalManager with ChangeNotifier {
     return LocalComic.fromRow(res.first);
   }
 
+  List<LocalComic> search(String keyword) {
+    final res = _db.select('''
+      SELECT * FROM comics
+      WHERE title LIKE ? OR tags LIKE ? OR subtitle LIKE ?
+      ORDER BY created_at DESC;
+    ''', ['%$keyword%', '%$keyword%', '%$keyword%']);
+    return res.map((row) => LocalComic.fromRow(row)).toList();
+  }
+
   Future<List<String>> getImages(String id, ComicType type, Object ep) async {
     if(ep is! String && ep is! int) {
       throw "Invalid ep";
@@ -429,3 +444,22 @@ class LocalManager with ChangeNotifier {
     notifyListeners();
   }
 }
+
+enum LocalSortType {
+  name("name"),
+  timeAsc("time_asc"),
+  timeDesc("time_desc");
+
+  final String value;
+
+  const LocalSortType(this.value);
+
+  static LocalSortType fromString(String value) {
+    for (var type in values) {
+      if (type.value == value) {
+        return type;
+      }
+    }
+    return name;
+  }
+}

lib/network/download.dart

@@ -197,6 +197,7 @@ class ImagesDownloadTask extends DownloadTask with _TransferSpeedMixin {
           _scheduleTasks();
         }
       });
+      downloading++;
     }
   }
 
@@ -590,5 +591,7 @@ abstract mixin class _TransferSpeedMixin {
   void stopRecorder() {
     timer?.cancel();
     timer = null;
+    _currentSpeed = 0;
+    _bytesSinceLastSecond = 0;
   }
 }

lib/pages/accounts_page.dart

@@ -70,6 +70,7 @@ class AccountsPage extends StatelessWidget {
               ),
             );
             element.saveData();
+            ComicSource.notifyListeners();
             logic.update();
           },
         );
@@ -124,6 +125,7 @@ class AccountsPage extends StatelessWidget {
             element.data["account"] = null;
             element.account?.logout();
             element.saveData();
+            ComicSource.notifyListeners();
             logic.update();
           },
           trailing: const Icon(Icons.logout),

lib/pages/comic_page.dart

@@ -42,12 +42,41 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
 
   bool isDownloaded = false;
 
+  void updateHistory() async {
+    var newHistory = await HistoryManager()
+        .find(widget.id, ComicType(widget.sourceKey.hashCode));
+    if(newHistory?.ep != history?.ep || newHistory?.page != history?.page) {
+      history = newHistory;
+      update();
+    }
+  }
+
+  @override
+  Widget buildLoading() {
+    return Column(
+      children: [
+        const Appbar(title: Text("")),
+        Expanded(
+          child: super.buildLoading(),
+        ),
+      ],
+    );
+  }
+
   @override
   void initState() {
     scrollController.addListener(onScroll);
+    HistoryManager().addListener(updateHistory);
     super.initState();
   }
 
+  @override
+  void dispose() {
+    scrollController.removeListener(onScroll);
+    HistoryManager().removeListener(updateHistory);
+    super.dispose();
+  }
+
   @override
   void update() {
     setState(() {});
@@ -205,6 +234,7 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
 
   Widget buildActions() {
     bool isMobile = context.width < changePoint;
+    bool hasHistory = history != null && (history!.ep > 1 || history!.page > 1);
     return SliverToBoxAdapter(
       child: Column(
         children: [
@@ -212,17 +242,17 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
             scrollDirection: Axis.horizontal,
             padding: const EdgeInsets.symmetric(horizontal: 8),
             children: [
-              if (history != null && (history!.ep > 1 || history!.page > 1))
+              if (hasHistory && !isMobile)
                 _ActionButton(
                   icon: const Icon(Icons.menu_book),
                   text: 'Continue'.tl,
                   onPressed: continueRead,
                   iconColor: context.useTextColor(Colors.yellow),
                 ),
-              if (!isMobile)
+              if(!isMobile || hasHistory)
                 _ActionButton(
                   icon: const Icon(Icons.play_circle_outline),
-                  text: 'Read'.tl,
+                  text: 'Start'.tl,
                   onPressed: read,
                   iconColor: context.useTextColor(Colors.orange),
                 ),
@@ -278,7 +308,10 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
                 ),
                 const SizedBox(width: 16),
                 Expanded(
-                  child: FilledButton(onPressed: read, child: Text("Read".tl)),
+                  child: hasHistory
+                      ? FilledButton(
+                          onPressed: continueRead, child: Text("Continue".tl))
+                      : FilledButton(onPressed: read, child: Text("Read".tl)),
                 )
               ],
             ).paddingHorizontal(16).paddingVertical(8),
@@ -398,23 +431,23 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
                 Text(comic.stars!.toStringAsFixed(2)),
               ],
             ).paddingLeft(16).paddingVertical(8),
-            for (var e in comic.tags.entries)
-              buildWrap(
-                children: [
-                  if(e.value.isNotEmpty)
+          for (var e in comic.tags.entries)
+            buildWrap(
+              children: [
+                if (e.value.isNotEmpty)
                   buildTag(text: e.key.ts(comicSource.key), isTitle: true),
-                  for (var tag in e.value)
-                    buildTag(
-                      text: enableTranslation
-                          ? TagsTranslation.translationTagWithNamespace(
-                              tag,
-                              e.key.toLowerCase(),
-                            )
-                          : tag,
-                      onTap: () => onTapTag(tag, e.key),
-                    ),
-                ],
-              ),
+                for (var tag in e.value)
+                  buildTag(
+                    text: enableTranslation
+                        ? TagsTranslation.translationTagWithNamespace(
+                            tag,
+                            e.key.toLowerCase(),
+                          )
+                        : tag,
+                    onTap: () => onTapTag(tag, e.key),
+                  ),
+              ],
+            ),
           if (comic.uploader != null)
             buildWrap(
               children: [
@@ -458,7 +491,7 @@ class _ComicPageState extends LoadingState<ComicPage, ComicDetails>
   }
 
   Widget buildRecommend() {
-    if (comic.recommend == null||comic.recommend!.isEmpty) {
+    if (comic.recommend == null || comic.recommend!.isEmpty) {
       return const SliverPadding(padding: EdgeInsets.zero);
     }
     return SliverMainAxisGroup(slivers: [
@@ -770,6 +803,7 @@ class _ActionButton extends StatelessWidget {
     this.isLoading,
     this.iconColor,
   });
+
   final Widget icon;
 
   final Widget? activeIcon;
@@ -783,6 +817,7 @@ class _ActionButton extends StatelessWidget {
   final bool? isLoading;
 
   final Color? iconColor;
+
   @override
   Widget build(BuildContext context) {
     return Container(

lib/pages/comic_source_page.dart

@@ -40,6 +40,7 @@ class ComicSourcePage extends StatefulWidget {
     }
     controller?.close();
     if (shouldUpdate.isEmpty) {
+      App.rootContext.showMessage(message: "No Update Available".tl);
       return;
     }
     var msg = "";

lib/pages/explore_page.dart

@@ -5,8 +5,12 @@ import 'package:venera/foundation/appdata.dart';
 import 'package:venera/foundation/comic_source/comic_source.dart';
 import 'package:venera/foundation/res.dart';
 import 'package:venera/foundation/state_controller.dart';
+import 'package:venera/pages/search_result_page.dart';
+import 'package:venera/utils/ext.dart';
 import 'package:venera/utils/translations.dart';
 
+import 'category_comics_page.dart';
+
 class ExplorePage extends StatefulWidget {
   const ExplorePage({super.key});
 
@@ -15,7 +19,7 @@ class ExplorePage extends StatefulWidget {
 }
 
 class _ExplorePageState extends State<ExplorePage>
-    with TickerProviderStateMixin {
+    with TickerProviderStateMixin, AutomaticKeepAliveClientMixin<ExplorePage> {
   late TabController controller;
 
   bool showFB = true;
@@ -24,6 +28,24 @@ class _ExplorePageState extends State<ExplorePage>
 
   late List<String> pages;
 
+  void onSettingsChanged() {
+    var explorePages = List<String>.from(appdata.settings["explore_pages"]);
+    var all = ComicSource.all()
+        .map((e) => e.explorePages)
+        .expand((e) => e.map((e) => e.title))
+        .toList();
+    explorePages = explorePages.where((e) => all.contains(e)).toList();
+    if (!pages.isEqualsTo(explorePages)) {
+      setState(() {
+        pages = explorePages;
+        controller = TabController(
+          length: pages.length,
+          vsync: this,
+        );
+      });
+    }
+  }
+
   @override
   void initState() {
     pages = List<String>.from(appdata.settings["explore_pages"]);
@@ -36,9 +58,17 @@ class _ExplorePageState extends State<ExplorePage>
       length: pages.length,
       vsync: this,
     );
+    appdata.settings.addListener(onSettingsChanged);
     super.initState();
   }
 
+  @override
+  void dispose() {
+    controller.dispose();
+    appdata.settings.removeListener(onSettingsChanged);
+    super.dispose();
+  }
+
   void refresh() {
     int page = controller.index;
     String currentPageId = pages[page];
@@ -83,12 +113,14 @@ class _ExplorePageState extends State<ExplorePage>
 
   @override
   Widget build(BuildContext context) {
+    super.build(context);
     if (pages.isEmpty) {
       return buildEmpty();
     }
 
     Widget tabBar = Material(
       child: FilledTabBar(
+        key: Key(pages.toString()),
         tabs: pages.map((e) => buildTab(e)).toList(),
         controller: controller,
       ),
@@ -97,48 +129,50 @@ class _ExplorePageState extends State<ExplorePage>
     return Stack(
       children: [
         Positioned.fill(
-            child: Column(
-          children: [
-            tabBar,
-            Expanded(
-              child: NotificationListener<ScrollNotification>(
-                onNotification: (notifications) {
-                  if (notifications.metrics.axis == Axis.horizontal) {
-                    if (!showFB) {
+          child: Column(
+            children: [
+              tabBar,
+              Expanded(
+                child: NotificationListener<ScrollNotification>(
+                  onNotification: (notifications) {
+                    if (notifications.metrics.axis == Axis.horizontal) {
+                      if (!showFB) {
+                        setState(() {
+                          showFB = true;
+                        });
+                      }
+                      return true;
+                    }
+
+                    var current = notifications.metrics.pixels;
+
+                    if ((current > location && current != 0) && showFB) {
+                      setState(() {
+                        showFB = false;
+                      });
+                    } else if ((current < location || current == 0) &&
+                        !showFB) {
                       setState(() {
                         showFB = true;
                       });
                     }
-                    return true;
-                  }
 
-                  var current = notifications.metrics.pixels;
-
-                  if ((current > location && current != 0) && showFB) {
-                    setState(() {
-                      showFB = false;
-                    });
-                  } else if ((current < location || current == 0) && !showFB) {
-                    setState(() {
-                      showFB = true;
-                    });
-                  }
-
-                  location = current;
-                  return false;
-                },
-                child: MediaQuery.removePadding(
-                  context: context,
-                  removeTop: true,
-                  child: TabBarView(
-                    controller: controller,
-                    children: pages.map((e) => buildBody(e)).toList(),
+                    location = current;
+                    return false;
+                  },
+                  child: MediaQuery.removePadding(
+                    context: context,
+                    removeTop: true,
+                    child: TabBarView(
+                      controller: controller,
+                      children: pages.map((e) => buildBody(e)).toList(),
+                    ),
                   ),
                 ),
-              ),
-            )
-          ],
-        )),
+              )
+            ],
+          ),
+        ),
         Positioned(
           right: 16,
           bottom: 16,
@@ -159,6 +193,9 @@ class _ExplorePageState extends State<ExplorePage>
       ],
     );
   }
+
+  @override
+  bool get wantKeepAlive => true;
 }
 
 class _SingleExplorePage extends StatefulWidget {
@@ -170,7 +207,8 @@ class _SingleExplorePage extends StatefulWidget {
   State<_SingleExplorePage> createState() => _SingleExplorePageState();
 }
 
-class _SingleExplorePageState extends StateWithController<_SingleExplorePage> {
+class _SingleExplorePageState extends StateWithController<_SingleExplorePage>
+    with AutomaticKeepAliveClientMixin<_SingleExplorePage> {
   late final ExplorePageData data;
 
   bool loading = true;
@@ -183,6 +221,16 @@ class _SingleExplorePageState extends StateWithController<_SingleExplorePage> {
 
   int key = 0;
 
+  bool _wantKeepAlive = true;
+
+  void onSettingsChanged() {
+    var explorePages = appdata.settings["explore_pages"];
+    if (!explorePages.contains(widget.title)) {
+      _wantKeepAlive = false;
+      updateKeepAlive();
+    }
+  }
+
   @override
   void initState() {
     super.initState();
@@ -195,11 +243,19 @@ class _SingleExplorePageState extends StateWithController<_SingleExplorePage> {
         }
       }
     }
+    appdata.settings.addListener(onSettingsChanged);
     throw "Explore Page ${widget.title} Not Found!";
   }
 
+  @override
+  void dispose() {
+    appdata.settings.removeListener(onSettingsChanged);
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
+    super.build(context);
     if (data.loadMultiPart != null) {
       return buildMultiPart();
     } else if (data.loadPage != null || data.loadNext != null) {
@@ -284,6 +340,9 @@ class _SingleExplorePageState extends StateWithController<_SingleExplorePage> {
       });
     }
   }
+
+  @override
+  bool get wantKeepAlive => _wantKeepAlive;
 }
 
 class _MixedExplorePage extends StatefulWidget {
@@ -367,13 +426,12 @@ Iterable<Widget> _buildExplorePagePart(
               if (part.viewMore != null)
                 TextButton(
                   onPressed: () {
-                    // TODO: view more
-                    /*
                     var context = App.mainNavigatorKey!.currentContext!;
                     if (part.viewMore!.startsWith("search:")) {
                       context.to(
-                            () => SearchResultPage(
-                          keyword: part.viewMore!.replaceFirst("search:", ""),
+                        () => SearchResultPage(
+                          text: part.viewMore!.replaceFirst("search:", ""),
+                          options: const [],
                           sourceKey: sourceKey,
                         ),
                       );
@@ -385,16 +443,16 @@ Iterable<Widget> _buildExplorePagePart(
                         p = null;
                       }
                       context.to(
-                            () => CategoryComicsPage(
+                        () => CategoryComicsPage(
                           category: c,
                           categoryKey:
-                          ComicSource.find(sourceKey)!.categoryData!.key,
+                              ComicSource.find(sourceKey)!.categoryData!.key,
                           param: p,
                         ),
                       );
-                    }*/
+                    }
                   },
-                  child: Text("查看更多".tl),
+                  child: Text("View more".tl),
                 )
             ],
           ),

lib/pages/favorites/favorites_page.dart

@@ -17,6 +17,7 @@ part 'favorite_actions.dart';
 part 'side_bar.dart';
 part 'local_favorites_page.dart';
 part 'network_favorites_page.dart';
+part 'local_search_page.dart';
 
 const _kLeftBarWidth = 256.0;
 

lib/pages/favorites/local_search_page.dart

@@ -0,0 +1,41 @@
+part of 'favorites_page.dart';
+
+class LocalSearchPage extends StatefulWidget {
+  const LocalSearchPage({super.key});
+
+  @override
+  State<LocalSearchPage> createState() => _LocalSearchPageState();
+}
+
+class _LocalSearchPageState extends State<LocalSearchPage> {
+  String keyword = '';
+
+  var comics = <FavoriteItemWithFolderInfo>[];
+
+  late final SearchBarController controller;
+
+  @override
+  void initState() {
+    super.initState();
+    controller = SearchBarController(onSearch: (text) {
+      keyword = text;
+      comics = LocalFavoritesManager().search(keyword);
+      setState(() {});
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: SmoothCustomScrollView(slivers: [
+        SliverSearchBar(controller: controller),
+        SliverGridComics(
+          comics: comics,
+          badgeBuilder: (c) {
+            return (c as FavoriteItemWithFolderInfo).folder;
+          },
+        ),
+      ]),
+    );
+  }
+}

lib/pages/favorites/side_bar.dart

@@ -88,6 +88,13 @@ class _LeftBarState extends State<_LeftBar> implements FolderList {
                         const SizedBox(width: 12),
                         Text("Local".tl),
                         const Spacer(),
+                        IconButton(
+                          icon: const Icon(Icons.search),
+                          color: context.colorScheme.primary,
+                          onPressed: () {
+                            context.to(() => const LocalSearchPage());
+                          },
+                        ),
                         IconButton(
                           icon: const Icon(Icons.add),
                           color: context.colorScheme.primary,
@@ -112,6 +119,7 @@ class _LeftBarState extends State<_LeftBar> implements FolderList {
                 if (index == 0) {
                   return Container(
                     padding: const EdgeInsets.symmetric(vertical: 12),
+                    margin: const EdgeInsets.only(top: 8),
                     decoration: BoxDecoration(
                       border: Border(
                         top: BorderSide(

lib/pages/home_page.dart

@@ -820,6 +820,7 @@ class _AccountsWidgetState extends State<_AccountsWidget> {
 
   void onComicSourceChange() {
     setState(() {
+      accounts.clear();
       for (var c in ComicSource.all()) {
         if (c.isLogged) {
           accounts.add(c.name);

lib/pages/local_comics_page.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:venera/components/components.dart';
 import 'package:venera/foundation/app.dart';
+import 'package:venera/foundation/appdata.dart';
 import 'package:venera/foundation/local.dart';
 import 'package:venera/pages/downloading_page.dart';
 import 'package:venera/utils/cbz.dart';
@@ -17,15 +18,29 @@ class LocalComicsPage extends StatefulWidget {
 class _LocalComicsPageState extends State<LocalComicsPage> {
   late List<LocalComic> comics;
 
+  late LocalSortType sortType;
+
+  String keyword = "";
+
+  bool searchMode = false;
+
   void update() {
-    setState(() {
-      comics = LocalManager().getComics();
-    });
+    if(keyword.isEmpty) {
+      setState(() {
+        comics = LocalManager().getComics(sortType);
+      });
+    } else {
+      setState(() {
+        comics = LocalManager().search(keyword);
+      });
+    }
   }
 
   @override
   void initState() {
-    comics = LocalManager().getComics();
+    var sort = appdata.implicitData["local_sort"] ?? "name";
+    sortType = LocalSortType.fromString(sort);
+    comics = LocalManager().getComics(sortType);
     LocalManager().addListener(update);
     super.initState();
   }
@@ -36,25 +51,129 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
     super.dispose();
   }
 
+  void sort() {
+    showDialog(
+      context: context,
+      builder: (context) {
+        return StatefulBuilder(builder: (context, setState) {
+          return ContentDialog(
+            title: "Sort".tl,
+            content: Column(
+              children: [
+                RadioListTile<LocalSortType>(
+                  title: Text("Name".tl),
+                  value: LocalSortType.name,
+                  groupValue: sortType,
+                  onChanged: (v) {
+                    setState(() {
+                      sortType = v!;
+                    });
+                  },
+                ),
+                RadioListTile<LocalSortType>(
+                  title: Text("Date".tl),
+                  value: LocalSortType.timeAsc,
+                  groupValue: sortType,
+                  onChanged: (v) {
+                    setState(() {
+                      sortType = v!;
+                    });
+                  },
+                ),
+                RadioListTile<LocalSortType>(
+                  title: Text("Date Desc".tl),
+                  value: LocalSortType.timeDesc,
+                  groupValue: sortType,
+                  onChanged: (v) {
+                    setState(() {
+                      sortType = v!;
+                    });
+                  },
+                ),
+              ],
+            ),
+            actions: [
+              FilledButton(
+                onPressed: () {
+                  appdata.implicitData["local_sort"] =
+                      sortType.value;
+                  appdata.writeImplicitData();
+                  Navigator.pop(context);
+                  update();
+                },
+                child: Text("Confirm".tl),
+              ),
+            ],
+          );
+        });
+      },
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       body: SmoothCustomScrollView(
         slivers: [
-          SliverAppbar(
-            title: Text("Local".tl),
-            actions: [
-              Tooltip(
-                message: "Downloading".tl,
-                child: IconButton(
-                  icon: const Icon(Icons.download),
+          if(!searchMode)
+            SliverAppbar(
+              title: Text("Local".tl),
+              actions: [
+                Tooltip(
+                  message: "Search".tl,
+                  child: IconButton(
+                    icon: const Icon(Icons.search),
+                    onPressed: () {
+                      setState(() {
+                        searchMode = true;
+                      });
+                    },
+                  ),
+                ),
+                Tooltip(
+                  message: "Sort".tl,
+                  child: IconButton(
+                    icon: const Icon(Icons.sort),
+                    onPressed: sort,
+                  ),
+                ),
+                Tooltip(
+                  message: "Downloading".tl,
+                  child: IconButton(
+                    icon: const Icon(Icons.download),
+                    onPressed: () {
+                      showPopUpWidget(context, const DownloadingPage());
+                    },
+                  ),
+                )
+              ],
+            )
+          else
+            SliverAppbar(
+              title: TextField(
+                autofocus: true,
+                decoration: InputDecoration(
+                  hintText: "Search".tl,
+                  border: InputBorder.none,
+                ),
+                onChanged: (v) {
+                  keyword = v;
+                  update();
+                },
+              ),
+              actions: [
+                IconButton(
+                  icon: const Icon(Icons.close),
                   onPressed: () {
-                    showPopUpWidget(context, const DownloadingPage());
+                    setState(() {
+                      searchMode = false;
+                      keyword = "";
+                      update();
+                    });
                   },
                 ),
-              )
-            ],
-          ),
+              ],
+            ),
           SliverGridComics(
             comics: comics,
             onTap: (c) {
@@ -80,8 +199,7 @@ class _LocalComicsPageState extends State<LocalComicsPage> {
                         var file = await CBZ.export(c as LocalComic);
                         await saveFile(filename: file.name, file: file);
                         await file.delete();
-                      }
-                      catch (e) {
+                      } catch (e) {
                         context.showMessage(message: e.toString());
                       }
                       controller.close();

lib/pages/reader/scaffold.dart

@@ -147,7 +147,7 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
         ),
         AnimatedPositioned(
           duration: const Duration(milliseconds: 180),
-          bottom: _isOpen ? 0 : -kBottomBarHeight,
+          bottom: _isOpen ? 0 : -(kBottomBarHeight + MediaQuery.of(context).padding.bottom),
           left: 0,
           right: 0,
           child: buildBottom(),
@@ -513,12 +513,12 @@ class _ReaderScaffoldState extends State<_ReaderScaffold> {
                       color: Colors.transparent,
                       child: InkWell(
                         onTap: () {
-                          setFloatingButton(0);
                           if (showFloatingButtonValue == 1) {
                             context.reader.toNextChapter();
-                          } else {
+                          } else if (showFloatingButtonValue == -1) {
                             context.reader.toPrevChapter();
                           }
+                          setFloatingButton(0);
                         },
                         borderRadius: BorderRadius.circular(16),
                         child: Center(

lib/pages/settings/app.dart

@@ -86,6 +86,36 @@ class _AppSettingsState extends State<AppSettings> {
           },
           actionTitle: 'Set'.tl,
         ).toSliver(),
+        _CallbackSetting(
+          title: "Export App Data".tl,
+          callback: () async {
+            var controller = showLoadingDialog(context);
+            var file = await exportAppData();
+            await saveFile(filename: "data.venera", file: file);
+            controller.close();
+          },
+          actionTitle: 'Export'.tl,
+        ).toSliver(),
+        _CallbackSetting(
+          title: "Import App Data".tl,
+          callback: () async {
+            var controller = showLoadingDialog(context);
+            var file = await selectFile(ext: ['venera']);
+            if(file != null) {
+              var cacheFile = File(FilePath.join(App.cachePath, "temp.venera"));
+              await file.saveTo(cacheFile.path);
+              try {
+                await importAppData(cacheFile);
+              }
+              catch(e, s) {
+                Log.error("Import data", e.toString(), s);
+                context.showMessage(message: "Failed to import data".tl);
+              }
+            }
+            controller.close();
+          },
+          actionTitle: 'Import'.tl,
+        ).toSliver(),
         _SettingPartTitle(
           title: "Log".tl,
           icon: Icons.error_outline,

lib/pages/settings/appearance.dart

@@ -21,6 +21,9 @@ class _AppearanceSettingsState extends State<AppearanceSettings> {
             "light": "Light".tl,
             "dark": "Dark".tl,
           },
+          onChanged: () async {
+            App.forceRebuild();
+          },
         ).toSliver(),
         SelectSetting(
           title: "Theme Color".tl,

lib/pages/settings/setting_components.dart

@@ -434,7 +434,7 @@ class _CallbackSetting extends StatelessWidget {
     return ListTile(
       title: Text(title),
       subtitle: subtitle == null ? null : Text(subtitle!),
-      trailing: FilledButton(
+      trailing: Button.normal(
         onPressed: callback,
         child: Text(actionTitle),
       ).fixHeight(28),

lib/pages/settings/settings_page.dart

@@ -14,6 +14,7 @@ import 'package:venera/foundation/consts.dart';
 import 'package:venera/foundation/local.dart';
 import 'package:venera/foundation/log.dart';
 import 'package:venera/network/app_dio.dart';
+import 'package:venera/utils/data.dart';
 import 'package:venera/utils/io.dart';
 import 'package:venera/utils/translations.dart';
 import 'package:yaml/yaml.dart';

lib/utils/data.dart

@@ -0,0 +1,71 @@
+import 'dart:isolate';
+
+import 'package:venera/foundation/app.dart';
+import 'package:venera/foundation/appdata.dart';
+import 'package:venera/foundation/comic_source/comic_source.dart';
+import 'package:venera/foundation/favorites.dart';
+import 'package:venera/foundation/history.dart';
+import 'package:zip_flutter/zip_flutter.dart';
+
+import 'io.dart';
+
+Future<File> exportAppData() async {
+  var time = DateTime.now().millisecondsSinceEpoch ~/ 1000;
+  var cacheFilePath = FilePath.join(App.cachePath, '$time.venera');
+  var cacheFile = File(cacheFilePath);
+  var dataPath = App.dataPath;
+  if(await cacheFile.exists()) {
+    await cacheFile.delete();
+  }
+  await Isolate.run(() {
+    var zipFile = ZipFile.open(cacheFilePath);
+    var historyFile = FilePath.join(dataPath, "history.db");
+    var localFavoriteFile = FilePath.join(dataPath, "local_favorite.db");
+    var appdata = FilePath.join(dataPath, "appdata.json");
+    zipFile.addFile("history.db", historyFile);
+    zipFile.addFile("local_favorite.db", localFavoriteFile);
+    zipFile.addFile("appdata.json", appdata);
+    for(var file in Directory(FilePath.join(dataPath, "comic_source")).listSync()) {
+      if(file is File) {
+        zipFile.addFile("comic_source/${file.name}", file.path);
+      }
+    }
+    zipFile.close();
+  });
+  return cacheFile;
+}
+
+Future<void> importAppData(File file) async {
+  var cacheDirPath = FilePath.join(App.cachePath, 'temp_data');
+  var cacheDir = Directory(cacheDirPath);
+  await Isolate.run(() {
+    ZipFile.openAndExtract(file.path, cacheDirPath);
+  });
+  var historyFile = cacheDir.joinFile("history.db");
+  var localFavoriteFile = cacheDir.joinFile("local_favorite.db");
+  var appdataFile = cacheDir.joinFile("appdata.json");
+  if(await historyFile.exists()) {
+    HistoryManager().close();
+    await historyFile.copy(FilePath.join(App.dataPath, "history.db"));
+    HistoryManager().init();
+  }
+  if(await localFavoriteFile.exists()) {
+    LocalFavoritesManager().close();
+    await localFavoriteFile.copy(FilePath.join(App.dataPath, "local_favorite.db"));
+    LocalFavoritesManager().init();
+  }
+  if(await appdataFile.exists()) {
+    await appdataFile.copy(FilePath.join(App.dataPath, "appdata.json"));
+    appdata.init();
+  }
+  var comicSourceDir = FilePath.join(cacheDirPath, "comic_source");
+  if(Directory(comicSourceDir).existsSync()) {
+    for(var file in Directory(comicSourceDir).listSync()) {
+      if(file is File) {
+        var targetFile = FilePath.join(App.dataPath, "comic_source", file.name);
+        await file.copy(targetFile);
+      }
+    }
+    await ComicSource.reload();
+  }
+}

lib/utils/ext.dart

@@ -24,6 +24,18 @@ extension ListExt<T> on List<T>{
       add(value);
     }
   }
+
+  bool isEqualsTo(List<T> list){
+    if(length != list.length){
+      return false;
+    }
+    for(int i=0; i<length; i++){
+      if(this[i] != list[i]){
+        return false;
+      }
+    }
+    return true;
+  }
 }
 
 extension StringExt on String{

lib/utils/io.dart

@@ -169,7 +169,8 @@ Future<file_selector.XFile?> selectFile({required List<String> ext}) async {
     acceptedTypeGroups: <file_selector.XTypeGroup>[typeGroup],
   );
   if (file == null) return null;
-  if (!ext.contains(file?.path.split(".").last)) {
+  if (!ext.contains(file.path.split(".").last)) {
+    App.rootContext.showMessage(message: "Invalid file type");
     return null;
   }
   return file;

pubspec.yaml

@@ -2,7 +2,7 @@ name: venera
 description: "A comic app."
 publish_to: 'none'
 
-version: 1.0.0+1
+version: 1.0.1+101
 
 environment:
   sdk: '>=3.5.0 <4.0.0'

windows/build.iss

@@ -53,6 +53,7 @@ Source: "{#RootPath}\build\windows\x64\runner\Release\share_plus_plugin.dll"; De
 Source: "{#RootPath}\build\windows\x64\runner\Release\url_launcher_windows_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#RootPath}\build\windows\x64\runner\Release\screen_retriever_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#RootPath}\build\windows\x64\runner\Release\window_manager_plugin.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#RootPath}\build\windows\x64\runner\Release\zip_flutter.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#RootPath}\build\windows\x64\runner\Release\data\*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files