From 565bc8012a40f086c49fda08a2da1e2d72b18ccf Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Thu, 26 Jan 2023 16:19:09 +0800 Subject: [PATCH] rename: `apt` -> `pkg` --- lib/data/model/app/menu_item.dart | 6 ++--- .../upgrade_info.dart} | 0 lib/data/provider/{apt.dart => pkg.dart} | 8 +++---- lib/locator.dart | 4 ++-- lib/main.dart | 4 ++-- lib/view/page/{apt.dart => pkg.dart} | 22 +++++++++---------- lib/view/page/server/tab.dart | 6 ++--- 7 files changed, 25 insertions(+), 25 deletions(-) rename lib/data/model/{apt/upgrade_pkg_info.dart => pkg/upgrade_info.dart} (100%) rename lib/data/provider/{apt.dart => pkg.dart} (97%) rename lib/view/page/{apt.dart => pkg.dart} (92%) diff --git a/lib/data/model/app/menu_item.dart b/lib/data/model/app/menu_item.dart index aa1db95f..7e2ba4b4 100644 --- a/lib/data/model/app/menu_item.dart +++ b/lib/data/model/app/menu_item.dart @@ -24,14 +24,14 @@ class DropdownBtnItem { } class ServerTabMenuItems { - static const List firstItems = [sftp, snippet, apt, docker]; + static const List firstItems = [sftp, snippet, pkg, docker]; static const List secondItems = [edit]; static const sftp = DropdownBtnItem(text: 'SFTP', icon: Icons.insert_drive_file); static const snippet = DropdownBtnItem(text: 'Snippet', icon: Icons.label); - static const apt = - DropdownBtnItem(text: 'Apt/Yum', icon: Icons.system_security_update); + static const pkg = + DropdownBtnItem(text: 'Pkg', icon: Icons.system_security_update); static const docker = DropdownBtnItem(text: 'Docker', icon: Icons.view_agenda); static const edit = DropdownBtnItem(text: 'Edit', icon: Icons.edit); diff --git a/lib/data/model/apt/upgrade_pkg_info.dart b/lib/data/model/pkg/upgrade_info.dart similarity index 100% rename from lib/data/model/apt/upgrade_pkg_info.dart rename to lib/data/model/pkg/upgrade_info.dart diff --git a/lib/data/provider/apt.dart b/lib/data/provider/pkg.dart similarity index 97% rename from lib/data/provider/apt.dart rename to lib/data/provider/pkg.dart index 58015c67..005abcf0 100644 --- a/lib/data/provider/apt.dart +++ b/lib/data/provider/pkg.dart @@ -7,13 +7,13 @@ import 'package:toolbox/core/extension/ssh_client.dart'; import 'package:toolbox/core/extension/stringx.dart'; import 'package:toolbox/core/extension/uint8list.dart'; import 'package:toolbox/core/provider_base.dart'; -import 'package:toolbox/data/model/apt/upgrade_pkg_info.dart'; +import 'package:toolbox/data/model/pkg/upgrade_info.dart'; import 'package:toolbox/data/model/server/dist.dart'; enum _Type { apt, yum, dnf, zypper, pkg, pacman, opkg } -class AptProvider extends BusyProvider { - final logger = Logger('AptProvider'); +class PkgProvider extends BusyProvider { + final logger = Logger('PkgProvider'); SSHClient? client; Dist? dist; @@ -30,7 +30,7 @@ class AptProvider extends BusyProvider { String lastLog = ''; bool isRequestingPwd = false; - AptProvider(); + PkgProvider(); Future init( SSHClient client, diff --git a/lib/locator.dart b/lib/locator.dart index 1768a279..b1faf26a 100644 --- a/lib/locator.dart +++ b/lib/locator.dart @@ -1,6 +1,6 @@ import 'package:get_it/get_it.dart'; import 'package:toolbox/data/provider/app.dart'; -import 'package:toolbox/data/provider/apt.dart'; +import 'package:toolbox/data/provider/pkg.dart'; import 'package:toolbox/data/provider/debug.dart'; import 'package:toolbox/data/provider/docker.dart'; import 'package:toolbox/data/provider/private_key.dart'; @@ -22,7 +22,7 @@ void setupLocatorForServices() { void setupLocatorForProviders() { locator.registerSingleton(AppProvider()); - locator.registerSingleton(AptProvider()); + locator.registerSingleton(PkgProvider()); locator.registerSingleton(DebugProvider()); locator.registerSingleton(DockerProvider()); locator.registerSingleton(ServerProvider()); diff --git a/lib/main.dart b/lib/main.dart index 45ff8e0e..cb2d1a67 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -11,7 +11,7 @@ import 'package:toolbox/data/model/server/private_key_info.dart'; import 'package:toolbox/data/model/server/server_private_info.dart'; import 'package:toolbox/data/model/server/snippet.dart'; import 'package:toolbox/data/provider/app.dart'; -import 'package:toolbox/data/provider/apt.dart'; +import 'package:toolbox/data/provider/pkg.dart'; import 'package:toolbox/data/provider/debug.dart'; import 'package:toolbox/data/provider/docker.dart'; import 'package:toolbox/data/provider/private_key.dart'; @@ -96,7 +96,7 @@ Future main() async { MultiProvider( providers: [ ChangeNotifierProvider(create: (_) => locator()), - ChangeNotifierProvider(create: (_) => locator()), + ChangeNotifierProvider(create: (_) => locator()), ChangeNotifierProvider(create: (_) => locator()), ChangeNotifierProvider(create: (_) => locator()), ChangeNotifierProvider(create: (_) => locator()), diff --git a/lib/view/page/apt.dart b/lib/view/page/pkg.dart similarity index 92% rename from lib/view/page/apt.dart rename to lib/view/page/pkg.dart index 0858a015..4c06c588 100644 --- a/lib/view/page/apt.dart +++ b/lib/view/page/pkg.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:toolbox/core/utils.dart'; -import 'package:toolbox/data/model/apt/upgrade_pkg_info.dart'; +import 'package:toolbox/data/model/pkg/upgrade_info.dart'; import 'package:toolbox/data/model/server/dist.dart'; import 'package:toolbox/data/model/server/server_private_info.dart'; -import 'package:toolbox/data/provider/apt.dart'; +import 'package:toolbox/data/provider/pkg.dart'; import 'package:toolbox/data/provider/server.dart'; import 'package:toolbox/data/res/font_style.dart'; import 'package:toolbox/data/res/url.dart'; @@ -15,22 +15,22 @@ import 'package:toolbox/view/widget/round_rect_card.dart'; import 'package:toolbox/view/widget/two_line_text.dart'; import 'package:toolbox/view/widget/url_text.dart'; -class AptManagePage extends StatefulWidget { - const AptManagePage(this.spi, {Key? key}) : super(key: key); +class PkgManagePage extends StatefulWidget { + const PkgManagePage(this.spi, {Key? key}) : super(key: key); final ServerPrivateInfo spi; @override - _AptManagePageState createState() => _AptManagePageState(); + _PkgManagePageState createState() => _PkgManagePageState(); } -class _AptManagePageState extends State +class _PkgManagePageState extends State with SingleTickerProviderStateMixin { late MediaQueryData _media; final _scrollController = ScrollController(); final _scrollControllerUpdate = ScrollController(); final _textController = TextEditingController(); - final _aptProvider = locator(); + final _aptProvider = locator(); late S _s; @override @@ -43,7 +43,7 @@ class _AptManagePageState extends State @override void dispose() { super.dispose(); - locator().clear(); + locator().clear(); } @override @@ -126,7 +126,7 @@ class _AptManagePageState extends State centerTitle: true, title: TwoLineText(up: 'Apt', down: widget.spi.name), ), - body: Consumer(builder: (_, apt, __) { + body: Consumer(builder: (_, apt, __) { if (apt.error != null) { return Column( mainAxisAlignment: MainAxisAlignment.center, @@ -193,7 +193,7 @@ class _AptManagePageState extends State ); } - Widget _buildUpdatePanel(AptProvider apt) { + Widget _buildUpdatePanel(PkgProvider apt) { if (apt.upgradeable!.isEmpty) { return ListTile( title: Text( @@ -249,7 +249,7 @@ class _AptManagePageState extends State ); } - Widget _buildUpdateItem(UpgradePkgInfo info, AptProvider apt) { + Widget _buildUpdateItem(UpgradePkgInfo info, PkgProvider apt) { return ListTile( title: Text(info.package), subtitle: Text( diff --git a/lib/view/page/server/tab.dart b/lib/view/page/server/tab.dart index ee853299..b45664b6 100644 --- a/lib/view/page/server/tab.dart +++ b/lib/view/page/server/tab.dart @@ -13,7 +13,7 @@ import 'package:toolbox/data/provider/server.dart'; import 'package:toolbox/data/res/color.dart'; import 'package:toolbox/generated/l10n.dart'; import 'package:toolbox/locator.dart'; -import 'package:toolbox/view/page/apt.dart'; +import 'package:toolbox/view/page/pkg.dart'; import 'package:toolbox/view/page/docker.dart'; import 'package:toolbox/view/page/server/detail.dart'; import 'package:toolbox/view/page/server/edit.dart'; @@ -211,8 +211,8 @@ class _ServerPageState extends State onSelected: (value) { final item = value as DropdownBtnItem; switch (item) { - case ServerTabMenuItems.apt: - AppRoute(AptManagePage(spi), 'apt manage').go(context); + case ServerTabMenuItems.pkg: + AppRoute(PkgManagePage(spi), 'pkg manage').go(context); break; case ServerTabMenuItems.sftp: AppRoute(SFTPPage(spi), 'SFTP').go(context);