Skip to content

Commit

Permalink
[Merge] branch 'develop' of origin into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@yungu0010
yungu0010 committed Jul 26, 2024
2 parents 2b54335 + 39629a4 commit b944a5e
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 23 deletions.
35 changes: 17 additions & 18 deletions pophory-iOS.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
3B1E30F92C4EA85800E019D9 /* FirebaseDynamicLinks in Frameworks */ = {isa = PBXBuildFile; productRef = 3B1E30F82C4EA85800E019D9 /* FirebaseDynamicLinks */; };
3B1E30FB2C4EA85800E019D9 /* FirebaseRemoteConfig in Frameworks */ = {isa = PBXBuildFile; productRef = 3B1E30FA2C4EA85800E019D9 /* FirebaseRemoteConfig */; };
3B1E31022C4FC57400E019D9 /* SplashViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B1E31012C4FC57400E019D9 /* SplashViewController.swift */; };
3B1E31062C4FDC4C00E019D9 /* SplashView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B1E31052C4FDC4C00E019D9 /* SplashView.swift */; };
3B218EA72B833FA0006959E3 /* AuthInterceptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B218EA62B833FA0006959E3 /* AuthInterceptor.swift */; };
3B3A09132A56A56F00C8A740 /* PhotoDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B3A09122A56A56F00C8A740 /* PhotoDetailView.swift */; };
3B3A09152A56A6C700C8A740 /* PhotoDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B3A09142A56A6C700C8A740 /* PhotoDetailViewController.swift */; };
Expand All @@ -93,6 +92,7 @@
3BD441B62BEB4D7600DC0F3B /* RxSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 3BD441B52BEB4D7600DC0F3B /* RxSwift */; };
3BD441B82BEB4DB200DC0F3B /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = 3BD441B72BEB4DB200DC0F3B /* Sentry */; };
3BD441BC2BEB4E1300DC0F3B /* RxCocoa in Frameworks */ = {isa = PBXBuildFile; productRef = 3BD441BB2BEB4E1300DC0F3B /* RxCocoa */; };
3BE178952C4FF21C00FC755B /* SplashView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE178942C4FF21C00FC755B /* SplashView.swift */; };
6B05C56D2AC4277800A75C00 /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6B05C56C2AC4277800A75C00 /* ShareViewController.swift */; };
6B05C5702AC4277800A75C00 /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6B05C56E2AC4277800A75C00 /* MainInterface.storyboard */; };
6B05C5742AC4277800A75C00 /* ShareExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 6B05C56A2AC4277800A75C00 /* ShareExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
Expand Down Expand Up @@ -310,7 +310,6 @@
3B149AB92C4D4B2C00F1832B /* RootViewSwitcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootViewSwitcher.swift; sourceTree = "<group>"; };
3B1E30F12C4EA60200E019D9 /* FirebaseService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirebaseService.swift; sourceTree = "<group>"; };
3B1E31012C4FC57400E019D9 /* SplashViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplashViewController.swift; sourceTree = "<group>"; };
3B1E31052C4FDC4C00E019D9 /* SplashView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SplashView.swift; path = "pophory-iOS/Screen/Splash/View/SplashView.swift"; sourceTree = SOURCE_ROOT; };
3B218EA62B833FA0006959E3 /* AuthInterceptor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthInterceptor.swift; sourceTree = "<group>"; };
3B3A09122A56A56F00C8A740 /* PhotoDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoDetailView.swift; sourceTree = "<group>"; };
3B3A09142A56A6C700C8A740 /* PhotoDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoDetailViewController.swift; sourceTree = "<group>"; };
Expand All @@ -329,6 +328,7 @@
3B9492292AF0525000AACAD1 /* Shared.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
3BBBEA312BE371A4005CD7A5 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
3BC03E8F2AEB902F006CF499 /* WebViewURLList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebViewURLList.swift; sourceTree = "<group>"; };
3BE178942C4FF21C00FC755B /* SplashView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplashView.swift; sourceTree = "<group>"; };
6B05C56A2AC4277800A75C00 /* ShareExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = ShareExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
6B05C56C2AC4277800A75C00 /* ShareViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareViewController.swift; sourceTree = "<group>"; };
6B05C56F2AC4277800A75C00 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainInterface.storyboard; sourceTree = "<group>"; };
Expand Down Expand Up @@ -745,21 +745,12 @@
3B1E30FE2C4FC53000E019D9 /* Splash */ = {
isa = PBXGroup;
children = (
3BE178932C4FF1A600FC755B /* View */,
3B1E31002C4FC56600E019D9 /* ViewController */,
3B1E30FF2C4FC55F00E019D9 /* View */,
);
path = Splash;
sourceTree = "<group>";
};
3B1E30FF2C4FC55F00E019D9 /* View */ = {
isa = PBXGroup;
children = (
3B1E31052C4FDC4C00E019D9 /* SplashView.swift */,
);
name = View;
path = "퍋ㅈ";
sourceTree = "<group>";
};
3B1E31002C4FC56600E019D9 /* ViewController */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -825,6 +816,14 @@
path = ViewModel;
sourceTree = "<group>";
};
3BE178932C4FF1A600FC755B /* View */ = {
isa = PBXGroup;
children = (
3BE178942C4FF21C00FC755B /* SplashView.swift */,
);
path = View;
sourceTree = "<group>";
};
6B05C56B2AC4277800A75C00 /* ShareExtension */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1757,12 +1756,12 @@
6BA49DEE2A66EF3000414CBF /* AddPhotoNetworkManager.swift in Sources */,
91F3A7662A52A87E00C06D1B /* FetchStudiosResponseDTO.swift in Sources */,
B1D029832A5DA7AF000B5B53 /* MyPageNetworkManager.swift in Sources */,
3BE178952C4FF21C00FC755B /* SplashView.swift in Sources */,
91F3A7B02A52F97700C06D1B /* AlbumDetailViewController.swift in Sources */,
B1631F5D2A175F9C0050974F /* Date+Extension.swift in Sources */,
37310F142A5535B20046E777 /* PickAlbumButtonCollectionViewCell.swift in Sources */,
3782F4322A51E6D200FE3846 /* KeyboardManager.swift in Sources */,
6B5EF4E32A8FF87600D20E04 /* UIImage+Extension.swift in Sources */,
3B1E31062C4FDC4C00E019D9 /* SplashView.swift in Sources */,
9127800E2A67BF510005BBA3 /* EditAlbumViewController.swift in Sources */,
3782F4462A52F4BF00FE3846 /* OnboardingContentCollectionViewCell.swift in Sources */,
B1F310EB2A629B1600BF989B /* PopupType.swift in Sources */,
Expand Down Expand Up @@ -2042,7 +2041,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 1.4.0;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CQJ9UKUU35;
Expand All @@ -2064,7 +2063,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.3.1;
MARKETING_VERSION = 1.4.0;
PRODUCT_BUNDLE_IDENTIFIER = "Team.pophory-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -2089,7 +2088,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 1.4.0;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = CQJ9UKUU35;
Expand All @@ -2111,7 +2110,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.3.1;
MARKETING_VERSION = 1.4.0;
PRODUCT_BUNDLE_IDENTIFIER = "Team.pophory-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -2331,7 +2330,7 @@
repositoryURL = "https://github.com/getsentry/sentry-cocoa";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 8.25.0;
minimumVersion = 8.26.0;
};
};
3BE3FAC02BE38E8500CF61A1 /* XCRemoteSwiftPackageReference "Moya" */ = {
Expand Down
4 changes: 2 additions & 2 deletions pophory-iOS.xcodeproj/xcshareddata/xcschemes/pophory-Release.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
</TestAction>
<LaunchAction
buildConfiguration = "Release"
selectedDebuggerIdentifier = ""
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
3 changes: 1 addition & 2 deletions pophory-iOS/Network/Intercep색/AuthInterceptor.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ final class AuthInterceptor: RequestInterceptor {
return
}
default:
// TODO: - 갱신 실패 로그인화면으로 전환

RootViewSwitcher.shared.setRootView(.onboarding)
completion(.doNotRetryWithError(error))
}
}
Expand Down
2 changes: 1 addition & 1 deletion pophory-iOS/Network/Repository/DefaultAuthRepository.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Moya

final class DefaultAuthRepository: BaseRepository, AuthRepository {

let provider = MoyaProvider<AuthAPI>(session: Session(interceptor: AuthInterceptor.shared), plugins: [MoyaLoggerPlugin()])
let provider = MoyaProvider<AuthAPI>(plugins: [MoyaLoggerPlugin()])

func submitAppleAuthorizationCode(code: String, completion: @escaping (NetworkResult<Any>) -> Void) {
provider.request(.postAuthorizationCode(authorizationCode: code)) { result in
Expand Down

0 comments on commit b944a5e

Please sign in to comment.