From 07cc0a22e8919784fc81cf625f1233befd9a1d62 Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Sun, 21 Jan 2024 15:41:35 +0800 Subject: [PATCH] opt. --- lib/locator.dart | 2 - lib/main.dart | 2 - lib/view/page/debug.dart | 20 ++++---- lib/view/page/server/edit.dart | 87 +++++++++++++++++----------------- 4 files changed, 55 insertions(+), 56 deletions(-) diff --git a/lib/locator.dart b/lib/locator.dart index 9684dcff..78372373 100644 --- a/lib/locator.dart +++ b/lib/locator.dart @@ -2,7 +2,6 @@ import 'package:get_it/get_it.dart'; import 'data/provider/app.dart'; import 'data/provider/debug.dart'; -import 'data/provider/container.dart'; import 'data/provider/private_key.dart'; import 'data/provider/server.dart'; import 'data/provider/sftp.dart'; @@ -25,7 +24,6 @@ void _setupLocatorForServices() { void _setupLocatorForProviders() { locator.registerSingleton(AppProvider()); locator.registerSingleton(DebugProvider()); - locator.registerSingleton(ContainerProvider()); locator.registerSingleton(ServerProvider()); locator.registerSingleton(VirtKeyProvider()); locator.registerSingleton(SnippetProvider()); diff --git a/lib/main.dart b/lib/main.dart index 6a4ad653..26522edf 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -28,7 +28,6 @@ import 'data/model/server/server_private_info.dart'; import 'data/model/server/snippet.dart'; import 'data/model/ssh/virtual_key.dart'; import 'data/provider/app.dart'; -import 'data/provider/debug.dart'; import 'data/provider/private_key.dart'; import 'data/provider/server.dart'; import 'data/provider/sftp.dart'; @@ -43,7 +42,6 @@ Future main() async { MultiProvider( providers: [ ChangeNotifierProvider(create: (_) => locator()), - ChangeNotifierProvider(create: (_) => locator()), ChangeNotifierProvider(create: (_) => locator()), ChangeNotifierProvider(create: (_) => locator()), ChangeNotifierProvider(create: (_) => locator()), diff --git a/lib/view/page/debug.dart b/lib/view/page/debug.dart index 9360805b..7783b196 100644 --- a/lib/view/page/debug.dart +++ b/lib/view/page/debug.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:toolbox/core/extension/context/common.dart'; import 'package:toolbox/data/provider/debug.dart'; +import 'package:toolbox/data/res/provider.dart'; import '../widget/appbar.dart'; @@ -40,14 +41,17 @@ class _DebugPageState extends State { fontWeight: FontWeight.bold, ), child: SingleChildScrollView( - child: Consumer( - builder: (_, debug, __) { - return Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: debug.widgets, - ); - }, + child: ChangeNotifierProvider( + create: (_) => Pros.debug, + child: Consumer( + builder: (_, debug, __) { + return Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: debug.widgets, + ); + }, + ), ), ), ), diff --git a/lib/view/page/server/edit.dart b/lib/view/page/server/edit.dart index a34fa8f7..fde7ab1c 100644 --- a/lib/view/page/server/edit.dart +++ b/lib/view/page/server/edit.dart @@ -6,7 +6,6 @@ import 'package:toolbox/core/extension/context/locale.dart'; import 'package:toolbox/core/extension/context/snackbar.dart'; import 'package:toolbox/data/model/app/shell_func.dart'; import 'package:toolbox/data/res/provider.dart'; -import 'package:toolbox/view/widget/expand_tile.dart'; import '../../../core/route.dart'; import '../../../data/model/server/private_key_info.dart'; @@ -219,7 +218,7 @@ class _ServerEditPageState extends State { onRenameTag: Pros.server.renameTag, ), _buildAuth(), - _buildJumpServer(), + //_buildJumpServer(), ListTile( title: Text(l10n.autoConnect), trailing: ListenableBuilder( @@ -347,48 +346,48 @@ class _ServerEditPageState extends State { ); } - Widget _buildJumpServer() { - return ListenableBuilder( - listenable: _jumpServer, - builder: (_, __) { - final children = Pros.server.servers - .where((element) => element.spi.jumpId == null) - .where((element) => element.spi.id != widget.spi?.id) - .map( - (e) => ListTile( - title: Text(e.spi.name), - subtitle: Text(e.spi.id, style: UIs.textGrey), - trailing: Radio( - groupValue: _jumpServer.value, - value: e.spi.id, - onChanged: (val) => _jumpServer.value = val, - ), - onTap: () { - _jumpServer.value = e.spi.id; - }, - ), - ) - .toList(); - children.add(ListTile( - title: Text(l10n.clear), - trailing: const Icon(Icons.clear), - onTap: () => _jumpServer.value = null, - )); - return CardX( - child: ExpandTile( - leading: const Icon(Icons.map), - initiallyExpanded: _jumpServer.value != null, - title: Text(l10n.jumpServer), - subtitle: const Text( - "It was temporarily disabled because it has some bugs (Issues #210)", - style: UIs.textGrey, - ), - children: children, - ), - ); - }, - ); - } + // Widget _buildJumpServer() { + // return ListenableBuilder( + // listenable: _jumpServer, + // builder: (_, __) { + // final children = Pros.server.servers + // .where((element) => element.spi.jumpId == null) + // .where((element) => element.spi.id != widget.spi?.id) + // .map( + // (e) => ListTile( + // title: Text(e.spi.name), + // subtitle: Text(e.spi.id, style: UIs.textGrey), + // trailing: Radio( + // groupValue: _jumpServer.value, + // value: e.spi.id, + // onChanged: (val) => _jumpServer.value = val, + // ), + // onTap: () { + // _jumpServer.value = e.spi.id; + // }, + // ), + // ) + // .toList(); + // children.add(ListTile( + // title: Text(l10n.clear), + // trailing: const Icon(Icons.clear), + // onTap: () => _jumpServer.value = null, + // )); + // return CardX( + // child: ExpandTile( + // leading: const Icon(Icons.map), + // initiallyExpanded: _jumpServer.value != null, + // title: Text(l10n.jumpServer), + // subtitle: const Text( + // "It was temporarily disabled because it has some bugs (Issues #210)", + // style: UIs.textGrey, + // ), + // children: children, + // ), + // ); + // }, + // ); + // } void _onSave() async { if (_ipController.text.isEmpty) {