Merge pull request #113 from DDakal/Develop

v1.2.2 hotfix

Author: mosiccan

DancingMarker/DancingMarker/Extensions/View+.swift

@@ -7,38 +7,55 @@
 
 import SwiftUI
 
-struct SwipeBackModifier: UIViewControllerRepresentable {
+struct EnableSwipeBack: ViewModifier {
+    func body(content: Content) -> some View {
+        content
+            .background(EnableSwipeBackRepresentable())
+    }
+}
+
+private struct EnableSwipeBackRepresentable: UIViewControllerRepresentable {
     func makeUIViewController(context: Context) -> UIViewController {
-        let viewController = UIViewController()
+        let controller = UIViewController()
         DispatchQueue.main.async {
-            if let navController = viewController.navigationController {
-                navController.interactivePopGestureRecognizer?.delegate = context.coordinator
-                navController.interactivePopGestureRecognizer?.isEnabled = true
+            if let nav = controller.parentNavigationController {
+                nav.interactivePopGestureRecognizer?.delegate = context.coordinator
+                nav.interactivePopGestureRecognizer?.isEnabled = true
             }
         }
-        return viewController
+        return controller
     }
-    
-    func updateUIViewController(_ uiViewController: UIViewController, context: Context) { }
-    
+
+    func updateUIViewController(_ uiViewController: UIViewController, context: Context) {}
+
     func makeCoordinator() -> Coordinator {
         Coordinator()
     }
-    
+
     class Coordinator: NSObject, UIGestureRecognizerDelegate {
         func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+            // 뒤로가기 제스처가 항상 동작하도록 허용
             return true
         }
-        
-        func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRequireFailureOf otherGestureRecognizer: UIGestureRecognizer) -> Bool {
-            return otherGestureRecognizer is UIPanGestureRecognizer &&
-            !(gestureRecognizer is UIScreenEdgePanGestureRecognizer)
+    }
+}
+
+// UINavigationController를 안전하게 찾는 extension
+private extension UIViewController {
+    var parentNavigationController: UINavigationController? {
+        var parentVC = self.parent
+        while parentVC != nil {
+            if let nav = parentVC as? UINavigationController {
+                return nav
+            }
+            parentVC = parentVC?.parent
         }
+        return nil
     }
 }
 
 extension View {
     func enableSwipeBack() -> some View {
-        self.background(SwipeBackModifier())
+        self.modifier(EnableSwipeBack())
     }
 }

DancingMarker/DancingMarker/View/Playing/PlayingView.swift

@@ -108,18 +108,23 @@ struct PlayingView: View {
                             .frame(width: geometry.size.width * CGFloat(playerModel.progress), height: geometry.size.height)
                     }
                     .cornerRadius(12)
-                    .background(Color.red.opacity(0.2))
-                    .gesture(DragGesture(minimumDistance: 0)
-                        .onChanged({ value in
-                            DispatchQueue.main.async {
-                                let newProgress = min(max(0, Double(value.location.x / geometry.size.width)), 1.0)
-                                playerModel.progress = newProgress
-                                let newTime = newProgress * playerModel.duration
-                                playerModel.currentTime = newTime
-                                playerModel.formattedProgress = playerModel.formattedTime(newTime)
-                                playerModel.updateAudioPlayer(with: newTime)
-                            }
-                        }))
+                    .contentShape(
+                        Rectangle()
+                            .inset(by: -6)
+                    )
+                    .highPriorityGesture(
+                        DragGesture(minimumDistance: 0)
+                            .onChanged({ value in
+                                DispatchQueue.main.async {
+                                    let newProgress = min(max(0, Double(value.location.x / geometry.size.width)), 1.0)
+                                    playerModel.progress = newProgress
+                                    let newTime = newProgress * playerModel.duration
+                                    playerModel.currentTime = newTime
+                                    playerModel.formattedProgress = playerModel.formattedTime(newTime)
+                                    playerModel.updateAudioPlayer(with: newTime)
+                                }
+                            })
+                    )
                 }
                 .frame(height: 8)
                 .padding(.bottom, 3)