🗑️ (GEK): Update old system Melody with changes

leka · Nov 29, 2023 · c22ebd4 · c22ebd4
1 parent 0b9f985
commit c22ebd4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/Modules/GameEngineKit/Sources/Staging/Melody/MelodyGameplay.swift b/Modules/GameEngineKit/Sources/Staging/Melody/MelodyGameplay.swift
@@ -4,13 +4,14 @@
 
 import AudioKit
 import Combine
+import ContentKit
 import SwiftUI
 
 public class MelodyGameplay: ObservableObject {
     @Published public var progress: CGFloat = 0.0
     @Published var state: ExerciseState = .idle
 
-    private let xyloPlayer = MIDIPlayer(name: "Xylophone", samples: xyloSamples)
+    private let xyloPlayer = MIDIPlayer(instrument: .xylophone)
 
     private let song: MelodySongModel
 
@@ -68,6 +69,6 @@ public class MelodyGameplay: ObservableObject {
         let index = kListOfTiles.firstIndex(where: {
             $0.noteNumber == currentNoteNumber
         })
-        return kListOfTiles[index!].color
+        return kListOfTiles[index!].color.screen
     }
 }
diff --git a/Modules/GameEngineKit/Sources/Staging/Melody/MelodyView.swift b/Modules/GameEngineKit/Sources/Staging/Melody/MelodyView.swift
@@ -2,9 +2,16 @@
 // Copyright 2023 APF France handicap
 // SPDX-License-Identifier: Apache-2.0
 
-import DesignKit
+import AudioKit
+import RobotKit
 import SwiftUI
 
+public struct XylophoneTile: Identifiable {
+    public var id: Int
+    var noteNumber: MIDINoteNumber
+    var color: Robot.Color
+}
+
 public let kListOfTiles: [XylophoneTile] = [
     XylophoneTile(id: 0, noteNumber: 24, color: .pink),
     XylophoneTile(id: 1, noteNumber: 26, color: .red),
@@ -36,9 +43,9 @@ public struct MelodyView: View {
                     Button {
                         viewModel.onTileTapped(tile: tile)
                     } label: {
-                        tile.color
+                        tile.color.screen
                     }
-                    .buttonStyle(XylophoneTileButtonStyle(index: tile.id, tilesNumber: tilesNumber))
+                    .buttonStyle(InstrumentView.XylophoneView.TileButtonStyle(index: tile.id, tileNumber: tilesNumber))
                     .compositingGroup()
                 }
             }