Merge pull request #9 from thisIsTheFoxe/dev

Dev

Author: thisIsTheFoxe

.swiftpm/xcode/xcshareddata/xcschemes/SimpleKeyboard.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1400"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

.swiftpm/xcode/xcshareddata/xcschemes/SimpleKeyboardTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1400"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Sources/SimpleKeyboard/Views/KeyButton.swift

@@ -24,7 +24,10 @@ struct ShiftKeyButton: View {
 
     var body: some View {
         Button(action: { self.isUpperCase?.toggle() }) {
-            if #available(iOS 14, macOS 11, *) {
+            if #available(iOS 15, macOS 12, *) {
+                AnyView(Image(systemName: isUpperCase ? "shift.fill" : "shift")
+                    .dynamicTypeSize(.large))
+            } else if #available(iOS 14, macOS 11, *) {
                 AnyView(Image(systemName: isUpperCase ? "shift.fill" : "shift"))
             } else {
                 AnyView(Text(isUpperCase! ? "Up": "lw", bundle: .module))
@@ -80,6 +83,7 @@ struct FRAccentKeyButton: View {
                 .background(Color.black.opacity(0.4))
                 .cornerRadius(5)
                 .layoutPriority(10)
+                .shadow(color: .black, radius: 0, y: 1)
         }
     }
 
@@ -108,16 +112,26 @@ struct SpaceKeyButton: View, ClickableKey {
     @Binding var text: String
     @Environment(\.colorScheme) var colorScheme
 
+    var content: some View {
+        let spaceText = Text("space", bundle: .module)
+        if #available(iOS 15.0, macOS 12, *) {
+            return AnyView(spaceText.dynamicTypeSize(.large))
+        } else {
+            return AnyView(spaceText)
+        }
+    }
+
     var body: some View {
         Button(action: { self.text.append(" "); didClick() }) {
-            Text("space", bundle: .module)
+            content
                 .padding()
+                .frame(idealWidth: .infinity, maxWidth: .infinity)
                 .frame(height: 50)
                 .foregroundColor(.primary)
-                .frame(maxWidth: .infinity)
                 .background(colorScheme.keyboardKeyColor)
                 .cornerRadius(7)
                 .layoutPriority(2)
+                .shadow(color: .black, radius: 1, y: 1)
         }
     }
 }
@@ -130,7 +144,9 @@ struct DeleteKeyButton: View {
             guard !self.text.isEmpty else { return }
             _ = self.text.removeLast()
         }) {
-            if #available(iOS 14, macOS 11, *) {
+            if #available(iOS 15, macOS 12, *) {
+                AnyView(Image(systemName: "delete.left").dynamicTypeSize(.large))
+            } else if #available(iOS 14, macOS 11, *) {
                 AnyView(Image(systemName: "delete.left"))
             } else {
                 AnyView(Text("⌫"))
@@ -153,13 +169,24 @@ struct ActionKeyButton: View {
     @State var icon: Icon
     var action: () -> Void
 
+    var iconView: some View {
+        if #available(iOS 15.0, macOS 12, *) {
+            return AnyView(icon.view.dynamicTypeSize(.large))
+        } else {
+            return icon.view
+        }
+    }
+
     var body: some View {
         Button(action: self.action) {
-            icon.view.padding()
+            iconView
+                .padding()
+                .frame(minWidth: 100, maxWidth: .infinity)
                 .frame(height: 50)
                 .foregroundColor(.white)
-                .frame(minWidth: 100, idealWidth: .infinity, maxWidth: .infinity)
-                .background(Color.blue).cornerRadius(7)
+                .background(Color.blue)
+                .cornerRadius(7)
+                .shadow(color: .black, radius: 2, y: 2)
         }
     }
 }
@@ -171,11 +198,11 @@ public enum Icon {
         switch self {
         case .done: return AnyView(Text("Done!", bundle: .module))
         case .search:
-            #if !targetEnvironment(macCatalyst)
-            return AnyView(Text("Search", bundle: .module))
-            #else
-            return AnyView(Image(systemName: "magnifyingglass"))
-            #endif
+            if #available(iOS 14, macOS 11, *) {
+                return AnyView(Image(systemName: "magnifyingglass"))
+            }else {
+                return AnyView(Text("Search", bundle: .module))
+            }
         case .go: return AnyView(Text("Go!", bundle: .module))
         }
     }

Sources/SimpleKeyboard/Views/SimpleKeyboard.swift

@@ -66,7 +66,8 @@ struct SimpleKeyboard_Previews: PreviewProvider {
                 SimpleKeyboard(
                     keys: [["a", "b", "c", "q", "w", "f", "m", "m"], ["d", "e", "f"]],
                     textInput: .constant(""),
-                    theme: .floating)
+                    theme: .floating,
+                    actionButton: .go)
             }
         }
 //        .preferredColorScheme(.dark)

Sources/SimpleKeyboard/Views/SimpleStandardKeyboard.swift

@@ -24,6 +24,7 @@ public struct SimpleStandardKeyboard: View, ThemeableView {
         HStack {
             if settings.showSpace {
                 SpaceKeyButton(text: $settings.text)
+                    .layoutPriority(2)
             }
             if let actionIcon = settings.actionButton {
                 ActionKeyButton(icon: actionIcon) {
@@ -108,6 +109,15 @@ struct SimpleStandardKeyboard_Previews: PreviewProvider {
             LinearGradient(colors: [.red, .green, .purple], startPoint: .bottomLeading, endPoint: .topTrailing)
             VStack {
                 Spacer()
+                SimpleStandardKeyboard(
+                    settings: KeyboardSettings(
+                        language: .english,
+                        textInput: nil,
+                        theme: .system,
+                        actionButton: .search,
+                        showNumbers: true,
+                        showSpace: true,
+                        isUpperCase: true))
                 SimpleStandardKeyboard(
                     settings: KeyboardSettings(
                         language: .english,

Sources/SimpleKeyboard/l10n/de.lproj/Localizable.strings

@@ -1,11 +1,18 @@
-"space" = "Leertaste";
+/* (No Comment) */
+"Done!" = "Fertig!";
 
-"Up" = "Gr";
+/* (No Comment) */
+"Go!" = "Los!";
 
+/* lower case */
 "lw" = "kl";
 
-"Done!" = "Fertig!";
-
+/* (No Comment) */
 "Search" = "Suchen";
 
-"Go!" = "Los!";
+/* (No Comment) */
+"space" = "Leertaste";
+
+/* Upper Case */
+"Up" = "Gr";
+

Sources/SimpleKeyboard/l10n/es.lproj/Localizable.strings

@@ -1,11 +1,18 @@
-"space" = "espacio";
+/* (No Comment) */
+"Done!" = "¡Hecho!";
 
-"Up" = "Ma";
+/* (No Comment) */
+"Go!" = "ir";
 
+/* lower case */
 "lw" = "mi";
 
-"Done!" = "¡Hecho!";
-
+/* (No Comment) */
 "Search" = "buscar";
 
-"Go!" = "ir";
+/* (No Comment) */
+"space" = "espacio";
+
+/* Upper Case */
+"Up" = "Ma";
+