Merge pull request #192 from L-j-h-c/feature/#188-visitorProjectPage

[Feat] #188 - 비활동 프로필 미등록 유저 프로젝트 및 마이페이지 분기
sopt-makers · Apr 19, 2023 · 319dcf6 · 319dcf6
2 parents 0ebebef + c18e1a2
commit 319dcf6
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 20 deletions.
diff --git a/SOPT-Stamp-iOS/SOPT-iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/SOPT-Stamp-iOS/SOPT-iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
diff --git 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/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/...S/Projects/Features/AppMyPageFeature/Sources/AppMypageScene/AppMyPageViewController.swift b/...S/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
+            )
         }
     }
 

diff --git a/SOPT-iOS/Projects/Features/MainFeature/Sources/MainScene/VC/MainVC.swift b/SOPT-iOS/Projects/Features/MainFeature/Sources/MainScene/VC/MainVC.swift
@@ -216,24 +216,29 @@ 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 }
 
           presentSoptampFeature()
       default: break
       }
     }
+
+    private func showSafariVC(url: String) {
+        let safariViewController = SFSafariViewController(url: URL(string: url)!)
+        safariViewController.playgroundStyle()
+        self.present(safariViewController, animated: true)
+    }
 }
 
 // MARK: - UICollectionViewDataSource

diff --git 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
 ))