From 5d43f5c556c36f0cf83d5c1ed396198d9437eff9 Mon Sep 17 00:00:00 2001 From: nyne Date: Thu, 7 Nov 2024 08:59:49 +0800 Subject: [PATCH] fix favorites page --- assets/translation.json | 8 +++- lib/pages/favorites/favorite_actions.dart | 1 - lib/pages/favorites/favorites_page.dart | 3 +- lib/pages/favorites/local_favorites_page.dart | 7 +-- pubspec.lock | 44 ++++++++++++++++--- pubspec.yaml | 2 +- 6 files changed, 51 insertions(+), 14 deletions(-) diff --git a/assets/translation.json b/assets/translation.json index 0df06c2..0545744 100644 --- a/assets/translation.json +++ b/assets/translation.json @@ -169,7 +169,9 @@ "minAppVersion @version is required": "需要最低App版本 @version", "Remove": "移除", "Long press to zoom": "长按缩放", - "Updates Available": "更新可用" + "Updates Available": "更新可用", + "Unselected": "未选择", + "Long press and drag to reorder.": "长按并拖动以重新排序。" }, "zh_TW": { "Home": "首頁", @@ -341,6 +343,8 @@ "minAppVersion @version is required": "需要最低App版本 @version", "Remove": "移除", "Long press to zoom": "長按縮放", - "Updates Available": "更新可用" + "Updates Available": "更新可用", + "Unselected": "未選擇", + "Long press and drag to reorder.": "長按並拖動以重新排序。" } } \ No newline at end of file diff --git a/lib/pages/favorites/favorite_actions.dart b/lib/pages/favorites/favorite_actions.dart index a51f091..2b625d6 100644 --- a/lib/pages/favorites/favorite_actions.dart +++ b/lib/pages/favorites/favorite_actions.dart @@ -6,7 +6,6 @@ Future newFolder() async { context: App.rootContext, builder: (context) { var controller = TextEditingController(); - var folders = LocalFavoritesManager().folderNames; String? error; return StatefulBuilder(builder: (context, setState) { diff --git a/lib/pages/favorites/favorites_page.dart b/lib/pages/favorites/favorites_page.dart index f069923..042058e 100644 --- a/lib/pages/favorites/favorites_page.dart +++ b/lib/pages/favorites/favorites_page.dart @@ -152,7 +152,8 @@ class _FavoritesPageState extends State { } else { var favoriteData = getFavoriteDataOrNull(folder!); if (favoriteData == null) { - return const Center(child: Text("Unknown source")); + folder = null; + return buildBody(); } else { return NetworkFavoritePage(favoriteData, key: Key(folder!)); } diff --git a/lib/pages/favorites/local_favorites_page.dart b/lib/pages/favorites/local_favorites_page.dart index 0497042..62230c8 100644 --- a/lib/pages/favorites/local_favorites_page.dart +++ b/lib/pages/favorites/local_favorites_page.dart @@ -15,10 +15,8 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> { late List comics; void updateComics() { - print(comics.length); setState(() { comics = LocalFavoritesManager().getAllComics(widget.folder); - print(comics.length); }); } @@ -107,7 +105,9 @@ class _LocalFavoritesPageState extends State<_LocalFavoritesPage> { }, ).then( (value) { - setState(() {}); + if(mounted) { + setState(() {}); + } }, ); }), @@ -199,6 +199,7 @@ class _ReorderComicsPageState extends State<_ReorderComicsPage> { var comicSource = e.type.comicSource; return ComicTile( key: Key(e.hashCode.toString()), + enableLongPressed: false, comic: Comic( e.name, e.coverPath, diff --git a/pubspec.lock b/pubspec.lock index fdf85c8..0c55483 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -345,10 +345,10 @@ packages: dependency: "direct main" description: name: flutter_reorderable_grid_view - sha256: "40abcc5bff228ebff119326502e7357ee6399956b60b80b17385e9770b7458c0" + sha256: "93a2b9e279bf40b9333428a67e70e520ca1528554984eb6f6304538400897e64" url: "https://pub.dev" source: hosted - version: "5.0.1" + version: "5.3.2" flutter_rust_bridge: dependency: transitive description: @@ -638,10 +638,42 @@ packages: dependency: transitive description: name: screen_retriever - sha256: "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90" + sha256: "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c" url: "https://pub.dev" source: hosted - version: "0.1.9" + version: "0.2.0" + screen_retriever_linux: + dependency: transitive + description: + name: screen_retriever_linux + sha256: f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18 + url: "https://pub.dev" + source: hosted + version: "0.2.0" + screen_retriever_macos: + dependency: transitive + description: + name: screen_retriever_macos + sha256: "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149" + url: "https://pub.dev" + source: hosted + version: "0.2.0" + screen_retriever_platform_interface: + dependency: transitive + description: + name: screen_retriever_platform_interface + sha256: ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0 + url: "https://pub.dev" + source: hosted + version: "0.2.0" + screen_retriever_windows: + dependency: transitive + description: + name: screen_retriever_windows + sha256: "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13" + url: "https://pub.dev" + source: hosted + version: "0.2.0" scrollable_positioned_list: dependency: "direct main" description: @@ -868,10 +900,10 @@ packages: dependency: "direct main" description: name: window_manager - sha256: ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792 + sha256: "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059" url: "https://pub.dev" source: hosted - version: "0.4.2" + version: "0.4.3" xdg_directories: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 119c78f..06018c7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -39,7 +39,7 @@ dependencies: url: https://github.com/venera-app/flutter.widgets ref: 09e756b1f1b04e6298318d99ec20a787fb360f59 path: packages/scrollable_positioned_list - flutter_reorderable_grid_view: 5.0.1 + flutter_reorderable_grid_view: 5.3.2 yaml: any uuid: ^4.5.1 desktop_webview_window: