Skip to content

Commit

Permalink
Merge pull request #84 from Team-Clody/feat/#83-testServer
Browse files Browse the repository at this point in the history
Feat [#83] test server 반영
  • Loading branch information
kim-seonwoo authored Sep 6, 2024
2 parents 3287b92 + bda8790 commit eec9306
Show file tree
Hide file tree
Showing 23 changed files with 117 additions and 169 deletions.
32 changes: 10 additions & 22 deletions Clody_iOS/Clody_iOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
objects = {

/* Begin PBXBuildFile section */
0B03B1A02C86D2AD00144596 /* waitingLody.json in Resources */ = {isa = PBXBuildFile; fileRef = 0B03B19F2C86D2AD00144596 /* waitingLody.json */; };
0B17F8052C368465008A9998 /* DailyCalendarCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B17F8042C368465008A9998 /* DailyCalendarCollectionViewCell.swift */; };
0B190F0B2C380F5300D46CFC /* DateFormatter+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B190F0A2C380F5300D46CFC /* DateFormatter+.swift */; };
0B190F0D2C38111500D46CFC /* CalendarDailyModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B190F0C2C38111500D46CFC /* CalendarDailyModel.swift */; };
0B20F3DD2C2C4DAA00F8D62D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B20F3DC2C2C4DAA00F8D62D /* AppDelegate.swift */; };
0B20F3DF2C2C4DAA00F8D62D /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B20F3DE2C2C4DAA00F8D62D /* SceneDelegate.swift */; };
0B20F3E12C2C4DAA00F8D62D /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B20F3E02C2C4DAA00F8D62D /* ViewController.swift */; };
0B20F3E62C2C4DAB00F8D62D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0B20F3E52C2C4DAB00F8D62D /* Assets.xcassets */; };
0B20F3E92C2C4DAB00F8D62D /* Base in Resources */ = {isa = PBXBuildFile; fileRef = 0B20F3E82C2C4DAB00F8D62D /* Base */; };
0B3DC0882C6CD77C0021AC61 /* ClodyErrorRetryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B3DC0872C6CD77C0021AC61 /* ClodyErrorRetryView.swift */; };
Expand Down Expand Up @@ -57,11 +57,11 @@
0B72DA2E2C46C13E00292173 /* NotificationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B72DA2D2C46C13E00292173 /* NotificationViewModel.swift */; };
0B72DA302C46C16000292173 /* NotificationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B72DA2F2C46C16000292173 /* NotificationView.swift */; };
0B72DA342C46C18F00292173 /* NotificationCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B72DA332C46C18F00292173 /* NotificationCell.swift */; };
0B7B25D62C6276C200FCA10D /* waitingLody.json in Resources */ = {isa = PBXBuildFile; fileRef = 0B7B25D52C6276C200FCA10D /* waitingLody.json */; };
0BAAC64E2C43BFD900174A9D /* DeleteBottomSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BAAC64D2C43BFD900174A9D /* DeleteBottomSheetView.swift */; };
0BAAC6532C43D74D00174A9D /* ClodyToast.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BAAC6522C43D74D00174A9D /* ClodyToast.swift */; };
0BAAC6552C43D77B00174A9D /* ClodyToastView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BAAC6542C43D77B00174A9D /* ClodyToastView.swift */; };
0BABF7BE2C722313005A5CA1 /* AppVersionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BABF7BD2C722313005A5CA1 /* AppVersionManager.swift */; };
0BB898262C85BBBB0082F87B /* RevokeResponseDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BB898252C85BBBB0082F87B /* RevokeResponseDTO.swift */; };
0BC373532C3FCC2600C45072 /* ViewModelType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0BC373522C3FCC2600C45072 /* ViewModelType.swift */; };
0BC373562C3FCF0F00C45072 /* RxKeyboard in Frameworks */ = {isa = PBXBuildFile; productRef = 0BC373552C3FCF0F00C45072 /* RxKeyboard */; };
0BC373592C4003A900C45072 /* RxGesture in Frameworks */ = {isa = PBXBuildFile; productRef = 0BC373582C4003A900C45072 /* RxGesture */; };
Expand Down Expand Up @@ -139,7 +139,6 @@
95310FA62C41D97E00023C7B /* SplashViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95310FA52C41D97E00023C7B /* SplashViewController.swift */; };
95310FAB2C42D9EC00023C7B /* ReplyDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95310FAA2C42D9EC00023C7B /* ReplyDetailViewController.swift */; };
95310FAD2C42D9FB00023C7B /* ReplyDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95310FAC2C42D9FB00023C7B /* ReplyDetailView.swift */; };
95310FB02C42E0CB00023C7B /* ReplyDetailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95310FAF2C42E0CB00023C7B /* ReplyDetailModel.swift */; };
95310FB22C434E0B00023C7B /* ReplyWaitingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95310FB12C434E0B00023C7B /* ReplyWaitingView.swift */; };
95310FB42C434E1E00023C7B /* ReplyWaitingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95310FB32C434E1E00023C7B /* ReplyWaitingViewController.swift */; };
95310FB72C43B07100023C7B /* ReplyWaitingViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95310FB62C43B07100023C7B /* ReplyWaitingViewModel.swift */; };
Expand All @@ -155,13 +154,13 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
0B03B19F2C86D2AD00144596 /* waitingLody.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = waitingLody.json; sourceTree = "<group>"; };
0B17F8042C368465008A9998 /* DailyCalendarCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DailyCalendarCollectionViewCell.swift; sourceTree = "<group>"; };
0B190F0A2C380F5300D46CFC /* DateFormatter+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DateFormatter+.swift"; sourceTree = "<group>"; };
0B190F0C2C38111500D46CFC /* CalendarDailyModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarDailyModel.swift; sourceTree = "<group>"; };
0B20F3D92C2C4DAA00F8D62D /* Clody_iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Clody_iOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
0B20F3DC2C2C4DAA00F8D62D /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
0B20F3DE2C2C4DAA00F8D62D /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
0B20F3E02C2C4DAA00F8D62D /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
0B20F3E52C2C4DAB00F8D62D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
0B20F3E82C2C4DAB00F8D62D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
0B20F3EA2C2C4DAB00F8D62D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand Down Expand Up @@ -203,11 +202,11 @@
0B72DA2D2C46C13E00292173 /* NotificationViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationViewModel.swift; sourceTree = "<group>"; };
0B72DA2F2C46C16000292173 /* NotificationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationView.swift; sourceTree = "<group>"; };
0B72DA332C46C18F00292173 /* NotificationCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationCell.swift; sourceTree = "<group>"; };
0B7B25D52C6276C200FCA10D /* waitingLody.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = waitingLody.json; sourceTree = "<group>"; };
0BAAC64D2C43BFD900174A9D /* DeleteBottomSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeleteBottomSheetView.swift; sourceTree = "<group>"; };
0BAAC6522C43D74D00174A9D /* ClodyToast.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClodyToast.swift; sourceTree = "<group>"; };
0BAAC6542C43D77B00174A9D /* ClodyToastView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClodyToastView.swift; sourceTree = "<group>"; };
0BABF7BD2C722313005A5CA1 /* AppVersionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppVersionManager.swift; sourceTree = "<group>"; };
0BB898252C85BBBB0082F87B /* RevokeResponseDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RevokeResponseDTO.swift; sourceTree = "<group>"; };
0BC373522C3FCC2600C45072 /* ViewModelType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModelType.swift; sourceTree = "<group>"; };
0BCD4FA22C35B59C006390D2 /* Clody_iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Clody_iOS.entitlements; sourceTree = "<group>"; };
0BDF13BF2C7D612800BA2E7C /* Config_Dev.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Config_Dev.xcconfig; sourceTree = "<group>"; };
Expand Down Expand Up @@ -276,7 +275,6 @@
95310FA52C41D97E00023C7B /* SplashViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplashViewController.swift; sourceTree = "<group>"; };
95310FAA2C42D9EC00023C7B /* ReplyDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyDetailViewController.swift; sourceTree = "<group>"; };
95310FAC2C42D9FB00023C7B /* ReplyDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyDetailView.swift; sourceTree = "<group>"; };
95310FAF2C42E0CB00023C7B /* ReplyDetailModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyDetailModel.swift; sourceTree = "<group>"; };
95310FB12C434E0B00023C7B /* ReplyWaitingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyWaitingView.swift; sourceTree = "<group>"; };
95310FB32C434E1E00023C7B /* ReplyWaitingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyWaitingViewController.swift; sourceTree = "<group>"; };
95310FB62C43B07100023C7B /* ReplyWaitingViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReplyWaitingViewModel.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -342,7 +340,6 @@
0BFCC5BF2C2E8C0000B5E0DB /* Global */,
0BFCC5C92C2E8D6700B5E0DB /* Network */,
0BFCC5D02C2E8E3600B5E0DB /* Presentation */,
0B20F3E02C2C4DAA00F8D62D /* ViewController.swift */,
0B20F3EA2C2C4DAB00F8D62D /* Info.plist */,
95310F892C401A1F00023C7B /* GoogleService-Info.plist */,
2CB129422C47F2CC009D1480 /* Config.xcconfig */,
Expand Down Expand Up @@ -390,6 +387,7 @@
0BE7E9FF2C4664EC000C5358 /* LoginRequestDTO.swift */,
0BE7EA012C466524000C5358 /* LoginResponseDTO.swift */,
0BE7EA032C4665FC000C5358 /* TokenRefreshResponseDTO.swift */,
0BB898252C85BBBB0082F87B /* RevokeResponseDTO.swift */,
);
path = AuthModel;
sourceTree = "<group>";
Expand Down Expand Up @@ -584,7 +582,7 @@
0BFCC5C32C2E8C4600B5E0DB /* Resources */ = {
isa = PBXGroup;
children = (
0B7B25D52C6276C200FCA10D /* waitingLody.json */,
0B03B19F2C86D2AD00144596 /* waitingLody.json */,
0BE7EA182C46AE25000C5358 /* replyLody.json */,
0BFCC5C62C2E8C9C00B5E0DB /* Font */,
0B20F3E52C2C4DAB00F8D62D /* Assets.xcassets */,
Expand Down Expand Up @@ -857,7 +855,6 @@
isa = PBXGroup;
children = (
95310FB52C43B06600023C7B /* ViewModels */,
95310FAE2C42E0BD00023C7B /* Models */,
95310FA92C42D98900023C7B /* ViewControllers */,
95310FA82C42D98400023C7B /* Views */,
);
Expand All @@ -882,14 +879,6 @@
path = ViewControllers;
sourceTree = "<group>";
};
95310FAE2C42E0BD00023C7B /* Models */ = {
isa = PBXGroup;
children = (
95310FAF2C42E0CB00023C7B /* ReplyDetailModel.swift */,
);
path = Models;
sourceTree = "<group>";
};
95310FB52C43B06600023C7B /* ViewModels */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1030,7 +1019,7 @@
files = (
0BE7EA192C46AE25000C5358 /* replyLody.json in Resources */,
0B20F3E62C2C4DAB00F8D62D /* Assets.xcassets in Resources */,
0B7B25D62C6276C200FCA10D /* waitingLody.json in Resources */,
0B03B1A02C86D2AD00144596 /* waitingLody.json in Resources */,
0B20F3E92C2C4DAB00F8D62D /* Base in Resources */,
2CE3AB2F2C36E9F50042085A /* Pretendard-Regular.otf in Resources */,
2C0B3C862C30DD55002EB1A3 /* Pretendard-Medium.otf in Resources */,
Expand Down Expand Up @@ -1104,8 +1093,6 @@
0BE7E9F12C4636DE000C5358 /* CalendarMonthlyResponseDTO.swift in Sources */,
0BFCC5DA2C2E8F0200B5E0DB /* CalendarModel.swift in Sources */,
0B4A1BC62C45401500E31EC4 /* MoyaPlugin.swift in Sources */,
0B20F3E12C2C4DAA00F8D62D /* ViewController.swift in Sources */,
95310FB02C42E0CB00023C7B /* ReplyDetailModel.swift in Sources */,
95310FAD2C42D9FB00023C7B /* ReplyDetailView.swift in Sources */,
95310F922C40706600023C7B /* NicknameView.swift in Sources */,
2CE637912C3D56C300B6EC6D /* AccountViewModel.swift in Sources */,
Expand Down Expand Up @@ -1158,6 +1145,7 @@
0BC373532C3FCC2600C45072 /* ViewModelType.swift in Sources */,
0BE7EA0F2C466AEE000C5358 /* PostAlarmSetResponseDTO.swift in Sources */,
0B20F3DF2C2C4DAA00F8D62D /* SceneDelegate.swift in Sources */,
0BB898262C85BBBB0082F87B /* RevokeResponseDTO.swift in Sources */,
2CE6378D2C3D56A700B6EC6D /* AccountView.swift in Sources */,
2CC0CE732C3C0ED9001F3E6B /* MyPageTableViewCell.swift in Sources */,
0B72DA342C46C18F00292173 /* NotificationCell.swift in Sources */,
Expand Down Expand Up @@ -1328,7 +1316,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.0;
MARKETING_VERSION = 1.0.2;
PRODUCT_BUNDLE_IDENTIFIER = com.Clody.Clody;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -1364,7 +1352,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.0;
MARKETING_VERSION = 1.0.2;
PRODUCT_BUNDLE_IDENTIFIER = com.Clody.Clody;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
2 changes: 0 additions & 2 deletions Clody_iOS/Clody_iOS/Application/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// 파이어베이스 Meesaging 설정
Messaging.messaging().delegate = self

AppVersionManager.shared.checkForUpdate()

return true
}

Expand Down
9 changes: 8 additions & 1 deletion Clody_iOS/Clody_iOS/Application/SceneDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,19 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
window.makeKeyAndVisible()
self.window = window

AppVersionManager.shared.checkForUpdateAndProceed { [weak self] shouldProceed in
guard shouldProceed else { return }
self?.proceedToNextViewController()
}
}

func proceedToNextViewController() {
DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
DispatchQueue.main.async {
if UserManager.shared.hasAccessToken {
self.window?.rootViewController = UINavigationController(rootViewController: CalendarViewController())
} else {
self.window?.rootViewController = UINavigationController(rootViewController: LoginViewController())
self.window?.rootViewController = UINavigationController(rootViewController: LoginViewController())
}
}
}
Expand Down
Loading

0 comments on commit eec9306

Please sign in to comment.