Skip to content

Commit

Permalink
Merge pull request #23 from cmushroom/dev
Browse files Browse the repository at this point in the history
1.4.2
  • Loading branch information
chengpan168 authored Feb 6, 2022
2 parents dd3d427 + f9a4813 commit 3a2c205
Show file tree
Hide file tree
Showing 83 changed files with 1,271 additions and 1,668 deletions.
6 changes: 3 additions & 3 deletions .version
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"latestVersionNum": 8,
"latestVersion": "1.4.1",
"latestVersionNum": 9,
"latestVersion": "1.4.2",
"updateType": "hint",
"releaseNotes": "1. 优化scan, 没有通配符时不进行scan搜索。感谢@ydq \n2. 使用swift concurrency 重写部分功能。"
"releaseNotes": "1. 密码,搜索框使用swiftUI 原生组件。 \n2. 表格增加双击编辑。 \n3. 修复hash field 禁用状态错误bug。 \n4. 去除promisekit依赖,使用swift concurrency。"
}
417 changes: 164 additions & 253 deletions redis-pro.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,9 @@
"version": "1.10.1"
}
},
{
"package": "PromiseKit",
"repositoryURL": "https://github.com/mxcl/PromiseKit.git",
"state": {
"branch": null,
"revision": "93c8d41ce96ed78f36c3948be396d76f3ca3de1b",
"version": "6.16.2"
}
},
{
"package": "Puppy",
"repositoryURL": "https://gitee.com/chengpan168_admin/Puppy.git",
"repositoryURL": "https://github.com/sushichop/Puppy.git",
"state": {
"branch": null,
"revision": "95ce04b0e778b8d7c351876bc98bbf68328dfc9b",
Expand All @@ -42,17 +33,17 @@
"repositoryURL": "https://github.com/Mordil/RediStack.git",
"state": {
"branch": null,
"revision": "0c3beee7eb7704e50e81d4a89740101b87d02833",
"version": "1.2.0"
"revision": "16037bbb8248eccaf50b8499d3bb9ed945cfd44c",
"version": "1.2.1"
}
},
{
"package": "swift-crypto",
"repositoryURL": "https://gitee.com/mirrors_apple/swift-crypto.git",
"repositoryURL": "https://github.com/apple/swift-crypto.git",
"state": {
"branch": null,
"revision": "3bea268b223651c4ab7b7b9ad62ef9b2d4143eb6",
"version": "1.1.6"
"revision": "9c53b7a758bb849a7df1bd2314395f5f0c14306f",
"version": "2.0.3"
}
},
{
Expand Down Expand Up @@ -84,7 +75,7 @@
},
{
"package": "swift-nio-ssh",
"repositoryURL": "https://gitee.com/mirrors_apple/swift-nio-ssh.git",
"repositoryURL": "https://github.com/apple/swift-nio-ssh",
"state": {
"branch": null,
"revision": "09778e0388bda898c7592887f2ec84bb81ef21eb",
Expand All @@ -93,7 +84,7 @@
},
{
"package": "SwiftyJSON",
"repositoryURL": "https://gitee.com/chengpan168_admin/SwiftyJSON.git",
"repositoryURL": "https://github.com/SwiftyJSON/SwiftyJSON.git",
"state": {
"branch": null,
"revision": "b3dcd7dbd0d488e1a7077cb33b00f2083e382f07",
Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "79348B33-ACC7-4D95-A1EA-FB30589A644A"
type = "1"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "B03E41DC-2757-4346-BBEE-7B7A73443FDA"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "redis-pro/Views/RedisEditorView/HashEditorView.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "94"
endingLineNumber = "94"
landmarkName = "setEditForm()"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
21 changes: 0 additions & 21 deletions redis-pro/Assets.xcassets/charleyrivers.imageset/Contents.json

This file was deleted.

Binary file not shown.
21 changes: 0 additions & 21 deletions redis-pro/Assets.xcassets/chilkoottrail.imageset/Contents.json

This file was deleted.

Binary file not shown.
21 changes: 0 additions & 21 deletions redis-pro/Assets.xcassets/chincoteague.imageset/Contents.json

This file was deleted.

Binary file not shown.
21 changes: 0 additions & 21 deletions redis-pro/Assets.xcassets/default_avatar.imageset/Contents.json

This file was deleted.

Binary file not shown.
21 changes: 0 additions & 21 deletions redis-pro/Assets.xcassets/hiddenlake.imageset/Contents.json

This file was deleted.

Binary file not shown.
21 changes: 0 additions & 21 deletions redis-pro/Assets.xcassets/icybay.imageset/Contents.json

This file was deleted.

Binary file not shown.
21 changes: 0 additions & 21 deletions redis-pro/Assets.xcassets/lakemcdonald.imageset/Contents.json

This file was deleted.

Binary file not shown.
21 changes: 0 additions & 21 deletions redis-pro/Assets.xcassets/rainbowlake.imageset/Contents.json

This file was deleted.

Binary file not shown.
21 changes: 0 additions & 21 deletions redis-pro/Assets.xcassets/silversalmoncreek.imageset/Contents.json

This file was deleted.

Binary file not shown.
21 changes: 0 additions & 21 deletions redis-pro/Assets.xcassets/stmarylake.imageset/Contents.json

This file was deleted.

Binary file not shown.
21 changes: 0 additions & 21 deletions redis-pro/Assets.xcassets/turtlerock.imageset/Contents.json

This file was deleted.

Binary file not shown.
21 changes: 0 additions & 21 deletions redis-pro/Assets.xcassets/twinlake.imageset/Contents.json

This file was deleted.

Binary file not shown.
21 changes: 0 additions & 21 deletions redis-pro/Assets.xcassets/umbagog.imageset/Contents.json

This file was deleted.

Binary file not shown.
5 changes: 5 additions & 0 deletions redis-pro/Common/MTheme.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ struct MTheme {
// static var PRIMARY:Color = Color(red: 0.1, green: 0.1, blue: 0.1)
static var PRIMARY:Color = Color.gray

static var CORNER_RADIUS:CGFloat = 2

static var DIALOG_W:CGFloat = 640
static var DIALOG_H:CGFloat = 400

// spacing
static var H_SPACING:CGFloat = 6
static var H_SPACING_L:CGFloat = 10
Expand Down
Loading

0 comments on commit 3a2c205

Please sign in to comment.