chore: Format code

Author: Danilo Campana Fuchs

ForceTouchPlayer/AppDelegate.swift

@@ -3,29 +3,25 @@ import SwiftUI
 
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
-
     var window: NSWindow!
 
-
-    func applicationDidFinishLaunching(_ aNotification: Notification) {
+    func applicationDidFinishLaunching(_: Notification) {
         // Create the SwiftUI view that provides the window contents.
         let contentView = ContentView(songsRepository: SongsRepository())
 
-        // Create the window and set the content view. 
+        // Create the window and set the content view.
         window = NSWindow(
             contentRect: NSRect(x: 0, y: 0, width: 480, height: 300),
             styleMask: [.titled, .closable, .miniaturizable, .resizable, .fullSizeContentView],
-            backing: .buffered, defer: false)
+            backing: .buffered, defer: false
+        )
         window.center()
         window.setFrameAutosaveName("Main Window")
         window.contentView = NSHostingView(rootView: contentView)
         window.makeKeyAndOrderFront(nil)
     }
 
-    func applicationWillTerminate(_ aNotification: Notification) {
+    func applicationWillTerminate(_: Notification) {
         // Insert code here to tear down your application
     }
-
-
 }
-

ForceTouchPlayer/ContentView.swift

@@ -9,26 +9,24 @@ var currentNote: Note?
 var currentNoteEndTime: Date?
 
 struct ContentView: View {
-    
     let songsList: [Song]
-    
+
     private let timer = Timer.publish(every: timerInterval, tolerance: timerInterval, on: .main, in: .common).autoconnect()
-    
+
     @State private var timerEnabled = false
-    
-    @State private var currentNoteIndex: Int = 0;
-    
+
+    @State private var currentNoteIndex: Int = 0
+
     @State private var tempo = 144.0
     @State private var currentSongIndex: Int = 0
-    
+
     init(songsRepository: SongsRepository) {
-        self.songsList = songsRepository.listSongs()
+        songsList = songsRepository.listSongs()
     }
-    
+
     var body: some View {
+        let tempoStr = String(format: "%d", Int(self.tempo)).padding(toLength: 5, withPad: " ", startingAt: 0)
 
-        let tempoStr = String(format: "%.1f", self.tempo).padding(toLength: 5, withPad: " ", startingAt: 0);
-    
         return HStack {
             Spacer()
                 .frame(width: 64.0)
@@ -41,7 +39,7 @@ struct ContentView: View {
                 }
                 HStack {
                     Text("Tempo: \(tempoStr) BPM").frame(width: 150, alignment: .leading)
-                    Slider(value: $tempo, in: 40...300, step: 8)
+                    Slider(value: $tempo, in: 40 ... 300, step: 8)
                 }
                 Spacer()
                 Text("Don't take your finger off of the trackpad!")
@@ -60,111 +58,111 @@ struct ContentView: View {
             self.playTick(time: time)
         }
     }
-    
-    func handlePickerChange(_ index: Int) {
-        self.tempo = songsList[currentSongIndex].defaultTempo
-        self.stop()
+
+    func handlePickerChange(_: Int) {
+        tempo = songsList[currentSongIndex].defaultTempo
+        stop()
     }
-    
+
     func toggleTimer() {
-        if (self.timerEnabled) {
-            self.stop()
+        if timerEnabled {
+            stop()
         } else {
-            self.start()
+            start()
         }
     }
-    
+
     func start() {
-        self.timerEnabled = true
-        self.enqueueInitialNote()
+        timerEnabled = true
+        enqueueInitialNote()
     }
-    
+
     func stop() {
-        self.timerEnabled = false
-        self.currentNoteIndex = 0
+        timerEnabled = false
+        currentNoteIndex = 0
         currentNote = nil
         currentNoteEndTime = nil
         skippedTicksCount = 0
     }
-    
+
     func playTick(time: Date) {
         guard timerEnabled else { return }
         guard let currentNote = currentNote else { return }
         guard let currentNoteEndTime = currentNoteEndTime else { return }
-        
-        if (time > currentNoteEndTime) {
-            self.enqueueNextNote()
+
+        if time > currentNoteEndTime {
+            enqueueNextNote()
         }
-        
-        self.playTickOfTone(frequency: currentNote.frequency)
+
+        playTickOfTone(frequency: currentNote.frequency)
     }
-    
+
     func enqueueInitialNote() {
-        self.currentNoteIndex = 0
-        self.enqueueNote()
+        currentNoteIndex = 0
+        enqueueNote()
     }
-    
+
     func enqueueNextNote() {
-        self.currentNoteIndex += 1
-        self.enqueueNote()
+        currentNoteIndex += 1
+        enqueueNote()
     }
-    
+
     func enqueueNote() {
-        guard let note = self.loadNote(index: self.currentNoteIndex) else {
+        guard let note = loadNote(index: currentNoteIndex) else {
             // End of song
-            self.stop()
+            stop()
             return
         }
-        
+
         // Time it takes to play a note with 4 beats
         // (1min / tempo (bpm))
-        let baseDuration = (60000.0) / tempo
-        
+        let baseDuration = 60000.0 / tempo
+
         let noteDuration = baseDuration * note.value
-        
+
         skippedTicksCount = 0
-        currentNote = note;
+        currentNote = note
         currentNoteEndTime = Date().addingTimeInterval(noteDuration / 1000.0)
     }
-    
+
     func loadNote(index: Int) -> Note? {
-        let currentSong = self.songsList[currentSongIndex]
-        
-        if (index >= currentSong.notes.endIndex) {
+        let currentSong = songsList[currentSongIndex]
+
+        if index >= currentSong.notes.endIndex {
             return nil
         }
-        
+
         return currentSong.notes[index]
     }
-    
+
     /// Software PWM
     /// Only performs haptic feedback in fractions of the timer frequency
     /// Example: If timer has frequency of 1000 Hz and we want to play at 100Hz,
     /// we need to skip 9 clock ticks. This way, we play once every 10 ticks (1000/10 = 100)
     func playTickOfTone(frequency: Double) {
-        if (frequency == 0) {
-            return;
+        if frequency == 0 {
+            return
         }
         let clockTicksPerToneTick = Int(timerClockHz / frequency)
         let clockTicksToSkip = clockTicksPerToneTick - 1
-        
-        if (skippedTicksCount < clockTicksToSkip) {
+
+        if skippedTicksCount < clockTicksToSkip {
             skippedTicksCount += 1
             return
         }
-        
-        self.performHapticFeedback()
+
+        performHapticFeedback()
         skippedTicksCount = 0
     }
-    
+
     func performHapticFeedback() {
         NSHapticFeedbackManager.defaultPerformer.perform(
             NSHapticFeedbackManager.FeedbackPattern.generic,
-            performanceTime: NSHapticFeedbackManager.PerformanceTime.now)
+            performanceTime: NSHapticFeedbackManager.PerformanceTime.now
+        )
     }
 }
 
-
 struct ContentView_Previews: PreviewProvider {
     static var previews: some View {
         ContentView(songsRepository: SongsRepository())

ForceTouchPlayer/Extensions.swift

@@ -8,6 +8,7 @@ extension Binding {
             set: { selection in
                 self.wrappedValue = selection
                 handler(selection)
-        })
+            }
+        )
     }
 }

ForceTouchPlayer/Song.swift

@@ -2,29 +2,29 @@ import Foundation
 
 struct Song {
     let name: String
-    
+
     /// Tempo when user first selects the song
     var defaultTempo: Double = 144.0
-    
+
     /// Padding note added between each note in a song
     var padding: Note? = Note(frequency: 0, value: 0.25)
-    
+
     /// Raw notes in array-of-tuples form
     let rawNotes: [RawNote]
-    
+
     var notes: [Note] {
-        
         let parsedNotes = rawNotes.map {
             Note(frequency: $0.frequency, value: $0.value)
         }
-        
-        let paddedNotes = parsedNotes.enumerated().flatMap({(index, note) -> [Note] in
-            if (padding == nil || index == parsedNotes.count - 1) { // Do not pad end of song
+
+        let paddedNotes = parsedNotes.enumerated().flatMap { (index, note) -> [Note] in
+            if padding == nil || index == parsedNotes.count - 1 {
+                // Do not pad end of song
                 return [note]
             }
             return [note, padding!]
-        })
-        
+        }
+
         return paddedNotes
     }
 }
@@ -38,6 +38,7 @@ struct Note {
 /// a 1 means a quarter note, 0.5 an eighteenth , 0.25 sixteenth, so on
 typealias RawNote = (frequency: Double, value: Double)
 
+// swiftformat:disable all -- Keep spacing
 let NOTE_B0  = 31.0
 let NOTE_C1  = 33.0
 let NOTE_CS1 = 35.0
@@ -100,3 +101,4 @@ let NOTE_A5  = 880.0
 let NOTE_AS5 = 932.0
 let NOTE_B5  = 988.0
 let REST = 0.0
+// swiftformat:enable all

ForceTouchPlayer/Songs/CMajorScale.swift

@@ -23,9 +23,9 @@ let cMajorScale = Song(
         (NOTE_D2, 1),
         (NOTE_E2, 1),
         (NOTE_F2, 1),
-        
+
         (NOTE_G2, 1),
-        
+
         (NOTE_F2, 1),
         (NOTE_E2, 1),
         (NOTE_D2, 1),

ForceTouchPlayer/Songs/CantinaBand.swift

@@ -68,6 +68,6 @@ let cantinaBand = Song(
         (NOTE_AS1, 0.5),
         (NOTE_AS1, 0.5),
         (NOTE_B1, 1),
-        (NOTE_G1, 1)
+        (NOTE_G1, 1),
     ]
 )