Skip to content

Commit

Permalink
fix: snippet tag
Browse files Browse the repository at this point in the history
  • Loading branch information
@lollipopkit
lollipopkit committed Jan 25, 2024
1 parent 292a29a commit 4756017
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 33 deletions.
36 changes: 18 additions & 18 deletions ios/Runner.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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";
Expand Down Expand Up @@ -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";
Expand All @@ -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";
Expand All @@ -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";
Expand All @@ -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";
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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)";
Expand All @@ -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;
Expand All @@ -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)";
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions lib/data/model/app/backup.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class Backup {
Stores.snippet.put(s);
}
}

// ServerPrivateInfo
final nowSpis = Stores.server.fetch().toSet();
final bakSpis = spis.toSet();
Expand All @@ -144,7 +144,7 @@ class Backup {
Stores.server.put(s);
}
}

// PrivateKeyInfo
final nowKeys = Stores.key.fetch().toSet();
final bakKeys = keys.toSet();
Expand All @@ -162,7 +162,7 @@ class Backup {
Stores.key.put(s);
}
}

// History
final nowHistory = Stores.history.box.keys.toSet();
final bakHistory = history.keys.toSet();
Expand All @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions lib/data/res/build_data.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
8 changes: 4 additions & 4 deletions lib/data/store/setting.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 4 additions & 1 deletion lib/view/page/server/tab.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -431,7 +432,9 @@ class _ServerPageState extends State<ServerPage>
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);
Expand Down
15 changes: 11 additions & 4 deletions lib/view/page/snippet/edit.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,9 @@ class _SnippetEditPageState extends State<SnippetEditPage>
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(
Expand All @@ -157,11 +157,18 @@ class _SnippetEditPageState extends State<SnippetEditPage>

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)),
);
}

Expand Down

0 comments on commit 4756017

Please sign in to comment.