From 47560173f9d1253bad9be38df7f32ff07cd268ea Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Thu, 25 Jan 2024 20:49:40 +0800 Subject: [PATCH] fix: snippet `tag` --- ios/Runner.xcodeproj/project.pbxproj | 36 ++++++++++++++-------------- lib/data/model/app/backup.dart | 8 +++---- lib/data/res/build_data.dart | 4 ++-- lib/data/store/setting.dart | 8 +++---- lib/view/page/server/tab.dart | 5 +++- lib/view/page/snippet/edit.dart | 15 ++++++++---- 6 files changed, 43 insertions(+), 33 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index ea1703a8..fb90ac69 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -586,7 +586,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 719; + CURRENT_PROJECT_VERSION = 720; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -596,7 +596,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.719; + MARKETING_VERSION = 1.0.720; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -720,7 +720,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 719; + CURRENT_PROJECT_VERSION = 720; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -730,7 +730,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.719; + MARKETING_VERSION = 1.0.720; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -748,7 +748,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 719; + CURRENT_PROJECT_VERSION = 720; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_BITCODE = NO; INFOPLIST_FILE = "Runner/Info-$(CONFIGURATION).plist"; @@ -758,7 +758,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.719; + MARKETING_VERSION = 1.0.720; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -779,7 +779,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 719; + CURRENT_PROJECT_VERSION = 720; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -792,7 +792,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.719; + MARKETING_VERSION = 1.0.720; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; @@ -818,7 +818,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 719; + CURRENT_PROJECT_VERSION = 720; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -831,7 +831,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.719; + MARKETING_VERSION = 1.0.720; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -854,7 +854,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 719; + CURRENT_PROJECT_VERSION = 720; DEVELOPMENT_TEAM = BA88US33G6; GCC_C_LANGUAGE_STANDARD = gnu11; GENERATE_INFOPLIST_FILE = YES; @@ -867,7 +867,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 1.0.719; + MARKETING_VERSION = 1.0.720; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.StatusWidget; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -890,7 +890,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 719; + CURRENT_PROJECT_VERSION = 720; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -902,7 +902,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.719; + MARKETING_VERSION = 1.0.720; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; @@ -931,7 +931,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 719; + CURRENT_PROJECT_VERSION = 720; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -943,7 +943,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.719; + MARKETING_VERSION = 1.0.720; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; @@ -969,7 +969,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 719; + CURRENT_PROJECT_VERSION = 720; DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = BA88US33G6; ENABLE_PREVIEWS = YES; @@ -981,7 +981,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.719; + MARKETING_VERSION = 1.0.720; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.lollipopkit.toolbox.WatchEnd; PRODUCT_NAME = ServerBox; diff --git a/lib/data/model/app/backup.dart b/lib/data/model/app/backup.dart index 8f353579..f086010c 100644 --- a/lib/data/model/app/backup.dart +++ b/lib/data/model/app/backup.dart @@ -126,7 +126,7 @@ class Backup { Stores.snippet.put(s); } } - + // ServerPrivateInfo final nowSpis = Stores.server.fetch().toSet(); final bakSpis = spis.toSet(); @@ -144,7 +144,7 @@ class Backup { Stores.server.put(s); } } - + // PrivateKeyInfo final nowKeys = Stores.key.fetch().toSet(); final bakKeys = keys.toSet(); @@ -162,7 +162,7 @@ class Backup { Stores.key.put(s); } } - + // History final nowHistory = Stores.history.box.keys.toSet(); final bakHistory = history.keys.toSet(); @@ -180,7 +180,7 @@ class Backup { Stores.history.box.put(s, history[s]); } } - + // Container final nowContainer = Stores.docker.box.keys.toSet(); final bakContainer = container.keys.toSet(); diff --git a/lib/data/res/build_data.dart b/lib/data/res/build_data.dart index a71f5c0f..2b7b222b 100644 --- a/lib/data/res/build_data.dart +++ b/lib/data/res/build_data.dart @@ -2,9 +2,9 @@ class BuildData { static const String name = "ServerBox"; - static const int build = 719; + static const int build = 720; static const String engine = "3.16.8"; - static const String buildAt = "2024-01-23 22:32:15"; + static const String buildAt = "2024-01-25 20:01:01"; static const int modifications = 3; static const int script = 36; } diff --git a/lib/data/store/setting.dart b/lib/data/store/setting.dart index 062b8dfe..0a63c34a 100644 --- a/lib/data/store/setting.dart +++ b/lib/data/store/setting.dart @@ -201,10 +201,10 @@ class SettingStore extends PersistentStore { late final showSuspendTip = property('showSuspendTip', true); /// Webdav sync - late final webdavSync = property('webdavSync', false, updateLastModified: false); - late final webdavUrl = property('webdavUrl', '', updateLastModified: false); - late final webdavUser = property('webdavUser', '', updateLastModified: false); - late final webdavPwd = property('webdavPwd', '', updateLastModified: false); + late final webdavSync = property('webdavSync', false); + late final webdavUrl = property('webdavUrl', ''); + late final webdavUser = property('webdavUser', ''); + late final webdavPwd = property('webdavPwd', ''); /// Whether collapse UI items by default late final collapseUIDefault = property('collapseUIDefault', true); diff --git a/lib/view/page/server/tab.dart b/lib/view/page/server/tab.dart index 1ddcb766..a1e0d1e3 100644 --- a/lib/view/page/server/tab.dart +++ b/lib/view/page/server/tab.dart @@ -6,6 +6,7 @@ import 'package:provider/provider.dart'; import 'package:toolbox/core/extension/context/common.dart'; import 'package:toolbox/core/extension/context/dialog.dart'; import 'package:toolbox/core/extension/context/locale.dart'; +import 'package:toolbox/core/extension/numx.dart'; import 'package:toolbox/core/extension/ssh_client.dart'; import 'package:toolbox/core/extension/widget.dart'; import 'package:toolbox/core/utils/platform/base.dart'; @@ -431,7 +432,9 @@ class _ServerPageState extends State return FadeTransition(opacity: animation, child: child); }, child: _buildIOData( - isSpeed ? '${l10n.read}:\n$r' : 'Total:\n${rootDisk?.size}', + isSpeed + ? '${l10n.read}:\n$r' + : 'Total:\n${rootDisk?.size.kb2Str}', isSpeed ? '${l10n.write}:\n$w' : 'Used:\n${rootDisk?.usedPercent}%', onTap: () { cardNoti.value = cardNoti.value.copyWith(diskIO: !isSpeed); diff --git a/lib/view/page/snippet/edit.dart b/lib/view/page/snippet/edit.dart index 11c9be11..b0ddd5b7 100644 --- a/lib/view/page/snippet/edit.dart +++ b/lib/view/page/snippet/edit.dart @@ -136,9 +136,9 @@ class _SnippetEditPageState extends State onChanged: (p0) => setState(() { _tags = p0; }), - allTags: [...Pros.server.tags], + allTags: [...Pros.snippet.tags], onRenameTag: (old, n) => setState(() { - Pros.server.renameTag(old, n); + Pros.snippet.renameTag(old, n); }), ), Input( @@ -157,11 +157,18 @@ class _SnippetEditPageState extends State Widget _buildTip() { return CardX( - child: MarkdownBody(data: ''' + child: MarkdownBody( + data: ''' 📌 ${l10n.supportFmtArgs} ${Snippet.fmtArgs.keys.map((e) => '`$e`').join(', ')} -''').padding(const EdgeInsets.all(13)), +''', +styleSheet: MarkdownStyleSheet( + codeblockDecoration: const BoxDecoration( + color: Colors.transparent, + ), +), + ).padding(const EdgeInsets.all(13)), ); }