Only support Apple's 2020 OSs

Author: amayers

.github/workflows/swift.yml

@@ -18,15 +18,7 @@ jobs:
       uses: maxim-lobanov/setup-xcode@1.0
       with:
         xcode-version: 12.0
-    - name: Build Xcode 12.0
+    - name: Build
       run: swift build -v
-    - name: Run tests Xcode 12.0
-      run: swift test -v
-    - name: Switch to Xcode 11.6
-      uses: maxim-lobanov/setup-xcode@1.0
-      with:
-        xcode-version: 11.6
-    - name: Build Xcode 11.6
-      run: swift build -v
-    - name: Run tests Xcode 11.6
+    - name: Run tests
       run: swift test -v

Package.swift

@@ -1,11 +1,11 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
 
 let package = Package(
     name: "NumericText",
-    platforms: [.iOS(.v13), .macOS(.v10_15), .watchOS(.v6), .tvOS(.v13)],
+    platforms: [.iOS(.v14), .macOS(.v10_16), .watchOS(.v7), .tvOS(.v14)],
     products: [
         .library(
             name: "NumericText",

README.md

@@ -30,7 +30,7 @@ var body: Some View {
 
 ## Installation
 
-Use Swift Package Manager or just drag and drop the two source files into your project. It supports any of Apple's platforms that support SwiftUI's initial release. So iOS 13, macOS 10.15, tvOS 13, watchOS 6.
+Use Swift Package Manager or just drag and drop the two source files into your project. It supports iOS 14, macOS 10.16/11, tvOS 14, watchOS 7.
 
 ## Improvement ideas
 * Ditch `NSNumber?` as the bound value, and allow binding either `Int?` or `Double?`. I took a quick shot at this, but my generics skills weren't sufficient to figure it out.

Sources/NumericText/NumericTextField.swift

@@ -38,9 +38,9 @@ public struct NumericTextField: View {
     }
 
     public var body: some View {
-        TextField(title, text: $string, onEditingChanged: onEditingChanged, onCommit: onCommit)
-            .keyboardType(isDecimalAllowed ? .decimalPad : .numberPad)
+        return TextField(title, text: $string, onEditingChanged: onEditingChanged, onCommit: onCommit)
             .onChange(of: string, perform: numberChanged(newValue:))
+            .modifier(KeyboardModifier(isDecimalAllowed: isDecimalAllowed))
     }
 
     private func numberChanged(newValue: String) {
@@ -52,17 +52,30 @@ public struct NumericTextField: View {
     }
 }
 
+private struct KeyboardModifier: ViewModifier {
+    let isDecimalAllowed: Bool
+
+    func body(content: Content) -> some View {
+        #if os(iOS)
+        return content
+            .keyboardType(isDecimalAllowed ? .decimalPad : .numberPad)
+        #else
+        return content
+        #endif
+    }
+}
+
 struct NumericTextField_Previews: PreviewProvider {
     @State private static var int: NSNumber?
     @State private static var double: NSNumber?
 
     static var previews: some View {
         VStack {
             NumericTextField("Int", number: $int, isDecimalAllowed: false)
-                .textFieldStyle(RoundedBorderTextFieldStyle())
+                .border(/*@START_MENU_TOKEN@*/Color.black/*@END_MENU_TOKEN@*/, width: /*@START_MENU_TOKEN@*/1/*@END_MENU_TOKEN@*/)
                 .padding()
             NumericTextField("Double", number: $double, isDecimalAllowed: true)
-                .textFieldStyle(RoundedBorderTextFieldStyle())
+                .border(/*@START_MENU_TOKEN@*/Color.black/*@END_MENU_TOKEN@*/, width: /*@START_MENU_TOKEN@*/1/*@END_MENU_TOKEN@*/)
                 .padding()
         }
     }