#158 merge: PR Merge

ahra1221 · web-flow · commit ae756a84cbaa · 2025-06-04T15:20:06.000+09:00
[Feat] #157 - 탭바 터치이펙트 적용
diff --git a/Walkie-iOS/Project.swift b/Walkie-iOS/Project.swift
@@ -84,6 +84,7 @@ let project = Project(
                 .external(name: "FirebaseCore"),
                 .external(name: "FirebaseMessaging"),
                 .external(name: "FirebaseAnalytics"),
+                .external(name: "FirebaseRemoteConfig"),
                 .external(name: "Moya"),
                 .external(name: "CombineMoya"),
                 .external(name: "KakaoSDKAuth"),
diff --git a/Walkie-iOS/Walkie-iOS/Sources/App/Coordinator/CoordinatorImpl/AppCoordinator.swift b/Walkie-iOS/Walkie-iOS/Sources/App/Coordinator/CoordinatorImpl/AppCoordinator.swift
@@ -43,7 +43,6 @@ final class AppCoordinator: Coordinator, ObservableObject {
     
     init(diContainer: DIContainer) {
         self.diContainer = diContainer
-        startSplash()
         initializeStepCoordinator()
         NotificationCenter.default
             .publisher(for: .reissueFailed)
@@ -62,7 +61,7 @@ final class AppCoordinator: Coordinator, ObservableObject {
     func buildScene(_ scene: AppScene) -> some View {
         switch scene {
         case .splash:
-            SplashView()
+            diContainer.buildSplashView(appCoordinator: self)
         case .nickname:
             diContainer.buildNicknameView()
         case .login:
@@ -114,14 +113,17 @@ final class AppCoordinator: Coordinator, ObservableObject {
             let cancelAction,
             let checkAction,
             let checkTitle,
-            let cancelTitle
+            let cancelTitle,
+            let tapDismiss
         ):
             ZStack {
                 Color.black.opacity(appFullScreenCover != nil ? 0.6 : 0.0)
                     .ignoresSafeArea()
                     .onTapGesture {
                         withAnimation(.easeInOut(duration: 0.25)) {
-                            self.dismissFullScreenCover()
+                            if tapDismiss {
+                                self.dismissFullScreenCover()
+                            }
                         }
                     }
                 Modal(
@@ -134,7 +136,9 @@ final class AppCoordinator: Coordinator, ObservableObject {
                         cancelAction()
                     },
                     checkButtonAction: {
-                        self.dismissFullScreenCover()
+                        if tapDismiss {
+                            self.dismissFullScreenCover()
+                        }
                         checkAction()
                     },
                     checkButtonTitle: checkTitle,
@@ -191,7 +195,7 @@ final class AppCoordinator: Coordinator, ObservableObject {
         }
     }
     
-    private func startSplash() {
+    func startSplash() {
         currentScene = .splash
         DispatchQueue.main.asyncAfter(deadline: .now() + 2) { [weak self] in
             self?.updateCurrentScene()
@@ -211,7 +215,8 @@ final class AppCoordinator: Coordinator, ObservableObject {
         cancelButtonAction: @escaping () -> Void,
         checkButtonAction: @escaping () -> Void,
         checkButtonTitle: String = "확인",
-        cancelButtonTitle: String = "취소"
+        cancelButtonTitle: String = "취소",
+        tapDismiss: Bool = true
     ) {
         presentFullScreenCover(
             AppFullScreenCover.alert(
@@ -222,7 +227,8 @@ final class AppCoordinator: Coordinator, ObservableObject {
                 cancelAction: cancelButtonAction,
                 checkAction: checkButtonAction,
                 checkTitle: checkButtonTitle,
-                cancelTitle: cancelButtonTitle
+                cancelTitle: cancelButtonTitle,
+                tapDismiss: tapDismiss
             ),
             onDismiss: nil
         )
diff --git a/Walkie-iOS/Walkie-iOS/Sources/App/Manager/DIContainer.swift b/Walkie-iOS/Walkie-iOS/Sources/App/Manager/DIContainer.swift
@@ -62,6 +62,12 @@ extension DIContainer {
 
 extension DIContainer {
     
+    func makeSplashViewModel(
+        appCoordinator: AppCoordinator
+    ) -> SplashViewModel {
+        return SplashViewModel(appCoordinator: appCoordinator)
+    }
+    
     func makeHomeViewModel(appCoordinator: AppCoordinator) -> HomeViewModel {
         return HomeViewModel(
             getEggPlayUseCase: resolveGetEggPlayUseCase(),
@@ -179,6 +185,16 @@ extension DIContainer {
 
 extension DIContainer {
     
+    func buildSplashView(
+        appCoordinator: AppCoordinator
+    ) -> SplashView {
+        return SplashView(
+            splashViewModel: self.makeSplashViewModel(
+                appCoordinator: appCoordinator
+            )
+        )
+    }
+    
     // MARK: - Main Views
     func buildTabBarView() -> TabBarView {
         return TabBarView()
diff --git a/Walkie-iOS/Walkie-iOS/Sources/Extension/ButtonStyle+.swift b/Walkie-iOS/Walkie-iOS/Sources/Extension/ButtonStyle+.swift
@@ -0,0 +1,56 @@
+//
+//  ButtonStyle+.swift
+//  Walkie-iOS
+//
+//  Created by 고아라 on 6/4/25.
+//
+
+import SwiftUI
+
+struct WalkieTouchEffect: ButtonStyle {
+    func makeBody(configuration: Configuration) -> some View {
+        let pressedScale: CGFloat = 0.8
+        let normalScale: CGFloat = 1.0
+        
+        let pressAnimation = Animation.spring(
+            response: 0.15,
+            dampingFraction: 0.6,
+            blendDuration: 0
+        )
+        let releaseAnimation = Animation.spring(
+            response: 0.5,
+            dampingFraction: 0.7,
+            blendDuration: 0
+        )
+        
+        return configuration.label
+            .scaleEffect(configuration.isPressed ? pressedScale : normalScale)
+            .animation(
+                configuration.isPressed
+                ? pressAnimation
+                : releaseAnimation,
+                value: configuration.isPressed
+            )
+            .onChange(of: configuration.isPressed) { _, isPressed in
+                if isPressed {
+                    HapticManager.shared.impact(style: .light)
+                }
+            }
+    }
+}
+
+struct HapticButtonStyle: ButtonStyle {
+    let style: UIImpactFeedbackGenerator.FeedbackStyle
+    
+    func makeBody(configuration: Configuration) -> some View {
+        configuration.label
+            .scaleEffect(configuration.isPressed ? 0.95 : 1.0)
+            .opacity(configuration.isPressed ? 0.7 : 1.0)
+            .onChange(of: configuration.isPressed) { _, pressed in
+                if pressed {
+                    HapticManager.shared.impact(style: style)
+                }
+            }
+            .animation(.easeInOut(duration: 0.1), value: configuration.isPressed)
+    }
+}
diff --git a/Walkie-iOS/Walkie-iOS/Sources/Extension/HapticManager.swift b/Walkie-iOS/Walkie-iOS/Sources/Extension/HapticManager.swift
@@ -0,0 +1,21 @@
+//
+//  HapticManager.swift
+//  Walkie-iOS
+//
+//  Created by 고아라 on 6/4/25.
+//
+
+import UIKit
+
+final class HapticManager {
+    
+    static let shared = HapticManager()
+    
+    private init() { }
+    
+    func impact(style: UIImpactFeedbackGenerator.FeedbackStyle = .medium) {
+        let generator = UIImpactFeedbackGenerator(style: style)
+        generator.prepare()
+        generator.impactOccurred()
+    }
+}
diff --git a/Walkie-iOS/Walkie-iOS/Sources/Extension/View+.swift b/Walkie-iOS/Walkie-iOS/Sources/Extension/View+.swift
@@ -24,6 +24,16 @@ extension View {
     func popGestureEnabled(_ enabled: Bool) -> some View {
         background(PopGestureConfigurator(enabled: enabled))
     }
+    
+    func applyHaptic(
+        _ style: UIImpactFeedbackGenerator.FeedbackStyle = .medium
+    ) -> some View {
+        modifier(HapticOnTapModifier(style: style))
+    }
+    
+    func walkieTouchEffect() -> some View {
+        self.buttonStyle(WalkieTouchEffect())
+    }
 }
 
 // MARK: - AlignmentModifier
@@ -137,3 +147,17 @@ extension View {
         }
     }
 }
+
+// Haptic
+
+struct HapticOnTapModifier: ViewModifier {
+    
+    let style: UIImpactFeedbackGenerator.FeedbackStyle
+    
+    func body(content: Content) -> some View {
+        content
+            .onTapGesture {
+                HapticManager.shared.impact(style: style)
+            }
+    }
+}
diff --git a/Walkie-iOS/Walkie-iOS/Sources/Network/Base/URLConstant.swift b/Walkie-iOS/Walkie-iOS/Sources/Network/Base/URLConstant.swift
@@ -13,6 +13,10 @@ enum URLConstant {
     
     static let baseURL = Config.baseURL
     
+    // MARK: - AppStore URL
+    
+    static let appStoreURL = "itms-apps://itunes.apple.com/app/id6742345668"
+    
     // MARK: - URL Path
     
     // auth
diff --git a/Walkie-iOS/Walkie-iOS/Sources/Presentation/Common/Modal/Modal.swift b/Walkie-iOS/Walkie-iOS/Sources/Presentation/Common/Modal/Modal.swift
@@ -44,6 +44,7 @@ struct Modal: View {
                 .foregroundColor(WalkieCommonAsset.gray700.swiftUIColor)
                 .padding(.horizontal, 16)
                 .padding(.bottom, 4)
+                .multilineTextAlignment(.center)
             
             Text(content)
                 .font(.B2)
diff --git a/Walkie-iOS/Walkie-iOS/Sources/Presentation/Common/TabBar/TabBarView.swift b/Walkie-iOS/Walkie-iOS/Sources/Presentation/Common/TabBar/TabBarView.swift
@@ -58,6 +58,7 @@ struct TabBarView: View {
                                     }
                                 )
                                 .frame(maxWidth: .infinity)
+                                .walkieTouchEffect()
                             }
                         }
                         .frame(height: 52)
diff --git a/Walkie-iOS/Walkie-iOS/Sources/Presentation/Onboarding/Login/LoginView.swift b/Walkie-iOS/Walkie-iOS/Sources/Presentation/Onboarding/Login/LoginView.swift
@@ -114,7 +114,9 @@ struct LoginView: View {
                                 cancelAction: {},
                                 checkAction: {},
                                 checkTitle: "확인",
-                                cancelTitle: ""),
+                                cancelTitle: "",
+                                tapDismiss: true
+                            ),
                         onDismiss: {
                             loginViewModel.state = .loading
                         }
diff --git a/Walkie-iOS/Walkie-iOS/Sources/Presentation/Onboarding/Splash/SplashView.swift b/Walkie-iOS/Walkie-iOS/Sources/Presentation/Onboarding/Splash/SplashView.swift
@@ -8,6 +8,8 @@
 import SwiftUI
 
 struct SplashView: View {
+    
+    @StateObject var splashViewModel: SplashViewModel
         
     var body: some View {
         ZStack {
@@ -17,5 +19,8 @@ struct SplashView: View {
                 .frame(width: 200, height: 200)
         }
         .edgesIgnoringSafeArea(.all)
+        .onAppear {
+            splashViewModel.action(.fetchVersion)
+        }
     }
 }
diff --git a/Walkie-iOS/Walkie-iOS/Sources/Presentation/Onboarding/Splash/SplashViewModel.swift b/Walkie-iOS/Walkie-iOS/Sources/Presentation/Onboarding/Splash/SplashViewModel.swift
@@ -0,0 +1,107 @@
+//
+//  SplashViewModel.swift
+//  Walkie-iOS
+//
+//  Created by 고아라 on 6/4/25.
+//
+
+import SwiftUI
+import Combine
+import FirebaseRemoteConfig
+
+final class SplashViewModel: NSObject, ViewModelable {
+    
+    private let remoteConfig = RemoteConfig.remoteConfig()
+    private let settings = RemoteConfigSettings()
+    private var cancellables = Set<AnyCancellable>()
+    let appCoordinator: AppCoordinator
+    
+    enum Action {
+        case fetchVersion
+    }
+    
+    enum SplashViewState: Equatable {
+        case loading
+        case loaded
+        case error
+    }
+    
+    @Published var state: SplashViewState = .loading
+    
+    init(
+        appCoordinator: AppCoordinator
+    ) {
+        self.appCoordinator = appCoordinator
+        super.init()
+        
+        settings.minimumFetchInterval = 0
+        remoteConfig.configSettings = settings
+        remoteConfig.addOnConfigUpdateListener { [weak self] _, error in
+            if error == nil {
+                Task { await self?.activateRemoteConfig() }
+            }
+        }
+    }
+    
+    func action(_ action: Action) {
+        switch action {
+        case .fetchVersion:
+            Task { await activateRemoteConfig() }
+        }
+    }
+    
+    private func activateRemoteConfig() async {
+        do {
+            try await remoteConfig.fetch()
+            try await remoteConfig.activate()
+            
+            let remoteVersion = remoteConfig["iOS_MIN_APP_VERSION"].stringValue
+            let currentVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? ""
+            
+            let needsUpdate = isVersion(
+                currentVersion,
+                lowerThan: remoteVersion
+            )
+            if needsUpdate {
+                appCoordinator.buildAlert(
+                    title: "워키를 안전한 버전으로\n업데이트 해주세요.",
+                    content: "여러 사용성과 안전성을 업데이트 했어요.",
+                    style: .primary,
+                    button: .onebutton,
+                    cancelButtonAction: {},
+                    checkButtonAction: {
+                        self.openAppStore()
+                    },
+                    checkButtonTitle: "업데이트",
+                    tapDismiss: false
+                )
+            } else {
+                appCoordinator.startSplash()
+            }
+        } catch {
+            self.state = .error
+        }
+    }
+    
+    private func isVersion(_ v1: String, lowerThan v2: String) -> Bool {
+        let arr1 = v1.split(separator: ".").compactMap { Int($0) }
+        let arr2 = v2.split(separator: ".").compactMap { Int($0) }
+        let maxCount = max(arr1.count, arr2.count)
+        let nums1 = arr1 + Array(repeating: 0, count: maxCount - arr1.count)
+        let nums2 = arr2 + Array(repeating: 0, count: maxCount - arr2.count)
+        
+        for i in 0..<maxCount {
+            if nums1[i] < nums2[i] { return true }
+            if nums1[i] > nums2[i] { return false }
+        }
+        return false
+    }
+    
+    private func openAppStore() {
+        guard let url = URL(string: URLConstant.appStoreURL) else { return }
+        
+        if UIApplication.shared.canOpenURL(url) {
+            UIApplication.shared.open(url, options: [:], completionHandler: nil)
+        }
+    }
+}
diff --git a/Walkie-iOS/Walkie-iOS/Sources/Presentation/Route/AppScene.swift b/Walkie-iOS/Walkie-iOS/Sources/Presentation/Route/AppScene.swift

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ struct TabBarView: View {`
`58`	`58`	`}`
`59`	`59`	`)`
`60`	`60`	`.frame(maxWidth: .infinity)`
	`61`	`+ .walkieTouchEffect()`
`61`	`62`	`}`
`62`	`63`	`}`
`63`	`64`	`.frame(height: 52)`