Swift formatting with swiftformat

aure · aure · commit 58225e07c2f7 · 2022-08-09T12:11:48.000-07:00
diff --git a/Demo/Shared/ContentView.swift b/Demo/Shared/ContentView.swift
@@ -1,9 +1,8 @@
-import SwiftUI
 import Keyboard
+import SwiftUI
 import Tonic
 
 struct ContentView: View {
-
     func noteOn(pitch: Pitch) {
         print("note on \(pitch)")
     }
@@ -12,44 +11,47 @@ struct ContentView: View {
         print("note off \(pitch)")
     }
 
-    var randomColors: [Color] = {
-        (0...12).map { _ in Color(red: Double.random(in: 0...1), green: Double.random(in: 0...1), blue: Double.random(in: 0...1), opacity: 1) }
-    }()
+    var randomColors: [Color] = (0 ... 12).map { _ in
+        Color(red: Double.random(in: 0 ... 1),
+              green: Double.random(in: 0 ... 1),
+              blue: Double.random(in: 0 ... 1), opacity: 1)
+    }
 
     @State var lowNote = 24
     @State var highNote = 48
 
     var body: some View {
         HStack {
-            Keyboard(layout: .pianoRoll(pitchRange: Pitch(48)...Pitch(77))).frame(width: 200)
+            Keyboard(layout: .pianoRoll(pitchRange: Pitch(48) ... Pitch(77))).frame(width: 200)
             VStack {
                 HStack {
                     Stepper("Lowest Note: \(Pitch(intValue: lowNote).note(in: .C).description)",
                             onIncrement: {
-                        if lowNote < 126 && highNote > lowNote + 12 {
-                            lowNote += 1
-                        }
-                    },
+                                if lowNote < 126, highNote > lowNote + 12 {
+                                    lowNote += 1
+                                }
+                            },
                             onDecrement: {
-                        if lowNote > 0 {
-                            lowNote -= 1
-                        }
-                    })
+                                if lowNote > 0 {
+                                    lowNote -= 1
+                                }
+                            })
                     Stepper("Highest Note: \(Pitch(intValue: highNote).note(in: .C).description)",
                             onIncrement: {
-                        if highNote < 126 {
-                            highNote += 1
-                        }},
+                                if highNote < 126 {
+                                    highNote += 1
+                                }
+                            },
                             onDecrement: {
-                        if highNote > 1 && highNote > lowNote + 12 {
-                            highNote -= 1
-                        }
+                                if highNote > 1, highNote > lowNote + 12 {
+                                    highNote -= 1
+                                }
 
-                    })
+                            })
                 }
-                Keyboard(layout: .piano(pitchRange: Pitch(intValue: lowNote)...Pitch(intValue: highNote)),
+                Keyboard(layout: .piano(pitchRange: Pitch(intValue: lowNote) ... Pitch(intValue: highNote)),
                          noteOn: noteOn, noteOff: noteOff)
-                Keyboard(layout: .isomorphic(pitchRange: Pitch(12)...Pitch(84)),
+                Keyboard(layout: .isomorphic(pitchRange: Pitch(12) ... Pitch(84)),
                          noteOn: noteOn, noteOff: noteOff)
                 Keyboard(layout: .guitar(openPitches: [Pitch(64), Pitch(59), Pitch(55), Pitch(50), Pitch(45), Pitch(40)], fretcount: 22),
                          noteOn: noteOn, noteOff: noteOff) { pitch, isActivated in
@@ -59,7 +61,7 @@ struct ContentView: View {
                                 pressedColor: Color(PitchColor.newtonian[Int(pitch.pitchClass)]),
                                 alignment: .center)
                 }
-                Keyboard(layout: .isomorphic(pitchRange: Pitch(48)...Pitch(65))) { pitch, isActivated in
+                Keyboard(layout: .isomorphic(pitchRange: Pitch(48) ... Pitch(65))) { pitch, isActivated in
                     KeyboardKey(pitch: pitch,
                                 isActivated: isActivated,
                                 text: pitch.note(in: .F).description,
diff --git a/Keyboard.playground/Contents.swift b/Keyboard.playground/Contents.swift
@@ -1,13 +1,13 @@
 import Keyboard
-import Tonic
-import SwiftUI
 import PlaygroundSupport
+import SwiftUI
+import Tonic
 
 struct ContentView: View {
     var body: some View {
         Keyboard()
         Keyboard(layout: .isomorphic)
-        Keyboard(pitchRange: Pitch(0)...Pitch(60+37))
+        Keyboard(pitchRange: Pitch(0) ... Pitch(60 + 37))
     }
 }
 
diff --git a/Package.swift b/Package.swift
@@ -4,7 +4,7 @@ import PackageDescription
 
 let package = Package(
     name: "Keyboard",
-    platforms: [ .macOS(.v12), .iOS(.v15)],
+    platforms: [.macOS(.v12), .iOS(.v15)],
     products: [.library(name: "Keyboard", targets: ["Keyboard"])],
     dependencies: [.package(url: "https://github.com/AudioKit/Tonic.git", from: "1.0.0")],
     targets: [
diff --git a/Sources/Keyboard/KeyContainer.swift b/Sources/Keyboard/KeyContainer.swift
@@ -4,8 +4,8 @@ import Tonic
 /// This handles the interaction for key, so the user can provide their own
 /// visual representation.
 struct KeyContainer<Content: View>: View {
-    let content: (Pitch, Bool)->Content
-    
+    let content: (Pitch, Bool) -> Content
+
     var pitch: Pitch
     @ObservedObject var model: KeyboardModel
 
@@ -16,7 +16,8 @@ struct KeyContainer<Content: View>: View {
          pitch: Pitch,
          zIndex: Int = 0,
          latching: Bool,
-         @ViewBuilder content: @escaping (Pitch, Bool)->Content) {
+         @ViewBuilder content: @escaping (Pitch, Bool) -> Content)
+    {
         self.model = model
         self.pitch = pitch
         self.zIndex = zIndex
@@ -36,14 +37,14 @@ struct KeyContainer<Content: View>: View {
                 }
             )
             .simultaneousGesture(
-                TapGesture().onEnded({ _ in
+                TapGesture().onEnded { _ in
                     guard latching else { return }
                     if model.externallyActivatedPitches.contains(pitch) {
                         model.externallyActivatedPitches.remove(pitch)
                     } else {
                         model.externallyActivatedPitches.add(pitch)
                     }
-                })
+                }
             )
             .preference(key: KeyRectsKey.self,
                         value: [KeyRectInfo(rect: rect,
diff --git a/Sources/Keyboard/Keyboard.swift b/Sources/Keyboard/Keyboard.swift
@@ -2,21 +2,22 @@ import SwiftUI
 import Tonic
 
 public struct Keyboard<Content>: View where Content: View {
-    let content: (Pitch, Bool)->Content
+    let content: (Pitch, Bool) -> Content
 
-    @StateObject var model: KeyboardModel = KeyboardModel()
+    @StateObject var model: KeyboardModel = .init()
 
     var latching: Bool
     var noteOn: (Pitch) -> Void
     var noteOff: (Pitch) -> Void
     var layout: KeyboardLayout
 
-    public init(layout: KeyboardLayout = .piano(pitchRange: (Pitch(60)...Pitch(72))),
+    public init(layout: KeyboardLayout = .piano(pitchRange: Pitch(60) ... Pitch(72)),
                 latching: Bool = false,
 
                 noteOn: @escaping (Pitch) -> Void = { _ in },
                 noteOff: @escaping (Pitch) -> Void = { _ in },
-                @ViewBuilder content: @escaping (Pitch, Bool)->Content) {
+                @ViewBuilder content: @escaping (Pitch, Bool) -> Content)
+    {
         self.latching = latching
         self.layout = layout
         self.noteOn = noteOn
@@ -27,13 +28,13 @@ public struct Keyboard<Content>: View where Content: View {
     public var body: some View {
         Group {
             switch layout {
-            case .piano(let pitchRange):
+            case let .piano(pitchRange):
                 Piano(content: content, model: model, pitchRange: pitchRange, latching: latching)
-            case .isomorphic(let pitchRange):
+            case let .isomorphic(pitchRange):
                 Isomorphic(content: content, model: model, pitchRange: pitchRange, latching: latching)
-            case .guitar(let openPitches, let fretCount):
+            case let .guitar(openPitches, fretCount):
                 Guitar(content: content, model: model, openPitches: openPitches, fretCount: fretCount, latching: latching)
-            case .pianoRoll(let pitchRange):
+            case let .pianoRoll(pitchRange):
                 PianoRoll(content: content, model: model, pitchRange: pitchRange, latching: latching)
             }
 
@@ -48,12 +49,12 @@ public struct Keyboard<Content>: View where Content: View {
     }
 }
 
-extension Keyboard where Content == KeyboardKey {
-
-    public init(layout: KeyboardLayout = .piano(pitchRange: (Pitch(60)...Pitch(72))),
-                latching: Bool = false,
-                noteOn: @escaping (Pitch) -> Void = { _ in },
-                noteOff: @escaping (Pitch) -> Void = { _ in }){
+public extension Keyboard where Content == KeyboardKey {
+    init(layout: KeyboardLayout = .piano(pitchRange: Pitch(60) ... Pitch(72)),
+         latching: Bool = false,
+         noteOn: @escaping (Pitch) -> Void = { _ in },
+         noteOff: @escaping (Pitch) -> Void = { _ in })
+    {
         self.layout = layout
         self.latching = latching
         self.noteOn = noteOn
@@ -63,15 +64,15 @@ extension Keyboard where Content == KeyboardKey {
 
         var flatTop = false
         switch layout {
-        case .guitar(_, _):
+        case .guitar:
             alignment = .center
-        case .isomorphic(_):
+        case .isomorphic:
             alignment = .bottom
-        case .piano(_):
+        case .piano:
             flatTop = true
-        case .pianoRoll(_):
+        case .pianoRoll:
             alignment = .trailing
         }
-        self.content = { KeyboardKey(pitch: $0, isActivated: $1, flatTop: flatTop, alignment: alignment) }
+        content = { KeyboardKey(pitch: $0, isActivated: $1, flatTop: flatTop, alignment: alignment) }
     }
 }
diff --git a/Sources/Keyboard/KeyboardKey.swift b/Sources/Keyboard/KeyboardKey.swift
@@ -3,8 +3,6 @@ import Tonic
 
 /// A default visual representation for a key.
 public struct KeyboardKey: View {
-
-
     /// Initialize the keyboard key
     /// - Parameters:
     ///   - pitch: Pitch assigned to the key
@@ -20,7 +18,8 @@ public struct KeyboardKey: View {
                 pressedColor: Color = .red,
                 flatTop: Bool = false,
                 alignment: Alignment = .bottom,
-                isActivatedExternally: Bool = false) {
+                isActivatedExternally: Bool = false)
+    {
         self.pitch = pitch
         self.isActivated = isActivated
         if text == "unset" {
@@ -78,7 +77,7 @@ public struct KeyboardKey: View {
 
     let relativeTextPadding = 0.05
 
-    func relativeCornerRadius(in containerSize: CGSize)-> CGFloat {
+    func relativeCornerRadius(in containerSize: CGSize) -> CGFloat {
         minDimension(containerSize) * 0.125
     }
 
@@ -89,14 +88,13 @@ public struct KeyboardKey: View {
                     .foregroundColor(keyColor)
                     .padding(.top, flatTop ? relativeCornerRadius(in: proxy.size) : 0)
                     .cornerRadius(relativeCornerRadius(in: proxy.size))
-                    .padding(.top, flatTop ? -relativeCornerRadius(in: proxy.size): 1)
+                    .padding(.top, flatTop ? -relativeCornerRadius(in: proxy.size) : 1)
                     .padding(.trailing, 1)
                 Text(text)
                     .font(Font(.init(.system, size: relativeFontSize(in: proxy.size))))
                     .foregroundColor(textColor)
                     .padding(relativeFontSize(in: proxy.size) / 3.0)
             }
-
         }
     }
 }
diff --git a/Sources/Keyboard/KeyboardModel.swift b/Sources/Keyboard/KeyboardModel.swift
@@ -2,7 +2,6 @@ import SwiftUI
 import Tonic
 
 class KeyboardModel: ObservableObject {
-
     var keyRectInfos: [KeyRectInfo] = []
     var noteOn: (Pitch) -> Void = { _ in }
     var noteOff: (Pitch) -> Void = { _ in }
@@ -11,11 +10,11 @@ class KeyboardModel: ObservableObject {
         didSet {
             var newPitches = PitchSet()
             for location in touchLocations {
-                var pitch: Pitch? = nil
+                var pitch: Pitch?
                 var highestZindex = -1
                 for info in keyRectInfos where info.rect.contains(location) {
                     if pitch == nil || info.zIndex > highestZindex {
-                        pitch  = info.pitch
+                        pitch = info.pitch
                         highestZindex = info.zIndex
                     }
                 }
diff --git a/Sources/Keyboard/Layouts/Guitar.swift b/Sources/Keyboard/Layouts/Guitar.swift
@@ -2,25 +2,24 @@ import SwiftUI
 import Tonic
 
 struct Guitar<Content>: View where Content: View {
-
-    let content: (Pitch, Bool)->Content
+    let content: (Pitch, Bool) -> Content
     var model: KeyboardModel
     var openPitches: [Pitch]
     var fretCount: Int
     var latching: Bool
 
     var body: some View {
-        //Loop through the keys and add rows (strings)
-        //Each row has a 5 note offset tuning them to 4ths
-        //The pitchRange is for the lowest row (string)
+        // Loop through the keys and add rows (strings)
+        // Each row has a 5 note offset tuning them to 4ths
+        // The pitchRange is for the lowest row (string)
         VStack(spacing: 0) {
-            ForEach(0..<openPitches.count, id: \.self) { string in
-                HStack(spacing: 0){
-                    ForEach(0..<fretCount + 1, id: \.self) { fret in
-                    KeyContainer(model: model,
-                                 pitch: Pitch(intValue: openPitches[string].intValue + fret),
-                                 latching: latching,
-                                 content: content)
+            ForEach(0 ..< openPitches.count, id: \.self) { string in
+                HStack(spacing: 0) {
+                    ForEach(0 ..< fretCount + 1, id: \.self) { fret in
+                        KeyContainer(model: model,
+                                     pitch: Pitch(intValue: openPitches[string].intValue + fret),
+                                     latching: latching,
+                                     content: content)
                     }
                 }
             }
@@ -29,4 +28,3 @@ struct Guitar<Content>: View where Content: View {
         .clipShape(Rectangle())
     }
 }
-
diff --git a/Sources/Keyboard/Layouts/Isomorphic.swift b/Sources/Keyboard/Layouts/Isomorphic.swift
@@ -2,8 +2,7 @@ import SwiftUI
 import Tonic
 
 struct Isomorphic<Content>: View where Content: View {
-
-    let content: (Pitch, Bool)->Content
+    let content: (Pitch, Bool) -> Content
     var model: KeyboardModel
     var pitchRange: ClosedRange<Pitch>
     var latching: Bool
@@ -21,4 +20,3 @@ struct Isomorphic<Content>: View where Content: View {
         .clipShape(Rectangle())
     }
 }
-
diff --git a/Sources/Keyboard/Layouts/KeyboardLayout.swift b/Sources/Keyboard/Layouts/KeyboardLayout.swift
@@ -2,7 +2,7 @@ import SwiftUI
 import Tonic
 
 /// Types of keyboards we can generate
-public enum KeyboardLayout: Equatable, Hashable  {
+public enum KeyboardLayout: Equatable, Hashable {
     /// Guitar in arbitrary tuning, from first string (highest) to loweset string
     case guitar(openPitches: [Pitch], fretcount: Int)
 
@@ -11,7 +11,7 @@ public enum KeyboardLayout: Equatable, Hashable  {
 
     /// Traditional Piano layout with raised black keys over white keys
     case piano(pitchRange: ClosedRange<Pitch>)
-    
+
     /// Vertical isomorphic
     case pianoRoll(pitchRange: ClosedRange<Pitch>)
 }
diff --git a/Sources/Keyboard/Layouts/Piano.swift b/Sources/Keyboard/Layouts/Piano.swift
diff --git a/Sources/Keyboard/Layouts/PianoRoll.swift b/Sources/Keyboard/Layouts/PianoRoll.swift
diff --git a/Tests/KeyboardTests/KeyboardTests.swift b/Tests/KeyboardTests/KeyboardTests.swift

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,7 @@ import SwiftUI`
`2`	`2`	`import Tonic`
`3`	`3`
`4`	`4`	`struct Isomorphic<Content>: View where Content: View {`
`5`		`-`
`6`		`- let content: (Pitch, Bool)->Content`
	`5`	`+ let content: (Pitch, Bool) -> Content`
`7`	`6`	`var model: KeyboardModel`
`8`	`7`	`var pitchRange: ClosedRange<Pitch>`
`9`	`8`	`var latching: Bool`
`@@ -21,4 +20,3 @@ struct Isomorphic<Content>: View where Content: View {`
`21`	`20`	`.clipShape(Rectangle())`
`22`	`21`	`}`
`23`	`22`	`}`
`24`		`-`