🔀️ Merge branch 'hugo/feature/Update-DanceFreeze-and-Melody-LauncherV…

…iew' into develop
leka · Sep 17, 2024 · eca773b · eca773b
2 parents 6c07b8d + 9c25e50
commit eca773b
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 24 deletions.
diff --git a/...ameEngineKit/Sources/Exercises/Specialized/DanceFreeze/DanceFreezeView+LauncherView.swift b/...ameEngineKit/Sources/Exercises/Specialized/DanceFreeze/DanceFreezeView+LauncherView.swift
@@ -20,20 +20,21 @@ extension DanceFreezeView {
                     .padding(.top, 30)
 
                 HStack(spacing: 30) {
-                    GameEngineKitAsset.Exercises.DanceFreeze.imageIllustration.swiftUIImage
-                        .resizable()
-                        .aspectRatio(contentMode: .fit)
-                        .padding(80)
-
                     VStack(spacing: 0) {
+                        GameEngineKitAsset.Exercises.DanceFreeze.imageIllustration.swiftUIImage
+                            .resizable()
+                            .aspectRatio(contentMode: .fit)
+                            .padding(80)
                         MotionSelectorView(motion: self.$motion)
-
-                        SongSelectorView(
-                            songs: self.songs,
-                            selectedAudioRecording: self.$selectedAudioRecording
-                        )
                     }
+
+                    SongSelectorView(
+                        songs: self.songs,
+                        selectedAudioRecording: self.$selectedAudioRecording
+                    )
                 }
+                .frame(maxWidth: .infinity, maxHeight: .infinity)
+                .padding(20)
 
                 HStack(spacing: 70) {
                     Button {

diff --git a/...ineKit/Sources/Exercises/Specialized/DanceFreeze/DanceFreezeView+MotionSelectorView.swift b/...ineKit/Sources/Exercises/Specialized/DanceFreeze/DanceFreezeView+MotionSelectorView.swift
@@ -71,8 +71,6 @@ extension DanceFreezeView {
                     }
                 }
             }
-            .padding(.vertical, 15)
-            .padding(.horizontal, 40)
         }
 
         // MARK: Private

diff --git a/...ngineKit/Sources/Exercises/Specialized/DanceFreeze/DanceFreezeView+SongSelectorView.swift b/...ngineKit/Sources/Exercises/Specialized/DanceFreeze/DanceFreezeView+SongSelectorView.swift
@@ -85,13 +85,15 @@ extension DanceFreezeView {
                     Image(uiImage: UIImage(named: self.image)!)
                         .resizable()
                         .scaledToFit()
+                        .frame(maxWidth: 100)
                 } else if self.image.isVectorImageFile {
                     SVGView(contentsOf: URL(fileURLWithPath: self.image))
                         .scaledToFit()
+                        .frame(maxWidth: 100)
                 }
                 Text(self.text)
             }
-            .frame(maxHeight: 70)
+            .frame(maxHeight: 150)
         }
     }
 }

diff --git a/Modules/GameEngineKit/Sources/Exercises/Specialized/Melody/MelodyView+KeyboardModeView.swift b/Modules/GameEngineKit/Sources/Exercises/Specialized/Melody/MelodyView+KeyboardModeView.swift
@@ -37,6 +37,7 @@ extension MelodyView {
                             GameEngineKitAsset.Exercises.Melody.iconKeyboardPartial.swiftUIImage
                                 .resizable()
                                 .scaledToFit()
+                                .frame(width: 130)
                             Text(l10n.MelodyView.partialKeyboardLabel)
                                 .foregroundStyle(self.keyboard == .partial ? self.styleManager.accentColor! : .primary)
                         }
@@ -58,6 +59,7 @@ extension MelodyView {
                             GameEngineKitAsset.Exercises.Melody.iconKeyboardFull.swiftUIImage
                                 .resizable()
                                 .scaledToFit()
+                                .frame(width: 130)
                             Text(l10n.MelodyView.fullKeyboardLabel)
                                 .foregroundStyle(self.keyboard == .full ? self.styleManager.accentColor! : .primary)
                         }
@@ -69,8 +71,6 @@ extension MelodyView {
                     }
                 }
             }
-            .padding(.vertical, 15)
-            .padding(.horizontal, 40)
         }
 
         // MARK: Private

diff --git a/Modules/GameEngineKit/Sources/Exercises/Specialized/Melody/MelodyView+LauncherView.swift b/Modules/GameEngineKit/Sources/Exercises/Specialized/Melody/MelodyView+LauncherView.swift
@@ -16,17 +16,18 @@ extension MelodyView {
         var body: some View {
             VStack(spacing: 50) {
                 HStack(spacing: 30) {
-                    GameEngineKitAsset.Exercises.Melody.imageIllustration.swiftUIImage
-                        .resizable()
-                        .aspectRatio(contentMode: .fit)
-                        .padding(80)
+                    VStack(spacing: 20) {
+                        GameEngineKitAsset.Exercises.Melody.imageIllustration.swiftUIImage
+                            .resizable()
+                            .aspectRatio(contentMode: .fit)
 
-                    VStack(spacing: 0) {
                         KeyboardModeView(keyboard: self.$keyboard)
-
-                        SongSelectorView(songs: self.songs, selectedMidiRecording: self.$selectedSong)
                     }
+
+                    SongSelectorView(songs: self.songs, selectedMidiRecording: self.$selectedSong)
                 }
+                .frame(maxWidth: .infinity, maxHeight: .infinity)
+                .padding(20)
 
                 Button {
                     self.mode = .selectionConfirmed

diff --git a/Modules/GameEngineKit/Sources/Exercises/Specialized/Melody/MelodyView+SongSelectorView.swift b/Modules/GameEngineKit/Sources/Exercises/Specialized/Melody/MelodyView+SongSelectorView.swift
@@ -51,7 +51,6 @@ extension MelodyView {
                     }
                 }
             }
-            .padding(.horizontal, 40)
         }
 
         // MARK: Private
@@ -86,13 +85,14 @@ extension MelodyView {
                     Image(uiImage: UIImage(named: self.image)!)
                         .resizable()
                         .scaledToFit()
+                        .frame(maxWidth: 100)
                 } else if self.image.isVectorImageFile {
                     SVGView(contentsOf: URL(fileURLWithPath: self.image))
                         .scaledToFit()
+                        .frame(maxWidth: 100)
                 }
                 Text(self.text)
             }
-            .frame(maxHeight: 70)
         }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,8 +71,6 @@ extension DanceFreezeView { @@
                         }
                     }
                 }
-                .padding(.vertical, 15)
-                .padding(.horizontal, 40)
             }
             // MARK: Private
@@ Expand Down @@