Skip to content

Commit 22784cd

Browse files
shp7724shp7724
authored
Fix build error (friends) (#248)
* Fix build error * Apply SwiftFormat changes --------- Co-authored-by: shp7724 <shp7724@users.noreply.github.com>
1 parent 5761c82 commit 22784cd

File tree

5 files changed

+85
-53
lines changed

5 files changed

+85
-53
lines changed

‎SNUTT-2022/SNUTT.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
B8EE0C2C2A7DEDCE00CCFFAC /* WIPFriendsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8EE0C2B2A7DEDCE00CCFFAC /* WIPFriendsView.swift */; };
4848
B8F0B2302A4B27A500A2E15E /* UIDevice+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8F0B22F2A4B27A500A2E15E /* UIDevice+Ext.swift */; };
4949
B8F0B2322A540A5300A2E15E /* EmailVerificationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8F0B2312A540A5300A2E15E /* EmailVerificationView.swift */; };
50-
B8F3E4582A7FDD3B00A69CBF /* FriendsScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8F3E4572A7FDD3B00A69CBF /* FriendsScene.swift */; };
5150
B8F40EA9289809C60021A2A9 /* LicenseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8F40EA8289809C60021A2A9 /* LicenseView.swift */; };
5251
B8F40EAB28980D730021A2A9 /* AccountSettingScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8F40EAA28980D730021A2A9 /* AccountSettingScene.swift */; };
5352
B8F40EAD28980D840021A2A9 /* TimetableSettingScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8F40EAC28980D840021A2A9 /* TimetableSettingScene.swift */; };
@@ -226,6 +225,7 @@
226225
CE17DF912A7F43E0000432B8 /* VacancySugangSnuButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE17DF902A7F43E0000432B8 /* VacancySugangSnuButton.swift */; };
227226
CE17DF932A7FCB32000432B8 /* VacancyGuidePopup.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE17DF922A7FCB32000432B8 /* VacancyGuidePopup.swift */; };
228227
CE3384BA2A86704100437CC5 /* FriendsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3384B92A86704100437CC5 /* FriendsService.swift */; };
228+
CE3384BC2A893F1B00437CC5 /* FriendsScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3384BB2A893F1B00437CC5 /* FriendsScene.swift */; };
229229
CE3F37A929C4CBC6009EDCCC /* TimetableCompactWidgetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3F37A829C4CBC6009EDCCC /* TimetableCompactWidgetView.swift */; };
230230
CE3F37AD29C5D452009EDCCC /* Collection+Getter.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3F37AC29C5D452009EDCCC /* Collection+Getter.swift */; };
231231
CE4777F32A6ADCAC00E03253 /* VacancyRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE4777F22A6ADCAC00E03253 /* VacancyRepository.swift */; };
@@ -254,7 +254,6 @@
254254
CEEAB49229C5EA37005497B0 /* Date+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = B87DF6F42918AB5D008BB95B /* Date+Ext.swift */; };
255255
CEEAB49329C5EA41005497B0 /* Collection+Getter.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3F37AC29C5D452009EDCCC /* Collection+Getter.swift */; };
256256
CEEAB49529C5EAA8005497B0 /* TimetableFullWidgetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEEAB49429C5EAA8005497B0 /* TimetableFullWidgetView.swift */; };
257-
CEF4200A2A62AAA7005C2B1F /* FriendsScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEF420092A62AAA7005C2B1F /* FriendsScene.swift */; };
258257
CEF4200F2A62ADE3005C2B1F /* FriendsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEF4200E2A62ADE3005C2B1F /* FriendsViewModel.swift */; };
259258
DC1E0ECC28771B32005632A3 /* TimetableRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC1E0ECB28771B32005632A3 /* TimetableRepository.swift */; };
260259
DC1E0ECF28772F13005632A3 /* NetworkUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC1E0ECE28772F13005632A3 /* NetworkUtils.swift */; };
@@ -358,7 +357,6 @@
358357
B8EE0C2B2A7DEDCE00CCFFAC /* WIPFriendsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WIPFriendsView.swift; sourceTree = "<group>"; };
359358
B8F0B22F2A4B27A500A2E15E /* UIDevice+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+Ext.swift"; sourceTree = "<group>"; };
360359
B8F0B2312A540A5300A2E15E /* EmailVerificationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmailVerificationView.swift; sourceTree = "<group>"; };
361-
B8F3E4572A7FDD3B00A69CBF /* FriendsScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FriendsScene.swift; sourceTree = "<group>"; };
362360
B8F40EA8289809C60021A2A9 /* LicenseView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LicenseView.swift; sourceTree = "<group>"; };
363361
B8F40EAA28980D730021A2A9 /* AccountSettingScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountSettingScene.swift; sourceTree = "<group>"; };
364362
B8F40EAC28980D840021A2A9 /* TimetableSettingScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimetableSettingScene.swift; sourceTree = "<group>"; };
@@ -513,6 +511,7 @@
513511
CE17DF902A7F43E0000432B8 /* VacancySugangSnuButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VacancySugangSnuButton.swift; sourceTree = "<group>"; };
514512
CE17DF922A7FCB32000432B8 /* VacancyGuidePopup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VacancyGuidePopup.swift; sourceTree = "<group>"; };
515513
CE3384B92A86704100437CC5 /* FriendsService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FriendsService.swift; sourceTree = "<group>"; };
514+
CE3384BB2A893F1B00437CC5 /* FriendsScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FriendsScene.swift; sourceTree = "<group>"; };
516515
CE3F37A829C4CBC6009EDCCC /* TimetableCompactWidgetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimetableCompactWidgetView.swift; sourceTree = "<group>"; };
517516
CE3F37AC29C5D452009EDCCC /* Collection+Getter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Collection+Getter.swift"; sourceTree = "<group>"; };
518517
CE4777F22A6ADCAC00E03253 /* VacancyRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VacancyRepository.swift; sourceTree = "<group>"; };
@@ -537,7 +536,6 @@
537536
CEDDCA812A6AF66D00474D4E /* VacancyState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VacancyState.swift; sourceTree = "<group>"; };
538537
CEDDCA832A6AFBF700474D4E /* VacancyDto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VacancyDto.swift; sourceTree = "<group>"; };
539538
CEEAB49429C5EAA8005497B0 /* TimetableFullWidgetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimetableFullWidgetView.swift; sourceTree = "<group>"; };
540-
CEF420092A62AAA7005C2B1F /* FriendsScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FriendsScene.swift; sourceTree = "<group>"; };
541539
CEF4200E2A62ADE3005C2B1F /* FriendsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FriendsViewModel.swift; sourceTree = "<group>"; };
542540
DC1E0ECB28771B32005632A3 /* TimetableRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimetableRepository.swift; sourceTree = "<group>"; };
543541
DC1E0ECE28772F13005632A3 /* NetworkUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkUtils.swift; sourceTree = "<group>"; };
@@ -1000,11 +998,10 @@
1000998
BEEBDFB9286B3A0C00DB5976 /* TabScene.swift */,
1001999
BE7E230027FF20EE004DC202 /* TimetableScene.swift */,
10021000
CE4777F62A6AE41C00E03253 /* VacancyScene.swift */,
1003-
CEF420092A62AAA7005C2B1F /* FriendsScene.swift */,
1001+
CE3384BB2A893F1B00437CC5 /* FriendsScene.swift */,
10041002
BEDF507227F427FA00CDCC13 /* LectureListScene.swift */,
10051003
BEDF506E27EB744A00CDCC13 /* LectureDetailScene.swift */,
10061004
DC29159E28660F7800FE5F9A /* ReviewScene.swift */,
1007-
B8F3E4572A7FDD3B00A69CBF /* FriendsScene.swift */,
10081005
BEF9233728E84653004AFCB2 /* LectureTimeSheetScene.swift */,
10091006
BE060BD828DF4C1E00A2F1B9 /* OnboardScene.swift */,
10101007
BE28036928E93EEF00B2B1AB /* LoginScene.swift */,
@@ -1385,7 +1382,6 @@
13851382
B87DF6F92918B7AD008BB95B /* PopupState.swift in Sources */,
13861383
B87B316D28D755B6005C170B /* MenuState.swift in Sources */,
13871384
CEA7F1E62A6D096000299BAF /* LectureCellActionButton.swift in Sources */,
1388-
B8F3E4582A7FDD3B00A69CBF /* FriendsScene.swift in Sources */,
13891385
DC29159B2865F95100FE5F9A /* SettingScene.swift in Sources */,
13901386
B88D16FD28AE2E1E00E2D652 /* User.swift in Sources */,
13911387
B8F40EAB28980D730021A2A9 /* AccountSettingScene.swift in Sources */,
@@ -1497,12 +1493,12 @@
14971493
B88D16F328ABC5DD00E2D652 /* String+Ext.swift in Sources */,
14981494
BEDE34D62879A7B800525014 /* DIContainer.swift in Sources */,
14991495
BE9413D228C2458A00171060 /* DateFormatter+Parse.swift in Sources */,
1500-
CEF4200A2A62AAA7005C2B1F /* FriendsScene.swift in Sources */,
15011496
BE9413C328C21D1000171060 /* NotificationRepository.swift in Sources */,
15021497
B87B315E28D5A70F005C170B /* SearchState.swift in Sources */,
15031498
BE060BD728DF43AC00A2F1B9 /* AuthService.swift in Sources */,
15041499
BE682C012888173B009EBCB7 /* TagRouter.swift in Sources */,
15051500
731DA003297BC5740027BA25 /* BookmarkRouter.swift in Sources */,
1501+
CE3384BC2A893F1B00437CC5 /* FriendsScene.swift in Sources */,
15061502
BE682BFB2887FC27009EBCB7 /* SearchTagDto.swift in Sources */,
15071503
CE17DF932A7FCB32000432B8 /* VacancyGuidePopup.swift in Sources */,
15081504
BEB57C2128B6758200279EFF /* Animation+Custom.swift in Sources */,
@@ -1772,7 +1768,7 @@
17721768
"@executable_path/Frameworks",
17731769
"@executable_path/../../Frameworks",
17741770
);
1775-
MARKETING_VERSION = 3.0.0;
1771+
MARKETING_VERSION = 3.2.0;
17761772
PRODUCT_BUNDLE_IDENTIFIER = com.wafflestudio.snutt.dev.widget;
17771773
PRODUCT_NAME = "$(TARGET_NAME)";
17781774
PROVISIONING_PROFILE_SPECIFIER = "match Development com.wafflestudio.snutt.dev.widget";
@@ -1808,7 +1804,7 @@
18081804
"@executable_path/Frameworks",
18091805
"@executable_path/../../Frameworks",
18101806
);
1811-
MARKETING_VERSION = 3.0.0;
1807+
MARKETING_VERSION = 3.2.0;
18121808
OTHER_SWIFT_FLAGS = "";
18131809
PRODUCT_BUNDLE_IDENTIFIER = com.wafflestudio.snutt.dev.widget;
18141810
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1845,7 +1841,7 @@
18451841
"@executable_path/Frameworks",
18461842
"@executable_path/../../Frameworks",
18471843
);
1848-
MARKETING_VERSION = 3.0.0;
1844+
MARKETING_VERSION = 3.2.0;
18491845
PRODUCT_BUNDLE_IDENTIFIER = com.wafflestudio.snutt.dev.widget;
18501846
PRODUCT_NAME = "$(TARGET_NAME)";
18511847
PROVISIONING_PROFILE_SPECIFIER = "match Development com.wafflestudio.snutt.dev.widget";

‎SNUTT-2022/SNUTT/AppState/AppEnvironment.swift‎

Lines changed: 56 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ extension AppEnvironment {
2626
let popupService: PopupServiceProtocol
2727
let etcService: EtcServiceProtocol
2828
let vacancyService: VacancyServiceProtocol
29-
let friendsService: FriendsServiceProtocol
29+
#if FEATURE_RN_FRIENDS
30+
let friendsService: FriendsServiceProtocol
31+
#endif
3032
}
3133
}
3234

@@ -133,19 +135,33 @@ extension AppEnvironment {
133135
let popupService = PopupService(appState: appState, webRepositories: webRepositories, localRepositories: localRepositories)
134136
let etcService = EtcService(appState: appState, webRepositories: webRepositories)
135137
let vacancyService = VacancyService(appState: appState, webRepositories: webRepositories, localRepositories: localRepositories)
136-
let friendsService = FriendsService(appState: appState, webRepositories: webRepositories, localRepositories: localRepositories)
137-
return .init(timetableService: timetableService,
138-
userService: userService,
139-
lectureService: lectureService,
140-
searchService: searchService,
141-
globalUIService: globalUIService,
142-
courseBookService: courseBookService,
143-
authService: authService,
144-
notificationService: notificationService,
145-
popupService: popupService,
146-
etcService: etcService,
147-
vacancyService: vacancyService,
148-
friendsService: friendsService)
138+
#if FEATURE_RN_FRIENDS
139+
let friendsService = FriendsService(appState: appState, webRepositories: webRepositories, localRepositories: localRepositories)
140+
return .init(timetableService: timetableService,
141+
userService: userService,
142+
lectureService: lectureService,
143+
searchService: searchService,
144+
globalUIService: globalUIService,
145+
courseBookService: courseBookService,
146+
authService: authService,
147+
notificationService: notificationService,
148+
popupService: popupService,
149+
etcService: etcService,
150+
vacancyService: vacancyService,
151+
friendsService: friendsService)
152+
#else
153+
return .init(timetableService: timetableService,
154+
userService: userService,
155+
lectureService: lectureService,
156+
searchService: searchService,
157+
globalUIService: globalUIService,
158+
courseBookService: courseBookService,
159+
authService: authService,
160+
notificationService: notificationService,
161+
popupService: popupService,
162+
etcService: etcService,
163+
vacancyService: vacancyService)
164+
#endif
149165
}
150166
}
151167

@@ -163,18 +179,32 @@ extension EnvironmentValues {
163179
#if DEBUG
164180
extension AppEnvironment.Services {
165181
@MainActor static func preview(appState: AppState) -> Self {
166-
.init(timetableService: FakeTimetableService(),
167-
userService: FakeUserService(),
168-
lectureService: FakeLectureService(),
169-
searchService: FakeSearchService(),
170-
globalUIService: GlobalUIService(appState: appState, localRepositories: .init(userDefaultsRepository: UserDefaultsRepository(storage: .preview)), webRepositories: nil),
171-
courseBookService: FakeCourseBookService(),
172-
authService: FakeAuthService(),
173-
notificationService: FakeNotificationService(),
174-
popupService: FakePopupService(),
175-
etcService: FakeEtcService(),
176-
vacancyService: FakeVacancyService(),
177-
friendsService: FakeFriendsService())
182+
#if FEATURE_RN_FRIENDS
183+
.init(timetableService: FakeTimetableService(),
184+
userService: FakeUserService(),
185+
lectureService: FakeLectureService(),
186+
searchService: FakeSearchService(),
187+
globalUIService: GlobalUIService(appState: appState, localRepositories: .init(userDefaultsRepository: UserDefaultsRepository(storage: .preview)), webRepositories: nil),
188+
courseBookService: FakeCourseBookService(),
189+
authService: FakeAuthService(),
190+
notificationService: FakeNotificationService(),
191+
popupService: FakePopupService(),
192+
etcService: FakeEtcService(),
193+
vacancyService: FakeVacancyService(),
194+
friendsService: FakeFriendsService())
195+
#else
196+
.init(timetableService: FakeTimetableService(),
197+
userService: FakeUserService(),
198+
lectureService: FakeLectureService(),
199+
searchService: FakeSearchService(),
200+
globalUIService: GlobalUIService(appState: appState, localRepositories: .init(userDefaultsRepository: UserDefaultsRepository(storage: .preview)), webRepositories: nil),
201+
courseBookService: FakeCourseBookService(),
202+
authService: FakeAuthService(),
203+
notificationService: FakeNotificationService(),
204+
popupService: FakePopupService(),
205+
etcService: FakeEtcService(),
206+
vacancyService: FakeVacancyService())
207+
#endif
178208
}
179209
}
180210
#endif

‎SNUTT-2022/SNUTT/ViewModels/SettingViewModel.swift‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,7 @@ class SettingViewModel: BaseViewModel, ObservableObject {
5858
}
5959

6060
func hasNewBadge(settingName: String) -> Bool {
61-
do {
62-
return services.globalUIService.hasNewBadge(settingName: settingName)
63-
} catch {
64-
return false
65-
}
61+
services.globalUIService.hasNewBadge(settingName: settingName)
6662
}
6763

6864
func setColorScheme(colorScheme: ColorScheme?) {

‎SNUTT-2022/SNUTT/Views/SNUTTView.swift‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ struct SNUTTView: View {
4545
ReviewScene(viewModel: .init(container: viewModel.container), isMainWebView: true)
4646
}
4747
TabScene(tabType: .friends) {
48-
FriendsScene(viewModel: .init(container: viewModel.container))
48+
#if FEATURE_RN_FRIENDS
49+
FriendsScene(viewModel: .init(container: viewModel.container))
50+
#else
51+
FriendsScene()
52+
#endif
4953
}
5054
TabScene(tabType: .settings) {
5155
SettingScene(viewModel: .init(container: viewModel.container))
@@ -72,9 +76,11 @@ struct SNUTTView: View {
7276
group.addTask {
7377
await viewModel.fetchVacancyLectures()
7478
}
75-
group.addTask {
76-
await viewModel.fetchReactNativeBundleIfNeeded()
77-
}
79+
#if FEATURE_RN_FRIENDS
80+
group.addTask {
81+
await viewModel.fetchReactNativeBundleIfNeeded()
82+
}
83+
#endif
7884
})
7985
}
8086

@@ -211,13 +217,15 @@ extension SNUTTView {
211217
}
212218
}
213219

214-
func fetchReactNativeBundleIfNeeded() async {
215-
do {
216-
try await services.friendsService.fetchReactNativeBundleUrl()
217-
} catch {
218-
// pass
220+
#if FEATURE_RN_FRIENDS
221+
func fetchReactNativeBundleIfNeeded() async {
222+
do {
223+
try await services.friendsService.fetchReactNativeBundleUrl()
224+
} catch {
225+
// pass
226+
}
219227
}
220-
}
228+
#endif
221229
}
222230
}
223231

‎SNUTT-2022/SNUTT/Views/Scenes/FriendsScene.swift‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ import ReactNativeKit
99
import SwiftUI
1010

1111
struct FriendsScene: View {
12-
var viewModel: FriendsViewModel
12+
#if FEATURE_RN_FRIENDS
13+
var viewModel: FriendsViewModel
14+
#endif
1315
@State private var bundleUrl: URL?
1416

1517
var body: some View {

0 commit comments

Comments
 (0)