diff --git a/AutoFill/Assets.xcassets/AccentColor.colorset/Contents.json b/AutoFill/Assets.xcassets/AccentColor.colorset/Contents.json
index 1f723f2..39d4d67 100644
--- a/AutoFill/Assets.xcassets/AccentColor.colorset/Contents.json
+++ b/AutoFill/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -5,9 +5,9 @@
"color" : {
"color-space" : "srgb",
"components" : {
- "red" : "0.710",
- "green" : "0.396",
- "blue" : "0.114",
+ "red" : "0.420",
+ "green" : "0.271",
+ "blue" : "0.467",
"alpha" : "1.000"
}
}
@@ -23,9 +23,9 @@
"color" : {
"color-space" : "srgb",
"components" : {
- "red" : "0.890",
- "green" : "0.635",
- "blue" : "0.357",
+ "red" : "0.651",
+ "green" : "0.498",
+ "blue" : "0.690",
"alpha" : "1.000"
}
}
diff --git a/KeeVault.xcodeproj/xcuserdata/kriss.xcuserdatad/xcschemes/xcschememanagement.plist b/KeeVault.xcodeproj/xcuserdata/kriss.xcuserdatad/xcschemes/xcschememanagement.plist
index 59379f4..512c211 100644
--- a/KeeVault.xcodeproj/xcuserdata/kriss.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/KeeVault.xcodeproj/xcuserdata/kriss.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
AutoFill.xcscheme_^#shared#^_
orderHint
- 0
+ 2
KeeVault.xcscheme_^#shared#^_
diff --git a/KeeVault/Assets.xcassets/AccentColor.colorset/Contents.json b/KeeVault/Assets.xcassets/AccentColor.colorset/Contents.json
index 1f723f2..39d4d67 100644
--- a/KeeVault/Assets.xcassets/AccentColor.colorset/Contents.json
+++ b/KeeVault/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -5,9 +5,9 @@
"color" : {
"color-space" : "srgb",
"components" : {
- "red" : "0.710",
- "green" : "0.396",
- "blue" : "0.114",
+ "red" : "0.420",
+ "green" : "0.271",
+ "blue" : "0.467",
"alpha" : "1.000"
}
}
@@ -23,9 +23,9 @@
"color" : {
"color-space" : "srgb",
"components" : {
- "red" : "0.890",
- "green" : "0.635",
- "blue" : "0.357",
+ "red" : "0.651",
+ "green" : "0.498",
+ "blue" : "0.690",
"alpha" : "1.000"
}
}
diff --git a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-1024-dark.png b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-1024-dark.png
index 28046b3..84cb9fb 100644
Binary files a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-1024-dark.png and b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-1024-dark.png differ
diff --git a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-1024-light.png b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-1024-light.png
index 200bb5a..951b054 100644
Binary files a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-1024-light.png and b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-1024-light.png differ
diff --git a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-128.png b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-128.png
index 1ea3d19..ed743a9 100644
Binary files a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-128.png and b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-128.png differ
diff --git a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-128@2x.png b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-128@2x.png
index ad77a73..caac11e 100644
Binary files a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-128@2x.png and b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-128@2x.png differ
diff --git a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-16.png b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-16.png
index 17d8cef..c934939 100644
Binary files a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-16.png and b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-16.png differ
diff --git a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-16@2x.png b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-16@2x.png
index 4edecb9..30bdd4e 100644
Binary files a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-16@2x.png and b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-16@2x.png differ
diff --git a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-256.png b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-256.png
index ad77a73..caac11e 100644
Binary files a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-256.png and b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-256.png differ
diff --git a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-256@2x.png b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-256@2x.png
index bbdebc6..a67bb04 100644
Binary files a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-256@2x.png and b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-256@2x.png differ
diff --git a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-32.png b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-32.png
index 4edecb9..30bdd4e 100644
Binary files a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-32.png and b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-32.png differ
diff --git a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-32@2x.png b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-32@2x.png
index 449157e..6b2a639 100644
Binary files a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-32@2x.png and b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-32@2x.png differ
diff --git a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-512.png b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-512.png
index bbdebc6..a67bb04 100644
Binary files a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-512.png and b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-512.png differ
diff --git a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-512@2x.png b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-512@2x.png
index 200bb5a..951b054 100644
Binary files a/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-512@2x.png and b/KeeVault/Assets.xcassets/AppIcon.appiconset/icon-mac-512@2x.png differ
diff --git a/KeeVault/Assets.xcassets/AppIconImage.imageset/Contents.json b/KeeVault/Assets.xcassets/AppIconImage.imageset/Contents.json
new file mode 100644
index 0000000..7d6de44
--- /dev/null
+++ b/KeeVault/Assets.xcassets/AppIconImage.imageset/Contents.json
@@ -0,0 +1,32 @@
+{
+ "images" : [
+ {
+ "filename" : "icon-light.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "filename" : "icon-dark.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/KeeVault/Assets.xcassets/AppIconImage.imageset/icon-dark.png b/KeeVault/Assets.xcassets/AppIconImage.imageset/icon-dark.png
new file mode 100644
index 0000000..84cb9fb
Binary files /dev/null and b/KeeVault/Assets.xcassets/AppIconImage.imageset/icon-dark.png differ
diff --git a/KeeVault/Assets.xcassets/AppIconImage.imageset/icon-light.png b/KeeVault/Assets.xcassets/AppIconImage.imageset/icon-light.png
new file mode 100644
index 0000000..951b054
Binary files /dev/null and b/KeeVault/Assets.xcassets/AppIconImage.imageset/icon-light.png differ
diff --git a/KeeVault/Views/GroupFilterView.swift b/KeeVault/Views/GroupFilterView.swift
index eec8d92..288361a 100644
--- a/KeeVault/Views/GroupFilterView.swift
+++ b/KeeVault/Views/GroupFilterView.swift
@@ -7,14 +7,17 @@ struct GroupFilterView: View {
var body: some View {
List {
- if !vm.selectedGroupIds.isEmpty {
- Button("Clear Filter", action: vm.clear)
- }
GroupFilterNode(group: rootGroup, vm: vm)
}
.scrollContentBackground(.hidden)
.background(Color("VaultBackground"))
.navigationTitle("Groups")
+ .toolbar {
+ ToolbarItem(placement: .cancellationAction) {
+ Button("Clear", action: vm.clear)
+ .disabled(vm.selectedGroupIds.isEmpty)
+ }
+ }
}
}
diff --git a/KeeVault/Views/UnlockView.swift b/KeeVault/Views/UnlockView.swift
index 0cc12b9..88dde40 100644
--- a/KeeVault/Views/UnlockView.swift
+++ b/KeeVault/Views/UnlockView.swift
@@ -13,9 +13,10 @@ struct UnlockView: View {
var body: some View {
VStack(spacing: 24) {
Spacer()
- Image(systemName: "lock.shield.fill")
- .font(.system(size: 64))
- .foregroundStyle(.tint)
+ Image("AppIconImage")
+ .resizable()
+ .frame(width: 88, height: 88)
+ .clipShape(RoundedRectangle(cornerRadius: 20, style: .continuous))
Text("KeeVault")
.font(.largeTitle.bold())
diff --git a/KeeVaultCore/.swiftpm/xcode/xcuserdata/kriss.xcuserdatad/xcschemes/xcschememanagement.plist b/KeeVaultCore/.swiftpm/xcode/xcuserdata/kriss.xcuserdatad/xcschemes/xcschememanagement.plist
index a45039e..25f6e17 100644
--- a/KeeVaultCore/.swiftpm/xcode/xcuserdata/kriss.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/KeeVaultCore/.swiftpm/xcode/xcuserdata/kriss.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
KeeVaultCore.xcscheme_^#shared#^_
orderHint
- 2
+ 3