diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 2b31bff4..050ecda0 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -470,7 +470,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 477; + CURRENT_PROJECT_VERSION = 480; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -478,7 +478,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.477; + MARKETING_VERSION = 1.0.480; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -602,7 +602,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 477; + CURRENT_PROJECT_VERSION = 480; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -610,7 +610,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.477; + MARKETING_VERSION = 1.0.480; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -628,7 +628,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 477; + CURRENT_PROJECT_VERSION = 480; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -636,7 +636,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.477; + MARKETING_VERSION = 1.0.480; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -657,7 +657,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 477; + CURRENT_PROJECT_VERSION = 480; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -670,7 +670,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.477; + MARKETING_VERSION = 1.0.480; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; @@ -696,7 +696,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 477; + CURRENT_PROJECT_VERSION = 480; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -709,7 +709,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.477; + MARKETING_VERSION = 1.0.480; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -732,7 +732,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 477; + CURRENT_PROJECT_VERSION = 480; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -745,7 +745,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.477; + MARKETING_VERSION = 1.0.480; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/lib/view/page/home.dart b/lib/view/page/home.dart index e3b0b12a..12304deb 100644 --- a/lib/view/page/home.dart +++ b/lib/view/page/home.dart @@ -153,7 +153,7 @@ class _HomePageState extends State return IconButton( icon: const Icon(Icons.refresh, size: 23), tooltip: 'Refresh', - onPressed: () => _serverProvider.refreshData(), + onPressed: () => _serverProvider.refreshData(onlyFailed: true), ); }, ), diff --git a/lib/view/page/server/tab.dart b/lib/view/page/server/tab.dart index c76ce36e..5ed7d25c 100644 --- a/lib/view/page/server/tab.dart +++ b/lib/view/page/server/tab.dart @@ -5,14 +5,12 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:get_it/get_it.dart'; import 'package:provider/provider.dart'; import 'package:toolbox/core/extension/media_queryx.dart'; -import 'package:toolbox/data/model/app/net_view.dart'; -import 'package:toolbox/view/widget/server_func_btns.dart'; -import 'package:toolbox/view/widget/tag/switcher.dart'; import '../../../core/route.dart'; import '../../../core/utils/misc.dart' hide pathJoin; import '../../../core/utils/platform.dart'; import '../../../core/utils/ui.dart'; +import '../../../data/model/app/net_view.dart'; import '../../../data/model/server/disk.dart'; import '../../../data/model/server/server.dart'; import '../../../data/model/server/server_private_info.dart'; @@ -23,6 +21,8 @@ import '../../../data/res/ui.dart'; import '../../../data/store/setting.dart'; import '../../../locator.dart'; import '../../widget/round_rect_card.dart'; +import '../../widget/server_func_btns.dart'; +import '../../widget/tag/switcher.dart'; import 'edit.dart'; class ServerPage extends StatefulWidget { @@ -187,6 +187,13 @@ class _ServerPageState extends State ); } + Widget _wrapWithSizedbox(Widget child) { + return SizedBox( + width: _useDoubleColumn ? (_media.size.width - 146) / 8 : (_media.size.width - 74) / 4, + child: child, + ); + } + Widget _buildRealServerCard( ServerStatus ss, ServerState cs, @@ -209,13 +216,13 @@ class _ServerPageState extends State child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - _buildPercentCircle(ss.cpu.usedPercent()), - _buildPercentCircle(ss.mem.usedPercent * 100), - _buildNet(ss), - _buildIOData( + _wrapWithSizedbox(_buildPercentCircle(ss.cpu.usedPercent())), + _wrapWithSizedbox(_buildPercentCircle(ss.mem.usedPercent * 100)), + _wrapWithSizedbox(_buildNet(ss)), + _wrapWithSizedbox(_buildIOData( 'Total:\n${rootDisk?.size}', 'Used:\n${rootDisk?.usedPercent}%', - ), + )), ], ), ), @@ -389,6 +396,7 @@ class _ServerPageState extends State maxNumber: 100, width: 53, height: 53, + animationDuration: const Duration(milliseconds: 777), ), ), Positioned.fill( diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 3976fd12..ed38c625 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -474,9 +474,9 @@ baseConfigurationReference = C1C758C41C4E208965A68933 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 477; + CURRENT_PROJECT_VERSION = 480; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.477; + MARKETING_VERSION = 1.0.480; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -489,9 +489,9 @@ baseConfigurationReference = 15AF97DF993E8968098D6EBE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 477; + CURRENT_PROJECT_VERSION = 480; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.477; + MARKETING_VERSION = 1.0.480; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -504,9 +504,9 @@ baseConfigurationReference = 7CFA7DE7FABA75685DFB6948 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 477; + CURRENT_PROJECT_VERSION = 480; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.477; + MARKETING_VERSION = 1.0.480; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; diff --git a/pubspec.lock b/pubspec.lock index e5128f83..ab3bb6f5 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -150,7 +150,7 @@ packages: description: path: "." ref: main - resolved-ref: "01eb9bcc7f1a1690381caeedb476ea98c5295d55" + resolved-ref: "449a3fa7e886869e87ea10ab56f99be3f16f2c1f" url: "https://github.com/lollipopkit/circle_chart" source: git version: "0.0.3"