Merge branch 'dev_views' of https://codefirst.iut.uca.fr/git/remi.regnault/DouShouQi_App into dev_views

DouShouQi_App/DouShouQi_App/Assets/Images/AppImages.swift

@@ -11,6 +11,12 @@ import SwiftUI
 public struct AppImages {
     static let TitleImage = "TitlePageImage"
     static let SemiLion = "SemiLion"
+    static let SemiDog = "SemiDog"
+    static let SemiElephant = "SemiElephant"
+    static let SemiCat = "SemiCat"
+    static let SemiRat = "SemiRat"
+    static let SemiLeopard = "SemiLeopard"
+    static let SemiWolf = "SemiWolf"
     static let Lion = "Lion"
     static let Rat = "Rat"
     static let Elephant = "Elephant"

DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/SemiCat.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "SemiCat.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/SemiDog.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "SemiDog.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/SemiElephant.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "SemiElephant.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/SemiLeopard.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "SemiLeopard.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/SemiRat.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "SemiRat.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/SemiTiger.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "SemiTiger.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/SemiWolf.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "SemiWolf.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DouShouQi_App/DouShouQi_App/Components/Player/PlayerRow.swift

@@ -41,6 +41,7 @@ struct PlayerRow: View {
                     .foregroundColor(.black)
             }
             Button(action: {
+            
                 
             }) {
                 Image(systemName: "trash")

DouShouQi_App/DouShouQi_App/Views/Menu/MainMenuView.swift

@@ -10,6 +10,10 @@ import SwiftUI
 struct MainMenuView: View {
     
     @State private var showSplash = true
+    @State private var currentImage: String?
+    @State private var timer: Timer?
+    @State private var showImage = false
+    let images: [String] = [AppImages.SemiLion, AppImages.SemiDog, AppImages.SemiRat, AppImages.SemiWolf, AppImages.SemiLeopard, AppImages.SemiElephant, AppImages.SemiCat] // Add your image names here
     
     var body: some View {
         NavigationView {
@@ -38,10 +42,19 @@ struct MainMenuView: View {
                                 MainMenuButton(text: "Players", destination: PlayersView(), sound: "TitleScreenButtonSound", topRightCorner: 10, bottomRightCorner: 10)
                                 MainMenuButton(text: "Settings", destination: SettingsView(), sound: "TitleScreenButtonSound", topRightCorner: 10, bottomRightCorner: 10)
                             }
-                            Image(AppImages.SemiLion)
-                                .resizable()
-                                .aspectRatio(contentMode: .fit)
-                                .frame(width: 200, height: 500)
+                            if let currentImage = currentImage {
+                                Image(currentImage)
+                                    .resizable()
+                                    .aspectRatio(contentMode: .fit)
+                                    .frame(width: 200, height: 500)
+                                    .transition(.opacity)
+                                    .animation(.easeInOut(duration: 1), value: showImage)
+                                    .onAppear {
+                                        withAnimation {
+                                            showImage = true
+                                        }
+                                    }
+                            }
                         }
                     }
                     Spacer()
@@ -66,15 +79,35 @@ struct MainMenuView: View {
                     
                     Spacer()
                         .onAppear {
+                            startTimer()
                             MusicPlayer.shared.playBackgroundMusic(music: "TitleScreenMusic")
                         }
                         .onDisappear {
+                            stopTimer()
                             MusicPlayer.shared.stopBackgroundMusic()
                         }
                 }
             }
         }
     }
+    
+    private func startTimer() {
+        timer = Timer.scheduledTimer(withTimeInterval: 2.0, repeats: true) { _ in
+            changeImage()
+        }
+        changeImage() // Immediately change the image on appear
+    }
+    
+    private func stopTimer() {
+        timer?.invalidate()
+        timer = nil
+    }
+    
+    private func changeImage() {
+        DispatchQueue.main.async {
+            currentImage = images.randomElement()
+        }
+    }
 }
 
 struct MainMenuView_Previews: PreviewProvider {