From 7a211b9a5528a1d91ee13f1bfcb1abb91a7e3272 Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Fri, 26 May 2023 20:09:13 +0800 Subject: [PATCH] fix: cards order --- ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ lib/data/res/build_data.dart | 6 +++--- lib/view/page/server/detail.dart | 4 ++-- lib/view/page/server/tab.dart | 8 +++++--- macos/Runner.xcodeproj/project.pbxproj | 12 ++++++------ 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 12e4bcb2..6840725f 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -360,7 +360,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 318; + CURRENT_PROJECT_VERSION = 320; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -368,7 +368,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.318; + MARKETING_VERSION = 1.0.320; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -491,7 +491,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 318; + CURRENT_PROJECT_VERSION = 320; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -499,7 +499,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.318; + MARKETING_VERSION = 1.0.320; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -516,7 +516,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 318; + CURRENT_PROJECT_VERSION = 320; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -524,7 +524,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.318; + MARKETING_VERSION = 1.0.320; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index f2ccc5ad..088dec13 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,8 +2,8 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 318; + static const int build = 320; static const String engine = "3.10.2"; - static const String buildAt = "2023-05-26 13:49:02.698178"; - static const int modifications = 6; + static const String buildAt = "2023-05-26 20:00:35.224841"; + static const int modifications = 5; } diff --git a/lib/view/page/server/detail.dart b/lib/view/page/server/detail.dart index 47af18ac..300f5413 100644 --- a/lib/view/page/server/detail.dart +++ b/lib/view/page/server/detail.dart @@ -33,7 +33,7 @@ class _ServerDetailPageState extends State with SingleTickerProviderStateMixin { late MediaQueryData _media; late S _s; - late List _cardsOrder; + final StringOrder _cardsOrder = []; final _setting = locator(); @override @@ -46,7 +46,7 @@ class _ServerDetailPageState extends State @override void initState() { super.initState(); - _cardsOrder = _setting.detailCardOrder.fetch()!; + _cardsOrder.addAll(_setting.detailCardOrder.fetch()!); } @override diff --git a/lib/view/page/server/tab.dart b/lib/view/page/server/tab.dart index 052610a3..34ea5968 100644 --- a/lib/view/page/server/tab.dart +++ b/lib/view/page/server/tab.dart @@ -206,7 +206,7 @@ class _ServerPageState extends State } Widget _buildTopRightText(ServerStatus ss, ServerState cs) { - final topRightStr = getTopRightStr( + final topRightStr = _getTopRightStr( cs, ss.temps.first, ss.uptime, @@ -321,7 +321,7 @@ class _ServerPageState extends State ); } - String getTopRightStr( + String _getTopRightStr( ServerState cs, double? temp, String upTime, @@ -333,7 +333,9 @@ class _ServerPageState extends State case ServerState.connected: final tempStr = temp == null ? '' : '${temp.toStringAsFixed(1)}°C'; final items = [tempStr, upTime]; - return items.where((element) => element.isNotEmpty).join(' | '); + final str = items.where((element) => element.isNotEmpty).join(' | '); + if (str.isEmpty) return _s.serverTabLoading; + return str; case ServerState.connecting: return _s.serverTabConnecting; case ServerState.failed: diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj index 8bd80373..fffb623f 100644 --- a/macos/Runner.xcodeproj/project.pbxproj +++ b/macos/Runner.xcodeproj/project.pbxproj @@ -475,9 +475,9 @@ baseConfigurationReference = C1C758C41C4E208965A68933 /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 318; + CURRENT_PROJECT_VERSION = 320; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.318; + MARKETING_VERSION = 1.0.320; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -490,9 +490,9 @@ baseConfigurationReference = 15AF97DF993E8968098D6EBE /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 318; + CURRENT_PROJECT_VERSION = 320; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.318; + MARKETING_VERSION = 1.0.320; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; @@ -505,9 +505,9 @@ baseConfigurationReference = 7CFA7DE7FABA75685DFB6948 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CURRENT_PROJECT_VERSION = 318; + CURRENT_PROJECT_VERSION = 320; GENERATE_INFOPLIST_FILE = YES; - MARKETING_VERSION = 1.0.318; + MARKETING_VERSION = 1.0.320; PRODUCT_BUNDLE_IDENTIFIER = tech.lolli.serverBox.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0;