Merge pull request #3 from AntonPoltoratskyi/feature/actions-interaction

Anton Poltoratskyi · web-flow · commit 0a834b799b7e · 2020-08-15T15:02:08.000+03:00
Added ability to disable actions
diff --git a/Example/NativeUIExample/Base.lproj/Main.storyboard b/Example/NativeUIExample/Base.lproj/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16096" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16086"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -28,6 +28,7 @@
                                 <segments>
                                     <segment title="Default"/>
                                     <segment title="Custom Content"/>
+                                    <segment title="System"/>
                                 </segments>
                             </segmentedControl>
                         </subviews>
diff --git a/Example/NativeUIExample/ViewController.swift b/Example/NativeUIExample/ViewController.swift
@@ -14,6 +14,7 @@ final class ViewController: UIViewController {
     enum Appearance: Int {
         case `default`  = 0
         case custom     = 1
+        case system     = 2
     }
     
     @IBOutlet private var segmentedControl: UISegmentedControl!
@@ -53,6 +54,20 @@ final class ViewController: UIViewController {
             )
             let alert = AlertViewController(viewModel: viewModel)
             present(alert, animated: true)
+            
+        case .system:
+            let cancelAction = UIAlertAction(title: "Cancel", style: .default)
+            let confirmAction = UIAlertAction(title: "Confirm", style: .default)
+            
+            let alert = UIAlertController(
+                title: "Your Title",
+                message: "Your Message",
+                preferredStyle: .alert
+            )
+            alert.addAction(cancelAction)
+            alert.addAction(confirmAction)
+            
+            present(alert, animated: true)
         }
     }
 }
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,11 +1,11 @@
 PODS:
-  - NativeUI (0.0.3):
-    - NativeUI/Core (= 0.0.3)
-  - NativeUI/Alert (0.0.3):
+  - NativeUI (1.0.1):
+    - NativeUI/Core (= 1.0.1)
+  - NativeUI/Alert (1.0.1):
     - NativeUI/Utils
-  - NativeUI/Core (0.0.3):
+  - NativeUI/Core (1.0.1):
     - NativeUI/Alert
-  - NativeUI/Utils (0.0.3)
+  - NativeUI/Utils (1.0.1)
 
 DEPENDENCIES:
   - NativeUI (from `../`)
@@ -15,8 +15,8 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  NativeUI: d89eeb004dd445bb67bef1579be654edffdd7a2e
+  NativeUI: 6de137806356923678e5b124502c00246ed8a14a
 
 PODFILE CHECKSUM: bb46d7bf1ae3b119e00a9331a12cd0a4b5cac170
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.9.3
diff --git a/NativeUI.podspec b/NativeUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "NativeUI"
-  s.version       = "1.0.0"
+  s.version       = "1.0.1"
   s.summary       = "Library that includes customizable replacements for native UIKit components"
 
   s.description   = <<-DESC
diff --git a/NativeUI.xcodeproj/project.pbxproj b/NativeUI.xcodeproj/project.pbxproj
@@ -80,8 +80,8 @@
 				3AB073CE243A017A0092DF66 /* Alert.swift */,
 				3AB073D1243A017A0092DF66 /* AlertViewController.swift */,
 				3AB073D0243A017A0092DF66 /* AlertView.swift */,
-				3AB073CD243A017A0092DF66 /* AlertPresentationAnimator.swift */,
 				3AB073CF243A017A0092DF66 /* AlertActionSequenceView.swift */,
+				3AB073CD243A017A0092DF66 /* AlertPresentationAnimator.swift */,
 			);
 			path = Alert;
 			sourceTree = "<group>";
diff --git a/NativeUI/Sources/Alert/Alert.swift b/NativeUI/Sources/Alert/Alert.swift
@@ -9,7 +9,7 @@
 import UIKit
 
 public struct Alert {
-    public struct Action {
+    public final class Action {
         public typealias Handler = (Alert.Action) -> Void
         
         public enum Style {
@@ -19,11 +19,19 @@ public struct Alert {
         }
         public let title: String
         public let style: Style
+        public var isEnabled: Bool {
+            didSet {
+                actionStateHandler?(isEnabled)
+            }
+        }
         public let handler: Handler?
         
-        public init(title: String, style: Style, handler: Handler? = nil) {
+        var actionStateHandler: ((Bool) -> Void)?
+        
+        public init(title: String, style: Style, isEnabled: Bool = true, handler: Handler? = nil) {
             self.title = title
             self.style = style
+            self.isEnabled = isEnabled
             self.handler = handler
         }
     }
@@ -42,17 +50,21 @@ public struct Alert {
     
     public let tintColor: UIColor?
     
+    public let disabledTintColor: UIColor?
+    
     public let actions: [Action]
     
     public init(title: Text?,
                 message: Text?,
                 contentView: UIView? = nil,
                 tintColor: UIColor? = nil,
+                disabledTintColor: UIColor? = nil,
                 actions: [Action]) {
         self.title = title
         self.message = message
         self.contentView = contentView
         self.tintColor = tintColor
+        self.disabledTintColor = disabledTintColor
         self.actions = actions
     }
     
@@ -62,23 +74,27 @@ public struct Alert {
                 messageFont: UIFont = UIFont.systemFont(ofSize: 13, weight: .regular),
                 contentView: UIView? = nil,
                 tintColor: UIColor? = nil,
+                disabledTintColor: UIColor? = nil,
                 actions: [Action]) {
         self.init(title: title.map { .string($0, titleFont) },
                   message: message.map { .string($0, messageFont) },
                   contentView: contentView,
                   tintColor: tintColor,
+                  disabledTintColor: disabledTintColor,
                   actions: actions)
     }
     
     public init(title: NSAttributedString?,
                 message: NSAttributedString?,
                 contentView: UIView? = nil,
                 tintColor: UIColor? = nil,
+                disabledTintColor: UIColor? = nil,
                 actions: [Action]) {
         self.init(title: title.map { .attributedString($0) },
                   message: message.map { .attributedString($0) },
                   contentView: contentView,
                   tintColor: tintColor,
+                  disabledTintColor: disabledTintColor,
                   actions: actions)
     }
 }
diff --git a/NativeUI/Sources/Alert/AlertActionSequenceView.swift b/NativeUI/Sources/Alert/AlertActionSequenceView.swift
@@ -14,6 +14,7 @@ protocol AlertActionSequenceViewDelegate: AnyObject {
 
 struct AlertActionSequenceViewModel {
     let actions: [Alert.Action]
+    let disabledTintColor: UIColor?
     let separatorColor: UIColor
     let separatorWidth: CGFloat
 }
@@ -34,6 +35,8 @@ final class AlertActionSequenceView: UIControl {
             }
         }
         
+        var isEnabled: Bool = true
+        
         private(set) lazy var titleLabel: UILabel = {
             let label = UILabel()
             label.translatesAutoresizingMaskIntoConstraints = false
@@ -104,15 +107,15 @@ final class AlertActionSequenceView: UIControl {
         }
         
         if let action = viewModel.actions.first {
-            let actionView = makeActionView(for: action)
+            let actionView = makeActionView(for: action, disabledTintColor: viewModel.disabledTintColor)
             stackView.addArrangedSubview(actionView)
         }
         
         for action in viewModel.actions.dropFirst() {
             let separator = makeButtonSeparatorView(viewModel: viewModel)
             stackView.addArrangedSubview(separator)
             
-            let actionView = makeActionView(for: action)
+            let actionView = makeActionView(for: action, disabledTintColor: viewModel.disabledTintColor)
             stackView.addArrangedSubview(actionView)
             
             if let firstActionView = stackView.arrangedSubviews.first(where: { $0 !== actionView }) {
@@ -121,25 +124,37 @@ final class AlertActionSequenceView: UIControl {
         }
     }
     
-    private func makeActionView(for action: Alert.Action) -> ActionView {
+    private func makeActionView(for action: Alert.Action, disabledTintColor: UIColor?) -> ActionView {
         let actionView = ActionView()
         actionView.translatesAutoresizingMaskIntoConstraints = false
         
+        updateAppearance(for: actionView, action: action, disabledTintColor: disabledTintColor)
+        
+        action.actionStateHandler = { [weak actionView, weak action, weak self] isEnabled in
+            guard let actionView = actionView, let action = action else { return }
+            self?.updateAppearance(for: actionView, action: action, disabledTintColor: disabledTintColor)
+        }
+        
+        return actionView
+    }
+    
+    private func updateAppearance(for actionView: ActionView, action: Alert.Action, disabledTintColor: UIColor?) {
+        actionView.isEnabled = action.isEnabled
         actionView.titleLabel.text = action.title
         
+        let disabledTintColor = disabledTintColor ?? UIColor(white: 0.48, alpha: 0.8)
+        
         switch action.style {
         case .default:
             actionView.titleLabel.font = UIFont.systemFont(ofSize: 17, weight: .regular)
-            actionView.titleLabel.textColor = tintColor
+            actionView.titleLabel.textColor = action.isEnabled ? tintColor : disabledTintColor
         case .primary:
             actionView.titleLabel.font = UIFont.systemFont(ofSize: 17, weight: .semibold)
-            actionView.titleLabel.textColor = tintColor
+            actionView.titleLabel.textColor = action.isEnabled ? tintColor : disabledTintColor
         case let .custom(font, textColor):
             actionView.titleLabel.font = font
-            actionView.titleLabel.textColor = textColor
+            actionView.titleLabel.textColor = action.isEnabled ? textColor : disabledTintColor
         }
-        
-        return actionView
     }
     
     private func makeButtonSeparatorView(viewModel: AlertActionSequenceViewModel) -> UIView {
@@ -189,7 +204,7 @@ final class AlertActionSequenceView: UIControl {
             guard let actionViewFrame = actionView.superview?.convert(actionView.frame, to: self) else {
                 continue
             }
-            let isHighlighted = actionViewFrame.contains(point)
+            let isHighlighted = actionViewFrame.contains(point) && actionView.isEnabled
             actionView.isHighlighted = isHighlighted
             
             if isHighlighted, highlightedView != actionView {
@@ -226,7 +241,8 @@ final class AlertActionSequenceView: UIControl {
     
     @objc private func handleTap(on actionView: ActionView) {
         let index = stackView.arrangedSubviews
-            .filter { $0 is ActionView }
+            .compactMap { $0 as? ActionView }
+            .filter { $0.isEnabled }
             .firstIndex(where: { $0 === actionView })
         
         if let index = index {
diff --git a/NativeUI/Sources/Alert/AlertView.swift b/NativeUI/Sources/Alert/AlertView.swift
@@ -193,6 +193,7 @@ final class AlertView: UIView {
         
         let actionsViewModel = AlertActionSequenceViewModel(
             actions: viewModel.actions,
+            disabledTintColor: viewModel.disabledTintColor,
             separatorColor: separatorColor,
             separatorWidth: Layout.separatorThickness
         )

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ final class ViewController: UIViewController {`
`14`	`14`	`enum Appearance: Int {`
`15`	`15`	case `default` = 0
`16`	`16`	`case custom = 1`
	`17`	`+ case system = 2`
`17`	`18`	`}`
`18`	`19`
`19`	`20`	`@IBOutlet private var segmentedControl: UISegmentedControl!`
`@@ -53,6 +54,20 @@ final class ViewController: UIViewController {`
`53`	`54`	`)`
`54`	`55`	`let alert = AlertViewController(viewModel: viewModel)`
`55`	`56`	`present(alert, animated: true)`
	`57`	`+`
	`58`	`+ case .system:`
	`59`	`+ let cancelAction = UIAlertAction(title: "Cancel", style: .default)`
	`60`	`+ let confirmAction = UIAlertAction(title: "Confirm", style: .default)`
	`61`	`+`
	`62`	`+ let alert = UIAlertController(`
	`63`	`+ title: "Your Title",`
	`64`	`+ message: "Your Message",`
	`65`	`+ preferredStyle: .alert`
	`66`	`+ )`
	`67`	`+ alert.addAction(cancelAction)`
	`68`	`+ alert.addAction(confirmAction)`
	`69`	`+`
	`70`	`+ present(alert, animated: true)`
`56`	`71`	`}`
`57`	`72`	`}`
`58`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,7 @@ final class AlertView: UIView {`
`193`	`193`
`194`	`194`	`let actionsViewModel = AlertActionSequenceViewModel(`
`195`	`195`	`actions: viewModel.actions,`
	`196`	`+ disabledTintColor: viewModel.disabledTintColor,`
`196`	`197`	`separatorColor: separatorColor,`
`197`	`198`	`separatorWidth: Layout.separatorThickness`
`198`	`199`	`)`