Merge pull request #7 from croquiscom/feature/APP-7541-talk-lounge

APP-7541 바텀시트 상단 indicator 색상 컨트롤 기능 추가 및 백그라운드 터치 조절 비활성화 추가
croquiscom · Sep 11, 2023 · cdb381d · cdb381d
2 parents c9fb501 + 772dc7e
commit cdb381d
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 3 deletions.
diff --git a/PanModal/Controller/PanModalPresentationController.swift b/PanModal/Controller/PanModalPresentationController.swift
@@ -111,7 +111,10 @@ public class PanModalPresentationController: UIPresentationController {
             view = DimmedView()
         }
         view.didTap = { [weak self] _ in
-            self?.dismissPresentedViewController()
+            if self?.presentable?.allowsTapToDismiss == true {
+                self?.dismissPresentedViewController()
+            }
+
         }
         return view
     }()
@@ -401,6 +404,7 @@ private extension PanModalPresentationController {
      */
     func addDragIndicatorView(to view: UIView) {
         view.addSubview(dragIndicatorView)
+        dragIndicatorView.indicator.backgroundColor = presentable?.indicatorColor
         dragIndicatorView.backgroundColor = presentable?.dragIndicatorBackgroundColor
         dragIndicatorView.translatesAutoresizingMaskIntoConstraints = false
         dragIndicatorView.bottomAnchor.constraint(equalTo: view.topAnchor, constant: 0.5).isActive = true

diff --git a/PanModal/Controller/PanModalWrappedViewController.swift b/PanModal/Controller/PanModalWrappedViewController.swift
@@ -376,6 +376,7 @@ private extension PanModalWrappedViewController {
      */
     func addDragIndicatorView(to view: UIView) {
         view.addSubview(dragIndicatorView)
+        dragIndicatorView.indicator.backgroundColor = presentable?.dragIndicatorBackgroundColor
         dragIndicatorView.backgroundColor = presentable?.dragIndicatorBackgroundColor
         dragIndicatorView.translatesAutoresizingMaskIntoConstraints = false
         dragIndicatorView.bottomAnchor.constraint(equalTo: view.topAnchor, constant: 0.5).isActive = true

diff --git a/PanModal/Presentable/PanModalPresentable+Defaults.swift b/PanModal/Presentable/PanModalPresentable+Defaults.swift
@@ -66,6 +66,10 @@ public extension PanModalPresentable where Self: UIViewController {
         return true
     }
 
+    var allowsTapToDismiss: Bool {
+        return true
+    }
+
     var allowScrollViewDragToDismiss: Bool {
         return true
     }
@@ -81,6 +85,10 @@ public extension PanModalPresentable where Self: UIViewController {
     var panCustomTopView: PanCustomTopView? {
         return nil
     }
+
+    var indicatorColor: UIColor {
+        return UIColor(red: 241/255.0, green: 243/255.0, blue: 245/255.0, alpha: 1)
+    }
 
     func shouldRespond(to panModalGestureRecognizer: UIPanGestureRecognizer) -> Bool {
         return true

diff --git a/PanModal/Presentable/PanModalPresentable.swift b/PanModal/Presentable/PanModalPresentable.swift
@@ -111,6 +111,13 @@ public protocol PanModalPresentable {
      Default value is true.
      */
     var allowsDragToDismiss: Bool { get }
+
+    /**
+     A flag to determine if dismissal should be initiated when tapping on the dimmed background view.
+
+     Default value is true.
+     */
+    var allowsTapToDismiss: Bool { get }
 
     /**
      Default value is true
@@ -133,6 +140,8 @@ public protocol PanModalPresentable {
      Default value is true.
      */
     var showDragIndicator: Bool { get }
+
+    var indicatorColor: UIColor { get }
 
     var panCustomTopView: PanCustomTopView? { get }
 

diff --git a/PanModal/View/IndicatorView.swift b/PanModal/View/IndicatorView.swift
@@ -1,6 +1,8 @@
 import UIKit
 
 class IndicatorView: UIView {
+    let indicator = UIView()
+
     override init(frame: CGRect) {
         super.init(frame: frame)
 
@@ -23,8 +25,6 @@ class IndicatorView: UIView {
     }
 
     private func addIndicatorView() {
-        let indicator = UIView()
-        indicator.backgroundColor = UIColor(red: 241/255.0, green: 243/255.0, blue: 245/255.0, alpha: 1)
         indicator.layer.cornerRadius = 2
         indicator.translatesAutoresizingMaskIntoConstraints = false
         indicator.widthAnchor.constraint(equalToConstant: 40).isActive = true

diff --git a/Sample/View Controllers/BasicViewController.swift b/Sample/View Controllers/BasicViewController.swift
@@ -38,6 +38,14 @@ extension BasicViewController: PanModalPresentable {
     var panCustomTopView: PanCustomTopView? {
         return topView
     }
+
+    var indicatorColor: UIColor {
+        return .red
+    }
+
+    var allowsTapToDismiss: Bool {
+        return false
+    }
 }
 
 extension BasicViewController {