diff --git a/DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/SemiLion.imageset/doushouqi-lion 1.png b/Assets/doushouqi-semilion.png
similarity index 100%
rename from DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/SemiLion.imageset/doushouqi-lion 1.png
rename to Assets/doushouqi-semilion.png
diff --git a/Assets/doushouqi-semilion.svg b/Assets/doushouqi-semilion.svg
new file mode 100644
index 0000000..a1a7aa2
--- /dev/null
+++ b/Assets/doushouqi-semilion.svg
@@ -0,0 +1,25 @@
+
diff --git a/DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj b/DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj
index 5584a47..a62504e 100644
--- a/DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj
+++ b/DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj
@@ -27,7 +27,6 @@
649B59A42BF64574002BAE38 /* TitlePageFrame.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649B59A32BF64574002BAE38 /* TitlePageFrame.swift */; };
649B59A72BF64BA9002BAE38 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 649B59A62BF64BA9002BAE38 /* Colors.xcassets */; };
649B59A92BF64C6A002BAE38 /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649B59A82BF64C6A002BAE38 /* Colors.swift */; };
- 649B59AC2BF64E12002BAE38 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 649B59AB2BF64E12002BAE38 /* Images.xcassets */; };
649B59AE2BF64EAB002BAE38 /* AppImages.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649B59AD2BF64EAB002BAE38 /* AppImages.swift */; };
649B59B22BF65392002BAE38 /* TextStyles.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649B59B12BF65392002BAE38 /* TextStyles.swift */; };
649B59B42BF653E1002BAE38 /* ViewTitleTextStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 649B59B32BF653E1002BAE38 /* ViewTitleTextStyle.swift */; };
@@ -38,6 +37,7 @@
EC62C4FF2C0457AD0048CD0B /* TitleScreenMusic.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = EC62C4FE2C0457AD0048CD0B /* TitleScreenMusic.mp3 */; };
EC62C5012C045B590048CD0B /* SoundPlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = EC62C5002C045B590048CD0B /* SoundPlayer.swift */; };
EC62C5062C045C1A0048CD0B /* TitleScreenButtonSound.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = EC62C5052C045C1A0048CD0B /* TitleScreenButtonSound.mp3 */; };
+ ECB636552C047992007CD5E2 /* Image.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = ECB636542C047992007CD5E2 /* Image.xcassets */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -95,7 +95,6 @@
649B59A32BF64574002BAE38 /* TitlePageFrame.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitlePageFrame.swift; sourceTree = ""; };
649B59A62BF64BA9002BAE38 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = ""; };
649B59A82BF64C6A002BAE38 /* Colors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Colors.swift; sourceTree = ""; };
- 649B59AB2BF64E12002BAE38 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; };
649B59AD2BF64EAB002BAE38 /* AppImages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppImages.swift; sourceTree = ""; };
649B59B12BF65392002BAE38 /* TextStyles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextStyles.swift; sourceTree = ""; };
649B59B32BF653E1002BAE38 /* ViewTitleTextStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewTitleTextStyle.swift; sourceTree = ""; };
@@ -106,6 +105,7 @@
EC62C4FE2C0457AD0048CD0B /* TitleScreenMusic.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = TitleScreenMusic.mp3; sourceTree = ""; };
EC62C5002C045B590048CD0B /* SoundPlayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SoundPlayer.swift; sourceTree = ""; };
EC62C5052C045C1A0048CD0B /* TitleScreenButtonSound.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = TitleScreenButtonSound.mp3; sourceTree = ""; };
+ ECB636542C047992007CD5E2 /* Image.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Image.xcassets; sourceTree = ""; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -283,8 +283,8 @@
649B59AA2BF64DF1002BAE38 /* Images */ = {
isa = PBXGroup;
children = (
- 649B59AB2BF64E12002BAE38 /* Images.xcassets */,
649B59AD2BF64EAB002BAE38 /* AppImages.swift */,
+ ECB636542C047992007CD5E2 /* Image.xcassets */,
);
path = Images;
sourceTree = "";
@@ -442,9 +442,9 @@
649B59A72BF64BA9002BAE38 /* Colors.xcassets in Resources */,
6493C1C02C046BF900B5121D /* samurai.ttf in Resources */,
EC62C5062C045C1A0048CD0B /* TitleScreenButtonSound.mp3 in Resources */,
- 649B59AC2BF64E12002BAE38 /* Images.xcassets in Resources */,
645834632BF5F92500E18321 /* Preview Assets.xcassets in Resources */,
645834602BF5F92500E18321 /* Assets.xcassets in Resources */,
+ ECB636552C047992007CD5E2 /* Image.xcassets in Resources */,
EC62C4FF2C0457AD0048CD0B /* TitleScreenMusic.mp3 in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
diff --git a/DouShouQi_App/DouShouQi_App/Assets/Images/AppImages.swift b/DouShouQi_App/DouShouQi_App/Assets/Images/AppImages.swift
index f26776f..105858e 100644
--- a/DouShouQi_App/DouShouQi_App/Assets/Images/AppImages.swift
+++ b/DouShouQi_App/DouShouQi_App/Assets/Images/AppImages.swift
@@ -9,6 +9,6 @@ import Foundation
import SwiftUI
public struct AppImages {
- static let TitleImage = "TitlePageImage"
+ static let TitleImage = "Title"
static let SemiLion = "SemiLion"
}
diff --git a/DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/Contents.json b/DouShouQi_App/DouShouQi_App/Assets/Images/Image.xcassets/Contents.json
similarity index 100%
rename from DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/Contents.json
rename to DouShouQi_App/DouShouQi_App/Assets/Images/Image.xcassets/Contents.json
diff --git a/DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/SemiLion.imageset/Contents.json b/DouShouQi_App/DouShouQi_App/Assets/Images/Image.xcassets/SemiLion.imageset/Contents.json
similarity index 85%
rename from DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/SemiLion.imageset/Contents.json
rename to DouShouQi_App/DouShouQi_App/Assets/Images/Image.xcassets/SemiLion.imageset/Contents.json
index 29853d4..077e986 100644
--- a/DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/SemiLion.imageset/Contents.json
+++ b/DouShouQi_App/DouShouQi_App/Assets/Images/Image.xcassets/SemiLion.imageset/Contents.json
@@ -1,7 +1,7 @@
{
"images" : [
{
- "filename" : "doushouqi-lion 1.png",
+ "filename" : "doushouqi-semilion.png",
"idiom" : "universal",
"scale" : "1x"
},
diff --git a/DouShouQi_App/DouShouQi_App/Assets/Images/Image.xcassets/SemiLion.imageset/doushouqi-semilion.png b/DouShouQi_App/DouShouQi_App/Assets/Images/Image.xcassets/SemiLion.imageset/doushouqi-semilion.png
new file mode 100644
index 0000000..f306b56
Binary files /dev/null and b/DouShouQi_App/DouShouQi_App/Assets/Images/Image.xcassets/SemiLion.imageset/doushouqi-semilion.png differ
diff --git a/DouShouQi_App/DouShouQi_App/Assets/Images/Image.xcassets/Title.imageset/Contents.json b/DouShouQi_App/DouShouQi_App/Assets/Images/Image.xcassets/Title.imageset/Contents.json
new file mode 100644
index 0000000..ec5d305
--- /dev/null
+++ b/DouShouQi_App/DouShouQi_App/Assets/Images/Image.xcassets/Title.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "images" : [
+ {
+ "filename" : "title-background.svg",
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/-16-05-2024.svg b/DouShouQi_App/DouShouQi_App/Assets/Images/Image.xcassets/Title.imageset/title-background.svg
similarity index 100%
rename from DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/-16-05-2024.svg
rename to DouShouQi_App/DouShouQi_App/Assets/Images/Image.xcassets/Title.imageset/title-background.svg
diff --git a/DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/Contents.json b/DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/Contents.json
deleted file mode 100644
index 1bb4e2b..0000000
--- a/DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/Contents.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "images" : [
- {
- "filename" : "title-background.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- "filename" : "-16-05-2024.svg",
- "idiom" : "universal"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- },
- "properties" : {
- "preserves-vector-representation" : true
- }
-}
diff --git a/DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/title-background.png b/DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/title-background.png
deleted file mode 100644
index dcd3220..0000000
Binary files a/DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/title-background.png and /dev/null differ
diff --git a/DouShouQi_App/DouShouQi_App/Assets/TextStyles/ViewTitleTextStyle.swift b/DouShouQi_App/DouShouQi_App/Assets/TextStyles/ViewTitleTextStyle.swift
index 6e3a6e1..3b66efe 100644
--- a/DouShouQi_App/DouShouQi_App/Assets/TextStyles/ViewTitleTextStyle.swift
+++ b/DouShouQi_App/DouShouQi_App/Assets/TextStyles/ViewTitleTextStyle.swift
@@ -13,9 +13,6 @@ struct ViewTitleTextStyle: TextStyle {
content
.foregroundColor(Colors.TitleText)
.fontWeight(.bold)
-<<<<<<< HEAD
-=======
.font(.custom(Fonts.title, size: 30))
->>>>>>> dev_views
}
}
diff --git a/DouShouQi_App/DouShouQi_App/Components/TitlePageFrame.swift b/DouShouQi_App/DouShouQi_App/Components/TitlePageFrame.swift
index 12ef286..43fbdb2 100644
--- a/DouShouQi_App/DouShouQi_App/Components/TitlePageFrame.swift
+++ b/DouShouQi_App/DouShouQi_App/Components/TitlePageFrame.swift
@@ -23,9 +23,7 @@ struct TitlePageFrame: View {
.resizable()
.aspectRatio(contentMode: .fit)
.frame(width: ImageWidth, height: ImageHeight)
-
- Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/)
- .textStyle(T: TextStyles.ViewTitle)
+
SwiftUI.Text(self.Text)
.foregroundColor(Colors.TitleText)
.fontWeight(.bold)