From c2348cab997bd3a6e8e8a898a4c81016003cb153 Mon Sep 17 00:00:00 2001 From: honjow Date: Tue, 14 Sep 2021 17:48:05 +0800 Subject: [PATCH] Fix: search --- .../controller/gallerycache_controller.dart | 2 +- lib/common/service/depth_service.dart | 4 +-- lib/pages/gallery/view/gallery_page.dart | 2 +- lib/pages/setting/eh_setting_page.dart | 29 +++++++++++++------ lib/pages/setting/setting_base.dart | 7 +++-- lib/route/navigator_util.dart | 3 -- lib/utils/cust_lib/sliver/element.dart | 2 +- pubspec.yaml | 2 +- 8 files changed, 30 insertions(+), 21 deletions(-) diff --git a/lib/common/controller/gallerycache_controller.dart b/lib/common/controller/gallerycache_controller.dart index 05e53b5b2..109feb4fb 100644 --- a/lib/common/controller/gallerycache_controller.dart +++ b/lib/common/controller/gallerycache_controller.dart @@ -29,7 +29,7 @@ class GalleryCacheController extends GetxController { } else { try { final remotelist = await webdavController.getRemotReadList(); - logger.d('remotelist $remotelist'); + logger.v('remotelist $remotelist'); if (remotelist.contains(gid)) { final remote = await webdavController.downloadRead(gid); logger.d('remote $remote'); diff --git a/lib/common/service/depth_service.dart b/lib/common/service/depth_service.dart index 9438592e6..7e191b9dd 100644 --- a/lib/common/service/depth_service.dart +++ b/lib/common/service/depth_service.dart @@ -30,11 +30,11 @@ class DepthService extends GetxService { void pushSearchPageCtrl() { searchPageCtrlDepth++; - logger.v('pushSearchPageCtrl to $searchPageCtrlDepth'); + logger.d('pushSearchPageCtrl to $searchPageCtrlDepth'); } void popSearchPageCtrl() { searchPageCtrlDepth--; - logger.v('pushSearchPageCtrl to $searchPageCtrlDepth'); + logger.d('pushSearchPageCtrl to $searchPageCtrlDepth'); } } diff --git a/lib/pages/gallery/view/gallery_page.dart b/lib/pages/gallery/view/gallery_page.dart index 828f2f25a..941b86d1e 100644 --- a/lib/pages/gallery/view/gallery_page.dart +++ b/lib/pages/gallery/view/gallery_page.dart @@ -48,7 +48,7 @@ class _GalleryMainPageState extends State { @override void initState() { super.initState(); - logger.d('initState pageCtrlDepth:$pageCtrlDepth'); + logger.v('initState pageCtrlDepth:$pageCtrlDepth'); initPageController(tag: _tag); _controller = Get.put(GalleryPageController(), tag: _tag); diff --git a/lib/pages/setting/eh_setting_page.dart b/lib/pages/setting/eh_setting_page.dart index bc2c6eaa6..a3adae293 100644 --- a/lib/pages/setting/eh_setting_page.dart +++ b/lib/pages/setting/eh_setting_page.dart @@ -94,6 +94,14 @@ class ListViewEhSetting extends StatelessWidget { _ehConfigService.isClipboardLink.value = val; } + Future _forceUpdateTranslate() async { + if (await transController.checkUpdate(force: true)) { + showToast('手动更新开始'); + await transController.updateDB(); + showToast('更新完成'); + } + } + final List _list = [ if (_isLogin) TextSwitchItem( @@ -159,16 +167,19 @@ class ListViewEhSetting extends StatelessWidget { behavior: HitTestBehavior.opaque, onLongPress: () async { vibrateUtil.light(); - showToast('强制更新开始'); - if (await transController.checkUpdate(force: true)) { - await transController.updateDB(); - showToast('更新完成'); - } + _forceUpdateTranslate(); }, - child: TextSwitchItem('显示标签中文翻译', - intValue: _tagTranslat, - onChanged: _handleTagTranslatChanged, - desc: '当前版本:${_ehConfigService.tagTranslatVer.value}'), + child: TextSwitchItem( + '显示标签中文翻译', + intValue: _tagTranslat, + onChanged: _handleTagTranslatChanged, + desc: '当前版本:${_ehConfigService.tagTranslatVer.value}', + suffix: CupertinoButton( + padding: const EdgeInsets.all(0), + child: const Icon(CupertinoIcons.refresh), + onPressed: _forceUpdateTranslate, + ), + ), )), Obx(() { // if (_ehConfigService.isTagTranslat) { diff --git a/lib/pages/setting/setting_base.dart b/lib/pages/setting/setting_base.dart index ce08313fb..19d19dc70 100644 --- a/lib/pages/setting/setting_base.dart +++ b/lib/pages/setting/setting_base.dart @@ -183,6 +183,7 @@ class TextSwitchItem extends StatefulWidget { this.hideLine = false, this.icon, this.iconIndent = 0.0, + this.suffix, }) : super(key: key); final bool? intValue; @@ -193,6 +194,7 @@ class TextSwitchItem extends StatefulWidget { final bool hideLine; final Widget? icon; final double iconIndent; + final Widget? suffix; @override _TextSwitchItemState createState() => _TextSwitchItemState(); @@ -242,9 +244,8 @@ class _TextSwitchItemState extends State { color: CupertinoColors.systemGrey), ).paddingOnly(top: 2.0), ]), - Expanded( - child: Container(), - ), + const Spacer(), + if (widget.suffix != null) widget.suffix!, if (widget.onChanged != null) CupertinoSwitch( onChanged: (bool value) { diff --git a/lib/route/navigator_util.dart b/lib/route/navigator_util.dart index 331074410..f8a908812 100644 --- a/lib/route/navigator_util.dart +++ b/lib/route/navigator_util.dart @@ -9,10 +9,7 @@ import 'package:fehviewer/pages/gallery/controller/gallery_page_controller.dart' import 'package:fehviewer/pages/gallery/view/gallery_page.dart'; import 'package:fehviewer/pages/image_view/common.dart'; import 'package:fehviewer/pages/image_view/view/view_page.dart'; -import 'package:fehviewer/pages/tab/controller/gallery_controller.dart'; import 'package:fehviewer/pages/tab/controller/search_page_controller.dart'; -import 'package:fehviewer/pages/tab/view/gallery_list_page.dart'; -import 'package:fehviewer/pages/tab/view/search_page.dart'; import 'package:fehviewer/pages/tab/view/tab_base.dart'; import 'package:fehviewer/route/routes.dart'; import 'package:fehviewer/route/second_observer.dart'; diff --git a/lib/utils/cust_lib/sliver/element.dart b/lib/utils/cust_lib/sliver/element.dart index a364ccff3..2150bbc49 100644 --- a/lib/utils/cust_lib/sliver/element.dart +++ b/lib/utils/cust_lib/sliver/element.dart @@ -34,7 +34,7 @@ class SliverFloatingPersistentHeaderElement extends RenderObjectElement { @override void unmount() { super.unmount(); - renderObject.element = null; + // renderObject.element = null; } @override diff --git a/pubspec.yaml b/pubspec.yaml index 3d7511ab7..2933b7a3e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: fehviewer publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 1.1.25+303 +version: 1.1.25+304 environment: sdk: '>=2.14.0 <3.0.0'