Skip to content

Commit 735d593

Browse files
saroarsaroar
committed
Merge branch 'feature/contactlist' into develop
2 parents 183d823 + dd8d1f2 commit 735d593

File tree

146 files changed

+2737
-1813
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+2737
-1813
lines changed

‎.swiftlint.yml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
disabled_rules:
2+
- vertical_parameter_alignment_on_call
3+
- weak_delegate
4+
- vertical_parameter_alignment
5+
- closure_parameter_position
6+
- todo
7+
- multiple_closures_with_trailing_closure
8+
opt_in_rules:
9+
- empty_count
10+
- explicit_init
11+
- closure_spacing
12+
- overridden_super_call
13+
- redundant_nil_coalescing
14+
- private_outlet
15+
- nimble_operator
16+
- operator_usage_whitespace
17+
- closure_end_indentation
18+
- first_where
19+
- prohibited_super_call
20+
- fatal_error_message
21+
- unneeded_parentheses_in_closure_argument
22+
- pattern_matching_keywords
23+
- array_init
24+
- literal_expression_end_indentation
25+
- joined_default_parameter
26+
- contains_over_first_not_nil
27+
- override_in_extension
28+
- private_action
29+
- quick_discouraged_call
30+
- quick_discouraged_focused_test
31+
- quick_discouraged_pending_test
32+
- single_test_class
33+
- sorted_first_last
34+
35+
warning_threshold: 1
36+
37+
line_length: 120
38+
39+
type_body_length:
40+
- 300 # warning
41+
- 300 # error
42+
43+
file_length:
44+
warning: 400 # warning
45+
error: 400 # error
46+
47+
identifier_name:
48+
min_length:
49+
error: 2
50+
max_length:
51+
error: 50
52+
excluded:
53+
- id
54+
- _id

‎Addame.xcodeproj/project.pbxproj‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@
105105
C3E50C98261B5DFA00285977 /* Sources */,
106106
C3E50C99261B5DFA00285977 /* Frameworks */,
107107
C3E50C9A261B5DFA00285977 /* Resources */,
108+
C3F9CB0A2678E4540007F6B9 /* SwiftLint */,
108109
);
109110
buildRules = (
110111
);
@@ -162,6 +163,27 @@
162163
};
163164
/* End PBXResourcesBuildPhase section */
164165

166+
/* Begin PBXShellScriptBuildPhase section */
167+
C3F9CB0A2678E4540007F6B9 /* SwiftLint */ = {
168+
isa = PBXShellScriptBuildPhase;
169+
buildActionMask = 2147483647;
170+
files = (
171+
);
172+
inputFileListPaths = (
173+
);
174+
inputPaths = (
175+
);
176+
name = SwiftLint;
177+
outputFileListPaths = (
178+
);
179+
outputPaths = (
180+
);
181+
runOnlyForDeploymentPostprocessing = 0;
182+
shellPath = /bin/sh;
183+
shellScript = "if which swiftlint >/dev/null; then\n swiftlint --fix --config \".swiftlint.yml\" && swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
184+
};
185+
/* End PBXShellScriptBuildPhase section */
186+
165187
/* Begin PBXSourcesBuildPhase section */
166188
C3E50C98261B5DFA00285977 /* Sources */ = {
167189
isa = PBXSourcesBuildPhase;

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

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Addame/Addame.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import ComposableArchitecture
99
import SwiftUI
1010
import EventView
11-
import ConversationView
11+
import ConversationsView
1212
import ProfileView
1313
import TabsView
1414
import AuthenticationView

‎Addame/Addame/Package.swift‎

Lines changed: 48 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ let package = Package(
2424
.library(name: "RemoteNotificationsClient", targets: ["RemoteNotificationsClient"]),
2525
.library(name: "UIApplicationClient", targets: ["UIApplicationClient"]),
2626
.library(name: "UserDefaultsClient", targets: ["UserDefaultsClient"]),
27-
27+
2828
.library(name: "AttachmentClient", targets: ["AttachmentClient"]),
2929
.library(name: "AttachmentClientLive", targets: ["AttachmentClientLive"]),
3030
.library(name: "AuthClient", targets: ["AuthClient"]),
@@ -44,18 +44,18 @@ let package = Package(
4444
.library(name: "UserClientLive", targets: ["UserClientLive"]),
4545
.library(name: "WebsocketClient", targets: ["WebsocketClient"]),
4646
.library(name: "WebsocketClientLive", targets: ["WebsocketClientLive"]),
47-
47+
4848
// Views
4949
.library(name: "AuthenticationView", targets: ["AuthenticationView"]),
5050
.library(name: "ChatView", targets: ["ChatView"]),
51-
.library(name: "ConversationView", targets: ["ConversationView"]),
51+
.library(name: "ConversationsView", targets: ["ConversationsView"]),
5252
.library(name: "ContactsView", targets: ["ContactsView"]),
5353
.library(name: "EventView", targets: ["EventView"]),
5454
.library(name: "EventForm", targets: ["EventForm"]),
5555
.library(name: "ProfileView", targets: ["ProfileView"]),
5656
.library(name: "TabsView", targets: ["TabsView"]),
5757
.library(name: "SettingsView", targets: ["SettingsView"]),
58-
58+
5959
// Helpers
6060
.library(name: "NotificationHelpers", targets: ["NotificationHelpers"]),
6161
.library(name: "SwiftUIHelpers", targets: ["SwiftUIHelpers"]),
@@ -66,11 +66,11 @@ let package = Package(
6666
dependencies: [
6767
.package(name: "AWSSDKSwift", url: "https://github.com/swift-aws/aws-sdk-swift.git", from: "4.9.0"),
6868
.package(url: "https://github.com/marmelroy/PhoneNumberKit", .upToNextMajor(from: "3.3.3")),
69-
.package(url: "https://github.com/pointfreeco/swift-composable-architecture.git",from: "0.17.0"),
69+
.package(url: "https://github.com/pointfreeco/swift-composable-architecture.git", from: "0.17.0"),
7070
.package(url: "https://github.com/pointfreeco/composable-core-location", from: "0.1.0"),
7171
.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "0.1.0"),
7272
.package(url: "https://github.com/AddaMeSPB/CombineContacts.git", from: "1.0.0"),
73-
.package(url: "https://github.com/AddaMeSPB/HttpRequest.git", from: "1.0.1"),
73+
.package(url: "https://github.com/AddaMeSPB/HttpRequest.git", from: "1.0.1")
7474
],
7575

7676
targets: [
@@ -81,9 +81,9 @@ let package = Package(
8181
"UserNotificationClient", "RemoteNotificationsClient", "NotificationHelpers",
8282
"AuthClient", "AuthClientLive", "AttachmentClient", "ChatClient", "ContactClient",
8383
"ConversationClient", "EventClient", "UserClient", "WebsocketClient",
84-
85-
"EventView", "ConversationView", "ProfileView", "TabsView", "AuthenticationView",
86-
"SettingsView",
84+
85+
"EventView", "ConversationsView", "ProfileView", "TabsView", "AuthenticationView",
86+
"SettingsView"
8787
]),
8888

8989
.testTarget(
@@ -104,7 +104,12 @@ let package = Package(
104104
"KeychainService", "FoundationExtension"
105105
]
106106
),
107-
.target(name: "CoreDataStore"),
107+
.target(
108+
name: "CoreDataStore",
109+
dependencies: [
110+
"SharedModels", "FoundationExtension"
111+
]
112+
),
108113
.target(name: "FoundationExtension"),
109114

110115
// Client
@@ -113,35 +118,35 @@ let package = Package(
113118
dependencies: [
114119
.product(name: "ComposableArchitecture", package: "swift-composable-architecture")
115120
]),
116-
121+
117122
.target(
118123
name: "UserNotificationClient",
119124
dependencies: [
120125
.product(name: "ComposableArchitecture", package: "swift-composable-architecture")
121126
]),
122-
127+
123128
.target(
124129
name: "UIApplicationClient",
125130
dependencies: [
126131
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
127-
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
132+
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay")
128133
]
129134
),
130135

131136
.target(
132137
name: "UserDefaultsClient",
133138
dependencies: [
134139
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
135-
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
140+
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay")
136141
]
137142
),
138-
143+
139144
.target(
140145
name: "CoreDataClient",
141146
dependencies: [
142-
"CoreDataStore", "ContactClient", "ContactClientLive", "SharedModels",
147+
"CoreDataStore", "ContactClient", "ContactClientLive", "SharedModels"
143148
]),
144-
149+
145150
.target(
146151
name: "AttachmentClient",
147152
dependencies: [
@@ -199,32 +204,31 @@ let package = Package(
199204
name: "UserClient",
200205
dependencies: ["SharedModels", "HttpRequest", "KeychainService", "InfoPlist"]),
201206
.target(name: "UserClientLive", dependencies: ["UserClient"]),
202-
207+
203208
.target(
204209
name: "WebsocketClient",
205210
dependencies: ["FoundationExtension", "HttpRequest", "SharedModels", "InfoPlist", "KeychainService"]),
206211
.target(
207212
name: "WebsocketClientLive",
208213
dependencies: ["WebsocketClient"]),
209-
214+
210215
// Views
211216
.target(
212217
name: "AuthenticationView",
213218
dependencies: [
214219
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
215220
"PhoneNumberKit", "SharedModels", "AuthClient", "KeychainService",
216-
"HttpRequest", "AuthClientLive",
221+
"HttpRequest", "AuthClientLive"
217222
]),
218223

219-
220224
.target(
221225
name: "TabsView",
222226
dependencies: [
223227
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
224228
"AuthClient", "AuthClientLive", "UserClient", "UserClientLive",
225229
"EventClient", "EventClientLive", "AttachmentClient", "AttachmentClientLive",
226230
"PathMonitorClient", "PathMonitorClientLive", "ConversationClient", "ConversationClientLive",
227-
"EventView", "ConversationView", "ProfileView",
231+
"EventView", "ConversationsView", "ProfileView",
228232
"SwiftUIExtension"
229233
]),
230234

@@ -239,28 +243,31 @@ let package = Package(
239243
"WebsocketClientLive"
240244
]
241245
),
242-
246+
243247
.target(
244-
name: "ConversationView",
248+
name: "ConversationsView",
245249
dependencies: [
246250
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
247251
"SharedModels", "InfoPlist", "KeychainService",
248-
"WebsocketClient", "ConversationClient", "ChatClient",
252+
"WebsocketClient", "ChatClient", "ChatClientLive",
249253
"SwiftUIExtension", "FoundationExtension", "AsyncImageLoder",
250-
"HttpRequest", "ChatClientLive", "ConversationClientLive",
251-
"WebsocketClientLive", "ChatView", "ComposableArchitectureHelpers"
254+
"HttpRequest", "ConversationClient", "ConversationClientLive",
255+
"WebsocketClientLive", "ChatView", "ComposableArchitectureHelpers",
256+
"ContactClient", "ContactClientLive", "ContactsView", "CoreDataClient"
252257
]
253258
),
254-
259+
255260
.target(
256261
name: "ContactsView",
257262
dependencies: [
258263
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
259264
"SharedModels", "AsyncImageLoder", "HttpRequest",
260-
"ContactClient", "ContactClientLive",
265+
"ContactClient", "ContactClientLive", "WebsocketClient",
266+
"WebsocketClientLive", "ChatClient", "ChatClientLive",
261267
"CoreDataStore", "CoreDataClient",
268+
"ChatView", "ComposableArchitectureHelpers"
262269
]),
263-
270+
264271
.target(
265272
name: "EventView",
266273
dependencies: [
@@ -270,18 +277,18 @@ let package = Package(
270277
"PathMonitorClient", "WebsocketClient", "ConversationClient",
271278
"SwiftUIExtension", "FoundationExtension", "AsyncImageLoder",
272279
"HttpRequest", "KeychainService", "ChatClient",
273-
"PathMonitorClientLive", "EventClientLive", "ComposableArchitectureHelpers",
280+
"PathMonitorClientLive", "EventClientLive", "ComposableArchitectureHelpers"
274281
]
275282
),
276-
283+
277284
.target(
278285
name: "EventForm",
279286
dependencies: [
280287
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
281-
"SharedModels", "EventClient", "InfoPlist",
288+
"SharedModels", "EventClient", "InfoPlist"
282289
]
283290
),
284-
291+
285292
.target(
286293
name: "ProfileView",
287294
dependencies: [
@@ -291,35 +298,35 @@ let package = Package(
291298
"SwiftUIExtension", "FoundationExtension", "AsyncImageLoder",
292299
"HttpRequest", "KeychainService", "AuthenticationView",
293300
"AttachmentClientLive", "AuthClientLive", "UserClientLive",
294-
"EventClientLive",
301+
"EventClientLive"
295302
]
296303
),
297-
304+
298305
.target(
299306
name: "SettingsView",
300307
dependencies: [
301308
"UIApplicationClient", "UserDefaultsClient",
302309
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
303-
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
310+
.product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay")
304311
]
305312
),
306-
313+
307314
// Helpers
308315
.target(
309316
name: "NotificationHelpers",
310317
dependencies: [
311318
"UserNotificationClient", "RemoteNotificationsClient",
312-
.product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
319+
.product(name: "ComposableArchitecture", package: "swift-composable-architecture")
313320
]
314321
),
315-
322+
316323
.target(name: "SwiftUIHelpers"),
317324
.target(name: "CombineHelpers"),
318325
.target(
319326
name: "ComposableArchitectureHelpers",
320327
dependencies: [
321328
.product(name: "ComposableArchitecture", package: "swift-composable-architecture")
322329
]
323-
),
330+
)
324331
]
325332
)

0 commit comments

Comments
 (0)