Skip to content

Commit c028ed2

Browse files
saroarsaroar
committed
update Event Model and update location SDK
1 parent 983cc36 commit c028ed2

File tree

22 files changed

+669
-224
lines changed

22 files changed

+669
-224
lines changed

‎Addame.xcworkspace/xcshareddata/swiftpm/Package.resolved

+4-13
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
},
3131
{
3232
"package": "composable-core-location",
33-
"repositoryURL": "https://github.com/pointfreeco/composable-core-location",
33+
"repositoryURL": "https://github.com/pointfreeco/composable-core-location.git",
3434
"state": {
35-
"branch": null,
36-
"revision": "ad0b25210c1daef738f2565c4308765123fa248f",
37-
"version": "0.1.0"
35+
"branch": "main",
36+
"revision": "42bb4d67b9afe88dc67ac0512f1bd98aebc7c79a",
37+
"version": null
3838
}
3939
},
4040
{
@@ -100,15 +100,6 @@
100100
"version": "0.0.7"
101101
}
102102
},
103-
{
104-
"package": "swift-composable-architecture",
105-
"repositoryURL": "https://github.com/pointfreeco/swift-composable-architecture.git",
106-
"state": {
107-
"branch": null,
108-
"revision": "599a2398adaaa7a4e3f5420cde7728c39e33677e",
109-
"version": "0.28.1"
110-
}
111-
},
112103
{
113104
"package": "swift-composable-presentation",
114105
"repositoryURL": "https://github.com/darrarski/swift-composable-presentation.git",

‎AddameSPM/.swiftpm/xcode/xcshareddata/xcschemes/EventClient.xcscheme

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1300"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "EventClient"
18+
BuildableName = "EventClient"
19+
BlueprintName = "EventClient"
20+
ReferencedContainer = "container:">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
</LaunchAction>
44+
<ProfileAction
45+
buildConfiguration = "Release"
46+
shouldUseLaunchSchemeArgsEnv = "YES"
47+
savedToolIdentifier = ""
48+
useCustomWorkingDirectory = "NO"
49+
debugDocumentVersioning = "YES">
50+
<MacroExpansion>
51+
<BuildableReference
52+
BuildableIdentifier = "primary"
53+
BlueprintIdentifier = "EventClient"
54+
BuildableName = "EventClient"
55+
BlueprintName = "EventClient"
56+
ReferencedContainer = "container:">
57+
</BuildableReference>
58+
</MacroExpansion>
59+
</ProfileAction>
60+
<AnalyzeAction
61+
buildConfiguration = "Debug">
62+
</AnalyzeAction>
63+
<ArchiveAction
64+
buildConfiguration = "Release"
65+
revealArchiveInOrganizer = "YES">
66+
</ArchiveAction>
67+
</Scheme>

‎AddameSPM/.swiftpm/xcode/xcshareddata/xcschemes/EventClientLive.xcscheme

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1300"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "EventClientLive"
18+
BuildableName = "EventClientLive"
19+
BlueprintName = "EventClientLive"
20+
ReferencedContainer = "container:">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
</LaunchAction>
44+
<ProfileAction
45+
buildConfiguration = "Release"
46+
shouldUseLaunchSchemeArgsEnv = "YES"
47+
savedToolIdentifier = ""
48+
useCustomWorkingDirectory = "NO"
49+
debugDocumentVersioning = "YES">
50+
<MacroExpansion>
51+
<BuildableReference
52+
BuildableIdentifier = "primary"
53+
BlueprintIdentifier = "EventClientLive"
54+
BuildableName = "EventClientLive"
55+
BlueprintName = "EventClientLive"
56+
ReferencedContainer = "container:">
57+
</BuildableReference>
58+
</MacroExpansion>
59+
</ProfileAction>
60+
<AnalyzeAction
61+
buildConfiguration = "Debug">
62+
</AnalyzeAction>
63+
<ArchiveAction
64+
buildConfiguration = "Release"
65+
revealArchiveInOrganizer = "YES">
66+
</ArchiveAction>
67+
</Scheme>

‎AddameSPM/.swiftpm/xcode/xcshareddata/xcschemes/EventView.xcscheme

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1300"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "EventView"
18+
BuildableName = "EventView"
19+
BlueprintName = "EventView"
20+
ReferencedContainer = "container:">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
</LaunchAction>
44+
<ProfileAction
45+
buildConfiguration = "Release"
46+
shouldUseLaunchSchemeArgsEnv = "YES"
47+
savedToolIdentifier = ""
48+
useCustomWorkingDirectory = "NO"
49+
debugDocumentVersioning = "YES">
50+
<MacroExpansion>
51+
<BuildableReference
52+
BuildableIdentifier = "primary"
53+
BlueprintIdentifier = "EventView"
54+
BuildableName = "EventView"
55+
BlueprintName = "EventView"
56+
ReferencedContainer = "container:">
57+
</BuildableReference>
58+
</MacroExpansion>
59+
</ProfileAction>
60+
<AnalyzeAction
61+
buildConfiguration = "Debug">
62+
</AnalyzeAction>
63+
<ArchiveAction
64+
buildConfiguration = "Release"
65+
revealArchiveInOrganizer = "YES">
66+
</ArchiveAction>
67+
</Scheme>

‎AddameSPM/.swiftpm/xcode/xcshareddata/xcschemes/SharedModels.xcscheme

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1300"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "SharedModels"
18+
BuildableName = "SharedModels"
19+
BlueprintName = "SharedModels"
20+
ReferencedContainer = "container:">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
</LaunchAction>
44+
<ProfileAction
45+
buildConfiguration = "Release"
46+
shouldUseLaunchSchemeArgsEnv = "YES"
47+
savedToolIdentifier = ""
48+
useCustomWorkingDirectory = "NO"
49+
debugDocumentVersioning = "YES">
50+
<MacroExpansion>
51+
<BuildableReference
52+
BuildableIdentifier = "primary"
53+
BlueprintIdentifier = "SharedModels"
54+
BuildableName = "SharedModels"
55+
BlueprintName = "SharedModels"
56+
ReferencedContainer = "container:">
57+
</BuildableReference>
58+
</MacroExpansion>
59+
</ProfileAction>
60+
<AnalyzeAction
61+
buildConfiguration = "Debug">
62+
</AnalyzeAction>
63+
<ArchiveAction
64+
buildConfiguration = "Release"
65+
revealArchiveInOrganizer = "YES">
66+
</ArchiveAction>
67+
</Scheme>

‎AddameSPM/Package.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ let package = Package(
7676
.package(url: "https://github.com/marmelroy/PhoneNumberKit", .upToNextMajor(from: "3.3.3")),
7777
.package(
7878
url: "https://github.com/pointfreeco/swift-composable-architecture.git", from: "0.28.1"),
79-
.package(url: "https://github.com/pointfreeco/composable-core-location", from: "0.1.0"),
79+
.package(url: "https://github.com/pointfreeco/composable-core-location.git", .branch("main")),
8080
.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "0.1.0"),
8181
.package(url: "https://github.com/AddaMeSPB/CombineContacts.git", from: "1.0.0"),
8282
// .package(path: "../../HTTPRequestKit"),

‎AddameSPM/Sources/AuthClient/Mocks.swift

+13
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,17 @@ extension AuthClient {
4646
.eraseToAnyPublisher()
4747
}
4848
)
49+
50+
public static let failing = Self(
51+
login: { _ in
52+
Fail(error: HTTPRequest.HRError.custom("Missing code", ""))
53+
.eraseToAnyPublisher()
54+
},
55+
verification: { _ in
56+
Fail(error: HTTPRequest.HRError.custom("verification fail", ""))
57+
.eraseToAnyPublisher()
58+
}
59+
)
4960
}
61+
62+
extension String: Error {}

‎AddameSPM/Sources/AuthenticationView/AuthenticationCore.swift

+3
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,18 @@ public struct AuthenticationEnvironment {
5757
public let loginReducer = Reducer<LoginState, LoginAction, AuthenticationEnvironment> {
5858
state, action, environment in
5959
switch action {
60+
6061
case .onAppear:
6162
state.isAuthorized = environment.userDefaults
6263
.boolForKey(AppUserDefaults.Key.isAuthorized.rawValue)
6364
state.isUserFirstNameEmpty = environment.userDefaults
6465
.boolForKey(AppUserDefaults.Key.isUserFirstNameEmpty.rawValue)
6566
return .none
67+
6668
case .alertDismissed:
6769
state.alert = nil
6870
return .none
71+
6972
case let .sendPhoneNumberButtonTapped(phoneNumber):
7073
state.isLoginRequestInFlight = true
7174

0 commit comments

Comments
 (0)