🚀 :: Deploy version 1.2.0 to AppStore

Team-return · Oct 6, 2023 · 93cef4a · 93cef4a
2 parents 1f7e1fa + 30d2a93
commit 93cef4a
Show file tree

Hide file tree

Showing 38 changed files with 335 additions and 235 deletions.
diff --git a/Makefile b/Makefile
@@ -10,6 +10,9 @@ clean:
 	rm -rf **/*.xcodeproj
 	rm -rf *.xcworkspace
 
+cache_clean:
+	rm -rf ~/Library/Developer/Xcode/DerivedData/*
+
 reset:
 	tuist clean
 	rm -rf **/*.xcodeproj

diff --git a/Plugin/DependencyPlugin/ProjectDescriptionHelpers/Dependency+Target.swift b/Plugin/DependencyPlugin/ProjectDescriptionHelpers/Dependency+Target.swift
@@ -282,6 +282,10 @@ public extension TargetDependency.Core {
 }
 
 public extension TargetDependency.Shared {
+    static let Environment = TargetDependency.project(
+        target: ModulePaths.Shared.Environment.targetName(type: .sources),
+        path: .relativeToShared(ModulePaths.Shared.Environment.rawValue)
+    )
     static let DesignSystem = TargetDependency.project(
         target: ModulePaths.Shared.DesignSystem.targetName(type: .sources),
         path: .relativeToShared(ModulePaths.Shared.DesignSystem.rawValue)

diff --git a/Plugin/DependencyPlugin/ProjectDescriptionHelpers/ModulePaths.swift b/Plugin/DependencyPlugin/ProjectDescriptionHelpers/ModulePaths.swift
@@ -65,6 +65,7 @@ public extension ModulePaths {
 
 public extension ModulePaths {
     enum Shared: String {
+        case Environment
         case DesignSystem
         case UtilityModule
         case GlobalThirdPartyLibrary

diff --git a/Projects/App/Support/Info.plist b/Projects/App/Support/Info.plist
@@ -4,8 +4,6 @@
 <dict>
 	<key>AppIdentifierPrefix</key>
 	<string>$(AppIdentifierPrefix)</string>
-	<key>BASE_URL</key>
-	<string>$(API_BASE_URL)</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -21,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.2</string>
+	<string>1.2.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>

diff --git a/Projects/Domain/BaseDomain/Derived/InfoPlists/BaseDomain-Info.plist b/Projects/Domain/BaseDomain/Derived/InfoPlists/BaseDomain-Info.plist
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>BASE_URL</key>
-	<string>$(API_BASE_URL)</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>

diff --git a/Projects/Domain/BaseDomain/Project.swift b/Projects/Domain/BaseDomain/Project.swift
@@ -13,9 +13,7 @@ let project = Project.makeModule(
     internalDependencies: [
         .Core.JwtStoreInterface,
         .Shared.GlobalThirdPartyLibrary,
-        .Shared.UtilityModule
-    ],
-    additionalPlistRows: [
-        "BASE_URL": .string("$(API_BASE_URL)")
+        .Shared.UtilityModule,
+        .Shared.Environment
     ]
 )
diff --git a/Projects/Domain/BaseDomain/Sources/JobisAPI.swift b/Projects/Domain/BaseDomain/Sources/JobisAPI.swift
@@ -1,5 +1,6 @@
 import Foundation
 import Moya
+import Environment
 
 public protocol JobisAPI: TargetType, JwtAuthorizable {
     associatedtype ErrorType: Error
@@ -9,11 +10,7 @@ public protocol JobisAPI: TargetType, JwtAuthorizable {
 }
 
 public extension JobisAPI {
-    var baseURL: URL {
-        URL(
-            string: Bundle.main.object(forInfoDictionaryKey: "BASE_URL") as? String ?? ""
-        ) ?? URL(string: "https://www.google.com")!
-    }
+    var baseURL: URL { Environment.getUrlValue(key: .apiBaseUrl) }
 
     var path: String {
         domain.asURLString + urlPath

diff --git a/Projects/Domain/RecruitmentsDomain/Interface/Entity/RecruitmentEntity.swift b/Projects/Domain/RecruitmentsDomain/Interface/Entity/RecruitmentEntity.swift
@@ -8,7 +8,7 @@ public struct RecruitmentEntity: Equatable, Hashable {
     public let military: Bool
     public let totalHiring: Int
     public let jobCodeList: String
-    public let bookmarked: Bool
+    public var bookmarked: Bool
 
     public init(
         recruitID: Int,

diff --git a/Projects/Feature/MyPageFeature/Sources/MyPage/MyPageView.swift b/Projects/Feature/MyPageFeature/Sources/MyPage/MyPageView.swift
@@ -36,25 +36,21 @@ struct MyPageView: View {
         ScrollView {
             VStack(spacing: 40) {
                 HStack(spacing: 22) {
-                    VStack {
-                        ZStack(alignment: .bottomTrailing) {
-                            Group {
-                                URLImage(
-                                    imageURL: viewModel.studentInfo?.profileImageUrl ?? "",
-                                    shape: .square(85)
-                                )
-                            }
-                            .frame(width: 85, height: 85)
+                    ZStack(alignment: .bottomTrailing) {
+                        URLImage(
+                            imageURL: viewModel.studentInfo?.profileImageUrl ?? "",
+                            shape: .square(85)
+                        )
+                        .frame(width: 85, height: 85)
+                        .clipShape(Circle())
+
+                        Image(systemName: "pencil.circle.fill")
+                            .resizable()
+                            .frame(width: 26, height: 26)
+                            .foregroundColor(.Main.lightBlue)
+                            .background(Color.white)
                             .clipShape(Circle())
-
-                            Image(systemName: "pencil.circle.fill")
-                                .resizable()
-                                .frame(width: 26, height: 26)
-                                .foregroundColor(.Main.lightBlue)
-                                .background(Color.white)
-                                .clipShape(Circle())
-                                .unredacted()
-                        }
+                            .unredacted()
                     }
                     .onTapGesture {
                         viewModel.isShowImagePicker.toggle()

diff --git a/Projects/Feature/RecruitmentFeature/Sources/Detail/RecruitmentDetailView.swift b/Projects/Feature/RecruitmentFeature/Sources/Detail/RecruitmentDetailView.swift
@@ -25,58 +25,57 @@ struct RecruitmentDetailView: View {
     var body: some View {
         ZStack {
             if let detailInfo = viewModel.recruitmentDetail {
-                ScrollView {
-                    LazyVStack(alignment: .leading, spacing: 10) {
-                        HStack(spacing: 12) {
-                            URLImage(imageURL: detailInfo.companyProfileUrl, shape: .square(80))
-                                .cornerRadius(15)
-
-                            Text(detailInfo.companyName)
-                                .JOBISFont(.body(.body1), color: .Sub.gray90)
-                        }
-                        .padding(.bottom, 2)
 
-                        if !isDetail {
-                            GrayBtn(text: "기업 보기", size: .large) {
-                                viewModel.isNavigateCompanyDetail.toggle()
+                VStack {
+                    ScrollView {
+                        LazyVStack(alignment: .leading, spacing: 10) {
+                            HStack(spacing: 12) {
+                                URLImage(imageURL: detailInfo.companyProfileUrl, shape: .square(80))
+                                    .cornerRadius(15)
+
+                                Text(detailInfo.companyName)
+                                    .JOBISFont(.body(.body1), color: .Sub.gray90)
+                            }
+                            .padding(.bottom, 2)
+
+                            if !isDetail {
+                                GrayBtn(text: "기업 보기", size: .large) {
+                                    viewModel.isNavigateCompanyDetail.toggle()
+                                }
+                                .navigate(
+                                    to: findCompanyDetailFactory.makeView(
+                                        id: String(detailInfo.companyID),
+                                        isDetail: true
+                                    ).eraseToAnyView(),
+                                    when: $viewModel.isNavigateCompanyDetail
+                                )
                             }
-                            .navigate(
-                                to: findCompanyDetailFactory.makeView(
-                                    id: String(detailInfo.companyID),
-                                    isDetail: true
-                                ).eraseToAnyView(),
-                                when: $viewModel.isNavigateCompanyDetail
-                            )
-                        }
 
-                        Divider()
-                            .foregroundColor(.Sub.gray40)
+                            Divider()
+                                .foregroundColor(.Sub.gray40)
 
-                        VStack(alignment: .leading, spacing: 10) {
-                            recruitmentInfoCell(
-                                title: "모집기간",
-                                content: detailInfo.startDate + " ~ " + detailInfo.endDate
-                            )
+                            VStack(alignment: .leading, spacing: 10) {
+                                recruitmentInfoCell(
+                                    title: "모집기간",
+                                    content: detailInfo.startDate + " ~ " + detailInfo.endDate
+                                )
 
-                            areaView(areas: detailInfo.areas)
+                                areaView(areas: detailInfo.areas)
 
-                            ForEach(Array(zip(viewModel.titles, viewModel.contents)), id: \.0) { title, content in
-                                recruitmentInfoCell(title: title, content: content)
+                                ForEach(Array(zip(viewModel.titles, viewModel.contents)), id: \.0) { title, content in
+                                    recruitmentInfoCell(title: title, content: content)
+                                }
                             }
                         }
+                        .padding(.horizontal, 20)
                     }
-                    .padding(.bottom, 100)
-                    .padding(.horizontal, 20)
-                }
-
-                VStack {
-                    Spacer()
 
                     SolidBtn(text: "지원하기", size: .large) {
                         viewModel.isTappedApplyButton.toggle()
                     }
+                    .padding(.vertical, 10)
+                    .padding(.horizontal, 20)
                 }
-                .padding(.horizontal, 20)
 
                 Color.black
                     .opacity(viewModel.isTappedApplyButton ? 0.2 : 0)
@@ -100,6 +99,7 @@ struct RecruitmentDetailView: View {
                     .frame(maxHeight: .infinity)
             }
         }
+        .frame(maxHeight: .infinity)
         .navigationBarTitleDisplayMode(.inline)
         .onAppear {
             viewModel.onAppear()

diff --git a/Projects/Feature/RecruitmentFeature/Sources/Recruitment/Components/RecruitmentListCell.swift b/Projects/Feature/RecruitmentFeature/Sources/Recruitment/Components/RecruitmentListCell.swift
@@ -5,23 +5,26 @@ import DesignSystem
 import Kingfisher
 
 struct RecruitmentListCell: View {
-    @State private var isBookmarked: Bool = false
-    let recruitmentEntity: RecruitmentEntity
+    @Binding var recruitmentEntitys: [RecruitmentEntity]
+    let index: Int
     let bookmark: () -> Void
 
     private let recruitmentDetailFactory: any RecruitmentDetailFactory
 
     init(
-        recruitmentEntity: RecruitmentEntity,
+        recruitmentEntitys: Binding<[RecruitmentEntity]>,
+        index: Int,
         recruitmentDetailFactory: any RecruitmentDetailFactory,
         bookmark: @escaping () -> Void
     ) {
-        self.recruitmentEntity = recruitmentEntity
+        _recruitmentEntitys = recruitmentEntitys
+        self.index = index
         self.bookmark = bookmark
         self.recruitmentDetailFactory = recruitmentDetailFactory
     }
 
     var body: some View {
+        let recruitmentEntity = recruitmentEntitys[index]
         NavigationLink {
             recruitmentDetailFactory.makeView(
                 id: "\(recruitmentEntity.recruitID)", isDetail: false
@@ -33,7 +36,7 @@ struct RecruitmentListCell: View {
                     .cornerRadius(15)
                     .padding(8)
 
-                VStack(alignment: .leading, spacing: 4) {
+                VStack(alignment: .leading, spacing: 0) {
                     Text(recruitmentEntity.jobCodeList)
                         .multilineTextAlignment(.leading)
                         .JOBISFont(.body(.body2), color: .Sub.gray90)
@@ -42,25 +45,28 @@ struct RecruitmentListCell: View {
                         .JOBISFont(.etc(.caption), color: .Sub.gray60)
 
                     Spacer()
+
+                    Text("실습 수당 \(recruitmentEntity.trainPay.intComma())만원")
+                        .JOBISFont(.etc(.caption), color: .Sub.gray70)
                 }
                 .padding(.leading, 8)
-                .padding(.top, 14)
+                .padding(.vertical, 14)
 
                 Spacer()
 
                 VStack {
-                    JOBISIcon(self.isBookmarked ? .bookmarkOn : .bookmarkOff)
+                    JOBISIcon(recruitmentEntity.bookmarked ? .bookmarkOn : .bookmarkOff)
                         .frame(width: 12, height: 16)
                         .padding(5)
                         .onTapGesture {
-                            isBookmarked.toggle()
+                            recruitmentEntitys[index].bookmarked.toggle()
                             bookmark()
                         }
 
                     Spacer()
 
                     JOBISIcon(.militaryServiceExceptionIcon)
-                        .frame(width: 16, height: 16)
+                        .frame(width: 20, height: 20)
                         .opacity(recruitmentEntity.military ? 1 : 0)
                 }
                 .padding(.vertical, 14)
@@ -70,9 +76,6 @@ struct RecruitmentListCell: View {
             .background(Color.Sub.gray10)
             .cornerRadius(15)
             .shadow(color: .black, opacity: 0.1, blur: 4)
-            .onAppear {
-                self.isBookmarked = self.recruitmentEntity.bookmarked
-            }
         }
     }
 }
diff --git a/Projects/Feature/RecruitmentFeature/Sources/Recruitment/RecruitmentView.swift b/Projects/Feature/RecruitmentFeature/Sources/Recruitment/RecruitmentView.swift
@@ -24,9 +24,22 @@ struct RecruitmentView: View {
             LazyVStack {
                 searchBar()
 
-                if let list = viewModel.recruitmentList {
-                    ForEach(list.recruitments, id: \.self) { recruitmentEntity in
-                        navigateToRecruitmentDetail(recruitmentEntity: recruitmentEntity)
+                if !viewModel.recruitmentList.recruitments.isEmpty {
+                    ForEach(0..<viewModel.recruitmentList.recruitments.count, id: \.self) { index in
+                        Button {
+                            viewModel.isNavigateRecruitmentDetail.toggle()
+                        } label: {
+                            RecruitmentListCell(
+                                recruitmentEntitys: $viewModel.recruitmentList.recruitments,
+                                index: index,
+                                recruitmentDetailFactory: recruitmentDetailFactory
+                            ) {
+                                viewModel.bookmark(id: viewModel.recruitmentList.recruitments[index].recruitID)
+                            }
+                        }
+                        .onAppear {
+                            viewModel.appendRecruitmentList(list: viewModel.recruitmentList.recruitments[index])
+                        }
                     }
                 } else {
                     ProgressView().progressViewStyle(.circular)
@@ -92,21 +105,4 @@ struct RecruitmentView: View {
         .listRowSeparator(.hidden)
         .listRowBackground(Color.clear)
     }
-
-    @ViewBuilder
-    func navigateToRecruitmentDetail(recruitmentEntity: RecruitmentEntity) -> some View {
-        Button {
-            viewModel.isNavigateRecruitmentDetail.toggle()
-        } label: {
-            RecruitmentListCell(
-                recruitmentEntity: recruitmentEntity,
-                recruitmentDetailFactory: recruitmentDetailFactory
-            ) {
-                viewModel.bookmark(id: recruitmentEntity.recruitID)
-            }
-        }
-        .onAppear {
-            viewModel.appendRecruitmentList(list: recruitmentEntity)
-        }
-    }
 }
diff --git a/Projects/Feature/RecruitmentFeature/Sources/Recruitment/RecruitmentViewModel.swift b/Projects/Feature/RecruitmentFeature/Sources/Recruitment/RecruitmentViewModel.swift
@@ -21,7 +21,7 @@ final class RecruitmentViewModel: BaseViewModel {
     @Published var filteringName: String = ""
     @Published var listPage: Int = 1
 
-    @Published var recruitmentList: RecruitmentListEntity?
+    @Published var recruitmentList: RecruitmentListEntity = .init(recruitments: [])
     @Published var selectedJobCode: CodeEntity? {
         didSet {
             fetchCodeList(codeType: .tech, code: selectedJobCode?.code)
@@ -75,7 +75,7 @@ final class RecruitmentViewModel: BaseViewModel {
     }
 
     func appendRecruitmentList(list: RecruitmentEntity) {
-        guard self.recruitmentList?.recruitments.last == list else { return }
+        guard self.recruitmentList.recruitments.last == list else { return }
         var jobCode: String? {
             guard let selectedJobCode = selectedJobCode?.code else { return nil }
             return String(selectedJobCode)
@@ -90,7 +90,7 @@ final class RecruitmentViewModel: BaseViewModel {
                 name: companyText.isEmpty ? nil : companyText
             )
         ) { [weak self] recruitmentList in
-            self?.recruitmentList?.recruitments.append(contentsOf: recruitmentList.recruitments)
+            self?.recruitmentList.recruitments.append(contentsOf: recruitmentList.recruitments)
         }
     }