Skip to content

[IDLE-000] 테스트플라이트 첫번쨰 배포 #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import ProjectDescription
public enum DeploymentSettings {

/// SceneDelegate를 지원하는 iOS 13이상 버전을 요구합니다.
public static let deployment_version = DeploymentTargets.iOS("13.0")
public static let platform = Destinations.iOS
public static let productName = "Caremeet"
public static let deployment_version = DeploymentTargets.iOS("15.0")
public static let platforms: Set = [Destination.iPad, Destination.iPhone]
public static let workspace_name = "idle_workspace"
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ import ProjectDescription
public enum IdleInfoPlist {

public static let appDefault: InfoPlist = .extendingDefault(with: [

"CFBundleDisplayName": "케어밋",

"NSAppTransportSecurity" : [
"NSAllowsArbitraryLoads" : true
],
"UILaunchStoryboardName": "LaunchScreen.storyboard",
"CFBundleDisplayName" : "$(BUNDLE_DISPLAY_NAME)",
"UIApplicationSceneManifest": [
"UIApplicationSupportsMultipleScenes": false,
"UISceneConfigurations": [
Expand All @@ -27,7 +29,16 @@ public enum IdleInfoPlist {
]
],

"NMFClientId": "$(NAVER_API_CLIENT_ID)"
// 멀티 스크린 미지원
"UIRequiresFullScreen": true,

"NMFClientId": "$(NAVER_API_CLIENT_ID)",

// 앱추적 허용 메세지
"NSUserTrackingUsageDescription": "사용자 맞춤 서비스 제공을 위해 권한을 허용해 주세요. 권한을 허용하지 않을 경우, 앱 사용에 제약이 있을 수 있습니다.",

// 네트워크 사용 메세지
"NSLocalNetworkUsageDescription": "이 앱은 로컬 네트워크를 통해 서버에 연결하여 데이터를 주고받기 위해 로컬 네트워크 접근 권한이 필요합니다."
])

public static let exampleAppDefault: InfoPlist = .extendingDefault(with: [
Expand Down
7 changes: 4 additions & 3 deletions project/Projects/App/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ let project = Project(
/// Application
.target(
name: "Idle-iOS",
destinations: DeploymentSettings.platform,
destinations: DeploymentSettings.platforms,
product: .app,
productName: DeploymentSettings.productName,
bundleId: "$(PRODUCT_BUNDLE_IDENTIFIER)",
deploymentTargets: DeploymentSettings.deployment_version,
infoPlist: IdleInfoPlist.appDefault,
Expand Down Expand Up @@ -48,9 +49,9 @@ let project = Project(
/// UnitTests
.target(
name: "IdleAppTests",
destinations: DeploymentSettings.platform,
destinations: DeploymentSettings.platforms,
product: .unitTests,
bundleId: "com.idle-application.test",
bundleId: "com.idleApplication.test",
deploymentTargets: DeploymentSettings.deployment_version,
sources: ["Tests/**"],
dependencies: [.target(name: "Idle-iOS")]
Expand Down
33 changes: 31 additions & 2 deletions project/Projects/App/Sources/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
//

import UIKit
import AppTrackingTransparency
import AdSupport
import PresentationCore

@main
class AppDelegate: UIResponder, UIApplicationDelegate {
Expand All @@ -14,6 +17,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
DispatchQueue.main.asyncAfter(deadline: .now() + 1.0, execute: { [weak self] in
self?.requestTrackingAuthorization()
})

return true
}

Expand All @@ -31,6 +38,28 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// Use this method to release any resources that were specific to the discarded scenes, as they will not return.
}


private func requestTrackingAuthorization() {
ATTrackingManager.requestTrackingAuthorization(completionHandler: { status in
switch status {
case .authorized:
// Tracking authorization dialog was shown
// and we are authorized
printIfDebug("앱추적권한: Authorized")

// 추적을 허용한 사용자 식별자
printIfDebug(ASIdentifierManager.shared().advertisingIdentifier)
case .denied:
// Tracking authorization dialog was
// shown and permission is denied
printIfDebug("앱추적권한: Denied")
case .notDetermined:
// Tracking authorization dialog has not been shown
printIfDebug("앱추적권한: Not Determined")
case .restricted:
printIfDebug("앱추적권한: Restricted")
@unknown default:
printIfDebug("앱추적권한: Unknown")
}
})
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -367,8 +367,6 @@ extension ApplyType {
switch self {
case .phoneCall:
"CALLING"
case .message:
"MESSAGE"
case .app:
"APP"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,6 @@ extension ApplyType {
switch text {
case "CALLING":
return .phoneCall
case "MESSAGE":
return .message
case "APP":
return .app
default:
Expand Down
6 changes: 3 additions & 3 deletions project/Projects/Data/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ let project = Project(
/// RepositoryConcrete
.target(
name: "ConcreteRepository",
destinations: DeploymentSettings.platform,
destinations: DeploymentSettings.platforms,
product: .staticLibrary,
bundleId: "$(PRODUCT_BUNDLE_IDENTIFIER)",
deploymentTargets: DeploymentSettings.deployment_version,
Expand All @@ -40,7 +40,7 @@ let project = Project(
/// ConcreteTests
.target(
name: "ConcretesTests",
destinations: DeploymentSettings.platform,
destinations: DeploymentSettings.platforms,
product: .unitTests,
bundleId: "$(PRODUCT_BUNDLE_IDENTIFIER)",
deploymentTargets: DeploymentSettings.deployment_version,
Expand All @@ -57,7 +57,7 @@ let project = Project(
/// DataSource
.target(
name: "DataSource",
destinations: DeploymentSettings.platform,
destinations: DeploymentSettings.platforms,
product: .staticLibrary,
bundleId: "$(PRODUCT_BUNDLE_IDENTIFIER)",
deploymentTargets: DeploymentSettings.deployment_version,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,9 @@ public class DefaultRecruitmentPostUseCase: RecruitmentPostUseCase {
requestCnt: postCount
)
case .thirdParty:

// TODO: ‼️ ‼️워크넷 가져오기 미구현
fatalError()
return .just(.failure(.notImplemented))
}
}

Expand Down
6 changes: 6 additions & 0 deletions project/Projects/Domain/Entity/Error/DomainError.swift
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ public enum DomainError: Error {
case undefinedCode
case undefinedError

// Not Implemented
case notImplemented

public init(code: String) {
switch code {
case "API-001":
Expand Down Expand Up @@ -198,6 +201,9 @@ public enum DomainError: Error {

case .undefinedCode, .undefinedError:
return "예기치 않은 오류가 발생했습니다. 잠시 후 다시 시도해주세요."

case .notImplemented:
return "아직 개발되지 않은 기능입니다."
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ public class ApplicationDetailStateObject: NSCopying {
mockObject.experiencePreferenceType = .beginnerPossible
mockObject.applyType = [
.app : true,
.message : false,
.phoneCall : false
]
mockObject.applyDeadlineType = .untilApplicationFinished
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,12 @@ public enum ExperiencePreferenceType: Int, CaseIterable {

public enum ApplyType: Int, CaseIterable {
case phoneCall
case message
case app

public var korTextForBtn: String {
switch self {
case .phoneCall:
"전화 지원"
case .message:
"문자 지원"
case .app:
"어플 지원"
}
Expand All @@ -41,8 +38,6 @@ public enum ApplyType: Int, CaseIterable {
switch self {
case .phoneCall:
"전화"
case .message:
"문자"
case .app:
"어플"
}
Expand Down
10 changes: 5 additions & 5 deletions project/Projects/Domain/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ let project = Project(
/// UseCaseConcrete type
.target(
name: "ConcreteUseCase",
destinations: DeploymentSettings.platform,
destinations: DeploymentSettings.platforms,
product: .staticLibrary,
bundleId: "$(PRODUCT_BUNDLE_IDENTIFIER)",
deploymentTargets: DeploymentSettings.deployment_version,
Expand All @@ -40,7 +40,7 @@ let project = Project(
/// Concrete type Test
.target(
name: "ConcreteUseCaseTests",
destinations: DeploymentSettings.platform,
destinations: DeploymentSettings.platforms,
product: .unitTests,
bundleId: "$(PRODUCT_BUNDLE_IDENTIFIER)",
deploymentTargets: DeploymentSettings.deployment_version,
Expand All @@ -61,7 +61,7 @@ let project = Project(
/// Domain interface
.target(
name: "UseCaseInterface",
destinations: DeploymentSettings.platform,
destinations: DeploymentSettings.platforms,
product: .framework,
bundleId: "$(PRODUCT_BUNDLE_IDENTIFIER)",
deploymentTargets: DeploymentSettings.deployment_version,
Expand All @@ -80,7 +80,7 @@ let project = Project(
/// Repository interface
.target(
name: "RepositoryInterface",
destinations: DeploymentSettings.platform,
destinations: DeploymentSettings.platforms,
product: .framework,
bundleId: "$(PRODUCT_BUNDLE_IDENTIFIER)",
deploymentTargets: DeploymentSettings.deployment_version,
Expand All @@ -100,7 +100,7 @@ let project = Project(
/// Entity
.target(
name: "Entity",
destinations: DeploymentSettings.platform,
destinations: DeploymentSettings.platforms,
product: .framework,
bundleId: "$(PRODUCT_BUNDLE_IDENTIFIER)",
deploymentTargets: DeploymentSettings.deployment_version,
Expand Down
4 changes: 2 additions & 2 deletions project/Projects/Presentation/DSKit/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ let proejct = Project(
targets: [
.target(
name: "DSKit",
destinations: DeploymentSettings.platform,
destinations: DeploymentSettings.platforms,
product: .framework,
bundleId: "$(PRODUCT_BUNDLE_IDENTIFIER)",
deploymentTargets: DeploymentSettings.deployment_version,
Expand All @@ -42,7 +42,7 @@ let proejct = Project(
// Component를 테스트하는 Example타겟
.target(
name: "DSKitExampleApp",
destinations: DeploymentSettings.platform,
destinations: DeploymentSettings.platforms,
product: .app,
bundleId: "$(PRODUCT_BUNDLE_IDENTIFIER)",
deploymentTargets: DeploymentSettings.deployment_version,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

import UIKit
import AuthFeature
import ConcreteUseCase
import ConcreteRepository

class SceneDelegate: UIResponder, UIWindowSceneDelegate {

Expand Down
4 changes: 2 additions & 2 deletions project/Projects/Presentation/Feature/Auth/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ let project = Project(
/// FeatureConcrete
.target(
name: "AuthFeature",
destinations: DeploymentSettings.platform,
destinations: DeploymentSettings.platforms,
product: .staticFramework,
bundleId: "$(PRODUCT_BUNDLE_IDENTIFIER)",
deploymentTargets: DeploymentSettings.deployment_version,
Expand All @@ -37,7 +37,7 @@ let project = Project(
/// FeatureConcrete ExampleApp
.target(
name: "Auth_ExampleApp",
destinations: DeploymentSettings.platform,
destinations: DeploymentSettings.platforms,
product: .app,
bundleId: "$(PRODUCT_BUNDLE_IDENTIFIER)",
deploymentTargets: DeploymentSettings.deployment_version,
Expand Down
8 changes: 2 additions & 6 deletions project/Projects/Presentation/Feature/Base/Project.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ let project = Project(
/// FeatureConcrete
.target(
name: "BaseFeature",
destinations: DeploymentSettings.platform,
destinations: DeploymentSettings.platforms,
product: .staticFramework,
bundleId: "$(PRODUCT_BUNDLE_IDENTIFIER)",
deploymentTargets: DeploymentSettings.deployment_version,
Expand All @@ -34,10 +34,6 @@ let project = Project(
// Domain
D.Domain.UseCaseInterface,
D.Domain.RepositoryInterface,

// For Test
D.Domain.ConcreteUseCase,
D.Data.ConcreteRepository,

// ThirdParty
D.ThirdParty.RxSwift,
Expand All @@ -52,7 +48,7 @@ let project = Project(
/// FeatureConcrete ExampleApp
.target(
name: "Base_ExampleApp",
destinations: DeploymentSettings.platform,
destinations: DeploymentSettings.platforms,
product: .app,
bundleId: "$(PRODUCT_BUNDLE_IDENTIFIER)",
deploymentTargets: DeploymentSettings.deployment_version,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ public class ApplicationDetailViewContentView: UIView {
.deadlineString?
.drive(onNext: { [calendarOpenButton] str in
calendarOpenButton.textLabel.textString = str
calendarOpenButton.textLabel.attrTextColor = DSColor.gray900.color
})
.disposed(by: disposeBag)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ public class NativePostDetailForWorkerVM: BaseViewModel ,NativePostDetailForWork
getPostDetailFailureAlert,
applyRequestFailureAlert
)
.subscribe(alert)
.subscribe(self.alert)
.disposed(by: disposeBag)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ open class BaseViewController: UIViewController {
public extension BaseViewController {

func showAlert(vo: DefaultAlertContentVO, onClose: (() -> ())? = nil) {

guard let _ = self.parent else { return }

let alert = UIAlertController(
title: vo.title,
message: vo.message,
Expand Down Expand Up @@ -87,6 +90,8 @@ public extension BaseViewController {

func showDefaultLoadingScreen() {

guard let _ = self.parent else { return }

let vc = DefaultLoadingVC()
loadingVC = vc
vc.modalPresentationStyle = .overFullScreen
Expand Down
Loading
Loading