Merge pull request #6 from thisIsTheFoxe/update/ios14

Updated version for iOS 14 & Swift 5.3

Author: thisIsTheFoxe

.github/workflows/lint.yml

@@ -0,0 +1,14 @@
+# Lints the project using SwiftLint
+name: SwiftLint
+  
+on: [push]
+
+jobs:
+  Lint:
+    runs-on: ubuntu-latest
+    
+    steps:
+     - uses: actions/checkout@v2
+       
+     - name: GitHub Action for SwiftLint
+       uses: norio-nomura/action-swiftlint@3.1.0

.github/workflows/sonar.yml

@@ -5,7 +5,7 @@ on: [push]
 jobs:
   build:
 
-    runs-on: macos
+    runs-on: macos-latest
 
 # build also for iOS, not possible (yet)? .-.
 
@@ -22,6 +22,6 @@ jobs:
           -ignore-filename-regex="(.build/|Tests/)" \
           .build/debug/SimpleKeyboardPackageTests.xctest/Contents/MacOS/SimpleKeyboardPackageTests > ./coverage.lcov
     - name: Codecov
-      uses: codecov/codecov-action@v1.0.5
+      uses: codecov/codecov-action@v1
       with:
         token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/swift.yml

@@ -1,30 +1,29 @@
-// swift-tools-version:5.1
+// 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: "SimpleKeyboard",
+    defaultLocalization: "en",
     //to be fair, watchOS support is pretty stupid, if you need it please open an issue...
     platforms: [.iOS(SupportedPlatform.IOSVersion.v13), .macOS(SupportedPlatform.MacOSVersion.v10_15)],
     products: [
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
             name: "SimpleKeyboard",
-            targets: ["SimpleKeyboard"]),
+            targets: ["SimpleKeyboard"])
     ],
     dependencies: [
-        // Dependencies declare other packages that this package depends on.
         // .package(url: /* package url */, from: "1.0.0"),
     ],
     targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
+        // Targets can depend on other targets.
         .target(
             name: "SimpleKeyboard",
             dependencies: []),
         .testTarget(
             name: "SimpleKeyboardTests",
-            dependencies: ["SimpleKeyboard"]),
+            dependencies: ["SimpleKeyboard"])
     ]
 )

Package.swift

@@ -1,10 +1,9 @@
 # SimpleKeyboard
 
+[![Swift](https://github.com/thisIsTheFoxe/SimpleKeyboard/workflows/Swift/badge.svg)](https://github.com/thisIsTheFoxe/SimpleKeyboard/actions?query=workflow%3ASwift)
+[![SwiftLint](https://github.com/thisIsTheFoxe/SimpleKeyboard/workflows/SwiftLint/badge.svg)](https://github.com/thisIsTheFoxe/SimpleKeyboard/actions?query=workflow%3ASwiftLint)
 [![codecov](https://codecov.io/gh/thisIsTheFoxe/SimpleKeyboard/branch/master/graph/badge.svg)](https://codecov.io/gh/thisIsTheFoxe/SimpleKeyboard)
-![](https://github.com/thisisthefoxe/SimpleKeyboard/workflows/Swift/badge.svg)
-![](https://github.com/thisisthefoxe/SimpleKeyboard/workflows/Sonarcloud/badge.svg)
-
-
+[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=thisIsTheFoxe_SimpleKeyboard&metric=sqale_rating)](https://sonarcloud.io/dashboard?id=thisIsTheFoxe_SimpleKeyboard)
 
 The idea of this package came from a keyboard-extension and the fact that - AFAIK - one can't open another keyboard within a keyboard-extension. So the goal was to have a ViewController, that simply displays the keyboard and changes a `text` variable. 
 
@@ -19,12 +18,12 @@ Or one can choose to only display the keyboard with a the text input coming from
 ### Use SimpleKeyboard with UIKit
 Here is an example implementation from one of my projects:
 ```swift
-class MyViewController: UIViewController{
+class MyViewController: UIViewController {
     @IBOutlet var textField: UITextField!
 
     //..........
 
-    func presentKeyboard(){
+    func presentKeyboard() {
         let keyboardSettings = KeyboardSettings(language: .english, textInput: self.textField)
         let keyboardVC = MyKeyboardMaker(settings: keyboardSettings).makeViewController()
         self.contentController.pushViewController(keyboardVC, animated: true)
@@ -34,11 +33,11 @@ class MyViewController: UIViewController{
 ```
 
 ```swift
-struct MyKeyboardMaker{
+struct MyKeyboardMaker {
 
     @ObservedObject var settings: KeyboardSettings
 
-    func makeViewController()-> UIHostingController<SimpleStandardKeyboard>{
+    func makeViewController() -> UIHostingController<SimpleStandardKeyboard> {
         UIHostingController(rootView: SimpleStandardKeyboard(settings: $settings)
     }
 }

README.md

@@ -8,86 +8,84 @@
 import Combine
 import SwiftUI
 
-
 public protocol SimpleKeyboardInput {
-    var currentText: String {  get }
+    var currentText: String { get }
     mutating func replaceAll(with text: String)
 }
 
 extension Binding: SimpleKeyboardInput where Value == String {
     public var currentText: String {
         self.wrappedValue
     }
-    
-    public mutating func replaceAll(with text: String){
+
+    public mutating func replaceAll(with text: String) {
         self.wrappedValue = text
-        print("mutating func replaceALl = "+self.wrappedValue)
     }
 }
 
-#if canImport(AppKit)
+#if canImport(AppKit) && !targetEnvironment(macCatalyst)
 import AppKit
-extension NSTextField: SimpleKeyboardInput{
+extension NSTextField: SimpleKeyboardInput {
     public var currentText: String {
         self.stringValue
     }
-    
-    public func replaceAll(with text: String){
+
+    public func replaceAll(with text: String) {
         stringValue = text
     }
 }
 #endif
 
 #if canImport(UIKit)
 import UIKit
-extension UITextField : SimpleKeyboardInput{
+
+extension UITextField: SimpleKeyboardInput {
     public var currentText: String {
         self.text ?? ""
     }
-    
-    public func replaceAll(with text: String){
+
+    public func replaceAll(with text: String) {
         self.text = text
     }
 }
 #endif
 
 public class KeyboardSettings: ObservableObject {
     public var text: String = "" {
-        didSet{
+        didSet {
             textInput?.replaceAll(with: text)
         }
     }
-    
+
     var language: Language
-    
+
     public var textInput: SimpleKeyboardInput?
-    public var action: (()->())?
-    
-    //        self._isShown = isShown
+    public var action: (() -> Void)?
+
     var showNumbers: Bool
     var showSpace: Bool
-    
+
     ///`nil` mean there is no need to switch, so there will be no shift-key
-    var isUpperCase: Bool?{
-        willSet{
-            print("ay!")
+    var isUpperCase: Bool? {
+        willSet {
             objectWillChange.send()
         }
     }
 
-    ///`textInput` should be `nil` when working directly with SwiftUI, in that case you would privide your 'bound' value directly to the keyboard
-    public init(language: Language, textInput: SimpleKeyboardInput?, showNumbers: Bool = false, showSpace: Bool = false, isUpperCase: Bool? = nil, action: (()->())? = nil){
+    ///`textInput` should be `nil` when working directly with SwiftUI,
+    ///in that case you would bind your input directly to the `textInput` of the Keyboard
+    public init(language: Language, textInput: SimpleKeyboardInput?, showNumbers: Bool = false,
+                showSpace: Bool = false, isUpperCase: Bool? = nil, action: (() -> Void)? = nil) {
         self.textInput = textInput
         self.language = language
         self.action = action
         self.showNumbers = showNumbers
         self.showSpace = showSpace
         self.isUpperCase = isUpperCase
     }
-    
-    func changeTextInput(to newInput: SimpleKeyboardInput){
+
+    func changeTextInput(to newInput: SimpleKeyboardInput) {
         self.textInput = newInput
         self.text = newInput.currentText
-        print("changed Input")
     }
 }

Sources/SimpleKeyboard/Models/KeyboardSettings.swift

@@ -7,22 +7,34 @@
 
 import Foundation
 public enum Language: CaseIterable {
-    static func numbers(areUppercased: Bool) -> [String]{
-        return areUppercased ? ["!", "?", ".", "%", "+", "-", "_", "=", "@", "#"] : ["1","2","3","4","5","6","7","8","9","0"]
+    static func numbers(areUppercased: Bool) -> [String] {
+        return areUppercased ? ["!", "?", ".", "%", "+", "-", "_", "=", "@", "#"] :
+            ["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"]
     }
+
     case english, german
-    
+
     func rows(areUppercased: Bool) -> [[String]] {
-        var r = [[String]]()
-        switch self{
+        var result = [[String]]()
+        switch self {
         case .english:
-            r = [["q","w","e","r","t","y","u","i","o","p"],["a","s","d","f","g","h","j","k","l"],["z","x","c","v","b","n","m"]]
+            result = [
+                ["q", "w", "e", "r", "t", "y", "u", "i", "o", "p"],
+                ["a", "s", "d", "f", "g", "h", "j", "k", "l"],
+                ["z", "x", "c", "v", "b", "n", "m"]
+            ]
         case .german:
-            r = [["q","w","e","r","t","z","u","i","o","p"],["a","s","d","f","g","h","j","k","l"],["y","x","c","v","b","n","m"]]
+            result = [
+                ["q", "w", "e", "r", "t", "z", "u", "i", "o", "p"],
+                ["a", "s", "d", "f", "g", "h", "j", "k", "l"],
+                ["y", "x", "c", "v", "b", "n", "m"]
+            ]
         }
+
         if areUppercased {
-            r = r.map{ $0.map { $0.uppercased() } }
+            result = result.map { $0.map { $0.uppercased() } }
         }
-        return r
+
+        return result
     }
 }

Sources/SimpleKeyboard/Models/Language.swift

@@ -9,16 +9,16 @@ import SwiftUI
 
 struct ShiftKeyButton: View {
     @Binding var isUpperCase: Bool!
-    
+
     var body: some View {
         AnyView(Button(action: { self.isUpperCase?.toggle() }) { () -> AnyView in
-            #if os(macOS)
-            return AnyView(Text(isUpperCase! ? "Up": "lw"))
+            #if !targetEnvironment(macCatalyst)
+            return AnyView(Text(isUpperCase! ? "Up": "lw"/*, bundle: .module*/))
             #else
             return AnyView(Image(systemName: isUpperCase ? "shift.fill" : "shift").imageScale(.large))
             #endif
         })
-            .foregroundColor(.primary)
+        .foregroundColor(.primary)
         .font(Font.headline.weight(.semibold))
         .padding()
         .background(Color.gray.opacity(0.5))
@@ -29,8 +29,8 @@ struct ShiftKeyButton: View {
 struct KeyButton: View {
     @Binding var text: String
     var letter: String
-    
-    var body: some View{
+
+    var body: some View {
         Button(action: { self.text.append(self.letter) }) {
             Text(letter)
                 .foregroundColor(.primary)
@@ -45,10 +45,10 @@ struct KeyButton: View {
 
 struct SpaceKeyButton: View {
     @Binding var text: String
-    
-    var body: some View{
+
+    var body: some View {
         Button(action: { self.text.append(" ") }) {
-            Text("space").padding().padding(.horizontal, 75)
+            Text("space"/*, bundle: .module*/).padding().padding(.horizontal, 75)
                 .foregroundColor(.primary)
                 .background(Color.gray.opacity(0.5)).cornerRadius(7)
         }
@@ -57,20 +57,20 @@ struct SpaceKeyButton: View {
 
 struct DeleteKeyButton: View {
     @Binding var text: String
-    
-    var body: some View{
+
+    var body: some View {
         AnyView(Button(action: {
             guard !self.text.isEmpty else { return }
             _ = self.text.removeLast()
-        }) { () -> AnyView in 
-            #if os(macOS)
+        }) { () -> AnyView in
+            #if !targetEnvironment(macCatalyst)
             return AnyView(Text("⌫"))
             #else
             return AnyView(Image(systemName: "delete.left")
                 .foregroundColor(.primary)
                 .imageScale(.large)
                 .font(Font.headline.weight(.semibold))
-                .padding()
+                .padding(10)
                 .background(Color.gray.opacity(0.5)).cornerRadius(7))
             #endif
         })
@@ -79,9 +79,9 @@ struct DeleteKeyButton: View {
 
 struct ActionKeyButton: View {
     @State var icon: Icon
-    var action: ()->()
-    
-    var body: some View{
+    var action: () -> Void
+
+    var body: some View {
         Button(action: self.action) {
             icon.view.padding()
                 .foregroundColor(.white)
@@ -92,17 +92,17 @@ struct ActionKeyButton: View {
 
 enum Icon {
     case done, search, go
-    
-    var view: some View{
-        switch self{
-        case .done: return AnyView(Text("Done!"))
+
+    var view: some View {
+        switch self {
+        case .done: return AnyView(Text("Done!"/* , bundle: .module*/))
         case .search:
-            #if os(macOS)
-            return AnyView(Text("Search"))
+            #if !targetEnvironment(macCatalyst)
+            return AnyView(Text("Search"/*, bundle: .module*/))
             #else
             return AnyView(Image(systemName: "magnifyingglass"))
             #endif
-        case .go: return AnyView(Text("Go!"))
+        case .go: return AnyView(Text("Go!"/*, bundle: .module*/))
         }
     }
 }