diff --git a/assets/translation.json b/assets/translation.json index d7a25c1..d8e93c8 100644 --- a/assets/translation.json +++ b/assets/translation.json @@ -19,7 +19,7 @@ "Select": "选择", "Imported @a comics": "已导入 @a 部漫画", "Downloading": "下载中", - "Back": "返回", + "Back": "后退", "Delete": "删除", "Full Screen": "全屏", "Auto Page Turning": "自动翻页", @@ -156,7 +156,18 @@ "Export App Data": "导出应用数据", "Import App Data": "导入应用数据", "Export": "导出", - "Download Threads": "下载线程数" + "Download Threads": "下载线程数", + "Update Time": "更新时间", + "Copy ID": "复制ID", + "Copy URL": "复制URL", + "Create": "创建", + "Folder Name": "文件夹名称", + "Ranking": "排行", + "Download Selected": "下载选中", + "Download All": "下载全部", + "Order": "顺序", + "minAppVersion @version is required": "需要最低App版本 @version", + "Remove": "移除" }, "zh_TW": { "Home": "首頁", @@ -179,7 +190,7 @@ "Select": "選擇", "Imported @a comics": "已匯入 @a 部漫畫", "Downloading": "下載中", - "Back": "返回", + "Back": "後退", "Delete": "刪除", "Full Screen": "全螢幕", "Auto Page Turning": "自動翻頁", @@ -315,6 +326,17 @@ "Export App Data": "匯出應用數據", "Import App Data": "匯入應用數據", "Export": "匯出", - "Download Threads": "下載線程數" + "Download Threads": "下載線程數", + "Update Time": "更新時間", + "Copy ID": "複製ID", + "Copy URL": "複製URL", + "Create": "創建", + "Folder Name": "文件夾名稱", + "Ranking": "排行", + "Download Selected": "下載選中", + "Download All": "下載全部", + "Order": "順序", + "minAppVersion @version is required": "需要最低App版本 @version", + "Remove": "移除" } } \ No newline at end of file diff --git a/lib/components/comic.dart b/lib/components/comic.dart index 2c4c4c3..ab8c073 100644 --- a/lib/components/comic.dart +++ b/lib/components/comic.dart @@ -454,7 +454,9 @@ class _ComicDescription extends StatelessWidget { ), ).toAlign(Alignment.topCenter); }), - ), + ) + else + const Spacer(), Row( crossAxisAlignment: CrossAxisAlignment.end, children: [ diff --git a/lib/foundation/comic_source/comic_source.dart b/lib/foundation/comic_source/comic_source.dart index 06621ad..f4c64df 100644 --- a/lib/foundation/comic_source/comic_source.dart +++ b/lib/foundation/comic_source/comic_source.dart @@ -12,6 +12,7 @@ import 'package:venera/foundation/history.dart'; import 'package:venera/foundation/res.dart'; import 'package:venera/utils/ext.dart'; import 'package:venera/utils/io.dart'; +import 'package:venera/utils/translations.dart'; import '../js_engine.dart'; import '../log.dart'; diff --git a/lib/foundation/comic_source/parser.dart b/lib/foundation/comic_source/parser.dart index ed723df..b02c54f 100644 --- a/lib/foundation/comic_source/parser.dart +++ b/lib/foundation/comic_source/parser.dart @@ -106,7 +106,9 @@ class ComicSourceParser { if (minAppVersion != null) { if (compareSemVer(minAppVersion, App.version.split('-').first)) { throw ComicSourceParseException( - "minAppVersion $minAppVersion is required"); + "minAppVersion @version is required" + .tlParams({"version": minAppVersion}), + ); } } for (var source in ComicSource.all()) { @@ -728,7 +730,7 @@ class ComicSourceParser { return retryZone(func); }; - if(_checkExists("favorites.addFolder")) { + if (_checkExists("favorites.addFolder")) { addFolder = (name) async { try { await JsEngine().runCode(""" @@ -741,7 +743,7 @@ class ComicSourceParser { } }; } - if(_checkExists("favorites.deleteFolder")) { + if (_checkExists("favorites.deleteFolder")) { deleteFolder = (key) async { try { await JsEngine().runCode(""" diff --git a/lib/pages/comic_page.dart b/lib/pages/comic_page.dart index 6f04bfd..16dca69 100644 --- a/lib/pages/comic_page.dart +++ b/lib/pages/comic_page.dart @@ -1574,7 +1574,7 @@ class _SelectDownloadChapterState extends State<_SelectDownloadChapter> { const SizedBox(width: 16), Expanded( child: FilledButton( - onPressed: () { + onPressed: selected.isEmpty ? null : () { widget.finishSelect(selected); context.pop(); }, @@ -1585,7 +1585,7 @@ class _SelectDownloadChapterState extends State<_SelectDownloadChapter> { ], ), ), - SizedBox(height: MediaQuery.of(context).padding.bottom + 4), + SizedBox(height: MediaQuery.of(context).padding.bottom), ], ), ); diff --git a/lib/pages/comic_source_page.dart b/lib/pages/comic_source_page.dart index d6ff26e..1079dc8 100644 --- a/lib/pages/comic_source_page.dart +++ b/lib/pages/comic_source_page.dart @@ -451,10 +451,11 @@ class _ComicSourceListState extends State<_ComicSourceList> { itemBuilder: (context, index) { var key = json![index]["key"]; var action = currentKey.contains(key) - ? const Icon(Icons.check) + ? const Icon(Icons.check, size: 22).paddingRight(8) : Tooltip( message: "Add", child: IconButton( + color: context.colorScheme.primary, icon: const Icon(Icons.add), onPressed: () async { await widget.onAdd(