Use AttributedString instead of NSAttributedString (#4)

* Set iOS minimum deployment version to v15

* Use AttributedString instead of NSAttributedString

Author: tinder-cfuller

README.md

@@ -163,7 +163,7 @@ Bindings
     <tr></tr>
     <tr>
       <td><code>.attributedTitle(for: UIControl.State)</code></td>
-      <td><code>NSAttributedString</code></td>
+      <td><code>AttributedString</code></td>
     </tr>
     <tr></tr>
     <tr>
@@ -207,7 +207,7 @@ Bindings
     <tr></tr>
     <tr>
       <td><code>.attributedText</code></td>
-      <td><code>NSAttributedString</code></td>
+      <td><code>AttributedString</code></td>
     </tr>
     <tr></tr>
     <tr>
@@ -280,7 +280,7 @@ Bindings
     <tr></tr>
     <tr>
       <td><code>.attributedText</code></td>
-      <td><code>NSAttributedString</code></td>
+      <td><code>AttributedString</code></td>
     </tr>
     <tr></tr>
     <tr>
@@ -386,7 +386,7 @@ Extension Methods
     <tr></tr>
     <tr>
       <td><code>.attributedTextPublisher()</code></td>
-      <td><code>AnyPublisher&lt;NSAttributedString, Never&gt;</code></td>
+      <td><code>AnyPublisher&lt;AttributedString, Never&gt;</code></td>
     </tr>
     <tr></tr>
     <tr>
@@ -442,7 +442,7 @@ Extension Methods
 
 ```swift
 func title(for state: UIControl.State) -> Binding<String>
-func attributedTitle(for state: UIControl.State) -> Binding<NSAttributedString>
+func attributedTitle(for state: UIControl.State) -> Binding<AttributedString>
 ```
 
 ### Extension Method
@@ -470,7 +470,7 @@ Just("Title")
     .bind(to: button.bindable.title(for: .normal))
     .store(in: &cancellables)
 
-Just(NSAttributedString("Title"))
+Just(AttributedString("Title"))
     .bind(to: button.bindable.attributedTitle(for: .normal))
     .store(in: &cancellables)
 
@@ -717,7 +717,7 @@ swipe
 ```swift
 var isEnabled: Binding<Bool>
 var text: Binding<String>
-var attributedText: Binding<NSAttributedString>
+var attributedText: Binding<AttributedString>
 ```
 
 ### Code Example
@@ -1225,7 +1225,7 @@ Just(true)
 // Properties
 
 var text: AnyPublisher<String, Never>
-var attributedText: AnyPublisher<NSAttributedString, Never>
+var attributedText: AnyPublisher<AttributedString, Never>
 
 // UITextFieldDelegate
 
@@ -1238,15 +1238,15 @@ var didChangeSelection: AnyPublisher<Void, Never>
 
 ```swift
 var text: Binding<String>
-var attributedText: Binding<NSAttributedString>
+var attributedText: Binding<AttributedString>
 ```
 
 ### Extension Methods
 
 ```swift
 func textPublisher() -> AnyPublisher<String, Never>
 
-func attributedTextPublisher() -> AnyPublisher<NSAttributedString, Never>
+func attributedTextPublisher() -> AnyPublisher<AttributedString, Never>
 ```
 
 ### Code Example
@@ -1277,7 +1277,7 @@ Just("Text")
     .bind(to: textField.bindable.text)
     .store(in: &cancellables)
 
-Just(NSAttributedString("Text"))
+Just(AttributedString("Text"))
     .bind(to: textField.bindable.attributedText)
     .store(in: &cancellables)
 

Sources/CombineUI/UIKit/Bindings/Bindable+UIButton.swift

@@ -15,7 +15,7 @@ extension Bindable where Target: UIButton {
 
     @preconcurrency
     @MainActor
-    public func attributedTitle(for state: UIControl.State) -> Binding<NSAttributedString> {
-        Binding(self) { $0.setAttributedTitle($1, for: state) }
+    public func attributedTitle(for state: UIControl.State) -> Binding<AttributedString> {
+        Binding(self) { $0.setAttributedTitle(NSAttributedString($1), for: state) }
     }
 }

Sources/CombineUI/UIKit/Bindings/Bindable+UILabel.swift

@@ -15,7 +15,7 @@ extension Bindable where Target: UILabel {
         Binding(self, for: \.text)
     }
 
-    @preconcurrency @MainActor public var attributedText: Binding<NSAttributedString> {
-        Binding(self, for: \.attributedText)
+    @preconcurrency @MainActor public var attributedText: Binding<AttributedString> {
+        Binding(self) { $0.attributedText = NSAttributedString($1) }
     }
 }

Sources/CombineUI/UIKit/Bindings/Bindable+UITextField.swift

@@ -11,7 +11,7 @@ extension Bindable where Target: UITextField {
         Binding(self, for: \.text)
     }
 
-    @preconcurrency @MainActor public var attributedText: Binding<NSAttributedString> {
-        Binding(self, for: \.attributedText)
+    @preconcurrency @MainActor public var attributedText: Binding<AttributedString> {
+        Binding(self) { $0.attributedText = NSAttributedString($1) }
     }
 }

Sources/CombineUI/UIKit/Controls/TextField/TextField.swift

@@ -35,12 +35,12 @@ extension UITextField {
 
     @preconcurrency
     @MainActor
-    public func attributedTextPublisher() -> AnyPublisher<NSAttributedString, Never> {
+    public func attributedTextPublisher() -> AnyPublisher<AttributedString, Never> {
         publisher(for: .allEditingEvents)
             .compactMap(bindable)
             .map(\.attributedText)
             .prepend(attributedText)
-            .map { $0 ?? NSAttributedString(string: "") }
+            .map { $0.flatMap { AttributedString($0) } ?? AttributedString("") }
             .removeDuplicates()
             .eraseToAnyPublisher()
     }

Sources/CombineUI/UIKit/Controls/TextField/TextFieldInterface.swift

@@ -14,7 +14,7 @@ public struct TextFieldInterface<T: UITextField> {
         .share()
         .eraseToAnyPublisher()
 
-    public private(set) lazy var attributedText: AnyPublisher<NSAttributedString, Never> = textField
+    public private(set) lazy var attributedText: AnyPublisher<AttributedString, Never> = textField
         .attributedTextPublisher()
         .share()
         .eraseToAnyPublisher()

Tests/CombineUITests/UIKit/BindingsTests/UIButtonTests.swift

@@ -18,7 +18,7 @@ final class UIButtonTests: XCTestCase {
     func testAttributedTitle() {
         let button: UIButton = .init()
         expect(button.attributedTitle(for: .normal)?.string) == nil
-        button.bindable.attributedTitle(for: .normal).receiveValue(NSAttributedString("Attributed Title"))
+        button.bindable.attributedTitle(for: .normal).receiveValue(AttributedString("Attributed Title"))
         expect(button.attributedTitle(for: .normal)?.string) == "Attributed Title"
     }
 }

Tests/CombineUITests/UIKit/BindingsTests/UILabelTests.swift

@@ -25,7 +25,7 @@ final class UILabelTests: XCTestCase {
     func testAttributedText() {
         let label: UILabel = .init()
         expect(label.attributedText) == nil
-        label.bindable.attributedText.receiveValue(NSAttributedString("Attributed Text"))
+        label.bindable.attributedText.receiveValue(AttributedString("Attributed Text"))
         expect(label.attributedText?.string) == "Attributed Text"
     }
 }

Tests/CombineUITests/UIKit/BindingsTests/UITextFieldTests.swift

@@ -18,7 +18,7 @@ final class UITextFieldTests: XCTestCase {
     func testAttributedText() {
         let textField: UITextField = .init()
         expect(textField.attributedText?.string.isEmpty) == true
-        textField.bindable.attributedText.receiveValue(NSAttributedString("Attributed Text"))
+        textField.bindable.attributedText.receiveValue(AttributedString("Attributed Text"))
         expect(textField.attributedText?.string) == "Attributed Text"
     }
 }

Tests/CombineUITests/UIKit/ControlsTests/TextFieldTests.swift

@@ -24,8 +24,8 @@ final class TextFieldTests: XCTestCase {
             targets.values.forEach { $0.editingChanged() }
         }
 
-        func invoke(_ attributedText: NSAttributedString) {
-            self.attributedText = attributedText
+        func invoke(_ attributedText: AttributedString) {
+            self.attributedText = NSAttributedString(attributedText)
             targets.values.forEach { $0.editingChanged() }
         }
 
@@ -73,14 +73,16 @@ final class TextFieldTests: XCTestCase {
         viewController
             .$textField
             .attributedText
-            .map(\.string)
+            .map(\.characters)
+            .map { $0[...] }
+            .map(String.init)
             .sink { receivedValues.append($0) }
             .store(in: &cancellables)
         expect(textField.targets.count) == 1
         expect(receivedValues) == [""]
-        textField.invoke(NSAttributedString("Hello"))
+        textField.invoke(AttributedString("Hello"))
         expect(receivedValues) == ["", "Hello"]
-        textField.invoke(NSAttributedString("World"))
+        textField.invoke(AttributedString("World"))
         expect(receivedValues) == ["", "Hello", "World"]
     }