Skip to content
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
10 changes: 0 additions & 10 deletions Data/Sources/Dependencies/DataSource.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ import Dependencies
// MARK: - VersionDataSource DI

public enum VersionDataSourceKey: TestDependencyKey {
#if DEBUG
public static let testValue: VersionDataSource = EmptyVersionDataSource()
#endif
}

public extension DependencyValues {
Expand All @@ -26,9 +24,7 @@ public extension DependencyValues {
// MARK: - RecipeDataSource DI

public enum RecipeDataSourceKey: TestDependencyKey {
#if DEBUG
public static let testValue: RecipeDataSource = EmptyRecipeDataSource()
#endif
}

public extension DependencyValues {
Expand All @@ -41,9 +37,7 @@ public extension DependencyValues {
// MARK: - RecipePreviewDataSource DI

public enum RecipePreviewDataSourceKey: TestDependencyKey {
#if DEBUG
public static let testValue: RecipePreviewDataSource = EmptyRecipePreviewDataSource()
#endif
}

public extension DependencyValues {
Expand All @@ -56,9 +50,7 @@ public extension DependencyValues {
// MARK: - OnboardingDataSource DI

public enum OnboardingDataSourceKey: TestDependencyKey {
#if DEBUG
public static let testValue: OnboardingDataSource = EmptyOnboardingDataSource()
#endif
}

public extension DependencyValues {
Expand All @@ -71,9 +63,7 @@ public extension DependencyValues {
// MARK: - LanguageDataSource

public enum LanguageDataSourceKey: TestDependencyKey {
#if DEBUG
public static let testValue: LanguageDataSource = EmptyLanguageDataSource()
#endif
}

public extension DependencyValues {
Expand Down
12 changes: 0 additions & 12 deletions Data/Sources/Dependencies/Repository.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ import Dependencies
// MARK: - IntroRepository DI

public enum IntroRepositoryKey: TestDependencyKey {
#if DEBUG
public static let testValue: IntroRepository = EmptyIntroRepository()
#endif
}

public extension DependencyValues {
Expand All @@ -27,9 +25,7 @@ public extension DependencyValues {
// MARK: - RecipeConversionRepository DI

public enum RecipeConversionRepositoryKey: TestDependencyKey {
#if DEBUG
public static let testValue: RecipeConversionRepository = EmptyRecipeConversionRepository()
#endif
}

public extension DependencyValues {
Expand All @@ -42,9 +38,7 @@ public extension DependencyValues {
// MARK: - RecipeDetailRepository DI

public enum RecipeDetailRepositoryKey: TestDependencyKey {
#if DEBUG
public static let testValue: RecipeDetailRepository = EmptyRecipeDetailRepository()
#endif
}

public extension DependencyValues {
Expand All @@ -57,9 +51,7 @@ public extension DependencyValues {
// MARK: - RecipePreviewRepository DI

public enum RecipePreviewRepositoryKey: TestDependencyKey {
#if DEBUG
public static let testValue: RecipePreviewRepository = EmptyRecipePreviewRepository()
#endif
}

public extension DependencyValues {
Expand All @@ -72,9 +64,7 @@ public extension DependencyValues {
// MARK: - OnboardingRepository DI

public enum OnboardingRepositoryKey: TestDependencyKey {
#if DEBUG
public static let testValue: OnboardingRepository = EmptyOnboardingRepository()
#endif
}

public extension DependencyValues {
Expand All @@ -87,9 +77,7 @@ public extension DependencyValues {
// MARK: - LanguageRepository DI

public enum LanguageRepositoryKey: TestDependencyKey {
#if DEBUG
public static let testValue: LanguageRepository = EmptyLanguageRepository()
#endif
}

public extension DependencyValues {
Expand Down
36 changes: 0 additions & 36 deletions Domain/Sources/Dependencies/UseCase.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ import Dependencies
// MARK: - IntroUseCase DI

public enum IntroUseCaseKey: TestDependencyKey {
#if DEBUG
public static let testValue: any IntroUseCase = EmptyIntroUseCase()
#endif
}

public extension DependencyValues {
Expand All @@ -25,9 +23,7 @@ public extension DependencyValues {
// MARK: - FetchConvertedPreviewUseCase DI

public enum FetchConvertedRecipeIDUseCaseKey: TestDependencyKey {
#if DEBUG
public static let testValue: FetchConvertedRecipeIDUseCase = EmptyFetchConvertedPreviewUseCase()
#endif
}

public extension DependencyValues {
Expand All @@ -40,9 +36,7 @@ public extension DependencyValues {
// MARK: - FetchRecipeDetailUseCase DI

public enum FetchRecipeDetailUseCaseKey: TestDependencyKey {
#if DEBUG
public static let testValue: FetchRecipeDetailUseCase = EmptyFetchRecipeDetailUseCase()
#endif
}

public extension DependencyValues {
Expand All @@ -55,9 +49,7 @@ public extension DependencyValues {
// MARK: - FetchRecipePreviewUseCase DI

public enum FetchRecipePreviewUseCaseKey: TestDependencyKey {
#if DEBUG
public static let testValue: FetchRecipePreviewUseCase = EmptyFetchRecipePreviewUseCase()
#endif
}

public extension DependencyValues {
Expand All @@ -70,9 +62,7 @@ public extension DependencyValues {
// MARK: - FetchRecipePreviewUseCase DI

public enum FetchRecipePreviewsUseCaseKey: TestDependencyKey {
#if DEBUG
public static let testValue: FetchRecipePreviewsUseCase = EmptyFetchRecipePreviewsUseCase()
#endif
}

public extension DependencyValues {
Expand All @@ -85,9 +75,7 @@ public extension DependencyValues {
// MARK: - LaunchOnboardingCheckUseCase DI

public enum LaunchOnboardingCheckUseCaseKey: TestDependencyKey {
#if DEBUG
public static let testValue: LaunchOnboardingCheckUseCase = EmptyLaunchOnboardingCheckUseCase()
#endif
}

public extension DependencyValues {
Expand All @@ -100,9 +88,7 @@ public extension DependencyValues {
// MARK: - LaunchOnboardingCompleteUseCase DI

public enum LaunchOnboardingCompleteUseCaseKey: TestDependencyKey {
#if DEBUG
public static let testValue: LaunchOnboardingCompleteUseCase = EmptyLaunchOnboardingCompleteUseCase()
#endif
}

public extension DependencyValues {
Expand All @@ -115,9 +101,7 @@ public extension DependencyValues {
// MARK: - CookingOnboardingCheckUseCase DI

public enum CookingOnboardingCheckUseCaseKey: TestDependencyKey {
#if DEBUG
public static let testValue: CookingOnboardingCheckUseCase = EmptyCookingOnboardingCheckUseCase()
#endif
}

public extension DependencyValues {
Expand All @@ -130,9 +114,7 @@ public extension DependencyValues {
// MARK: - CookingOnboardingCompleteUseCase DI

public enum CookingOnboardingCompleteUseCaseKey: TestDependencyKey {
#if DEBUG
public static let testValue: CookingOnboardingCompleteUseCase = EmptyCookingOnboardingCompleteUseCase()
#endif
}

public extension DependencyValues {
Expand All @@ -145,9 +127,7 @@ public extension DependencyValues {
// MARK: - FetchUILanguageUseCase DI

public enum FetchUILanguageUseCaseKey: TestDependencyKey {
#if DEBUG
public static let testValue: FetchUILanguageUseCase = EmptyFetchUILanguageUseCase()
#endif
}

public extension DependencyValues {
Expand All @@ -160,9 +140,7 @@ public extension DependencyValues {
// MARK: - SetUILanguageUseCase DI

public enum SetUILanguageUseCaseKey: TestDependencyKey {
#if DEBUG
public static var testValue: SetUILanguageUseCase = EmptySetUILanguageUseCase()
#endif
}

public extension DependencyValues {
Expand All @@ -175,9 +153,7 @@ public extension DependencyValues {
// MARK: - FetchConversionLanguageUseCase DI

public enum FetchConversionLanguageUseCaseKey: TestDependencyKey {
#if DEBUG
public static var testValue: FetchConversionLanguageUseCase = EmptyFetchConversionLanguageUseCase()
#endif
}

public extension DependencyValues {
Expand All @@ -192,9 +168,7 @@ public extension DependencyValues {
// MARK: - SetConversionLanguageUseCase DI

public enum SetConversionLanguageUseCaseKey: TestDependencyKey {
#if DEBUG
public static var testValue: SetConversionLanguageUseCase = EmptySetConversionLanguageUseCase()
#endif
}

public extension DependencyValues {
Expand All @@ -207,9 +181,7 @@ public extension DependencyValues {
// MARK: - FetchOnboardingImageUseCase DI

public enum FetchOnboardingImageUseCaseKey: TestDependencyKey {
#if DEBUG
public static var testValue: FetchOnboardingImageUseCase = EmptyFetchOnboardingImageUseCase()
#endif
}

public extension DependencyValues {
Expand All @@ -222,9 +194,7 @@ public extension DependencyValues {
// MARK: - FetchCompletedRecipeConversionIDsUseCase DI

public enum FetchCompletedRecipeConversionIDsUseCaseKey: TestDependencyKey {
#if DEBUG
public static var testValue: FetchCompletedRecipeConversionIDsUseCase = EmptyFetchCompletedRecipeConversionIDsUseCase()
#endif
}

public extension DependencyValues {
Expand All @@ -237,9 +207,7 @@ public extension DependencyValues {
// MARK: - FetchRecipeStateUseCase DI

public enum FetchRecipeStateUseCaseKey: TestDependencyKey {
#if DEBUG
public static var testValue: FetchRecipeStateUseCase = EmptyFetchRecipeStateUseCase()
#endif
}

public extension DependencyValues {
Expand All @@ -252,9 +220,7 @@ public extension DependencyValues {
// MARK: - DeleteRecipeUseCase DI

public enum DeleteRecipeUseCaseKey: TestDependencyKey {
#if DEBUG
public static var testValue: DeleteRecipeUseCase = EmptyDeleteRecipeUseCase()
#endif
}

public extension DependencyValues {
Expand All @@ -267,9 +233,7 @@ public extension DependencyValues {
// MARK: - ClearRecipePreviewCacheUseCase DI

public enum ClearRecipePreviewCacheUseCaseKey: TestDependencyKey {
#if DEBUG
public static var testValue: ClearRecipePreviewCacheUseCase = EmptyClearRecipePreviewCacheUseCase()
#endif
}

public extension DependencyValues {
Expand Down
2 changes: 0 additions & 2 deletions Login/Sources/Dependencies/LoginManagerDependency.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ import Dependencies
import Foundation

public enum LoginManagerKey: TestDependencyKey {
#if DEBUG
public static let testValue: LoginManager = EmptyLoginManager()
#endif
}

public extension DependencyValues {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import Entity
import Foundation
import UIKit
import Logger
import Minifire

@Reducer
struct ConversionProcessReducer {
Expand Down Expand Up @@ -38,6 +39,9 @@ struct ConversionProcessReducer {
case pollResponse(RecipeStateViewData)
case loadCompletedRecipe

case appDidEnterBackground
case appWillEnterForeground

case showError(ErrorDisplayType)
case clearError

Expand Down Expand Up @@ -87,6 +91,13 @@ struct ConversionProcessReducer {
}
}

case .appDidEnterBackground:
return .send(.stopPolling)

case .appWillEnterForeground:
guard state.recipeConversionID != nil else { return .none }
return .send(.startPolling)

case .showError(let errorType):
state.errorState.showError(errorType)
return .none
Expand Down Expand Up @@ -134,7 +145,7 @@ private extension ConversionProcessReducer {
func reduceStartPolling() -> Effect<Action> {
return .run { send in
for await _ in Timer
.publish(every: 5, on: .main, in: .common)
.publish(every: 5, on: .main, in: .default)
.autoconnect()
.values {
await send(.pollTick)
Expand Down Expand Up @@ -232,3 +243,9 @@ extension ConversionProcessReducer {
case navigateToFailed
}
}

extension MFError: @retroactive LocalizedError {
public var errorDescription: String? {
self.description
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import SwiftUI

struct ConversionProcessView: View {
@Bindable var store: StoreOf<ConversionProcessReducer>
@Environment(\.scenePhase) private var scenePhase

var body: some View {
VStack(spacing: 0) {
Expand All @@ -26,6 +27,20 @@ struct ConversionProcessView: View {
.onAppear {
store.send(.onAppear)
}
.onChange(of: scenePhase) { oldPhase, newPhase in
switch newPhase {
case .background:
print(">>> background")
store.send(.appDidEnterBackground)
case .active:
print(">>> foreground")
store.send(.appWillEnterForeground)
case .inactive:
break
@unknown default:
break
}
}
.errorDialog(
title: store.errorState.dialogTitle,
message: store.errorState.dialogMessage,
Expand Down
Loading
Loading