Skip to content

Commit 161a604

Browse files
peterfriesepeterfriese
committed
✨Implement advanced form validation
1 parent 7b95406 commit 161a604

File tree

7 files changed

+241
-2
lines changed

7 files changed

+241
-2
lines changed

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ xcuserdata/
6565
# We recommend against adding the Pods directory to your .gitignore. However
6666
# you should judge for yourself, the pros and cons are mentioned at:
6767
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
68-
# Pods/
68+
Pods/
6969
# Add this line if you want to avoid checking in source code from the Xcode workspace
7070
# *.xcworkspace
7171

‎Podfile

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Uncomment the next line to define a global platform for your project
2+
# platform :ios, '9.0'
3+
4+
target 'SwiftUI-Combine' do
5+
# Comment the next line if you don't want to use dynamic frameworks
6+
use_frameworks!
7+
8+
# Pods for SwiftUI-Combine
9+
pod 'Navajo-Swift'
10+
11+
target 'SwiftUI-CombineTests' do
12+
inherit! :search_paths
13+
# Pods for testing
14+
end
15+
16+
end

‎Podfile.lock

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
PODS:
2+
- Navajo-Swift (2.1.0)
3+
4+
DEPENDENCIES:
5+
- Navajo-Swift
6+
7+
SPEC REPOS:
8+
https://github.com/cocoapods/specs.git:
9+
- Navajo-Swift
10+
11+
SPEC CHECKSUMS:
12+
Navajo-Swift: 57b93e73efbfbf452433efbff04402de56beff51
13+
14+
PODFILE CHECKSUM: 21a261f53df521c3dd277f00f37c6d4e9069747d
15+
16+
COCOAPODS: 1.7.5

‎SwiftUI-Combine.xcodeproj/project.pbxproj

+104
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
882C7EB3231D7AE000B9AFC5 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 882C7EB2231D7AE000B9AFC5 /* Preview Assets.xcassets */; };
1515
882C7EB6231D7AE000B9AFC5 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 882C7EB4231D7AE000B9AFC5 /* LaunchScreen.storyboard */; };
1616
882C7EC1231D7AE100B9AFC5 /* SwiftUI_CombineTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 882C7EC0231D7AE100B9AFC5 /* SwiftUI_CombineTests.swift */; };
17+
F4EAB782D9A69D55169AA082 /* Pods_SwiftUI_CombineTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EAED7B4B2E771F456C8D9A44 /* Pods_SwiftUI_CombineTests.framework */; };
18+
FA4B1DD302AA565FF9C19D95 /* Pods_SwiftUI_Combine.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 10ACBDCE50933F4EC1241D62 /* Pods_SwiftUI_Combine.framework */; };
1719
/* End PBXBuildFile section */
1820

1921
/* Begin PBXContainerItemProxy section */
@@ -27,6 +29,8 @@
2729
/* End PBXContainerItemProxy section */
2830

2931
/* Begin PBXFileReference section */
32+
10ACBDCE50933F4EC1241D62 /* Pods_SwiftUI_Combine.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SwiftUI_Combine.framework; sourceTree = BUILT_PRODUCTS_DIR; };
33+
599086138F71BEBCF45931C6 /* Pods-SwiftUI-Combine.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftUI-Combine.release.xcconfig"; path = "Target Support Files/Pods-SwiftUI-Combine/Pods-SwiftUI-Combine.release.xcconfig"; sourceTree = "<group>"; };
3034
882C7EA6231D7ADF00B9AFC5 /* SwiftUI-Combine.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "SwiftUI-Combine.app"; sourceTree = BUILT_PRODUCTS_DIR; };
3135
882C7EA9231D7ADF00B9AFC5 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
3236
882C7EAB231D7ADF00B9AFC5 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -38,32 +42,61 @@
3842
882C7EBC231D7AE100B9AFC5 /* SwiftUI-CombineTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SwiftUI-CombineTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
3943
882C7EC0231D7AE100B9AFC5 /* SwiftUI_CombineTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUI_CombineTests.swift; sourceTree = "<group>"; };
4044
882C7EC2231D7AE100B9AFC5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
45+
90842E7EA5DF6F7316755E72 /* Pods-SwiftUI-Combine.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftUI-Combine.debug.xcconfig"; path = "Target Support Files/Pods-SwiftUI-Combine/Pods-SwiftUI-Combine.debug.xcconfig"; sourceTree = "<group>"; };
46+
A874CED7A50631579A1CC107 /* Pods-SwiftUI-CombineTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftUI-CombineTests.debug.xcconfig"; path = "Target Support Files/Pods-SwiftUI-CombineTests/Pods-SwiftUI-CombineTests.debug.xcconfig"; sourceTree = "<group>"; };
47+
E12A138418FFFE624CC418C6 /* Pods-SwiftUI-CombineTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SwiftUI-CombineTests.release.xcconfig"; path = "Target Support Files/Pods-SwiftUI-CombineTests/Pods-SwiftUI-CombineTests.release.xcconfig"; sourceTree = "<group>"; };
48+
EAED7B4B2E771F456C8D9A44 /* Pods_SwiftUI_CombineTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SwiftUI_CombineTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4149
/* End PBXFileReference section */
4250

4351
/* Begin PBXFrameworksBuildPhase section */
4452
882C7EA3231D7ADF00B9AFC5 /* Frameworks */ = {
4553
isa = PBXFrameworksBuildPhase;
4654
buildActionMask = 2147483647;
4755
files = (
56+
FA4B1DD302AA565FF9C19D95 /* Pods_SwiftUI_Combine.framework in Frameworks */,
4857
);
4958
runOnlyForDeploymentPostprocessing = 0;
5059
};
5160
882C7EB9231D7AE100B9AFC5 /* Frameworks */ = {
5261
isa = PBXFrameworksBuildPhase;
5362
buildActionMask = 2147483647;
5463
files = (
64+
F4EAB782D9A69D55169AA082 /* Pods_SwiftUI_CombineTests.framework in Frameworks */,
5565
);
5666
runOnlyForDeploymentPostprocessing = 0;
5767
};
5868
/* End PBXFrameworksBuildPhase section */
5969

6070
/* Begin PBXGroup section */
71+
645D7801FE25E8A20FA5A557 /* Frameworks */ = {
72+
isa = PBXGroup;
73+
children = (
74+
10ACBDCE50933F4EC1241D62 /* Pods_SwiftUI_Combine.framework */,
75+
EAED7B4B2E771F456C8D9A44 /* Pods_SwiftUI_CombineTests.framework */,
76+
);
77+
name = Frameworks;
78+
sourceTree = "<group>";
79+
};
80+
7A0740E42B9ECC47EA99F52D /* Pods */ = {
81+
isa = PBXGroup;
82+
children = (
83+
90842E7EA5DF6F7316755E72 /* Pods-SwiftUI-Combine.debug.xcconfig */,
84+
599086138F71BEBCF45931C6 /* Pods-SwiftUI-Combine.release.xcconfig */,
85+
A874CED7A50631579A1CC107 /* Pods-SwiftUI-CombineTests.debug.xcconfig */,
86+
E12A138418FFFE624CC418C6 /* Pods-SwiftUI-CombineTests.release.xcconfig */,
87+
);
88+
name = Pods;
89+
path = Pods;
90+
sourceTree = "<group>";
91+
};
6192
882C7E9D231D7ADF00B9AFC5 = {
6293
isa = PBXGroup;
6394
children = (
6495
882C7EA8231D7ADF00B9AFC5 /* SwiftUI-Combine */,
6596
882C7EBF231D7AE100B9AFC5 /* SwiftUI-CombineTests */,
6697
882C7EA7231D7ADF00B9AFC5 /* Products */,
98+
7A0740E42B9ECC47EA99F52D /* Pods */,
99+
645D7801FE25E8A20FA5A557 /* Frameworks */,
67100
);
68101
sourceTree = "<group>";
69102
};
@@ -114,9 +147,11 @@
114147
isa = PBXNativeTarget;
115148
buildConfigurationList = 882C7EC5231D7AE100B9AFC5 /* Build configuration list for PBXNativeTarget "SwiftUI-Combine" */;
116149
buildPhases = (
150+
6C0DC6CFC852FB8A2593FA93 /* [CP] Check Pods Manifest.lock */,
117151
882C7EA2231D7ADF00B9AFC5 /* Sources */,
118152
882C7EA3231D7ADF00B9AFC5 /* Frameworks */,
119153
882C7EA4231D7ADF00B9AFC5 /* Resources */,
154+
9097C35BE50017624621435F /* [CP] Embed Pods Frameworks */,
120155
);
121156
buildRules = (
122157
);
@@ -131,6 +166,7 @@
131166
isa = PBXNativeTarget;
132167
buildConfigurationList = 882C7EC8231D7AE100B9AFC5 /* Build configuration list for PBXNativeTarget "SwiftUI-CombineTests" */;
133168
buildPhases = (
169+
6131D054C8597DB651A4CC6E /* [CP] Check Pods Manifest.lock */,
134170
882C7EB8231D7AE100B9AFC5 /* Sources */,
135171
882C7EB9231D7AE100B9AFC5 /* Frameworks */,
136172
882C7EBA231D7AE100B9AFC5 /* Resources */,
@@ -203,6 +239,70 @@
203239
};
204240
/* End PBXResourcesBuildPhase section */
205241

242+
/* Begin PBXShellScriptBuildPhase section */
243+
6131D054C8597DB651A4CC6E /* [CP] Check Pods Manifest.lock */ = {
244+
isa = PBXShellScriptBuildPhase;
245+
buildActionMask = 2147483647;
246+
files = (
247+
);
248+
inputFileListPaths = (
249+
);
250+
inputPaths = (
251+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
252+
"${PODS_ROOT}/Manifest.lock",
253+
);
254+
name = "[CP] Check Pods Manifest.lock";
255+
outputFileListPaths = (
256+
);
257+
outputPaths = (
258+
"$(DERIVED_FILE_DIR)/Pods-SwiftUI-CombineTests-checkManifestLockResult.txt",
259+
);
260+
runOnlyForDeploymentPostprocessing = 0;
261+
shellPath = /bin/sh;
262+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
263+
showEnvVarsInLog = 0;
264+
};
265+
6C0DC6CFC852FB8A2593FA93 /* [CP] Check Pods Manifest.lock */ = {
266+
isa = PBXShellScriptBuildPhase;
267+
buildActionMask = 2147483647;
268+
files = (
269+
);
270+
inputFileListPaths = (
271+
);
272+
inputPaths = (
273+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
274+
"${PODS_ROOT}/Manifest.lock",
275+
);
276+
name = "[CP] Check Pods Manifest.lock";
277+
outputFileListPaths = (
278+
);
279+
outputPaths = (
280+
"$(DERIVED_FILE_DIR)/Pods-SwiftUI-Combine-checkManifestLockResult.txt",
281+
);
282+
runOnlyForDeploymentPostprocessing = 0;
283+
shellPath = /bin/sh;
284+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
285+
showEnvVarsInLog = 0;
286+
};
287+
9097C35BE50017624621435F /* [CP] Embed Pods Frameworks */ = {
288+
isa = PBXShellScriptBuildPhase;
289+
buildActionMask = 2147483647;
290+
files = (
291+
);
292+
inputFileListPaths = (
293+
"${PODS_ROOT}/Target Support Files/Pods-SwiftUI-Combine/Pods-SwiftUI-Combine-frameworks-${CONFIGURATION}-input-files.xcfilelist",
294+
);
295+
name = "[CP] Embed Pods Frameworks";
296+
outputFileListPaths = (
297+
"${PODS_ROOT}/Target Support Files/Pods-SwiftUI-Combine/Pods-SwiftUI-Combine-frameworks-${CONFIGURATION}-output-files.xcfilelist",
298+
);
299+
runOnlyForDeploymentPostprocessing = 0;
300+
shellPath = /bin/sh;
301+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SwiftUI-Combine/Pods-SwiftUI-Combine-frameworks.sh\"\n";
302+
showEnvVarsInLog = 0;
303+
};
304+
/* End PBXShellScriptBuildPhase section */
305+
206306
/* Begin PBXSourcesBuildPhase section */
207307
882C7EA2231D7ADF00B9AFC5 /* Sources */ = {
208308
isa = PBXSourcesBuildPhase;
@@ -360,6 +460,7 @@
360460
};
361461
882C7EC6231D7AE100B9AFC5 /* Debug */ = {
362462
isa = XCBuildConfiguration;
463+
baseConfigurationReference = 90842E7EA5DF6F7316755E72 /* Pods-SwiftUI-Combine.debug.xcconfig */;
363464
buildSettings = {
364465
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
365466
CODE_SIGN_STYLE = Automatic;
@@ -380,6 +481,7 @@
380481
};
381482
882C7EC7231D7AE100B9AFC5 /* Release */ = {
382483
isa = XCBuildConfiguration;
484+
baseConfigurationReference = 599086138F71BEBCF45931C6 /* Pods-SwiftUI-Combine.release.xcconfig */;
383485
buildSettings = {
384486
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
385487
CODE_SIGN_STYLE = Automatic;
@@ -400,6 +502,7 @@
400502
};
401503
882C7EC9231D7AE100B9AFC5 /* Debug */ = {
402504
isa = XCBuildConfiguration;
505+
baseConfigurationReference = A874CED7A50631579A1CC107 /* Pods-SwiftUI-CombineTests.debug.xcconfig */;
403506
buildSettings = {
404507
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
405508
BUNDLE_LOADER = "$(TEST_HOST)";
@@ -422,6 +525,7 @@
422525
};
423526
882C7ECA231D7AE100B9AFC5 /* Release */ = {
424527
isa = XCBuildConfiguration;
528+
baseConfigurationReference = E12A138418FFFE624CC418C6 /* Pods-SwiftUI-CombineTests.release.xcconfig */;
425529
buildSettings = {
426530
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
427531
BUNDLE_LOADER = "$(TEST_HOST)";

‎SwiftUI-Combine.xcworkspace/contents.xcworkspacedata

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎SwiftUI-Combine.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎SwiftUI-Combine/ContentView.swift

+86-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import SwiftUI
1010
import Combine
11+
import Navajo_Swift
1112

1213
class UserModel: ObservableObject {
1314
@Published var userName = ""
@@ -17,16 +18,100 @@ class UserModel: ObservableObject {
1718

1819
private var cancellableSet: Set<AnyCancellable> = []
1920

20-
init() {
21+
private var isUserNameValidPublisher: AnyPublisher<Bool, Never> {
2122
$userName
2223
.debounce(for: 0.8, scheduler: RunLoop.main)
2324
.removeDuplicates()
2425
.map { input in
2526
return input.count >= 3
2627
}
28+
.eraseToAnyPublisher()
29+
}
30+
31+
private var isPasswordEmptyPublisher: AnyPublisher<Bool, Never> {
32+
$password
33+
.debounce(for: 0.8, scheduler: RunLoop.main)
34+
.removeDuplicates()
35+
.map { password in
36+
return password == ""
37+
}
38+
.eraseToAnyPublisher()
39+
}
40+
41+
private var isPasswordsEqualPublisher: AnyPublisher<Bool, Never> {
42+
Publishers.CombineLatest($password, $passwordAgain)
43+
.debounce(for: 0.2, scheduler: RunLoop.main)
44+
.map { password, passwordAgain in
45+
return password == passwordAgain
46+
}
47+
.eraseToAnyPublisher()
48+
}
49+
50+
private var passwordStrengthPublisher: AnyPublisher<PasswordStrength, Never> {
51+
$password
52+
.debounce(for: 0.2, scheduler: RunLoop.main)
53+
.removeDuplicates()
54+
.map { input in
55+
return Navajo.strength(ofPassword: input)
56+
}
57+
.eraseToAnyPublisher()
58+
}
59+
60+
private var isPasswordStrongEnoughPublisher: AnyPublisher<Bool, Never> {
61+
passwordStrengthPublisher
62+
.map { strength in
63+
print(Navajo.localizedString(forStrength: strength))
64+
switch strength {
65+
case .reasonable, .strong, .veryStrong:
66+
return true
67+
default:
68+
return false
69+
}
70+
}
71+
.eraseToAnyPublisher()
72+
}
73+
74+
enum PasswordCheck {
75+
case valid
76+
case empty
77+
case noMatch
78+
case notStrongEnough
79+
}
80+
81+
private var isPasswordValidPublisher: AnyPublisher<PasswordCheck, Never> {
82+
Publishers.CombineLatest3(isPasswordEmptyPublisher, isPasswordsEqualPublisher, isPasswordStrongEnoughPublisher)
83+
.map { passwordIsEmpty, passwordsAreEqual, passwordIsStrongEnough in
84+
if (passwordIsEmpty) {
85+
return .empty
86+
}
87+
else if (!passwordsAreEqual) {
88+
return .noMatch
89+
}
90+
else if (!passwordIsStrongEnough) {
91+
return .notStrongEnough
92+
}
93+
else {
94+
return .valid
95+
}
96+
}
97+
.eraseToAnyPublisher()
98+
}
99+
100+
private var isFormValidPublisher: AnyPublisher<Bool, Never> {
101+
Publishers.CombineLatest(isUserNameValidPublisher, isPasswordValidPublisher)
102+
.map { userNameIsValid, passwordIsValid in
103+
return userNameIsValid && (passwordIsValid == .valid)
104+
}
105+
.eraseToAnyPublisher()
106+
}
107+
108+
init() {
109+
isFormValidPublisher
110+
.receive(on: RunLoop.main)
27111
.assign(to: \.valid, on: self)
28112
.store(in: &cancellableSet)
29113
}
114+
30115
}
31116

32117
struct ContentView: View {

0 commit comments

Comments
 (0)