Fix the default confirm title.

RxSwiftCommunity · Jul 26, 2019 · 570767a · 570767a
1 parent 4c6ea99
commit 570767a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/RxAlertViewable/Classes/RxAlert.swift b/RxAlertViewable/Classes/RxAlert.swift
@@ -106,6 +106,7 @@ extension RxAlert {
         return self.init(
             title: config.tip,
             message: message,
+            item: UIAlertItem(confirmTitle: config.ok),
             category: .single(onConfirm: onConfirm)
         )
     }
@@ -114,6 +115,7 @@ extension RxAlert {
         return self.init(
             title: config.warning,
             message: message,
+            item: UIAlertItem(confirmTitle: config.ok),
             category: .single(onConfirm: onConfirm)
         )
     }
@@ -122,6 +124,7 @@ extension RxAlert {
         return self.init(
             title: config.error,
             message: message,
+            item: UIAlertItem(confirmTitle: config.ok),
             category: .single(onConfirm: onConfirm)
         )
     }

diff --git a/RxAlertViewable/Classes/RxAlertController.swift b/RxAlertViewable/Classes/RxAlertController.swift
@@ -38,10 +38,17 @@ public protocol RxAlertController: UIViewController {
 }
 
 struct UIAlertItem: RxAlertItem {
+
     static let controllerType: RxAlertController.Type = UIAlertController.self
 
     var confirmTitle: String
-    var denyTitle: String
+    var denyTitle: String?
+
+    init(confirmTitle: String, denyTitle: String? = nil) {
+        self.confirmTitle = confirmTitle
+        self.denyTitle = denyTitle
+    }
+
 }
 
 extension UIAlertController: RxAlertController {
@@ -55,11 +62,13 @@ extension UIAlertController: RxAlertController {
         var denyTitle = RxAlert.config.no
         if let alertItem = item as? UIAlertItem {
             confirmTitle = alertItem.confirmTitle
-            denyTitle = alertItem.denyTitle
+            if let deny = alertItem.denyTitle {
+                denyTitle = deny
+            }
         }
         switch category {
         case .single(let onConfirm):
-            addAction(UIAlertAction(title: title, style: .cancel) { _ in
+            addAction(UIAlertAction(title: confirmTitle, style: .cancel) { _ in
                 onConfirm?()
             })
         case .double(let onConfirm, let onDeny):