Merge pull request #13 from RxSwiftCommunity/develop/input

Support text inputs

Author: lm2343635

Example/Podfile.lock

@@ -1,14 +1,14 @@
 PODS:
-  - Kingfisher (6.0.1)
-  - RxAlertViewable (1.1):
+  - Kingfisher (6.3.1)
+  - RxAlertViewable (1.2):
     - RxCocoa (~> 6)
     - RxSwift (~> 6)
-  - RxCocoa (6.0.0):
-    - RxRelay (= 6.0.0)
-    - RxSwift (= 6.0.0)
-  - RxRelay (6.0.0):
-    - RxSwift (= 6.0.0)
-  - RxSwift (6.0.0)
+  - RxCocoa (6.2.0):
+    - RxRelay (= 6.2.0)
+    - RxSwift (= 6.2.0)
+  - RxRelay (6.2.0):
+    - RxSwift (= 6.2.0)
+  - RxSwift (6.2.0)
   - SnapKit (5.0.1)
 
 DEPENDENCIES:
@@ -31,13 +31,13 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Kingfisher: adde87a4f74f6a3845395769354efff593581740
-  RxAlertViewable: 4657f4a51b8a6fa5dd8c7a7ed5e08ac63398b8b4
-  RxCocoa: 3f79328fafa3645b34600f37c31e64c73ae3a80e
-  RxRelay: 8d593be109c06ea850df027351beba614b012ffb
-  RxSwift: c14e798c59b9f6e9a2df8fd235602e85cc044295
+  Kingfisher: 016c8b653a35add51dd34a3aba36b580041acc74
+  RxAlertViewable: 8b8b82e6c22b974813e67a79b0c3d500bb08b676
+  RxCocoa: 4baf94bb35f2c0ab31bc0cb9f1900155f646ba42
+  RxRelay: e72dbfd157807478401ef1982e1c61c945c94b2f
+  RxSwift: d356ab7bee873611322f134c5f9ef379fa183d8f
   SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
 
 PODFILE CHECKSUM: b4605b4abcc2e96e810853dd0c68eb98e91ba151
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.11.2

Example/RxAlertViewable/ViewController.swift

@@ -63,6 +63,16 @@ class ViewController: UIViewController, RxAlertViewable {
         return button
     }()
 
+    private lazy var inputButton: UIButton = {
+        let button = UIButton()
+        button.setTitle("Open Input AlertView", for: .normal)
+        button.setTitleColor(.red, for: .normal)
+        button.rx.tap.bind { [unowned self] in
+            self.viewModel.showInputAlertView()
+        }.disposed(by: disposeBag)
+        return button
+    }()
+    
     private let viewModel: ViewModel
     private let disposeBag = DisposeBag()
 
@@ -84,6 +94,7 @@ class ViewController: UIViewController, RxAlertViewable {
         view.addSubview(customizedAlertButton)
         view.addSubview(globalAlertButton)
         view.addSubview(actionSheetButton)
+        view.addSubview(inputButton)
         createConstraints()
 
         viewModel.alert.bind(to: rx.alert).disposed(by: disposeBag)
@@ -117,6 +128,10 @@ class ViewController: UIViewController, RxAlertViewable {
             $0.top.equalTo(globalAlertButton.snp.bottom).offset(20)
         }
 
+        inputButton.snp.makeConstraints {
+            $0.centerX.equalToSuperview()
+            $0.top.equalTo(actionSheetButton.snp.bottom).offset(20)
+        }
     }
 
 }

Example/RxAlertViewable/ViewModel.swift

@@ -15,6 +15,7 @@ class ViewModel {
     let alert = PublishSubject<RxAlert>()
     let globalTip = PublishSubject<RxAlert>()
     let actionSheet = PublishSubject<RxActionSheet>()
+    let disposeBag = DisposeBag()
 
     private var clickTimes = 0
 
@@ -85,4 +86,27 @@ class ViewModel {
             .cancel
         )
     }
+    
+    private let textRealy = BehaviorRelay<String?>(value: nil)
+    
+    func showInputAlertView() {
+        
+        alert.onNextTip(
+            "My Input AlertView",
+            inputs: [
+                RxAlertInput(
+                    placeholder: "My placeholder",
+                    text: "My text",
+                    textAlignment: .center,
+                    onTextChanged: RxAlertInput.OnTextChanged(
+                        text: textRealy,
+                        disposeBag: disposeBag
+                    )
+                )
+            ],
+            onConfirm: { [weak self] in
+                self?.alert.onNextTip(self?.textRealy.value ?? "")
+            }
+        )
+    }
 }

RxAlertViewable.podspec

@@ -7,7 +7,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'RxAlertViewable'
-  s.version          = '1.1'
+  s.version          = '1.2'
   s.summary          = 'A simple alert library with RxSwift supported.'
 
   s.description      = <<-DESC

RxAlertViewable/Classes/ObserverType+RxAlert.swift

@@ -28,8 +28,12 @@ import RxSwift
 
 extension ObserverType where Element == RxAlert {
 
-    public func onNextTip(_ message: String, onConfirm: RxAlertCompletion = nil) {
-        onNext(.tip(message, onConfirm: onConfirm))
+    public func onNextTip(
+        _ message: String,
+        inputs: [RxAlertInput] = [],
+        onConfirm: RxAlertCompletion = nil
+    ) {
+        onNext(.tip(message, inputs: inputs, onConfirm: onConfirm))
     }
 
     public func onNextWarning(_ message: String, onConfirm: RxAlertCompletion = nil) {

RxAlertViewable/Classes/RxAlert.swift

@@ -36,10 +36,16 @@ public struct RxAlert {
 
     private var title: String
     private var message: String
+    
     private var item: RxAlertItem?
     private var category: RxAlertCategory
 
-    init(title: String, message: String, item: RxAlertItem? = nil, category: RxAlertCategory) {
+    init(
+        title: String,
+        message: String,
+        item: RxAlertItem? = nil,
+        category: RxAlertCategory
+    ) {
         self.title = title
         self.message = message
         self.item = item
@@ -66,29 +72,50 @@ public struct RxAlert {
 
 extension RxAlert {
 
-    public static func tip(_ message: String, onConfirm: RxAlertCompletion = nil) -> RxAlert {
+    public static func tip(
+        _ message: String,
+        inputs: [RxAlertInput] = [],
+        onConfirm: RxAlertCompletion = nil
+    ) -> RxAlert {
         return self.init(
             title: RxAlertConfig.current.tip,
             message: message,
-            item: UIAlertItem(confirmTitle: RxAlertConfig.current.ok),
+            item: UIAlertItem(
+                inputs: inputs,
+                confirmTitle: RxAlertConfig.current.ok
+            ),
             category: .single(onConfirm: onConfirm)
         )
     }
 
-    public static func warning(_ message: String, onConfirm: RxAlertCompletion = nil) -> RxAlert {
+    public static func warning(
+        _ message: String,
+        inputs: [RxAlertInput] = [],
+        onConfirm: RxAlertCompletion = nil
+    ) -> RxAlert {
         return self.init(
             title: RxAlertConfig.current.warning,
             message: message,
-            item: UIAlertItem(confirmTitle: RxAlertConfig.current.ok),
+            item: UIAlertItem(
+                inputs: inputs,
+                confirmTitle: RxAlertConfig.current.ok
+            ),
             category: .single(onConfirm: onConfirm)
         )
     }
 
-    public static func error(_ message: String, onConfirm: RxAlertCompletion = nil) -> RxAlert {
+    public static func error(
+        _ message: String,
+        inputs: [RxAlertInput] = [],
+        onConfirm: RxAlertCompletion = nil
+    ) -> RxAlert {
         return self.init(
             title: RxAlertConfig.current.error,
             message: message,
-            item: UIAlertItem(confirmTitle: RxAlertConfig.current.ok),
+            item: UIAlertItem(
+                inputs: inputs,
+                confirmTitle: RxAlertConfig.current.ok
+            ),
             category: .single(onConfirm: onConfirm)
         )
     }

RxAlertViewable/Classes/RxAlertController.swift

@@ -6,6 +6,8 @@
 //  Copyright © 2019 XFLAG. All rights reserved.
 //
 
+import UIKit
+
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
@@ -24,6 +26,9 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
+import RxCocoa
+import RxSwift
+
 public protocol RxAlertItem {
     static var controllerType: RxAlertController.Type { get }
 }
@@ -35,14 +40,49 @@ public protocol RxAlertController: UIViewController {
     func setAction(for category: RxAlertCategory, item: RxAlertItem?)
 }
 
+public struct RxAlertInput {
+    let placeholder: String?
+    let text: String?
+    let textAlignment: NSTextAlignment
+    let onTextChanged: OnTextChanged?
+    
+    public init(
+        placeholder: String? = nil,
+        text: String? = nil,
+        textAlignment: NSTextAlignment = .left,
+        onTextChanged: OnTextChanged? = nil
+    ) {
+        self.placeholder = placeholder
+        self.text = text
+        self.textAlignment = textAlignment
+        self.onTextChanged = onTextChanged
+    }
+    
+    public struct OnTextChanged {
+        let text: BehaviorRelay<String?>
+        let disposeBag: DisposeBag
+        
+        public init(text: BehaviorRelay<String?>, disposeBag: DisposeBag) {
+            self.text = text
+            self.disposeBag = disposeBag
+        }
+    }
+}
+
 public struct UIAlertItem: RxAlertItem {
 
     public static let controllerType: RxAlertController.Type = UIAlertController.self
 
+    var inputs: [RxAlertInput]
     var confirmTitle: String
     var denyTitle: String?
 
-    public init(confirmTitle: String, denyTitle: String? = nil) {
+    public init(
+        inputs: [RxAlertInput] = [],
+        confirmTitle: String,
+        denyTitle: String? = nil
+    ) {
+        self.inputs = inputs
         self.confirmTitle = confirmTitle
         self.denyTitle = denyTitle
     }
@@ -63,7 +103,18 @@ extension UIAlertController: RxAlertController {
             if let deny = alertItem.denyTitle {
                 denyTitle = deny
             }
+            alertItem.inputs.forEach { input in
+                addTextField {
+                    $0.placeholder = input.placeholder
+                    $0.text = input.text
+                    $0.textAlignment = input.textAlignment
+                    if let onChanged = input.onTextChanged {
+                        $0.rx.text.bind(to: onChanged.text).disposed(by: onChanged.disposeBag)
+                    }
+                }
+            }
         }
+    
         switch category {
         case .single(let onConfirm):
             addAction(UIAlertAction(title: confirmTitle, style: .cancel) { _ in