From a7783934e657d4767182924a41d97ec7191b3bfa Mon Sep 17 00:00:00 2001 From: L-j-h-c Date: Wed, 19 Apr 2023 22:56:37 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[Feat]=20#188=20-=20=EB=B9=84=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=EC=9D=BC=20=EA=B2=BD=EC=9A=B0=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=EC=A0=9D=ED=8A=B8=20=ED=83=AD=20=EC=8B=9C=20sopt=20org=20proje?= =?UTF-8?q?ct=EB=A1=9C=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Core/Sources/Literals/ExternalURL.swift | 4 ++++ .../Sources/MainScene/VC/MainVC.swift | 21 ++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/SOPT-iOS/Projects/Core/Sources/Literals/ExternalURL.swift b/SOPT-iOS/Projects/Core/Sources/Literals/ExternalURL.swift index 1a8cf1f64..65fafa6c9 100644 --- a/SOPT-iOS/Projects/Core/Sources/Literals/ExternalURL.swift +++ b/SOPT-iOS/Projects/Core/Sources/Literals/ExternalURL.swift @@ -19,6 +19,10 @@ public struct ExternalURL { public static let findEmail = "https://forms.gle/XkVFMUPsWWV1DXU38" } + public struct SOPT { + public static let project = "https://sopt.org/project" + } + public struct Playground { #if DEV || PROD public static let main = "https://playground.sopt.org" diff --git a/SOPT-iOS/Projects/Features/MainFeature/Sources/MainScene/VC/MainVC.swift b/SOPT-iOS/Projects/Features/MainFeature/Sources/MainScene/VC/MainVC.swift index b45735bf3..5e8e735e9 100644 --- a/SOPT-iOS/Projects/Features/MainFeature/Sources/MainScene/VC/MainVC.swift +++ b/SOPT-iOS/Projects/Features/MainFeature/Sources/MainScene/VC/MainVC.swift @@ -216,17 +216,16 @@ extension MainVC: UICollectionViewDelegate { self.navigationController?.pushViewController(viewController, animated: true) return } - - let safariViewController = SFSafariViewController(url: URL(string: service.serviceDomainLink)!) - safariViewController.playgroundStyle() - self.present(safariViewController, animated: true) - + + var needOfficialProject = service == .project && viewModel.userType == .visitor + let serviceDomainURL = needOfficialProject + ? ExternalURL.SOPT.project + : service.serviceDomainLink + showSafariVC(url: serviceDomainURL) case (2, _): guard let service = viewModel.otherServiceList[safe: indexPath.item] else { return } - let safariViewController = SFSafariViewController(url: URL(string: service.serviceDomainLink)!) - safariViewController.playgroundStyle() - self.present(safariViewController, animated: true) + showSafariVC(url: service.serviceDomainLink) case(3, _): guard viewModel.userType != .visitor && viewModel.userType != .unregisteredInactive else { return } @@ -234,6 +233,12 @@ extension MainVC: UICollectionViewDelegate { default: break } } + + private func showSafariVC(url: String) { + let safariViewController = SFSafariViewController(url: URL(string: url)!) + safariViewController.playgroundStyle() + self.present(safariViewController, animated: true) + } } // MARK: - UICollectionViewDataSource From 490bd6690797b3223b5b66f8172ce1f57dd8cfe5 Mon Sep 17 00:00:00 2001 From: L-j-h-c Date: Wed, 19 Apr 2023 23:20:35 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[Feat]=20#188=20-=20=EB=B9=84=ED=99=9C?= =?UTF-8?q?=EB=8F=99=20=ED=94=8C=EA=B7=B8=20=EB=AF=B8=EB=93=B1=EB=A1=9D=20?= =?UTF-8?q?=EC=9C=A0=EC=A0=80=20=EC=84=A4=EC=A0=95=20=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EB=B6=84=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppMyPageViewController.swift | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/SOPT-iOS/Projects/Features/AppMyPageFeature/Sources/AppMypageScene/AppMyPageViewController.swift b/SOPT-iOS/Projects/Features/AppMyPageFeature/Sources/AppMypageScene/AppMyPageViewController.swift index 1abc70f10..201da57b0 100644 --- a/SOPT-iOS/Projects/Features/AppMyPageFeature/Sources/AppMypageScene/AppMyPageViewController.swift +++ b/SOPT-iOS/Projects/Features/AppMyPageFeature/Sources/AppMypageScene/AppMyPageViewController.swift @@ -139,6 +139,16 @@ public final class AppMyPageVC: UIViewController, AppMyPageViewControllable { frame: self.view.frame ) + // MARK: For UnregisteredInActive + + private lazy var etcForUnregisteredInActiveSectionGroup = MypageSectionGroupView( + headerTitle: I18N.MyPage.etcSectionGroupTitle, + subviews: [ + self.logoutListItem, + ], + frame: self.view.frame + ) + public init( userType: UserType, viewModel: AppMyPageViewModel, @@ -182,11 +192,17 @@ extension AppMyPageVC { self.soptampSectionGroup, self.etcSectionGroup ) - case .visitor, .unregisteredInactive: + case .visitor: self.contentStackView.addArrangedSubviews( self.servicePolicySectionGroup, self.etcForVisitorsSectionGroup ) + + case .unregisteredInactive: + self.contentStackView.addArrangedSubviews( + self.servicePolicySectionGroup, + self.etcForUnregisteredInActiveSectionGroup + ) } } From b62d882a9dae258b7242e9daa994af131512d6f8 Mon Sep 17 00:00:00 2001 From: L-j-h-c Date: Wed, 19 Apr 2023 23:30:26 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[Chore]=20#188=20-=20=EB=B6=88=ED=95=84?= =?UTF-8?q?=EC=9A=94=ED=95=9C=20=ED=8C=8C=EC=9D=BC=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xcshareddata/IDEWorkspaceChecks.plist | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 SOPT-Stamp-iOS/SOPT-iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/SOPT-Stamp-iOS/SOPT-iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/SOPT-Stamp-iOS/SOPT-iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003..000000000 --- a/SOPT-Stamp-iOS/SOPT-iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - From c18e1a26372679502a54bd917bd82d1b02923184 Mon Sep 17 00:00:00 2001 From: L-j-h-c Date: Thu, 20 Apr 2023 06:41:57 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[Fix]=20#188=20-=20=EC=95=84=EC=B9=B4?= =?UTF-8?q?=EC=9D=B4=EB=B8=8C=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectDescriptionHelpers/SettingsDictionary+.swift | 2 +- SOPT-iOS/Tuist/Dependencies.swift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SOPT-iOS/Plugins/EnvPlugin/ProjectDescriptionHelpers/SettingsDictionary+.swift b/SOPT-iOS/Plugins/EnvPlugin/ProjectDescriptionHelpers/SettingsDictionary+.swift index e707153de..0a0a62d19 100644 --- a/SOPT-iOS/Plugins/EnvPlugin/ProjectDescriptionHelpers/SettingsDictionary+.swift +++ b/SOPT-iOS/Plugins/EnvPlugin/ProjectDescriptionHelpers/SettingsDictionary+.swift @@ -17,7 +17,7 @@ public extension SettingsDictionary { static let baseSettings: Self = [ "OTHER_LDFLAGS" : [ - "-Xlinker -interposable" + "$(inherited)" ] ] diff --git a/SOPT-iOS/Tuist/Dependencies.swift b/SOPT-iOS/Tuist/Dependencies.swift index 49042f1dd..7c42f5f16 100644 --- a/SOPT-iOS/Tuist/Dependencies.swift +++ b/SOPT-iOS/Tuist/Dependencies.swift @@ -14,12 +14,12 @@ let spm = SwiftPackageManagerDependencies([ .remote(url: "https://github.com/SnapKit/SnapKit.git", requirement: .upToNextMinor(from: "5.0.0")), .remote(url: "https://github.com/Moya/Moya.git", requirement: .upToNextMajor(from: "15.0.0")), .remote(url: "https://github.com/devxoul/Then", requirement: .upToNextMajor(from: "2")), - .remote(url: "https://github.com/onevcat/Kingfisher.git", requirement: .upToNextMajor(from: "7.0.0")), + .remote(url: "https://github.com/onevcat/Kingfisher.git", requirement: .upToNextMajor(from: "7.6.2")), .remote(url: "https://github.com/FLEXTool/FLEX.git", requirement: .upToNextMajor(from: "4.3.0")), .remote(url: "https://github.com/krzysztofzablocki/Inject.git", requirement: .upToNextMajor(from: "1.0.5")), .remote(url: "https://github.com/Quick/Quick.git", requirement: .upToNextMajor(from: "5.0.0")), .remote(url: "https://github.com/Quick/Nimble.git", requirement: .upToNextMajor(from: "10.0.0")), - .remote(url: "https://github.com/airbnb/lottie-ios", requirement: .upToNextMajor(from: "3.0.0")) + .remote(url: "https://github.com/airbnb/lottie-ios", requirement: .upToNextMajor(from: "4.1.3")) ], baseSettings: Settings.settings( configurations: XCConfig.framework ))