Refine completion UIs and remove obsolete settings flow

djschilling · djschilling · commit db5f770552a6 · 2026-02-06T17:14:03.000+01:00
diff --git a/IOS_PRODUCT_COMPLETION_PLAN.md b/IOS_PRODUCT_COMPLETION_PLAN.md
@@ -60,15 +60,15 @@ Die iOS-Version soll sich in der **Spiellogik** wie die Android-Version verhalte
 
 **Android-seitig vorhanden, iOS-seitig unvollständig/fehlend:**
 - [x] Hauptmenü
-- [ ] Settings (mind. Audio-Mute)
-- [ ] Credits
-- [ ] Tutorial/Onboarding
+- [ ] Settings (entfernt, da aktuell kein Audio im iOS-Build aktiv ist)
+- [x] Credits
+- [x] Tutorial/Onboarding
 - [x] Levelmode-Completion
 - [ ] Optional Loading-Übergang
 
 **Umsetzung:**
 - [x] Story-/Navigation auf iOS erweitern
-- [ ] Flows als eigene Szenen oder äquivalente iOS-Navigation umsetzen
+- [x] Flows als eigene Szenen oder äquivalente iOS-Navigation umsetzen
 
 **Abnahmekriterium:**
 - [ ] Alle wesentlichen Modi/Zustände sind für Nutzer erreichbar und vollständig rücknavigierbar.
diff --git a/SOPA/JustPlay/JustPlayGameScene.swift b/SOPA/JustPlay/JustPlayGameScene.swift
@@ -1,5 +1,6 @@
 import Foundation
 import SpriteKit
+import UIKit
 
 protocol JustPlaySceneObserver: AnyObject {
     func updateJustPlayScene(remainingTime: Int)
@@ -362,12 +363,14 @@ class JustPlayGameScene: GameScene, JustPlaySceneObserver {
 class JustPlayScoreScene: SKScene {
     private let justPlayResult: JustPlayResult
     private let textColor = UIColor(red: 240.0 / 255.0, green: 239.0 / 255.0, blue: 238.0 / 255.0, alpha: 1.0)
+    private let background = UIColor(red: 90.6 / 255.0, green: 86.7 / 255.0, blue: 70.6 / 255.0, alpha: 1.0)
 
     init(size: CGSize, proportionSet: ProportionSet, justPlayResult: JustPlayResult) {
         self.justPlayResult = justPlayResult
         _ = proportionSet
         super.init(size: size)
-        self.backgroundColor = UIColor(red: 90.6 / 255.0, green: 86.7 / 255.0, blue: 70.6 / 255, alpha: 1.0)
+        self.backgroundColor = background
+        addBackgroundDecor()
         addLabels()
         addButtons()
     }
@@ -379,35 +382,21 @@ class JustPlayScoreScene: SKScene {
     private func addLabels() {
         let title = SKLabelNode(fontNamed: "Optima-Bold")
         title.text = "Level \(justPlayResult.levelCount) Complete"
-        title.fontSize = min(size.width, size.height) * 0.07
+        title.fontSize = min(size.width, size.height) * 0.082
         title.fontColor = textColor
-        title.position = CGPoint(x: size.width * 0.5, y: size.height * 0.82)
+        title.position = CGPoint(x: size.width * 0.5, y: size.height * 0.84)
         addChild(title)
 
-        let score = SKLabelNode(fontNamed: "Optima-Bold")
-        score.text = "Score: \(justPlayResult.lastScore) -> \(justPlayResult.score)"
-        score.fontSize = min(size.width, size.height) * 0.052
-        score.fontColor = textColor
-        score.position = CGPoint(x: size.width * 0.5, y: size.height * 0.60)
-        addChild(score)
-
-        let time = SKLabelNode(fontNamed: "Optima-Bold")
-        time.text = "Time Left: \(justPlayResult.leftTime)"
-        time.fontSize = min(size.width, size.height) * 0.043
-        time.fontColor = textColor
-        time.position = CGPoint(x: size.width * 0.5, y: size.height * 0.50)
-        addChild(time)
+        let panel = makeInfoPanel(centerY: size.height * 0.57, width: size.width * 0.84, height: size.height * 0.34)
+        addChild(panel)
 
-        let extraTime = SKLabelNode(fontNamed: "Optima-Bold")
-        extraTime.text = "Extra Time: +\(justPlayResult.extraTime)"
-        extraTime.fontSize = min(size.width, size.height) * 0.043
-        extraTime.fontColor = textColor
-        extraTime.position = CGPoint(x: size.width * 0.5, y: size.height * 0.43)
-        addChild(extraTime)
+        addInfoLine(icon: "star.circle.fill", text: "Score", value: "\(justPlayResult.score)", y: size.height * 0.64)
+        addInfoLine(icon: "clock.circle.fill", text: "Time Left", value: "\(justPlayResult.leftTime)", y: size.height * 0.56)
+        addInfoLine(icon: "plus.circle.fill", text: "Extra Time", value: "+\(justPlayResult.extraTime)", y: size.height * 0.48)
 
         let helper = SKLabelNode(fontNamed: "Optima-Bold")
         helper.text = "Continue to the next level?"
-        helper.fontSize = min(size.width, size.height) * 0.036
+        helper.fontSize = min(size.width, size.height) * 0.042
         helper.fontColor = textColor
         helper.position = CGPoint(x: size.width * 0.5, y: size.height * 0.31)
         helper.alpha = 0.9
@@ -431,6 +420,69 @@ class JustPlayScoreScene: SKScene {
         levelChoice.position = CGPoint(x: size.width * 0.28, y: size.height * 0.17)
         addChild(levelChoice)
     }
+
+    private func addBackgroundDecor() {
+        let topGlow = SKShapeNode(circleOfRadius: size.width * 0.28)
+        topGlow.fillColor = UIColor(white: 1.0, alpha: 0.05)
+        topGlow.strokeColor = .clear
+        topGlow.position = CGPoint(x: size.width * 0.15, y: size.height * 0.88)
+        topGlow.zPosition = -2
+        addChild(topGlow)
+
+        let bottomGlow = SKShapeNode(circleOfRadius: size.width * 0.32)
+        bottomGlow.fillColor = UIColor(white: 1.0, alpha: 0.04)
+        bottomGlow.strokeColor = .clear
+        bottomGlow.position = CGPoint(x: size.width * 0.88, y: size.height * 0.14)
+        bottomGlow.zPosition = -2
+        addChild(bottomGlow)
+    }
+
+    private func makeInfoPanel(centerY: CGFloat, width: CGFloat, height: CGFloat) -> SKShapeNode {
+        let rect = CGRect(x: -width / 2.0, y: -height / 2.0, width: width, height: height)
+        let panel = SKShapeNode(rect: rect, cornerRadius: min(width, height) * 0.08)
+        panel.position = CGPoint(x: size.width * 0.5, y: centerY)
+        panel.fillColor = UIColor(white: 1.0, alpha: 0.08)
+        panel.strokeColor = UIColor(white: 1.0, alpha: 0.18)
+        panel.lineWidth = 2.0
+        panel.zPosition = -1
+        return panel
+    }
+
+    private func addInfoLine(icon: String, text: String, value: String, y: CGFloat) {
+        let iconNode = SKSpriteNode(texture: makeStatIconTexture(symbolName: icon))
+        iconNode.size = CGSize(width: size.height * 0.045, height: size.height * 0.045)
+        iconNode.position = CGPoint(x: size.width * 0.18, y: y)
+        addChild(iconNode)
+
+        let line = SKLabelNode(fontNamed: "Optima-Bold")
+        line.text = "\(text): \(value)"
+        line.horizontalAlignmentMode = .left
+        line.verticalAlignmentMode = .center
+        line.fontSize = min(size.width, size.height) * 0.056
+        line.fontColor = textColor
+        line.position = CGPoint(x: size.width * 0.22, y: y)
+        addChild(line)
+    }
+
+    private func makeStatIconTexture(symbolName: String) -> SKTexture {
+        let side = size.height * 0.06
+        let renderer = UIGraphicsImageRenderer(size: CGSize(width: side, height: side))
+        let image = renderer.image { _ in
+            let config = UIImage.SymbolConfiguration(pointSize: side * 0.72, weight: .semibold)
+            let tint = textColor
+            if let symbol = UIImage(systemName: symbolName, withConfiguration: config)?
+                .withTintColor(tint, renderingMode: .alwaysOriginal) {
+                let symbolRect = CGRect(
+                    x: (side - symbol.size.width) / 2.0,
+                    y: (side - symbol.size.height) / 2.0,
+                    width: symbol.size.width,
+                    height: symbol.size.height
+                )
+                symbol.draw(in: symbolRect)
+            }
+        }
+        return SKTexture(image: image)
+    }
 }
 
 class JustPlayLostScene: SKScene {
diff --git a/SOPA/manager/StoryService.swift b/SOPA/manager/StoryService.swift
@@ -13,18 +13,20 @@ protocol StoryService {
     func loadStartMenuScene()
     func loadLevelCoiceScene()
     func loadLevelCoiceSceneFromLevelModeScene()
-    
+
+    func loadCreditsSceneFromMenuScene()
+    func loadTutorialSceneFromMenuScene()
+    func loadTutorialGameSceneFromTutorialScene()
+
     func loadJustPlaySceneFromMenuScene()
     func loadJustPlaySceneFromJustPlayScene(timeBasedGameService: TimeBasedGameService, justPlayLevel: JustPlayLevel)
     func loadJustPlayScoreSceneFromJustPlayScene(justPlayLevelResult: JustPlayLevelResult)
     func loadJustPlayLostSceneFromJustPlayScene(justPlayLevelResult: JustPlayLevelResult)
     func loadNextJustPlayGameScene()
     func reloadJustPlayGameScene(level: Level)
-    
+
     func loadLevelModeGameSceneFromChoiceScene(levelId: Int)
     func loadLevelModeScoreSceneFromLevelModeScene(levelResult: LevelResult)
     func reloadLevelModeGameScene(levelId: Int)
     func loadNextLevelModeGameScene(levelId: Int)
-    
-    
 }
diff --git a/SOPA/manager/StoryServiceImpl.swift b/SOPA/manager/StoryServiceImpl.swift
@@ -11,21 +11,38 @@ import SpriteKit
 
 class StoryServiceImpl: StoryService {
     private var justPlayService: JustPlayService?
-    
+
     func loadStartMenuScene() {
         let startMenuScene = StartMenuScene(size: size)
         startMenuScene.scaleMode = .resizeFill
         currentView.presentScene(startMenuScene)
     }
 
+    func loadCreditsSceneFromMenuScene() {
+        let creditsScene = CreditsScene(size: size)
+        let transition = SKTransition.push(with: .left, duration: 0.35)
+        currentView.presentScene(creditsScene, transition: transition)
+    }
+
+    func loadTutorialSceneFromMenuScene() {
+        let tutorialScene = TutorialScene(size: size)
+        let transition = SKTransition.push(with: .left, duration: 0.35)
+        currentView.presentScene(tutorialScene, transition: transition)
+    }
+
+    func loadTutorialGameSceneFromTutorialScene() {
+        let tutorialLevel = levelService.getLevelById(id: 1) ?? makeFallbackTutorialLevel()
+        let tutorialGameScene = TutorialGameScene(size: size, proportionSet: proportionSet, level: tutorialLevel)
+        currentView.presentScene(tutorialGameScene)
+    }
+
     func loadJustPlaySceneFromJustPlayScene(timeBasedGameService: TimeBasedGameService, justPlayLevel: JustPlayLevel) {
         guard let currentJustPlayService = justPlayService else {
             loadJustPlaySceneFromMenuScene()
             return
         }
         let justPlayGameScene = JustPlayGameScene(size: size, proportionSet: proportionSet, justPlayLevel: justPlayLevel, justPlayService: currentJustPlayService, timeBasedGameService: timeBasedGameService)
-        let transition = SKTransition.crossFade(withDuration: 0.5)
-        currentView.presentScene(justPlayGameScene, transition: transition)
+        currentView.presentScene(justPlayGameScene)
     }
     
     func loadJustPlayScoreSceneFromJustPlayScene(justPlayLevelResult: JustPlayLevelResult) {
@@ -59,8 +76,7 @@ class StoryServiceImpl: StoryService {
         let timeBasedGameService = TimeBasedGameServiceImpl(remainingTime: justPlayLevel.leftTime)
         timeBasedGameService.start()
         let justPlayScene = JustPlayGameScene(size: size, proportionSet: proportionSet, justPlayLevel: justPlayLevel, justPlayService: currentJustPlayService, timeBasedGameService: timeBasedGameService)
-        let transition = SKTransition.push(with: .left, duration: 0.5)
-        currentView.presentScene(justPlayScene, transition: transition)
+        currentView.presentScene(justPlayScene)
     }
     
     func reloadJustPlayGameScene(level: Level) {
@@ -70,8 +86,7 @@ class StoryServiceImpl: StoryService {
         let timeBasedGameService = TimeBasedGameServiceImpl(remainingTime: 10)
         timeBasedGameService.start()
         let justPlayGameScene = JustPlayGameScene(size: size, proportionSet: proportionSet, justPlayLevel: JustPlayLevel(leftTime: 10, level: level), justPlayService: justPlayService!, timeBasedGameService: timeBasedGameService)
-        let transition = SKTransition.crossFade(withDuration: 0.5)
-        currentView.presentScene(justPlayGameScene, transition: transition)
+        currentView.presentScene(justPlayGameScene)
     }
     
     func loadJustPlaySceneFromMenuScene() {
@@ -81,8 +96,7 @@ class StoryServiceImpl: StoryService {
         let timeBasedGameService = TimeBasedGameServiceImpl(remainingTime: justPlayLevel.leftTime)
         timeBasedGameService.start()
         let justPlayScene = JustPlayGameScene(size: size, proportionSet: proportionSet, justPlayLevel: justPlayLevel, justPlayService: currentJustPlayService, timeBasedGameService: timeBasedGameService)
-        let transition = SKTransition.push(with: .down, duration: 0.5)
-        currentView.presentScene(justPlayScene, transition: transition)
+        currentView.presentScene(justPlayScene)
     }
     
     
@@ -116,8 +130,7 @@ class StoryServiceImpl: StoryService {
     
     func loadLevelModeGameSceneFromChoiceScene(levelId: Int) {
         let levelModeGameScene = LevelModeGameScene(size: size, proportionSet: proportionSet, level: levelService.getLevelById(id: levelId)!)
-        let transition = SKTransition.push(with: .down, duration: 0.5)
-        currentView.presentScene(levelModeGameScene, transition: transition)
+        currentView.presentScene(levelModeGameScene)
     }
     
     func loadLevelModeScoreSceneFromLevelModeScene(levelResult: LevelResult) {
@@ -129,15 +142,27 @@ class StoryServiceImpl: StoryService {
     func reloadLevelModeGameScene(levelId: Int) {
         let levelModeGameScene = LevelModeGameScene(size:
             size, proportionSet: proportionSet, level: levelService.getLevelById(id: levelId)!)
-        let transition = SKTransition.crossFade(withDuration: 0.5)
-        currentView.presentScene(levelModeGameScene, transition: transition)
+        currentView.presentScene(levelModeGameScene)
     }
     
     func loadNextLevelModeGameScene(levelId: Int) {
         let levelModeGameScene = LevelModeGameScene(size: size, proportionSet: proportionSet, level: levelService.getLevelById(id: levelId)!)
-        let transition = SKTransition.push(with: .left, duration: 0.5)
-        currentView.presentScene(levelModeGameScene, transition: transition)
+        currentView.presentScene(levelModeGameScene)
+    }
+
+    private func makeFallbackTutorialLevel() -> Level {
+        let levelLines = [
+            "1",
+            "1",
+            "4",
+            "#",
+            "nnnnnn",
+            "noooon",
+            "soacon",
+            "fagoon",
+            "noooon",
+            "nnnnnn"
+        ]
+        return LevelTranslator().fromString(levelLines: levelLines)
     }
-    
-    
 }
diff --git a/SOPA/view/LevelMode/LevelChoiceScene.swift b/SOPA/view/LevelMode/LevelChoiceScene.swift
