로그인 - 온보딩 쪽 디자인 & 기능 완성

Encrypted/XCConfig/App/PROD.xcconfig.encrypted

@@ -1 +1 @@
-�d��BJؠ���LH�
8�v2c�����mH �"?^F1Xn�o^�|�т�2x>�SFgtmz \���Ԍ����uQ&=O��pV��fa�zuc)�!����wW�0+SXl>7{�mD@
���Z�]��增�o�_{�Z���Ex�6 l}�5`������W����.?��h��o>Hˈ4��: SѢ����C^7L�
+�d��BJؠ���LH�
8�v2c�����mH �"?^F1Xn�o^�|�т�2x>�SFgtmz \���Ԍ����uQ&uD�0�p>y�����|/�N&UcŞ�;RV��$�H�K����X6W]�nu.����i}�D�ş?��~Jod >�w���R

Plugins/EnvPlugin/ProjectDescriptionHelpers/InfoPlist.swift

@@ -16,11 +16,24 @@ public extension Project {
  "CFBundleURLTypes": [
  [
  "CFBundleTypeRole": "Editor",
- "CFBundleURLSchemes": ["keyme"]
+ "CFBundleURLSchemes": [
+ "keyme",
+ "kakao$(KAKAO_API_KEY)"
+ ]
  ]
  ],
  "API_BASE_URL": "$(API_BASE_URL)",
- "UIUserInterfaceStyle": "Light"
+ "KAKAO_API_KEY": "$(KAKAO_API_KEY)",
+ "UIUserInterfaceStyle": "Light",
+ "NSAppTransportSecurity": [
+ "NSExceptionDomains": [
+ "api.keyme.space": [
+ "NSIncludesSubdomains": true,
+ "NSExceptionMinimumTLSVersion": "TLSv1.2",
+ ],
+ ]
+ ],
+ "LSApplicationQueriesSchemes": ["kakaokompassauth", "kakaolink"]
  ]
 
  static let baseUrlInfoPlist: [String: InfoPlist.Value] = [

Projects/Core/Sources/Utility/Function/TCA+.swift

@@ -0,0 +1,46 @@
+//
+// TCA+.swift
+// Core
+//
+// Created by Young Bin on 2023/09/03.
+// Copyright © 2023 team.humanwave. All rights reserved.
+//
+
+import ComposableArchitecture
+
+private final class Ref<T: Equatable>: Equatable {
+ var val: T
+ init(_ v: T) {
+ self.val = v
+ }
+
+ static func == (lhs: Ref<T>, rhs: Ref<T>) -> Bool {
+ lhs.val == rhs.val
+ }
+}
+
+/// 스택 오버플로우 방지용 래퍼
+/// 참고: https://github.com/pointfreeco/swift-composable-architecture/discussions/488
+@propertyWrapper
+public struct Box<T: Equatable>: Equatable {
+ private var ref: Ref<T>
+
+ public init(_ x: T) {
+ self.ref = Ref(x)
+ }
+
+ public var wrappedValue: T {
+ get { ref.val }
+ set {
+ if !isKnownUniquelyReferenced(&ref) {
+ ref = Ref(newValue)
+ return
+ }
+ ref.val = newValue
+ }
+ }
+
+ public var projectedValue: Box<T> {
+ self
+ }
+}

Projects/Core/Sources/Utility/Interact/Haptic/HapticManager.swift

@@ -54,6 +54,13 @@ public class HapticManager {
  generator.impactOccurred()
  }
 
+ /// 붕
+ public func boong() {
+ let generator = UIImpactFeedbackGenerator(style: .soft)
+ generator.prepare()
+ generator.impactOccurred()
+ }
+
  /// 패턴 재생(패턴은 추후 협의 후 개발해서 추가)
  public func playHapticPattern() {
  do {

Projects/Core/Sources/Utility/UI/TextField/TextFieldPlaceholder.swift

@@ -0,0 +1,22 @@
+//
+// TextFieldPlaceholder.swift
+// Core
+//
+// Created by 이영빈 on 2023/08/31.
+// Copyright © 2023 team.humanwave. All rights reserved.
+//
+
+import SwiftUI
+
+public extension View {
+ func placeholder<Content: View>(
+ when shouldShow: Bool,
+ alignment: Alignment = .leading,
+ @ViewBuilder placeholder: () -> Content
+ ) -> some View {
+ ZStack(alignment: alignment) {
+ placeholder().opacity(shouldShow ? 1 : 0)
+ self
+ }
+ }
+}

Projects/Core/Sources/Utility/UI/WebView/WebViewWarmUper.swift

@@ -0,0 +1,68 @@
+// https://github.com/bernikovich/WebViewWarmUper
+//
+// Created by Timur Bernikovich on 07/03/2019.
+// Copyright © 2019 Timur Bernikovich. All rights reserved.
+//
+
+import WebKit
+import UIKit
+
+public protocol WarmUpable {
+ func warmUp()
+}
+
+public class WarmUper<Object: WarmUpable> {
+
+ private let creationClosure: () -> Object
+ private var warmedUpObjects: [Object] = []
+ public var numberOfWamedUpObjects: Int = 2 {
+ didSet {
+ prepare()
+ }
+ }
+
+ public init(creationClosure: @escaping () -> Object) {
+ self.creationClosure = creationClosure
+ prepare()
+ }
+
+ public func prepare() {
+ while warmedUpObjects.count < numberOfWamedUpObjects {
+ let object = creationClosure()
+ object.warmUp()
+ warmedUpObjects.append(object)
+ }
+ }
+
+ private func createObjectAndWarmUp() -> Object {
+ let object = creationClosure()
+ object.warmUp()
+ return object
+ }
+
+ public func dequeue() -> Object {
+ let warmedUpObject: Object
+ if let object = warmedUpObjects.first {
+ warmedUpObjects.removeFirst()
+ warmedUpObject = object
+ } else {
+ warmedUpObject = createObjectAndWarmUp()
+ }
+ prepare()
+ return warmedUpObject
+ }
+
+}
+
+extension WKWebView: WarmUpable {
+ public func warmUp() {
+ loadHTMLString("", baseURL: nil)
+ }
+}
+
+public typealias WKWebViewWarmUper = WarmUper<WKWebView>
+public extension WarmUper where Object == WKWebView {
+ static let shared = WKWebViewWarmUper(creationClosure: {
+ WKWebView(frame: .zero, configuration: WKWebViewConfiguration())
+ })
+}

Projects/DSKit/Resources/Image.xcassets/photo_export.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "filename" : "photo_export.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}

Projects/DSKit/Resources/Image.xcassets/setting.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+ "images" : [
+ {
+ "filename" : "setting.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "[email protected]",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}

Projects/DSKit/Sources/Lottie/KeymeLottie.swift

@@ -27,7 +27,7 @@ public struct KeymeLottieView: UIViewRepresentable {
 
  lottieView.translatesAutoresizingMaskIntoConstraints = false
  lottieView.loopMode = loopMode
- lottieView.contentMode = .scaleToFill
+ lottieView.contentMode = .scaleAspectFill
  lottieView.play(completion: { finished in
  if finished {
  completion?()

Projects/Features/Sources/Home/KeymeTestHomeFeature.swift

@@ -9,13 +9,19 @@
 import ComposableArchitecture
 import Domain
 import Network
+import Foundation
 
-struct KeymeTestsHomeFeature: Reducer {
+public struct KeymeTestsHomeFeature: Reducer {
  @Dependency(\.keymeAPIManager) private var network
 
  // 테스트를 아직 풀지 않았거나, 풀었거나 2가지 케이스만 존재
- struct State: Equatable {
+ public struct State: Equatable {
+ @PresentationState var alertState: AlertState<Action.Alert>?
  @PresentationState var testStartViewState: KeymeTestsStartFeature.State?
+ var authorizationToken: String? {
+ @Dependency(\.keymeAPIManager.authorizationToken) var authorizationToken
+ return authorizationToken
+ }
  var view: View
 
  struct View: Equatable {
@@ -28,15 +34,35 @@ struct KeymeTestsHomeFeature: Reducer {
  }
  }
 
- enum Action {
+ public enum Action {
+ case requestLogout
+
  case fetchDailyTests
  case showTestStartView(testData: KeymeTestsModel)
+ case showErrorAlert(HomeFeatureError)
+
+ case alert(PresentationAction<Alert>)
  case startTest(PresentationAction<KeymeTestsStartFeature.Action>)
 
  enum View {}
+
+ public enum Alert: Equatable {
+ case error(HomeFeatureError)
+ }
+
+ public enum HomeFeatureError: LocalizedError {
+ case cannotGetAuthorizationInformation
+
+ public var errorDescription: String? {
+ switch self {
+ case .cannotGetAuthorizationInformation:
+ return "로그인 정보를 불러올 수 없습니다. 다시 로그인을 진행해주세요."
+ }
+ }
+ }
  }
 
- var body: some ReducerOf<Self> {
+ public var body: some ReducerOf<Self> {
  Reduce { state, action in
  switch action {
  case .fetchDailyTests:
@@ -49,13 +75,41 @@ struct KeymeTestsHomeFeature: Reducer {
 
  case .showTestStartView(let testData):
  state.view.dailyTestId = testData.testId
- state.testStartViewState = .init(nickname: state.view.nickname, testData: testData)
+ guard let authorizationToken = state.authorizationToken else {
+ return .send(.showErrorAlert(.cannotGetAuthorizationInformation))
+ }
+
+ state.testStartViewState = KeymeTestsStartFeature.State(
+ nickname: state.view.nickname,
+ testData: testData,
+ authorizationToken: authorizationToken)
+
+ case .showErrorAlert(let error):
+ if case .cannotGetAuthorizationInformation = error {
+ state.alertState = AlertState(
+ title: { TextState("에러 발생") },
+ actions: { ButtonState(
+ action: .error(.cannotGetAuthorizationInformation),
+ label: { TextState("닫기") }
+ ) },
+ message: { TextState(error.localizedDescription) })
+ }
+ return .none
+
+ case .alert(.presented(.error(let error))):
+ if case .cannotGetAuthorizationInformation = error {
+ return .send(.requestLogout)
+ }
+ return .none
 
  default:
  break
  }
 
  return .none
  }
+ .ifLet(\.$testStartViewState, action: /Action.startTest) {
+ KeymeTestsStartFeature()
+ }
  }
 }

Projects/Features/Sources/Home/KeymeTestHomeView.swift

@@ -15,7 +15,6 @@ struct KeymeTestsHomeView: View {
 
  init(store: StoreOf<KeymeTestsHomeFeature>) {
  self.store = store
- store.send(.fetchDailyTests)
  }
 
  var body: some View {
@@ -41,7 +40,13 @@ struct KeymeTestsHomeView: View {
  // 결과 화면 표시도 생각
 
  }
+ .onAppear {
+ if viewStore.dailyTestId == nil {
+ viewStore.send(.fetchDailyTests)
+ }
+ }
  }
+ .alert(store: store.scope(state: \.$alertState, action: KeymeTestsHomeFeature.Action.alert))
  }
 }