remi.regnault
/
DouShouQi_App
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🔀 merging to get main button

Browse Source
dev_views_SelectPlayer
Nathan VERDIER 11 months ago
parent cf73760067
commit a03d069197
13 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File

0
DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/SemiLion.imageset/doushouqi-lion 1.png → Assets/doushouqi-semilion.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

25
Assets/doushouqi-semilion.svg
Unescape View File

@ -0,0 +1,25 @@
<svg width="189" height="498" viewBox="0 0 189 498" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_1_3268)" filter="url(#filter0_f_1_3268)">
<path d="M382.621 215.799C382.621 280.998 367.172 328.099 326.932 366.096C286.691 404.095 221.662 432.991 206.134 448.623C188.76 432.992 121.271 404.095 81.4915 366.096C41.7124 328.099 29.646 280.998 29.646 215.799C29.646 85.4001 108.663 31 206.134 31C303.606 31 382.621 85.4001 382.621 215.799Z" fill="white" stroke="#0D0501" stroke-width="6.9846"/>
<path d="M103.782 60.4177C139.069 83.6755 178.165 144.19 206.065 234.072C153.55 188.305 69.4868 158.676 32.7195 189.01" stroke="#0D0501" stroke-width="7.7606"/>
<path d="M40.1171 294.518C69.8771 236.433 211.364 234.035 203.605 231.872C196.221 229.813 97.3095 309.398 87.7663 373.653" stroke="#0D0501" stroke-width="7.7606"/>
<path d="M149.375 413.222C149.074 369.401 201.146 228.22 206.061 231.874" stroke="#0D0501" stroke-width="7.7606"/>
<path d="M202.348 89.0595C181.351 89.8512 161.676 98.5256 144.555 112.384C127.637 102.836 93.8681 104.951 81.372 114.084C74.6176 143.49 79.1279 176.397 89.9115 198.815C84.985 215.771 82.2869 233.481 82.2869 251.109C82.2869 308.824 111.136 349.456 152.841 367.528C158.186 379.038 171.186 389.906 180.69 392.058C199.695 396.361 213.127 396.754 232.131 392.058C241.851 389.656 254.857 378.133 260.095 366.712C300.763 348.236 328.767 307.935 328.767 251.11C328.767 234.023 326.19 216.862 321.549 200.38C332.879 177.949 337.813 144.177 330.902 114.084C318.216 104.813 283.604 102.741 266.956 112.792C248.861 97.9991 227.89 89.0596 205.501 89.0596C204.437 89.0596 203.405 89.0194 202.348 89.0595Z" fill="white" stroke="#0D0501" stroke-width="6.9846"/>
<path d="M144.416 253.148C142.863 255.917 141.925 259.35 141.925 263.077C141.925 272.228 147.488 279.669 154.328 279.669C160.562 279.669 165.662 273.475 166.528 265.457L144.416 253.148Z" fill="#0D0501"/>
<path d="M178.748 295.04C182.093 278.305 228.543 276.7 233.318 295.04C237.407 310.748 218.496 331.015 206.033 331.063C194.678 331.104 175.386 311.866 178.748 295.04Z" fill="#0D0501"/>
<path opacity="0.2" d="M95.3709 138.466C103.29 134.933 118.684 138.313 128.439 141.763C115.861 157.535 107.634 170.613 99.8898 191.772C93.2601 175.599 91.6636 153.358 95.3709 138.466Z" fill="black"/>
<path d="M13 290.133L132.126 301.124" stroke="#050200" stroke-width="1.5521" stroke-linecap="round"/>
<path d="M139.113 315.425L47.5098 362.686" stroke="#050200" stroke-width="1.5521" stroke-linecap="round"/>
<path d="M147.728 330.819C144.442 334.116 86.111 397.862 86.111 397.862" stroke="#050200" stroke-width="1.5521" stroke-linecap="round"/>
</g>
<defs>
<filter id="filter0_f_1_3268" x="-1" y="-1" width="190" height="500" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
<feGaussianBlur stdDeviation="0.5" result="effect1_foregroundBlur_1_3268"/>
</filter>
<clipPath id="clip0_1_3268">
<rect width="188" height="498" fill="white"/>
</clipPath>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

8
DouShouQi_App/DouShouQi_App.xcodeproj/project.pbxproj
Unescape View File

@ -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 = "<group>"; };
649B59A62BF64BA9002BAE38 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = "<group>"; };
649B59A82BF64C6A002BAE38 /* Colors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Colors.swift; sourceTree = "<group>"; };
649B59AB2BF64E12002BAE38 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
649B59AD2BF64EAB002BAE38 /* AppImages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppImages.swift; sourceTree = "<group>"; };
649B59B12BF65392002BAE38 /* TextStyles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextStyles.swift; sourceTree = "<group>"; };
649B59B32BF653E1002BAE38 /* ViewTitleTextStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewTitleTextStyle.swift; sourceTree = "<group>"; };
@ -106,6 +105,7 @@
EC62C4FE2C0457AD0048CD0B /* TitleScreenMusic.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = TitleScreenMusic.mp3; sourceTree = "<group>"; };
EC62C5002C045B590048CD0B /* SoundPlayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SoundPlayer.swift; sourceTree = "<group>"; };
EC62C5052C045C1A0048CD0B /* TitleScreenButtonSound.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = TitleScreenButtonSound.mp3; sourceTree = "<group>"; };
ECB636542C047992007CD5E2 /* Image.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Image.xcassets; sourceTree = "<group>"; };
/* 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 = "<group>";
@ -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;

2
DouShouQi_App/DouShouQi_App/Assets/Images/AppImages.swift
Unescape View File

@ -9,6 +9,6 @@ import Foundation
import SwiftUI
public struct AppImages {
static let TitleImage = "TitlePageImage"
static let TitleImage = "Title"
static let SemiLion = "SemiLion"
}

0
DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/Contents.json → DouShouQi_App/DouShouQi_App/Assets/Images/Image.xcassets/Contents.json
Unescape View File

2
DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/SemiLion.imageset/Contents.json → DouShouQi_App/DouShouQi_App/Assets/Images/Image.xcassets/SemiLion.imageset/Contents.json vendored
Unescape View File

@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "doushouqi-lion 1.png",
"filename" : "doushouqi-semilion.png",
"idiom" : "universal",
"scale" : "1x"
},

BIN
DouShouQi_App/DouShouQi_App/Assets/Images/Image.xcassets/SemiLion.imageset/doushouqi-semilion.png vendored
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 50 KiB

12
DouShouQi_App/DouShouQi_App/Assets/Images/Image.xcassets/Title.imageset/Contents.json vendored
Unescape View File

@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "title-background.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

0
DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/-16-05-2024.svg → DouShouQi_App/DouShouQi_App/Assets/Images/Image.xcassets/Title.imageset/title-background.svg vendored
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

26
DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/Contents.json vendored
Unescape View File

@ -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
}
}

BIN
DouShouQi_App/DouShouQi_App/Assets/Images/Images.xcassets/TitlePageImage.imageset/title-background.png vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.9 KiB

3
DouShouQi_App/DouShouQi_App/Assets/TextStyles/ViewTitleTextStyle.swift
Unescape View File

@ -13,9 +13,6 @@ struct ViewTitleTextStyle: TextStyle {
content
.foregroundColor(Colors.TitleText)
.fontWeight(.bold)
<<<<<<< HEAD
=======
.font(.custom(Fonts.title, size: 30))
>>>>>>> dev_views
}
}

4
DouShouQi_App/DouShouQi_App/Components/TitlePageFrame.swift
Unescape View File

@ -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)

Write Preview
Loading…
Cancel
Save