From c923c889faf0b55234638908176d412924be66e1 Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 5 Feb 2024 17:34:21 +0900 Subject: [PATCH 001/108] Update minimum development target to 17.0 --- SFSymbolsArtCollection.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 21a063e..54e73f7 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -664,6 +664,7 @@ INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -696,6 +697,7 @@ INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", From 4ff625a6af0d05c89564cdc25c09c81d47fc9b8f Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 5 Feb 2024 18:04:01 +0900 Subject: [PATCH 002/108] Add ArtGalleryView --- .../project.pbxproj | 12 ++++++++++ .../ArtGalleryView.swift | 22 +++++++++++++++++++ .../SFSymbolsArtCollectionApp.swift | 6 +++-- 3 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 54e73f7..dba4b08 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -47,6 +47,7 @@ 97624C3A28C82DBB004E1720 /* CharacterAppearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3928C82DBB004E1720 /* CharacterAppearance.swift */; }; 97624C3C28C935F0004E1720 /* FiveCharactersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3B28C935F0004E1720 /* FiveCharactersView.swift */; }; 97624C3E28C93693004E1720 /* CharactersType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3D28C93693004E1720 /* CharactersType.swift */; }; + 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */; }; 97CD46E928BF080300919B65 /* iOSDCJapan2022Logo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */; }; 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11D4F2817381100B2AB32 /* SFSymbolsArtCollectionApp.swift */; }; @@ -108,6 +109,7 @@ 97624C3928C82DBB004E1720 /* CharacterAppearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CharacterAppearance.swift; sourceTree = ""; }; 97624C3B28C935F0004E1720 /* FiveCharactersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FiveCharactersView.swift; sourceTree = ""; }; 97624C3D28C93693004E1720 /* CharactersType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CharactersType.swift; sourceTree = ""; }; + 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Symbol.swift; sourceTree = ""; }; 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Logo.swift; sourceTree = ""; }; 97E11D4C2817381100B2AB32 /* SFSymbolsArtCollection.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SFSymbolsArtCollection.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -326,6 +328,14 @@ path = Animals; sourceTree = ""; }; + 97AD530D2B70DBC70034FB5D /* ArtisticWorldOfSFSymbols */ = { + isa = PBXGroup; + children = ( + 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */, + ); + path = ArtisticWorldOfSFSymbols; + sourceTree = ""; + }; 97CD46E528BEF8A000919B65 /* iOSDCJapan2022 */ = { isa = PBXGroup; children = ( @@ -357,6 +367,7 @@ children = ( 9748BE62289F4BFB006DF0BE /* Info.plist */, 97E11D4F2817381100B2AB32 /* SFSymbolsArtCollectionApp.swift */, + 97AD530D2B70DBC70034FB5D /* ArtisticWorldOfSFSymbols */, 97E11D512817381100B2AB32 /* ContentView.swift */, 97624C3628C74AA0004E1720 /* ArtWorks */, 971D9DE628C93EB500136A36 /* Common */, @@ -500,6 +511,7 @@ 97E11E3C281971ED00B2AB32 /* CrayonEye.swift in Sources */, 9748BE5D289DD696006DF0BE /* Building.swift in Sources */, 9748BE1D289399CF006DF0BE /* SFAlphabet.swift in Sources */, + 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */, 9748BE6628A395D5006DF0BE /* ArtWork.swift in Sources */, 973B2CA128C2546C006ED5F0 /* ArrangeShapeWithFont.swift in Sources */, 9748BE3F2897AE68006DF0BE /* ArmHair.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift new file mode 100644 index 0000000..526d140 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift @@ -0,0 +1,22 @@ +// +// ArtGalleryView.swift +// SFSymbolsArtCollection +// +// + +import SwiftUI + +struct ArtGalleryView: View { + + let baseLength: CGFloat + + var body: some View { + NavigationStack { + + } + } +} + +#Preview { + ArtGalleryView(baseLength: 1024) +} diff --git a/SFSymbolsArtCollection/SFSymbolsArtCollectionApp.swift b/SFSymbolsArtCollection/SFSymbolsArtCollectionApp.swift index e70804e..da544ed 100644 --- a/SFSymbolsArtCollection/SFSymbolsArtCollectionApp.swift +++ b/SFSymbolsArtCollection/SFSymbolsArtCollectionApp.swift @@ -2,7 +2,7 @@ // SFSymbolsArtCollectionApp.swift // SFSymbolsArtCollection // -// Created by 平岡修 on 2022/04/26. +// Created by Lil Ossa // import SwiftUI @@ -11,7 +11,9 @@ import SwiftUI struct SFSymbolsArtCollectionApp: App { var body: some Scene { WindowGroup { - ContentView() + GeometryReader { geometry in + ArtGalleryView(baseLength: geometry.baseLength) + } } } } From 1f72d7dd7e6d83c5199271612e406a8f44fd76d6 Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 5 Feb 2024 18:04:48 +0900 Subject: [PATCH 003/108] Update Setting by Xcode 15 --- SFSymbolsArtCollection.xcodeproj/project.pbxproj | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index dba4b08..0fddbe9 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -437,7 +437,7 @@ attributes = { BuildIndependentTargetsInParallel = 1; LastSwiftUpdateCheck = 1330; - LastUpgradeCheck = 1330; + LastUpgradeCheck = 1520; TargetAttributes = { 97E11D4B2817381100B2AB32 = { CreatedOnToolsVersion = 13.3; @@ -547,6 +547,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; @@ -579,6 +580,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -607,6 +609,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; @@ -639,6 +642,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; From 72d2cf47c2513a570ae00108643d8ca0687ff84a Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 5 Feb 2024 18:06:05 +0900 Subject: [PATCH 004/108] Remove unused Color+Extension --- SFSymbolsArtCollection.xcodeproj/project.pbxproj | 4 ---- .../ArtWorks/Fireworks/Fireworks.swift | 4 ++-- .../ArtWorks/Fireworks/MediumFirework.swift | 2 +- .../Common/Extensions/Color+Extensions.swift | 16 ---------------- 4 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 SFSymbolsArtCollection/Common/Extensions/Color+Extensions.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 0fddbe9..747a4a6 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -63,7 +63,6 @@ 97E11E3D281971ED00B2AB32 /* CrayonEyelid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11E38281971ED00B2AB32 /* CrayonEyelid.swift */; }; 97E11E3E281971ED00B2AB32 /* CrayonEyebrow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11E39281971ED00B2AB32 /* CrayonEyebrow.swift */; }; 97E11E3F281971ED00B2AB32 /* CrayonEyeBall.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11E3A281971ED00B2AB32 /* CrayonEyeBall.swift */; }; - 97E11E442819729B00B2AB32 /* Color+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11E432819729B00B2AB32 /* Color+Extensions.swift */; }; 97E11E462819734700B2AB32 /* CrayonBoy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11E452819734700B2AB32 /* CrayonBoy.swift */; }; /* End PBXBuildFile section */ @@ -125,7 +124,6 @@ 97E11E38281971ED00B2AB32 /* CrayonEyelid.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CrayonEyelid.swift; sourceTree = ""; }; 97E11E39281971ED00B2AB32 /* CrayonEyebrow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CrayonEyebrow.swift; sourceTree = ""; }; 97E11E3A281971ED00B2AB32 /* CrayonEyeBall.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CrayonEyeBall.swift; sourceTree = ""; }; - 97E11E432819729B00B2AB32 /* Color+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+Extensions.swift"; sourceTree = ""; }; 97E11E452819734700B2AB32 /* CrayonBoy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrayonBoy.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -400,7 +398,6 @@ 97E11E412819727A00B2AB32 /* Extensions */ = { isa = PBXGroup; children = ( - 97E11E432819729B00B2AB32 /* Color+Extensions.swift */, 97624C3228C4F43F004E1720 /* GeometryProxy+Extensions.swift */, ); path = Extensions; @@ -529,7 +526,6 @@ 9748BE352893CB67006DF0BE /* Lion.swift in Sources */, 97624C2C28C2DDAA004E1720 /* Buildings.swift in Sources */, 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */, - 97E11E442819729B00B2AB32 /* Color+Extensions.swift in Sources */, 9748BE4A28995877006DF0BE /* DemonWrestlerOutline.swift in Sources */, 97E11E34281971E200B2AB32 /* CrayonFace.swift in Sources */, 9748BE4C28995A43006DF0BE /* DemonWrestlerBody.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtWorks/Fireworks/Fireworks.swift b/SFSymbolsArtCollection/ArtWorks/Fireworks/Fireworks.swift index 5ba017a..6ff42b1 100644 --- a/SFSymbolsArtCollection/ArtWorks/Fireworks/Fireworks.swift +++ b/SFSymbolsArtCollection/ArtWorks/Fireworks/Fireworks.swift @@ -33,7 +33,7 @@ struct Fireworks: View { offsetX: baseLength * -0.225, offsetY: baseLength * 0.125) - SmallFirework(color: .lemonYellow, + SmallFirework(color: .init(.yellow), fontSize: baseLength * 0.125, offsetX: baseLength * -0.075, offsetY: baseLength * 0.25) @@ -73,7 +73,7 @@ struct Fireworks: View { } MediumFirework(baseLength: baseLength, - color: .lemonYellow, + color: .init(uiColor: .yellow), dotColor: .red) .offset(x: baseLength * 0.225, y: baseLength * 0.075) diff --git a/SFSymbolsArtCollection/ArtWorks/Fireworks/MediumFirework.swift b/SFSymbolsArtCollection/ArtWorks/Fireworks/MediumFirework.swift index 0349d97..4cd75cd 100644 --- a/SFSymbolsArtCollection/ArtWorks/Fireworks/MediumFirework.swift +++ b/SFSymbolsArtCollection/ArtWorks/Fireworks/MediumFirework.swift @@ -35,6 +35,6 @@ struct FMediumFirework_Previews: PreviewProvider { static var previews: some View { MediumFirework(baseLength: 400, color: .red, - dotColor: .lemonYellow) + dotColor: .init(uiColor: .yellow)) } } diff --git a/SFSymbolsArtCollection/Common/Extensions/Color+Extensions.swift b/SFSymbolsArtCollection/Common/Extensions/Color+Extensions.swift deleted file mode 100644 index ba11e2e..0000000 --- a/SFSymbolsArtCollection/Common/Extensions/Color+Extensions.swift +++ /dev/null @@ -1,16 +0,0 @@ -// -// Color+Extensions.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/04/27. -// - -import SwiftUI - -extension Color { - static let paleOrange = Color("PaleOrange") - static let palePink = Color("PalePink") - static let darkBrown = Color("DarkBrown") - static let midnightNavy = Color("MidnightNavy") - static let lemonYellow = Color(uiColor: .yellow) -} From 64031c91daf743684d1dbd82acad6177afd9b29f Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 5 Feb 2024 18:11:16 +0900 Subject: [PATCH 005/108] Update GeometryProxy+ --- SFSymbolsArtCollection.xcodeproj/project.pbxproj | 10 +++++----- .../ArtisticWorldOfSFSymbols/ArtGalleryView.swift | 1 + .../Extensions/GeometryProxy+.swift} | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) rename SFSymbolsArtCollection/{Common/Extensions/GeometryProxy+Extensions.swift => ArtisticWorldOfSFSymbols/Extensions/GeometryProxy+.swift} (72%) diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 747a4a6..7adaa3a 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -43,7 +43,7 @@ 97624C2A28C2BC9A004E1720 /* MediumFirework.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C2928C2BC9A004E1720 /* MediumFirework.swift */; }; 97624C2C28C2DDAA004E1720 /* Buildings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C2B28C2DDAA004E1720 /* Buildings.swift */; }; 97624C2F28C2E608004E1720 /* SmallFirework.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C2E28C2E608004E1720 /* SmallFirework.swift */; }; - 97624C3328C4F43F004E1720 /* GeometryProxy+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3228C4F43F004E1720 /* GeometryProxy+Extensions.swift */; }; + 97624C3328C4F43F004E1720 /* GeometryProxy+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3228C4F43F004E1720 /* GeometryProxy+.swift */; }; 97624C3A28C82DBB004E1720 /* CharacterAppearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3928C82DBB004E1720 /* CharacterAppearance.swift */; }; 97624C3C28C935F0004E1720 /* FiveCharactersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3B28C935F0004E1720 /* FiveCharactersView.swift */; }; 97624C3E28C93693004E1720 /* CharactersType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3D28C93693004E1720 /* CharactersType.swift */; }; @@ -104,7 +104,7 @@ 97624C2928C2BC9A004E1720 /* MediumFirework.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediumFirework.swift; sourceTree = ""; }; 97624C2B28C2DDAA004E1720 /* Buildings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Buildings.swift; sourceTree = ""; }; 97624C2E28C2E608004E1720 /* SmallFirework.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmallFirework.swift; sourceTree = ""; }; - 97624C3228C4F43F004E1720 /* GeometryProxy+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GeometryProxy+Extensions.swift"; sourceTree = ""; }; + 97624C3228C4F43F004E1720 /* GeometryProxy+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GeometryProxy+.swift"; sourceTree = ""; }; 97624C3928C82DBB004E1720 /* CharacterAppearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CharacterAppearance.swift; sourceTree = ""; }; 97624C3B28C935F0004E1720 /* FiveCharactersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FiveCharactersView.swift; sourceTree = ""; }; 97624C3D28C93693004E1720 /* CharactersType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CharactersType.swift; sourceTree = ""; }; @@ -153,7 +153,6 @@ children = ( 973B2CA228C2584F006ED5F0 /* ViewModifiers */, 9748BE1E28939AE5006DF0BE /* Enum */, - 97E11E412819727A00B2AB32 /* Extensions */, ); path = Common; sourceTree = ""; @@ -330,6 +329,7 @@ isa = PBXGroup; children = ( 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */, + 97E11E412819727A00B2AB32 /* Extensions */, ); path = ArtisticWorldOfSFSymbols; sourceTree = ""; @@ -398,7 +398,7 @@ 97E11E412819727A00B2AB32 /* Extensions */ = { isa = PBXGroup; children = ( - 97624C3228C4F43F004E1720 /* GeometryProxy+Extensions.swift */, + 97624C3228C4F43F004E1720 /* GeometryProxy+.swift */, ); path = Extensions; sourceTree = ""; @@ -515,7 +515,7 @@ 97E11D522817381100B2AB32 /* ContentView.swift in Sources */, 9748BE412897CD6C006DF0BE /* Arm.swift in Sources */, 9748BE4328980C4D006DF0BE /* Hair.swift in Sources */, - 97624C3328C4F43F004E1720 /* GeometryProxy+Extensions.swift in Sources */, + 97624C3328C4F43F004E1720 /* GeometryProxy+.swift in Sources */, 9748BE1828933E40006DF0BE /* MagicianHat.swift in Sources */, 9748BE50289AB439006DF0BE /* DemonWrestlerHand.swift in Sources */, 97E11E3F281971ED00B2AB32 /* CrayonEyeBall.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift index 526d140..015d4e9 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift @@ -2,6 +2,7 @@ // ArtGalleryView.swift // SFSymbolsArtCollection // +// Created by Lil Ossa // import SwiftUI diff --git a/SFSymbolsArtCollection/Common/Extensions/GeometryProxy+Extensions.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/GeometryProxy+.swift similarity index 72% rename from SFSymbolsArtCollection/Common/Extensions/GeometryProxy+Extensions.swift rename to SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/GeometryProxy+.swift index 8bb582f..fb921f3 100644 --- a/SFSymbolsArtCollection/Common/Extensions/GeometryProxy+Extensions.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/GeometryProxy+.swift @@ -2,7 +2,7 @@ // GeometryProxy+Extensions.swift // SFSymbolsArtCollection // -// Created by 平岡修 on 2022/09/04. +// Created by Lil Ossa // import SwiftUI @@ -12,9 +12,9 @@ extension GeometryProxy { var baseLength: CGFloat { let width = self.size.width - let halfHeight = self.size.height / 2 + let height = self.size.height - let baseLength = width < halfHeight ? width : halfHeight + let baseLength = width < height ? width : height return baseLength } From cd9837f0dc48057dbb07e8426dd8d2560bc87360 Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 5 Feb 2024 18:14:48 +0900 Subject: [PATCH 006/108] Add SymbolNameFrameView --- .../project.pbxproj | 12 +++ .../Common/SymbolNameFrameView.swift | 88 +++++++++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/SymbolNameFrameView.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 7adaa3a..aff9ff5 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -48,6 +48,7 @@ 97624C3C28C935F0004E1720 /* FiveCharactersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3B28C935F0004E1720 /* FiveCharactersView.swift */; }; 97624C3E28C93693004E1720 /* CharactersType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3D28C93693004E1720 /* CharactersType.swift */; }; 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; + 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */; }; 97CD46E928BF080300919B65 /* iOSDCJapan2022Logo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */; }; 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11D4F2817381100B2AB32 /* SFSymbolsArtCollectionApp.swift */; }; @@ -109,6 +110,7 @@ 97624C3B28C935F0004E1720 /* FiveCharactersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FiveCharactersView.swift; sourceTree = ""; }; 97624C3D28C93693004E1720 /* CharactersType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CharactersType.swift; sourceTree = ""; }; 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; + 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Symbol.swift; sourceTree = ""; }; 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Logo.swift; sourceTree = ""; }; 97E11D4C2817381100B2AB32 /* SFSymbolsArtCollection.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SFSymbolsArtCollection.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -329,11 +331,20 @@ isa = PBXGroup; children = ( 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */, + 97AD530E2B70DDD10034FB5D /* Common */, 97E11E412819727A00B2AB32 /* Extensions */, ); path = ArtisticWorldOfSFSymbols; sourceTree = ""; }; + 97AD530E2B70DDD10034FB5D /* Common */ = { + isa = PBXGroup; + children = ( + 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */, + ); + path = Common; + sourceTree = ""; + }; 97CD46E528BEF8A000919B65 /* iOSDCJapan2022 */ = { isa = PBXGroup; children = ( @@ -531,6 +542,7 @@ 9748BE4C28995A43006DF0BE /* DemonWrestlerBody.swift in Sources */, 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */, 9748BE1A289341BE006DF0BE /* MagicianFace.swift in Sources */, + 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */, 9748BE4628981011006DF0BE /* DemonWrestler.swift in Sources */, 9748BE302893C706006DF0BE /* AnimalNose.swift in Sources */, ); diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/SymbolNameFrameView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/SymbolNameFrameView.swift new file mode 100644 index 0000000..ddf2277 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/SymbolNameFrameView.swift @@ -0,0 +1,88 @@ +// +// SymbolNameFrameView.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +struct SymbolNameFrameView: View { + + init(name: String, + length: CGFloat, + frameOpacity: CGFloat, + @ViewBuilder content: () -> Content){ + self.name = name + self.length = length + self.frameOpacity = frameOpacity + self.content = content() + } + + let name: String + let length: CGFloat + let frameOpacity: CGFloat + let content: Content + + var isFrameVisible: Bool { + frameOpacity != 0 + } + + var body: some View { + ZStack { + if isFrameVisible { + RoundedRectangle(cornerRadius: 12) + .stroke(lineWidth: 2) + .frame(width: length * 2, + height: length * 2.2) + .opacity(frameOpacity) + .offset(y: UIDevice.current.isPad ? length * 0.35 : 0) + } + + content + + VStack(spacing: 32) { + + content + .opacity(0) + + if isFrameVisible, + UIDevice.current.isPad { + Text(name) + .font(.system(size: length * 0.25)) + .opacity(frameOpacity) + .frame(width: length * 1.8) + .fixedSize(horizontal: false, vertical: true) + .multilineTextAlignment(.center) + .offset(y: length * 0.2) + } + } + } + } +} + +#Preview { + HStack { + SymbolNameFrameView( + name: "circle.fill", + length: 61.44, + frameOpacity: 1 + ) { + Image(systemName: "circle.fill") + .resizable() + .frame(width: 61.4, + height: 61.4) + } + + SymbolNameFrameView( + name: "doc.plaintext.fill", + length: 61.44, + frameOpacity: 1 + ) { + Image(systemName: "doc.plaintext.fill") + .resizable() + .frame(width: 61.4, + height: 61.4) + } + } +} From 29362e43a1839cc575ef0713b31544dcaa5c42b9 Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 5 Feb 2024 18:16:08 +0900 Subject: [PATCH 007/108] Add UIDevice+Extension --- SFSymbolsArtCollection.xcodeproj/project.pbxproj | 4 ++++ .../Extensions/UIDevice+.swift | 15 +++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/UIDevice+.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index aff9ff5..47f5dc5 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -49,6 +49,7 @@ 97624C3E28C93693004E1720 /* CharactersType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3D28C93693004E1720 /* CharactersType.swift */; }; 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; + 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */; }; 97CD46E928BF080300919B65 /* iOSDCJapan2022Logo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */; }; 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11D4F2817381100B2AB32 /* SFSymbolsArtCollectionApp.swift */; }; @@ -111,6 +112,7 @@ 97624C3D28C93693004E1720 /* CharactersType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CharactersType.swift; sourceTree = ""; }; 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; + 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Symbol.swift; sourceTree = ""; }; 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Logo.swift; sourceTree = ""; }; 97E11D4C2817381100B2AB32 /* SFSymbolsArtCollection.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SFSymbolsArtCollection.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -410,6 +412,7 @@ isa = PBXGroup; children = ( 97624C3228C4F43F004E1720 /* GeometryProxy+.swift */, + 97AD53112B70DEB60034FB5D /* UIDevice+.swift */, ); path = Extensions; sourceTree = ""; @@ -509,6 +512,7 @@ 97E11E35281971E200B2AB32 /* CrayonMouth.swift in Sources */, 9748BE6428A3936E006DF0BE /* ArtWorkView.swift in Sources */, 97E11E3D281971ED00B2AB32 /* CrayonEyelid.swift in Sources */, + 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */, 97624C3C28C935F0004E1720 /* FiveCharactersView.swift in Sources */, 9748BE292893BFE3006DF0BE /* Earth.swift in Sources */, 97E11E3E281971ED00B2AB32 /* CrayonEyebrow.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/UIDevice+.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/UIDevice+.swift new file mode 100644 index 0000000..52fde53 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/UIDevice+.swift @@ -0,0 +1,15 @@ +// +// UIDevice+.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension UIDevice { + + var isPad: Bool { + return userInterfaceIdiom == .pad + } +} From 94c94f18070e34679c560e0b271ebad214547171 Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 5 Feb 2024 18:18:52 +0900 Subject: [PATCH 008/108] Add new folder group --- SFSymbolsArtCollection.xcodeproj/project.pbxproj | 10 +++++++++- .../Common/{ => Views}/SymbolNameFrameView.swift | 0 2 files changed, 9 insertions(+), 1 deletion(-) rename SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/{ => Views}/SymbolNameFrameView.swift (100%) diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 47f5dc5..7491bee 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -342,11 +342,19 @@ 97AD530E2B70DDD10034FB5D /* Common */ = { isa = PBXGroup; children = ( - 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */, + 97AD53132B70DF5A0034FB5D /* Views */, ); path = Common; sourceTree = ""; }; + 97AD53132B70DF5A0034FB5D /* Views */ = { + isa = PBXGroup; + children = ( + 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */, + ); + path = Views; + sourceTree = ""; + }; 97CD46E528BEF8A000919B65 /* iOSDCJapan2022 */ = { isa = PBXGroup; children = ( diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/SymbolNameFrameView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/SymbolNameFrameView.swift similarity index 100% rename from SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/SymbolNameFrameView.swift rename to SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/SymbolNameFrameView.swift From b8f15fd0dac16041a75dfcef423b363aced68025 Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 5 Feb 2024 18:20:19 +0900 Subject: [PATCH 009/108] Add AnimationDuration --- SFSymbolsArtCollection.xcodeproj/project.pbxproj | 12 ++++++++++++ .../Common/Models/AnimationDuration.swift | 14 ++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/AnimationDuration.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 7491bee..7b6363a 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -50,6 +50,7 @@ 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; + 97AD53162B70DFB40034FB5D /* AnimationDuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53152B70DFB40034FB5D /* AnimationDuration.swift */; }; 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */; }; 97CD46E928BF080300919B65 /* iOSDCJapan2022Logo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */; }; 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11D4F2817381100B2AB32 /* SFSymbolsArtCollectionApp.swift */; }; @@ -113,6 +114,7 @@ 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; + 97AD53152B70DFB40034FB5D /* AnimationDuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimationDuration.swift; sourceTree = ""; }; 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Symbol.swift; sourceTree = ""; }; 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Logo.swift; sourceTree = ""; }; 97E11D4C2817381100B2AB32 /* SFSymbolsArtCollection.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SFSymbolsArtCollection.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -342,6 +344,7 @@ 97AD530E2B70DDD10034FB5D /* Common */ = { isa = PBXGroup; children = ( + 97AD53142B70DF8A0034FB5D /* Models */, 97AD53132B70DF5A0034FB5D /* Views */, ); path = Common; @@ -355,6 +358,14 @@ path = Views; sourceTree = ""; }; + 97AD53142B70DF8A0034FB5D /* Models */ = { + isa = PBXGroup; + children = ( + 97AD53152B70DFB40034FB5D /* AnimationDuration.swift */, + ); + path = Models; + sourceTree = ""; + }; 97CD46E528BEF8A000919B65 /* iOSDCJapan2022 */ = { isa = PBXGroup; children = ( @@ -510,6 +521,7 @@ 971D9DE828C9497D00136A36 /* MagicianSunGlasses.swift in Sources */, 97624C3E28C93693004E1720 /* CharactersType.swift in Sources */, 97624C2A28C2BC9A004E1720 /* MediumFirework.swift in Sources */, + 97AD53162B70DFB40034FB5D /* AnimationDuration.swift in Sources */, 97E11E33281971E200B2AB32 /* CrayonHair.swift in Sources */, 97624C3A28C82DBB004E1720 /* CharacterAppearance.swift in Sources */, 9748BE3A2893D0E3006DF0BE /* Frog.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/AnimationDuration.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/AnimationDuration.swift new file mode 100644 index 0000000..eb22ecf --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/AnimationDuration.swift @@ -0,0 +1,14 @@ +// +// AnimationDuration.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +struct AnimationDuration { + static let perSymbol: Double = 1.5 + + static func waitingTime(forCount count: Int) -> Double { + return perSymbol * Double(count) + } +} From fe85343a7b11f4563253013f9e86e7bd2af7f7c3 Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 5 Feb 2024 18:21:45 +0900 Subject: [PATCH 010/108] Add AnimationValues --- .../project.pbxproj | 4 ++ .../Common/Models/AnimationValues.swift | 48 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/AnimationValues.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 7b6363a..bc236e5 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -51,6 +51,7 @@ 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; 97AD53162B70DFB40034FB5D /* AnimationDuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53152B70DFB40034FB5D /* AnimationDuration.swift */; }; + 97AD53182B70DFF30034FB5D /* AnimationValues.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53172B70DFF30034FB5D /* AnimationValues.swift */; }; 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */; }; 97CD46E928BF080300919B65 /* iOSDCJapan2022Logo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */; }; 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11D4F2817381100B2AB32 /* SFSymbolsArtCollectionApp.swift */; }; @@ -115,6 +116,7 @@ 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; 97AD53152B70DFB40034FB5D /* AnimationDuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimationDuration.swift; sourceTree = ""; }; + 97AD53172B70DFF30034FB5D /* AnimationValues.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimationValues.swift; sourceTree = ""; }; 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Symbol.swift; sourceTree = ""; }; 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Logo.swift; sourceTree = ""; }; 97E11D4C2817381100B2AB32 /* SFSymbolsArtCollection.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SFSymbolsArtCollection.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -362,6 +364,7 @@ isa = PBXGroup; children = ( 97AD53152B70DFB40034FB5D /* AnimationDuration.swift */, + 97AD53172B70DFF30034FB5D /* AnimationValues.swift */, ); path = Models; sourceTree = ""; @@ -518,6 +521,7 @@ 9748BE4828981096006DF0BE /* DemonWrestlerFace.swift in Sources */, 9748BE372893D064006DF0BE /* PartyAnimals.swift in Sources */, 971D9DEA28C9731D00136A36 /* iOSDCJapan2022SymbolType.swift in Sources */, + 97AD53182B70DFF30034FB5D /* AnimationValues.swift in Sources */, 971D9DE828C9497D00136A36 /* MagicianSunGlasses.swift in Sources */, 97624C3E28C93693004E1720 /* CharactersType.swift in Sources */, 97624C2A28C2BC9A004E1720 /* MediumFirework.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/AnimationValues.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/AnimationValues.swift new file mode 100644 index 0000000..701ec78 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/AnimationValues.swift @@ -0,0 +1,48 @@ +// +// AnimationValues.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +struct AnimationValues { + + init( + primaryColor: Color = .black, + secondaryColor: Color = .black, + fontWeight: Font.Weight = .regular, + width: CGFloat, + height: CGFloat, + symbolNameVisibleValue: CGFloat = 1, + rotationDegrees: CGFloat = 0, + rotationAxis: (x: CGFloat, y: CGFloat, z: CGFloat) = (x: 0, y: 0, z: 1), + offsetX: CGFloat = 0, + offsetY: CGFloat = 0 + ) { + self.primaryColor = primaryColor.resolve(in: .init()) + self.secondaryColor = secondaryColor.resolve(in: .init()) + self.fontWeightValue = fontWeight.animatableValue + self.width = width + self.height = height + self.symbolNameVisibleValue = symbolNameVisibleValue + self.rotationDegrees = rotationDegrees + self.rotationAxis = rotationAxis + self.offset = .init(width: offsetX, height: offsetY) + } + + var primaryColor: Color.Resolved + var secondaryColor: Color.Resolved + var fontWeightValue: CGFloat + var width: CGFloat + var height: CGFloat + var symbolNameVisibleValue: CGFloat + var rotationDegrees: CGFloat + var rotationAxis: (x: CGFloat, y: CGFloat, z: CGFloat) + var offset: CGSize + + var fontWeight: Font.Weight { + return .init(animatableValue: fontWeightValue) + } +} From d2793931f47ab738703e0c0411c5cca7d8a10673 Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 5 Feb 2024 18:23:04 +0900 Subject: [PATCH 011/108] Add Font.Weight+Extension --- .../project.pbxproj | 4 ++ .../Extensions/Font.Weight+.swift | 62 +++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/Font.Weight+.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index bc236e5..6e4b673 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -52,6 +52,7 @@ 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; 97AD53162B70DFB40034FB5D /* AnimationDuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53152B70DFB40034FB5D /* AnimationDuration.swift */; }; 97AD53182B70DFF30034FB5D /* AnimationValues.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53172B70DFF30034FB5D /* AnimationValues.swift */; }; + 97AD531A2B70E0530034FB5D /* Font.Weight+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53192B70E0530034FB5D /* Font.Weight+.swift */; }; 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */; }; 97CD46E928BF080300919B65 /* iOSDCJapan2022Logo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */; }; 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11D4F2817381100B2AB32 /* SFSymbolsArtCollectionApp.swift */; }; @@ -117,6 +118,7 @@ 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; 97AD53152B70DFB40034FB5D /* AnimationDuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimationDuration.swift; sourceTree = ""; }; 97AD53172B70DFF30034FB5D /* AnimationValues.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimationValues.swift; sourceTree = ""; }; + 97AD53192B70E0530034FB5D /* Font.Weight+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Font.Weight+.swift"; sourceTree = ""; }; 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Symbol.swift; sourceTree = ""; }; 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Logo.swift; sourceTree = ""; }; 97E11D4C2817381100B2AB32 /* SFSymbolsArtCollection.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SFSymbolsArtCollection.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -435,6 +437,7 @@ children = ( 97624C3228C4F43F004E1720 /* GeometryProxy+.swift */, 97AD53112B70DEB60034FB5D /* UIDevice+.swift */, + 97AD53192B70E0530034FB5D /* Font.Weight+.swift */, ); path = Extensions; sourceTree = ""; @@ -534,6 +537,7 @@ 9748BE15289338A3006DF0BE /* Magician.swift in Sources */, 9748BE3C2897AA28006DF0BE /* AnimalWhiskers.swift in Sources */, 97E11E35281971E200B2AB32 /* CrayonMouth.swift in Sources */, + 97AD531A2B70E0530034FB5D /* Font.Weight+.swift in Sources */, 9748BE6428A3936E006DF0BE /* ArtWorkView.swift in Sources */, 97E11E3D281971ED00B2AB32 /* CrayonEyelid.swift in Sources */, 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/Font.Weight+.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/Font.Weight+.swift new file mode 100644 index 0000000..06fa785 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/Font.Weight+.swift @@ -0,0 +1,62 @@ +// +// Font.Weight+.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension Font.Weight { + + var animatableValue: CGFloat { + switch self { + case .ultraLight: + return 0 + case .thin: + return 1 + case .light: + return 2 + case .regular: + return 3 + case .medium: + return 4 + case .semibold: + return 5 + case .bold: + return 6 + case .heavy: + return 7 + case .black: + return 8 + default: + fatalError("\(self) is not defined") + } + } + + init(animatableValue value: CGFloat) { + switch value { + case 0..<1: + self = .ultraLight + case 1..<2: + self = .thin + case 2..<3: + self = .light + case 3..<4: + self = .regular + case 4..<5: + self = .medium + case 5..<6: + self = .semibold + case 6..<7: + self = .bold + case 7..<8: + self = .heavy + case 8: + self = .black + default: + print("💣: \(value) is not defined") + self = .regular + } + } +} From 5079ae14bb3dbf3c94fe064a39b00f56f1c2600d Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 5 Feb 2024 18:35:07 +0900 Subject: [PATCH 012/108] Add ArtWorks group folder --- SFSymbolsArtCollection.xcodeproj/project.pbxproj | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 6e4b673..e0b14ba 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -339,6 +339,7 @@ isa = PBXGroup; children = ( 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */, + 97AD531B2B70E0A10034FB5D /* ArtWorks */, 97AD530E2B70DDD10034FB5D /* Common */, 97E11E412819727A00B2AB32 /* Extensions */, ); @@ -371,6 +372,21 @@ path = Models; sourceTree = ""; }; + 97AD531B2B70E0A10034FB5D /* ArtWorks */ = { + isa = PBXGroup; + children = ( + 97AD531E2B70E2770034FB5D /* AfroBoy */, + ); + path = ArtWorks; + sourceTree = ""; + }; + 97AD531E2B70E2770034FB5D /* AfroBoy */ = { + isa = PBXGroup; + children = ( + ); + path = AfroBoy; + sourceTree = ""; + }; 97CD46E528BEF8A000919B65 /* iOSDCJapan2022 */ = { isa = PBXGroup; children = ( From 8905ae0fad51aa50f2b6f6a6c389e59d4cca546f Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 5 Feb 2024 18:39:29 +0900 Subject: [PATCH 013/108] Add ArtComponentView --- .../project.pbxproj | 4 + .../Common/Views/ArtComponentView.swift | 135 ++++++++++++++++++ 2 files changed, 139 insertions(+) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index e0b14ba..fd4568c 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -53,6 +53,7 @@ 97AD53162B70DFB40034FB5D /* AnimationDuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53152B70DFB40034FB5D /* AnimationDuration.swift */; }; 97AD53182B70DFF30034FB5D /* AnimationValues.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53172B70DFF30034FB5D /* AnimationValues.swift */; }; 97AD531A2B70E0530034FB5D /* Font.Weight+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53192B70E0530034FB5D /* Font.Weight+.swift */; }; + 97AD53222B70E3FA0034FB5D /* ArtComponentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53212B70E3FA0034FB5D /* ArtComponentView.swift */; }; 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */; }; 97CD46E928BF080300919B65 /* iOSDCJapan2022Logo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */; }; 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11D4F2817381100B2AB32 /* SFSymbolsArtCollectionApp.swift */; }; @@ -119,6 +120,7 @@ 97AD53152B70DFB40034FB5D /* AnimationDuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimationDuration.swift; sourceTree = ""; }; 97AD53172B70DFF30034FB5D /* AnimationValues.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimationValues.swift; sourceTree = ""; }; 97AD53192B70E0530034FB5D /* Font.Weight+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Font.Weight+.swift"; sourceTree = ""; }; + 97AD53212B70E3FA0034FB5D /* ArtComponentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtComponentView.swift; sourceTree = ""; }; 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Symbol.swift; sourceTree = ""; }; 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Logo.swift; sourceTree = ""; }; 97E11D4C2817381100B2AB32 /* SFSymbolsArtCollection.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SFSymbolsArtCollection.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -358,6 +360,7 @@ 97AD53132B70DF5A0034FB5D /* Views */ = { isa = PBXGroup; children = ( + 97AD53212B70E3FA0034FB5D /* ArtComponentView.swift */, 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */, ); path = Views; @@ -584,6 +587,7 @@ 97E11E3B281971ED00B2AB32 /* CrayonEyes.swift in Sources */, 9748BE352893CB67006DF0BE /* Lion.swift in Sources */, 97624C2C28C2DDAA004E1720 /* Buildings.swift in Sources */, + 97AD53222B70E3FA0034FB5D /* ArtComponentView.swift in Sources */, 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */, 9748BE4A28995877006DF0BE /* DemonWrestlerOutline.swift in Sources */, 97E11E34281971E200B2AB32 /* CrayonFace.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView.swift new file mode 100644 index 0000000..267bdde --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView.swift @@ -0,0 +1,135 @@ +// +// ArtComponentView.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +struct ArtComponentView: View { + + let name: String + let initialValue: AnimationValues + let finalValue: AnimationValues + let isAnimating: Bool + let animationDuration: Double + let waitingTime: Double + + var body: some View { + Image(systemName: name) + .resizable() + .keyframeAnimator( + initialValue: initialValue, + trigger: isAnimating + ) { content, value in + + SymbolNameFrameView( + name: name, + length: initialValue.width, + frameOpacity: value.symbolNameVisibleValue + ) { + + Group { + if value.symbolNameVisibleValue == 1 { + content + .scaledToFit() + } else { + content + } + } + .foregroundStyle( + value.primaryColor, + value.secondaryColor + ) + .fontWeight(value.fontWeight) + .frame( + width: value.width, + height: value.height + ) + } + .rotation3DEffect( + .degrees(value.rotationDegrees), + axis: value.rotationAxis + ) + .offset(value.offset) + + } keyframes: { value in + + KeyframeTrack(\.primaryColor) { + LinearKeyframe(value.primaryColor, duration: waitingTime) + CubicKeyframe(finalValue.primaryColor, duration: animationDuration) + } + + KeyframeTrack(\.secondaryColor) { + LinearKeyframe(value.secondaryColor, duration: waitingTime) + CubicKeyframe(finalValue.secondaryColor, duration: animationDuration) + } + + KeyframeTrack(\.fontWeightValue) { + LinearKeyframe(value.fontWeightValue, duration: waitingTime) + CubicKeyframe(finalValue.fontWeightValue, duration: animationDuration) + } + + KeyframeTrack(\.width) { + LinearKeyframe(value.width, duration: waitingTime) + CubicKeyframe(finalValue.width, duration: animationDuration) + } + + KeyframeTrack(\.height) { + LinearKeyframe(value.height, duration: waitingTime) + CubicKeyframe(finalValue.height, duration: animationDuration) + } + + KeyframeTrack(\.rotationDegrees) { + LinearKeyframe(value.rotationDegrees, duration: waitingTime) + CubicKeyframe(finalValue.rotationDegrees, duration: animationDuration) + } + + KeyframeTrack(\.rotationAxis.x) { + LinearKeyframe(value.rotationAxis.x, duration: waitingTime) + CubicKeyframe(finalValue.rotationAxis.x, duration: animationDuration) + } + + KeyframeTrack(\.rotationAxis.y) { + LinearKeyframe(value.rotationAxis.y, duration: waitingTime) + CubicKeyframe(finalValue.rotationAxis.y, duration: animationDuration) + } + + KeyframeTrack(\.rotationAxis.z) { + LinearKeyframe(value.rotationAxis.z, duration: waitingTime) + CubicKeyframe(finalValue.rotationAxis.z, duration: animationDuration) + } + + KeyframeTrack(\.offset) { + LinearKeyframe(value.offset, duration: waitingTime) + CubicKeyframe(finalValue.offset, duration: animationDuration) + } + + KeyframeTrack(\.symbolNameVisibleValue) { + LinearKeyframe(1, duration: waitingTime) + CubicKeyframe(0, duration: animationDuration * 0.2) + } + } + } +} + +#Preview { + ArtComponentView( + name: "circle.fill", + initialValue: .init( + width: 100, + height: 100, + offsetX: 0, + offsetY: 0 + ), finalValue: .init( + width: 200, + height: 200, + offsetX: 0, + offsetY: 0 + ), + isAnimating: true, + animationDuration: 20, + waitingTime: 0 + ) +} From 13cd24649690808b94ddff8eaffb6ba27b0c6e06 Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 5 Feb 2024 18:41:35 +0900 Subject: [PATCH 014/108] Add PlayButton --- .../project.pbxproj | 4 +++ .../Common/Views/PlayButton.swift | 28 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/PlayButton.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index fd4568c..5e107df 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -54,6 +54,7 @@ 97AD53182B70DFF30034FB5D /* AnimationValues.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53172B70DFF30034FB5D /* AnimationValues.swift */; }; 97AD531A2B70E0530034FB5D /* Font.Weight+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53192B70E0530034FB5D /* Font.Weight+.swift */; }; 97AD53222B70E3FA0034FB5D /* ArtComponentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53212B70E3FA0034FB5D /* ArtComponentView.swift */; }; + 97AD53242B70E48F0034FB5D /* PlayButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53232B70E48F0034FB5D /* PlayButton.swift */; }; 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */; }; 97CD46E928BF080300919B65 /* iOSDCJapan2022Logo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */; }; 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11D4F2817381100B2AB32 /* SFSymbolsArtCollectionApp.swift */; }; @@ -121,6 +122,7 @@ 97AD53172B70DFF30034FB5D /* AnimationValues.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimationValues.swift; sourceTree = ""; }; 97AD53192B70E0530034FB5D /* Font.Weight+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Font.Weight+.swift"; sourceTree = ""; }; 97AD53212B70E3FA0034FB5D /* ArtComponentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtComponentView.swift; sourceTree = ""; }; + 97AD53232B70E48F0034FB5D /* PlayButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayButton.swift; sourceTree = ""; }; 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Symbol.swift; sourceTree = ""; }; 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Logo.swift; sourceTree = ""; }; 97E11D4C2817381100B2AB32 /* SFSymbolsArtCollection.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SFSymbolsArtCollection.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -361,6 +363,7 @@ isa = PBXGroup; children = ( 97AD53212B70E3FA0034FB5D /* ArtComponentView.swift */, + 97AD53232B70E48F0034FB5D /* PlayButton.swift */, 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */, ); path = Views; @@ -552,6 +555,7 @@ 97624C3A28C82DBB004E1720 /* CharacterAppearance.swift in Sources */, 9748BE3A2893D0E3006DF0BE /* Frog.swift in Sources */, 97CD46E928BF080300919B65 /* iOSDCJapan2022Logo.swift in Sources */, + 97AD53242B70E48F0034FB5D /* PlayButton.swift in Sources */, 9748BE2028939B04006DF0BE /* FlipType.swift in Sources */, 9748BE15289338A3006DF0BE /* Magician.swift in Sources */, 9748BE3C2897AA28006DF0BE /* AnimalWhiskers.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/PlayButton.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/PlayButton.swift new file mode 100644 index 0000000..72a63e1 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/PlayButton.swift @@ -0,0 +1,28 @@ +// +// PlayButton.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +struct PlayButton: View { + + let action: () -> Void + + var body: some View { + Button { + action() + } label: { + HStack { + Image(systemName: "play.circle.fill") + Text("Play") + } + } + } +} + +#Preview { + PlayButton {} +} From 04a101601a1bb063c4a1d8cdf96aa1444211daac Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 5 Feb 2024 18:42:23 +0900 Subject: [PATCH 015/108] Create ArtComponentView group folder --- SFSymbolsArtCollection.xcodeproj/project.pbxproj | 12 ++++++++++-- .../{ => ArtComponentView}/ArtComponentView.swift | 0 .../{ => ArtComponentView}/SymbolNameFrameView.swift | 0 3 files changed, 10 insertions(+), 2 deletions(-) rename SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/{ => ArtComponentView}/ArtComponentView.swift (100%) rename SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/{ => ArtComponentView}/SymbolNameFrameView.swift (100%) diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 5e107df..108b9e6 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -362,9 +362,8 @@ 97AD53132B70DF5A0034FB5D /* Views */ = { isa = PBXGroup; children = ( - 97AD53212B70E3FA0034FB5D /* ArtComponentView.swift */, + 97AD53252B70E4DA0034FB5D /* ArtComponentView */, 97AD53232B70E48F0034FB5D /* PlayButton.swift */, - 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */, ); path = Views; sourceTree = ""; @@ -393,6 +392,15 @@ path = AfroBoy; sourceTree = ""; }; + 97AD53252B70E4DA0034FB5D /* ArtComponentView */ = { + isa = PBXGroup; + children = ( + 97AD53212B70E3FA0034FB5D /* ArtComponentView.swift */, + 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */, + ); + path = ArtComponentView; + sourceTree = ""; + }; 97CD46E528BEF8A000919B65 /* iOSDCJapan2022 */ = { isa = PBXGroup; children = ( diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView/ArtComponentView.swift similarity index 100% rename from SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView.swift rename to SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView/ArtComponentView.swift diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/SymbolNameFrameView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView/SymbolNameFrameView.swift similarity index 100% rename from SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/SymbolNameFrameView.swift rename to SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView/SymbolNameFrameView.swift From 9d593baa835a3b2eaad622cc1aeedeade956e1bd Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 5 Feb 2024 21:45:17 +0900 Subject: [PATCH 016/108] Update Art gallery --- .../project.pbxproj | 16 +-- .../ArtGalleryView.swift | 22 +++- .../ArtWorks/AfroBoy/AfroBoyArtView.swift | 124 ++++++++++++++++++ .../Common/Models/AnimationDuration.swift | 14 -- .../Common/Models/ArtWorkModel.swift | 35 +++++ .../SFSymbolsArtCollectionApp.swift | 3 +- 6 files changed, 188 insertions(+), 26 deletions(-) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift delete mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/AnimationDuration.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 108b9e6..7e6ab35 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -50,11 +50,12 @@ 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; - 97AD53162B70DFB40034FB5D /* AnimationDuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53152B70DFB40034FB5D /* AnimationDuration.swift */; }; 97AD53182B70DFF30034FB5D /* AnimationValues.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53172B70DFF30034FB5D /* AnimationValues.swift */; }; 97AD531A2B70E0530034FB5D /* Font.Weight+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53192B70E0530034FB5D /* Font.Weight+.swift */; }; 97AD53222B70E3FA0034FB5D /* ArtComponentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53212B70E3FA0034FB5D /* ArtComponentView.swift */; }; 97AD53242B70E48F0034FB5D /* PlayButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53232B70E48F0034FB5D /* PlayButton.swift */; }; + 97AD53292B7100670034FB5D /* ArtWorkModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53282B7100670034FB5D /* ArtWorkModel.swift */; }; + 97AD532B2B71068B0034FB5D /* AfroBoyArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD532A2B71068B0034FB5D /* AfroBoyArtView.swift */; }; 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */; }; 97CD46E928BF080300919B65 /* iOSDCJapan2022Logo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */; }; 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11D4F2817381100B2AB32 /* SFSymbolsArtCollectionApp.swift */; }; @@ -118,11 +119,12 @@ 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; - 97AD53152B70DFB40034FB5D /* AnimationDuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimationDuration.swift; sourceTree = ""; }; 97AD53172B70DFF30034FB5D /* AnimationValues.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimationValues.swift; sourceTree = ""; }; 97AD53192B70E0530034FB5D /* Font.Weight+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Font.Weight+.swift"; sourceTree = ""; }; 97AD53212B70E3FA0034FB5D /* ArtComponentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtComponentView.swift; sourceTree = ""; }; 97AD53232B70E48F0034FB5D /* PlayButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayButton.swift; sourceTree = ""; }; + 97AD53282B7100670034FB5D /* ArtWorkModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtWorkModel.swift; sourceTree = ""; }; + 97AD532A2B71068B0034FB5D /* AfroBoyArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AfroBoyArtView.swift; sourceTree = ""; }; 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Symbol.swift; sourceTree = ""; }; 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Logo.swift; sourceTree = ""; }; 97E11D4C2817381100B2AB32 /* SFSymbolsArtCollection.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SFSymbolsArtCollection.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -371,7 +373,7 @@ 97AD53142B70DF8A0034FB5D /* Models */ = { isa = PBXGroup; children = ( - 97AD53152B70DFB40034FB5D /* AnimationDuration.swift */, + 97AD53282B7100670034FB5D /* ArtWorkModel.swift */, 97AD53172B70DFF30034FB5D /* AnimationValues.swift */, ); path = Models; @@ -388,6 +390,7 @@ 97AD531E2B70E2770034FB5D /* AfroBoy */ = { isa = PBXGroup; children = ( + 97AD532A2B71068B0034FB5D /* AfroBoyArtView.swift */, ); path = AfroBoy; sourceTree = ""; @@ -558,7 +561,6 @@ 971D9DE828C9497D00136A36 /* MagicianSunGlasses.swift in Sources */, 97624C3E28C93693004E1720 /* CharactersType.swift in Sources */, 97624C2A28C2BC9A004E1720 /* MediumFirework.swift in Sources */, - 97AD53162B70DFB40034FB5D /* AnimationDuration.swift in Sources */, 97E11E33281971E200B2AB32 /* CrayonHair.swift in Sources */, 97624C3A28C82DBB004E1720 /* CharacterAppearance.swift in Sources */, 9748BE3A2893D0E3006DF0BE /* Frog.swift in Sources */, @@ -584,6 +586,7 @@ 9748BE1D289399CF006DF0BE /* SFAlphabet.swift in Sources */, 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */, 9748BE6628A395D5006DF0BE /* ArtWork.swift in Sources */, + 97AD532B2B71068B0034FB5D /* AfroBoyArtView.swift in Sources */, 973B2CA128C2546C006ED5F0 /* ArrangeShapeWithFont.swift in Sources */, 9748BE3F2897AE68006DF0BE /* ArmHair.swift in Sources */, 97E11D522817381100B2AB32 /* ContentView.swift in Sources */, @@ -594,6 +597,7 @@ 9748BE50289AB439006DF0BE /* DemonWrestlerHand.swift in Sources */, 97E11E3F281971ED00B2AB32 /* CrayonEyeBall.swift in Sources */, 9748BE2C2893C428006DF0BE /* Bear.swift in Sources */, + 97AD53292B7100670034FB5D /* ArtWorkModel.swift in Sources */, 973B2CA428C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift in Sources */, 97E11E462819734700B2AB32 /* CrayonBoy.swift in Sources */, 97E11E3B281971ED00B2AB32 /* CrayonEyes.swift in Sources */, @@ -750,8 +754,6 @@ INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UIStatusBarHidden = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = UIInterfaceOrientationPortrait; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait; IPHONEOS_DEPLOYMENT_TARGET = 17.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -783,8 +785,6 @@ INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UIStatusBarHidden = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = UIInterfaceOrientationPortrait; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait; IPHONEOS_DEPLOYMENT_TARGET = 17.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift index 015d4e9..9356ed8 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift @@ -7,17 +7,33 @@ import SwiftUI +extension ArtGalleryView { + + init(screenSize: CGSize) { + self._model = State(wrappedValue: ArtWorkModel(screenSize: screenSize)) + } +} + struct ArtGalleryView: View { - let baseLength: CGFloat + @State private var model: ArtWorkModel var body: some View { NavigationStack { - + List { + NavigationLink { + AfroBoyArtView() + } label: { + Text("Afro boy") + } + } + .navigationTitle("Gallery") } + .environment(model) } } #Preview { - ArtGalleryView(baseLength: 1024) + ArtGalleryView(screenSize: .init(width: 1024, + height: 1024)) } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift new file mode 100644 index 0000000..00e58ea --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift @@ -0,0 +1,124 @@ +// +// AfroBoyArtView.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +struct AfroBoyArtView: View { + + @Environment(ArtWorkModel.self) var model + @State private var isAnimating = false + + var body: some View { + ZStack { + + // MARK: - 􁝰 Hair + ArtComponentView( + name: "tree.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingProportionalValue(withRatio: -0.42), + offsetY: model.calculatingProportionalValue(withRatio: 0.5) + ), + finalValue: .init( + width: model.calculatingProportionalValue(withRatio: 0.9), + height: model.calculatingProportionalValue(withRatio: 0.9) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: 0.001 + ) + + // MARK: - 􀙧 Contour + ArtComponentView( + name: "shield.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingProportionalValue(withRatio: -0.28), + offsetY: model.calculatingProportionalValue(withRatio: 0.5) + ), + finalValue: .init( + primaryColor: .paleOrange, + width: model.calculatingProportionalValue(withRatio: 0.5), + height: model.calculatingProportionalValue(withRatio: 0.6), + offsetY: model.calculatingProportionalValue(withRatio: 0.17) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 1) + ) + + // MARK: - 􀎽 Face + ArtComponentView( + name: "faceid", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingProportionalValue(withRatio: -0.14), + offsetY: model.calculatingProportionalValue(withRatio: 0.5) + ), + finalValue: .init( + secondaryColor: .paleOrange, + width: model.calculatingProportionalValue(withRatio: 0.3), + height: model.calculatingProportionalValue(withRatio: 0.3), + offsetY: model.calculatingProportionalValue(withRatio: 0.16) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 2) + ) + + // MARK: - 􀦉 Comb + ArtComponentView( + name: "comb.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetY: model.calculatingProportionalValue(withRatio: 0.5) + ), + finalValue: .init( + primaryColor: .red, + width: model.calculatingProportionalValue(withRatio: 0.2), + height: model.calculatingProportionalValue(withRatio: 0.2), + offsetX: model.calculatingProportionalValue(withRatio: -0.2), + offsetY: model.calculatingProportionalValue(withRatio: -0.2) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 3) + ) + } + .navigationTitle("Afro boy") + .navigationBarTitleDisplayMode(.inline) + .toolbar(content: { + ToolbarItemGroup(placement: .bottomBar) { + Spacer() + + PlayButton { + isAnimating = true + } + .font(.system(size: 32)) + .disabled(isAnimating) + } + }) + } +} + +#Preview { + NavigationStack { + AfroBoyArtView() + .environment( + ArtWorkModel( + screenSize: .init( + width: 1024, + height: 1024 + ) + ) + ) + } +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/AnimationDuration.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/AnimationDuration.swift deleted file mode 100644 index eb22ecf..0000000 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/AnimationDuration.swift +++ /dev/null @@ -1,14 +0,0 @@ -// -// AnimationDuration.swift -// SFSymbolsArtCollection -// -// Created by Lil Ossa -// - -struct AnimationDuration { - static let perSymbol: Double = 1.5 - - static func waitingTime(forCount count: Int) -> Double { - return perSymbol * Double(count) - } -} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift new file mode 100644 index 0000000..c76e978 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift @@ -0,0 +1,35 @@ +// +// ArtWorkModel.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +@Observable +class ArtWorkModel { + + init(screenSize: CGSize) { + let width = screenSize.width + let height = screenSize.height + self.baseLength = width < height ? width : height + } + + private let baseLength: CGFloat + + let animationDurationPerSymbol: Double = 1.5 + + var initialSymbolLength: CGFloat { + baseLength * 0.06 + } + + /// The value calculated from baseLength using the given ratio. + func calculatingProportionalValue(withRatio ratio: CGFloat) -> CGFloat { + return baseLength * ratio + } + + func waitingTime(forCount count: Int) -> Double { + return animationDurationPerSymbol * Double(count) + } +} diff --git a/SFSymbolsArtCollection/SFSymbolsArtCollectionApp.swift b/SFSymbolsArtCollection/SFSymbolsArtCollectionApp.swift index da544ed..a0bb100 100644 --- a/SFSymbolsArtCollection/SFSymbolsArtCollectionApp.swift +++ b/SFSymbolsArtCollection/SFSymbolsArtCollectionApp.swift @@ -9,10 +9,11 @@ import SwiftUI @main struct SFSymbolsArtCollectionApp: App { + var body: some Scene { WindowGroup { GeometryReader { geometry in - ArtGalleryView(baseLength: geometry.baseLength) + ArtGalleryView(screenSize: geometry.size) } } } From c0f0bb57968814702a8e95be93f8890fa6c9b60e Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 5 Feb 2024 22:19:43 +0900 Subject: [PATCH 017/108] Update ArtWorkModel with BottomColumnSymbol --- .../ArtWorks/AfroBoy/AfroBoyArtView.swift | 14 +++--- .../Common/Models/ArtWorkModel.swift | 45 ++++++++++++++++++- 2 files changed, 50 insertions(+), 9 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift index 00e58ea..8407651 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift @@ -21,8 +21,8 @@ struct AfroBoyArtView: View { initialValue: .init( width: model.initialSymbolLength, height: model.initialSymbolLength, - offsetX: model.calculatingProportionalValue(withRatio: -0.42), - offsetY: model.calculatingProportionalValue(withRatio: 0.5) + offsetX: model.calculatingOffsetX(forBottomColumn: .first), + offsetY: model.offsetYForBottomColumn ), finalValue: .init( width: model.calculatingProportionalValue(withRatio: 0.9), @@ -39,8 +39,8 @@ struct AfroBoyArtView: View { initialValue: .init( width: model.initialSymbolLength, height: model.initialSymbolLength, - offsetX: model.calculatingProportionalValue(withRatio: -0.28), - offsetY: model.calculatingProportionalValue(withRatio: 0.5) + offsetX: model.calculatingOffsetX(forBottomColumn: .second), + offsetY: model.offsetYForBottomColumn ), finalValue: .init( primaryColor: .paleOrange, @@ -59,8 +59,8 @@ struct AfroBoyArtView: View { initialValue: .init( width: model.initialSymbolLength, height: model.initialSymbolLength, - offsetX: model.calculatingProportionalValue(withRatio: -0.14), - offsetY: model.calculatingProportionalValue(withRatio: 0.5) + offsetX: model.calculatingOffsetX(forBottomColumn: .third), + offsetY: model.offsetYForBottomColumn ), finalValue: .init( secondaryColor: .paleOrange, @@ -79,7 +79,7 @@ struct AfroBoyArtView: View { initialValue: .init( width: model.initialSymbolLength, height: model.initialSymbolLength, - offsetY: model.calculatingProportionalValue(withRatio: 0.5) + offsetY: model.offsetYForBottomColumn ), finalValue: .init( primaryColor: .red, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift index c76e978..9865b2c 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift @@ -20,8 +20,16 @@ class ArtWorkModel { let animationDurationPerSymbol: Double = 1.5 - var initialSymbolLength: CGFloat { - baseLength * 0.06 + var initialSymbolLength: Double { + return baseLength * 0.06 + } + + var offsetYForBottomColumn: CGFloat { + return calculatingProportionalValue(withRatio: 0.5) + } + + func calculatingOffsetX(forBottomColumn bottomColumn: BottomColumnSymbol) -> CGFloat { + return calculatingProportionalValue(withRatio: bottomColumn.offsetXRatio) } /// The value calculated from baseLength using the given ratio. @@ -33,3 +41,36 @@ class ArtWorkModel { return animationDurationPerSymbol * Double(count) } } + +// MARK: - BottomColumnSymbol +extension ArtWorkModel { + + enum BottomColumnSymbol { + case first + case second + case third + case forth + case fifth + case sixth + case seventh + + var offsetXRatio: CGFloat { + switch self { + case .first: + -0.42 + case .second: + -0.28 + case .third: + -0.14 + case .forth: + 0 + case .fifth: + 0.14 + case .sixth: + 0.28 + case .seventh: + 0.42 + } + } + } +} From e96574ef2be9275f2a6cafd61afe45ebf351a12b Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 5 Feb 2024 22:23:38 +0900 Subject: [PATCH 018/108] Add ArtWorkModel for preview --- .../ArtWorks/AfroBoy/AfroBoyArtView.swift | 9 +-------- .../Common/Models/ArtWorkModel.swift | 2 ++ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift index 8407651..5b629e7 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift @@ -112,13 +112,6 @@ struct AfroBoyArtView: View { #Preview { NavigationStack { AfroBoyArtView() - .environment( - ArtWorkModel( - screenSize: .init( - width: 1024, - height: 1024 - ) - ) - ) + .environment(ArtWorkModel.preview) } } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift index 9865b2c..102a127 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift @@ -9,6 +9,8 @@ import SwiftUI @Observable class ArtWorkModel { + + static let preview = ArtWorkModel(screenSize: CGSize(width: 1024, height: 1024)) init(screenSize: CGSize) { let width = screenSize.width From 5a8c379ce04057e0e7b99bb845b87e824bae4efb Mon Sep 17 00:00:00 2001 From: littleossa Date: Tue, 6 Feb 2024 05:04:44 +0900 Subject: [PATCH 019/108] Modify forced interface orientation --- SFSymbolsArtCollection.xcodeproj/project.pbxproj | 4 ++-- .../ArtisticWorldOfSFSymbols/ArtGalleryView.swift | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 7e6ab35..7c1726a 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -753,7 +753,7 @@ INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UIStatusBarHidden = YES; - INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; + INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; IPHONEOS_DEPLOYMENT_TARGET = 17.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -784,7 +784,7 @@ INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UIStatusBarHidden = YES; - INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; + INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; IPHONEOS_DEPLOYMENT_TARGET = 17.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift index 9356ed8..2ea15b5 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift @@ -10,13 +10,13 @@ import SwiftUI extension ArtGalleryView { init(screenSize: CGSize) { - self._model = State(wrappedValue: ArtWorkModel(screenSize: screenSize)) + self.model = ArtWorkModel(screenSize: screenSize) } } struct ArtGalleryView: View { - @State private var model: ArtWorkModel + private let model: ArtWorkModel var body: some View { NavigationStack { From d0bd16925908a6173c1843da70e6f21b4d8ae9d6 Mon Sep 17 00:00:00 2001 From: littleossa Date: Tue, 6 Feb 2024 07:21:16 +0900 Subject: [PATCH 020/108] Update ArtWorkModel --- .../Common/Models/ArtWorkModel.swift | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift index 102a127..f07820e 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift @@ -21,6 +21,15 @@ class ArtWorkModel { private let baseLength: CGFloat let animationDurationPerSymbol: Double = 1.5 + let galleryColumnSpacing: CGFloat = 32 + + /// Art works column count in gallery + var galleryColumnCount: Int { + if UIDevice.current.isPad { + return 4 + } + return 2 + } var initialSymbolLength: Double { return baseLength * 0.06 @@ -35,7 +44,13 @@ class ArtWorkModel { } /// The value calculated from baseLength using the given ratio. - func calculatingProportionalValue(withRatio ratio: CGFloat) -> CGFloat { + func calculatingProportionalValue(withRatio ratio: CGFloat, forPreview isForPreview: Bool = false) -> CGFloat { + + if isForPreview { + let columnCount = CGFloat(galleryColumnCount) + let padding = galleryColumnSpacing * 2 + galleryColumnSpacing / 2 + return (baseLength / columnCount - padding) * ratio + } return baseLength * ratio } From 1bb00101a43f5f63dcfcc7c7f0620c2c9b340a6b Mon Sep 17 00:00:00 2001 From: littleossa Date: Tue, 6 Feb 2024 07:21:41 +0900 Subject: [PATCH 021/108] Add AfroBoyPreviewView --- .../project.pbxproj | 4 ++ .../ArtWorks/AfroBoy/AfroBoyPreviewView.swift | 56 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 7c1726a..bb37c30 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -56,6 +56,7 @@ 97AD53242B70E48F0034FB5D /* PlayButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53232B70E48F0034FB5D /* PlayButton.swift */; }; 97AD53292B7100670034FB5D /* ArtWorkModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53282B7100670034FB5D /* ArtWorkModel.swift */; }; 97AD532B2B71068B0034FB5D /* AfroBoyArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD532A2B71068B0034FB5D /* AfroBoyArtView.swift */; }; + 97AD532D2B717C950034FB5D /* AfroBoyPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD532C2B717C950034FB5D /* AfroBoyPreviewView.swift */; }; 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */; }; 97CD46E928BF080300919B65 /* iOSDCJapan2022Logo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */; }; 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11D4F2817381100B2AB32 /* SFSymbolsArtCollectionApp.swift */; }; @@ -125,6 +126,7 @@ 97AD53232B70E48F0034FB5D /* PlayButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayButton.swift; sourceTree = ""; }; 97AD53282B7100670034FB5D /* ArtWorkModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtWorkModel.swift; sourceTree = ""; }; 97AD532A2B71068B0034FB5D /* AfroBoyArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AfroBoyArtView.swift; sourceTree = ""; }; + 97AD532C2B717C950034FB5D /* AfroBoyPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AfroBoyPreviewView.swift; sourceTree = ""; }; 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Symbol.swift; sourceTree = ""; }; 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Logo.swift; sourceTree = ""; }; 97E11D4C2817381100B2AB32 /* SFSymbolsArtCollection.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SFSymbolsArtCollection.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -391,6 +393,7 @@ isa = PBXGroup; children = ( 97AD532A2B71068B0034FB5D /* AfroBoyArtView.swift */, + 97AD532C2B717C950034FB5D /* AfroBoyPreviewView.swift */, ); path = AfroBoy; sourceTree = ""; @@ -555,6 +558,7 @@ 9748BE232893B35A006DF0BE /* WorldPeace.swift in Sources */, 9748BE57289DCBB0006DF0BE /* LargeFirework.swift in Sources */, 9748BE4828981096006DF0BE /* DemonWrestlerFace.swift in Sources */, + 97AD532D2B717C950034FB5D /* AfroBoyPreviewView.swift in Sources */, 9748BE372893D064006DF0BE /* PartyAnimals.swift in Sources */, 971D9DEA28C9731D00136A36 /* iOSDCJapan2022SymbolType.swift in Sources */, 97AD53182B70DFF30034FB5D /* AnimationValues.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift new file mode 100644 index 0000000..db475ec --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift @@ -0,0 +1,56 @@ +// +// AfroBoyPreviewView.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +struct AfroBoyPreviewView: View { + + @Environment(ArtWorkModel.self) var model + @State private var isAnimating = false + + var body: some View { + ZStack { + + // MARK: - 􁝰 Hair + Image(systemName: "tree.fill") + .resizable() + .foregroundStyle(.black) + .frame(width: model.calculatingProportionalValue(withRatio: 0.9, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.9, forPreview: true)) + + // MARK: - 􀙧 Contour + Image(systemName: "shield.fill") + .resizable() + .foregroundStyle(.paleOrange) + .frame(width: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.6, forPreview: true)) + .offset(y: model.calculatingProportionalValue(withRatio: 0.17, forPreview: true)) + + // MARK: - 􀎽 Face + Image(systemName: "faceid") + .resizable() + .foregroundStyle(.black, .paleOrange) + .frame(width: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true)) + .offset(y: model.calculatingProportionalValue(withRatio: 0.16, forPreview: true)) + + // MARK: - 􀦉 Comb + Image(systemName: "comb.fill") + .resizable() + .foregroundStyle(.red) + .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true)) + } + } +} + +#Preview { + AfroBoyPreviewView() + .environment(ArtWorkModel.preview) +} From 3871c7ed47b558b982ea4d5b8447fd5d280a5296 Mon Sep 17 00:00:00 2001 From: littleossa Date: Tue, 6 Feb 2024 07:21:56 +0900 Subject: [PATCH 022/108] Update ArtGallery layout --- .../ArtGalleryView.swift | 48 ++++++++++++++++--- 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift index 2ea15b5..5cf311d 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift @@ -11,23 +11,59 @@ extension ArtGalleryView { init(screenSize: CGSize) { self.model = ArtWorkModel(screenSize: screenSize) + self.columns = Array(repeating: GridItem(spacing: model.galleryColumnSpacing), + count: model.galleryColumnCount) } } struct ArtGalleryView: View { private let model: ArtWorkModel + private let columns: [GridItem] var body: some View { NavigationStack { - List { - NavigationLink { - AfroBoyArtView() - } label: { - Text("Afro boy") + ScrollView { + LazyVGrid(columns: columns) { + + Group { + NavigationLink { + AfroBoyArtView() + } label: { + AfroBoyPreviewView() + } + + NavigationLink { + AfroBoyArtView() + } label: { + AfroBoyPreviewView() + } + + NavigationLink { + AfroBoyArtView() + } label: { + AfroBoyPreviewView() + } + + NavigationLink { + AfroBoyArtView() + } label: { + AfroBoyPreviewView() + } + + NavigationLink { + AfroBoyArtView() + } label: { + AfroBoyPreviewView() + } + } + .padding(model.galleryColumnSpacing) + .background(RoundedRectangle(cornerRadius: 12).stroke(lineWidth: 4)) + .padding(.top, 24) } + .padding(.horizontal, 24) } - .navigationTitle("Gallery") + .navigationTitle("Art Gallery") } .environment(model) } From c3311975bbf82865bf76d579b8d2396ceae9db3a Mon Sep 17 00:00:00 2001 From: littleossa Date: Tue, 6 Feb 2024 08:38:47 +0900 Subject: [PATCH 023/108] Add GalleryGridItemView --- .../project.pbxproj | 4 ++ .../ArtGalleryView.swift | 7 +-- .../Common/Models/ArtWorkModel.swift | 10 +++- .../Common/Views/GalleryGridView.swift | 57 +++++++++++++++++++ 4 files changed, 71 insertions(+), 7 deletions(-) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/GalleryGridView.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index bb37c30..cd99529 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -57,6 +57,7 @@ 97AD53292B7100670034FB5D /* ArtWorkModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53282B7100670034FB5D /* ArtWorkModel.swift */; }; 97AD532B2B71068B0034FB5D /* AfroBoyArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD532A2B71068B0034FB5D /* AfroBoyArtView.swift */; }; 97AD532D2B717C950034FB5D /* AfroBoyPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD532C2B717C950034FB5D /* AfroBoyPreviewView.swift */; }; + 97AD53312B71A5130034FB5D /* GalleryGridView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53302B71A5130034FB5D /* GalleryGridView.swift */; }; 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */; }; 97CD46E928BF080300919B65 /* iOSDCJapan2022Logo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */; }; 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11D4F2817381100B2AB32 /* SFSymbolsArtCollectionApp.swift */; }; @@ -127,6 +128,7 @@ 97AD53282B7100670034FB5D /* ArtWorkModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtWorkModel.swift; sourceTree = ""; }; 97AD532A2B71068B0034FB5D /* AfroBoyArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AfroBoyArtView.swift; sourceTree = ""; }; 97AD532C2B717C950034FB5D /* AfroBoyPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AfroBoyPreviewView.swift; sourceTree = ""; }; + 97AD53302B71A5130034FB5D /* GalleryGridView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GalleryGridView.swift; sourceTree = ""; }; 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Symbol.swift; sourceTree = ""; }; 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Logo.swift; sourceTree = ""; }; 97E11D4C2817381100B2AB32 /* SFSymbolsArtCollection.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SFSymbolsArtCollection.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -368,6 +370,7 @@ children = ( 97AD53252B70E4DA0034FB5D /* ArtComponentView */, 97AD53232B70E48F0034FB5D /* PlayButton.swift */, + 97AD53302B71A5130034FB5D /* GalleryGridView.swift */, ); path = Views; sourceTree = ""; @@ -587,6 +590,7 @@ 9748BE59289DCE17006DF0BE /* Fireworks.swift in Sources */, 97E11E3C281971ED00B2AB32 /* CrayonEye.swift in Sources */, 9748BE5D289DD696006DF0BE /* Building.swift in Sources */, + 97AD53312B71A5130034FB5D /* GalleryGridView.swift in Sources */, 9748BE1D289399CF006DF0BE /* SFAlphabet.swift in Sources */, 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */, 9748BE6628A395D5006DF0BE /* ArtWork.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift index 5cf311d..069be23 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift @@ -11,7 +11,7 @@ extension ArtGalleryView { init(screenSize: CGSize) { self.model = ArtWorkModel(screenSize: screenSize) - self.columns = Array(repeating: GridItem(spacing: model.galleryColumnSpacing), + self.columns = Array(repeating: GridItem(.fixed(model.galleryColumnLength), spacing: model.galleryColumnSpacing), count: model.galleryColumnCount) } } @@ -31,6 +31,7 @@ struct ArtGalleryView: View { AfroBoyArtView() } label: { AfroBoyPreviewView() + .galleryGridItemView(length: model.galleryColumnLength) } NavigationLink { @@ -55,11 +56,9 @@ struct ArtGalleryView: View { AfroBoyArtView() } label: { AfroBoyPreviewView() + .galleryGridItemView(length: model.galleryColumnLength) } } - .padding(model.galleryColumnSpacing) - .background(RoundedRectangle(cornerRadius: 12).stroke(lineWidth: 4)) - .padding(.top, 24) } .padding(.horizontal, 24) } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift index f07820e..d418b33 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift @@ -31,6 +31,12 @@ class ArtWorkModel { return 2 } + var galleryColumnLength: CGFloat { + let columnCount = CGFloat(galleryColumnCount) + let padding = galleryColumnSpacing + return (baseLength / columnCount - padding) + } + var initialSymbolLength: Double { return baseLength * 0.06 } @@ -47,9 +53,7 @@ class ArtWorkModel { func calculatingProportionalValue(withRatio ratio: CGFloat, forPreview isForPreview: Bool = false) -> CGFloat { if isForPreview { - let columnCount = CGFloat(galleryColumnCount) - let padding = galleryColumnSpacing * 2 + galleryColumnSpacing / 2 - return (baseLength / columnCount - padding) * ratio + return (galleryColumnLength - galleryColumnSpacing) * ratio } return baseLength * ratio } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/GalleryGridView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/GalleryGridView.swift new file mode 100644 index 0000000..1666e89 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/GalleryGridView.swift @@ -0,0 +1,57 @@ +// +// GalleryGridView.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension View { + + func galleryGridItemView(length: CGFloat) -> some View { + GalleryGridItemView(length: length) { + self + } + } +} + +struct GalleryGridItemView: View { + + init(length: CGFloat, @ViewBuilder content: () -> Content) { + self.length = length + self.content = content() + } + + let length: CGFloat + let content: Content + + var body: some View { + + ZStack { + content + + VStack(alignment: .trailing) { + Spacer() + + Image(systemName: "chevron.right") + .foregroundStyle(.gray) + .imageScale(.large) + .padding() + } + .frame(width: length, + height: length, + alignment: .bottomTrailing) + } + .frame(width: length, + height: length) + .background(RoundedRectangle(cornerRadius: 12).stroke(lineWidth: 4).foregroundStyle(Color(uiColor: .label))) + .padding(.top, 16) + } +} + +#Preview { + AfroBoyPreviewView() + .environment(ArtWorkModel.preview) + .galleryGridItemView(length: 1024 / 4) +} From bf116f03aee606c0e837714e5c00977f0eb95c18 Mon Sep 17 00:00:00 2001 From: littleossa Date: Tue, 6 Feb 2024 08:59:39 +0900 Subject: [PATCH 024/108] Add preferredColorScheme to light --- SFSymbolsArtCollection/SFSymbolsArtCollectionApp.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/SFSymbolsArtCollection/SFSymbolsArtCollectionApp.swift b/SFSymbolsArtCollection/SFSymbolsArtCollectionApp.swift index a0bb100..d3c7eca 100644 --- a/SFSymbolsArtCollection/SFSymbolsArtCollectionApp.swift +++ b/SFSymbolsArtCollection/SFSymbolsArtCollectionApp.swift @@ -14,6 +14,7 @@ struct SFSymbolsArtCollectionApp: App { WindowGroup { GeometryReader { geometry in ArtGalleryView(screenSize: geometry.size) + .preferredColorScheme(.light) } } } From 6bba517fd06887d676cb4a97e29f3dd68e9384e7 Mon Sep 17 00:00:00 2001 From: littleossa Date: Tue, 6 Feb 2024 09:00:01 +0900 Subject: [PATCH 025/108] Refactor GalleryGridView --- SFSymbolsArtCollection.xcodeproj/project.pbxproj | 2 +- .../ArtisticWorldOfSFSymbols/Common/Views/GalleryGridView.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index cd99529..3c40d98 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -369,8 +369,8 @@ isa = PBXGroup; children = ( 97AD53252B70E4DA0034FB5D /* ArtComponentView */, - 97AD53232B70E48F0034FB5D /* PlayButton.swift */, 97AD53302B71A5130034FB5D /* GalleryGridView.swift */, + 97AD53232B70E48F0034FB5D /* PlayButton.swift */, ); path = Views; sourceTree = ""; diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/GalleryGridView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/GalleryGridView.swift index 1666e89..bb9c663 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/GalleryGridView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/GalleryGridView.swift @@ -45,7 +45,7 @@ struct GalleryGridItemView: View { } .frame(width: length, height: length) - .background(RoundedRectangle(cornerRadius: 12).stroke(lineWidth: 4).foregroundStyle(Color(uiColor: .label))) + .background(RoundedRectangle(cornerRadius: 12).stroke(lineWidth: 4).foregroundStyle(.black)) .padding(.top, 16) } } From 5d1000f5b916ff949f38ee685e736d9f9da1c41d Mon Sep 17 00:00:00 2001 From: littleossa Date: Tue, 6 Feb 2024 09:03:32 +0900 Subject: [PATCH 026/108] Modify GalleryGridItemView background --- .../ArtisticWorldOfSFSymbols/Common/Views/GalleryGridView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/GalleryGridView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/GalleryGridView.swift index bb9c663..818970a 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/GalleryGridView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/GalleryGridView.swift @@ -45,7 +45,7 @@ struct GalleryGridItemView: View { } .frame(width: length, height: length) - .background(RoundedRectangle(cornerRadius: 12).stroke(lineWidth: 4).foregroundStyle(.black)) + .background(RoundedRectangle(cornerRadius: 12).fill(.white).shadow(radius: 4)) .padding(.top, 16) } } From f37f7113731910a4de6b2bc06d9f3d0194008670 Mon Sep 17 00:00:00 2001 From: littleossa Date: Tue, 6 Feb 2024 22:32:47 +0900 Subject: [PATCH 027/108] Add awesomeYellow --- .../AwesomeYellow.colorset/Contents.json | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 SFSymbolsArtCollection/Assets.xcassets/AwesomeYellow.colorset/Contents.json diff --git a/SFSymbolsArtCollection/Assets.xcassets/AwesomeYellow.colorset/Contents.json b/SFSymbolsArtCollection/Assets.xcassets/AwesomeYellow.colorset/Contents.json new file mode 100644 index 0000000..9647112 --- /dev/null +++ b/SFSymbolsArtCollection/Assets.xcassets/AwesomeYellow.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "display-p3", + "components" : { + "alpha" : "1.000", + "blue" : "0.306", + "green" : "0.918", + "red" : "0.984" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} From e0b0d54d95ce2a96aa7e118e8b6ca4da5578db3c Mon Sep 17 00:00:00 2001 From: littleossa Date: Tue, 6 Feb 2024 22:33:23 +0900 Subject: [PATCH 028/108] Modify calculatingInitialOffset methods --- .../ArtWorks/AfroBoy/AfroBoyArtView.swift | 14 ++--- .../Common/Models/ArtWorkModel.swift | 63 +++++++++++++++++-- 2 files changed, 66 insertions(+), 11 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift index 5b629e7..2e4934b 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift @@ -21,8 +21,8 @@ struct AfroBoyArtView: View { initialValue: .init( width: model.initialSymbolLength, height: model.initialSymbolLength, - offsetX: model.calculatingOffsetX(forBottomColumn: .first), - offsetY: model.offsetYForBottomColumn + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.first)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.first)) ), finalValue: .init( width: model.calculatingProportionalValue(withRatio: 0.9), @@ -39,8 +39,8 @@ struct AfroBoyArtView: View { initialValue: .init( width: model.initialSymbolLength, height: model.initialSymbolLength, - offsetX: model.calculatingOffsetX(forBottomColumn: .second), - offsetY: model.offsetYForBottomColumn + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.second)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.second)) ), finalValue: .init( primaryColor: .paleOrange, @@ -59,8 +59,8 @@ struct AfroBoyArtView: View { initialValue: .init( width: model.initialSymbolLength, height: model.initialSymbolLength, - offsetX: model.calculatingOffsetX(forBottomColumn: .third), - offsetY: model.offsetYForBottomColumn + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.third)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.third)) ), finalValue: .init( secondaryColor: .paleOrange, @@ -79,7 +79,7 @@ struct AfroBoyArtView: View { initialValue: .init( width: model.initialSymbolLength, height: model.initialSymbolLength, - offsetY: model.offsetYForBottomColumn + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.forth)) ), finalValue: .init( primaryColor: .red, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift index d418b33..2b5a71d 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift @@ -41,12 +41,21 @@ class ArtWorkModel { return baseLength * 0.06 } - var offsetYForBottomColumn: CGFloat { - return calculatingProportionalValue(withRatio: 0.5) + func calculatingInitialOffsetX(forPosition symbolRow: InitialSymbolRow) -> CGFloat { + let ratio: CGFloat + switch symbolRow { + case let .first(symbolColumn): + ratio = symbolColumn.offsetXRatio + case let .second(symbolColumn): + ratio = symbolColumn.offsetXRatio + case let .third(symbolColumn): + ratio = symbolColumn.offsetXRatio + } + return calculatingProportionalValue(withRatio: ratio) } - func calculatingOffsetX(forBottomColumn bottomColumn: BottomColumnSymbol) -> CGFloat { - return calculatingProportionalValue(withRatio: bottomColumn.offsetXRatio) + func calculatingInitialOffsetY(forPosition symbolRow: InitialSymbolRow) -> CGFloat { + return calculatingProportionalValue(withRatio: symbolRow.offsetYRatio) } /// The value calculated from baseLength using the given ratio. @@ -66,6 +75,52 @@ class ArtWorkModel { // MARK: - BottomColumnSymbol extension ArtWorkModel { + enum InitialSymbolRow { + case first(InitialSymbolColumn) + case second(InitialSymbolColumn) + case third(InitialSymbolColumn) + + enum InitialSymbolColumn { + case first + case second + case third + case forth + case fifth + case sixth + case seventh + + var offsetXRatio: CGFloat { + switch self { + case .first: + -0.42 + case .second: + -0.28 + case .third: + -0.14 + case .forth: + 0 + case .fifth: + 0.14 + case .sixth: + 0.28 + case .seventh: + 0.42 + } + } + } + + var offsetYRatio: CGFloat { + switch self { + case .first: + 0.63 + case .second: + 0.34 + case .third: + 0.5 + } + } + } + enum BottomColumnSymbol { case first case second From e532f5a1b0220fc14720564135bf635a06ea9593 Mon Sep 17 00:00:00 2001 From: littleossa Date: Tue, 6 Feb 2024 22:33:36 +0900 Subject: [PATCH 029/108] Add NosebleedArtView --- .../project.pbxproj | 12 + .../ArtWorks/Nosebleed/NosebleedArtView.swift | 508 ++++++++++++++++++ 2 files changed, 520 insertions(+) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 3c40d98..c15a294 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -74,6 +74,7 @@ 97E11E3E281971ED00B2AB32 /* CrayonEyebrow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11E39281971ED00B2AB32 /* CrayonEyebrow.swift */; }; 97E11E3F281971ED00B2AB32 /* CrayonEyeBall.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11E3A281971ED00B2AB32 /* CrayonEyeBall.swift */; }; 97E11E462819734700B2AB32 /* CrayonBoy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11E452819734700B2AB32 /* CrayonBoy.swift */; }; + 97EF438B2B725E02003648F5 /* NosebleedArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438A2B725E02003648F5 /* NosebleedArtView.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -145,6 +146,7 @@ 97E11E39281971ED00B2AB32 /* CrayonEyebrow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CrayonEyebrow.swift; sourceTree = ""; }; 97E11E3A281971ED00B2AB32 /* CrayonEyeBall.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CrayonEyeBall.swift; sourceTree = ""; }; 97E11E452819734700B2AB32 /* CrayonBoy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrayonBoy.swift; sourceTree = ""; }; + 97EF438A2B725E02003648F5 /* NosebleedArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NosebleedArtView.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -387,6 +389,7 @@ 97AD531B2B70E0A10034FB5D /* ArtWorks */ = { isa = PBXGroup; children = ( + 97EF43892B725DE7003648F5 /* Nosebleed */, 97AD531E2B70E2770034FB5D /* AfroBoy */, ); path = ArtWorks; @@ -481,6 +484,14 @@ path = Extensions; sourceTree = ""; }; + 97EF43892B725DE7003648F5 /* Nosebleed */ = { + isa = PBXGroup; + children = ( + 97EF438A2B725E02003648F5 /* NosebleedArtView.swift */, + ); + path = Nosebleed; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -562,6 +573,7 @@ 9748BE57289DCBB0006DF0BE /* LargeFirework.swift in Sources */, 9748BE4828981096006DF0BE /* DemonWrestlerFace.swift in Sources */, 97AD532D2B717C950034FB5D /* AfroBoyPreviewView.swift in Sources */, + 97EF438B2B725E02003648F5 /* NosebleedArtView.swift in Sources */, 9748BE372893D064006DF0BE /* PartyAnimals.swift in Sources */, 971D9DEA28C9731D00136A36 /* iOSDCJapan2022SymbolType.swift in Sources */, 97AD53182B70DFF30034FB5D /* AnimationValues.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift new file mode 100644 index 0000000..57b9ec8 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift @@ -0,0 +1,508 @@ +// +// NosebleedArtView.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +struct NosebleedArtView: View { + + @Environment(ArtWorkModel.self) var model + @State private var isAnimating = false + @State private var isEffectActivated = false + + var body: some View { + + ZStack { + + // 🟡 Contour + ArtComponentView( + name: "circle.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.first)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.first)) + ), + finalValue: .init( + primaryColor: .awesomeYellow, + width: model.calculatingProportionalValue(withRatio: 0.65), + height: model.calculatingProportionalValue(withRatio: 0.65) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: 0.001 + ) + + // 👃🩸 Nosebleed bottom + ArtComponentView( + name: "cellularbars", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.second)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.second)) + ), + finalValue: .init( + primaryColor: .red, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.2), + height: model.calculatingProportionalValue(withRatio: 0.5), + rotationDegrees: 180, + offsetX: model.calculatingProportionalValue(withRatio: 0.09), + offsetY: model.calculatingProportionalValue(withRatio: 0.074) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 1) + ) + .symbolEffect(.variableColor.hideInactiveLayers, + options: .speed(0.6).repeating, + isActive: isEffectActivated) + + // 🟨 Nosebleed bottom hide + ArtComponentView( + name: "rectangle.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.third)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.third)) + ), + finalValue: .init( + primaryColor: .awesomeYellow, + width: model.calculatingProportionalValue(withRatio: 0.1), + height: model.calculatingProportionalValue(withRatio: 0.14), + offsetX: model.calculatingProportionalValue(withRatio: 0.09), + offsetY: model.calculatingProportionalValue(withRatio: 0.15) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 2) + ) + + // 👄 Mouth + ArtComponentView( + name: "lasso", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.forth)) + ), + finalValue: .init( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.4), + height: model.calculatingProportionalValue(withRatio: 0.3), + rotationDegrees: 170, + offsetX: model.calculatingProportionalValue(withRatio: 0.01), + offsetY: model.calculatingProportionalValue(withRatio: 0.05) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 3) + ) + + // 🟨 Mouth hide + ArtComponentView( + name: "rectangle.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.third)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.third)) + ), + finalValue: .init( + primaryColor: .awesomeYellow, + width: model.calculatingProportionalValue(withRatio: 0.5), + height: model.calculatingProportionalValue(withRatio: 0.3), + rotationDegrees: 176, + offsetY: model.calculatingProportionalValue(withRatio: -0.03) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 4) + ) + + // 👃🩸 Nosebleed top + ArtComponentView( + name: "cellularbars", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.second)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.second)) + ), + finalValue: .init( + primaryColor: .red, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.2), + height: model.calculatingProportionalValue(withRatio: 0.12), + rotationDegrees: 180, + offsetX: model.calculatingProportionalValue(withRatio: 0.033), + offsetY: model.calculatingProportionalValue(withRatio: 0.096) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 5) + ) + .symbolEffect(.variableColor.hideInactiveLayers, + options: .speed(0.6).repeating, + isActive: isEffectActivated) + + // 🟨 Nosebleed top hide right + ArtComponentView( + name: "rectangle.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.third)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.third)) + ), + finalValue: .init( + primaryColor: .awesomeYellow, + width: model.calculatingProportionalValue(withRatio: 0.1), + height: model.calculatingProportionalValue(withRatio: 0.1), + offsetX: model.calculatingProportionalValue(withRatio: 0.09), + offsetY: model.calculatingProportionalValue(withRatio: 0.06) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 6) + ) + + // 🟨 Nosebleed top hide left + ArtComponentView( + name: "rectangle.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.third)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.third)) + ), + finalValue: .init( + primaryColor: .awesomeYellow, + width: model.calculatingProportionalValue(withRatio: 0.03), + height: model.calculatingProportionalValue(withRatio: 0.14), + offsetX: model.calculatingProportionalValue(withRatio: -0.053), + offsetY: model.calculatingProportionalValue(withRatio: 0.09) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 6) + ) + + // 👁️ Right eye + ArtComponentView( + name: "circle.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.first)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.first)) + ), + finalValue: .init( + width: model.calculatingProportionalValue(withRatio: 0.06), + height: model.calculatingProportionalValue(withRatio: 0.06), + offsetX: model.calculatingProportionalValue(withRatio: 0.117), + offsetY: model.calculatingProportionalValue(withRatio: -0.176) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 7) + ) + + // 👁️ Left eye + ArtComponentView( + name: "circle.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.first)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.first)) + ), + finalValue: .init( + width: model.calculatingProportionalValue(withRatio: 0.06), + height: model.calculatingProportionalValue(withRatio: 0.06), + offsetX: model.calculatingProportionalValue(withRatio: -0.113), + offsetY: model.calculatingProportionalValue(withRatio: -0.17) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 7) + ) + + // 🧻 Tissue + ArtComponentView( + name: "doc.plaintext.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.fifth)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.fifth)) + ), + finalValue: .init( + primaryColor: .white, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.04), + height: model.calculatingProportionalValue(withRatio: 0.08), + rotationDegrees: 188, + offsetX: model.calculatingProportionalValue(withRatio: -0.052), + offsetY: model.calculatingProportionalValue(withRatio: 0.083) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 8) + ) + + // 🧻 Tissue frame + ArtComponentView( + name: "doc.plaintext", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.sixth)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.sixth)) + ), + finalValue: .init( + fontWeight: .light, + width: model.calculatingProportionalValue(withRatio: 0.04), + height: model.calculatingProportionalValue(withRatio: 0.08), + rotationDegrees: 188, + offsetX: model.calculatingProportionalValue(withRatio: -0.052), + offsetY: model.calculatingProportionalValue(withRatio: 0.083) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 8) + ) + + // 👃 Nose + ArtComponentView( + name: "triangleshape", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.seventh)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.seventh)) + ), + finalValue: .init( + fontWeight: .light, + width: model.calculatingProportionalValue(withRatio: 0.15), + height: model.calculatingProportionalValue(withRatio: 0.14), + rotationDegrees: -4, + offsetX: model.calculatingProportionalValue(withRatio: -0.013), + offsetY: model.calculatingProportionalValue(withRatio: -0.02) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 9) + ) + + // 🟨 Nose hide + ArtComponentView( + name: "rectangle.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.third)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.third)) + ), + finalValue: .init( + primaryColor: .awesomeYellow, + width: model.calculatingProportionalValue(withRatio: 0.02), + height: model.calculatingProportionalValue(withRatio: 0.13), + rotationDegrees: 148, + offsetX: model.calculatingProportionalValue(withRatio: 0.007), + offsetY: model.calculatingProportionalValue(withRatio: -0.046) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 10) + ) + } + .navigationTitle("Nosebleed") + .navigationBarTitleDisplayMode(.inline) + .toolbar(content: { + ToolbarItemGroup(placement: .bottomBar) { + Spacer() + + PlayButton { + isAnimating = true + } + .font(.system(size: 32)) + .disabled(isAnimating) + } + }) + .onChange(of: isAnimating) { _, newValue in + if newValue { + Timer.scheduledTimer( + withTimeInterval: model.waitingTime(forCount: 13), + repeats: false + ) { _ in + isEffectActivated = true + } + } + } + } +} + +struct NosebleedArtPreviewView: View { + + @Environment(ArtWorkModel.self) var model + + var body: some View { + + ZStack { + + // MARK: - 􀀁 Contour + Image(systemName: "circle.fill") + .resizable() + .foregroundStyle(.awesomeYellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.65, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.65, forPreview: true)) + + // MARK: - 􀭧 Nosebleed bottom + Image(systemName: "cellularbars") + .resizable() + .foregroundStyle(.red) + .fontWeight(.ultraLight) + .rotationEffect(.degrees(180)) + .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.074, forPreview: true)) + + // MARK: - 􀏄 Nosebleed bottom hide + Image(systemName: "rectangle.fill") + .resizable() + .foregroundStyle(.awesomeYellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true)) + + // MARK: - 􀓩 Mouth + Image(systemName: "lasso") + .resizable() + .foregroundStyle(.black) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true)) + .rotationEffect(.degrees(170)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true)) + + // MARK: - 􀏄 Mouth hide + Image(systemName: "rectangle.fill") + .resizable() + .foregroundStyle(.awesomeYellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true)) + .rotationEffect(.degrees(176)) + .offset(y: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true)) + + // MARK: - 􀭧 Nosebleed top + Image(systemName: "cellularbars") + .resizable() + .foregroundStyle(.red) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true)) + .rotationEffect(.degrees(180)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.033, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.096, forPreview: true)) + + // MARK: - 􀏄 Nosebleed top right hide + Image(systemName: "rectangle.fill") + .resizable() + .foregroundStyle(.awesomeYellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true)) + + // MARK: - 􀏄 Nosebleed top left hide + Image(systemName: "rectangle.fill") + .resizable() + .foregroundStyle(.awesomeYellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.053, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true)) + + // MARK: - 􀀁 Right eye + Image(systemName: "circle.fill") + .resizable() + .foregroundStyle(.black) + .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.117, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.176, forPreview: true)) + + // MARK: - 􀀁 Left eye + Image(systemName: "circle.fill") + .resizable() + .foregroundStyle(.black) + .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.113, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.17, forPreview: true)) + + // MARK: - 􀥨 Tissue + Image(systemName: "doc.plaintext.fill") + .resizable() + .foregroundStyle(.white) + .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true)) + .rotationEffect(.degrees(188)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.052, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.083, forPreview: true)) + + // MARK: - 􀉆 Tissue frame + Image(systemName: "doc.plaintext") + .resizable() + .foregroundStyle(.black) + .fontWeight(.light) + .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true)) + .rotationEffect(.degrees(188)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.052, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.083, forPreview: true)) + + // MARK: - 􀥰 Nose + Image(systemName: "triangleshape") + .resizable() + .foregroundStyle(.black) + .fontWeight(.light) + .frame(width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true)) + .rotationEffect(.degrees(-4)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.013, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.02, forPreview: true)) + + // MARK: - 􀏄 Nose hide + Image(systemName: "rectangle.fill") + .resizable() + .foregroundStyle(.awesomeYellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.13, forPreview: true)) + .rotationEffect(.degrees(148)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.007, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.046, forPreview: true)) + } + } +} + +#Preview { + NavigationStack { + NosebleedArtView() + .environment(ArtWorkModel.preview) + } +} + +#Preview { + NosebleedArtPreviewView() + .environment(ArtWorkModel.preview) +} From 74e244e827625f5f9a10439625bc8b9c275a6439 Mon Sep 17 00:00:00 2001 From: littleossa Date: Tue, 6 Feb 2024 22:36:14 +0900 Subject: [PATCH 030/108] Move InitialSymbolRow to decrate folder --- .../project.pbxproj | 4 + .../Common/Models/ArtWorkModel.swift | 79 ----------------- .../ArtWorkModel+InitialSymbolRow.swift | 87 +++++++++++++++++++ 3 files changed, 91 insertions(+), 79 deletions(-) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/ArtWorkModel+InitialSymbolRow.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index c15a294..2ebecfd 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -75,6 +75,7 @@ 97E11E3F281971ED00B2AB32 /* CrayonEyeBall.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11E3A281971ED00B2AB32 /* CrayonEyeBall.swift */; }; 97E11E462819734700B2AB32 /* CrayonBoy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11E452819734700B2AB32 /* CrayonBoy.swift */; }; 97EF438B2B725E02003648F5 /* NosebleedArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438A2B725E02003648F5 /* NosebleedArtView.swift */; }; + 97EF438D2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438C2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -147,6 +148,7 @@ 97E11E3A281971ED00B2AB32 /* CrayonEyeBall.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CrayonEyeBall.swift; sourceTree = ""; }; 97E11E452819734700B2AB32 /* CrayonBoy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrayonBoy.swift; sourceTree = ""; }; 97EF438A2B725E02003648F5 /* NosebleedArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NosebleedArtView.swift; sourceTree = ""; }; + 97EF438C2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ArtWorkModel+InitialSymbolRow.swift"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -477,6 +479,7 @@ 97E11E412819727A00B2AB32 /* Extensions */ = { isa = PBXGroup; children = ( + 97EF438C2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift */, 97624C3228C4F43F004E1720 /* GeometryProxy+.swift */, 97AD53112B70DEB60034FB5D /* UIDevice+.swift */, 97AD53192B70E0530034FB5D /* Font.Weight+.swift */, @@ -621,6 +624,7 @@ 973B2CA428C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift in Sources */, 97E11E462819734700B2AB32 /* CrayonBoy.swift in Sources */, 97E11E3B281971ED00B2AB32 /* CrayonEyes.swift in Sources */, + 97EF438D2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift in Sources */, 9748BE352893CB67006DF0BE /* Lion.swift in Sources */, 97624C2C28C2DDAA004E1720 /* Buildings.swift in Sources */, 97AD53222B70E3FA0034FB5D /* ArtComponentView.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift index 2b5a71d..426dce1 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift @@ -71,82 +71,3 @@ class ArtWorkModel { return animationDurationPerSymbol * Double(count) } } - -// MARK: - BottomColumnSymbol -extension ArtWorkModel { - - enum InitialSymbolRow { - case first(InitialSymbolColumn) - case second(InitialSymbolColumn) - case third(InitialSymbolColumn) - - enum InitialSymbolColumn { - case first - case second - case third - case forth - case fifth - case sixth - case seventh - - var offsetXRatio: CGFloat { - switch self { - case .first: - -0.42 - case .second: - -0.28 - case .third: - -0.14 - case .forth: - 0 - case .fifth: - 0.14 - case .sixth: - 0.28 - case .seventh: - 0.42 - } - } - } - - var offsetYRatio: CGFloat { - switch self { - case .first: - 0.63 - case .second: - 0.34 - case .third: - 0.5 - } - } - } - - enum BottomColumnSymbol { - case first - case second - case third - case forth - case fifth - case sixth - case seventh - - var offsetXRatio: CGFloat { - switch self { - case .first: - -0.42 - case .second: - -0.28 - case .third: - -0.14 - case .forth: - 0 - case .fifth: - 0.14 - case .sixth: - 0.28 - case .seventh: - 0.42 - } - } - } -} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/ArtWorkModel+InitialSymbolRow.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/ArtWorkModel+InitialSymbolRow.swift new file mode 100644 index 0000000..2456bad --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/ArtWorkModel+InitialSymbolRow.swift @@ -0,0 +1,87 @@ +// +// ArtWorkModel+InitialSymbolRow.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +// MARK: - BottomColumnSymbol +extension ArtWorkModel { + + enum InitialSymbolRow { + case first(InitialSymbolColumn) + case second(InitialSymbolColumn) + case third(InitialSymbolColumn) + + enum InitialSymbolColumn { + case first + case second + case third + case forth + case fifth + case sixth + case seventh + + var offsetXRatio: CGFloat { + switch self { + case .first: + -0.42 + case .second: + -0.28 + case .third: + -0.14 + case .forth: + 0 + case .fifth: + 0.14 + case .sixth: + 0.28 + case .seventh: + 0.42 + } + } + } + + var offsetYRatio: CGFloat { + switch self { + case .first: + 0.63 + case .second: + 0.34 + case .third: + 0.5 + } + } + } + + enum BottomColumnSymbol { + case first + case second + case third + case forth + case fifth + case sixth + case seventh + + var offsetXRatio: CGFloat { + switch self { + case .first: + -0.42 + case .second: + -0.28 + case .third: + -0.14 + case .forth: + 0 + case .fifth: + 0.14 + case .sixth: + 0.28 + case .seventh: + 0.42 + } + } + } +} From f6614565a53db8939847ec9858df3e35a0532393 Mon Sep 17 00:00:00 2001 From: littleossa Date: Tue, 6 Feb 2024 22:37:05 +0900 Subject: [PATCH 031/108] Refactor ArtWorkModel --- SFSymbolsArtCollection.xcodeproj/project.pbxproj | 12 ++++++++++-- .../ArtWorkModel+InitialSymbolRow.swift | 0 .../Models/{ => ArtWorkModel}/ArtWorkModel.swift | 0 3 files changed, 10 insertions(+), 2 deletions(-) rename SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/{Extensions => Common/Models/ArtWorkModel}/ArtWorkModel+InitialSymbolRow.swift (100%) rename SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/{ => ArtWorkModel}/ArtWorkModel.swift (100%) diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 2ebecfd..3c0a4ff 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -382,7 +382,7 @@ 97AD53142B70DF8A0034FB5D /* Models */ = { isa = PBXGroup; children = ( - 97AD53282B7100670034FB5D /* ArtWorkModel.swift */, + 97EF438E2B726D66003648F5 /* ArtWorkModel */, 97AD53172B70DFF30034FB5D /* AnimationValues.swift */, ); path = Models; @@ -479,7 +479,6 @@ 97E11E412819727A00B2AB32 /* Extensions */ = { isa = PBXGroup; children = ( - 97EF438C2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift */, 97624C3228C4F43F004E1720 /* GeometryProxy+.swift */, 97AD53112B70DEB60034FB5D /* UIDevice+.swift */, 97AD53192B70E0530034FB5D /* Font.Weight+.swift */, @@ -495,6 +494,15 @@ path = Nosebleed; sourceTree = ""; }; + 97EF438E2B726D66003648F5 /* ArtWorkModel */ = { + isa = PBXGroup; + children = ( + 97AD53282B7100670034FB5D /* ArtWorkModel.swift */, + 97EF438C2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift */, + ); + path = ArtWorkModel; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/ArtWorkModel+InitialSymbolRow.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel+InitialSymbolRow.swift similarity index 100% rename from SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/ArtWorkModel+InitialSymbolRow.swift rename to SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel+InitialSymbolRow.swift diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel.swift similarity index 100% rename from SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel.swift rename to SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel.swift From f4a4e876dc23d9768f8138d4f816c16c1036ee40 Mon Sep 17 00:00:00 2001 From: littleossa Date: Wed, 7 Feb 2024 05:48:23 +0900 Subject: [PATCH 032/108] Update comment of Nosebleed --- .../ArtWorks/Nosebleed/NosebleedArtView.swift | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift index 57b9ec8..28c6a34 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift @@ -17,7 +17,7 @@ struct NosebleedArtView: View { ZStack { - // 🟡 Contour + // MARK: - 􀀁 Contour ArtComponentView( name: "circle.fill", initialValue: .init( @@ -36,7 +36,7 @@ struct NosebleedArtView: View { waitingTime: 0.001 ) - // 👃🩸 Nosebleed bottom + // MARK: - 􀭧 Nosebleed bottom ArtComponentView( name: "cellularbars", initialValue: .init( @@ -62,7 +62,7 @@ struct NosebleedArtView: View { options: .speed(0.6).repeating, isActive: isEffectActivated) - // 🟨 Nosebleed bottom hide + // MARK: - 􀏄 Concealing part for nosebleed bottom ArtComponentView( name: "rectangle.fill", initialValue: .init( @@ -83,7 +83,7 @@ struct NosebleedArtView: View { waitingTime: model.waitingTime(forCount: 2) ) - // 👄 Mouth + // MARK: - 􀓩 Mouth ArtComponentView( name: "lasso", initialValue: .init( @@ -104,7 +104,7 @@ struct NosebleedArtView: View { waitingTime: model.waitingTime(forCount: 3) ) - // 🟨 Mouth hide + // MARK: - 􀏄 Concealing part for Mouth ArtComponentView( name: "rectangle.fill", initialValue: .init( @@ -125,7 +125,7 @@ struct NosebleedArtView: View { waitingTime: model.waitingTime(forCount: 4) ) - // 👃🩸 Nosebleed top + // MARK: - 􀭧 Nosebleed top ArtComponentView( name: "cellularbars", initialValue: .init( @@ -151,7 +151,7 @@ struct NosebleedArtView: View { options: .speed(0.6).repeating, isActive: isEffectActivated) - // 🟨 Nosebleed top hide right + // MARK: - 􀏄 Concealing part for nosebleed top right ArtComponentView( name: "rectangle.fill", initialValue: .init( @@ -172,7 +172,7 @@ struct NosebleedArtView: View { waitingTime: model.waitingTime(forCount: 6) ) - // 🟨 Nosebleed top hide left + // MARK: - 􀏄 Concealing part for nosebleed top left ArtComponentView( name: "rectangle.fill", initialValue: .init( @@ -193,7 +193,7 @@ struct NosebleedArtView: View { waitingTime: model.waitingTime(forCount: 6) ) - // 👁️ Right eye + // MARK: - 􀀁 Right eye ArtComponentView( name: "circle.fill", initialValue: .init( @@ -213,7 +213,7 @@ struct NosebleedArtView: View { waitingTime: model.waitingTime(forCount: 7) ) - // 👁️ Left eye + // MARK: - 􀀁 Left eye ArtComponentView( name: "circle.fill", initialValue: .init( @@ -233,7 +233,7 @@ struct NosebleedArtView: View { waitingTime: model.waitingTime(forCount: 7) ) - // 🧻 Tissue + // MARK: - 􀥨 Tissue ArtComponentView( name: "doc.plaintext.fill", initialValue: .init( @@ -256,7 +256,7 @@ struct NosebleedArtView: View { waitingTime: model.waitingTime(forCount: 8) ) - // 🧻 Tissue frame + // MARK: - 􀉆 Tissue frame ArtComponentView( name: "doc.plaintext", initialValue: .init( @@ -278,7 +278,7 @@ struct NosebleedArtView: View { waitingTime: model.waitingTime(forCount: 8) ) - // 👃 Nose + // MARK: - 􀥰 Nose ArtComponentView( name: "triangleshape", initialValue: .init( @@ -300,7 +300,7 @@ struct NosebleedArtView: View { waitingTime: model.waitingTime(forCount: 9) ) - // 🟨 Nose hide + // MARK: - 􀏄 Concealing part for nose ArtComponentView( name: "rectangle.fill", initialValue: .init( @@ -374,7 +374,7 @@ struct NosebleedArtPreviewView: View { .offset(x: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), y: model.calculatingProportionalValue(withRatio: 0.074, forPreview: true)) - // MARK: - 􀏄 Nosebleed bottom hide + // MARK: - 􀏄 Concealing part for nosebleed bottom Image(systemName: "rectangle.fill") .resizable() .foregroundStyle(.awesomeYellow) @@ -394,7 +394,7 @@ struct NosebleedArtPreviewView: View { .offset(x: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), y: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true)) - // MARK: - 􀏄 Mouth hide + // MARK: - 􀏄 Concealing part for Mouth Image(systemName: "rectangle.fill") .resizable() .foregroundStyle(.awesomeYellow) From bed2a18fc6b094db197245eb2046a77dfd7c5a81 Mon Sep 17 00:00:00 2001 From: littleossa Date: Wed, 7 Feb 2024 05:49:02 +0900 Subject: [PATCH 033/108] Update ArtGalleryView with NosebleedArtWork --- SFSymbolsArtCollection.xcodeproj/project.pbxproj | 2 +- .../ArtisticWorldOfSFSymbols/ArtGalleryView.swift | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 3c0a4ff..cf54c82 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -391,8 +391,8 @@ 97AD531B2B70E0A10034FB5D /* ArtWorks */ = { isa = PBXGroup; children = ( - 97EF43892B725DE7003648F5 /* Nosebleed */, 97AD531E2B70E2770034FB5D /* AfroBoy */, + 97EF43892B725DE7003648F5 /* Nosebleed */, ); path = ArtWorks; sourceTree = ""; diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift index 069be23..2d8fd0b 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift @@ -35,9 +35,10 @@ struct ArtGalleryView: View { } NavigationLink { - AfroBoyArtView() + NosebleedArtView() } label: { - AfroBoyPreviewView() + NosebleedArtPreviewView() + .galleryGridItemView(length: model.galleryColumnLength) } NavigationLink { From 5be81be9d5deefd24462195e877e48a13e779d5a Mon Sep 17 00:00:00 2001 From: littleossa Date: Wed, 7 Feb 2024 05:50:56 +0900 Subject: [PATCH 034/108] Create discrete file for NosebleedArtPreviewView --- .../project.pbxproj | 4 + .../ArtWorks/Nosebleed/NosebleedArtView.swift | 152 ----------------- .../Nosebleed/NosebleedPreviewView.swift | 160 ++++++++++++++++++ 3 files changed, 164 insertions(+), 152 deletions(-) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedPreviewView.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index cf54c82..798f1c6 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -76,6 +76,7 @@ 97E11E462819734700B2AB32 /* CrayonBoy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11E452819734700B2AB32 /* CrayonBoy.swift */; }; 97EF438B2B725E02003648F5 /* NosebleedArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438A2B725E02003648F5 /* NosebleedArtView.swift */; }; 97EF438D2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438C2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift */; }; + 97EF43902B72D2E4003648F5 /* NosebleedPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438F2B72D2E4003648F5 /* NosebleedPreviewView.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -149,6 +150,7 @@ 97E11E452819734700B2AB32 /* CrayonBoy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrayonBoy.swift; sourceTree = ""; }; 97EF438A2B725E02003648F5 /* NosebleedArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NosebleedArtView.swift; sourceTree = ""; }; 97EF438C2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ArtWorkModel+InitialSymbolRow.swift"; sourceTree = ""; }; + 97EF438F2B72D2E4003648F5 /* NosebleedPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NosebleedPreviewView.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -490,6 +492,7 @@ isa = PBXGroup; children = ( 97EF438A2B725E02003648F5 /* NosebleedArtView.swift */, + 97EF438F2B72D2E4003648F5 /* NosebleedPreviewView.swift */, ); path = Nosebleed; sourceTree = ""; @@ -638,6 +641,7 @@ 97AD53222B70E3FA0034FB5D /* ArtComponentView.swift in Sources */, 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */, 9748BE4A28995877006DF0BE /* DemonWrestlerOutline.swift in Sources */, + 97EF43902B72D2E4003648F5 /* NosebleedPreviewView.swift in Sources */, 97E11E34281971E200B2AB32 /* CrayonFace.swift in Sources */, 9748BE4C28995A43006DF0BE /* DemonWrestlerBody.swift in Sources */, 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift index 28c6a34..b0bf0a8 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift @@ -348,161 +348,9 @@ struct NosebleedArtView: View { } } -struct NosebleedArtPreviewView: View { - - @Environment(ArtWorkModel.self) var model - - var body: some View { - - ZStack { - - // MARK: - 􀀁 Contour - Image(systemName: "circle.fill") - .resizable() - .foregroundStyle(.awesomeYellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.65, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.65, forPreview: true)) - - // MARK: - 􀭧 Nosebleed bottom - Image(systemName: "cellularbars") - .resizable() - .foregroundStyle(.red) - .fontWeight(.ultraLight) - .rotationEffect(.degrees(180)) - .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.074, forPreview: true)) - - // MARK: - 􀏄 Concealing part for nosebleed bottom - Image(systemName: "rectangle.fill") - .resizable() - .foregroundStyle(.awesomeYellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true)) - - // MARK: - 􀓩 Mouth - Image(systemName: "lasso") - .resizable() - .foregroundStyle(.black) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true)) - .rotationEffect(.degrees(170)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true)) - - // MARK: - 􀏄 Concealing part for Mouth - Image(systemName: "rectangle.fill") - .resizable() - .foregroundStyle(.awesomeYellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true)) - .rotationEffect(.degrees(176)) - .offset(y: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true)) - - // MARK: - 􀭧 Nosebleed top - Image(systemName: "cellularbars") - .resizable() - .foregroundStyle(.red) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true)) - .rotationEffect(.degrees(180)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.033, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.096, forPreview: true)) - - // MARK: - 􀏄 Nosebleed top right hide - Image(systemName: "rectangle.fill") - .resizable() - .foregroundStyle(.awesomeYellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true)) - - // MARK: - 􀏄 Nosebleed top left hide - Image(systemName: "rectangle.fill") - .resizable() - .foregroundStyle(.awesomeYellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.053, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true)) - - // MARK: - 􀀁 Right eye - Image(systemName: "circle.fill") - .resizable() - .foregroundStyle(.black) - .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.117, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.176, forPreview: true)) - - // MARK: - 􀀁 Left eye - Image(systemName: "circle.fill") - .resizable() - .foregroundStyle(.black) - .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.113, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.17, forPreview: true)) - - // MARK: - 􀥨 Tissue - Image(systemName: "doc.plaintext.fill") - .resizable() - .foregroundStyle(.white) - .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true)) - .rotationEffect(.degrees(188)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.052, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.083, forPreview: true)) - - // MARK: - 􀉆 Tissue frame - Image(systemName: "doc.plaintext") - .resizable() - .foregroundStyle(.black) - .fontWeight(.light) - .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true)) - .rotationEffect(.degrees(188)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.052, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.083, forPreview: true)) - - // MARK: - 􀥰 Nose - Image(systemName: "triangleshape") - .resizable() - .foregroundStyle(.black) - .fontWeight(.light) - .frame(width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true)) - .rotationEffect(.degrees(-4)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.013, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.02, forPreview: true)) - - // MARK: - 􀏄 Nose hide - Image(systemName: "rectangle.fill") - .resizable() - .foregroundStyle(.awesomeYellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.13, forPreview: true)) - .rotationEffect(.degrees(148)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.007, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.046, forPreview: true)) - } - } -} - #Preview { NavigationStack { NosebleedArtView() .environment(ArtWorkModel.preview) } } - -#Preview { - NosebleedArtPreviewView() - .environment(ArtWorkModel.preview) -} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedPreviewView.swift new file mode 100644 index 0000000..448020e --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedPreviewView.swift @@ -0,0 +1,160 @@ +// +// NosebleedPreviewView.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +struct NosebleedArtPreviewView: View { + + @Environment(ArtWorkModel.self) var model + + var body: some View { + + ZStack { + + // MARK: - 􀀁 Contour + Image(systemName: "circle.fill") + .resizable() + .foregroundStyle(.awesomeYellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.65, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.65, forPreview: true)) + + // MARK: - 􀭧 Nosebleed bottom + Image(systemName: "cellularbars") + .resizable() + .foregroundStyle(.red) + .fontWeight(.ultraLight) + .rotationEffect(.degrees(180)) + .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.074, forPreview: true)) + + // MARK: - 􀏄 Concealing part for nosebleed bottom + Image(systemName: "rectangle.fill") + .resizable() + .foregroundStyle(.awesomeYellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true)) + + // MARK: - 􀓩 Mouth + Image(systemName: "lasso") + .resizable() + .foregroundStyle(.black) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true)) + .rotationEffect(.degrees(170)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true)) + + // MARK: - 􀏄 Concealing part for Mouth + Image(systemName: "rectangle.fill") + .resizable() + .foregroundStyle(.awesomeYellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true)) + .rotationEffect(.degrees(176)) + .offset(y: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true)) + + // MARK: - 􀭧 Nosebleed top + Image(systemName: "cellularbars") + .resizable() + .foregroundStyle(.red) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true)) + .rotationEffect(.degrees(180)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.033, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.096, forPreview: true)) + + // MARK: - 􀏄 Nosebleed top right hide + Image(systemName: "rectangle.fill") + .resizable() + .foregroundStyle(.awesomeYellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true)) + + // MARK: - 􀏄 Nosebleed top left hide + Image(systemName: "rectangle.fill") + .resizable() + .foregroundStyle(.awesomeYellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.053, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true)) + + // MARK: - 􀀁 Right eye + Image(systemName: "circle.fill") + .resizable() + .foregroundStyle(.black) + .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.117, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.176, forPreview: true)) + + // MARK: - 􀀁 Left eye + Image(systemName: "circle.fill") + .resizable() + .foregroundStyle(.black) + .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.113, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.17, forPreview: true)) + + // MARK: - 􀥨 Tissue + Image(systemName: "doc.plaintext.fill") + .resizable() + .foregroundStyle(.white) + .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true)) + .rotationEffect(.degrees(188)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.052, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.083, forPreview: true)) + + // MARK: - 􀉆 Tissue frame + Image(systemName: "doc.plaintext") + .resizable() + .foregroundStyle(.black) + .fontWeight(.light) + .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true)) + .rotationEffect(.degrees(188)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.052, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.083, forPreview: true)) + + // MARK: - 􀥰 Nose + Image(systemName: "triangleshape") + .resizable() + .foregroundStyle(.black) + .fontWeight(.light) + .frame(width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true)) + .rotationEffect(.degrees(-4)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.013, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.02, forPreview: true)) + + // MARK: - 􀏄 Nose hide + Image(systemName: "rectangle.fill") + .resizable() + .foregroundStyle(.awesomeYellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.13, forPreview: true)) + .rotationEffect(.degrees(148)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.007, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.046, forPreview: true)) + } + } +} + +#Preview { + NosebleedArtPreviewView() + .environment(ArtWorkModel.preview) +} From d53f846ec23a936313eeed8b8d20a9669fbf1c7b Mon Sep 17 00:00:00 2001 From: littleossa Date: Wed, 7 Feb 2024 09:04:37 +0900 Subject: [PATCH 035/108] Add IamWearingPantsArt --- .../project.pbxproj | 16 + .../IamWearingPantsArtView.swift | 794 ++++++++++++++++++ .../IamWearingPantsPreviewView.swift | 422 ++++++++++ 3 files changed, 1232 insertions(+) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsArtView.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsPreviewView.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 798f1c6..1e5cce0 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -77,6 +77,8 @@ 97EF438B2B725E02003648F5 /* NosebleedArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438A2B725E02003648F5 /* NosebleedArtView.swift */; }; 97EF438D2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438C2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift */; }; 97EF43902B72D2E4003648F5 /* NosebleedPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438F2B72D2E4003648F5 /* NosebleedPreviewView.swift */; }; + 97EF43932B72D3E2003648F5 /* IamWearingPantsPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43922B72D3E2003648F5 /* IamWearingPantsPreviewView.swift */; }; + 97EF43952B72DA69003648F5 /* IamWearingPantsArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43942B72DA69003648F5 /* IamWearingPantsArtView.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -151,6 +153,8 @@ 97EF438A2B725E02003648F5 /* NosebleedArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NosebleedArtView.swift; sourceTree = ""; }; 97EF438C2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ArtWorkModel+InitialSymbolRow.swift"; sourceTree = ""; }; 97EF438F2B72D2E4003648F5 /* NosebleedPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NosebleedPreviewView.swift; sourceTree = ""; }; + 97EF43922B72D3E2003648F5 /* IamWearingPantsPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IamWearingPantsPreviewView.swift; sourceTree = ""; }; + 97EF43942B72DA69003648F5 /* IamWearingPantsArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IamWearingPantsArtView.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -395,6 +399,7 @@ children = ( 97AD531E2B70E2770034FB5D /* AfroBoy */, 97EF43892B725DE7003648F5 /* Nosebleed */, + 97EF43912B72D3AF003648F5 /* IamWearingPants */, ); path = ArtWorks; sourceTree = ""; @@ -506,6 +511,15 @@ path = ArtWorkModel; sourceTree = ""; }; + 97EF43912B72D3AF003648F5 /* IamWearingPants */ = { + isa = PBXGroup; + children = ( + 97EF43942B72DA69003648F5 /* IamWearingPantsArtView.swift */, + 97EF43922B72D3E2003648F5 /* IamWearingPantsPreviewView.swift */, + ); + path = IamWearingPants; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -582,6 +596,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 97EF43932B72D3E2003648F5 /* IamWearingPantsPreviewView.swift in Sources */, 97624C2F28C2E608004E1720 /* SmallFirework.swift in Sources */, 9748BE232893B35A006DF0BE /* WorldPeace.swift in Sources */, 9748BE57289DCBB0006DF0BE /* LargeFirework.swift in Sources */, @@ -627,6 +642,7 @@ 9748BE412897CD6C006DF0BE /* Arm.swift in Sources */, 9748BE4328980C4D006DF0BE /* Hair.swift in Sources */, 97624C3328C4F43F004E1720 /* GeometryProxy+.swift in Sources */, + 97EF43952B72DA69003648F5 /* IamWearingPantsArtView.swift in Sources */, 9748BE1828933E40006DF0BE /* MagicianHat.swift in Sources */, 9748BE50289AB439006DF0BE /* DemonWrestlerHand.swift in Sources */, 97E11E3F281971ED00B2AB32 /* CrayonEyeBall.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsArtView.swift new file mode 100644 index 0000000..cbc5e34 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsArtView.swift @@ -0,0 +1,794 @@ +// +// IamWearingPantsArtView.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +struct ImWearingPantsArtView: View { + + enum Pose: String { + case walk = "figure.walk" + case discSport = "figure.disc.sports" + case martialArts = "figure.martial.arts" + case strengthTraining = "figure.strengthtraining.traditional" + case football = "figure.australian.football" + case intervalTraining = "figure.highintensity.intervaltraining" + case finish = "" + + var next: Pose { + switch self { + case .walk: + .discSport + case .discSport: + .martialArts + case .martialArts: + .strengthTraining + case .strengthTraining: + .football + case .football: + .intervalTraining + case .intervalTraining: + .finish + case .finish: + .finish + } + } + + var offsetXRatio: CGFloat { + switch self { + case .walk, .discSport, .strengthTraining, .finish: + 0 + case .martialArts: + 0.04 + case .football: + -0.1 + case .intervalTraining: + -0.01 + } + } + } + + @Environment(ArtWorkModel.self) var model + @State private var isAnimating = false + @State private var isChangingPose = false + @State private var musicCount = 0 + @State private var musicTimer: Timer? + @State private var currentPose: Pose = .walk + @State private var poseTimer: Timer? + + var body: some View { + + ZStack { + + // MARK: - Current pose + ArtComponentView( + name: currentPose.rawValue, + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.second)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.second)) + ), + finalValue: .init( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.6), + height: model.calculatingProportionalValue(withRatio: 1) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 10) + ) + .contentTransition(isChangingPose ? .symbolEffect(.replace) : .identity) + .offset(x: model.calculatingProportionalValue(withRatio: currentPose.offsetXRatio)) + + // MARK: - 􁉨 Pants + ArtComponentView( + name: "parkingsign.steeringwheel", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.first)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.first)) + ), + finalValue: .init( + primaryColor: .palePink, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.35), + height: model.calculatingProportionalValue(withRatio: 0.2), + offsetX: model.calculatingProportionalValue(withRatio: -0.07), + offsetY: model.calculatingProportionalValue(withRatio: 0.03) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 16) + ) + .zIndex(0.1) + + if currentPose == .finish { + + Group { + + // MARK: - 􁗅 Pose + Image(systemName: "figure.arms.open") + .resizable() + .foregroundStyle(.yellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.6), + height: model.calculatingProportionalValue(withRatio: 1)) + + // MARK: - 􀆹 Chest shadow + Image(systemName: "moon") + .resizable() + .foregroundStyle(.black.opacity(0.6)) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.06), + height: model.calculatingProportionalValue(withRatio: 0.015)) + .rotationEffect(.degrees(-10)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.09), + y: model.calculatingProportionalValue(withRatio: -0.125)) + + Image(systemName: "moon") + .resizable() + .foregroundStyle(.black.opacity(0.6)) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.06), + height: model.calculatingProportionalValue(withRatio: 0.015)) + .rotation3DEffect( + .degrees(160), + axis: (x: 0, y: 1, z: 0) + ) + .offset(x: model.calculatingProportionalValue(withRatio: 0.085), + y: model.calculatingProportionalValue(withRatio: -0.125)) + + // MARK: - 􀏄 Parts for shaping + Image(systemName: "rectangle.fill") + .resizable() + .foregroundStyle(Color(uiColor: .systemBackground)) + .fontWeight(.black) + .frame(width: model.calculatingProportionalValue(withRatio: 0.3), + height: model.calculatingProportionalValue(withRatio: 0.4)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.25), + y: model.calculatingProportionalValue(withRatio: -0.1)) + + Image(systemName: "rectangle.fill") + .resizable() + .foregroundStyle(Color(uiColor: .systemBackground)) + .fontWeight(.black) + .frame(width: model.calculatingProportionalValue(withRatio: 0.3), + height: model.calculatingProportionalValue(withRatio: 0.4)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.25), + y: model.calculatingProportionalValue(withRatio: -0.1)) + + // MARK: - 􀊡 Neck + Image(systemName: "speaker.fill") + .resizable() + .foregroundStyle(.yellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.2), + height: model.calculatingProportionalValue(withRatio: 0.38)) + .rotationEffect(.degrees(90)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.005), + y: model.calculatingProportionalValue(withRatio: -0.27)) + + // MARK: - 􀂓 Parts for shaping + Image(systemName: "square.fill") + .resizable() + .foregroundStyle(Color(uiColor: .systemBackground)) + .frame(width: model.calculatingProportionalValue(withRatio: 0.2), + height: model.calculatingProportionalValue(withRatio: 0.2)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.14), + y: model.calculatingProportionalValue(withRatio: -0.385)) + + Image(systemName: "square.fill") + .resizable() + .foregroundStyle(Color(uiColor: .systemBackground)) + .frame(width: model.calculatingProportionalValue(withRatio: 0.2), + height: model.calculatingProportionalValue(withRatio: 0.2)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.14), + y: model.calculatingProportionalValue(withRatio: -0.385)) + + // MARK: - 􀆺 Chest + Image(systemName: "moon.fill") + .resizable() + .foregroundStyle(.yellow) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.06), + height: model.calculatingProportionalValue(withRatio: 0.04)) + .rotationEffect(.degrees(-10)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.09), + y: model.calculatingProportionalValue(withRatio: -0.138)) + + Image(systemName: "moon.fill") + .resizable() + .foregroundStyle(.yellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.06), + height: model.calculatingProportionalValue(withRatio: 0.04)) + .rotation3DEffect( + .degrees(160), + axis: (x: 0, y: 1, z: 0) + ) + .offset(x: model.calculatingProportionalValue(withRatio: 0.085), + y: model.calculatingProportionalValue(withRatio: -0.138)) + + // MARK: - 􀆉 Left arm + Image(systemName: "chevron.left") + .resizable() + .foregroundStyle(.yellow) + .fontWeight(.black) + .frame(width: model.calculatingProportionalValue(withRatio: 0.2), + height: model.calculatingProportionalValue(withRatio: 0.3)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.2), + y: model.calculatingProportionalValue(withRatio: -0.08)) + + // MARK: - 􀆊 Right artm + Image(systemName: "chevron.right") + .resizable() + .foregroundStyle(.yellow) + .fontWeight(.black) + .frame(width: model.calculatingProportionalValue(withRatio: 0.2), + height: model.calculatingProportionalValue(withRatio: 0.3)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.2), + y: model.calculatingProportionalValue(withRatio: -0.08)) + } + .transition(.symbolEffect(.appear)) + + Group { + // MARK: - 􀀁 Pant center hole cover + Image(systemName: "circle.fill") + .resizable() + .foregroundStyle(.palePink) + .frame(width: model.calculatingProportionalValue(withRatio: 0.06), + height: model.calculatingProportionalValue(withRatio: 0.06)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.01), + y: model.calculatingProportionalValue(withRatio: 0.04)) + + // MARK: - 􁁌 Patterns on pants + Image(systemName: "fan.fill") + .resizable() + .foregroundStyle(.white) + .frame(width: model.calculatingProportionalValue(withRatio: 0.04), + height: model.calculatingProportionalValue(withRatio: 0.04)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.01), + y: model.calculatingProportionalValue(withRatio: 0.04)) + + Image(systemName: "fan.fill") + .resizable() + .foregroundStyle(.white) + .frame(width: model.calculatingProportionalValue(withRatio: 0.04), + height: model.calculatingProportionalValue(withRatio: 0.04)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.08), + y: model.calculatingProportionalValue(withRatio: 0.02)) + + Image(systemName: "fan.fill") + .resizable() + .foregroundStyle(.white) + .frame(width: model.calculatingProportionalValue(withRatio: 0.04), + height: model.calculatingProportionalValue(withRatio: 0.04)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.08), + y: model.calculatingProportionalValue(withRatio: 0.02)) + + Image(systemName: "fan.fill") + .resizable() + .foregroundStyle(.white) + .frame(width: model.calculatingProportionalValue(withRatio: 0.04), + height: model.calculatingProportionalValue(withRatio: 0.04)) + .offset(y: model.calculatingProportionalValue(withRatio: 0.099)) + + // MARK: - 􀲟 Concealing part for pants + Image(systemName: "oval.fill") + .resizable() + .foregroundStyle(.yellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.11), + height: model.calculatingProportionalValue(withRatio: 0.03)) + .rotationEffect(.degrees(45)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.07), + y: model.calculatingProportionalValue(withRatio: 0.09)) + + Image(systemName: "oval.fill") + .resizable() + .foregroundStyle(.yellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.11), + height: model.calculatingProportionalValue(withRatio: 0.03)) + .rotationEffect(.degrees(-47)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.06), + y: model.calculatingProportionalValue(withRatio: 0.089)) + + // MARK: - 􁎘 Abdomen + Image(systemName: "visionpro.fill") + .resizable() + .foregroundStyle(.yellow) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.25), + height: model.calculatingProportionalValue(withRatio: 0.15)) + .rotationEffect(.degrees(180)) + .offset(y: model.calculatingProportionalValue(withRatio: -0.045)) + + // MARK: - 􀥤 Belly button + Image(systemName: "poweron") + .resizable() + .foregroundStyle(.black) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.02), + height: model.calculatingProportionalValue(withRatio: 0.002)) + .rotationEffect(.degrees(180)) + + // MARK: - 􀕩 Niple + Image(systemName: "smallcircle.filled.circle.fill") + .resizable() + .foregroundStyle(.brown) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.02), + height: model.calculatingProportionalValue(withRatio: 0.01)) + .rotationEffect(.degrees(15)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.09), + y: model.calculatingProportionalValue(withRatio: -0.138)) + + Image(systemName: "smallcircle.filled.circle.fill") + .resizable() + .foregroundStyle(.brown) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.02), + height: model.calculatingProportionalValue(withRatio: 0.01)) + .rotationEffect(.degrees(-15)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.09), + y: model.calculatingProportionalValue(withRatio: -0.14)) + } + .zIndex(0.2) + .transition(.symbolEffect(.appear)) + } + + // MARK: - 􀑪 Music + ArtComponentView( + name: "music.note", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .second(.first)), + offsetY: model.calculatingInitialOffsetY(forPosition: .second(.first)) + ), + finalValue: .init( + width: model.calculatingProportionalValue(withRatio: 0.1), + height: model.calculatingProportionalValue(withRatio: 0.15), + offsetX: model.calculatingProportionalValue(withRatio: 0.35), + offsetY: model.calculatingProportionalValue(withRatio: -0.5) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: 0.001 + ) + .symbolEffect(.bounce, value: musicCount) + + // MARK: - 􀫀 Music 3 + ArtComponentView( + name: "music.quarternote.3", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .second(.second)), + offsetY: model.calculatingInitialOffsetY(forPosition: .second(.second)) + ), + finalValue: .init( + width: model.calculatingProportionalValue(withRatio: 0.2), + height: model.calculatingProportionalValue(withRatio: 0.15), + offsetX: model.calculatingProportionalValue(withRatio: -0.34), + offsetY: model.calculatingProportionalValue(withRatio: -0.38) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 1) + ) + .symbolEffect(.bounce, value: musicCount) + + // MARK: - 􀀁 Face background + ArtComponentView( + name: "circle.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .second(.third)), + offsetY: model.calculatingInitialOffsetY(forPosition: .second(.third)) + ), + finalValue: .init( + primaryColor: Color(uiColor: .systemBackground), + width: model.calculatingProportionalValue(withRatio: 0.2), + height: model.calculatingProportionalValue(withRatio: 0.2), + offsetY: model.calculatingProportionalValue(withRatio: -0.4) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 2) + ) + + // MARK: - 􀧷 Contour + ArtComponentView( + name: "capsule.portrait.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetY: model.calculatingInitialOffsetY(forPosition: .second(.forth)) + ), + finalValue: .init( + primaryColor: .yellow, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.16), + height: model.calculatingProportionalValue(withRatio: 0.22), + offsetY: model.calculatingProportionalValue(withRatio: -0.4) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 2) + ) + + // MARK: - 􀧷 Contour bottom + ArtComponentView( + name: "capsule.portrait.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetY: model.calculatingInitialOffsetY(forPosition: .second(.forth)) + ), + finalValue: .init( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.1), + height: model.calculatingProportionalValue(withRatio: 0.16), + offsetY: model.calculatingProportionalValue(withRatio: -0.35) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 3) + ) + + // MARK: - 􀨯 nose + ArtComponentView( + name: "nose", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .second(.fifth)), + offsetY: model.calculatingInitialOffsetY(forPosition: .second(.fifth)) + ), + finalValue: .init( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.045), + height: model.calculatingProportionalValue(withRatio: 0.06), + offsetY: model.calculatingProportionalValue(withRatio: -0.38) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 4) + ) + + // MARK: - 􀦭 Right eyebrow + ArtComponentView( + name: "eyebrow", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .second(.sixth)), + offsetY: model.calculatingInitialOffsetY(forPosition: .second(.sixth)) + ), + finalValue: .init( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.04), + height: model.calculatingProportionalValue(withRatio: 0.04), + rotationDegrees: 10, + offsetX: model.calculatingProportionalValue(withRatio: 0.03), + offsetY: model.calculatingProportionalValue(withRatio: -0.41) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 5) + ) + + // MARK: - 􀦭 Left eyebrow + ArtComponentView( + name: "eyebrow", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .second(.sixth)), + offsetY: model.calculatingInitialOffsetY(forPosition: .second(.sixth)) + ), + finalValue: .init( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.045), + height: model.calculatingProportionalValue(withRatio: 0.04), + rotationDegrees: 180, + rotationAxis: (x: 0, y: 1, z: 0), + offsetX: model.calculatingProportionalValue(withRatio: -0.03), + offsetY: model.calculatingProportionalValue(withRatio: -0.408) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 5) + ) + + // MARK: - 􀋭 Right eye + ArtComponentView( + name: "eye", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .second(.seventh)), + offsetY: model.calculatingInitialOffsetY(forPosition: .second(.seventh)) + ), + finalValue: .init( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.04), + height: model.calculatingProportionalValue(withRatio: 0.02), + offsetX: model.calculatingProportionalValue(withRatio: 0.03), + offsetY: model.calculatingProportionalValue(withRatio: -0.4) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 6) + ) + + // MARK: - 􀋭 Left eye + ArtComponentView( + name: "eye", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .second(.seventh)), + offsetY: model.calculatingInitialOffsetY(forPosition: .second(.seventh)) + ), + finalValue: .init( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.04), + height: model.calculatingProportionalValue(withRatio: 0.02), + offsetX: model.calculatingProportionalValue(withRatio: -0.03), + offsetY: model.calculatingProportionalValue(withRatio: -0.4) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 6) + ) + + // MARK: - 􀋮 Right eye.fill + ArtComponentView( + name: "eye.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.seventh)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.seventh)) + ), + finalValue: .init( + primaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.04), + height: model.calculatingProportionalValue(withRatio: 0.02), + offsetX: model.calculatingProportionalValue(withRatio: 0.03), + offsetY: model.calculatingProportionalValue(withRatio: -0.4) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 6) + ) + + // MARK: - 􀋮 Left eye.fill + ArtComponentView( + name: "eye.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.seventh)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.seventh)) + ), + finalValue: .init( + primaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.04), + height: model.calculatingProportionalValue(withRatio: 0.02), + offsetX: model.calculatingProportionalValue(withRatio: -0.03), + offsetY: model.calculatingProportionalValue(withRatio: -0.4) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 6) + ) + + // MARK: - 􀦪 Mouth + ArtComponentView( + name: "mouth.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.third)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.third)) + ), + finalValue: .init( + primaryColor: .red, + width: model.calculatingProportionalValue(withRatio: 0.06), + height: model.calculatingProportionalValue(withRatio: 0.02), + offsetY: model.calculatingProportionalValue(withRatio: -0.32) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 7) + ) + + ArtComponentView( + name: "mouth.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.third)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.third)) + ), + finalValue: .init( + primaryColor: .red, + width: model.calculatingProportionalValue(withRatio: 0.06), + height: model.calculatingProportionalValue(withRatio: 0.02), + offsetY: model.calculatingProportionalValue(withRatio: -0.33) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 7) + ) + + // MARK: - 􁒀 Teeth + ArtComponentView( + name: "window.casement.closed", + initialValue: .init( + secondaryColor: .clear, + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.forth)) + ), + finalValue: .init( + primaryColor: .black, + secondaryColor: .white, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.015), + height: model.calculatingProportionalValue(withRatio: 0.029), + rotationDegrees: 90, + offsetX: model.calculatingProportionalValue(withRatio: 0.013), + offsetY: model.calculatingProportionalValue(withRatio: -0.328) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 8) + ) + + ArtComponentView( + name: "window.casement.closed", + initialValue: .init( + secondaryColor: .clear, + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.forth)) + ), + finalValue: .init( + primaryColor: .black, + secondaryColor: .white, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.015), + height: model.calculatingProportionalValue(withRatio: 0.029), + rotationDegrees: 90, + offsetX: model.calculatingProportionalValue(withRatio: -0.014), + offsetY: model.calculatingProportionalValue(withRatio: -0.328) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 8) + ) + + // MARK: - 􀲟 Hair + ArtComponentView( + name: "oval.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.fifth)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.fifth)) + ), + finalValue: .init( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.14), + height: model.calculatingProportionalValue(withRatio: 0.057), + offsetX: model.calculatingProportionalValue(withRatio: -0.001), + offsetY: model.calculatingProportionalValue(withRatio: -0.49) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 9) + ) + + // MARK: - 􀠒 Hair + ArtComponentView( + name: "drop.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.sixth)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.sixth)) + ), + finalValue: .init( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.05), + height: model.calculatingProportionalValue(withRatio: 0.06), + rotationDegrees: -65, + offsetX: model.calculatingProportionalValue(withRatio: 0.04), + offsetY: model.calculatingProportionalValue(withRatio: -0.48) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 9) + ) + + ArtComponentView( + name: "drop.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.sixth)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.sixth)) + ), + finalValue: .init( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.05), + height: model.calculatingProportionalValue(withRatio: 0.1), + rotationDegrees: 95, + offsetX: model.calculatingProportionalValue(withRatio: -0.03), + offsetY: model.calculatingProportionalValue(withRatio: -0.47) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 9) + ) + } + .navigationTitle("I'm wearing pants") + .navigationBarTitleDisplayMode(.inline) + .toolbar(content: { + ToolbarItemGroup(placement: .bottomBar) { + Spacer() + + PlayButton { + isAnimating = true + } + .font(.system(size: 32)) + .disabled(isAnimating) + } + }) + .onChange(of: isAnimating) { _, newValue in + if newValue { + Timer.scheduledTimer( + withTimeInterval: model.waitingTime(forCount: 11), + repeats: false + ) { _ in + isChangingPose = true + } + } + } + .onChange(of: isChangingPose) { _, newValue in + if newValue { + poseTimer = Timer.scheduledTimer( + withTimeInterval: model.waitingTime(forCount: 1), + repeats: true + ) { _ in + currentPose = currentPose.next + + if currentPose == .finish { + poseTimer?.invalidate() + musicTimer?.invalidate() + } + } + + musicTimer = Timer.scheduledTimer( + withTimeInterval: 0.4, + repeats: true + ) { _ in + musicCount += 1 + } + } + } + } +} + +#Preview { + NavigationStack { + ImWearingPantsArtView() + .environment(ArtWorkModel.preview) + } +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsPreviewView.swift new file mode 100644 index 0000000..8e01efa --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsPreviewView.swift @@ -0,0 +1,422 @@ +// +// IamWearingPantsPreviewView.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +struct ImWearingPantsPreviewView: View { + + @Environment(ArtWorkModel.self) var model + + var body: some View { + + ZStack { + + // MARK: - 􀑪 Music + Image(systemName: "music.note") + .resizable() + .foregroundStyle(.black) + .frame(width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.35, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.5, forPreview: true)) + + // MARK: - 􀫀 Music 3 + Image(systemName: "music.quarternote.3") + .resizable() + .foregroundStyle(.black) + .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.34, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.38, forPreview: true)) + + // MARK: - 􁗅 Pose + Image(systemName: "figure.arms.open") + .resizable() + .foregroundStyle(.yellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.6, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 1, forPreview: true)) + + // MARK: - 􀆹 Chest shadow + Image(systemName: "moon") + .resizable() + .foregroundStyle(.black.opacity(0.6)) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.015, forPreview: true)) + .rotationEffect(.degrees(-10)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.09, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.125, forPreview: true)) + + Image(systemName: "moon") + .resizable() + .foregroundStyle(.black.opacity(0.6)) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.015, forPreview: true)) + .rotation3DEffect( + .degrees(160), + axis: (x: 0, y: 1, z: 0) + ) + .offset(x: model.calculatingProportionalValue(withRatio: 0.085, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.125, forPreview: true)) + + // MARK: - 􀏄 Parts for shaping + Image(systemName: "rectangle.fill") + .resizable() + .foregroundStyle(Color(uiColor: .systemBackground)) + .fontWeight(.black) + .frame(width: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.25, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.1, forPreview: true)) + + Image(systemName: "rectangle.fill") + .resizable() + .foregroundStyle(Color(uiColor: .systemBackground)) + .fontWeight(.black) + .frame(width: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.25, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.1, forPreview: true)) + + // MARK: - 􀊡 Neck + Image(systemName: "speaker.fill") + .resizable() + .foregroundStyle(.yellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.38, forPreview: true)) + .rotationEffect(.degrees(90)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.005, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.27, forPreview: true)) + + // MARK: - 􀂓 Parts for shaping + Image(systemName: "square.fill") + .resizable() + .foregroundStyle(Color(uiColor: .systemBackground)) + .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.385, forPreview: true)) + + Image(systemName: "square.fill") + .resizable() + .foregroundStyle(Color(uiColor: .systemBackground)) + .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.14, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.385, forPreview: true)) + + // MARK: - 􀆺 Chest + Image(systemName: "moon.fill") + .resizable() + .foregroundStyle(.yellow) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) + .rotationEffect(.degrees(-10)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.09, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.138, forPreview: true)) + + Image(systemName: "moon.fill") + .resizable() + .foregroundStyle(.yellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) + .rotation3DEffect( + .degrees(160), + axis: (x: 0, y: 1, z: 0) + ) + .offset(x: model.calculatingProportionalValue(withRatio: 0.085, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.138, forPreview: true)) + + // MARK: - 􀆉 Left arm + Image(systemName: "chevron.left") + .resizable() + .foregroundStyle(.yellow) + .fontWeight(.black) + .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true)) + + // MARK: - 􀆊 Right artm + Image(systemName: "chevron.right") + .resizable() + .foregroundStyle(.yellow) + .fontWeight(.black) + .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true)) + + // MARK: - 􁉨 Pants + Image(systemName: "parkingsign.steeringwheel") + .resizable() + .foregroundStyle(.palePink) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.35, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.07, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true)) + + // MARK: - 􀀁 Pant center hole cover + Image(systemName: "circle.fill") + .resizable() + .foregroundStyle(.palePink) + .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.01, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) + + // MARK: - 􁁌 Patterns on pants + Image(systemName: "fan.fill") + .resizable() + .foregroundStyle(.white) + .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.01, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) + + Image(systemName: "fan.fill") + .resizable() + .foregroundStyle(.white) + .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true)) + + Image(systemName: "fan.fill") + .resizable() + .foregroundStyle(.white) + .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true)) + + Image(systemName: "fan.fill") + .resizable() + .foregroundStyle(.white) + .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) + .offset(y: model.calculatingProportionalValue(withRatio: 0.099, forPreview: true)) + + // MARK: - 􀲟 Concealing part for pants + Image(systemName: "oval.fill") + .resizable() + .foregroundStyle(.yellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.11, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true)) + .rotationEffect(.degrees(45)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.07, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true)) + + Image(systemName: "oval.fill") + .resizable() + .foregroundStyle(.yellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.11, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true)) + .rotationEffect(.degrees(-47)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.089, forPreview: true)) + + // MARK: - 􁎘 Abdomen + Image(systemName: "visionpro.fill") + .resizable() + .foregroundStyle(.yellow) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.25, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true)) + .rotationEffect(.degrees(180)) + .offset(y: model.calculatingProportionalValue(withRatio: -0.045, forPreview: true)) + + // MARK: - 􀥤 Belly button + Image(systemName: "poweron") + .resizable() + .foregroundStyle(.black) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.002, forPreview: true)) + .rotationEffect(.degrees(180)) + + // MARK: - 􀕩 Niple + Image(systemName: "smallcircle.filled.circle.fill") + .resizable() + .foregroundStyle(.brown) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true)) + .rotationEffect(.degrees(15)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.138, forPreview: true)) + + Image(systemName: "smallcircle.filled.circle.fill") + .resizable() + .foregroundStyle(.brown) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true)) + .rotationEffect(.degrees(-15)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.09, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.14, forPreview: true)) + + // MARK: - 􀧷 Contour + Image(systemName: "capsule.portrait.fill") + .resizable() + .foregroundStyle(.yellow) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.16, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.22, forPreview: true)) + .offset(y: model.calculatingProportionalValue(withRatio: -0.4, forPreview: true)) + + Image(systemName: "capsule.portrait.fill") + .resizable() + .foregroundStyle(.yellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.16, forPreview: true)) + .offset(y: model.calculatingProportionalValue(withRatio: -0.35, forPreview: true)) + + // MARK: - 􀨯 Nose + Image(systemName: "nose") + .resizable() + .foregroundStyle(.black) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.045, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true)) + .offset(y: model.calculatingProportionalValue(withRatio: -0.38, forPreview: true)) + + // MARK: - 􀦭 Eyebrow + Image(systemName: "eyebrow") + .resizable() + .foregroundStyle(.black) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) + .rotationEffect(.degrees(10)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.41, forPreview: true)) + + Image(systemName: "eyebrow") + .resizable() + .foregroundStyle(.black) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.045, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) + .rotation3DEffect(.degrees(180), + axis: (x: 0, y: 1, z: 0)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.408, forPreview: true)) + + // MARK: - 􀋭 Eye frame + Image(systemName: "eye") + .resizable() + .foregroundStyle(.black) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.4, forPreview: true)) + + Image(systemName: "eye") + .resizable() + .foregroundStyle(.black) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.4, forPreview: true)) + + // MARK: - 􀋮 Eye + Image(systemName: "eye.fill") + .resizable() + .foregroundStyle(.white) + .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.4, forPreview: true)) + + Image(systemName: "eye.fill") + .resizable() + .foregroundStyle(.white) + .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.4, forPreview: true)) + + // MARK: - 􀦪 Mouth + Image(systemName: "mouth.fill") + .resizable() + .foregroundStyle(.red) + .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true)) + .offset(y: model.calculatingProportionalValue(withRatio: -0.32, forPreview: true)) + + Image(systemName: "mouth.fill") + .resizable() + .foregroundStyle(.red) + .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true)) + .offset(y: model.calculatingProportionalValue(withRatio: -0.33, forPreview: true)) + + // MARK: - 􁒀 Teeth + Image(systemName: "window.casement.closed") + .resizable() + .foregroundStyle(.black, .white) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.015, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.029, forPreview: true)) + .rotationEffect(.degrees(90)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.013, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.328, forPreview: true)) + + Image(systemName: "window.casement.closed") + .resizable() + .foregroundStyle(.black, .white) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.015, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.029, forPreview: true)) + .rotationEffect(.degrees(90)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.014, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.328, forPreview: true)) + + // MARK: - 􀲟 Hair + Image(systemName: "oval.fill") + .resizable() + .foregroundStyle(.black) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.057, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.001, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.49, forPreview: true)) + + // MARK: - 􀠒 Off-center part hair style + Image(systemName: "drop.fill") + .resizable() + .foregroundStyle(.black) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true)) + .rotationEffect(.degrees(-65)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.48, forPreview: true)) + + Image(systemName: "drop.fill") + .resizable() + .foregroundStyle(.black) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true)) + .rotationEffect(.degrees(95)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.47, forPreview: true)) + } + } +} + +#Preview { + ImWearingPantsPreviewView() + .environment(ArtWorkModel.preview) +} From a4850b6c9d8b95079dfc2e7f25e9f9c0eef74450 Mon Sep 17 00:00:00 2001 From: littleossa Date: Wed, 7 Feb 2024 09:05:31 +0900 Subject: [PATCH 036/108] Rename fourth --- .../ArtWorks/AfroBoy/AfroBoyArtView.swift | 2 +- .../ArtWorks/IamWearingPants/IamWearingPantsArtView.swift | 8 ++++---- .../ArtWorks/Nosebleed/NosebleedArtView.swift | 2 +- .../ArtWorkModel/ArtWorkModel+InitialSymbolRow.swift | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift index 2e4934b..f08c3c2 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift @@ -79,7 +79,7 @@ struct AfroBoyArtView: View { initialValue: .init( width: model.initialSymbolLength, height: model.initialSymbolLength, - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.forth)) + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.fourth)) ), finalValue: .init( primaryColor: .red, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsArtView.swift index cbc5e34..31bdd68 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsArtView.swift @@ -406,7 +406,7 @@ struct ImWearingPantsArtView: View { initialValue: .init( width: model.initialSymbolLength, height: model.initialSymbolLength, - offsetY: model.calculatingInitialOffsetY(forPosition: .second(.forth)) + offsetY: model.calculatingInitialOffsetY(forPosition: .second(.fourth)) ), finalValue: .init( primaryColor: .yellow, @@ -426,7 +426,7 @@ struct ImWearingPantsArtView: View { initialValue: .init( width: model.initialSymbolLength, height: model.initialSymbolLength, - offsetY: model.calculatingInitialOffsetY(forPosition: .second(.forth)) + offsetY: model.calculatingInitialOffsetY(forPosition: .second(.fourth)) ), finalValue: .init( primaryColor: .yellow, @@ -634,7 +634,7 @@ struct ImWearingPantsArtView: View { secondaryColor: .clear, width: model.initialSymbolLength, height: model.initialSymbolLength, - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.forth)) + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.fourth)) ), finalValue: .init( primaryColor: .black, @@ -657,7 +657,7 @@ struct ImWearingPantsArtView: View { secondaryColor: .clear, width: model.initialSymbolLength, height: model.initialSymbolLength, - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.forth)) + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.fourth)) ), finalValue: .init( primaryColor: .black, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift index b0bf0a8..0a0dc9d 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift @@ -89,7 +89,7 @@ struct NosebleedArtView: View { initialValue: .init( width: model.initialSymbolLength, height: model.initialSymbolLength, - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.forth)) + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.fourth)) ), finalValue: .init( fontWeight: .ultraLight, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel+InitialSymbolRow.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel+InitialSymbolRow.swift index 2456bad..020da5e 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel+InitialSymbolRow.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel+InitialSymbolRow.swift @@ -19,7 +19,7 @@ extension ArtWorkModel { case first case second case third - case forth + case fourth case fifth case sixth case seventh @@ -32,7 +32,7 @@ extension ArtWorkModel { -0.28 case .third: -0.14 - case .forth: + case .fourth: 0 case .fifth: 0.14 From 20aab50a84e1a6703afd7a27f51bfac8b0a921cf Mon Sep 17 00:00:00 2001 From: littleossa Date: Wed, 7 Feb 2024 09:15:58 +0900 Subject: [PATCH 037/108] Update IamWearingPants --- .../IamWearingPantsArtView.swift | 43 +++++++++++++++++++ .../IamWearingPantsPreviewView.swift | 19 ++++++++ 2 files changed, 62 insertions(+) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsArtView.swift index 31bdd68..28e0491 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsArtView.swift @@ -504,6 +504,49 @@ struct ImWearingPantsArtView: View { waitingTime: model.waitingTime(forCount: 5) ) + // MARK: - 􀧷 Concealing part for eyebrow + ArtComponentView( + name: "capsule.portrait.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .second(.fourth)), + offsetY: model.calculatingInitialOffsetY(forPosition: .second(.fourth)) + ), + finalValue: .init( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.05), + height: model.calculatingProportionalValue(withRatio: 0.02), + rotationDegrees: -10, + offsetX: model.calculatingProportionalValue(withRatio: -0.035), + offsetY: model.calculatingProportionalValue(withRatio: -0.396) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 5) + ) + + ArtComponentView( + name: "capsule.portrait.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .second(.fourth)), + offsetY: model.calculatingInitialOffsetY(forPosition: .second(.fourth)) + ), + finalValue: .init( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.05), + height: model.calculatingProportionalValue(withRatio: 0.02), + rotationDegrees: 10, + offsetX: model.calculatingProportionalValue(withRatio: 0.035), + offsetY: model.calculatingProportionalValue(withRatio: -0.396) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 5) + ) + // MARK: - 􀋭 Right eye ArtComponentView( name: "eye", diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsPreviewView.swift index 8e01efa..308c724 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsPreviewView.swift @@ -310,6 +310,25 @@ struct ImWearingPantsPreviewView: View { .offset(x: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true), y: model.calculatingProportionalValue(withRatio: -0.408, forPreview: true)) + // MARK: - 􀧷 Concealing part for eyebrow + Image(systemName: "capsule.portrait.fill") + .resizable() + .foregroundStyle(.yellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true)) + .rotationEffect(.degrees(-10)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.035, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.396, forPreview: true)) + + Image(systemName: "capsule.portrait.fill") + .resizable() + .foregroundStyle(.yellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true)) + .rotationEffect(.degrees(10)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.035, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.396, forPreview: true)) + // MARK: - 􀋭 Eye frame Image(systemName: "eye") .resizable() From 779cb010a31536602d51aa2067467344ce1762fa Mon Sep 17 00:00:00 2001 From: littleossa Date: Wed, 7 Feb 2024 09:20:50 +0900 Subject: [PATCH 038/108] Update I'm wearing pants art --- .../project.pbxproj | 22 +++++++++---------- .../ArtGalleryView.swift | 5 +++-- .../ImWearingPantsArtView.swift} | 2 +- .../ImWearingPantsPreviewView.swift} | 2 +- 4 files changed, 16 insertions(+), 15 deletions(-) rename SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/{IamWearingPants/IamWearingPantsArtView.swift => ImWearingPants/ImWearingPantsArtView.swift} (99%) rename SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/{IamWearingPants/IamWearingPantsPreviewView.swift => ImWearingPants/ImWearingPantsPreviewView.swift} (99%) diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 1e5cce0..aa7e455 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -77,8 +77,8 @@ 97EF438B2B725E02003648F5 /* NosebleedArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438A2B725E02003648F5 /* NosebleedArtView.swift */; }; 97EF438D2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438C2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift */; }; 97EF43902B72D2E4003648F5 /* NosebleedPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438F2B72D2E4003648F5 /* NosebleedPreviewView.swift */; }; - 97EF43932B72D3E2003648F5 /* IamWearingPantsPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43922B72D3E2003648F5 /* IamWearingPantsPreviewView.swift */; }; - 97EF43952B72DA69003648F5 /* IamWearingPantsArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43942B72DA69003648F5 /* IamWearingPantsArtView.swift */; }; + 97EF43932B72D3E2003648F5 /* ImWearingPantsPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43922B72D3E2003648F5 /* ImWearingPantsPreviewView.swift */; }; + 97EF43952B72DA69003648F5 /* ImWearingPantsArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43942B72DA69003648F5 /* ImWearingPantsArtView.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -153,8 +153,8 @@ 97EF438A2B725E02003648F5 /* NosebleedArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NosebleedArtView.swift; sourceTree = ""; }; 97EF438C2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ArtWorkModel+InitialSymbolRow.swift"; sourceTree = ""; }; 97EF438F2B72D2E4003648F5 /* NosebleedPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NosebleedPreviewView.swift; sourceTree = ""; }; - 97EF43922B72D3E2003648F5 /* IamWearingPantsPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IamWearingPantsPreviewView.swift; sourceTree = ""; }; - 97EF43942B72DA69003648F5 /* IamWearingPantsArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IamWearingPantsArtView.swift; sourceTree = ""; }; + 97EF43922B72D3E2003648F5 /* ImWearingPantsPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImWearingPantsPreviewView.swift; sourceTree = ""; }; + 97EF43942B72DA69003648F5 /* ImWearingPantsArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImWearingPantsArtView.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -399,7 +399,7 @@ children = ( 97AD531E2B70E2770034FB5D /* AfroBoy */, 97EF43892B725DE7003648F5 /* Nosebleed */, - 97EF43912B72D3AF003648F5 /* IamWearingPants */, + 97EF43912B72D3AF003648F5 /* ImWearingPants */, ); path = ArtWorks; sourceTree = ""; @@ -511,13 +511,13 @@ path = ArtWorkModel; sourceTree = ""; }; - 97EF43912B72D3AF003648F5 /* IamWearingPants */ = { + 97EF43912B72D3AF003648F5 /* ImWearingPants */ = { isa = PBXGroup; children = ( - 97EF43942B72DA69003648F5 /* IamWearingPantsArtView.swift */, - 97EF43922B72D3E2003648F5 /* IamWearingPantsPreviewView.swift */, + 97EF43942B72DA69003648F5 /* ImWearingPantsArtView.swift */, + 97EF43922B72D3E2003648F5 /* ImWearingPantsPreviewView.swift */, ); - path = IamWearingPants; + path = ImWearingPants; sourceTree = ""; }; /* End PBXGroup section */ @@ -596,7 +596,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 97EF43932B72D3E2003648F5 /* IamWearingPantsPreviewView.swift in Sources */, + 97EF43932B72D3E2003648F5 /* ImWearingPantsPreviewView.swift in Sources */, 97624C2F28C2E608004E1720 /* SmallFirework.swift in Sources */, 9748BE232893B35A006DF0BE /* WorldPeace.swift in Sources */, 9748BE57289DCBB0006DF0BE /* LargeFirework.swift in Sources */, @@ -642,7 +642,7 @@ 9748BE412897CD6C006DF0BE /* Arm.swift in Sources */, 9748BE4328980C4D006DF0BE /* Hair.swift in Sources */, 97624C3328C4F43F004E1720 /* GeometryProxy+.swift in Sources */, - 97EF43952B72DA69003648F5 /* IamWearingPantsArtView.swift in Sources */, + 97EF43952B72DA69003648F5 /* ImWearingPantsArtView.swift in Sources */, 9748BE1828933E40006DF0BE /* MagicianHat.swift in Sources */, 9748BE50289AB439006DF0BE /* DemonWrestlerHand.swift in Sources */, 97E11E3F281971ED00B2AB32 /* CrayonEyeBall.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift index 2d8fd0b..6f5291d 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift @@ -42,9 +42,10 @@ struct ArtGalleryView: View { } NavigationLink { - AfroBoyArtView() + ImWearingPantsArtView() } label: { - AfroBoyPreviewView() + ImWearingPantsPreviewView() + .galleryGridItemView(length: model.galleryColumnLength) } NavigationLink { diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift similarity index 99% rename from SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsArtView.swift rename to SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift index 28e0491..74298d9 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift @@ -1,5 +1,5 @@ // -// IamWearingPantsArtView.swift +// ImWearingPantsArtView.swift // SFSymbolsArtCollection // // Created by Lil Ossa diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift similarity index 99% rename from SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsPreviewView.swift rename to SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift index 308c724..03b3c9f 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/IamWearingPants/IamWearingPantsPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift @@ -1,5 +1,5 @@ // -// IamWearingPantsPreviewView.swift +// ImWearingPantsPreviewView.swift // SFSymbolsArtCollection // // Created by Lil Ossa From 7b9118f2261173a3d076db41e3186ec8a0f795be Mon Sep 17 00:00:00 2001 From: littleossa Date: Wed, 7 Feb 2024 09:26:33 +0900 Subject: [PATCH 039/108] Add title on ArtGalleryView --- .../ArtGalleryView.swift | 89 +++++++++++-------- 1 file changed, 51 insertions(+), 38 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift index 6f5291d..dc48755 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift @@ -22,49 +22,62 @@ struct ArtGalleryView: View { private let columns: [GridItem] var body: some View { - NavigationStack { - ScrollView { - LazyVGrid(columns: columns) { - - Group { - NavigationLink { - AfroBoyArtView() - } label: { - AfroBoyPreviewView() - .galleryGridItemView(length: model.galleryColumnLength) - } - - NavigationLink { - NosebleedArtView() - } label: { - NosebleedArtPreviewView() - .galleryGridItemView(length: model.galleryColumnLength) - } - - NavigationLink { - ImWearingPantsArtView() - } label: { - ImWearingPantsPreviewView() - .galleryGridItemView(length: model.galleryColumnLength) - } - - NavigationLink { - AfroBoyArtView() - } label: { - AfroBoyPreviewView() - } + + VStack { + + Spacer() + .frame(height: 60) + + Text("SF Symbols Art") + .font(.largeTitle) + .bold() + + Text("is just the art created by combining SF Symbols") + + NavigationStack { + ScrollView { + LazyVGrid(columns: columns) { - NavigationLink { - AfroBoyArtView() - } label: { - AfroBoyPreviewView() - .galleryGridItemView(length: model.galleryColumnLength) + Group { + NavigationLink { + AfroBoyArtView() + } label: { + AfroBoyPreviewView() + .galleryGridItemView(length: model.galleryColumnLength) + } + + NavigationLink { + NosebleedArtView() + } label: { + NosebleedArtPreviewView() + .galleryGridItemView(length: model.galleryColumnLength) + } + + NavigationLink { + ImWearingPantsArtView() + } label: { + ImWearingPantsPreviewView() + .galleryGridItemView(length: model.galleryColumnLength) + } + + NavigationLink { + AfroBoyArtView() + } label: { + AfroBoyPreviewView() + } + + NavigationLink { + AfroBoyArtView() + } label: { + AfroBoyPreviewView() + .galleryGridItemView(length: model.galleryColumnLength) + } } } + .padding(.horizontal, 24) } - .padding(.horizontal, 24) + .navigationTitle("Art Gallery") } - .navigationTitle("Art Gallery") } .environment(model) } From b52b2f8e4949c0b325b54f498b07eaa55d40bf5b Mon Sep 17 00:00:00 2001 From: littleossa Date: Thu, 8 Feb 2024 06:33:03 +0900 Subject: [PATCH 040/108] Create MagicianArt --- .../project.pbxproj | 16 + .../ArtWorks/Magician/MagicianArtView.swift | 328 ++++++++++++++++++ .../Magician/MagicianPreviewView.swift | 174 ++++++++++ 3 files changed, 518 insertions(+) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianPreviewView.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index aa7e455..4def53d 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -79,6 +79,8 @@ 97EF43902B72D2E4003648F5 /* NosebleedPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438F2B72D2E4003648F5 /* NosebleedPreviewView.swift */; }; 97EF43932B72D3E2003648F5 /* ImWearingPantsPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43922B72D3E2003648F5 /* ImWearingPantsPreviewView.swift */; }; 97EF43952B72DA69003648F5 /* ImWearingPantsArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43942B72DA69003648F5 /* ImWearingPantsArtView.swift */; }; + 97EF43982B733337003648F5 /* MagicianArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43972B733337003648F5 /* MagicianArtView.swift */; }; + 97EF439C2B7421A7003648F5 /* MagicianPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF439B2B7421A7003648F5 /* MagicianPreviewView.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -155,6 +157,8 @@ 97EF438F2B72D2E4003648F5 /* NosebleedPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NosebleedPreviewView.swift; sourceTree = ""; }; 97EF43922B72D3E2003648F5 /* ImWearingPantsPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImWearingPantsPreviewView.swift; sourceTree = ""; }; 97EF43942B72DA69003648F5 /* ImWearingPantsArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImWearingPantsArtView.swift; sourceTree = ""; }; + 97EF43972B733337003648F5 /* MagicianArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicianArtView.swift; sourceTree = ""; }; + 97EF439B2B7421A7003648F5 /* MagicianPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicianPreviewView.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -397,6 +401,7 @@ 97AD531B2B70E0A10034FB5D /* ArtWorks */ = { isa = PBXGroup; children = ( + 97EF43962B7332FB003648F5 /* Magician */, 97AD531E2B70E2770034FB5D /* AfroBoy */, 97EF43892B725DE7003648F5 /* Nosebleed */, 97EF43912B72D3AF003648F5 /* ImWearingPants */, @@ -520,6 +525,15 @@ path = ImWearingPants; sourceTree = ""; }; + 97EF43962B7332FB003648F5 /* Magician */ = { + isa = PBXGroup; + children = ( + 97EF43972B733337003648F5 /* MagicianArtView.swift */, + 97EF439B2B7421A7003648F5 /* MagicianPreviewView.swift */, + ); + path = Magician; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -611,6 +625,7 @@ 97624C2A28C2BC9A004E1720 /* MediumFirework.swift in Sources */, 97E11E33281971E200B2AB32 /* CrayonHair.swift in Sources */, 97624C3A28C82DBB004E1720 /* CharacterAppearance.swift in Sources */, + 97EF43982B733337003648F5 /* MagicianArtView.swift in Sources */, 9748BE3A2893D0E3006DF0BE /* Frog.swift in Sources */, 97CD46E928BF080300919B65 /* iOSDCJapan2022Logo.swift in Sources */, 97AD53242B70E48F0034FB5D /* PlayButton.swift in Sources */, @@ -648,6 +663,7 @@ 97E11E3F281971ED00B2AB32 /* CrayonEyeBall.swift in Sources */, 9748BE2C2893C428006DF0BE /* Bear.swift in Sources */, 97AD53292B7100670034FB5D /* ArtWorkModel.swift in Sources */, + 97EF439C2B7421A7003648F5 /* MagicianPreviewView.swift in Sources */, 973B2CA428C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift in Sources */, 97E11E462819734700B2AB32 /* CrayonBoy.swift in Sources */, 97E11E3B281971ED00B2AB32 /* CrayonEyes.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView.swift new file mode 100644 index 0000000..cb5f098 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView.swift @@ -0,0 +1,328 @@ +// +// MagicianArtView.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +struct MagicianArtView: View { + + @Environment(ArtWorkModel.self) var model + @State private var isAnimating = false + + var body: some View { + ZStack { + + // MARK: - 􀠒 Outline + ArtComponentView( + name: "drop.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .second(.first)), + offsetY: model.calculatingInitialOffsetY(forPosition: .second(.first)) + ), + finalValue: .init( + primaryColor: .paleOrange, + width: model.calculatingProportionalValue(withRatio: 0.5), + height: model.calculatingProportionalValue(withRatio: 0.75), + rotationDegrees: 180, + offsetY: model.calculatingProportionalValue(withRatio: 0.15) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: 0.001 + ) + + // MARK: - 􀏄 Hat band + ArtComponentView( + name: "rectangle.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .second(.second)), + offsetY: model.calculatingInitialOffsetY(forPosition: .second(.second)) + ), + finalValue: .init( + primaryColor: .red, + width: model.calculatingProportionalValue(withRatio: 0.446), + height: model.calculatingProportionalValue(withRatio: 0.1), + offsetX: model.calculatingProportionalValue(withRatio: 0.01), + offsetY: model.calculatingProportionalValue(withRatio: -0.15) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 1) + ) + + // MARK: - 􀈮 Hat + ArtComponentView( + name: "archivebox.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.first)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.first)) + ), + finalValue: .init( + width: model.calculatingProportionalValue(withRatio: 0.525), + height: model.calculatingProportionalValue(withRatio: 0.525), + rotationDegrees: 180, + offsetY: model.calculatingProportionalValue(withRatio: -0.25) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 2) + ) + + // MARK: - 􀏄 Hat brim + ArtComponentView( + name: "rectangle.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .second(.second)), + offsetY: model.calculatingInitialOffsetY(forPosition: .second(.second)) + ), + finalValue: .init( + width: model.calculatingProportionalValue(withRatio: 0.625), + height: model.calculatingProportionalValue(withRatio: 0.125), + offsetY: model.calculatingProportionalValue(withRatio: -0.05) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 3) + ) + + // MARK: - 􀆐 Eyebrow + ArtComponentView( + name: "chevron.compact.up", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.second)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.second)) + ), + finalValue: .init( + fontWeight: .thin, + width: model.calculatingProportionalValue(withRatio: 0.1), + height: model.calculatingProportionalValue(withRatio: 0.04), + offsetX: model.calculatingProportionalValue(withRatio: 0.1), + offsetY: model.calculatingProportionalValue(withRatio: 0.03) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 4) + ) + + ArtComponentView( + name: "chevron.compact.up", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.second)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.second)) + ), + finalValue: .init( + fontWeight: .thin, + width: model.calculatingProportionalValue(withRatio: 0.1), + height: model.calculatingProportionalValue(withRatio: 0.04), + offsetX: model.calculatingProportionalValue(withRatio: -0.1), + offsetY: model.calculatingProportionalValue(withRatio: 0.03) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 4) + ) + + // MARK: - 􀅽 Sunglasses frame + ArtComponentView( + name: "minus", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.third)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.third)) + ), + finalValue: .init( + fontWeight: .thin, + width: model.calculatingProportionalValue(withRatio: 0.06), + height: model.calculatingProportionalValue(withRatio: 0.0125), + offsetY: model.calculatingProportionalValue(withRatio: 0.12) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 5) + ) + + ArtComponentView( + name: "minus", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.third)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.third)) + ), + finalValue: .init( + fontWeight: .thin, + width: model.calculatingProportionalValue(withRatio: 0.06), + height: model.calculatingProportionalValue(withRatio: 0.0125), + offsetX: model.calculatingProportionalValue(withRatio: 0.2), + offsetY: model.calculatingProportionalValue(withRatio: 0.12) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 5) + ) + + ArtComponentView( + name: "minus", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.third)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.third)) + ), + finalValue: .init( + fontWeight: .thin, + width: model.calculatingProportionalValue(withRatio: 0.04), + height: model.calculatingProportionalValue(withRatio: 0.0125), + offsetX: model.calculatingProportionalValue(withRatio: -0.2), + offsetY: model.calculatingProportionalValue(withRatio: 0.12) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 5) + ) + + // MARK: - 􀆼 Sunglasses lens + ArtComponentView( + name: "moon.circle.fill", + initialValue: .init( + primaryColor: .white, + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.fourth)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.fourth)) + ), + finalValue: .init( + primaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.125), + height: model.calculatingProportionalValue(withRatio: 0.125), + offsetX: model.calculatingProportionalValue(withRatio: 0.1), + offsetY: model.calculatingProportionalValue(withRatio: 0.12) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 6) + ) + + ArtComponentView( + name: "moon.circle.fill", + initialValue: .init( + primaryColor: .white, + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.fourth)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.fourth)) + ), + finalValue: .init( + primaryColor: .white, + secondaryColor: .black, + width: model.calculatingProportionalValue(withRatio: 0.125), + height: model.calculatingProportionalValue(withRatio: 0.125), + offsetX: model.calculatingProportionalValue(withRatio: -0.1), + offsetY: model.calculatingProportionalValue(withRatio: 0.12) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 6) + ) + + // MARK: - 􀇈 Nose + ArtComponentView( + name: "cloud.heavyrain", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.fifth)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.fifth)) + ), + finalValue: .init( + fontWeight: .light, + width: model.calculatingProportionalValue(withRatio: 0.15), + height: model.calculatingProportionalValue(withRatio: 0.15), + offsetX: model.calculatingProportionalValue(withRatio: 0.01), + offsetY: model.calculatingProportionalValue(withRatio: 0.27) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 7) + ) + + // MARK: - 􀩻 Inside mouth + ArtComponentView( + name: "button.roundedbottom.horizontal.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.sixth)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.sixth)) + ), + finalValue: .init( + primaryColor: .red, + width: model.calculatingProportionalValue(withRatio: 0.15), + height: model.calculatingProportionalValue(withRatio: 0.075), + offsetX: model.calculatingProportionalValue(withRatio: 0.01), + offsetY: model.calculatingProportionalValue(withRatio: 0.4) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 8) + ) + + // MARK: - 􀝷 Tongue capsule.fill + ArtComponentView( + name: "capsule.fill", + initialValue: .init( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.seventh)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.seventh)) + ), + finalValue: .init( + primaryColor: .orange, + width: model.calculatingProportionalValue(withRatio: 0.145), + height: model.calculatingProportionalValue(withRatio: 0.025), + offsetX: model.calculatingProportionalValue(withRatio: 0.01), + offsetY: model.calculatingProportionalValue(withRatio: 0.424) + ), + isAnimating: isAnimating, + animationDuration: model.animationDurationPerSymbol, + waitingTime: model.waitingTime(forCount: 9) + ) + } + .navigationTitle("Magician") + .navigationBarTitleDisplayMode(.inline) + .toolbar(content: { + ToolbarItemGroup(placement: .bottomBar) { + Spacer() + + PlayButton { + isAnimating = true + } + .font(.system(size: 32)) + .disabled(isAnimating) + } + }) + } +} + +#Preview { + NavigationStack { + MagicianArtView() + .environment(ArtWorkModel.preview) + } +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianPreviewView.swift new file mode 100644 index 0000000..8ed1f90 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianPreviewView.swift @@ -0,0 +1,174 @@ +// +// MagicianPreviewView.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +struct MagicianPreviewView: View { + + @Environment(ArtWorkModel.self) var model + + var body: some View { + ZStack { + + // MARK: - 􀠒 Outline + Image(systemName: "drop.fill") + .resizable() + .foregroundStyle(.paleOrange) + .frame(width: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.75, forPreview: true)) + .rotationEffect(.degrees(180)) + .offset(y: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true)) + + // MARK: - 􀏄 Hat band + Image(systemName: "rectangle.fill") + .resizable() + .foregroundStyle(.red) + .frame(width: model.calculatingProportionalValue(withRatio: 0.446, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), + y: model.calculatingProportionalValue(withRatio: -0.15, forPreview: true)) + + // MARK: - 􀈮 Hat + Image(systemName: "archivebox.fill") + .resizable() + .foregroundStyle(.black) + .frame(width: model.calculatingProportionalValue(withRatio: 0.525, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.525, forPreview: true)) + .rotationEffect(.degrees(180)) + .offset(y: model.calculatingProportionalValue(withRatio: -0.25, forPreview: true)) + + // MARK: - 􀏄 Hat brim + Image(systemName: "rectangle.fill") + .resizable() + .foregroundStyle(.black) + .frame(width: model.calculatingProportionalValue(withRatio: 0.625, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true)) + .offset(y: model.calculatingProportionalValue(withRatio: -0.05, forPreview: true)) + + // MARK: - 􀆐 Eyebrow + Image(systemName: "chevron.compact.up") + .resizable() + .foregroundStyle(.black) + .fontWeight(.thin) + .frame(width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true)) + + Image(systemName: "chevron.compact.up") + .resizable() + .foregroundStyle(.black) + .fontWeight(.thin) + .frame(width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.1, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true)) + + // MARK: - 􀅽 Sunglasses frame + Image(systemName: "minus") + .resizable() + .foregroundStyle(.black) + .fontWeight(.thin) + .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.0125, forPreview: true)) + .offset(y: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true)) + + Image(systemName: "minus") + .resizable() + .foregroundStyle(.black) + .fontWeight(.thin) + .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.0125, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true)) + + Image(systemName: "minus") + .resizable() + .foregroundStyle(.black) + .fontWeight(.thin) + .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.0125, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true)) + + // MARK: - 􀀁 Sunglasses inside lens + Image(systemName: "circle.fill") + .resizable() + .foregroundStyle(.white) + .frame(width: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true)) + + Image(systemName: "circle.fill") + .resizable() + .foregroundStyle(.white) + .frame(width: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.1, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true)) + + // MARK: - 􀆼 Sunglasses outside lens + Image(systemName: "moon.circle.fill") + .resizable() + .foregroundStyle(.black) + .frame(width: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true)) + + Image(systemName: "moon.circle.fill") + .resizable() + .foregroundStyle(.black) + .frame(width: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.1, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true)) + + Image(systemName: "moon.circle.fill") + .resizable() + .foregroundStyle(.black) + .frame(width: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.1, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true)) + + // MARK: - 􀇈 Nose + Image(systemName: "cloud.heavyrain") + .resizable() + .foregroundStyle(.black) + .fontWeight(.light) + .frame(width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.27, forPreview: true)) + + // MARK: - 􀩻 Inside mouth + Image(systemName: "button.roundedbottom.horizontal.fill") + .resizable() + .foregroundStyle(.red) + .frame(width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.075, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true)) + + // MARK: - 􀝷 Tongue capsule.fill + Image(systemName: "capsule.fill") + .resizable() + .foregroundStyle(.orange) + .frame(width: model.calculatingProportionalValue(withRatio: 0.145, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.025, forPreview: true)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), + y: model.calculatingProportionalValue(withRatio: 0.424, forPreview: true)) + } + } +} + +#Preview { + MagicianPreviewView() + .environment(ArtWorkModel.preview) +} From 1912fbe0e81e2b0720688f78e47f5a9879cfc365 Mon Sep 17 00:00:00 2001 From: littleossa Date: Thu, 8 Feb 2024 06:33:51 +0900 Subject: [PATCH 041/108] Update ArtGalleryView --- .../ArtGalleryView.swift | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift index dc48755..cf2b81c 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift @@ -25,20 +25,28 @@ struct ArtGalleryView: View { VStack { - Spacer() - .frame(height: 60) - - Text("SF Symbols Art") - .font(.largeTitle) - .bold() - - Text("is just the art created by combining SF Symbols") - + // Navigation pathの状態によって、この部分の表示非表示を切り替えれるか？ +// Spacer() +// .frame(height: 60) +// +// Text("SF Symbols Art") +// .font(.largeTitle) +// .bold() +// +// Text("is just the art created by combining SF Symbols") +// NavigationStack { ScrollView { LazyVGrid(columns: columns) { Group { + NavigationLink { + MagicianArtView() + } label: { + MagicianPreviewView() + .galleryGridItemView(length: model.galleryColumnLength) + } + NavigationLink { AfroBoyArtView() } label: { @@ -60,12 +68,6 @@ struct ArtGalleryView: View { .galleryGridItemView(length: model.galleryColumnLength) } - NavigationLink { - AfroBoyArtView() - } label: { - AfroBoyPreviewView() - } - NavigationLink { AfroBoyArtView() } label: { From bf0d7342d09b8aa0fc9ea088423eafba40f73f03 Mon Sep 17 00:00:00 2001 From: littleossa Date: Thu, 8 Feb 2024 09:52:10 +0900 Subject: [PATCH 042/108] Add Color+Extension systemBackground color --- SFSymbolsArtCollection.xcodeproj/project.pbxproj | 4 ++++ .../ArtisticWorldOfSFSymbols/Extensions/Color+.swift | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/Color+.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 4def53d..add7bb9 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -81,6 +81,7 @@ 97EF43952B72DA69003648F5 /* ImWearingPantsArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43942B72DA69003648F5 /* ImWearingPantsArtView.swift */; }; 97EF43982B733337003648F5 /* MagicianArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43972B733337003648F5 /* MagicianArtView.swift */; }; 97EF439C2B7421A7003648F5 /* MagicianPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF439B2B7421A7003648F5 /* MagicianPreviewView.swift */; }; + 97EF439E2B744C4C003648F5 /* Color+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF439D2B744C4C003648F5 /* Color+.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -159,6 +160,7 @@ 97EF43942B72DA69003648F5 /* ImWearingPantsArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImWearingPantsArtView.swift; sourceTree = ""; }; 97EF43972B733337003648F5 /* MagicianArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicianArtView.swift; sourceTree = ""; }; 97EF439B2B7421A7003648F5 /* MagicianPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicianPreviewView.swift; sourceTree = ""; }; + 97EF439D2B744C4C003648F5 /* Color+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+.swift"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -491,6 +493,7 @@ 97E11E412819727A00B2AB32 /* Extensions */ = { isa = PBXGroup; children = ( + 97EF439D2B744C4C003648F5 /* Color+.swift */, 97624C3228C4F43F004E1720 /* GeometryProxy+.swift */, 97AD53112B70DEB60034FB5D /* UIDevice+.swift */, 97AD53192B70E0530034FB5D /* Font.Weight+.swift */, @@ -611,6 +614,7 @@ buildActionMask = 2147483647; files = ( 97EF43932B72D3E2003648F5 /* ImWearingPantsPreviewView.swift in Sources */, + 97EF439E2B744C4C003648F5 /* Color+.swift in Sources */, 97624C2F28C2E608004E1720 /* SmallFirework.swift in Sources */, 9748BE232893B35A006DF0BE /* WorldPeace.swift in Sources */, 9748BE57289DCBB0006DF0BE /* LargeFirework.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/Color+.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/Color+.swift new file mode 100644 index 0000000..276e0b7 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/Color+.swift @@ -0,0 +1,12 @@ +// +// Color+.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension Color { + static let systemBackground: Color = .init(uiColor: .systemBackground) +} From 1c27e9054c6478bb2f8258a17c5066054075d486 Mon Sep 17 00:00:00 2001 From: littleossa Date: Thu, 8 Feb 2024 09:52:30 +0900 Subject: [PATCH 043/108] Refactor ArtComponentView --- .../ArtWorks/AfroBoy/AfroBoyArtView.swift | 77 +-- .../ImWearingPantsArtView.swift | 513 ++++++------------ .../ArtWorks/Magician/MagicianArtView.swift | 305 ++++------- .../ArtWorks/Nosebleed/NosebleedArtView.swift | 317 ++++------- .../ArtComponentView/ArtComponentView.swift | 126 ++++- 5 files changed, 484 insertions(+), 854 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift index f08c3c2..0830ad0 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift @@ -18,79 +18,48 @@ struct AfroBoyArtView: View { // MARK: - 􁝰 Hair ArtComponentView( name: "tree.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.first)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.first)) - ), - finalValue: .init( - width: model.calculatingProportionalValue(withRatio: 0.9), - height: model.calculatingProportionalValue(withRatio: 0.9) - ), + initialPosition: .third(.first), + widthRatio: 0.9, + heightRatio: 0.9, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: 0.001 + symbolCountToWaitFor: 0 ) // MARK: - 􀙧 Contour ArtComponentView( name: "shield.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.second)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.second)) - ), - finalValue: .init( - primaryColor: .paleOrange, - width: model.calculatingProportionalValue(withRatio: 0.5), - height: model.calculatingProportionalValue(withRatio: 0.6), - offsetY: model.calculatingProportionalValue(withRatio: 0.17) - ), + initialPosition: .third(.second), + primaryColor: .paleOrange, + widthRatio: 0.5, + heightRatio: 0.6, + verticalOffsetRatio: 0.17, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 1) + symbolCountToWaitFor: 1 ) // MARK: - 􀎽 Face ArtComponentView( name: "faceid", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.third)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.third)) - ), - finalValue: .init( - secondaryColor: .paleOrange, - width: model.calculatingProportionalValue(withRatio: 0.3), - height: model.calculatingProportionalValue(withRatio: 0.3), - offsetY: model.calculatingProportionalValue(withRatio: 0.16) - ), + initialPosition: .third(.third), + secondaryColor: .paleOrange, + widthRatio: 0.3, + heightRatio: 0.3, + verticalOffsetRatio: 0.16, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 2) + symbolCountToWaitFor: 2 ) // MARK: - 􀦉 Comb ArtComponentView( name: "comb.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.fourth)) - ), - finalValue: .init( - primaryColor: .red, - width: model.calculatingProportionalValue(withRatio: 0.2), - height: model.calculatingProportionalValue(withRatio: 0.2), - offsetX: model.calculatingProportionalValue(withRatio: -0.2), - offsetY: model.calculatingProportionalValue(withRatio: -0.2) - ), + initialPosition: .third(.fourth), + primaryColor: .red, + widthRatio: 0.2, + heightRatio: 0.2, + horizontalOffsetRatio: -0.2, + verticalOffsetRatio: -0.2, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 3) + symbolCountToWaitFor: 3 ) } .navigationTitle("Afro boy") diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift index 74298d9..a67b230 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift @@ -66,20 +66,12 @@ struct ImWearingPantsArtView: View { // MARK: - Current pose ArtComponentView( name: currentPose.rawValue, - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.second)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.second)) - ), - finalValue: .init( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.6), - height: model.calculatingProportionalValue(withRatio: 1) - ), + initialPosition: .third(.second), + primaryColor: .yellow, + widthRatio: 0.6, + heightRatio: 1, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 10) + symbolCountToWaitFor: 10 ) .contentTransition(isChangingPose ? .symbolEffect(.replace) : .identity) .offset(x: model.calculatingProportionalValue(withRatio: currentPose.offsetXRatio)) @@ -87,23 +79,15 @@ struct ImWearingPantsArtView: View { // MARK: - 􁉨 Pants ArtComponentView( name: "parkingsign.steeringwheel", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.first)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.first)) - ), - finalValue: .init( - primaryColor: .palePink, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.35), - height: model.calculatingProportionalValue(withRatio: 0.2), - offsetX: model.calculatingProportionalValue(withRatio: -0.07), - offsetY: model.calculatingProportionalValue(withRatio: 0.03) - ), + initialPosition: .third(.first), + primaryColor: .palePink, + fontWeight: .ultraLight, + widthRatio: 0.35, + heightRatio: 0.2, + horizontalOffsetRatio: -0.07, + verticalOffsetRatio: 0.03, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 16) + symbolCountToWaitFor: 16 ) .zIndex(0.1) @@ -341,444 +325,277 @@ struct ImWearingPantsArtView: View { // MARK: - 􀑪 Music ArtComponentView( name: "music.note", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .second(.first)), - offsetY: model.calculatingInitialOffsetY(forPosition: .second(.first)) - ), - finalValue: .init( - width: model.calculatingProportionalValue(withRatio: 0.1), - height: model.calculatingProportionalValue(withRatio: 0.15), - offsetX: model.calculatingProportionalValue(withRatio: 0.35), - offsetY: model.calculatingProportionalValue(withRatio: -0.5) - ), + initialPosition: .second(.first), + widthRatio: 0.1, + heightRatio: 0.15, + horizontalOffsetRatio: 0.35, + verticalOffsetRatio: -0.5, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: 0.001 + symbolCountToWaitFor: 0 ) .symbolEffect(.bounce, value: musicCount) // MARK: - 􀫀 Music 3 ArtComponentView( name: "music.quarternote.3", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .second(.second)), - offsetY: model.calculatingInitialOffsetY(forPosition: .second(.second)) - ), - finalValue: .init( - width: model.calculatingProportionalValue(withRatio: 0.2), - height: model.calculatingProportionalValue(withRatio: 0.15), - offsetX: model.calculatingProportionalValue(withRatio: -0.34), - offsetY: model.calculatingProportionalValue(withRatio: -0.38) - ), + initialPosition: .second(.second), + widthRatio: 0.2, + heightRatio: 0.15, + horizontalOffsetRatio: -0.34, + verticalOffsetRatio: -0.38, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 1) + symbolCountToWaitFor: 1 ) .symbolEffect(.bounce, value: musicCount) // MARK: - 􀀁 Face background ArtComponentView( name: "circle.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .second(.third)), - offsetY: model.calculatingInitialOffsetY(forPosition: .second(.third)) - ), - finalValue: .init( - primaryColor: Color(uiColor: .systemBackground), - width: model.calculatingProportionalValue(withRatio: 0.2), - height: model.calculatingProportionalValue(withRatio: 0.2), - offsetY: model.calculatingProportionalValue(withRatio: -0.4) - ), + initialPosition: .second(.third), + primaryColor: .systemBackground, + widthRatio: 0.2, + heightRatio: 0.2, + verticalOffsetRatio: -0.4, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 2) + symbolCountToWaitFor: 2 ) // MARK: - 􀧷 Contour ArtComponentView( name: "capsule.portrait.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetY: model.calculatingInitialOffsetY(forPosition: .second(.fourth)) - ), - finalValue: .init( - primaryColor: .yellow, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.16), - height: model.calculatingProportionalValue(withRatio: 0.22), - offsetY: model.calculatingProportionalValue(withRatio: -0.4) - ), + initialPosition: .second(.fourth), + primaryColor: .yellow, + fontWeight: .ultraLight, + widthRatio: 0.16, + heightRatio: 0.22, + verticalOffsetRatio: -0.4, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 2) + symbolCountToWaitFor: 2 ) // MARK: - 􀧷 Contour bottom ArtComponentView( name: "capsule.portrait.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetY: model.calculatingInitialOffsetY(forPosition: .second(.fourth)) - ), - finalValue: .init( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.1), - height: model.calculatingProportionalValue(withRatio: 0.16), - offsetY: model.calculatingProportionalValue(withRatio: -0.35) - ), + initialPosition: .second(.fourth), + primaryColor: .yellow, + widthRatio: 0.1, + heightRatio: 0.16, + verticalOffsetRatio: -0.35, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 3) + symbolCountToWaitFor: 3 ) // MARK: - 􀨯 nose ArtComponentView( name: "nose", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .second(.fifth)), - offsetY: model.calculatingInitialOffsetY(forPosition: .second(.fifth)) - ), - finalValue: .init( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.045), - height: model.calculatingProportionalValue(withRatio: 0.06), - offsetY: model.calculatingProportionalValue(withRatio: -0.38) - ), + initialPosition: .second(.fifth), + fontWeight: .ultraLight, + widthRatio: 0.045, + heightRatio: 0.06, + verticalOffsetRatio: -0.38, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 4) + symbolCountToWaitFor: 4 ) // MARK: - 􀦭 Right eyebrow ArtComponentView( name: "eyebrow", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .second(.sixth)), - offsetY: model.calculatingInitialOffsetY(forPosition: .second(.sixth)) - ), - finalValue: .init( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.04), - height: model.calculatingProportionalValue(withRatio: 0.04), - rotationDegrees: 10, - offsetX: model.calculatingProportionalValue(withRatio: 0.03), - offsetY: model.calculatingProportionalValue(withRatio: -0.41) - ), + initialPosition: .second(.sixth), + fontWeight: .ultraLight, + widthRatio: 0.04, + heightRatio: 0.04, + horizontalOffsetRatio: 0.03, + verticalOffsetRatio: -0.41, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 5) + symbolCountToWaitFor: 5 ) // MARK: - 􀦭 Left eyebrow ArtComponentView( name: "eyebrow", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .second(.sixth)), - offsetY: model.calculatingInitialOffsetY(forPosition: .second(.sixth)) - ), - finalValue: .init( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.045), - height: model.calculatingProportionalValue(withRatio: 0.04), - rotationDegrees: 180, - rotationAxis: (x: 0, y: 1, z: 0), - offsetX: model.calculatingProportionalValue(withRatio: -0.03), - offsetY: model.calculatingProportionalValue(withRatio: -0.408) - ), + initialPosition: .second(.sixth), + fontWeight: .ultraLight, + widthRatio: 0.045, + heightRatio: 0.04, + rotationDegrees: 180, + rotationAxis: (x: 0, y: 1, z: 0), + horizontalOffsetRatio: -0.03, + verticalOffsetRatio: -0.408, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 5) + symbolCountToWaitFor: 5 ) // MARK: - 􀧷 Concealing part for eyebrow ArtComponentView( name: "capsule.portrait.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .second(.fourth)), - offsetY: model.calculatingInitialOffsetY(forPosition: .second(.fourth)) - ), - finalValue: .init( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.05), - height: model.calculatingProportionalValue(withRatio: 0.02), - rotationDegrees: -10, - offsetX: model.calculatingProportionalValue(withRatio: -0.035), - offsetY: model.calculatingProportionalValue(withRatio: -0.396) - ), + initialPosition: .second(.fourth), + primaryColor: .yellow, + widthRatio: 0.05, + heightRatio: 0.02, + rotationDegrees: -10, + horizontalOffsetRatio: -0.035, + verticalOffsetRatio: -0.396, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 5) + symbolCountToWaitFor: 5 ) ArtComponentView( name: "capsule.portrait.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .second(.fourth)), - offsetY: model.calculatingInitialOffsetY(forPosition: .second(.fourth)) - ), - finalValue: .init( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.05), - height: model.calculatingProportionalValue(withRatio: 0.02), - rotationDegrees: 10, - offsetX: model.calculatingProportionalValue(withRatio: 0.035), - offsetY: model.calculatingProportionalValue(withRatio: -0.396) - ), + initialPosition: .second(.fourth), + primaryColor: .yellow, + widthRatio: 0.05, + heightRatio: 0.02, + rotationDegrees: 10, + horizontalOffsetRatio: 0.035, + verticalOffsetRatio: -0.396, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 5) + symbolCountToWaitFor: 5 ) // MARK: - 􀋭 Right eye ArtComponentView( name: "eye", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .second(.seventh)), - offsetY: model.calculatingInitialOffsetY(forPosition: .second(.seventh)) - ), - finalValue: .init( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.04), - height: model.calculatingProportionalValue(withRatio: 0.02), - offsetX: model.calculatingProportionalValue(withRatio: 0.03), - offsetY: model.calculatingProportionalValue(withRatio: -0.4) - ), + initialPosition: .second(.seventh), + fontWeight: .ultraLight, + widthRatio: 0.04, + heightRatio: 0.02, + horizontalOffsetRatio: 0.03, + verticalOffsetRatio: -0.4, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 6) + symbolCountToWaitFor: 6 ) // MARK: - 􀋭 Left eye ArtComponentView( name: "eye", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .second(.seventh)), - offsetY: model.calculatingInitialOffsetY(forPosition: .second(.seventh)) - ), - finalValue: .init( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.04), - height: model.calculatingProportionalValue(withRatio: 0.02), - offsetX: model.calculatingProportionalValue(withRatio: -0.03), - offsetY: model.calculatingProportionalValue(withRatio: -0.4) - ), + initialPosition: .second(.seventh), + fontWeight: .ultraLight, + widthRatio: 0.04, + heightRatio: 0.02, + horizontalOffsetRatio: -0.03, + verticalOffsetRatio: -0.4, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 6) + symbolCountToWaitFor: 6 ) // MARK: - 􀋮 Right eye.fill ArtComponentView( name: "eye.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.seventh)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.seventh)) - ), - finalValue: .init( - primaryColor: .white, - width: model.calculatingProportionalValue(withRatio: 0.04), - height: model.calculatingProportionalValue(withRatio: 0.02), - offsetX: model.calculatingProportionalValue(withRatio: 0.03), - offsetY: model.calculatingProportionalValue(withRatio: -0.4) - ), + initialPosition: .third(.seventh), + primaryColor: .white, + widthRatio: 0.04, + heightRatio: 0.02, + horizontalOffsetRatio: 0.03, + verticalOffsetRatio: -0.4, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 6) + symbolCountToWaitFor: 6 ) // MARK: - 􀋮 Left eye.fill ArtComponentView( name: "eye.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.seventh)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.seventh)) - ), - finalValue: .init( - primaryColor: .white, - width: model.calculatingProportionalValue(withRatio: 0.04), - height: model.calculatingProportionalValue(withRatio: 0.02), - offsetX: model.calculatingProportionalValue(withRatio: -0.03), - offsetY: model.calculatingProportionalValue(withRatio: -0.4) - ), + initialPosition: .third(.seventh), + primaryColor: .white, + widthRatio: 0.04, + heightRatio: 0.02, + horizontalOffsetRatio: -0.03, + verticalOffsetRatio: -0.4, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 6) + symbolCountToWaitFor: 6 ) // MARK: - 􀦪 Mouth ArtComponentView( name: "mouth.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.third)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.third)) - ), - finalValue: .init( - primaryColor: .red, - width: model.calculatingProportionalValue(withRatio: 0.06), - height: model.calculatingProportionalValue(withRatio: 0.02), - offsetY: model.calculatingProportionalValue(withRatio: -0.32) - ), + initialPosition: .third(.third), + primaryColor: .red, + widthRatio: 0.06, + heightRatio: 0.02, + verticalOffsetRatio: -0.32, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 7) + symbolCountToWaitFor: 7 ) ArtComponentView( name: "mouth.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.third)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.third)) - ), - finalValue: .init( - primaryColor: .red, - width: model.calculatingProportionalValue(withRatio: 0.06), - height: model.calculatingProportionalValue(withRatio: 0.02), - offsetY: model.calculatingProportionalValue(withRatio: -0.33) - ), + initialPosition: .third(.third), + primaryColor: .red, + widthRatio: 0.06, + heightRatio: 0.02, + verticalOffsetRatio: -0.33, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 7) + symbolCountToWaitFor: 7 ) // MARK: - 􁒀 Teeth ArtComponentView( name: "window.casement.closed", - initialValue: .init( - secondaryColor: .clear, - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.fourth)) - ), - finalValue: .init( - primaryColor: .black, - secondaryColor: .white, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.015), - height: model.calculatingProportionalValue(withRatio: 0.029), - rotationDegrees: 90, - offsetX: model.calculatingProportionalValue(withRatio: 0.013), - offsetY: model.calculatingProportionalValue(withRatio: -0.328) - ), + initialSecondaryColor: .clear, + initialPosition: .third(.fourth), + secondaryColor: .white, + fontWeight: .ultraLight, + widthRatio: 0.015, + heightRatio: 0.029, + rotationDegrees: 90, + horizontalOffsetRatio: 0.013, + verticalOffsetRatio: -0.328, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 8) + symbolCountToWaitFor: 8 ) ArtComponentView( name: "window.casement.closed", - initialValue: .init( - secondaryColor: .clear, - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.fourth)) - ), - finalValue: .init( - primaryColor: .black, - secondaryColor: .white, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.015), - height: model.calculatingProportionalValue(withRatio: 0.029), - rotationDegrees: 90, - offsetX: model.calculatingProportionalValue(withRatio: -0.014), - offsetY: model.calculatingProportionalValue(withRatio: -0.328) - ), + initialSecondaryColor: .clear, + initialPosition: .third(.fourth), + secondaryColor: .white, + fontWeight: .ultraLight, + widthRatio: 0.015, + heightRatio: 0.029, + rotationDegrees: 90, + horizontalOffsetRatio: -0.014, + verticalOffsetRatio: -0.328, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 8) + symbolCountToWaitFor: 8 ) // MARK: - 􀲟 Hair ArtComponentView( name: "oval.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.fifth)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.fifth)) - ), - finalValue: .init( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.14), - height: model.calculatingProportionalValue(withRatio: 0.057), - offsetX: model.calculatingProportionalValue(withRatio: -0.001), - offsetY: model.calculatingProportionalValue(withRatio: -0.49) - ), + initialPosition: .third(.fifth), + fontWeight: .ultraLight, + widthRatio: 0.14, + heightRatio: 0.057, + horizontalOffsetRatio: -0.001, + verticalOffsetRatio: -0.49, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 9) + symbolCountToWaitFor: 9 ) // MARK: - 􀠒 Hair ArtComponentView( name: "drop.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.sixth)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.sixth)) - ), - finalValue: .init( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.05), - height: model.calculatingProportionalValue(withRatio: 0.06), - rotationDegrees: -65, - offsetX: model.calculatingProportionalValue(withRatio: 0.04), - offsetY: model.calculatingProportionalValue(withRatio: -0.48) - ), + initialPosition: .third(.sixth), + fontWeight: .ultraLight, + widthRatio: 0.05, + heightRatio: 0.06, + rotationDegrees: -65, + horizontalOffsetRatio: 0.04, + verticalOffsetRatio: -0.48, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 9) + symbolCountToWaitFor: 9 ) ArtComponentView( name: "drop.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.sixth)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.sixth)) - ), - finalValue: .init( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.05), - height: model.calculatingProportionalValue(withRatio: 0.1), - rotationDegrees: 95, - offsetX: model.calculatingProportionalValue(withRatio: -0.03), - offsetY: model.calculatingProportionalValue(withRatio: -0.47) - ), + initialPosition: .third(.sixth), + fontWeight: .ultraLight, + widthRatio: 0.05, + heightRatio: 0.1, + rotationDegrees: 95, + horizontalOffsetRatio: -0.03, + verticalOffsetRatio: -0.47, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 9) + symbolCountToWaitFor: 9 ) } .navigationTitle("I'm wearing pants") diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView.swift index cb5f098..2a8ed50 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView.swift @@ -18,290 +18,177 @@ struct MagicianArtView: View { // MARK: - 􀠒 Outline ArtComponentView( name: "drop.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .second(.first)), - offsetY: model.calculatingInitialOffsetY(forPosition: .second(.first)) - ), - finalValue: .init( - primaryColor: .paleOrange, - width: model.calculatingProportionalValue(withRatio: 0.5), - height: model.calculatingProportionalValue(withRatio: 0.75), - rotationDegrees: 180, - offsetY: model.calculatingProportionalValue(withRatio: 0.15) - ), + initialPosition: .second(.first), + primaryColor: .paleOrange, + widthRatio: 0.5, + heightRatio: 0.75, + rotationDegrees: 180, + verticalOffsetRatio: 0.15, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: 0.001 + symbolCountToWaitFor: 0 ) // MARK: - 􀏄 Hat band ArtComponentView( name: "rectangle.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .second(.second)), - offsetY: model.calculatingInitialOffsetY(forPosition: .second(.second)) - ), - finalValue: .init( - primaryColor: .red, - width: model.calculatingProportionalValue(withRatio: 0.446), - height: model.calculatingProportionalValue(withRatio: 0.1), - offsetX: model.calculatingProportionalValue(withRatio: 0.01), - offsetY: model.calculatingProportionalValue(withRatio: -0.15) - ), + initialPosition: .second(.second), + primaryColor: .red, + widthRatio: 0.446, + heightRatio: 0.1, + horizontalOffsetRatio: 0.01, + verticalOffsetRatio: -0.15, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 1) + symbolCountToWaitFor: 1 ) // MARK: - 􀈮 Hat ArtComponentView( name: "archivebox.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.first)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.first)) - ), - finalValue: .init( - width: model.calculatingProportionalValue(withRatio: 0.525), - height: model.calculatingProportionalValue(withRatio: 0.525), - rotationDegrees: 180, - offsetY: model.calculatingProportionalValue(withRatio: -0.25) - ), + initialPosition: .third(.first), + widthRatio: 0.525, + heightRatio: 0.525, + rotationDegrees: 180, + verticalOffsetRatio: -0.25, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 2) + symbolCountToWaitFor: 2 ) // MARK: - 􀏄 Hat brim ArtComponentView( name: "rectangle.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .second(.second)), - offsetY: model.calculatingInitialOffsetY(forPosition: .second(.second)) - ), - finalValue: .init( - width: model.calculatingProportionalValue(withRatio: 0.625), - height: model.calculatingProportionalValue(withRatio: 0.125), - offsetY: model.calculatingProportionalValue(withRatio: -0.05) - ), + initialPosition: .second(.second), + widthRatio: 0.625, + heightRatio: 0.125, + verticalOffsetRatio: -0.05, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 3) + symbolCountToWaitFor: 3 ) // MARK: - 􀆐 Eyebrow ArtComponentView( name: "chevron.compact.up", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.second)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.second)) - ), - finalValue: .init( - fontWeight: .thin, - width: model.calculatingProportionalValue(withRatio: 0.1), - height: model.calculatingProportionalValue(withRatio: 0.04), - offsetX: model.calculatingProportionalValue(withRatio: 0.1), - offsetY: model.calculatingProportionalValue(withRatio: 0.03) - ), + initialPosition: .third(.second), + fontWeight: .thin, + widthRatio: 0.1, + heightRatio: 0.04, + horizontalOffsetRatio: 0.1, + verticalOffsetRatio: 0.03, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 4) + symbolCountToWaitFor: 4 ) ArtComponentView( name: "chevron.compact.up", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.second)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.second)) - ), - finalValue: .init( - fontWeight: .thin, - width: model.calculatingProportionalValue(withRatio: 0.1), - height: model.calculatingProportionalValue(withRatio: 0.04), - offsetX: model.calculatingProportionalValue(withRatio: -0.1), - offsetY: model.calculatingProportionalValue(withRatio: 0.03) - ), + initialPosition: .third(.second), + fontWeight: .thin, + widthRatio: 0.1, + heightRatio: 0.04, + horizontalOffsetRatio: -0.1, + verticalOffsetRatio: 0.03, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 4) + symbolCountToWaitFor: 4 ) // MARK: - 􀅽 Sunglasses frame ArtComponentView( name: "minus", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.third)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.third)) - ), - finalValue: .init( - fontWeight: .thin, - width: model.calculatingProportionalValue(withRatio: 0.06), - height: model.calculatingProportionalValue(withRatio: 0.0125), - offsetY: model.calculatingProportionalValue(withRatio: 0.12) - ), + initialPosition: .third(.third), + fontWeight: .thin, + widthRatio: 0.06, + heightRatio: 0.0125, + verticalOffsetRatio: 0.12, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 5) + symbolCountToWaitFor: 5 ) ArtComponentView( name: "minus", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.third)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.third)) - ), - finalValue: .init( - fontWeight: .thin, - width: model.calculatingProportionalValue(withRatio: 0.06), - height: model.calculatingProportionalValue(withRatio: 0.0125), - offsetX: model.calculatingProportionalValue(withRatio: 0.2), - offsetY: model.calculatingProportionalValue(withRatio: 0.12) - ), + initialPosition: .third(.third), + fontWeight: .thin, + widthRatio: 0.06, + heightRatio: 0.0125, + horizontalOffsetRatio: 0.2, + verticalOffsetRatio: 0.12, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 5) + symbolCountToWaitFor: 5 ) ArtComponentView( name: "minus", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.third)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.third)) - ), - finalValue: .init( - fontWeight: .thin, - width: model.calculatingProportionalValue(withRatio: 0.04), - height: model.calculatingProportionalValue(withRatio: 0.0125), - offsetX: model.calculatingProportionalValue(withRatio: -0.2), - offsetY: model.calculatingProportionalValue(withRatio: 0.12) - ), + initialPosition: .third(.third), + fontWeight: .thin, + widthRatio: 0.04, + heightRatio: 0.0125, + horizontalOffsetRatio: -0.2, + verticalOffsetRatio: 0.12, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 5) + symbolCountToWaitFor: 5 ) // MARK: - 􀆼 Sunglasses lens ArtComponentView( name: "moon.circle.fill", - initialValue: .init( - primaryColor: .white, - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.fourth)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.fourth)) - ), - finalValue: .init( - primaryColor: .white, - width: model.calculatingProportionalValue(withRatio: 0.125), - height: model.calculatingProportionalValue(withRatio: 0.125), - offsetX: model.calculatingProportionalValue(withRatio: 0.1), - offsetY: model.calculatingProportionalValue(withRatio: 0.12) - ), + initialPrimaryColor: .white, + initialPosition: .third(.fourth), + primaryColor: .white, + widthRatio: 0.125, + heightRatio: 0.125, + horizontalOffsetRatio: 0.1, + verticalOffsetRatio: 0.12, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 6) + symbolCountToWaitFor: 6 ) ArtComponentView( name: "moon.circle.fill", - initialValue: .init( - primaryColor: .white, - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.fourth)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.fourth)) - ), - finalValue: .init( - primaryColor: .white, - secondaryColor: .black, - width: model.calculatingProportionalValue(withRatio: 0.125), - height: model.calculatingProportionalValue(withRatio: 0.125), - offsetX: model.calculatingProportionalValue(withRatio: -0.1), - offsetY: model.calculatingProportionalValue(withRatio: 0.12) - ), + initialPrimaryColor: .white, + initialPosition: .third(.fourth), + primaryColor: .white, + widthRatio: 0.125, + heightRatio: 0.125, + horizontalOffsetRatio: -0.1, + verticalOffsetRatio: 0.12, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 6) + symbolCountToWaitFor: 6 ) // MARK: - 􀇈 Nose ArtComponentView( name: "cloud.heavyrain", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.fifth)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.fifth)) - ), - finalValue: .init( - fontWeight: .light, - width: model.calculatingProportionalValue(withRatio: 0.15), - height: model.calculatingProportionalValue(withRatio: 0.15), - offsetX: model.calculatingProportionalValue(withRatio: 0.01), - offsetY: model.calculatingProportionalValue(withRatio: 0.27) - ), + initialPosition: .third(.fifth), + fontWeight: .light, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: 0.01, + verticalOffsetRatio: 0.27, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 7) + symbolCountToWaitFor: 7 ) // MARK: - 􀩻 Inside mouth ArtComponentView( name: "button.roundedbottom.horizontal.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.sixth)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.sixth)) - ), - finalValue: .init( - primaryColor: .red, - width: model.calculatingProportionalValue(withRatio: 0.15), - height: model.calculatingProportionalValue(withRatio: 0.075), - offsetX: model.calculatingProportionalValue(withRatio: 0.01), - offsetY: model.calculatingProportionalValue(withRatio: 0.4) - ), + initialPosition: .third(.sixth), + primaryColor: .red, + widthRatio: 0.15, + heightRatio: 0.075, + horizontalOffsetRatio: 0.01, + verticalOffsetRatio: 0.4, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 8) + symbolCountToWaitFor: 8 ) // MARK: - 􀝷 Tongue capsule.fill ArtComponentView( name: "capsule.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.seventh)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.seventh)) - ), - finalValue: .init( - primaryColor: .orange, - width: model.calculatingProportionalValue(withRatio: 0.145), - height: model.calculatingProportionalValue(withRatio: 0.025), - offsetX: model.calculatingProportionalValue(withRatio: 0.01), - offsetY: model.calculatingProportionalValue(withRatio: 0.424) - ), + initialPosition: .third(.seventh), + primaryColor: .orange, + widthRatio: 0.145, + heightRatio: 0.025, + horizontalOffsetRatio: 0.01, + verticalOffsetRatio: 0.424, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 9) + symbolCountToWaitFor: 9 ) } .navigationTitle("Magician") diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift index 0a0dc9d..be605d8 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift @@ -20,43 +20,26 @@ struct NosebleedArtView: View { // MARK: - 􀀁 Contour ArtComponentView( name: "circle.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.first)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.first)) - ), - finalValue: .init( - primaryColor: .awesomeYellow, - width: model.calculatingProportionalValue(withRatio: 0.65), - height: model.calculatingProportionalValue(withRatio: 0.65) - ), + initialPosition: .third(.first), + primaryColor: .awesomeYellow, + widthRatio: 0.65, + heightRatio: 0.65, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: 0.001 + symbolCountToWaitFor: 0 ) // MARK: - 􀭧 Nosebleed bottom ArtComponentView( name: "cellularbars", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.second)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.second)) - ), - finalValue: .init( - primaryColor: .red, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.2), - height: model.calculatingProportionalValue(withRatio: 0.5), - rotationDegrees: 180, - offsetX: model.calculatingProportionalValue(withRatio: 0.09), - offsetY: model.calculatingProportionalValue(withRatio: 0.074) - ), + initialPosition: .third(.second), + primaryColor: .red, + widthRatio: 0.2, + heightRatio: 0.5, + rotationDegrees: 180, + horizontalOffsetRatio: 0.09, + verticalOffsetRatio: 0.074, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 1) + symbolCountToWaitFor: 1 ) .symbolEffect(.variableColor.hideInactiveLayers, options: .speed(0.6).repeating, @@ -65,87 +48,55 @@ struct NosebleedArtView: View { // MARK: - 􀏄 Concealing part for nosebleed bottom ArtComponentView( name: "rectangle.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.third)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.third)) - ), - finalValue: .init( - primaryColor: .awesomeYellow, - width: model.calculatingProportionalValue(withRatio: 0.1), - height: model.calculatingProportionalValue(withRatio: 0.14), - offsetX: model.calculatingProportionalValue(withRatio: 0.09), - offsetY: model.calculatingProportionalValue(withRatio: 0.15) - ), + initialPosition: .third(.third), + primaryColor: .awesomeYellow, + widthRatio: 0.1, + heightRatio: 0.14, + horizontalOffsetRatio: 0.09, + verticalOffsetRatio: 0.15, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 2) + symbolCountToWaitFor: 2 ) // MARK: - 􀓩 Mouth ArtComponentView( name: "lasso", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.fourth)) - ), - finalValue: .init( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.4), - height: model.calculatingProportionalValue(withRatio: 0.3), - rotationDegrees: 170, - offsetX: model.calculatingProportionalValue(withRatio: 0.01), - offsetY: model.calculatingProportionalValue(withRatio: 0.05) - ), + initialPosition: .third(.fourth), + fontWeight: .ultraLight, + widthRatio: 0.4, + heightRatio: 0.3, + rotationDegrees: 170, + horizontalOffsetRatio: 0.01, + verticalOffsetRatio: 0.05, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 3) + symbolCountToWaitFor: 3 ) // MARK: - 􀏄 Concealing part for Mouth ArtComponentView( name: "rectangle.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.third)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.third)) - ), - finalValue: .init( - primaryColor: .awesomeYellow, - width: model.calculatingProportionalValue(withRatio: 0.5), - height: model.calculatingProportionalValue(withRatio: 0.3), - rotationDegrees: 176, - offsetY: model.calculatingProportionalValue(withRatio: -0.03) - ), + initialPosition: .third(.third), + primaryColor: .awesomeYellow, + widthRatio: 0.5, + heightRatio: 0.3, + rotationDegrees: 176, + verticalOffsetRatio: -0.03, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 4) + symbolCountToWaitFor: 4 ) // MARK: - 􀭧 Nosebleed top ArtComponentView( name: "cellularbars", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.second)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.second)) - ), - finalValue: .init( - primaryColor: .red, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.2), - height: model.calculatingProportionalValue(withRatio: 0.12), - rotationDegrees: 180, - offsetX: model.calculatingProportionalValue(withRatio: 0.033), - offsetY: model.calculatingProportionalValue(withRatio: 0.096) - ), + initialPosition: .third(.second), + primaryColor: .red, + widthRatio: 0.2, + heightRatio: 0.12, + rotationDegrees: 180, + horizontalOffsetRatio: 0.035, + verticalOffsetRatio: 0.097, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 5) + symbolCountToWaitFor: 5 ) .symbolEffect(.variableColor.hideInactiveLayers, options: .speed(0.6).repeating, @@ -154,172 +105,108 @@ struct NosebleedArtView: View { // MARK: - 􀏄 Concealing part for nosebleed top right ArtComponentView( name: "rectangle.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.third)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.third)) - ), - finalValue: .init( - primaryColor: .awesomeYellow, - width: model.calculatingProportionalValue(withRatio: 0.1), - height: model.calculatingProportionalValue(withRatio: 0.1), - offsetX: model.calculatingProportionalValue(withRatio: 0.09), - offsetY: model.calculatingProportionalValue(withRatio: 0.06) - ), + initialPosition: .third(.third), + primaryColor: .awesomeYellow, + widthRatio: 0.1, + heightRatio: 0.1, + horizontalOffsetRatio: 0.09, + verticalOffsetRatio: 0.06, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 6) + symbolCountToWaitFor: 6 ) // MARK: - 􀏄 Concealing part for nosebleed top left ArtComponentView( name: "rectangle.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.third)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.third)) - ), - finalValue: .init( - primaryColor: .awesomeYellow, - width: model.calculatingProportionalValue(withRatio: 0.03), - height: model.calculatingProportionalValue(withRatio: 0.14), - offsetX: model.calculatingProportionalValue(withRatio: -0.053), - offsetY: model.calculatingProportionalValue(withRatio: 0.09) - ), + initialPosition: .third(.third), + primaryColor: .awesomeYellow, + widthRatio: 0.04, + heightRatio: 0.14, + horizontalOffsetRatio: -0.047, + verticalOffsetRatio: 0.09, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 6) + symbolCountToWaitFor: 6 ) // MARK: - 􀀁 Right eye ArtComponentView( name: "circle.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.first)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.first)) - ), - finalValue: .init( - width: model.calculatingProportionalValue(withRatio: 0.06), - height: model.calculatingProportionalValue(withRatio: 0.06), - offsetX: model.calculatingProportionalValue(withRatio: 0.117), - offsetY: model.calculatingProportionalValue(withRatio: -0.176) - ), + initialPosition: .third(.first), + widthRatio: 0.06, + heightRatio: 0.06, + horizontalOffsetRatio: 0.117, + verticalOffsetRatio: -0.176, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 7) + symbolCountToWaitFor: 7 ) // MARK: - 􀀁 Left eye ArtComponentView( name: "circle.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.first)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.first)) - ), - finalValue: .init( - width: model.calculatingProportionalValue(withRatio: 0.06), - height: model.calculatingProportionalValue(withRatio: 0.06), - offsetX: model.calculatingProportionalValue(withRatio: -0.113), - offsetY: model.calculatingProportionalValue(withRatio: -0.17) - ), + initialPosition: .third(.first), + widthRatio: 0.06, + heightRatio: 0.06, + horizontalOffsetRatio: -0.113, + verticalOffsetRatio: -0.17, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 7) + symbolCountToWaitFor: 7 ) // MARK: - 􀥨 Tissue ArtComponentView( name: "doc.plaintext.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.fifth)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.fifth)) - ), - finalValue: .init( - primaryColor: .white, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.04), - height: model.calculatingProportionalValue(withRatio: 0.08), - rotationDegrees: 188, - offsetX: model.calculatingProportionalValue(withRatio: -0.052), - offsetY: model.calculatingProportionalValue(withRatio: 0.083) - ), + initialPosition: .third(.fifth), + primaryColor: .white, + fontWeight: .ultraLight, + widthRatio: 0.04, + heightRatio: 0.08, + rotationDegrees: 188, + horizontalOffsetRatio: -0.052, + verticalOffsetRatio: 0.083, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 8) + symbolCountToWaitFor: 8 ) // MARK: - 􀉆 Tissue frame ArtComponentView( name: "doc.plaintext", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.sixth)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.sixth)) - ), - finalValue: .init( - fontWeight: .light, - width: model.calculatingProportionalValue(withRatio: 0.04), - height: model.calculatingProportionalValue(withRatio: 0.08), - rotationDegrees: 188, - offsetX: model.calculatingProportionalValue(withRatio: -0.052), - offsetY: model.calculatingProportionalValue(withRatio: 0.083) - ), + initialPosition: .third(.sixth), + fontWeight: .light, + widthRatio: 0.04, + heightRatio: 0.08, + rotationDegrees: 188, + horizontalOffsetRatio: -0.052, + verticalOffsetRatio: 0.083, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 8) + symbolCountToWaitFor: 8 ) // MARK: - 􀥰 Nose ArtComponentView( name: "triangleshape", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.seventh)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.seventh)) - ), - finalValue: .init( - fontWeight: .light, - width: model.calculatingProportionalValue(withRatio: 0.15), - height: model.calculatingProportionalValue(withRatio: 0.14), - rotationDegrees: -4, - offsetX: model.calculatingProportionalValue(withRatio: -0.013), - offsetY: model.calculatingProportionalValue(withRatio: -0.02) - ), + initialPosition: .third(.seventh), + fontWeight: .light, + widthRatio: 0.15, + heightRatio: 0.14, + rotationDegrees: -4, + horizontalOffsetRatio: -0.013, + verticalOffsetRatio: -0.02, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 9) + symbolCountToWaitFor: 9 ) // MARK: - 􀏄 Concealing part for nose ArtComponentView( name: "rectangle.fill", - initialValue: .init( - width: model.initialSymbolLength, - height: model.initialSymbolLength, - offsetX: model.calculatingInitialOffsetX(forPosition: .third(.third)), - offsetY: model.calculatingInitialOffsetY(forPosition: .third(.third)) - ), - finalValue: .init( - primaryColor: .awesomeYellow, - width: model.calculatingProportionalValue(withRatio: 0.02), - height: model.calculatingProportionalValue(withRatio: 0.13), - rotationDegrees: 148, - offsetX: model.calculatingProportionalValue(withRatio: 0.007), - offsetY: model.calculatingProportionalValue(withRatio: -0.046) - ), + initialPosition: .third(.third), + primaryColor: .awesomeYellow, + widthRatio: 0.02, + heightRatio: 0.13, + rotationDegrees: 148, + horizontalOffsetRatio: 0.007, + verticalOffsetRatio: -0.046, isAnimating: isAnimating, - animationDuration: model.animationDurationPerSymbol, - waitingTime: model.waitingTime(forCount: 10) + symbolCountToWaitFor: 10 ) } .navigationTitle("Nosebleed") diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView/ArtComponentView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView/ArtComponentView.swift index 267bdde..2135e8e 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView/ArtComponentView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView/ArtComponentView.swift @@ -9,12 +9,89 @@ import SwiftUI struct ArtComponentView: View { + init( + name: String, + initialPrimaryColor: Color = .black, + initialSecondaryColor: Color = .black, + initialPosition: ArtWorkModel.InitialSymbolRow, + primaryColor: Color = .black, + secondaryColor: Color = .black, + fontWeight: Font.Weight = .regular, + widthRatio: CGFloat, + heightRatio: CGFloat, + rotationDegrees: CGFloat = 0, + rotationAxis: (x: CGFloat, y: CGFloat, z: CGFloat) = (x: 0, y: 0, z: 1), + horizontalOffsetRatio: CGFloat = 0, + verticalOffsetRatio: CGFloat = 0, + isAnimating: Bool, + symbolCountToWaitFor: Int + ) { + self.name = name + self.initialPrimaryColor = initialPrimaryColor + self.initialSecondaryColor = initialSecondaryColor + self.initialPosition = initialPosition + self.primaryColor = primaryColor + self.secondaryColor = secondaryColor + self.fontWeight = fontWeight + self.widthRatio = widthRatio + self.heightRatio = heightRatio + self.rotationDegrees = rotationDegrees + self.rotationAxis = rotationAxis + self.horizontalOffsetRatio = horizontalOffsetRatio + self.verticalOffsetRatio = verticalOffsetRatio + self.isAnimating = isAnimating + self.symbolCountToWaitFor = symbolCountToWaitFor + } + + @Environment(ArtWorkModel.self) var model let name: String - let initialValue: AnimationValues - let finalValue: AnimationValues + let initialPrimaryColor: Color + let initialSecondaryColor: Color + let initialPosition: ArtWorkModel.InitialSymbolRow + let primaryColor: Color + let secondaryColor: Color + let fontWeight: Font.Weight + let widthRatio: CGFloat + let heightRatio: CGFloat + let rotationDegrees: CGFloat + var rotationAxis: (x: CGFloat, y: CGFloat, z: CGFloat) + let horizontalOffsetRatio: CGFloat + let verticalOffsetRatio: CGFloat let isAnimating: Bool - let animationDuration: Double - let waitingTime: Double + let symbolCountToWaitFor: Int + + private var initialValue: AnimationValues { + return .init( + primaryColor: initialPrimaryColor, + secondaryColor: initialSecondaryColor, + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: initialPosition), + offsetY: model.calculatingInitialOffsetY(forPosition: initialPosition) + ) + } + + private var finalValue: AnimationValues { + return .init( + primaryColor: primaryColor, + secondaryColor: secondaryColor, + fontWeight: fontWeight, + width: model.calculatingProportionalValue(withRatio: widthRatio), + height: model.calculatingProportionalValue(withRatio: heightRatio), + rotationDegrees: rotationDegrees, + rotationAxis: rotationAxis, + offsetX: model.calculatingProportionalValue(withRatio: horizontalOffsetRatio), + offsetY: model.calculatingProportionalValue(withRatio: verticalOffsetRatio) + ) + } + + private var waitingTime: Double { + if symbolCountToWaitFor <= 0 { + // In case of setting it to 0, the symbols disappear from the view. + return 0.001 + } + return model.waitingTime(forCount: symbolCountToWaitFor) + } var body: some View { Image(systemName: name) @@ -58,57 +135,57 @@ struct ArtComponentView: View { KeyframeTrack(\.primaryColor) { LinearKeyframe(value.primaryColor, duration: waitingTime) - CubicKeyframe(finalValue.primaryColor, duration: animationDuration) + CubicKeyframe(finalValue.primaryColor, duration: model.animationDurationPerSymbol) } KeyframeTrack(\.secondaryColor) { LinearKeyframe(value.secondaryColor, duration: waitingTime) - CubicKeyframe(finalValue.secondaryColor, duration: animationDuration) + CubicKeyframe(finalValue.secondaryColor, duration: model.animationDurationPerSymbol) } KeyframeTrack(\.fontWeightValue) { LinearKeyframe(value.fontWeightValue, duration: waitingTime) - CubicKeyframe(finalValue.fontWeightValue, duration: animationDuration) + CubicKeyframe(finalValue.fontWeightValue, duration: model.animationDurationPerSymbol) } KeyframeTrack(\.width) { LinearKeyframe(value.width, duration: waitingTime) - CubicKeyframe(finalValue.width, duration: animationDuration) + CubicKeyframe(finalValue.width, duration: model.animationDurationPerSymbol) } KeyframeTrack(\.height) { LinearKeyframe(value.height, duration: waitingTime) - CubicKeyframe(finalValue.height, duration: animationDuration) + CubicKeyframe(finalValue.height, duration: model.animationDurationPerSymbol) } KeyframeTrack(\.rotationDegrees) { LinearKeyframe(value.rotationDegrees, duration: waitingTime) - CubicKeyframe(finalValue.rotationDegrees, duration: animationDuration) + CubicKeyframe(finalValue.rotationDegrees, duration: model.animationDurationPerSymbol) } KeyframeTrack(\.rotationAxis.x) { LinearKeyframe(value.rotationAxis.x, duration: waitingTime) - CubicKeyframe(finalValue.rotationAxis.x, duration: animationDuration) + CubicKeyframe(finalValue.rotationAxis.x, duration: model.animationDurationPerSymbol) } KeyframeTrack(\.rotationAxis.y) { LinearKeyframe(value.rotationAxis.y, duration: waitingTime) - CubicKeyframe(finalValue.rotationAxis.y, duration: animationDuration) + CubicKeyframe(finalValue.rotationAxis.y, duration: model.animationDurationPerSymbol) } KeyframeTrack(\.rotationAxis.z) { LinearKeyframe(value.rotationAxis.z, duration: waitingTime) - CubicKeyframe(finalValue.rotationAxis.z, duration: animationDuration) + CubicKeyframe(finalValue.rotationAxis.z, duration: model.animationDurationPerSymbol) } KeyframeTrack(\.offset) { LinearKeyframe(value.offset, duration: waitingTime) - CubicKeyframe(finalValue.offset, duration: animationDuration) + CubicKeyframe(finalValue.offset, duration: model.animationDurationPerSymbol) } KeyframeTrack(\.symbolNameVisibleValue) { LinearKeyframe(1, duration: waitingTime) - CubicKeyframe(0, duration: animationDuration * 0.2) + CubicKeyframe(0, duration: model.animationDurationPerSymbol * 0.2) } } } @@ -117,19 +194,12 @@ struct ArtComponentView: View { #Preview { ArtComponentView( name: "circle.fill", - initialValue: .init( - width: 100, - height: 100, - offsetX: 0, - offsetY: 0 - ), finalValue: .init( - width: 200, - height: 200, - offsetX: 0, - offsetY: 0 - ), + initialPosition: .third(.first), + primaryColor: .red, + widthRatio: 1, + heightRatio: 1, isAnimating: true, - animationDuration: 20, - waitingTime: 0 + symbolCountToWaitFor: 0 ) + .environment(ArtWorkModel.preview) } From 6cfefd136e1ba2eb748165c9ebb30e38ad8d543f Mon Sep 17 00:00:00 2001 From: littleossa Date: Thu, 8 Feb 2024 09:54:38 +0900 Subject: [PATCH 044/108] Refactor Color.systemBackground --- .../ArtWorks/ImWearingPants/ImWearingPantsArtView.swift | 8 ++++---- .../ImWearingPants/ImWearingPantsPreviewView.swift | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift index a67b230..aa5c66c 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift @@ -129,7 +129,7 @@ struct ImWearingPantsArtView: View { // MARK: - 􀏄 Parts for shaping Image(systemName: "rectangle.fill") .resizable() - .foregroundStyle(Color(uiColor: .systemBackground)) + .foregroundStyle(Color.systemBackground) .fontWeight(.black) .frame(width: model.calculatingProportionalValue(withRatio: 0.3), height: model.calculatingProportionalValue(withRatio: 0.4)) @@ -138,7 +138,7 @@ struct ImWearingPantsArtView: View { Image(systemName: "rectangle.fill") .resizable() - .foregroundStyle(Color(uiColor: .systemBackground)) + .foregroundStyle(Color.systemBackground) .fontWeight(.black) .frame(width: model.calculatingProportionalValue(withRatio: 0.3), height: model.calculatingProportionalValue(withRatio: 0.4)) @@ -158,7 +158,7 @@ struct ImWearingPantsArtView: View { // MARK: - 􀂓 Parts for shaping Image(systemName: "square.fill") .resizable() - .foregroundStyle(Color(uiColor: .systemBackground)) + .foregroundStyle(Color.systemBackground) .frame(width: model.calculatingProportionalValue(withRatio: 0.2), height: model.calculatingProportionalValue(withRatio: 0.2)) .offset(x: model.calculatingProportionalValue(withRatio: 0.14), @@ -166,7 +166,7 @@ struct ImWearingPantsArtView: View { Image(systemName: "square.fill") .resizable() - .foregroundStyle(Color(uiColor: .systemBackground)) + .foregroundStyle(Color.systemBackground) .frame(width: model.calculatingProportionalValue(withRatio: 0.2), height: model.calculatingProportionalValue(withRatio: 0.2)) .offset(x: model.calculatingProportionalValue(withRatio: -0.14), diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift index 03b3c9f..0dbb32a 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift @@ -67,7 +67,7 @@ struct ImWearingPantsPreviewView: View { // MARK: - 􀏄 Parts for shaping Image(systemName: "rectangle.fill") .resizable() - .foregroundStyle(Color(uiColor: .systemBackground)) + .foregroundStyle(Color.systemBackground) .fontWeight(.black) .frame(width: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), height: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true)) @@ -76,7 +76,7 @@ struct ImWearingPantsPreviewView: View { Image(systemName: "rectangle.fill") .resizable() - .foregroundStyle(Color(uiColor: .systemBackground)) + .foregroundStyle(Color.systemBackground) .fontWeight(.black) .frame(width: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), height: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true)) @@ -96,7 +96,7 @@ struct ImWearingPantsPreviewView: View { // MARK: - 􀂓 Parts for shaping Image(systemName: "square.fill") .resizable() - .foregroundStyle(Color(uiColor: .systemBackground)) + .foregroundStyle(Color.systemBackground) .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), height: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true)) .offset(x: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), @@ -104,7 +104,7 @@ struct ImWearingPantsPreviewView: View { Image(systemName: "square.fill") .resizable() - .foregroundStyle(Color(uiColor: .systemBackground)) + .foregroundStyle(Color.systemBackground) .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), height: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true)) .offset(x: model.calculatingProportionalValue(withRatio: -0.14, forPreview: true), From eced7610a5221b54b59a45d3b9ff6c818a8c7ece Mon Sep 17 00:00:00 2001 From: littleossa Date: Thu, 8 Feb 2024 10:04:55 +0900 Subject: [PATCH 045/108] Update NosebleedArtView --- .../ArtWorks/Nosebleed/NosebleedArtView.swift | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift index be605d8..c378257 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift @@ -25,7 +25,7 @@ struct NosebleedArtView: View { widthRatio: 0.65, heightRatio: 0.65, isAnimating: isAnimating, - symbolCountToWaitFor: 0 + symbolCountToWaitFor: 2 ) // MARK: - 􀭧 Nosebleed bottom @@ -39,7 +39,7 @@ struct NosebleedArtView: View { horizontalOffsetRatio: 0.09, verticalOffsetRatio: 0.074, isAnimating: isAnimating, - symbolCountToWaitFor: 1 + symbolCountToWaitFor: 0 ) .symbolEffect(.variableColor.hideInactiveLayers, options: .speed(0.6).repeating, @@ -55,7 +55,7 @@ struct NosebleedArtView: View { horizontalOffsetRatio: 0.09, verticalOffsetRatio: 0.15, isAnimating: isAnimating, - symbolCountToWaitFor: 2 + symbolCountToWaitFor: 3 ) // MARK: - 􀓩 Mouth @@ -69,7 +69,7 @@ struct NosebleedArtView: View { horizontalOffsetRatio: 0.01, verticalOffsetRatio: 0.05, isAnimating: isAnimating, - symbolCountToWaitFor: 3 + symbolCountToWaitFor: 1 ) // MARK: - 􀏄 Concealing part for Mouth @@ -82,7 +82,7 @@ struct NosebleedArtView: View { rotationDegrees: 176, verticalOffsetRatio: -0.03, isAnimating: isAnimating, - symbolCountToWaitFor: 4 + symbolCountToWaitFor: 3 ) // MARK: - 􀭧 Nosebleed top @@ -96,7 +96,7 @@ struct NosebleedArtView: View { horizontalOffsetRatio: 0.035, verticalOffsetRatio: 0.097, isAnimating: isAnimating, - symbolCountToWaitFor: 5 + symbolCountToWaitFor: 0 ) .symbolEffect(.variableColor.hideInactiveLayers, options: .speed(0.6).repeating, @@ -112,7 +112,7 @@ struct NosebleedArtView: View { horizontalOffsetRatio: 0.09, verticalOffsetRatio: 0.06, isAnimating: isAnimating, - symbolCountToWaitFor: 6 + symbolCountToWaitFor: 3 ) // MARK: - 􀏄 Concealing part for nosebleed top left @@ -125,7 +125,7 @@ struct NosebleedArtView: View { horizontalOffsetRatio: -0.047, verticalOffsetRatio: 0.09, isAnimating: isAnimating, - symbolCountToWaitFor: 6 + symbolCountToWaitFor: 3 ) // MARK: - 􀀁 Right eye @@ -137,7 +137,7 @@ struct NosebleedArtView: View { horizontalOffsetRatio: 0.117, verticalOffsetRatio: -0.176, isAnimating: isAnimating, - symbolCountToWaitFor: 7 + symbolCountToWaitFor: 2 ) // MARK: - 􀀁 Left eye @@ -149,7 +149,7 @@ struct NosebleedArtView: View { horizontalOffsetRatio: -0.113, verticalOffsetRatio: -0.17, isAnimating: isAnimating, - symbolCountToWaitFor: 7 + symbolCountToWaitFor: 2 ) // MARK: - 􀥨 Tissue @@ -164,7 +164,7 @@ struct NosebleedArtView: View { horizontalOffsetRatio: -0.052, verticalOffsetRatio: 0.083, isAnimating: isAnimating, - symbolCountToWaitFor: 8 + symbolCountToWaitFor: 5 ) // MARK: - 􀉆 Tissue frame @@ -178,7 +178,7 @@ struct NosebleedArtView: View { horizontalOffsetRatio: -0.052, verticalOffsetRatio: 0.083, isAnimating: isAnimating, - symbolCountToWaitFor: 8 + symbolCountToWaitFor: 5 ) // MARK: - 􀥰 Nose @@ -192,7 +192,7 @@ struct NosebleedArtView: View { horizontalOffsetRatio: -0.013, verticalOffsetRatio: -0.02, isAnimating: isAnimating, - symbolCountToWaitFor: 9 + symbolCountToWaitFor: 4 ) // MARK: - 􀏄 Concealing part for nose @@ -206,7 +206,7 @@ struct NosebleedArtView: View { horizontalOffsetRatio: 0.007, verticalOffsetRatio: -0.046, isAnimating: isAnimating, - symbolCountToWaitFor: 10 + symbolCountToWaitFor: 3 ) } .navigationTitle("Nosebleed") @@ -225,7 +225,7 @@ struct NosebleedArtView: View { .onChange(of: isAnimating) { _, newValue in if newValue { Timer.scheduledTimer( - withTimeInterval: model.waitingTime(forCount: 13), + withTimeInterval: model.waitingTime(forCount: 6), repeats: false ) { _ in isEffectActivated = true From 108aa779fa8ef99dc2721be1985d6514f36297fe Mon Sep 17 00:00:00 2001 From: littleossa Date: Thu, 8 Feb 2024 10:10:06 +0900 Subject: [PATCH 046/108] Update IamWearingPants --- .../ImWearingPantsArtView.swift | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift index aa5c66c..800933c 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift @@ -382,7 +382,7 @@ struct ImWearingPantsArtView: View { heightRatio: 0.16, verticalOffsetRatio: -0.35, isAnimating: isAnimating, - symbolCountToWaitFor: 3 + symbolCountToWaitFor: 2 ) // MARK: - 􀨯 nose @@ -394,7 +394,7 @@ struct ImWearingPantsArtView: View { heightRatio: 0.06, verticalOffsetRatio: -0.38, isAnimating: isAnimating, - symbolCountToWaitFor: 4 + symbolCountToWaitFor: 3 ) // MARK: - 􀦭 Right eyebrow @@ -407,7 +407,7 @@ struct ImWearingPantsArtView: View { horizontalOffsetRatio: 0.03, verticalOffsetRatio: -0.41, isAnimating: isAnimating, - symbolCountToWaitFor: 5 + symbolCountToWaitFor: 4 ) // MARK: - 􀦭 Left eyebrow @@ -422,7 +422,7 @@ struct ImWearingPantsArtView: View { horizontalOffsetRatio: -0.03, verticalOffsetRatio: -0.408, isAnimating: isAnimating, - symbolCountToWaitFor: 5 + symbolCountToWaitFor: 4 ) // MARK: - 􀧷 Concealing part for eyebrow @@ -436,7 +436,7 @@ struct ImWearingPantsArtView: View { horizontalOffsetRatio: -0.035, verticalOffsetRatio: -0.396, isAnimating: isAnimating, - symbolCountToWaitFor: 5 + symbolCountToWaitFor: 2 ) ArtComponentView( @@ -449,7 +449,7 @@ struct ImWearingPantsArtView: View { horizontalOffsetRatio: 0.035, verticalOffsetRatio: -0.396, isAnimating: isAnimating, - symbolCountToWaitFor: 5 + symbolCountToWaitFor: 2 ) // MARK: - 􀋭 Right eye @@ -462,7 +462,7 @@ struct ImWearingPantsArtView: View { horizontalOffsetRatio: 0.03, verticalOffsetRatio: -0.4, isAnimating: isAnimating, - symbolCountToWaitFor: 6 + symbolCountToWaitFor: 5 ) // MARK: - 􀋭 Left eye @@ -475,7 +475,7 @@ struct ImWearingPantsArtView: View { horizontalOffsetRatio: -0.03, verticalOffsetRatio: -0.4, isAnimating: isAnimating, - symbolCountToWaitFor: 6 + symbolCountToWaitFor: 5 ) // MARK: - 􀋮 Right eye.fill @@ -488,7 +488,7 @@ struct ImWearingPantsArtView: View { horizontalOffsetRatio: 0.03, verticalOffsetRatio: -0.4, isAnimating: isAnimating, - symbolCountToWaitFor: 6 + symbolCountToWaitFor: 5 ) // MARK: - 􀋮 Left eye.fill @@ -501,7 +501,7 @@ struct ImWearingPantsArtView: View { horizontalOffsetRatio: -0.03, verticalOffsetRatio: -0.4, isAnimating: isAnimating, - symbolCountToWaitFor: 6 + symbolCountToWaitFor: 5 ) // MARK: - 􀦪 Mouth @@ -513,7 +513,7 @@ struct ImWearingPantsArtView: View { heightRatio: 0.02, verticalOffsetRatio: -0.32, isAnimating: isAnimating, - symbolCountToWaitFor: 7 + symbolCountToWaitFor: 6 ) ArtComponentView( @@ -524,7 +524,7 @@ struct ImWearingPantsArtView: View { heightRatio: 0.02, verticalOffsetRatio: -0.33, isAnimating: isAnimating, - symbolCountToWaitFor: 7 + symbolCountToWaitFor: 6 ) // MARK: - 􁒀 Teeth @@ -540,7 +540,7 @@ struct ImWearingPantsArtView: View { horizontalOffsetRatio: 0.013, verticalOffsetRatio: -0.328, isAnimating: isAnimating, - symbolCountToWaitFor: 8 + symbolCountToWaitFor: 7 ) ArtComponentView( @@ -555,7 +555,7 @@ struct ImWearingPantsArtView: View { horizontalOffsetRatio: -0.014, verticalOffsetRatio: -0.328, isAnimating: isAnimating, - symbolCountToWaitFor: 8 + symbolCountToWaitFor: 7 ) // MARK: - 􀲟 Hair @@ -568,7 +568,7 @@ struct ImWearingPantsArtView: View { horizontalOffsetRatio: -0.001, verticalOffsetRatio: -0.49, isAnimating: isAnimating, - symbolCountToWaitFor: 9 + symbolCountToWaitFor: 8 ) // MARK: - 􀠒 Hair From ae02c7e0fadf874c6dc6d3824d03d2af33c84bcc Mon Sep 17 00:00:00 2001 From: littleossa Date: Thu, 8 Feb 2024 17:36:41 +0900 Subject: [PATCH 047/108] Remove old magician --- .../project.pbxproj | 24 ------- .../ArtWorks/Magician/Magician.swift | 32 --------- .../ArtWorks/Magician/MagicianFace.swift | 65 ------------------- .../ArtWorks/Magician/MagicianHat.swift | 41 ------------ .../Magician/MagicianSunGlasses.swift | 59 ----------------- 5 files changed, 221 deletions(-) delete mode 100644 SFSymbolsArtCollection/ArtWorks/Magician/Magician.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/Magician/MagicianFace.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/Magician/MagicianHat.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/Magician/MagicianSunGlasses.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index add7bb9..c624ba0 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -7,13 +7,9 @@ objects = { /* Begin PBXBuildFile section */ - 971D9DE828C9497D00136A36 /* MagicianSunGlasses.swift in Sources */ = {isa = PBXBuildFile; fileRef = 971D9DE728C9497D00136A36 /* MagicianSunGlasses.swift */; }; 971D9DEA28C9731D00136A36 /* iOSDCJapan2022SymbolType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 971D9DE928C9731D00136A36 /* iOSDCJapan2022SymbolType.swift */; }; 973B2CA128C2546C006ED5F0 /* ArrangeShapeWithFont.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973B2CA028C2546C006ED5F0 /* ArrangeShapeWithFont.swift */; }; 973B2CA428C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973B2CA328C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift */; }; - 9748BE15289338A3006DF0BE /* Magician.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE14289338A3006DF0BE /* Magician.swift */; }; - 9748BE1828933E40006DF0BE /* MagicianHat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE1728933E40006DF0BE /* MagicianHat.swift */; }; - 9748BE1A289341BE006DF0BE /* MagicianFace.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE19289341BE006DF0BE /* MagicianFace.swift */; }; 9748BE1D289399CF006DF0BE /* SFAlphabet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE1C289399CF006DF0BE /* SFAlphabet.swift */; }; 9748BE2028939B04006DF0BE /* FlipType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE1F28939B04006DF0BE /* FlipType.swift */; }; 9748BE232893B35A006DF0BE /* WorldPeace.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE222893B35A006DF0BE /* WorldPeace.swift */; }; @@ -85,13 +81,9 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 971D9DE728C9497D00136A36 /* MagicianSunGlasses.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicianSunGlasses.swift; sourceTree = ""; }; 971D9DE928C9731D00136A36 /* iOSDCJapan2022SymbolType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022SymbolType.swift; sourceTree = ""; }; 973B2CA028C2546C006ED5F0 /* ArrangeShapeWithFont.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrangeShapeWithFont.swift; sourceTree = ""; }; 973B2CA328C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrangeShapeWithWidthAndHeight.swift; sourceTree = ""; }; - 9748BE14289338A3006DF0BE /* Magician.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Magician.swift; sourceTree = ""; }; - 9748BE1728933E40006DF0BE /* MagicianHat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicianHat.swift; sourceTree = ""; }; - 9748BE19289341BE006DF0BE /* MagicianFace.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicianFace.swift; sourceTree = ""; }; 9748BE1C289399CF006DF0BE /* SFAlphabet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFAlphabet.swift; sourceTree = ""; }; 9748BE1F28939B04006DF0BE /* FlipType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlipType.swift; sourceTree = ""; }; 9748BE222893B35A006DF0BE /* WorldPeace.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorldPeace.swift; sourceTree = ""; }; @@ -222,17 +214,6 @@ path = ViewModifiers; sourceTree = ""; }; - 9748BE16289338C9006DF0BE /* Magician */ = { - isa = PBXGroup; - children = ( - 9748BE14289338A3006DF0BE /* Magician.swift */, - 9748BE1728933E40006DF0BE /* MagicianHat.swift */, - 9748BE19289341BE006DF0BE /* MagicianFace.swift */, - 971D9DE728C9497D00136A36 /* MagicianSunGlasses.swift */, - ); - path = Magician; - sourceTree = ""; - }; 9748BE1E28939AE5006DF0BE /* Enum */ = { isa = PBXGroup; children = ( @@ -343,7 +324,6 @@ 9748BE3D2897ADBD006DF0BE /* ArmHair */, 9748BE2A2893C406006DF0BE /* PartyAnimals */, 9748BE212893B2CD006DF0BE /* WorldPeace */, - 9748BE16289338C9006DF0BE /* Magician */, 97E11E402819720900B2AB32 /* CrayonBoy */, 97CD46E528BEF8A000919B65 /* iOSDCJapan2022 */, ); @@ -624,7 +604,6 @@ 9748BE372893D064006DF0BE /* PartyAnimals.swift in Sources */, 971D9DEA28C9731D00136A36 /* iOSDCJapan2022SymbolType.swift in Sources */, 97AD53182B70DFF30034FB5D /* AnimationValues.swift in Sources */, - 971D9DE828C9497D00136A36 /* MagicianSunGlasses.swift in Sources */, 97624C3E28C93693004E1720 /* CharactersType.swift in Sources */, 97624C2A28C2BC9A004E1720 /* MediumFirework.swift in Sources */, 97E11E33281971E200B2AB32 /* CrayonHair.swift in Sources */, @@ -634,7 +613,6 @@ 97CD46E928BF080300919B65 /* iOSDCJapan2022Logo.swift in Sources */, 97AD53242B70E48F0034FB5D /* PlayButton.swift in Sources */, 9748BE2028939B04006DF0BE /* FlipType.swift in Sources */, - 9748BE15289338A3006DF0BE /* Magician.swift in Sources */, 9748BE3C2897AA28006DF0BE /* AnimalWhiskers.swift in Sources */, 97E11E35281971E200B2AB32 /* CrayonMouth.swift in Sources */, 97AD531A2B70E0530034FB5D /* Font.Weight+.swift in Sources */, @@ -662,7 +640,6 @@ 9748BE4328980C4D006DF0BE /* Hair.swift in Sources */, 97624C3328C4F43F004E1720 /* GeometryProxy+.swift in Sources */, 97EF43952B72DA69003648F5 /* ImWearingPantsArtView.swift in Sources */, - 9748BE1828933E40006DF0BE /* MagicianHat.swift in Sources */, 9748BE50289AB439006DF0BE /* DemonWrestlerHand.swift in Sources */, 97E11E3F281971ED00B2AB32 /* CrayonEyeBall.swift in Sources */, 9748BE2C2893C428006DF0BE /* Bear.swift in Sources */, @@ -681,7 +658,6 @@ 97E11E34281971E200B2AB32 /* CrayonFace.swift in Sources */, 9748BE4C28995A43006DF0BE /* DemonWrestlerBody.swift in Sources */, 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */, - 9748BE1A289341BE006DF0BE /* MagicianFace.swift in Sources */, 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */, 9748BE4628981011006DF0BE /* DemonWrestler.swift in Sources */, 9748BE302893C706006DF0BE /* AnimalNose.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtWorks/Magician/Magician.swift b/SFSymbolsArtCollection/ArtWorks/Magician/Magician.swift deleted file mode 100644 index a1d2129..0000000 --- a/SFSymbolsArtCollection/ArtWorks/Magician/Magician.swift +++ /dev/null @@ -1,32 +0,0 @@ -// -// Magician.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/07/29. -// - -import SwiftUI - -struct Magician: View { - var body: some View { - - GeometryReader { proxy in - - let baseLength = proxy.baseLength - - ZStack { - MagicianFace(baseLength: baseLength) - .offset(x: 0, y: baseLength * 0.125) - MagicianHat(baseLength: baseLength) - .offset(x: 0, y: baseLength * -0.375) - } - .position(proxy.localCenter) - } - } -} - -struct Magician_Previews: PreviewProvider { - static var previews: some View { - Magician() - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/Magician/MagicianFace.swift b/SFSymbolsArtCollection/ArtWorks/Magician/MagicianFace.swift deleted file mode 100644 index 9cd7e10..0000000 --- a/SFSymbolsArtCollection/ArtWorks/Magician/MagicianFace.swift +++ /dev/null @@ -1,65 +0,0 @@ -// -// MagicianFace.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/07/29. -// - -import SwiftUI - -struct MagicianFace: View { - - let baseLength: CGFloat - - var body: some View { - ZStack { - // Outline - Image(symbol: .dropFill) - .arrangeShape(color: .paleOrange, - fontSize: baseLength * 0.75, - flipType: .vertical) - - VStack { - // Eyebrows - HStack(spacing: 0) { - ForEach(0..<2) { _ in - Image(symbol: .chevronCompactUp) - .arrangeShape(fontSize: baseLength * 0.225, - fontWeight: .thin) - } - } - - Spacer() - .frame(height: 0) - - MagicianSunGlasses(baseLength: baseLength) - - // Nose - Image(symbol: .cloudHeavyrain) - .arrangeShape(fontSize: baseLength * 0.1625, - fontWeight: .light) - - // Mouse - ZStack { - - Image(symbol: .rectangleRoundedbottomFill) - .arrangeShape(color: .red, - width: baseLength * 0.15, - height: baseLength * 0.075) - - Image(symbol: .capsuleFill) - .arrangeShape(color: .orange, - width: baseLength * 0.145, - height: baseLength * 0.025, - offsetY: baseLength * 0.025) - } - } - } - } -} - -struct MagicianFace_Previews: PreviewProvider { - static var previews: some View { - MagicianFace(baseLength: 400) - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/Magician/MagicianHat.swift b/SFSymbolsArtCollection/ArtWorks/Magician/MagicianHat.swift deleted file mode 100644 index bb32bb8..0000000 --- a/SFSymbolsArtCollection/ArtWorks/Magician/MagicianHat.swift +++ /dev/null @@ -1,41 +0,0 @@ -// -// MagicianHat.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/07/29. -// - -import SwiftUI - -struct MagicianHat: View { - - let baseLength: CGFloat - - var body: some View { - ZStack { - - Image(symbol: .rectangleFill) - .arrangeShape(color: .red, - width: baseLength * 0.435, - height: baseLength * 0.075, - flipType: .vertical, - offsetY: baseLength * 0.1) - - Image(symbol: .archiveboxFill) - .arrangeShape(fontSize: baseLength * 0.525, - flipType: .vertical) - - Image(symbol: .rectangleFill) - .arrangeShape(width: baseLength * 0.625, - height: baseLength * 0.125, - flipType: .vertical, - offsetY: baseLength * 0.1875) - } - } -} - -struct MagicianHat_Previews: PreviewProvider { - static var previews: some View { - MagicianHat(baseLength: 400) - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/Magician/MagicianSunGlasses.swift b/SFSymbolsArtCollection/ArtWorks/Magician/MagicianSunGlasses.swift deleted file mode 100644 index 616c7a6..0000000 --- a/SFSymbolsArtCollection/ArtWorks/Magician/MagicianSunGlasses.swift +++ /dev/null @@ -1,59 +0,0 @@ -// -// MagicianSunGlasses.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/09/08. -// - -import SwiftUI - -struct MagicianSunGlasses: View { - - let baseLength: CGFloat - - var body: some View { - - HStack(spacing: 0) { - - Image(symbol: .minus) - .arrangeShape(width: baseLength * 0.075, - height: baseLength * 0.0125) - - ZStack { - - Image(symbol: .circleFill) - .arrangeShape(color: .white, - fontSize: baseLength * 0.125) - - Image(symbol: .moonCircleFill) - .arrangeShape(fontSize: baseLength * 0.125) - - } - - Image(symbol: .minus) - .arrangeShape(width: baseLength * 0.075, - height: baseLength * 0.0125) - - ZStack { - - Image(symbol: .circleFill) - .arrangeShape(color: .white, - fontSize: baseLength * 0.125) - - Image(symbol: .moonCircleFill) - .arrangeShape(fontSize: baseLength * 0.125) - - } - - Image(symbol: .minus) - .arrangeShape(width: baseLength * 0.075, - height: baseLength * 0.0125) - } - } -} - -struct MagicianSunGlasses_Previews: PreviewProvider { - static var previews: some View { - MagicianSunGlasses(baseLength: 400) - } -} From 01dda732be78cda5ff0d8ba089c113577c098560 Mon Sep 17 00:00:00 2001 From: littleossa Date: Thu, 8 Feb 2024 21:01:39 +0900 Subject: [PATCH 048/108] Add CrayonBoyArt --- .../project.pbxproj | 26 +- .../ArtWorks/ArtWorkView.swift | 2 +- .../ArtGalleryView.swift | 4 +- .../ArtWorks/CrayonBoy/CrayonBoyArtView.swift | 238 ++++++++++++++++++ .../CrayonBoy/CrayonBoyPreviewView.swift | 178 +++++++++++++ .../ImWearingPantsArtView.swift | 3 +- .../Common/Enums}/FlipType.swift | 2 +- .../Common/Models/AnimationValues.swift | 2 +- .../ArtComponentView/ArtComponentView.swift | 14 +- .../Extensions/Image+arrangeShape.swift | 34 +++ 10 files changed, 486 insertions(+), 17 deletions(-) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyPreviewView.swift rename SFSymbolsArtCollection/{Common/Enum => ArtisticWorldOfSFSymbols/Common/Enums}/FlipType.swift (93%) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/Image+arrangeShape.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index c624ba0..618dbc2 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -78,6 +78,9 @@ 97EF43982B733337003648F5 /* MagicianArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43972B733337003648F5 /* MagicianArtView.swift */; }; 97EF439C2B7421A7003648F5 /* MagicianPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF439B2B7421A7003648F5 /* MagicianPreviewView.swift */; }; 97EF439E2B744C4C003648F5 /* Color+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF439D2B744C4C003648F5 /* Color+.swift */; }; + 97EF43A12B74CA38003648F5 /* CrayonBoyPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43A02B74CA38003648F5 /* CrayonBoyPreviewView.swift */; }; + 97EF43A32B74D9BA003648F5 /* Image+arrangeShape.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43A22B74D9BA003648F5 /* Image+arrangeShape.swift */; }; + 97EF43A52B74F27D003648F5 /* CrayonBoyArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43A42B74F27D003648F5 /* CrayonBoyArtView.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -153,6 +156,9 @@ 97EF43972B733337003648F5 /* MagicianArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicianArtView.swift; sourceTree = ""; }; 97EF439B2B7421A7003648F5 /* MagicianPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicianPreviewView.swift; sourceTree = ""; }; 97EF439D2B744C4C003648F5 /* Color+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+.swift"; sourceTree = ""; }; + 97EF43A02B74CA38003648F5 /* CrayonBoyPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrayonBoyPreviewView.swift; sourceTree = ""; }; + 97EF43A22B74D9BA003648F5 /* Image+arrangeShape.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Image+arrangeShape.swift"; sourceTree = ""; }; + 97EF43A42B74F27D003648F5 /* CrayonBoyArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrayonBoyArtView.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -180,7 +186,6 @@ isa = PBXGroup; children = ( 973B2CA228C2584F006ED5F0 /* ViewModifiers */, - 9748BE1E28939AE5006DF0BE /* Enum */, ); path = Common; sourceTree = ""; @@ -214,12 +219,12 @@ path = ViewModifiers; sourceTree = ""; }; - 9748BE1E28939AE5006DF0BE /* Enum */ = { + 9748BE1E28939AE5006DF0BE /* Enums */ = { isa = PBXGroup; children = ( 9748BE1F28939B04006DF0BE /* FlipType.swift */, ); - path = Enum; + path = Enums; sourceTree = ""; }; 9748BE212893B2CD006DF0BE /* WorldPeace */ = { @@ -355,6 +360,7 @@ 97AD530E2B70DDD10034FB5D /* Common */ = { isa = PBXGroup; children = ( + 9748BE1E28939AE5006DF0BE /* Enums */, 97AD53142B70DF8A0034FB5D /* Models */, 97AD53132B70DF5A0034FB5D /* Views */, ); @@ -384,6 +390,7 @@ isa = PBXGroup; children = ( 97EF43962B7332FB003648F5 /* Magician */, + 97EF439F2B74CA22003648F5 /* CrayonBoy */, 97AD531E2B70E2770034FB5D /* AfroBoy */, 97EF43892B725DE7003648F5 /* Nosebleed */, 97EF43912B72D3AF003648F5 /* ImWearingPants */, @@ -475,6 +482,7 @@ children = ( 97EF439D2B744C4C003648F5 /* Color+.swift */, 97624C3228C4F43F004E1720 /* GeometryProxy+.swift */, + 97EF43A22B74D9BA003648F5 /* Image+arrangeShape.swift */, 97AD53112B70DEB60034FB5D /* UIDevice+.swift */, 97AD53192B70E0530034FB5D /* Font.Weight+.swift */, ); @@ -517,6 +525,15 @@ path = Magician; sourceTree = ""; }; + 97EF439F2B74CA22003648F5 /* CrayonBoy */ = { + isa = PBXGroup; + children = ( + 97EF43A42B74F27D003648F5 /* CrayonBoyArtView.swift */, + 97EF43A02B74CA38003648F5 /* CrayonBoyPreviewView.swift */, + ); + path = CrayonBoy; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -629,6 +646,7 @@ 97E11E3C281971ED00B2AB32 /* CrayonEye.swift in Sources */, 9748BE5D289DD696006DF0BE /* Building.swift in Sources */, 97AD53312B71A5130034FB5D /* GalleryGridView.swift in Sources */, + 97EF43A32B74D9BA003648F5 /* Image+arrangeShape.swift in Sources */, 9748BE1D289399CF006DF0BE /* SFAlphabet.swift in Sources */, 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */, 9748BE6628A395D5006DF0BE /* ArtWork.swift in Sources */, @@ -649,10 +667,12 @@ 97E11E462819734700B2AB32 /* CrayonBoy.swift in Sources */, 97E11E3B281971ED00B2AB32 /* CrayonEyes.swift in Sources */, 97EF438D2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift in Sources */, + 97EF43A52B74F27D003648F5 /* CrayonBoyArtView.swift in Sources */, 9748BE352893CB67006DF0BE /* Lion.swift in Sources */, 97624C2C28C2DDAA004E1720 /* Buildings.swift in Sources */, 97AD53222B70E3FA0034FB5D /* ArtComponentView.swift in Sources */, 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */, + 97EF43A12B74CA38003648F5 /* CrayonBoyPreviewView.swift in Sources */, 9748BE4A28995877006DF0BE /* DemonWrestlerOutline.swift in Sources */, 97EF43902B72D2E4003648F5 /* NosebleedPreviewView.swift in Sources */, 97E11E34281971E200B2AB32 /* CrayonFace.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtWorks/ArtWorkView.swift b/SFSymbolsArtCollection/ArtWorks/ArtWorkView.swift index 472def3..3b7c945 100644 --- a/SFSymbolsArtCollection/ArtWorks/ArtWorkView.swift +++ b/SFSymbolsArtCollection/ArtWorks/ArtWorkView.swift @@ -17,7 +17,7 @@ struct ArtWorkView: View { case .crayonBoy: CrayonBoy() case .magician: - Magician() +EmptyView() case .worldPeace: WorldPeace() case .partyAnimals: diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift index cf2b81c..f8964de 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift @@ -69,9 +69,9 @@ struct ArtGalleryView: View { } NavigationLink { - AfroBoyArtView() + CrayonBoyArtView() } label: { - AfroBoyPreviewView() + CrayonBoyPreviewView() .galleryGridItemView(length: model.galleryColumnLength) } } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView.swift new file mode 100644 index 0000000..aac7e52 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView.swift @@ -0,0 +1,238 @@ +// +// CrayonBoyArtView.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +struct CrayonBoyArtView: View { + + @Environment(ArtWorkModel.self) var model + @State private var isAnimating = false + + var body: some View { + + ZStack { + // MARK: - 􀇃 Outline + ArtComponentView( + name: "cloud.fill", + initialPosition: .second(.first), + primaryColor: .paleOrange, + fontWeight: .ultraLight, + widthRatio: 0.75, + heightRatio: 0.5, + rotationDegrees: 8, + flip: .horizontal, + isAnimating: isAnimating, + symbolCountToWaitFor: 0 + ) + + // MARK: - 􀀁 Hair top + ArtComponentView( + name: "circle.fill", + initialPosition: .second(.second), + widthRatio: 0.44, + heightRatio: 0.25, + horizontalOffsetRatio: 0.05, + verticalOffsetRatio: -0.125, + isAnimating: isAnimating, + symbolCountToWaitFor: 2 + ) + + // MARK: - 􀏄 Concealing part for hair + ArtComponentView( + name: "rectangle.fill", + initialPosition: .third(.fifth), + primaryColor: .paleOrange, + widthRatio: 0.4, + heightRatio: 0.25, + horizontalOffsetRatio: 0.033, + verticalOffsetRatio: -0.05, + isAnimating: isAnimating, + symbolCountToWaitFor: 3 + ) + + // MARK: - 􀆍 Eyebrow + ArtComponentView( + name: "control", + initialPosition: .third(.sixth), + fontWeight: .black, + widthRatio: 0.2, + heightRatio: 0.1, + rotationDegrees: 6, + horizontalOffsetRatio: -0.07, + verticalOffsetRatio: -0.14, + isAnimating: isAnimating, + symbolCountToWaitFor: 4 + ) + + ArtComponentView( + name: "control", + initialPosition: .third(.sixth), + fontWeight: .black, + widthRatio: 0.2, + heightRatio: 0.1, + rotationDegrees: 6, + horizontalOffsetRatio: 0.14, + verticalOffsetRatio: -0.12, + isAnimating: isAnimating, + symbolCountToWaitFor: 4 + ) + + // MARK: - 􀀀 Eyelid + ArtComponentView( + name: "circle", + initialPosition: .second(.third), + fontWeight: .ultraLight, + widthRatio: 0.17, + heightRatio: 0.16, + horizontalOffsetRatio: 0.12, + verticalOffsetRatio: -0.01, + isAnimating: isAnimating, + symbolCountToWaitFor: 5 + ) + + ArtComponentView( + name: "circle", + initialPosition: .second(.third), + fontWeight: .ultraLight, + widthRatio: 0.17, + heightRatio: 0.16, + horizontalOffsetRatio: -0.08, + verticalOffsetRatio: -0.01, + isAnimating: isAnimating, + symbolCountToWaitFor: 5 + ) + + // MARK: - 􀏄 Concealing part for Eyelid + ArtComponentView( + name: "rectangle.fill", + initialPosition: .third(.fifth), + primaryColor: .paleOrange, + widthRatio: 0.2, + heightRatio: 0.16, + horizontalOffsetRatio: 0.13, + verticalOffsetRatio: 0.06, + isAnimating: isAnimating, + symbolCountToWaitFor: 6 + ) + + ArtComponentView( + name: "rectangle.fill", + initialPosition: .third(.fifth), + primaryColor: .paleOrange, + widthRatio: 0.2, + heightRatio: 0.16, + horizontalOffsetRatio: -0.08, + verticalOffsetRatio: 0.06, + isAnimating: isAnimating, + symbolCountToWaitFor: 6 + ) + + // MARK: - 􀢚 Eye + ArtComponentView( + name: "record.circle.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .third(.seventh), + primaryColor: .white, + widthRatio: 0.14, + heightRatio: 0.14, + horizontalOffsetRatio: 0.1, + verticalOffsetRatio: 0.02, + isAnimating: isAnimating, + symbolCountToWaitFor: 7 + ) + + ArtComponentView( + name: "record.circle.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .third(.seventh), + primaryColor: .white, + widthRatio: 0.14, + heightRatio: 0.14, + horizontalOffsetRatio: -0.06, + verticalOffsetRatio: 0.016, + isAnimating: isAnimating, + symbolCountToWaitFor: 7 + ) + + // MARK: - 􀇂 Outline frame + ArtComponentView( + name: "cloud", + initialPosition: .third(.first), + fontWeight: .ultraLight, + widthRatio: 0.75, + heightRatio: 0.5, + rotationDegrees: 8, + flip: .horizontal, + isAnimating: isAnimating, + symbolCountToWaitFor: 1 + ) + + // MARK: - 􀧷 Mouth + ArtComponentView( + name: "capsule.portrait.fill", + initialPosition: .third(.second), + primaryColor: .red, + fontWeight: .ultraLight, + widthRatio: 0.1, + heightRatio: 0.15, + rotationDegrees: 16, + horizontalOffsetRatio: -0.09, + verticalOffsetRatio: 0.225, + isAnimating: isAnimating, + symbolCountToWaitFor: 8 + ) + + // MARK: - 􀧶 Mouth frame + ArtComponentView( + name: "capsule.portrait", + initialPosition: .third(.third), + fontWeight: .ultraLight, + widthRatio: 0.1, + heightRatio: 0.15, + rotationDegrees: 16, + horizontalOffsetRatio: -0.09, + verticalOffsetRatio: 0.225, + isAnimating: isAnimating, + symbolCountToWaitFor: 8 + ) + + // MARK: - 􁹬 Sideburns + ArtComponentView( + name: "righttriangle.fill", + initialPosition: .third(.fourth), + widthRatio: 0.064, + heightRatio: 0.2, + rotationDegrees: 170, + flip: .horizontal, + horizontalOffsetRatio: 0.215, + verticalOffsetRatio: -0.07, + isAnimating: isAnimating, + symbolCountToWaitFor: 9 + ) + } + .navigationTitle("Crayon boy") + .navigationBarTitleDisplayMode(.inline) + .toolbar(content: { + ToolbarItemGroup(placement: .bottomBar) { + Spacer() + + PlayButton { + isAnimating = true + } + .font(.system(size: 32)) + .disabled(isAnimating) + } + }) + } +} + +#Preview { + NavigationStack { + CrayonBoyArtView() + .environment(ArtWorkModel.preview) + } +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyPreviewView.swift new file mode 100644 index 0000000..baf984b --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyPreviewView.swift @@ -0,0 +1,178 @@ +// +// CrayonBoyPreviewView.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +struct CrayonBoyPreviewView: View { + + @Environment(ArtWorkModel.self) var model + + var body: some View { + + ZStack { + // MARK: - 􀇃 Outline + Image(systemName: "cloud.fill") + .arrangeShape( + primaryColor: .paleOrange, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.75, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true), + rotationDegrees: 8, + flip: .horizontal + ) + + // MARK: - 􀀁 Hair top + Image(systemName: "circle.fill") + .arrangeShape( + width: model.calculatingProportionalValue(withRatio: 0.44, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.25, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.125, forPreview: true) + ) + + // MARK: - 􀏄 Concealing part for hair + Image(systemName: "rectangle.fill") + .arrangeShape( + primaryColor: .paleOrange, + width: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.25, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.033, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.05, forPreview: true) + ) + + // MARK: - 􀆍 Eyebrow + Image(systemName: "control") + .arrangeShape( + fontWeight: .black, + width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + rotationDegrees: 6, + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.07, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.14, forPreview: true) + ) + + Image(systemName: "control") + .arrangeShape( + fontWeight: .black, + width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + rotationDegrees: 6, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.12, forPreview: true) + ) + + // MARK: - 􀀀 Eyelid + Image(systemName: "circle") + .arrangeShape( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.17, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.16, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.01, forPreview: true) + ) + + Image(systemName: "circle") + .arrangeShape( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.17, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.16, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.01, forPreview: true) + ) + + // MARK: - 􀏄 Concealing part for Eyelid + Image(systemName: "rectangle.fill") + .arrangeShape( + primaryColor: .paleOrange, + width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.16, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.13, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true) + ) + + Image(systemName: "rectangle.fill") + .arrangeShape( + primaryColor: .paleOrange, + width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.16, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true) + ) + + // MARK: - 􀢚 Eye + Image(systemName: "record.circle.fill") + .arrangeShape( + primaryColor: .white, + secondaryColor: .black, + width: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true) + ) + + Image(systemName: "record.circle.fill") + .arrangeShape( + primaryColor: .white, + secondaryColor: .black, + width: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.06, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.016, forPreview: true) + ) + + // MARK: - 􀇂 Outline frame + Image(systemName: "cloud") + .arrangeShape( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.75, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true), + rotationDegrees: 8, + flip: .horizontal + ) + + // MARK: - 􀧷 Mouth + Image(systemName: "capsule.portrait.fill") + .arrangeShape( + primaryColor: .red, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.10, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + rotationDegrees: 16, + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.09, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.225, forPreview: true) + ) + + // MARK: - 􀧶 Mouth frame + Image(systemName: "capsule.portrait") + .arrangeShape( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.10, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + rotationDegrees: 16, + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.09, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.225, forPreview: true) + ) + + // MARK: - 􁹬 Sideburns + Image(systemName: "righttriangle.fill") + .arrangeShape( + width: model.calculatingProportionalValue(withRatio: 0.064, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + rotationDegrees: 170, + flip: .horizontal, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.215, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.07, forPreview: true) + ) + } + } +} + +#Preview { + CrayonBoyPreviewView() + .environment(ArtWorkModel.preview) +// .environment(ArtWorkModel.init(screenSize: .init(width: 4600, height: 4600))) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift index 800933c..a431e5d 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift @@ -417,8 +417,7 @@ struct ImWearingPantsArtView: View { fontWeight: .ultraLight, widthRatio: 0.045, heightRatio: 0.04, - rotationDegrees: 180, - rotationAxis: (x: 0, y: 1, z: 0), + flip: .horizontal, horizontalOffsetRatio: -0.03, verticalOffsetRatio: -0.408, isAnimating: isAnimating, diff --git a/SFSymbolsArtCollection/Common/Enum/FlipType.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Enums/FlipType.swift similarity index 93% rename from SFSymbolsArtCollection/Common/Enum/FlipType.swift rename to SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Enums/FlipType.swift index 710c3aa..c93c50c 100644 --- a/SFSymbolsArtCollection/Common/Enum/FlipType.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Enums/FlipType.swift @@ -2,7 +2,7 @@ // FlipType.swift // SFSymbolsArtCollection // -// Created by 平岡修 on 2022/07/29. +// Created by Lil Ossa // import CoreGraphics diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/AnimationValues.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/AnimationValues.swift index 701ec78..c40d8cc 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/AnimationValues.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/AnimationValues.swift @@ -17,7 +17,7 @@ struct AnimationValues { height: CGFloat, symbolNameVisibleValue: CGFloat = 1, rotationDegrees: CGFloat = 0, - rotationAxis: (x: CGFloat, y: CGFloat, z: CGFloat) = (x: 0, y: 0, z: 1), + rotationAxis: (x: CGFloat, y: CGFloat, z: CGFloat) = (x: 0, y: 0, z: 0), offsetX: CGFloat = 0, offsetY: CGFloat = 0 ) { diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView/ArtComponentView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView/ArtComponentView.swift index 2135e8e..9ae7c12 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView/ArtComponentView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView/ArtComponentView.swift @@ -20,7 +20,7 @@ struct ArtComponentView: View { widthRatio: CGFloat, heightRatio: CGFloat, rotationDegrees: CGFloat = 0, - rotationAxis: (x: CGFloat, y: CGFloat, z: CGFloat) = (x: 0, y: 0, z: 1), + flip: FlipType = .none, horizontalOffsetRatio: CGFloat = 0, verticalOffsetRatio: CGFloat = 0, isAnimating: Bool, @@ -36,7 +36,7 @@ struct ArtComponentView: View { self.widthRatio = widthRatio self.heightRatio = heightRatio self.rotationDegrees = rotationDegrees - self.rotationAxis = rotationAxis + self.rotationAxis = flip.axis self.horizontalOffsetRatio = horizontalOffsetRatio self.verticalOffsetRatio = verticalOffsetRatio self.isAnimating = isAnimating @@ -124,11 +124,11 @@ struct ArtComponentView: View { width: value.width, height: value.height ) + .rotationEffect(.degrees(value.rotationDegrees)) + .rotation3DEffect(.degrees(180), + axis: value.rotationAxis, + anchorZ: 0) } - .rotation3DEffect( - .degrees(value.rotationDegrees), - axis: value.rotationAxis - ) .offset(value.offset) } keyframes: { value in @@ -193,7 +193,7 @@ struct ArtComponentView: View { #Preview { ArtComponentView( - name: "circle.fill", + name: "nose", initialPosition: .third(.first), primaryColor: .red, widthRatio: 1, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/Image+arrangeShape.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/Image+arrangeShape.swift new file mode 100644 index 0000000..b0cd9c8 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/Image+arrangeShape.swift @@ -0,0 +1,34 @@ +// +// Image+arrangeShape.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension Image { + + func arrangeShape( + primaryColor: Color = .black, + secondaryColor: Color = .black, + fontWeight: Font.Weight = .regular, + width: CGFloat, + height: CGFloat, + rotationDegrees: CGFloat = 0, + flip: FlipType = .none, + horizontalOffset: CGFloat = 0, + verticalOffset: CGFloat = 0 + ) -> some View { + self + .resizable() + .foregroundStyle(primaryColor, secondaryColor) + .fontWeight(fontWeight) + .frame(width: width, height: height) + .rotationEffect(.degrees(rotationDegrees)) + .rotation3DEffect(.degrees(180), axis: flip.axis) + .offset(x: horizontalOffset, + y: verticalOffset) + } +} + From 2e14953757c74708213c8b4bd2dba5f87c599a11 Mon Sep 17 00:00:00 2001 From: littleossa Date: Thu, 8 Feb 2024 21:02:19 +0900 Subject: [PATCH 049/108] Remove old CrayonBoy --- .../project.pbxproj | 52 ---------------- .../ArtWorks/CrayonBoy/CrayonBoy.swift | 56 ----------------- .../CrayonBoy/CrayonEye/CrayonEye.swift | 34 ----------- .../CrayonBoy/CrayonEye/CrayonEyeBall.swift | 31 ---------- .../CrayonBoy/CrayonEye/CrayonEyebrow.swift | 26 -------- .../CrayonBoy/CrayonEye/CrayonEyelid.swift | 34 ----------- .../CrayonBoy/CrayonEye/CrayonEyes.swift | 32 ---------- .../ArtWorks/CrayonBoy/CrayonFace.swift | 61 ------------------- .../ArtWorks/CrayonBoy/CrayonHair.swift | 33 ---------- .../ArtWorks/CrayonBoy/CrayonMouth.swift | 34 ----------- 10 files changed, 393 deletions(-) delete mode 100644 SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonBoy.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonEye/CrayonEye.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonEye/CrayonEyeBall.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonEye/CrayonEyebrow.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonEye/CrayonEyelid.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonEye/CrayonEyes.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonFace.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonHair.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonMouth.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 618dbc2..863af95 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -61,15 +61,6 @@ 97E11D542817381200B2AB32 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97E11D532817381200B2AB32 /* Assets.xcassets */; }; 97E11D572817381200B2AB32 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97E11D562817381200B2AB32 /* Preview Assets.xcassets */; }; 97E11DF028176A0D00B2AB32 /* SFUserFriendlySymbols in Frameworks */ = {isa = PBXBuildFile; productRef = 97E11DEF28176A0D00B2AB32 /* SFUserFriendlySymbols */; }; - 97E11E33281971E200B2AB32 /* CrayonHair.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11E30281971E100B2AB32 /* CrayonHair.swift */; }; - 97E11E34281971E200B2AB32 /* CrayonFace.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11E31281971E200B2AB32 /* CrayonFace.swift */; }; - 97E11E35281971E200B2AB32 /* CrayonMouth.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11E32281971E200B2AB32 /* CrayonMouth.swift */; }; - 97E11E3B281971ED00B2AB32 /* CrayonEyes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11E36281971EC00B2AB32 /* CrayonEyes.swift */; }; - 97E11E3C281971ED00B2AB32 /* CrayonEye.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11E37281971EC00B2AB32 /* CrayonEye.swift */; }; - 97E11E3D281971ED00B2AB32 /* CrayonEyelid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11E38281971ED00B2AB32 /* CrayonEyelid.swift */; }; - 97E11E3E281971ED00B2AB32 /* CrayonEyebrow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11E39281971ED00B2AB32 /* CrayonEyebrow.swift */; }; - 97E11E3F281971ED00B2AB32 /* CrayonEyeBall.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11E3A281971ED00B2AB32 /* CrayonEyeBall.swift */; }; - 97E11E462819734700B2AB32 /* CrayonBoy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11E452819734700B2AB32 /* CrayonBoy.swift */; }; 97EF438B2B725E02003648F5 /* NosebleedArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438A2B725E02003648F5 /* NosebleedArtView.swift */; }; 97EF438D2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438C2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift */; }; 97EF43902B72D2E4003648F5 /* NosebleedPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438F2B72D2E4003648F5 /* NosebleedPreviewView.swift */; }; @@ -139,15 +130,6 @@ 97E11D512817381100B2AB32 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; 97E11D532817381200B2AB32 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97E11D562817381200B2AB32 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; - 97E11E30281971E100B2AB32 /* CrayonHair.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CrayonHair.swift; sourceTree = ""; }; - 97E11E31281971E200B2AB32 /* CrayonFace.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CrayonFace.swift; sourceTree = ""; }; - 97E11E32281971E200B2AB32 /* CrayonMouth.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CrayonMouth.swift; sourceTree = ""; }; - 97E11E36281971EC00B2AB32 /* CrayonEyes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CrayonEyes.swift; sourceTree = ""; }; - 97E11E37281971EC00B2AB32 /* CrayonEye.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CrayonEye.swift; sourceTree = ""; }; - 97E11E38281971ED00B2AB32 /* CrayonEyelid.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CrayonEyelid.swift; sourceTree = ""; }; - 97E11E39281971ED00B2AB32 /* CrayonEyebrow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CrayonEyebrow.swift; sourceTree = ""; }; - 97E11E3A281971ED00B2AB32 /* CrayonEyeBall.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CrayonEyeBall.swift; sourceTree = ""; }; - 97E11E452819734700B2AB32 /* CrayonBoy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrayonBoy.swift; sourceTree = ""; }; 97EF438A2B725E02003648F5 /* NosebleedArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NosebleedArtView.swift; sourceTree = ""; }; 97EF438C2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ArtWorkModel+InitialSymbolRow.swift"; sourceTree = ""; }; 97EF438F2B72D2E4003648F5 /* NosebleedPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NosebleedPreviewView.swift; sourceTree = ""; }; @@ -198,18 +180,6 @@ path = Entity; sourceTree = ""; }; - 971D9DEC28C98BF900136A36 /* CrayonEye */ = { - isa = PBXGroup; - children = ( - 97E11E36281971EC00B2AB32 /* CrayonEyes.swift */, - 97E11E37281971EC00B2AB32 /* CrayonEye.swift */, - 97E11E3A281971ED00B2AB32 /* CrayonEyeBall.swift */, - 97E11E39281971ED00B2AB32 /* CrayonEyebrow.swift */, - 97E11E38281971ED00B2AB32 /* CrayonEyelid.swift */, - ); - path = CrayonEye; - sourceTree = ""; - }; 973B2CA228C2584F006ED5F0 /* ViewModifiers */ = { isa = PBXGroup; children = ( @@ -329,7 +299,6 @@ 9748BE3D2897ADBD006DF0BE /* ArmHair */, 9748BE2A2893C406006DF0BE /* PartyAnimals */, 9748BE212893B2CD006DF0BE /* WorldPeace */, - 97E11E402819720900B2AB32 /* CrayonBoy */, 97CD46E528BEF8A000919B65 /* iOSDCJapan2022 */, ); path = ArtWorks; @@ -465,18 +434,6 @@ path = "Preview Content"; sourceTree = ""; }; - 97E11E402819720900B2AB32 /* CrayonBoy */ = { - isa = PBXGroup; - children = ( - 97E11E452819734700B2AB32 /* CrayonBoy.swift */, - 97E11E31281971E200B2AB32 /* CrayonFace.swift */, - 97E11E30281971E100B2AB32 /* CrayonHair.swift */, - 97E11E32281971E200B2AB32 /* CrayonMouth.swift */, - 971D9DEC28C98BF900136A36 /* CrayonEye */, - ); - path = CrayonBoy; - sourceTree = ""; - }; 97E11E412819727A00B2AB32 /* Extensions */ = { isa = PBXGroup; children = ( @@ -623,7 +580,6 @@ 97AD53182B70DFF30034FB5D /* AnimationValues.swift in Sources */, 97624C3E28C93693004E1720 /* CharactersType.swift in Sources */, 97624C2A28C2BC9A004E1720 /* MediumFirework.swift in Sources */, - 97E11E33281971E200B2AB32 /* CrayonHair.swift in Sources */, 97624C3A28C82DBB004E1720 /* CharacterAppearance.swift in Sources */, 97EF43982B733337003648F5 /* MagicianArtView.swift in Sources */, 9748BE3A2893D0E3006DF0BE /* Frog.swift in Sources */, @@ -631,19 +587,15 @@ 97AD53242B70E48F0034FB5D /* PlayButton.swift in Sources */, 9748BE2028939B04006DF0BE /* FlipType.swift in Sources */, 9748BE3C2897AA28006DF0BE /* AnimalWhiskers.swift in Sources */, - 97E11E35281971E200B2AB32 /* CrayonMouth.swift in Sources */, 97AD531A2B70E0530034FB5D /* Font.Weight+.swift in Sources */, 9748BE6428A3936E006DF0BE /* ArtWorkView.swift in Sources */, - 97E11E3D281971ED00B2AB32 /* CrayonEyelid.swift in Sources */, 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */, 97624C3C28C935F0004E1720 /* FiveCharactersView.swift in Sources */, 9748BE292893BFE3006DF0BE /* Earth.swift in Sources */, - 97E11E3E281971ED00B2AB32 /* CrayonEyebrow.swift in Sources */, 9748BE5F289F194E006DF0BE /* RocketFirework.swift in Sources */, 9748BE2E2893C688006DF0BE /* AnimalOutline.swift in Sources */, 9748BE322893C91F006DF0BE /* AnimalEye.swift in Sources */, 9748BE59289DCE17006DF0BE /* Fireworks.swift in Sources */, - 97E11E3C281971ED00B2AB32 /* CrayonEye.swift in Sources */, 9748BE5D289DD696006DF0BE /* Building.swift in Sources */, 97AD53312B71A5130034FB5D /* GalleryGridView.swift in Sources */, 97EF43A32B74D9BA003648F5 /* Image+arrangeShape.swift in Sources */, @@ -659,13 +611,10 @@ 97624C3328C4F43F004E1720 /* GeometryProxy+.swift in Sources */, 97EF43952B72DA69003648F5 /* ImWearingPantsArtView.swift in Sources */, 9748BE50289AB439006DF0BE /* DemonWrestlerHand.swift in Sources */, - 97E11E3F281971ED00B2AB32 /* CrayonEyeBall.swift in Sources */, 9748BE2C2893C428006DF0BE /* Bear.swift in Sources */, 97AD53292B7100670034FB5D /* ArtWorkModel.swift in Sources */, 97EF439C2B7421A7003648F5 /* MagicianPreviewView.swift in Sources */, 973B2CA428C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift in Sources */, - 97E11E462819734700B2AB32 /* CrayonBoy.swift in Sources */, - 97E11E3B281971ED00B2AB32 /* CrayonEyes.swift in Sources */, 97EF438D2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift in Sources */, 97EF43A52B74F27D003648F5 /* CrayonBoyArtView.swift in Sources */, 9748BE352893CB67006DF0BE /* Lion.swift in Sources */, @@ -675,7 +624,6 @@ 97EF43A12B74CA38003648F5 /* CrayonBoyPreviewView.swift in Sources */, 9748BE4A28995877006DF0BE /* DemonWrestlerOutline.swift in Sources */, 97EF43902B72D2E4003648F5 /* NosebleedPreviewView.swift in Sources */, - 97E11E34281971E200B2AB32 /* CrayonFace.swift in Sources */, 9748BE4C28995A43006DF0BE /* DemonWrestlerBody.swift in Sources */, 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */, 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonBoy.swift b/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonBoy.swift deleted file mode 100644 index 29e5b06..0000000 --- a/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonBoy.swift +++ /dev/null @@ -1,56 +0,0 @@ -// -// CrayonBoy.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/04/27. -// - -import SwiftUI - -struct CrayonBoy: View { - - var body: some View { - - GeometryReader { proxy in - - let baseLength = proxy.baseLength - - ZStack { - CrayonFace(faceType: .fill, - baseLength: baseLength) - - CrayonHair(baseLength: baseLength) - .offset(x: baseLength * 0.025, - y: baseLength * -0.125) - - Group { - CrayonEye(baseLength: baseLength) - .offset(x: baseLength * -0.0625, - y: 0) - - CrayonEye(baseLength: baseLength) - .offset(x: baseLength * 0.125, - y: 0) - - } - .rotationEffect(.radians(0.1)) - - CrayonFace(faceType: .line, - baseLength: baseLength) - - - CrayonMouth(baseLength: baseLength) - .offset(x: baseLength * -0.075, - y: baseLength * 0.225) - - } - .position(proxy.localCenter) - } - } -} - -struct CrayonBoy_Previews: PreviewProvider { - static var previews: some View { - CrayonBoy() - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonEye/CrayonEye.swift b/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonEye/CrayonEye.swift deleted file mode 100644 index 9b1fe80..0000000 --- a/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonEye/CrayonEye.swift +++ /dev/null @@ -1,34 +0,0 @@ -// -// CrayonEye.swift -// CrayonShinchan -// -// Created by 平岡修 on 2022/02/23. -// - -import SwiftUI - -struct CrayonEye: View { - - let baseLength: CGFloat - - var body: some View { - - ZStack { - CrayonEyebrow(baseLength: baseLength) - .offset(x: 0, - y: baseLength * -0.125) - - CrayonEyelid(baseLength: baseLength) - - CrayonEyeBall(baseLength: baseLength) - .offset(x: baseLength * -0.0075, - y: baseLength * 0.025) - } - } -} - -struct CrayonEye_Previews: PreviewProvider { - static var previews: some View { - CrayonEye(baseLength: 400) - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonEye/CrayonEyeBall.swift b/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonEye/CrayonEyeBall.swift deleted file mode 100644 index bc65387..0000000 --- a/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonEye/CrayonEyeBall.swift +++ /dev/null @@ -1,31 +0,0 @@ -// -// CrayonEyeBall.swift -// CrayonShinchan -// -// Created by 平岡修 on 2022/02/23. -// - -import SwiftUI - -struct CrayonEyeBall: View { - - let baseLength: CGFloat - - var body: some View { - ZStack { - - Image(symbol: .circleFill) - .arrangeShape(fontSize: baseLength * 0.125) - - Image(symbol: .circleFill) - .arrangeShape(color: .white, - fontSize: baseLength * 0.05) - } - } -} - -struct CrayonEyeBall_Previews: PreviewProvider { - static var previews: some View { - CrayonEyeBall(baseLength: 400) - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonEye/CrayonEyebrow.swift b/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonEye/CrayonEyebrow.swift deleted file mode 100644 index b07d5c8..0000000 --- a/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonEye/CrayonEyebrow.swift +++ /dev/null @@ -1,26 +0,0 @@ -// -// CrayonEyebrow.swift -// CrayonShinchan -// -// Created by 平岡修 on 2022/02/23. -// - -import SwiftUI - -struct CrayonEyebrow: View { - - let baseLength: CGFloat - - var body: some View { - - Image(symbol: .control) - .arrangeShape(fontSize: baseLength * 0.2, - fontWeight: .black) - } -} - -struct CrayonEyebrow_Previews: PreviewProvider { - static var previews: some View { - CrayonEyebrow(baseLength: 400) - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonEye/CrayonEyelid.swift b/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonEye/CrayonEyelid.swift deleted file mode 100644 index d1d0a84..0000000 --- a/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonEye/CrayonEyelid.swift +++ /dev/null @@ -1,34 +0,0 @@ -// -// CrayonEyelid.swift -// CrayonShinchan -// -// Created by 平岡修 on 2022/02/23. -// - -import SwiftUI - -struct CrayonEyelid: View { - - let baseLength: CGFloat - - var body: some View { - - ZStack { - Image(symbol: .circle) - .arrangeShape(fontSize: baseLength * 0.15, - fontWeight: .ultraLight) - - Image(symbol: .rectangleFill) - .arrangeShape(color: .paleOrange, - fontSize: baseLength * 0.15, - fontWeight: .ultraLight, - offsetY: baseLength * 0.05) - } - } -} - -struct CrayonEyelid_Previews: PreviewProvider { - static var previews: some View { - CrayonEyelid(baseLength: 400) - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonEye/CrayonEyes.swift b/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonEye/CrayonEyes.swift deleted file mode 100644 index e9fa169..0000000 --- a/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonEye/CrayonEyes.swift +++ /dev/null @@ -1,32 +0,0 @@ -// -// CrayonEyes.swift -// CrayonShinchan -// -// Created by 平岡修 on 2022/02/23. -// - -import SwiftUI - -struct CrayonEyes: View { - - let baseLength: CGFloat - - var body: some View { - HStack(spacing: 0) { - Spacer() - - CrayonEye(baseLength: baseLength) - - CrayonEye(baseLength: baseLength) - - Spacer() - } - .rotationEffect(.radians(0.1)) - } -} - -struct CrayonEyes_Previews: PreviewProvider { - static var previews: some View { - CrayonEyes(baseLength: 400) - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonFace.swift b/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonFace.swift deleted file mode 100644 index 1c0f37e..0000000 --- a/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonFace.swift +++ /dev/null @@ -1,61 +0,0 @@ -// -// CrayonFace.swift -// CrayonShinchan -// -// Created by littleossa on 2022/02/23. -// - -import SwiftUI -import SFUserFriendlySymbols - -struct CrayonFace: View { - - enum FaceType: String { - case line - case fill - - var symbol: SFSymbols { - switch self { - case .line: - return .cloud - case .fill: - return .cloudFill - } - } - - var color: Color { - switch self { - case .line: - return .black - case .fill: - return .paleOrange - } - } - } - - let faceType: FaceType - let baseLength: CGFloat - - var body: some View { - - Image(symbol: faceType.symbol) - .arrangeShape(color: faceType.color, - width: baseLength * 0.75, - height: baseLength * 0.5, - fontWeight: .ultraLight, - flipType: .horizontal, - rotationDegrees: 8) - } -} - -struct CrayonFace_Previews: PreviewProvider { - static var previews: some View { - - ZStack { - CrayonFace(faceType: .fill, - baseLength: 400) - CrayonFace(faceType: .line, - baseLength: 400) - } - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonHair.swift b/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonHair.swift deleted file mode 100644 index 722c9c7..0000000 --- a/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonHair.swift +++ /dev/null @@ -1,33 +0,0 @@ -// -// CrayonHair.swift -// CrayonShinchan -// -// Created by 平岡修 on 2022/02/23. -// - -import SwiftUI - -struct CrayonHair: View { - - let baseLength: CGFloat - - var body: some View { - ZStack { - Image(symbol: .circleFill) - .arrangeShape(width: baseLength * 0.375, - height: baseLength * 0.25) - - Image(symbol: .rectangleFill) - .arrangeShape(color: .paleOrange, - width: baseLength * 0.375, - height: baseLength * 0.25, - offsetY: baseLength * 0.075) - } - } -} - -struct CrayonHair_Previews: PreviewProvider { - static var previews: some View { - CrayonHair(baseLength: 400) - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonMouth.swift b/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonMouth.swift deleted file mode 100644 index 3f5bcb9..0000000 --- a/SFSymbolsArtCollection/ArtWorks/CrayonBoy/CrayonMouth.swift +++ /dev/null @@ -1,34 +0,0 @@ -// -// CrayonMouse.swift -// CrayonShinchan -// -// Created by 平岡修 on 2022/02/23. -// - -import SwiftUI - -struct CrayonMouth: View { - - let baseLength: CGFloat - - var body: some View { - - ZStack { - Image(symbol: .capsulePortraitFill) - .arrangeShape(color: .red, - width: baseLength * 0.105, - height: baseLength * 0.15, fontWeight: .ultraLight) - - Image(symbol: .capsulePortrait) - .arrangeShape(width: baseLength * 0.105, - height: baseLength * 0.15, fontWeight: .ultraLight) - } - .rotationEffect(.degrees(10)) - } -} - -struct CrayonMouth_Previews: PreviewProvider { - static var previews: some View { - CrayonMouth(baseLength: 400) - } -} From 7df682d8cd2c0ba2d3b7d253e995517efb3fbfe4 Mon Sep 17 00:00:00 2001 From: littleossa Date: Thu, 8 Feb 2024 21:04:53 +0900 Subject: [PATCH 050/108] Rename ArtComponentView into AnimatableSymbolView --- .../project.pbxproj | 14 +++--- .../ArtWorks/ArtWorkView.swift | 2 +- .../ArtWorks/AfroBoy/AfroBoyArtView.swift | 8 ++-- .../ArtWorks/CrayonBoy/CrayonBoyArtView.swift | 30 ++++++------ .../ImWearingPantsArtView.swift | 46 +++++++++---------- .../ArtWorks/Magician/MagicianArtView.swift | 28 +++++------ .../ArtWorks/Nosebleed/NosebleedArtView.swift | 28 +++++------ .../AnimatableSymbolView.swift} | 6 +-- .../SymbolNameFrameView.swift | 0 9 files changed, 81 insertions(+), 81 deletions(-) rename SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/{ArtComponentView/ArtComponentView.swift => AnimatableSymbolView/AnimatableSymbolView.swift} (98%) rename SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/{ArtComponentView => AnimatableSymbolView}/SymbolNameFrameView.swift (100%) diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 863af95..a86ff30 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -48,7 +48,7 @@ 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; 97AD53182B70DFF30034FB5D /* AnimationValues.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53172B70DFF30034FB5D /* AnimationValues.swift */; }; 97AD531A2B70E0530034FB5D /* Font.Weight+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53192B70E0530034FB5D /* Font.Weight+.swift */; }; - 97AD53222B70E3FA0034FB5D /* ArtComponentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53212B70E3FA0034FB5D /* ArtComponentView.swift */; }; + 97AD53222B70E3FA0034FB5D /* AnimatableSymbolView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53212B70E3FA0034FB5D /* AnimatableSymbolView.swift */; }; 97AD53242B70E48F0034FB5D /* PlayButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53232B70E48F0034FB5D /* PlayButton.swift */; }; 97AD53292B7100670034FB5D /* ArtWorkModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53282B7100670034FB5D /* ArtWorkModel.swift */; }; 97AD532B2B71068B0034FB5D /* AfroBoyArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD532A2B71068B0034FB5D /* AfroBoyArtView.swift */; }; @@ -117,7 +117,7 @@ 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; 97AD53172B70DFF30034FB5D /* AnimationValues.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimationValues.swift; sourceTree = ""; }; 97AD53192B70E0530034FB5D /* Font.Weight+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Font.Weight+.swift"; sourceTree = ""; }; - 97AD53212B70E3FA0034FB5D /* ArtComponentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtComponentView.swift; sourceTree = ""; }; + 97AD53212B70E3FA0034FB5D /* AnimatableSymbolView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimatableSymbolView.swift; sourceTree = ""; }; 97AD53232B70E48F0034FB5D /* PlayButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayButton.swift; sourceTree = ""; }; 97AD53282B7100670034FB5D /* ArtWorkModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtWorkModel.swift; sourceTree = ""; }; 97AD532A2B71068B0034FB5D /* AfroBoyArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AfroBoyArtView.swift; sourceTree = ""; }; @@ -339,7 +339,7 @@ 97AD53132B70DF5A0034FB5D /* Views */ = { isa = PBXGroup; children = ( - 97AD53252B70E4DA0034FB5D /* ArtComponentView */, + 97AD53252B70E4DA0034FB5D /* AnimatableSymbolView */, 97AD53302B71A5130034FB5D /* GalleryGridView.swift */, 97AD53232B70E48F0034FB5D /* PlayButton.swift */, ); @@ -376,13 +376,13 @@ path = AfroBoy; sourceTree = ""; }; - 97AD53252B70E4DA0034FB5D /* ArtComponentView */ = { + 97AD53252B70E4DA0034FB5D /* AnimatableSymbolView */ = { isa = PBXGroup; children = ( - 97AD53212B70E3FA0034FB5D /* ArtComponentView.swift */, + 97AD53212B70E3FA0034FB5D /* AnimatableSymbolView.swift */, 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */, ); - path = ArtComponentView; + path = AnimatableSymbolView; sourceTree = ""; }; 97CD46E528BEF8A000919B65 /* iOSDCJapan2022 */ = { @@ -619,7 +619,7 @@ 97EF43A52B74F27D003648F5 /* CrayonBoyArtView.swift in Sources */, 9748BE352893CB67006DF0BE /* Lion.swift in Sources */, 97624C2C28C2DDAA004E1720 /* Buildings.swift in Sources */, - 97AD53222B70E3FA0034FB5D /* ArtComponentView.swift in Sources */, + 97AD53222B70E3FA0034FB5D /* AnimatableSymbolView.swift in Sources */, 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */, 97EF43A12B74CA38003648F5 /* CrayonBoyPreviewView.swift in Sources */, 9748BE4A28995877006DF0BE /* DemonWrestlerOutline.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtWorks/ArtWorkView.swift b/SFSymbolsArtCollection/ArtWorks/ArtWorkView.swift index 3b7c945..1f5e4a2 100644 --- a/SFSymbolsArtCollection/ArtWorks/ArtWorkView.swift +++ b/SFSymbolsArtCollection/ArtWorks/ArtWorkView.swift @@ -15,7 +15,7 @@ struct ArtWorkView: View { switch artwork { case .crayonBoy: - CrayonBoy() + EmptyView() case .magician: EmptyView() case .worldPeace: diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift index 0830ad0..c44ae3f 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift @@ -16,7 +16,7 @@ struct AfroBoyArtView: View { ZStack { // MARK: - 􁝰 Hair - ArtComponentView( + AnimatableSymbolView( name: "tree.fill", initialPosition: .third(.first), widthRatio: 0.9, @@ -26,7 +26,7 @@ struct AfroBoyArtView: View { ) // MARK: - 􀙧 Contour - ArtComponentView( + AnimatableSymbolView( name: "shield.fill", initialPosition: .third(.second), primaryColor: .paleOrange, @@ -38,7 +38,7 @@ struct AfroBoyArtView: View { ) // MARK: - 􀎽 Face - ArtComponentView( + AnimatableSymbolView( name: "faceid", initialPosition: .third(.third), secondaryColor: .paleOrange, @@ -50,7 +50,7 @@ struct AfroBoyArtView: View { ) // MARK: - 􀦉 Comb - ArtComponentView( + AnimatableSymbolView( name: "comb.fill", initialPosition: .third(.fourth), primaryColor: .red, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView.swift index aac7e52..f03503c 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView.swift @@ -16,7 +16,7 @@ struct CrayonBoyArtView: View { ZStack { // MARK: - 􀇃 Outline - ArtComponentView( + AnimatableSymbolView( name: "cloud.fill", initialPosition: .second(.first), primaryColor: .paleOrange, @@ -30,7 +30,7 @@ struct CrayonBoyArtView: View { ) // MARK: - 􀀁 Hair top - ArtComponentView( + AnimatableSymbolView( name: "circle.fill", initialPosition: .second(.second), widthRatio: 0.44, @@ -42,7 +42,7 @@ struct CrayonBoyArtView: View { ) // MARK: - 􀏄 Concealing part for hair - ArtComponentView( + AnimatableSymbolView( name: "rectangle.fill", initialPosition: .third(.fifth), primaryColor: .paleOrange, @@ -55,7 +55,7 @@ struct CrayonBoyArtView: View { ) // MARK: - 􀆍 Eyebrow - ArtComponentView( + AnimatableSymbolView( name: "control", initialPosition: .third(.sixth), fontWeight: .black, @@ -68,7 +68,7 @@ struct CrayonBoyArtView: View { symbolCountToWaitFor: 4 ) - ArtComponentView( + AnimatableSymbolView( name: "control", initialPosition: .third(.sixth), fontWeight: .black, @@ -82,7 +82,7 @@ struct CrayonBoyArtView: View { ) // MARK: - 􀀀 Eyelid - ArtComponentView( + AnimatableSymbolView( name: "circle", initialPosition: .second(.third), fontWeight: .ultraLight, @@ -94,7 +94,7 @@ struct CrayonBoyArtView: View { symbolCountToWaitFor: 5 ) - ArtComponentView( + AnimatableSymbolView( name: "circle", initialPosition: .second(.third), fontWeight: .ultraLight, @@ -107,7 +107,7 @@ struct CrayonBoyArtView: View { ) // MARK: - 􀏄 Concealing part for Eyelid - ArtComponentView( + AnimatableSymbolView( name: "rectangle.fill", initialPosition: .third(.fifth), primaryColor: .paleOrange, @@ -119,7 +119,7 @@ struct CrayonBoyArtView: View { symbolCountToWaitFor: 6 ) - ArtComponentView( + AnimatableSymbolView( name: "rectangle.fill", initialPosition: .third(.fifth), primaryColor: .paleOrange, @@ -132,7 +132,7 @@ struct CrayonBoyArtView: View { ) // MARK: - 􀢚 Eye - ArtComponentView( + AnimatableSymbolView( name: "record.circle.fill", initialPrimaryColor: .systemBackground, initialPosition: .third(.seventh), @@ -145,7 +145,7 @@ struct CrayonBoyArtView: View { symbolCountToWaitFor: 7 ) - ArtComponentView( + AnimatableSymbolView( name: "record.circle.fill", initialPrimaryColor: .systemBackground, initialPosition: .third(.seventh), @@ -159,7 +159,7 @@ struct CrayonBoyArtView: View { ) // MARK: - 􀇂 Outline frame - ArtComponentView( + AnimatableSymbolView( name: "cloud", initialPosition: .third(.first), fontWeight: .ultraLight, @@ -172,7 +172,7 @@ struct CrayonBoyArtView: View { ) // MARK: - 􀧷 Mouth - ArtComponentView( + AnimatableSymbolView( name: "capsule.portrait.fill", initialPosition: .third(.second), primaryColor: .red, @@ -187,7 +187,7 @@ struct CrayonBoyArtView: View { ) // MARK: - 􀧶 Mouth frame - ArtComponentView( + AnimatableSymbolView( name: "capsule.portrait", initialPosition: .third(.third), fontWeight: .ultraLight, @@ -201,7 +201,7 @@ struct CrayonBoyArtView: View { ) // MARK: - 􁹬 Sideburns - ArtComponentView( + AnimatableSymbolView( name: "righttriangle.fill", initialPosition: .third(.fourth), widthRatio: 0.064, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift index a431e5d..950f442 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift @@ -64,7 +64,7 @@ struct ImWearingPantsArtView: View { ZStack { // MARK: - Current pose - ArtComponentView( + AnimatableSymbolView( name: currentPose.rawValue, initialPosition: .third(.second), primaryColor: .yellow, @@ -77,7 +77,7 @@ struct ImWearingPantsArtView: View { .offset(x: model.calculatingProportionalValue(withRatio: currentPose.offsetXRatio)) // MARK: - 􁉨 Pants - ArtComponentView( + AnimatableSymbolView( name: "parkingsign.steeringwheel", initialPosition: .third(.first), primaryColor: .palePink, @@ -323,7 +323,7 @@ struct ImWearingPantsArtView: View { } // MARK: - 􀑪 Music - ArtComponentView( + AnimatableSymbolView( name: "music.note", initialPosition: .second(.first), widthRatio: 0.1, @@ -336,7 +336,7 @@ struct ImWearingPantsArtView: View { .symbolEffect(.bounce, value: musicCount) // MARK: - 􀫀 Music 3 - ArtComponentView( + AnimatableSymbolView( name: "music.quarternote.3", initialPosition: .second(.second), widthRatio: 0.2, @@ -349,7 +349,7 @@ struct ImWearingPantsArtView: View { .symbolEffect(.bounce, value: musicCount) // MARK: - 􀀁 Face background - ArtComponentView( + AnimatableSymbolView( name: "circle.fill", initialPosition: .second(.third), primaryColor: .systemBackground, @@ -361,7 +361,7 @@ struct ImWearingPantsArtView: View { ) // MARK: - 􀧷 Contour - ArtComponentView( + AnimatableSymbolView( name: "capsule.portrait.fill", initialPosition: .second(.fourth), primaryColor: .yellow, @@ -374,7 +374,7 @@ struct ImWearingPantsArtView: View { ) // MARK: - 􀧷 Contour bottom - ArtComponentView( + AnimatableSymbolView( name: "capsule.portrait.fill", initialPosition: .second(.fourth), primaryColor: .yellow, @@ -386,7 +386,7 @@ struct ImWearingPantsArtView: View { ) // MARK: - 􀨯 nose - ArtComponentView( + AnimatableSymbolView( name: "nose", initialPosition: .second(.fifth), fontWeight: .ultraLight, @@ -398,7 +398,7 @@ struct ImWearingPantsArtView: View { ) // MARK: - 􀦭 Right eyebrow - ArtComponentView( + AnimatableSymbolView( name: "eyebrow", initialPosition: .second(.sixth), fontWeight: .ultraLight, @@ -411,7 +411,7 @@ struct ImWearingPantsArtView: View { ) // MARK: - 􀦭 Left eyebrow - ArtComponentView( + AnimatableSymbolView( name: "eyebrow", initialPosition: .second(.sixth), fontWeight: .ultraLight, @@ -425,7 +425,7 @@ struct ImWearingPantsArtView: View { ) // MARK: - 􀧷 Concealing part for eyebrow - ArtComponentView( + AnimatableSymbolView( name: "capsule.portrait.fill", initialPosition: .second(.fourth), primaryColor: .yellow, @@ -438,7 +438,7 @@ struct ImWearingPantsArtView: View { symbolCountToWaitFor: 2 ) - ArtComponentView( + AnimatableSymbolView( name: "capsule.portrait.fill", initialPosition: .second(.fourth), primaryColor: .yellow, @@ -452,7 +452,7 @@ struct ImWearingPantsArtView: View { ) // MARK: - 􀋭 Right eye - ArtComponentView( + AnimatableSymbolView( name: "eye", initialPosition: .second(.seventh), fontWeight: .ultraLight, @@ -465,7 +465,7 @@ struct ImWearingPantsArtView: View { ) // MARK: - 􀋭 Left eye - ArtComponentView( + AnimatableSymbolView( name: "eye", initialPosition: .second(.seventh), fontWeight: .ultraLight, @@ -478,7 +478,7 @@ struct ImWearingPantsArtView: View { ) // MARK: - 􀋮 Right eye.fill - ArtComponentView( + AnimatableSymbolView( name: "eye.fill", initialPosition: .third(.seventh), primaryColor: .white, @@ -491,7 +491,7 @@ struct ImWearingPantsArtView: View { ) // MARK: - 􀋮 Left eye.fill - ArtComponentView( + AnimatableSymbolView( name: "eye.fill", initialPosition: .third(.seventh), primaryColor: .white, @@ -504,7 +504,7 @@ struct ImWearingPantsArtView: View { ) // MARK: - 􀦪 Mouth - ArtComponentView( + AnimatableSymbolView( name: "mouth.fill", initialPosition: .third(.third), primaryColor: .red, @@ -515,7 +515,7 @@ struct ImWearingPantsArtView: View { symbolCountToWaitFor: 6 ) - ArtComponentView( + AnimatableSymbolView( name: "mouth.fill", initialPosition: .third(.third), primaryColor: .red, @@ -527,7 +527,7 @@ struct ImWearingPantsArtView: View { ) // MARK: - 􁒀 Teeth - ArtComponentView( + AnimatableSymbolView( name: "window.casement.closed", initialSecondaryColor: .clear, initialPosition: .third(.fourth), @@ -542,7 +542,7 @@ struct ImWearingPantsArtView: View { symbolCountToWaitFor: 7 ) - ArtComponentView( + AnimatableSymbolView( name: "window.casement.closed", initialSecondaryColor: .clear, initialPosition: .third(.fourth), @@ -558,7 +558,7 @@ struct ImWearingPantsArtView: View { ) // MARK: - 􀲟 Hair - ArtComponentView( + AnimatableSymbolView( name: "oval.fill", initialPosition: .third(.fifth), fontWeight: .ultraLight, @@ -571,7 +571,7 @@ struct ImWearingPantsArtView: View { ) // MARK: - 􀠒 Hair - ArtComponentView( + AnimatableSymbolView( name: "drop.fill", initialPosition: .third(.sixth), fontWeight: .ultraLight, @@ -584,7 +584,7 @@ struct ImWearingPantsArtView: View { symbolCountToWaitFor: 9 ) - ArtComponentView( + AnimatableSymbolView( name: "drop.fill", initialPosition: .third(.sixth), fontWeight: .ultraLight, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView.swift index 2a8ed50..e3284eb 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView.swift @@ -16,7 +16,7 @@ struct MagicianArtView: View { ZStack { // MARK: - 􀠒 Outline - ArtComponentView( + AnimatableSymbolView( name: "drop.fill", initialPosition: .second(.first), primaryColor: .paleOrange, @@ -29,7 +29,7 @@ struct MagicianArtView: View { ) // MARK: - 􀏄 Hat band - ArtComponentView( + AnimatableSymbolView( name: "rectangle.fill", initialPosition: .second(.second), primaryColor: .red, @@ -42,7 +42,7 @@ struct MagicianArtView: View { ) // MARK: - 􀈮 Hat - ArtComponentView( + AnimatableSymbolView( name: "archivebox.fill", initialPosition: .third(.first), widthRatio: 0.525, @@ -54,7 +54,7 @@ struct MagicianArtView: View { ) // MARK: - 􀏄 Hat brim - ArtComponentView( + AnimatableSymbolView( name: "rectangle.fill", initialPosition: .second(.second), widthRatio: 0.625, @@ -65,7 +65,7 @@ struct MagicianArtView: View { ) // MARK: - 􀆐 Eyebrow - ArtComponentView( + AnimatableSymbolView( name: "chevron.compact.up", initialPosition: .third(.second), fontWeight: .thin, @@ -77,7 +77,7 @@ struct MagicianArtView: View { symbolCountToWaitFor: 4 ) - ArtComponentView( + AnimatableSymbolView( name: "chevron.compact.up", initialPosition: .third(.second), fontWeight: .thin, @@ -90,7 +90,7 @@ struct MagicianArtView: View { ) // MARK: - 􀅽 Sunglasses frame - ArtComponentView( + AnimatableSymbolView( name: "minus", initialPosition: .third(.third), fontWeight: .thin, @@ -101,7 +101,7 @@ struct MagicianArtView: View { symbolCountToWaitFor: 5 ) - ArtComponentView( + AnimatableSymbolView( name: "minus", initialPosition: .third(.third), fontWeight: .thin, @@ -113,7 +113,7 @@ struct MagicianArtView: View { symbolCountToWaitFor: 5 ) - ArtComponentView( + AnimatableSymbolView( name: "minus", initialPosition: .third(.third), fontWeight: .thin, @@ -126,7 +126,7 @@ struct MagicianArtView: View { ) // MARK: - 􀆼 Sunglasses lens - ArtComponentView( + AnimatableSymbolView( name: "moon.circle.fill", initialPrimaryColor: .white, initialPosition: .third(.fourth), @@ -139,7 +139,7 @@ struct MagicianArtView: View { symbolCountToWaitFor: 6 ) - ArtComponentView( + AnimatableSymbolView( name: "moon.circle.fill", initialPrimaryColor: .white, initialPosition: .third(.fourth), @@ -153,7 +153,7 @@ struct MagicianArtView: View { ) // MARK: - 􀇈 Nose - ArtComponentView( + AnimatableSymbolView( name: "cloud.heavyrain", initialPosition: .third(.fifth), fontWeight: .light, @@ -166,7 +166,7 @@ struct MagicianArtView: View { ) // MARK: - 􀩻 Inside mouth - ArtComponentView( + AnimatableSymbolView( name: "button.roundedbottom.horizontal.fill", initialPosition: .third(.sixth), primaryColor: .red, @@ -179,7 +179,7 @@ struct MagicianArtView: View { ) // MARK: - 􀝷 Tongue capsule.fill - ArtComponentView( + AnimatableSymbolView( name: "capsule.fill", initialPosition: .third(.seventh), primaryColor: .orange, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift index c378257..e5d996a 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift @@ -18,7 +18,7 @@ struct NosebleedArtView: View { ZStack { // MARK: - 􀀁 Contour - ArtComponentView( + AnimatableSymbolView( name: "circle.fill", initialPosition: .third(.first), primaryColor: .awesomeYellow, @@ -29,7 +29,7 @@ struct NosebleedArtView: View { ) // MARK: - 􀭧 Nosebleed bottom - ArtComponentView( + AnimatableSymbolView( name: "cellularbars", initialPosition: .third(.second), primaryColor: .red, @@ -46,7 +46,7 @@ struct NosebleedArtView: View { isActive: isEffectActivated) // MARK: - 􀏄 Concealing part for nosebleed bottom - ArtComponentView( + AnimatableSymbolView( name: "rectangle.fill", initialPosition: .third(.third), primaryColor: .awesomeYellow, @@ -59,7 +59,7 @@ struct NosebleedArtView: View { ) // MARK: - 􀓩 Mouth - ArtComponentView( + AnimatableSymbolView( name: "lasso", initialPosition: .third(.fourth), fontWeight: .ultraLight, @@ -73,7 +73,7 @@ struct NosebleedArtView: View { ) // MARK: - 􀏄 Concealing part for Mouth - ArtComponentView( + AnimatableSymbolView( name: "rectangle.fill", initialPosition: .third(.third), primaryColor: .awesomeYellow, @@ -86,7 +86,7 @@ struct NosebleedArtView: View { ) // MARK: - 􀭧 Nosebleed top - ArtComponentView( + AnimatableSymbolView( name: "cellularbars", initialPosition: .third(.second), primaryColor: .red, @@ -103,7 +103,7 @@ struct NosebleedArtView: View { isActive: isEffectActivated) // MARK: - 􀏄 Concealing part for nosebleed top right - ArtComponentView( + AnimatableSymbolView( name: "rectangle.fill", initialPosition: .third(.third), primaryColor: .awesomeYellow, @@ -116,7 +116,7 @@ struct NosebleedArtView: View { ) // MARK: - 􀏄 Concealing part for nosebleed top left - ArtComponentView( + AnimatableSymbolView( name: "rectangle.fill", initialPosition: .third(.third), primaryColor: .awesomeYellow, @@ -129,7 +129,7 @@ struct NosebleedArtView: View { ) // MARK: - 􀀁 Right eye - ArtComponentView( + AnimatableSymbolView( name: "circle.fill", initialPosition: .third(.first), widthRatio: 0.06, @@ -141,7 +141,7 @@ struct NosebleedArtView: View { ) // MARK: - 􀀁 Left eye - ArtComponentView( + AnimatableSymbolView( name: "circle.fill", initialPosition: .third(.first), widthRatio: 0.06, @@ -153,7 +153,7 @@ struct NosebleedArtView: View { ) // MARK: - 􀥨 Tissue - ArtComponentView( + AnimatableSymbolView( name: "doc.plaintext.fill", initialPosition: .third(.fifth), primaryColor: .white, @@ -168,7 +168,7 @@ struct NosebleedArtView: View { ) // MARK: - 􀉆 Tissue frame - ArtComponentView( + AnimatableSymbolView( name: "doc.plaintext", initialPosition: .third(.sixth), fontWeight: .light, @@ -182,7 +182,7 @@ struct NosebleedArtView: View { ) // MARK: - 􀥰 Nose - ArtComponentView( + AnimatableSymbolView( name: "triangleshape", initialPosition: .third(.seventh), fontWeight: .light, @@ -196,7 +196,7 @@ struct NosebleedArtView: View { ) // MARK: - 􀏄 Concealing part for nose - ArtComponentView( + AnimatableSymbolView( name: "rectangle.fill", initialPosition: .third(.third), primaryColor: .awesomeYellow, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView/ArtComponentView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/AnimatableSymbolView.swift similarity index 98% rename from SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView/ArtComponentView.swift rename to SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/AnimatableSymbolView.swift index 9ae7c12..f23f304 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView/ArtComponentView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/AnimatableSymbolView.swift @@ -1,5 +1,5 @@ // -// ArtComponentView.swift +// AnimatableSymbolView.swift // SFSymbolsArtCollection // // Created by Lil Ossa @@ -7,7 +7,7 @@ import SwiftUI -struct ArtComponentView: View { +struct AnimatableSymbolView: View { init( name: String, @@ -192,7 +192,7 @@ struct ArtComponentView: View { } #Preview { - ArtComponentView( + AnimatableSymbolView( name: "nose", initialPosition: .third(.first), primaryColor: .red, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView/SymbolNameFrameView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/SymbolNameFrameView.swift similarity index 100% rename from SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/ArtComponentView/SymbolNameFrameView.swift rename to SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/SymbolNameFrameView.swift From 29feddd05bcec4df93f34c8111276e6846ac0c88 Mon Sep 17 00:00:00 2001 From: littleossa Date: Thu, 8 Feb 2024 21:10:08 +0900 Subject: [PATCH 051/108] Refactor AfroBoyPreview --- .../ArtWorks/AfroBoy/AfroBoyPreviewView.swift | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift index db475ec..534e89d 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift @@ -17,35 +17,39 @@ struct AfroBoyPreviewView: View { // MARK: - 􁝰 Hair Image(systemName: "tree.fill") - .resizable() - .foregroundStyle(.black) - .frame(width: model.calculatingProportionalValue(withRatio: 0.9, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.9, forPreview: true)) + .arrangeShape( + width: model.calculatingProportionalValue(withRatio: 0.9, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.9, forPreview: true) + ) // MARK: - 􀙧 Contour Image(systemName: "shield.fill") - .resizable() - .foregroundStyle(.paleOrange) - .frame(width: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.6, forPreview: true)) - .offset(y: model.calculatingProportionalValue(withRatio: 0.17, forPreview: true)) + .arrangeShape( + primaryColor: .paleOrange, + width: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.6, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.17, forPreview: true) + ) // MARK: - 􀎽 Face Image(systemName: "faceid") - .resizable() - .foregroundStyle(.black, .paleOrange) - .frame(width: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true)) - .offset(y: model.calculatingProportionalValue(withRatio: 0.16, forPreview: true)) + .arrangeShape( + primaryColor: .black, + secondaryColor: .paleOrange, + width: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.16, forPreview: true) + ) // MARK: - 􀦉 Comb Image(systemName: "comb.fill") - .resizable() - .foregroundStyle(.red) - .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true)) + .arrangeShape( + primaryColor: .red, + width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true) + ) } } } From e18eff1b4a0253d435ca08dba54776d54d79d9e5 Mon Sep 17 00:00:00 2001 From: littleossa Date: Thu, 8 Feb 2024 21:23:27 +0900 Subject: [PATCH 052/108] Refactor MagicianPreview --- .../Magician/MagicianPreviewView.swift | 211 ++++++++---------- 1 file changed, 96 insertions(+), 115 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianPreviewView.swift index 8ed1f90..16ea12e 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianPreviewView.swift @@ -16,154 +16,135 @@ struct MagicianPreviewView: View { // MARK: - 􀠒 Outline Image(systemName: "drop.fill") - .resizable() - .foregroundStyle(.paleOrange) - .frame(width: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.75, forPreview: true)) - .rotationEffect(.degrees(180)) - .offset(y: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true)) + .arrangeShape( + primaryColor: .paleOrange, + width: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.75, forPreview: true), + rotationDegrees: 180, + verticalOffset: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true) + ) // MARK: - 􀏄 Hat band Image(systemName: "rectangle.fill") - .resizable() - .foregroundStyle(.red) - .frame(width: model.calculatingProportionalValue(withRatio: 0.446, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.15, forPreview: true)) + .arrangeShape( + primaryColor: .red, + width: model.calculatingProportionalValue(withRatio: 0.446, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.15, forPreview: true) + ) // MARK: - 􀈮 Hat Image(systemName: "archivebox.fill") - .resizable() - .foregroundStyle(.black) - .frame(width: model.calculatingProportionalValue(withRatio: 0.525, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.525, forPreview: true)) - .rotationEffect(.degrees(180)) - .offset(y: model.calculatingProportionalValue(withRatio: -0.25, forPreview: true)) + .arrangeShape( + width: model.calculatingProportionalValue(withRatio: 0.525, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.525, forPreview: true), + rotationDegrees: 180, + verticalOffset: model.calculatingProportionalValue(withRatio: -0.25, forPreview: true) + ) // MARK: - 􀏄 Hat brim Image(systemName: "rectangle.fill") - .resizable() - .foregroundStyle(.black) - .frame(width: model.calculatingProportionalValue(withRatio: 0.625, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true)) - .offset(y: model.calculatingProportionalValue(withRatio: -0.05, forPreview: true)) + .arrangeShape( + width: model.calculatingProportionalValue(withRatio: 0.625, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.05, forPreview: true) + ) // MARK: - 􀆐 Eyebrow Image(systemName: "chevron.compact.up") - .resizable() - .foregroundStyle(.black) - .fontWeight(.thin) - .frame(width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true)) + .arrangeShape( + fontWeight: .thin, + width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true) + ) Image(systemName: "chevron.compact.up") - .resizable() - .foregroundStyle(.black) - .fontWeight(.thin) - .frame(width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.1, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true)) + .arrangeShape( + fontWeight: .thin, + width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.1, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true) + ) // MARK: - 􀅽 Sunglasses frame Image(systemName: "minus") - .resizable() - .foregroundStyle(.black) - .fontWeight(.thin) - .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.0125, forPreview: true)) - .offset(y: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true)) + .arrangeShape( + fontWeight: .thin, + width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.0125, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true) + ) Image(systemName: "minus") - .resizable() - .foregroundStyle(.black) - .fontWeight(.thin) - .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.0125, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true)) + .arrangeShape( + fontWeight: .thin, + width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.0125, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true) + ) Image(systemName: "minus") - .resizable() - .foregroundStyle(.black) - .fontWeight(.thin) - .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.0125, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true)) - - // MARK: - 􀀁 Sunglasses inside lens - Image(systemName: "circle.fill") - .resizable() - .foregroundStyle(.white) - .frame(width: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true)) - - Image(systemName: "circle.fill") - .resizable() - .foregroundStyle(.white) - .frame(width: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.1, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true)) - - // MARK: - 􀆼 Sunglasses outside lens - Image(systemName: "moon.circle.fill") - .resizable() - .foregroundStyle(.black) - .frame(width: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true)) - + .arrangeShape( + fontWeight: .thin, + width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.0125, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true) + ) + + // MARK: - 􀆼 Sunglasses lens Image(systemName: "moon.circle.fill") - .resizable() - .foregroundStyle(.black) - .frame(width: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.1, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true)) + .arrangeShape( + primaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true) + ) Image(systemName: "moon.circle.fill") - .resizable() - .foregroundStyle(.black) - .frame(width: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.1, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true)) + .arrangeShape( + primaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.1, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true) + ) // MARK: - 􀇈 Nose Image(systemName: "cloud.heavyrain") - .resizable() - .foregroundStyle(.black) - .fontWeight(.light) - .frame(width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.27, forPreview: true)) + .arrangeShape( + fontWeight: .light, + width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.27, forPreview: true) + ) // MARK: - 􀩻 Inside mouth Image(systemName: "button.roundedbottom.horizontal.fill") - .resizable() - .foregroundStyle(.red) - .frame(width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.075, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true)) + .arrangeShape( + primaryColor: .red, + width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.075, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true) + ) // MARK: - 􀝷 Tongue capsule.fill Image(systemName: "capsule.fill") - .resizable() - .foregroundStyle(.orange) - .frame(width: model.calculatingProportionalValue(withRatio: 0.145, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.025, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.424, forPreview: true)) + .arrangeShape( + primaryColor: .orange, + width: model.calculatingProportionalValue(withRatio: 0.145, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.025, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.424, forPreview: true) + ) } } } From 16b1e0a870eb24709257f7f092cd55281c2a39a0 Mon Sep 17 00:00:00 2001 From: littleossa Date: Thu, 8 Feb 2024 21:45:15 +0900 Subject: [PATCH 053/108] Refactor NosebleedArt --- .../ArtWorks/Nosebleed/NosebleedArtView.swift | 36 ++-- .../Nosebleed/NosebleedPreviewView.swift | 198 +++++++++--------- 2 files changed, 123 insertions(+), 111 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift index e5d996a..26c1b13 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift @@ -25,7 +25,7 @@ struct NosebleedArtView: View { widthRatio: 0.65, heightRatio: 0.65, isAnimating: isAnimating, - symbolCountToWaitFor: 2 + symbolCountToWaitFor: 3 ) // MARK: - 􀭧 Nosebleed bottom @@ -33,13 +33,14 @@ struct NosebleedArtView: View { name: "cellularbars", initialPosition: .third(.second), primaryColor: .red, + fontWeight: .ultraLight, widthRatio: 0.2, heightRatio: 0.5, rotationDegrees: 180, horizontalOffsetRatio: 0.09, verticalOffsetRatio: 0.074, isAnimating: isAnimating, - symbolCountToWaitFor: 0 + symbolCountToWaitFor: 1 ) .symbolEffect(.variableColor.hideInactiveLayers, options: .speed(0.6).repeating, @@ -55,7 +56,7 @@ struct NosebleedArtView: View { horizontalOffsetRatio: 0.09, verticalOffsetRatio: 0.15, isAnimating: isAnimating, - symbolCountToWaitFor: 3 + symbolCountToWaitFor: 2 ) // MARK: - 􀓩 Mouth @@ -69,9 +70,9 @@ struct NosebleedArtView: View { horizontalOffsetRatio: 0.01, verticalOffsetRatio: 0.05, isAnimating: isAnimating, - symbolCountToWaitFor: 1 + symbolCountToWaitFor: 0 ) - + // MARK: - 􀏄 Concealing part for Mouth AnimatableSymbolView( name: "rectangle.fill", @@ -82,7 +83,7 @@ struct NosebleedArtView: View { rotationDegrees: 176, verticalOffsetRatio: -0.03, isAnimating: isAnimating, - symbolCountToWaitFor: 3 + symbolCountToWaitFor: 2 ) // MARK: - 􀭧 Nosebleed top @@ -90,13 +91,14 @@ struct NosebleedArtView: View { name: "cellularbars", initialPosition: .third(.second), primaryColor: .red, + fontWeight: .ultraLight, widthRatio: 0.2, heightRatio: 0.12, rotationDegrees: 180, - horizontalOffsetRatio: 0.035, - verticalOffsetRatio: 0.097, + horizontalOffsetRatio: 0.033, + verticalOffsetRatio: 0.096, isAnimating: isAnimating, - symbolCountToWaitFor: 0 + symbolCountToWaitFor: 1 ) .symbolEffect(.variableColor.hideInactiveLayers, options: .speed(0.6).repeating, @@ -112,7 +114,7 @@ struct NosebleedArtView: View { horizontalOffsetRatio: 0.09, verticalOffsetRatio: 0.06, isAnimating: isAnimating, - symbolCountToWaitFor: 3 + symbolCountToWaitFor: 2 ) // MARK: - 􀏄 Concealing part for nosebleed top left @@ -125,7 +127,7 @@ struct NosebleedArtView: View { horizontalOffsetRatio: -0.047, verticalOffsetRatio: 0.09, isAnimating: isAnimating, - symbolCountToWaitFor: 3 + symbolCountToWaitFor: 2 ) // MARK: - 􀀁 Right eye @@ -137,7 +139,7 @@ struct NosebleedArtView: View { horizontalOffsetRatio: 0.117, verticalOffsetRatio: -0.176, isAnimating: isAnimating, - symbolCountToWaitFor: 2 + symbolCountToWaitFor: 3 ) // MARK: - 􀀁 Left eye @@ -149,7 +151,7 @@ struct NosebleedArtView: View { horizontalOffsetRatio: -0.113, verticalOffsetRatio: -0.17, isAnimating: isAnimating, - symbolCountToWaitFor: 2 + symbolCountToWaitFor: 3 ) // MARK: - 􀥨 Tissue @@ -164,7 +166,7 @@ struct NosebleedArtView: View { horizontalOffsetRatio: -0.052, verticalOffsetRatio: 0.083, isAnimating: isAnimating, - symbolCountToWaitFor: 5 + symbolCountToWaitFor: 6 ) // MARK: - 􀉆 Tissue frame @@ -178,7 +180,7 @@ struct NosebleedArtView: View { horizontalOffsetRatio: -0.052, verticalOffsetRatio: 0.083, isAnimating: isAnimating, - symbolCountToWaitFor: 5 + symbolCountToWaitFor: 6 ) // MARK: - 􀥰 Nose @@ -206,7 +208,7 @@ struct NosebleedArtView: View { horizontalOffsetRatio: 0.007, verticalOffsetRatio: -0.046, isAnimating: isAnimating, - symbolCountToWaitFor: 3 + symbolCountToWaitFor: 5 ) } .navigationTitle("Nosebleed") @@ -225,7 +227,7 @@ struct NosebleedArtView: View { .onChange(of: isAnimating) { _, newValue in if newValue { Timer.scheduledTimer( - withTimeInterval: model.waitingTime(forCount: 6), + withTimeInterval: model.waitingTime(forCount: 7), repeats: false ) { _ in isEffectActivated = true diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedPreviewView.swift index 448020e..d0653b3 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedPreviewView.swift @@ -17,139 +17,149 @@ struct NosebleedArtPreviewView: View { // MARK: - 􀀁 Contour Image(systemName: "circle.fill") - .resizable() - .foregroundStyle(.awesomeYellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.65, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.65, forPreview: true)) + .arrangeShape( + primaryColor: .awesomeYellow, + width: model.calculatingProportionalValue(withRatio: 0.65, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.65, forPreview: true) + ) // MARK: - 􀭧 Nosebleed bottom Image(systemName: "cellularbars") - .resizable() - .foregroundStyle(.red) - .fontWeight(.ultraLight) - .rotationEffect(.degrees(180)) - .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.074, forPreview: true)) + .arrangeShape( + primaryColor: .red, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true), + rotationDegrees: 180, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.0741, forPreview: true) + ) // MARK: - 􀏄 Concealing part for nosebleed bottom Image(systemName: "rectangle.fill") - .resizable() - .foregroundStyle(.awesomeYellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true)) + .arrangeShape( + primaryColor: .awesomeYellow, + width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true) + ) // MARK: - 􀓩 Mouth Image(systemName: "lasso") - .resizable() - .foregroundStyle(.black) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true)) - .rotationEffect(.degrees(170)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true)) + .arrangeShape( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), + rotationDegrees: 170, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true) + ) // MARK: - 􀏄 Concealing part for Mouth Image(systemName: "rectangle.fill") - .resizable() - .foregroundStyle(.awesomeYellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true)) - .rotationEffect(.degrees(176)) - .offset(y: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true)) + .arrangeShape( + primaryColor: .awesomeYellow, + width: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), + rotationDegrees: 176, + verticalOffset: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true) + ) // MARK: - 􀭧 Nosebleed top Image(systemName: "cellularbars") - .resizable() - .foregroundStyle(.red) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true)) - .rotationEffect(.degrees(180)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.033, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.096, forPreview: true)) + .arrangeShape( + primaryColor: .red, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true), + rotationDegrees: 180, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.033, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.096, forPreview: true) + ) // MARK: - 􀏄 Nosebleed top right hide Image(systemName: "rectangle.fill") - .resizable() - .foregroundStyle(.awesomeYellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true)) + .arrangeShape( + primaryColor: .awesomeYellow, + width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true) + ) // MARK: - 􀏄 Nosebleed top left hide Image(systemName: "rectangle.fill") - .resizable() - .foregroundStyle(.awesomeYellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.053, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true)) + .arrangeShape( + primaryColor: .awesomeYellow, + width: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.053, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true) + ) // MARK: - 􀀁 Right eye Image(systemName: "circle.fill") - .resizable() - .foregroundStyle(.black) - .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.117, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.176, forPreview: true)) + .arrangeShape( + width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.117, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.176, forPreview: true) + ) // MARK: - 􀀁 Left eye Image(systemName: "circle.fill") - .resizable() - .foregroundStyle(.black) - .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.113, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.17, forPreview: true)) + .arrangeShape( + width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.113, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.17, forPreview: true) + ) // MARK: - 􀥨 Tissue Image(systemName: "doc.plaintext.fill") - .resizable() - .foregroundStyle(.white) - .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true)) - .rotationEffect(.degrees(188)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.052, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.083, forPreview: true)) + .arrangeShape( + primaryColor: .white, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true), + rotationDegrees: 188, + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.052, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.083, forPreview: true) + ) // MARK: - 􀉆 Tissue frame Image(systemName: "doc.plaintext") - .resizable() - .foregroundStyle(.black) - .fontWeight(.light) - .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true)) - .rotationEffect(.degrees(188)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.052, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.083, forPreview: true)) + .arrangeShape( + fontWeight: .light, + width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true), + rotationDegrees: 188, + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.052, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.083, forPreview: true) + ) // MARK: - 􀥰 Nose Image(systemName: "triangleshape") - .resizable() - .foregroundStyle(.black) - .fontWeight(.light) - .frame(width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true)) - .rotationEffect(.degrees(-4)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.013, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.02, forPreview: true)) + .arrangeShape( + fontWeight: .light, + width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), + rotationDegrees: -4, + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.013, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.02, forPreview: true) + ) // MARK: - 􀏄 Nose hide Image(systemName: "rectangle.fill") - .resizable() - .foregroundStyle(.awesomeYellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.13, forPreview: true)) - .rotationEffect(.degrees(148)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.007, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.046, forPreview: true)) + .arrangeShape( + primaryColor: .awesomeYellow, + width: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.13, forPreview: true), + rotationDegrees: 148, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.007, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.046, forPreview: true) + ) } } } From 823d5c626e006fa70fb4c4b54f628f7f6ee605cd Mon Sep 17 00:00:00 2001 From: littleossa Date: Thu, 8 Feb 2024 21:47:25 +0900 Subject: [PATCH 054/108] Rearrange ArtGralley list --- .../ArtisticWorldOfSFSymbols/ArtGalleryView.swift | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift index f8964de..b26c2ae 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift @@ -47,6 +47,13 @@ struct ArtGalleryView: View { .galleryGridItemView(length: model.galleryColumnLength) } + NavigationLink { + CrayonBoyArtView() + } label: { + CrayonBoyPreviewView() + .galleryGridItemView(length: model.galleryColumnLength) + } + NavigationLink { AfroBoyArtView() } label: { @@ -67,13 +74,6 @@ struct ArtGalleryView: View { ImWearingPantsPreviewView() .galleryGridItemView(length: model.galleryColumnLength) } - - NavigationLink { - CrayonBoyArtView() - } label: { - CrayonBoyPreviewView() - .galleryGridItemView(length: model.galleryColumnLength) - } } } .padding(.horizontal, 24) From e94f637decb6e15fc90b1f15e9e1490274f7c0e2 Mon Sep 17 00:00:00 2001 From: littleossa Date: Thu, 8 Feb 2024 23:22:09 +0900 Subject: [PATCH 055/108] Refactor ImWearingPant art --- .../ImWearingPantsArtView.swift | 343 +++++------ .../ImWearingPantsPreviewView.swift | 533 +++++++++--------- 2 files changed, 461 insertions(+), 415 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift index 950f442..aaa690c 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift @@ -97,226 +97,247 @@ struct ImWearingPantsArtView: View { // MARK: - 􁗅 Pose Image(systemName: "figure.arms.open") - .resizable() - .foregroundStyle(.yellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.6), - height: model.calculatingProportionalValue(withRatio: 1)) + .arrangeShape( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.6), + height: model.calculatingProportionalValue(withRatio: 1) + ) // MARK: - 􀆹 Chest shadow Image(systemName: "moon") - .resizable() - .foregroundStyle(.black.opacity(0.6)) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.06), - height: model.calculatingProportionalValue(withRatio: 0.015)) - .rotationEffect(.degrees(-10)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.09), - y: model.calculatingProportionalValue(withRatio: -0.125)) + .arrangeShape( + primaryColor: .black.opacity(0.6), + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.06), + height: model.calculatingProportionalValue(withRatio: 0.015), + rotationDegrees: -10, + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.09), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.125) + ) Image(systemName: "moon") - .resizable() - .foregroundStyle(.black.opacity(0.6)) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.06), - height: model.calculatingProportionalValue(withRatio: 0.015)) - .rotation3DEffect( - .degrees(160), - axis: (x: 0, y: 1, z: 0) + .arrangeShape( + primaryColor: .black.opacity(0.6), + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.06), + height: model.calculatingProportionalValue(withRatio: 0.015), + rotationDegrees: -10, + flip: .horizontal, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.085), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.125) ) - .offset(x: model.calculatingProportionalValue(withRatio: 0.085), - y: model.calculatingProportionalValue(withRatio: -0.125)) // MARK: - 􀏄 Parts for shaping Image(systemName: "rectangle.fill") - .resizable() - .foregroundStyle(Color.systemBackground) - .fontWeight(.black) - .frame(width: model.calculatingProportionalValue(withRatio: 0.3), - height: model.calculatingProportionalValue(withRatio: 0.4)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.25), - y: model.calculatingProportionalValue(withRatio: -0.1)) + .arrangeShape( + primaryColor: .systemBackground, + fontWeight: .black, + width: model.calculatingProportionalValue(withRatio: 0.3), + height: model.calculatingProportionalValue(withRatio: 0.4), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.25), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.1) + ) Image(systemName: "rectangle.fill") - .resizable() - .foregroundStyle(Color.systemBackground) - .fontWeight(.black) - .frame(width: model.calculatingProportionalValue(withRatio: 0.3), - height: model.calculatingProportionalValue(withRatio: 0.4)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.25), - y: model.calculatingProportionalValue(withRatio: -0.1)) + .arrangeShape( + primaryColor: .systemBackground, + fontWeight: .black, + width: model.calculatingProportionalValue(withRatio: 0.3), + height: model.calculatingProportionalValue(withRatio: 0.4), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.25), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.1) + ) // MARK: - 􀊡 Neck Image(systemName: "speaker.fill") - .resizable() - .foregroundStyle(.yellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.2), - height: model.calculatingProportionalValue(withRatio: 0.38)) - .rotationEffect(.degrees(90)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.005), - y: model.calculatingProportionalValue(withRatio: -0.27)) + .arrangeShape( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.2), + height: model.calculatingProportionalValue(withRatio: 0.38), + rotationDegrees: 90, + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.005), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.27) + ) // MARK: - 􀂓 Parts for shaping Image(systemName: "square.fill") - .resizable() - .foregroundStyle(Color.systemBackground) - .frame(width: model.calculatingProportionalValue(withRatio: 0.2), - height: model.calculatingProportionalValue(withRatio: 0.2)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.14), - y: model.calculatingProportionalValue(withRatio: -0.385)) + .arrangeShape( + primaryColor: .systemBackground, + width: model.calculatingProportionalValue(withRatio: 0.2), + height: model.calculatingProportionalValue(withRatio: 0.2), + rotationDegrees: 90, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.14), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.385) + ) Image(systemName: "square.fill") - .resizable() - .foregroundStyle(Color.systemBackground) - .frame(width: model.calculatingProportionalValue(withRatio: 0.2), - height: model.calculatingProportionalValue(withRatio: 0.2)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.14), - y: model.calculatingProportionalValue(withRatio: -0.385)) + .arrangeShape( + primaryColor: .systemBackground, + width: model.calculatingProportionalValue(withRatio: 0.2), + height: model.calculatingProportionalValue(withRatio: 0.2), + rotationDegrees: 90, + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.14), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.385) + ) // MARK: - 􀆺 Chest Image(systemName: "moon.fill") - .resizable() - .foregroundStyle(.yellow) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.06), - height: model.calculatingProportionalValue(withRatio: 0.04)) - .rotationEffect(.degrees(-10)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.09), - y: model.calculatingProportionalValue(withRatio: -0.138)) - + .arrangeShape( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.06), + height: model.calculatingProportionalValue(withRatio: 0.04), + rotationDegrees: -10, + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.09), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.138) + ) + Image(systemName: "moon.fill") - .resizable() - .foregroundStyle(.yellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.06), - height: model.calculatingProportionalValue(withRatio: 0.04)) - .rotation3DEffect( - .degrees(160), - axis: (x: 0, y: 1, z: 0) + .arrangeShape( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.06), + height: model.calculatingProportionalValue(withRatio: 0.04), + rotationDegrees: -10, + flip: .horizontal, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.085), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.138) ) - .offset(x: model.calculatingProportionalValue(withRatio: 0.085), - y: model.calculatingProportionalValue(withRatio: -0.138)) // MARK: - 􀆉 Left arm Image(systemName: "chevron.left") - .resizable() - .foregroundStyle(.yellow) - .fontWeight(.black) - .frame(width: model.calculatingProportionalValue(withRatio: 0.2), - height: model.calculatingProportionalValue(withRatio: 0.3)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.2), - y: model.calculatingProportionalValue(withRatio: -0.08)) + .arrangeShape( + primaryColor: .yellow, + fontWeight: .black, + width: model.calculatingProportionalValue(withRatio: 0.2), + height: model.calculatingProportionalValue(withRatio: 0.3), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.2), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.08) + ) // MARK: - 􀆊 Right artm Image(systemName: "chevron.right") - .resizable() - .foregroundStyle(.yellow) - .fontWeight(.black) - .frame(width: model.calculatingProportionalValue(withRatio: 0.2), - height: model.calculatingProportionalValue(withRatio: 0.3)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.2), - y: model.calculatingProportionalValue(withRatio: -0.08)) + .arrangeShape( + primaryColor: .yellow, + fontWeight: .black, + width: model.calculatingProportionalValue(withRatio: 0.2), + height: model.calculatingProportionalValue(withRatio: 0.3), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.08) + ) } .transition(.symbolEffect(.appear)) Group { // MARK: - 􀀁 Pant center hole cover Image(systemName: "circle.fill") - .resizable() - .foregroundStyle(.palePink) - .frame(width: model.calculatingProportionalValue(withRatio: 0.06), - height: model.calculatingProportionalValue(withRatio: 0.06)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.01), - y: model.calculatingProportionalValue(withRatio: 0.04)) + .arrangeShape( + primaryColor: .palePink, + width: model.calculatingProportionalValue(withRatio: 0.06), + height: model.calculatingProportionalValue(withRatio: 0.06), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.01), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.04) + ) // MARK: - 􁁌 Patterns on pants Image(systemName: "fan.fill") - .resizable() - .foregroundStyle(.white) - .frame(width: model.calculatingProportionalValue(withRatio: 0.04), - height: model.calculatingProportionalValue(withRatio: 0.04)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.01), - y: model.calculatingProportionalValue(withRatio: 0.04)) + .arrangeShape( + primaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.04), + height: model.calculatingProportionalValue(withRatio: 0.04), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.01), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.04) + ) Image(systemName: "fan.fill") - .resizable() - .foregroundStyle(.white) - .frame(width: model.calculatingProportionalValue(withRatio: 0.04), - height: model.calculatingProportionalValue(withRatio: 0.04)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.08), - y: model.calculatingProportionalValue(withRatio: 0.02)) + .arrangeShape( + primaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.04), + height: model.calculatingProportionalValue(withRatio: 0.04), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.08), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.02) + ) Image(systemName: "fan.fill") - .resizable() - .foregroundStyle(.white) - .frame(width: model.calculatingProportionalValue(withRatio: 0.04), - height: model.calculatingProportionalValue(withRatio: 0.04)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.08), - y: model.calculatingProportionalValue(withRatio: 0.02)) + .arrangeShape( + primaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.04), + height: model.calculatingProportionalValue(withRatio: 0.04), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.08), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.02) + ) Image(systemName: "fan.fill") - .resizable() - .foregroundStyle(.white) - .frame(width: model.calculatingProportionalValue(withRatio: 0.04), - height: model.calculatingProportionalValue(withRatio: 0.04)) - .offset(y: model.calculatingProportionalValue(withRatio: 0.099)) + .arrangeShape( + primaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.04), + height: model.calculatingProportionalValue(withRatio: 0.04), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.099) + ) // MARK: - 􀲟 Concealing part for pants Image(systemName: "oval.fill") - .resizable() - .foregroundStyle(.yellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.11), - height: model.calculatingProportionalValue(withRatio: 0.03)) - .rotationEffect(.degrees(45)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.07), - y: model.calculatingProportionalValue(withRatio: 0.09)) + .arrangeShape( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.11), + height: model.calculatingProportionalValue(withRatio: 0.03), + rotationDegrees: 45, + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.07), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.09) + ) Image(systemName: "oval.fill") - .resizable() - .foregroundStyle(.yellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.11), - height: model.calculatingProportionalValue(withRatio: 0.03)) - .rotationEffect(.degrees(-47)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.06), - y: model.calculatingProportionalValue(withRatio: 0.089)) + .arrangeShape( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.11), + height: model.calculatingProportionalValue(withRatio: 0.03), + rotationDegrees: -47, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.06), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.089) + ) // MARK: - 􁎘 Abdomen Image(systemName: "visionpro.fill") - .resizable() - .foregroundStyle(.yellow) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.25), - height: model.calculatingProportionalValue(withRatio: 0.15)) - .rotationEffect(.degrees(180)) - .offset(y: model.calculatingProportionalValue(withRatio: -0.045)) + .arrangeShape( + primaryColor: .yellow, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.25), + height: model.calculatingProportionalValue(withRatio: 0.15), + rotationDegrees: 180, + verticalOffset: model.calculatingProportionalValue(withRatio: -0.045) + ) // MARK: - 􀥤 Belly button Image(systemName: "poweron") - .resizable() - .foregroundStyle(.black) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.02), - height: model.calculatingProportionalValue(withRatio: 0.002)) - .rotationEffect(.degrees(180)) + .arrangeShape( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.02), + height: model.calculatingProportionalValue(withRatio: 0.002), + rotationDegrees: 180 + ) // MARK: - 􀕩 Niple Image(systemName: "smallcircle.filled.circle.fill") - .resizable() - .foregroundStyle(.brown) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.02), - height: model.calculatingProportionalValue(withRatio: 0.01)) - .rotationEffect(.degrees(15)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.09), - y: model.calculatingProportionalValue(withRatio: -0.138)) + .arrangeShape( + primaryColor: .yellow, + secondaryColor: .brown, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.02), + height: model.calculatingProportionalValue(withRatio: 0.01), + rotationDegrees: 15, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.09), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.138) + ) Image(systemName: "smallcircle.filled.circle.fill") - .resizable() - .foregroundStyle(.brown) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.02), - height: model.calculatingProportionalValue(withRatio: 0.01)) - .rotationEffect(.degrees(-15)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.09), - y: model.calculatingProportionalValue(withRatio: -0.14)) + .arrangeShape( + primaryColor: .yellow, + secondaryColor: .brown, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.02), + height: model.calculatingProportionalValue(withRatio: 0.01), + rotationDegrees: -15, + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.09), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.14) + ) } .zIndex(0.2) .transition(.symbolEffect(.appear)) @@ -435,7 +456,7 @@ struct ImWearingPantsArtView: View { horizontalOffsetRatio: -0.035, verticalOffsetRatio: -0.396, isAnimating: isAnimating, - symbolCountToWaitFor: 2 + symbolCountToWaitFor: 5 ) AnimatableSymbolView( @@ -448,7 +469,7 @@ struct ImWearingPantsArtView: View { horizontalOffsetRatio: 0.035, verticalOffsetRatio: -0.396, isAnimating: isAnimating, - symbolCountToWaitFor: 2 + symbolCountToWaitFor: 5 ) // MARK: - 􀋭 Right eye diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift index 0dbb32a..61d1255 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift @@ -42,27 +42,27 @@ struct ImWearingPantsPreviewView: View { // MARK: - 􀆹 Chest shadow Image(systemName: "moon") - .resizable() - .foregroundStyle(.black.opacity(0.6)) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.015, forPreview: true)) - .rotationEffect(.degrees(-10)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.09, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.125, forPreview: true)) + .arrangeShape( + primaryColor: .black.opacity(0.6), + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.015, forPreview: true), + rotationDegrees: -10, + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.09, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.125, forPreview: true) + ) Image(systemName: "moon") - .resizable() - .foregroundStyle(.black.opacity(0.6)) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.015, forPreview: true)) - .rotation3DEffect( - .degrees(160), - axis: (x: 0, y: 1, z: 0) + .arrangeShape( + primaryColor: .black.opacity(0.6), + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.015, forPreview: true), + rotationDegrees: -10, + flip: .horizontal, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.085, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.125, forPreview: true) ) - .offset(x: model.calculatingProportionalValue(withRatio: 0.085, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.125, forPreview: true)) // MARK: - 􀏄 Parts for shaping Image(systemName: "rectangle.fill") @@ -112,325 +112,350 @@ struct ImWearingPantsPreviewView: View { // MARK: - 􀆺 Chest Image(systemName: "moon.fill") - .resizable() - .foregroundStyle(.yellow) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) - .rotationEffect(.degrees(-10)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.09, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.138, forPreview: true)) - + .arrangeShape( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + rotationDegrees: -10, + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.09, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.138, forPreview: true) + ) + Image(systemName: "moon.fill") - .resizable() - .foregroundStyle(.yellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) - .rotation3DEffect( - .degrees(160), - axis: (x: 0, y: 1, z: 0) + .arrangeShape( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + rotationDegrees: -10, + flip: .horizontal, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.085, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.138, forPreview: true) ) - .offset(x: model.calculatingProportionalValue(withRatio: 0.085, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.138, forPreview: true)) // MARK: - 􀆉 Left arm Image(systemName: "chevron.left") - .resizable() - .foregroundStyle(.yellow) - .fontWeight(.black) - .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true)) + .arrangeShape( + primaryColor: .yellow, + fontWeight: .black, + width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true) + ) // MARK: - 􀆊 Right artm Image(systemName: "chevron.right") - .resizable() - .foregroundStyle(.yellow) - .fontWeight(.black) - .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true)) + .arrangeShape( + primaryColor: .yellow, + fontWeight: .black, + width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true) + ) // MARK: - 􁉨 Pants Image(systemName: "parkingsign.steeringwheel") - .resizable() - .foregroundStyle(.palePink) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.35, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.07, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true)) + .arrangeShape( + primaryColor: .palePink, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.35, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.07, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true) + ) // MARK: - 􀀁 Pant center hole cover Image(systemName: "circle.fill") - .resizable() - .foregroundStyle(.palePink) - .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.01, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) + .arrangeShape( + primaryColor: .palePink, + width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.01, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true) + ) // MARK: - 􁁌 Patterns on pants Image(systemName: "fan.fill") - .resizable() - .foregroundStyle(.white) - .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.01, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) + .arrangeShape( + primaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.01, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true) + ) Image(systemName: "fan.fill") - .resizable() - .foregroundStyle(.white) - .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true)) + .arrangeShape( + primaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true) + ) Image(systemName: "fan.fill") - .resizable() - .foregroundStyle(.white) - .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true)) + .arrangeShape( + primaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true) + ) Image(systemName: "fan.fill") - .resizable() - .foregroundStyle(.white) - .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) - .offset(y: model.calculatingProportionalValue(withRatio: 0.099, forPreview: true)) + .arrangeShape( + primaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.099, forPreview: true) + ) // MARK: - 􀲟 Concealing part for pants Image(systemName: "oval.fill") - .resizable() - .foregroundStyle(.yellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.11, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true)) - .rotationEffect(.degrees(45)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.07, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true)) + .arrangeShape( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.11, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true), + rotationDegrees: 45, + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.07, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true) + ) Image(systemName: "oval.fill") - .resizable() - .foregroundStyle(.yellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.11, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true)) - .rotationEffect(.degrees(-47)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - y: model.calculatingProportionalValue(withRatio: 0.089, forPreview: true)) + .arrangeShape( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.11, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true), + rotationDegrees: -47, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.089, forPreview: true) + ) // MARK: - 􁎘 Abdomen Image(systemName: "visionpro.fill") - .resizable() - .foregroundStyle(.yellow) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.25, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true)) - .rotationEffect(.degrees(180)) - .offset(y: model.calculatingProportionalValue(withRatio: -0.045, forPreview: true)) + .arrangeShape( + primaryColor: .yellow, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.25, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + rotationDegrees: 180, + verticalOffset: model.calculatingProportionalValue(withRatio: -0.045, forPreview: true) + ) // MARK: - 􀥤 Belly button Image(systemName: "poweron") - .resizable() - .foregroundStyle(.black) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.002, forPreview: true)) - .rotationEffect(.degrees(180)) + .arrangeShape( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.002, forPreview: true), + rotationDegrees: 180 + ) // MARK: - 􀕩 Niple Image(systemName: "smallcircle.filled.circle.fill") - .resizable() - .foregroundStyle(.brown) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true)) - .rotationEffect(.degrees(15)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.138, forPreview: true)) + .arrangeShape( + primaryColor: .yellow, + secondaryColor: .brown, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), + rotationDegrees: 15, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.138, forPreview: true) + ) Image(systemName: "smallcircle.filled.circle.fill") - .resizable() - .foregroundStyle(.brown) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true)) - .rotationEffect(.degrees(-15)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.09, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.14, forPreview: true)) + .arrangeShape( + primaryColor: .yellow, + secondaryColor: .brown, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), + rotationDegrees: -15, + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.09, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.14, forPreview: true) + ) // MARK: - 􀧷 Contour Image(systemName: "capsule.portrait.fill") - .resizable() - .foregroundStyle(.yellow) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.16, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.22, forPreview: true)) - .offset(y: model.calculatingProportionalValue(withRatio: -0.4, forPreview: true)) + .arrangeShape( + primaryColor: .yellow, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.16, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.22, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.4, forPreview: true) + ) Image(systemName: "capsule.portrait.fill") - .resizable() - .foregroundStyle(.yellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.16, forPreview: true)) - .offset(y: model.calculatingProportionalValue(withRatio: -0.35, forPreview: true)) + .arrangeShape( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.16, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.35, forPreview: true) + ) // MARK: - 􀨯 Nose Image(systemName: "nose") - .resizable() - .foregroundStyle(.black) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.045, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true)) - .offset(y: model.calculatingProportionalValue(withRatio: -0.38, forPreview: true)) + .arrangeShape( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.045, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.38, forPreview: true) + ) // MARK: - 􀦭 Eyebrow Image(systemName: "eyebrow") - .resizable() - .foregroundStyle(.black) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) - .rotationEffect(.degrees(10)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.41, forPreview: true)) - + .arrangeShape( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + rotationDegrees: 10, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.41, forPreview: true) + ) + Image(systemName: "eyebrow") - .resizable() - .foregroundStyle(.black) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.045, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true)) - .rotation3DEffect(.degrees(180), - axis: (x: 0, y: 1, z: 0)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.408, forPreview: true)) + .arrangeShape( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.045, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + flip: .horizontal, + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.408, forPreview: true) + ) // MARK: - 􀧷 Concealing part for eyebrow Image(systemName: "capsule.portrait.fill") - .resizable() - .foregroundStyle(.yellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true)) - .rotationEffect(.degrees(-10)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.035, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.396, forPreview: true)) + .arrangeShape( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), + rotationDegrees: -10, + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.035, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.396, forPreview: true) + ) Image(systemName: "capsule.portrait.fill") - .resizable() - .foregroundStyle(.yellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true)) - .rotationEffect(.degrees(10)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.035, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.396, forPreview: true)) + .arrangeShape( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), + rotationDegrees: 10, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.035, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.396, forPreview: true) + ) // MARK: - 􀋭 Eye frame Image(systemName: "eye") - .resizable() - .foregroundStyle(.black) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.4, forPreview: true)) - + .arrangeShape( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.4, forPreview: true) + ) + Image(systemName: "eye") - .resizable() - .foregroundStyle(.black) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.4, forPreview: true)) + .arrangeShape( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.4, forPreview: true) + ) // MARK: - 􀋮 Eye Image(systemName: "eye.fill") - .resizable() - .foregroundStyle(.white) - .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.4, forPreview: true)) + .arrangeShape( + primaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.4, forPreview: true) + ) Image(systemName: "eye.fill") - .resizable() - .foregroundStyle(.white) - .frame(width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.4, forPreview: true)) + .arrangeShape( + primaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.4, forPreview: true) + ) // MARK: - 􀦪 Mouth Image(systemName: "mouth.fill") - .resizable() - .foregroundStyle(.red) - .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true)) - .offset(y: model.calculatingProportionalValue(withRatio: -0.32, forPreview: true)) + .arrangeShape( + primaryColor: .red, + width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.32, forPreview: true) + ) Image(systemName: "mouth.fill") - .resizable() - .foregroundStyle(.red) - .frame(width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true)) - .offset(y: model.calculatingProportionalValue(withRatio: -0.33, forPreview: true)) + .arrangeShape( + primaryColor: .red, + width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.33, forPreview: true) + ) // MARK: - 􁒀 Teeth Image(systemName: "window.casement.closed") - .resizable() - .foregroundStyle(.black, .white) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.015, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.029, forPreview: true)) - .rotationEffect(.degrees(90)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.013, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.328, forPreview: true)) + .arrangeShape( + primaryColor: .black, + secondaryColor: .white, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.015, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.029, forPreview: true), + rotationDegrees: 90, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.013, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.328, forPreview: true) + ) Image(systemName: "window.casement.closed") - .resizable() - .foregroundStyle(.black, .white) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.015, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.029, forPreview: true)) - .rotationEffect(.degrees(90)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.014, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.328, forPreview: true)) + .arrangeShape( + primaryColor: .black, + secondaryColor: .white, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.015, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.029, forPreview: true), + rotationDegrees: 90, + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.014, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.328, forPreview: true) + ) // MARK: - 􀲟 Hair Image(systemName: "oval.fill") - .resizable() - .foregroundStyle(.black) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.057, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.001, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.49, forPreview: true)) + .arrangeShape( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.057, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.001, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.49, forPreview: true) + ) // MARK: - 􀠒 Off-center part hair style Image(systemName: "drop.fill") - .resizable() - .foregroundStyle(.black) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true)) - .rotationEffect(.degrees(-65)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.48, forPreview: true)) + .arrangeShape( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + rotationDegrees: -65, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.48, forPreview: true) + ) Image(systemName: "drop.fill") - .resizable() - .foregroundStyle(.black) - .fontWeight(.ultraLight) - .frame(width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true)) - .rotationEffect(.degrees(95)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.47, forPreview: true)) + .arrangeShape( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + rotationDegrees: 95, + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.47, forPreview: true) + ) } } } From 2e146554ac398941960fae38696f2f144cff76a5 Mon Sep 17 00:00:00 2001 From: littleossa Date: Fri, 9 Feb 2024 00:43:49 +0900 Subject: [PATCH 056/108] Add WorldPeacePreview --- .../project.pbxproj | 20 ++++ .../CrayonBoy/CrayonBoyPreviewView.swift | 1 - .../WorldPeace+CharacterPosition.swift | 85 ++++++++++++++ .../WorldPeace/WorldPeacePreviewView.swift | 106 ++++++++++++++++++ .../Common/Models/Offset.swift | 13 +++ 5 files changed, 224 insertions(+), 1 deletion(-) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeace+CharacterPosition.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeacePreviewView.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/Offset.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index a86ff30..9af815e 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -43,6 +43,9 @@ 97624C3A28C82DBB004E1720 /* CharacterAppearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3928C82DBB004E1720 /* CharacterAppearance.swift */; }; 97624C3C28C935F0004E1720 /* FiveCharactersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3B28C935F0004E1720 /* FiveCharactersView.swift */; }; 97624C3E28C93693004E1720 /* CharactersType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3D28C93693004E1720 /* CharactersType.swift */; }; + 9767DEFA2B751C2C00457DA1 /* WorldPeacePreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEF92B751C2C00457DA1 /* WorldPeacePreviewView.swift */; }; + 9767DEFC2B7523A900457DA1 /* Offset.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEFB2B7523A900457DA1 /* Offset.swift */; }; + 9767DEFE2B752E0400457DA1 /* WorldPeace+CharacterPosition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEFD2B752E0400457DA1 /* WorldPeace+CharacterPosition.swift */; }; 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; @@ -112,6 +115,9 @@ 97624C3928C82DBB004E1720 /* CharacterAppearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CharacterAppearance.swift; sourceTree = ""; }; 97624C3B28C935F0004E1720 /* FiveCharactersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FiveCharactersView.swift; sourceTree = ""; }; 97624C3D28C93693004E1720 /* CharactersType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CharactersType.swift; sourceTree = ""; }; + 9767DEF92B751C2C00457DA1 /* WorldPeacePreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorldPeacePreviewView.swift; sourceTree = ""; }; + 9767DEFB2B7523A900457DA1 /* Offset.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Offset.swift; sourceTree = ""; }; + 9767DEFD2B752E0400457DA1 /* WorldPeace+CharacterPosition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorldPeace+CharacterPosition.swift"; sourceTree = ""; }; 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; @@ -315,6 +321,15 @@ path = Animals; sourceTree = ""; }; + 9767DEF82B751C1300457DA1 /* WorldPeace */ = { + isa = PBXGroup; + children = ( + 9767DEF92B751C2C00457DA1 /* WorldPeacePreviewView.swift */, + 9767DEFD2B752E0400457DA1 /* WorldPeace+CharacterPosition.swift */, + ); + path = WorldPeace; + sourceTree = ""; + }; 97AD530D2B70DBC70034FB5D /* ArtisticWorldOfSFSymbols */ = { isa = PBXGroup; children = ( @@ -351,6 +366,7 @@ children = ( 97EF438E2B726D66003648F5 /* ArtWorkModel */, 97AD53172B70DFF30034FB5D /* AnimationValues.swift */, + 9767DEFB2B7523A900457DA1 /* Offset.swift */, ); path = Models; sourceTree = ""; @@ -360,6 +376,7 @@ children = ( 97EF43962B7332FB003648F5 /* Magician */, 97EF439F2B74CA22003648F5 /* CrayonBoy */, + 9767DEF82B751C1300457DA1 /* WorldPeace */, 97AD531E2B70E2770034FB5D /* AfroBoy */, 97EF43892B725DE7003648F5 /* Nosebleed */, 97EF43912B72D3AF003648F5 /* ImWearingPants */, @@ -569,6 +586,7 @@ files = ( 97EF43932B72D3E2003648F5 /* ImWearingPantsPreviewView.swift in Sources */, 97EF439E2B744C4C003648F5 /* Color+.swift in Sources */, + 9767DEFC2B7523A900457DA1 /* Offset.swift in Sources */, 97624C2F28C2E608004E1720 /* SmallFirework.swift in Sources */, 9748BE232893B35A006DF0BE /* WorldPeace.swift in Sources */, 9748BE57289DCBB0006DF0BE /* LargeFirework.swift in Sources */, @@ -578,10 +596,12 @@ 9748BE372893D064006DF0BE /* PartyAnimals.swift in Sources */, 971D9DEA28C9731D00136A36 /* iOSDCJapan2022SymbolType.swift in Sources */, 97AD53182B70DFF30034FB5D /* AnimationValues.swift in Sources */, + 9767DEFE2B752E0400457DA1 /* WorldPeace+CharacterPosition.swift in Sources */, 97624C3E28C93693004E1720 /* CharactersType.swift in Sources */, 97624C2A28C2BC9A004E1720 /* MediumFirework.swift in Sources */, 97624C3A28C82DBB004E1720 /* CharacterAppearance.swift in Sources */, 97EF43982B733337003648F5 /* MagicianArtView.swift in Sources */, + 9767DEFA2B751C2C00457DA1 /* WorldPeacePreviewView.swift in Sources */, 9748BE3A2893D0E3006DF0BE /* Frog.swift in Sources */, 97CD46E928BF080300919B65 /* iOSDCJapan2022Logo.swift in Sources */, 97AD53242B70E48F0034FB5D /* PlayButton.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyPreviewView.swift index baf984b..1c68be1 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyPreviewView.swift @@ -174,5 +174,4 @@ struct CrayonBoyPreviewView: View { #Preview { CrayonBoyPreviewView() .environment(ArtWorkModel.preview) -// .environment(ArtWorkModel.init(screenSize: .init(width: 4600, height: 4600))) } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeace+CharacterPosition.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeace+CharacterPosition.swift new file mode 100644 index 0000000..c7d522b --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeace+CharacterPosition.swift @@ -0,0 +1,85 @@ +// +// WorldPeace+CharacterPosition.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +enum CharacterPosition: String, CaseIterable, Identifiable { + case topFirst + case topSecond + case topThird + case topFourth + case topFifth + case bottomFirst + case bottomSecond + case bottomThird + case bottomFourth + case bottomFifth + + struct Value { + let character: String + let color: Color + let horizontalOffsetRatio: CGFloat + let verticalOffsetRatio: CGFloat + } + + var id: String { self.rawValue } + + var value: Value { + switch self { + case .topFirst: + Value(character: "w", + color: .red, + horizontalOffsetRatio: -0.34, + verticalOffsetRatio: -0.4) + case .topSecond: + Value(character: "o", + color: .yellow, + horizontalOffsetRatio: -0.17, + verticalOffsetRatio: -0.4) + case .topThird: + Value(character: "r", + color: .green, + horizontalOffsetRatio: 0, + verticalOffsetRatio: -0.4) + case .topFourth: + Value(character: "l", + color: .blue, + horizontalOffsetRatio: 0.17, + verticalOffsetRatio: -0.4) + case .topFifth: + Value(character: "d", + color: .purple, + horizontalOffsetRatio: 0.34, + verticalOffsetRatio: -0.4) + case .bottomFirst: + Value(character: "p", + color: .teal, + horizontalOffsetRatio: -0.34, + verticalOffsetRatio: 0.4) + case .bottomSecond: + Value(character: "e", + color: .pink, + horizontalOffsetRatio: -0.17, + verticalOffsetRatio: 0.4) + case .bottomThird: + Value(character: "a", + color: .mint, + horizontalOffsetRatio: 0, + verticalOffsetRatio: 0.4) + case .bottomFourth: + Value(character: "c", + color: .indigo, + horizontalOffsetRatio: 0.17, + verticalOffsetRatio: 0.4) + case .bottomFifth: + Value(character: "e", + color: .orange, + horizontalOffsetRatio: 0.34, + verticalOffsetRatio: 0.4) + } + } +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeacePreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeacePreviewView.swift new file mode 100644 index 0000000..e46d431 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeacePreviewView.swift @@ -0,0 +1,106 @@ +// +// WorldPeacePreviewView.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +struct WorldPeacePreviewView: View { + + @Environment(ArtWorkModel.self) var model + + var body: some View { + + ZStack { + + // MARK: - Characters black shadow + ForEach(CharacterPosition.allCases) { + Image(systemName: "\($0.value.character).circle") + .arrangeShape( + fontWeight: .bold, + width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: $0.value.horizontalOffsetRatio, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: $0.value.verticalOffsetRatio, forPreview: true) + ) + } + + // MARK: - Colored Characters + ForEach(CharacterPosition.allCases) { + Image(systemName: "\($0.value.character).circle") + .arrangeShape( + primaryColor: $0.value.color, + fontWeight: .bold, + width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: $0.value.horizontalOffsetRatio, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: $0.value.verticalOffsetRatio, forPreview: true) + ) + } + .offset(x: model.calculatingProportionalValue(withRatio: -0.001)) + + // MARK: - 􀀀 Concealing part for Characters + ForEach(CharacterPosition.allCases) { + Image(systemName: "circle") + .arrangeShape( + primaryColor: .systemBackground, + fontWeight: .black, + width: model.calculatingProportionalValue(withRatio: 0.158, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.154, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: $0.value.horizontalOffsetRatio, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: $0.value.verticalOffsetRatio, forPreview: true) + ) + } + .offset(x: model.calculatingProportionalValue(withRatio: -0.0006)) + + // MARK: - 􀀁 Sea + Image(systemName: "circle.fill") + .arrangeShape( + primaryColor: .cyan, + width: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true) + ) + + // MARK: - 􀀁 Sea + Image(systemName: "circle.fill") + .arrangeShape( + primaryColor: .cyan, + width: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true) + ) + + // MARK: - 􀵶 Earth + Image(systemName: "globe.asia.australia.fill") + .arrangeShape( + primaryColor: .green, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true) + ) + + // MARK: - 􀵵 Earth frame + Image(systemName: "globe.asia.australia") + .arrangeShape( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.57, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.57, forPreview: true) + ) + + // MARK: - 􀺎 Peace sign + Image(systemName: "peacesign") + .arrangeShape( + primaryColor: .white, + fontWeight: .thin, + width: model.calculatingProportionalValue(withRatio: 0.535, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.535, forPreview: true) + ) + } + } +} + +#Preview { + WorldPeacePreviewView() + .environment(ArtWorkModel.init(screenSize: .init(width: 4600, height: 4600))) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/Offset.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/Offset.swift new file mode 100644 index 0000000..9dfba23 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/Offset.swift @@ -0,0 +1,13 @@ +// +// Offset.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import CoreGraphics + +struct Offset { + let x: CGFloat + let y: CGFloat +} From c5afa0b2ace67f0a207d2cbad755103085a8e538 Mon Sep 17 00:00:00 2001 From: littleossa Date: Fri, 9 Feb 2024 01:14:50 +0900 Subject: [PATCH 057/108] Add World peace art --- .../project.pbxproj | 8 +- .../ArtGalleryView.swift | 7 + .../WorldPeace+CharacterPosition.swift | 159 ++++++++++-------- .../WorldPeace/WorldPeaceArtView.swift | 118 +++++++++++++ .../WorldPeace/WorldPeacePreviewView.swift | 157 ++++++++--------- .../Common/Models/Offset.swift | 13 -- 6 files changed, 288 insertions(+), 174 deletions(-) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView.swift delete mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/Offset.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 9af815e..fb77c00 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -44,8 +44,8 @@ 97624C3C28C935F0004E1720 /* FiveCharactersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3B28C935F0004E1720 /* FiveCharactersView.swift */; }; 97624C3E28C93693004E1720 /* CharactersType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3D28C93693004E1720 /* CharactersType.swift */; }; 9767DEFA2B751C2C00457DA1 /* WorldPeacePreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEF92B751C2C00457DA1 /* WorldPeacePreviewView.swift */; }; - 9767DEFC2B7523A900457DA1 /* Offset.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEFB2B7523A900457DA1 /* Offset.swift */; }; 9767DEFE2B752E0400457DA1 /* WorldPeace+CharacterPosition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEFD2B752E0400457DA1 /* WorldPeace+CharacterPosition.swift */; }; + 9767DF002B752E4700457DA1 /* WorldPeaceArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEFF2B752E4700457DA1 /* WorldPeaceArtView.swift */; }; 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; @@ -116,8 +116,8 @@ 97624C3B28C935F0004E1720 /* FiveCharactersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FiveCharactersView.swift; sourceTree = ""; }; 97624C3D28C93693004E1720 /* CharactersType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CharactersType.swift; sourceTree = ""; }; 9767DEF92B751C2C00457DA1 /* WorldPeacePreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorldPeacePreviewView.swift; sourceTree = ""; }; - 9767DEFB2B7523A900457DA1 /* Offset.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Offset.swift; sourceTree = ""; }; 9767DEFD2B752E0400457DA1 /* WorldPeace+CharacterPosition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorldPeace+CharacterPosition.swift"; sourceTree = ""; }; + 9767DEFF2B752E4700457DA1 /* WorldPeaceArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorldPeaceArtView.swift; sourceTree = ""; }; 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; @@ -324,6 +324,7 @@ 9767DEF82B751C1300457DA1 /* WorldPeace */ = { isa = PBXGroup; children = ( + 9767DEFF2B752E4700457DA1 /* WorldPeaceArtView.swift */, 9767DEF92B751C2C00457DA1 /* WorldPeacePreviewView.swift */, 9767DEFD2B752E0400457DA1 /* WorldPeace+CharacterPosition.swift */, ); @@ -366,7 +367,6 @@ children = ( 97EF438E2B726D66003648F5 /* ArtWorkModel */, 97AD53172B70DFF30034FB5D /* AnimationValues.swift */, - 9767DEFB2B7523A900457DA1 /* Offset.swift */, ); path = Models; sourceTree = ""; @@ -586,10 +586,10 @@ files = ( 97EF43932B72D3E2003648F5 /* ImWearingPantsPreviewView.swift in Sources */, 97EF439E2B744C4C003648F5 /* Color+.swift in Sources */, - 9767DEFC2B7523A900457DA1 /* Offset.swift in Sources */, 97624C2F28C2E608004E1720 /* SmallFirework.swift in Sources */, 9748BE232893B35A006DF0BE /* WorldPeace.swift in Sources */, 9748BE57289DCBB0006DF0BE /* LargeFirework.swift in Sources */, + 9767DF002B752E4700457DA1 /* WorldPeaceArtView.swift in Sources */, 9748BE4828981096006DF0BE /* DemonWrestlerFace.swift in Sources */, 97AD532D2B717C950034FB5D /* AfroBoyPreviewView.swift in Sources */, 97EF438B2B725E02003648F5 /* NosebleedArtView.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift index b26c2ae..2d0c2d3 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift @@ -54,6 +54,13 @@ struct ArtGalleryView: View { .galleryGridItemView(length: model.galleryColumnLength) } + NavigationLink { + WorldPeaceArtView() + } label: { + WorldPeacePreviewView() + .galleryGridItemView(length: model.galleryColumnLength) + } + NavigationLink { AfroBoyArtView() } label: { diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeace+CharacterPosition.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeace+CharacterPosition.swift index c7d522b..ca29c2d 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeace+CharacterPosition.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeace+CharacterPosition.swift @@ -7,79 +7,94 @@ import SwiftUI -enum CharacterPosition: String, CaseIterable, Identifiable { - case topFirst - case topSecond - case topThird - case topFourth - case topFifth - case bottomFirst - case bottomSecond - case bottomThird - case bottomFourth - case bottomFifth - - struct Value { - let character: String - let color: Color - let horizontalOffsetRatio: CGFloat - let verticalOffsetRatio: CGFloat - } - - var id: String { self.rawValue } +extension WorldPeaceArtView { - var value: Value { - switch self { - case .topFirst: - Value(character: "w", - color: .red, - horizontalOffsetRatio: -0.34, - verticalOffsetRatio: -0.4) - case .topSecond: - Value(character: "o", - color: .yellow, - horizontalOffsetRatio: -0.17, - verticalOffsetRatio: -0.4) - case .topThird: - Value(character: "r", - color: .green, - horizontalOffsetRatio: 0, - verticalOffsetRatio: -0.4) - case .topFourth: - Value(character: "l", - color: .blue, - horizontalOffsetRatio: 0.17, - verticalOffsetRatio: -0.4) - case .topFifth: - Value(character: "d", - color: .purple, - horizontalOffsetRatio: 0.34, - verticalOffsetRatio: -0.4) - case .bottomFirst: - Value(character: "p", - color: .teal, - horizontalOffsetRatio: -0.34, - verticalOffsetRatio: 0.4) - case .bottomSecond: - Value(character: "e", - color: .pink, - horizontalOffsetRatio: -0.17, - verticalOffsetRatio: 0.4) - case .bottomThird: - Value(character: "a", - color: .mint, - horizontalOffsetRatio: 0, - verticalOffsetRatio: 0.4) - case .bottomFourth: - Value(character: "c", - color: .indigo, - horizontalOffsetRatio: 0.17, - verticalOffsetRatio: 0.4) - case .bottomFifth: - Value(character: "e", - color: .orange, - horizontalOffsetRatio: 0.34, - verticalOffsetRatio: 0.4) + enum CharacterPosition: String, CaseIterable, Identifiable { + case topFirst + case topSecond + case topThird + case topFourth + case topFifth + case bottomFirst + case bottomSecond + case bottomThird + case bottomFourth + case bottomFifth + + struct Value { + let character: String + let color: Color + let initialPosition: ArtWorkModel.InitialSymbolRow + let horizontalOffsetRatio: CGFloat + let verticalOffsetRatio: CGFloat + } + + var id: String { self.rawValue } + + var value: Value { + switch self { + case .topFirst: + Value(character: "w", + color: .red, + initialPosition: .second(.second), + horizontalOffsetRatio: -0.34, + verticalOffsetRatio: -0.4) + case .topSecond: + Value(character: "o", + color: .yellow, + initialPosition: .third(.sixth), + horizontalOffsetRatio: -0.17, + verticalOffsetRatio: -0.4) + case .topThird: + Value(character: "r", + color: .green, + initialPosition: .second(.first), + + horizontalOffsetRatio: 0, + verticalOffsetRatio: -0.4) + case .topFourth: + Value(character: "l", + color: .blue, + initialPosition: .third(.fifth), + horizontalOffsetRatio: 0.17, + verticalOffsetRatio: -0.4) + case .topFifth: + Value(character: "d", + color: .purple, + initialPosition: .third(.third), + horizontalOffsetRatio: 0.34, + verticalOffsetRatio: -0.4) + case .bottomFirst: + Value(character: "p", + color: .teal, + initialPosition: .third(.seventh), + horizontalOffsetRatio: -0.34, + verticalOffsetRatio: 0.4) + case .bottomSecond: + Value(character: "e", + color: .pink, + initialPosition: .third(.fourth), + horizontalOffsetRatio: -0.17, + verticalOffsetRatio: 0.4) + case .bottomThird: + Value(character: "a", + color: .mint, + initialPosition: .third(.first), + horizontalOffsetRatio: 0, + verticalOffsetRatio: 0.4) + case .bottomFourth: + Value(character: "c", + color: .indigo, + initialPosition: .third(.second), + horizontalOffsetRatio: 0.17, + verticalOffsetRatio: 0.4) + case .bottomFifth: + Value(character: "e", + color: .orange, + initialPosition: .third(.fourth), + horizontalOffsetRatio: 0.34, + verticalOffsetRatio: 0.4) + } } } } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView.swift new file mode 100644 index 0000000..8e8b921 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView.swift @@ -0,0 +1,118 @@ +// +// WorldPeaceArtView.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +struct WorldPeaceArtView: View { + + @Environment(ArtWorkModel.self) var model + @State private var isAnimating = false + + var body: some View { + + ZStack { + + // MARK: - Characters black shadow + ForEach(WorldPeaceArtView.CharacterPosition.allCases) { + + AnimatableSymbolView( + name: "\($0.value.character).circle", + initialPosition: $0.value.initialPosition, + secondaryColor: .systemBackground, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: $0.value.horizontalOffsetRatio, + verticalOffsetRatio: $0.value.verticalOffsetRatio, + isAnimating: isAnimating, + symbolCountToWaitFor: 4 + ) + } + + // MARK: - Colored Characters + ForEach(WorldPeaceArtView.CharacterPosition.allCases) { + AnimatableSymbolView( + name: "\($0.value.character).circle", + initialPosition: $0.value.initialPosition, + primaryColor: $0.value.color, + secondaryColor: .systemBackground, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: $0.value.horizontalOffsetRatio - 0.006, + verticalOffsetRatio: $0.value.verticalOffsetRatio, + isAnimating: isAnimating, + symbolCountToWaitFor: 5 + ) + } + + // MARK: - 􀀁 Sea + AnimatableSymbolView( + name: "circle.fill", + initialPosition: .second(.third), + primaryColor: .cyan, + widthRatio: 0.55, + heightRatio: 0.55, + isAnimating: isAnimating, + symbolCountToWaitFor: 0 + ) + + // MARK: - 􀵶 Earth + AnimatableSymbolView( + name: "globe.asia.australia.fill", + initialPosition: .second(.fourth), + primaryColor: .green, + fontWeight: .ultraLight, + widthRatio: 0.55, + heightRatio: 0.55, + isAnimating: isAnimating, + symbolCountToWaitFor: 1 + ) + + // MARK: - 􀵵 Earth frame + AnimatableSymbolView( + name: "globe.asia.australia", + initialPosition: .second(.fifth), + fontWeight: .ultraLight, + widthRatio: 0.57, + heightRatio: 0.57, + isAnimating: isAnimating, + symbolCountToWaitFor: 2 + ) + + // MARK: - 􀺎 Peace sign + AnimatableSymbolView( + name: "peacesign", + initialPosition: .second(.sixth), + primaryColor: .white, + fontWeight: .thin, + widthRatio: 0.535, + heightRatio: 0.535, + isAnimating: isAnimating, + symbolCountToWaitFor: 3 + ) + } + .navigationTitle("World Peace") + .navigationBarTitleDisplayMode(.inline) + .toolbar(content: { + ToolbarItemGroup(placement: .bottomBar) { + Spacer() + + PlayButton { + isAnimating = true + } + .font(.system(size: 32)) + .disabled(isAnimating) + } + }) + } +} + +#Preview { + NavigationStack { + WorldPeaceArtView() + .environment(ArtWorkModel.preview) + } +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeacePreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeacePreviewView.swift index e46d431..7f3b83e 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeacePreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeacePreviewView.swift @@ -13,94 +13,81 @@ struct WorldPeacePreviewView: View { var body: some View { - ZStack { - - // MARK: - Characters black shadow - ForEach(CharacterPosition.allCases) { - Image(systemName: "\($0.value.character).circle") - .arrangeShape( - fontWeight: .bold, - width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: $0.value.horizontalOffsetRatio, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: $0.value.verticalOffsetRatio, forPreview: true) - ) - } - - // MARK: - Colored Characters - ForEach(CharacterPosition.allCases) { - Image(systemName: "\($0.value.character).circle") - .arrangeShape( - primaryColor: $0.value.color, - fontWeight: .bold, - width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: $0.value.horizontalOffsetRatio, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: $0.value.verticalOffsetRatio, forPreview: true) - ) - } - .offset(x: model.calculatingProportionalValue(withRatio: -0.001)) - - // MARK: - 􀀀 Concealing part for Characters - ForEach(CharacterPosition.allCases) { - Image(systemName: "circle") - .arrangeShape( - primaryColor: .systemBackground, - fontWeight: .black, - width: model.calculatingProportionalValue(withRatio: 0.158, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.154, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: $0.value.horizontalOffsetRatio, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: $0.value.verticalOffsetRatio, forPreview: true) - ) - } - .offset(x: model.calculatingProportionalValue(withRatio: -0.0006)) - - // MARK: - 􀀁 Sea - Image(systemName: "circle.fill") - .arrangeShape( - primaryColor: .cyan, - width: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true) - ) - - // MARK: - 􀀁 Sea - Image(systemName: "circle.fill") - .arrangeShape( - primaryColor: .cyan, - width: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true) - ) - - // MARK: - 􀵶 Earth - Image(systemName: "globe.asia.australia.fill") - .arrangeShape( - primaryColor: .green, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true) - ) - - // MARK: - 􀵵 Earth frame - Image(systemName: "globe.asia.australia") - .arrangeShape( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.57, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.57, forPreview: true) - ) - - // MARK: - 􀺎 Peace sign - Image(systemName: "peacesign") - .arrangeShape( - primaryColor: .white, - fontWeight: .thin, - width: model.calculatingProportionalValue(withRatio: 0.535, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.535, forPreview: true) - ) - } + ZStack { + + // MARK: - Characters black shadow + ForEach(WorldPeaceArtView.CharacterPosition.allCases) { + Image(systemName: "\($0.value.character).circle") + .arrangeShape( + secondaryColor: .systemBackground, + fontWeight: .bold, + width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: $0.value.horizontalOffsetRatio, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: $0.value.verticalOffsetRatio, forPreview: true) + ) + } + + // MARK: - Colored Characters + ForEach(WorldPeaceArtView.CharacterPosition.allCases) { + Image(systemName: "\($0.value.character).circle") + .arrangeShape( + primaryColor: $0.value.color, + secondaryColor: .systemBackground, + fontWeight: .bold, + width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: $0.value.horizontalOffsetRatio - 0.006, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: $0.value.verticalOffsetRatio, forPreview: true) + ) + } + + // MARK: - 􀀁 Sea + Image(systemName: "circle.fill") + .arrangeShape( + primaryColor: .cyan, + width: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true) + ) + + // MARK: - 􀀁 Sea + Image(systemName: "circle.fill") + .arrangeShape( + primaryColor: .cyan, + width: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true) + ) + + // MARK: - 􀵶 Earth + Image(systemName: "globe.asia.australia.fill") + .arrangeShape( + primaryColor: .green, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true) + ) + + // MARK: - 􀵵 Earth frame + Image(systemName: "globe.asia.australia") + .arrangeShape( + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.57, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.57, forPreview: true) + ) + + // MARK: - 􀺎 Peace sign + Image(systemName: "peacesign") + .arrangeShape( + primaryColor: .white, + fontWeight: .thin, + width: model.calculatingProportionalValue(withRatio: 0.535, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.535, forPreview: true) + ) + } } } #Preview { WorldPeacePreviewView() - .environment(ArtWorkModel.init(screenSize: .init(width: 4600, height: 4600))) + .environment(ArtWorkModel.init(screenSize: .init(width: 4600, height: 4600))) } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/Offset.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/Offset.swift deleted file mode 100644 index 9dfba23..0000000 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/Offset.swift +++ /dev/null @@ -1,13 +0,0 @@ -// -// Offset.swift -// SFSymbolsArtCollection -// -// Created by Lil Ossa -// - -import CoreGraphics - -struct Offset { - let x: CGFloat - let y: CGFloat -} From d2ed557ee077e62a871faea23fca2ebfbc146a7f Mon Sep 17 00:00:00 2001 From: littleossa Date: Fri, 9 Feb 2024 01:16:03 +0900 Subject: [PATCH 058/108] Remove old world peace art --- .../project.pbxproj | 40 ----- .../ArtWorks/ArtWorkView.swift | 4 +- .../ArtWorks/WorldPeace/Earth.swift | 36 ---- .../Entity/CharacterAppearance.swift | 14 -- .../WorldPeace/Entity/CharactersType.swift | 54 ------ .../WorldPeace/FiveCharactersView.swift | 60 ------- .../ArtWorks/WorldPeace/SFAlphabet.swift | 155 ------------------ .../ArtWorks/WorldPeace/WorldPeace.swift | 42 ----- 8 files changed, 2 insertions(+), 403 deletions(-) delete mode 100644 SFSymbolsArtCollection/ArtWorks/WorldPeace/Earth.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/WorldPeace/Entity/CharacterAppearance.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/WorldPeace/Entity/CharactersType.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/WorldPeace/FiveCharactersView.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/WorldPeace/SFAlphabet.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/WorldPeace/WorldPeace.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index fb77c00..1979ccf 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -10,10 +10,7 @@ 971D9DEA28C9731D00136A36 /* iOSDCJapan2022SymbolType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 971D9DE928C9731D00136A36 /* iOSDCJapan2022SymbolType.swift */; }; 973B2CA128C2546C006ED5F0 /* ArrangeShapeWithFont.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973B2CA028C2546C006ED5F0 /* ArrangeShapeWithFont.swift */; }; 973B2CA428C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973B2CA328C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift */; }; - 9748BE1D289399CF006DF0BE /* SFAlphabet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE1C289399CF006DF0BE /* SFAlphabet.swift */; }; 9748BE2028939B04006DF0BE /* FlipType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE1F28939B04006DF0BE /* FlipType.swift */; }; - 9748BE232893B35A006DF0BE /* WorldPeace.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE222893B35A006DF0BE /* WorldPeace.swift */; }; - 9748BE292893BFE3006DF0BE /* Earth.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE282893BFE3006DF0BE /* Earth.swift */; }; 9748BE2C2893C428006DF0BE /* Bear.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE2B2893C428006DF0BE /* Bear.swift */; }; 9748BE2E2893C688006DF0BE /* AnimalOutline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE2D2893C688006DF0BE /* AnimalOutline.swift */; }; 9748BE302893C706006DF0BE /* AnimalNose.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE2F2893C706006DF0BE /* AnimalNose.swift */; }; @@ -40,9 +37,6 @@ 97624C2C28C2DDAA004E1720 /* Buildings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C2B28C2DDAA004E1720 /* Buildings.swift */; }; 97624C2F28C2E608004E1720 /* SmallFirework.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C2E28C2E608004E1720 /* SmallFirework.swift */; }; 97624C3328C4F43F004E1720 /* GeometryProxy+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3228C4F43F004E1720 /* GeometryProxy+.swift */; }; - 97624C3A28C82DBB004E1720 /* CharacterAppearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3928C82DBB004E1720 /* CharacterAppearance.swift */; }; - 97624C3C28C935F0004E1720 /* FiveCharactersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3B28C935F0004E1720 /* FiveCharactersView.swift */; }; - 97624C3E28C93693004E1720 /* CharactersType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3D28C93693004E1720 /* CharactersType.swift */; }; 9767DEFA2B751C2C00457DA1 /* WorldPeacePreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEF92B751C2C00457DA1 /* WorldPeacePreviewView.swift */; }; 9767DEFE2B752E0400457DA1 /* WorldPeace+CharacterPosition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEFD2B752E0400457DA1 /* WorldPeace+CharacterPosition.swift */; }; 9767DF002B752E4700457DA1 /* WorldPeaceArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEFF2B752E4700457DA1 /* WorldPeaceArtView.swift */; }; @@ -81,10 +75,7 @@ 971D9DE928C9731D00136A36 /* iOSDCJapan2022SymbolType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022SymbolType.swift; sourceTree = ""; }; 973B2CA028C2546C006ED5F0 /* ArrangeShapeWithFont.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrangeShapeWithFont.swift; sourceTree = ""; }; 973B2CA328C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrangeShapeWithWidthAndHeight.swift; sourceTree = ""; }; - 9748BE1C289399CF006DF0BE /* SFAlphabet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFAlphabet.swift; sourceTree = ""; }; 9748BE1F28939B04006DF0BE /* FlipType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlipType.swift; sourceTree = ""; }; - 9748BE222893B35A006DF0BE /* WorldPeace.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorldPeace.swift; sourceTree = ""; }; - 9748BE282893BFE3006DF0BE /* Earth.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Earth.swift; sourceTree = ""; }; 9748BE2B2893C428006DF0BE /* Bear.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bear.swift; sourceTree = ""; }; 9748BE2D2893C688006DF0BE /* AnimalOutline.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimalOutline.swift; sourceTree = ""; }; 9748BE2F2893C706006DF0BE /* AnimalNose.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimalNose.swift; sourceTree = ""; }; @@ -112,9 +103,6 @@ 97624C2B28C2DDAA004E1720 /* Buildings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Buildings.swift; sourceTree = ""; }; 97624C2E28C2E608004E1720 /* SmallFirework.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmallFirework.swift; sourceTree = ""; }; 97624C3228C4F43F004E1720 /* GeometryProxy+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GeometryProxy+.swift"; sourceTree = ""; }; - 97624C3928C82DBB004E1720 /* CharacterAppearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CharacterAppearance.swift; sourceTree = ""; }; - 97624C3B28C935F0004E1720 /* FiveCharactersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FiveCharactersView.swift; sourceTree = ""; }; - 97624C3D28C93693004E1720 /* CharactersType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CharactersType.swift; sourceTree = ""; }; 9767DEF92B751C2C00457DA1 /* WorldPeacePreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorldPeacePreviewView.swift; sourceTree = ""; }; 9767DEFD2B752E0400457DA1 /* WorldPeace+CharacterPosition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorldPeace+CharacterPosition.swift"; sourceTree = ""; }; 9767DEFF2B752E4700457DA1 /* WorldPeaceArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorldPeaceArtView.swift; sourceTree = ""; }; @@ -161,15 +149,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 971D9DE528C93E5900136A36 /* Entity */ = { - isa = PBXGroup; - children = ( - 97624C3D28C93693004E1720 /* CharactersType.swift */, - 97624C3928C82DBB004E1720 /* CharacterAppearance.swift */, - ); - path = Entity; - sourceTree = ""; - }; 971D9DE628C93EB500136A36 /* Common */ = { isa = PBXGroup; children = ( @@ -203,18 +182,6 @@ path = Enums; sourceTree = ""; }; - 9748BE212893B2CD006DF0BE /* WorldPeace */ = { - isa = PBXGroup; - children = ( - 9748BE222893B35A006DF0BE /* WorldPeace.swift */, - 9748BE282893BFE3006DF0BE /* Earth.swift */, - 97624C3B28C935F0004E1720 /* FiveCharactersView.swift */, - 9748BE1C289399CF006DF0BE /* SFAlphabet.swift */, - 971D9DE528C93E5900136A36 /* Entity */, - ); - path = WorldPeace; - sourceTree = ""; - }; 9748BE2A2893C406006DF0BE /* PartyAnimals */ = { isa = PBXGroup; children = ( @@ -304,7 +271,6 @@ 9748BE4428980FE4006DF0BE /* DemonWrestler */, 9748BE3D2897ADBD006DF0BE /* ArmHair */, 9748BE2A2893C406006DF0BE /* PartyAnimals */, - 9748BE212893B2CD006DF0BE /* WorldPeace */, 97CD46E528BEF8A000919B65 /* iOSDCJapan2022 */, ); path = ArtWorks; @@ -587,7 +553,6 @@ 97EF43932B72D3E2003648F5 /* ImWearingPantsPreviewView.swift in Sources */, 97EF439E2B744C4C003648F5 /* Color+.swift in Sources */, 97624C2F28C2E608004E1720 /* SmallFirework.swift in Sources */, - 9748BE232893B35A006DF0BE /* WorldPeace.swift in Sources */, 9748BE57289DCBB0006DF0BE /* LargeFirework.swift in Sources */, 9767DF002B752E4700457DA1 /* WorldPeaceArtView.swift in Sources */, 9748BE4828981096006DF0BE /* DemonWrestlerFace.swift in Sources */, @@ -597,9 +562,7 @@ 971D9DEA28C9731D00136A36 /* iOSDCJapan2022SymbolType.swift in Sources */, 97AD53182B70DFF30034FB5D /* AnimationValues.swift in Sources */, 9767DEFE2B752E0400457DA1 /* WorldPeace+CharacterPosition.swift in Sources */, - 97624C3E28C93693004E1720 /* CharactersType.swift in Sources */, 97624C2A28C2BC9A004E1720 /* MediumFirework.swift in Sources */, - 97624C3A28C82DBB004E1720 /* CharacterAppearance.swift in Sources */, 97EF43982B733337003648F5 /* MagicianArtView.swift in Sources */, 9767DEFA2B751C2C00457DA1 /* WorldPeacePreviewView.swift in Sources */, 9748BE3A2893D0E3006DF0BE /* Frog.swift in Sources */, @@ -610,8 +573,6 @@ 97AD531A2B70E0530034FB5D /* Font.Weight+.swift in Sources */, 9748BE6428A3936E006DF0BE /* ArtWorkView.swift in Sources */, 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */, - 97624C3C28C935F0004E1720 /* FiveCharactersView.swift in Sources */, - 9748BE292893BFE3006DF0BE /* Earth.swift in Sources */, 9748BE5F289F194E006DF0BE /* RocketFirework.swift in Sources */, 9748BE2E2893C688006DF0BE /* AnimalOutline.swift in Sources */, 9748BE322893C91F006DF0BE /* AnimalEye.swift in Sources */, @@ -619,7 +580,6 @@ 9748BE5D289DD696006DF0BE /* Building.swift in Sources */, 97AD53312B71A5130034FB5D /* GalleryGridView.swift in Sources */, 97EF43A32B74D9BA003648F5 /* Image+arrangeShape.swift in Sources */, - 9748BE1D289399CF006DF0BE /* SFAlphabet.swift in Sources */, 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */, 9748BE6628A395D5006DF0BE /* ArtWork.swift in Sources */, 97AD532B2B71068B0034FB5D /* AfroBoyArtView.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtWorks/ArtWorkView.swift b/SFSymbolsArtCollection/ArtWorks/ArtWorkView.swift index 1f5e4a2..40eacb2 100644 --- a/SFSymbolsArtCollection/ArtWorks/ArtWorkView.swift +++ b/SFSymbolsArtCollection/ArtWorks/ArtWorkView.swift @@ -17,9 +17,9 @@ struct ArtWorkView: View { case .crayonBoy: EmptyView() case .magician: -EmptyView() + EmptyView() case .worldPeace: - WorldPeace() + EmptyView() case .partyAnimals: PartyAnimals() case .armHair: diff --git a/SFSymbolsArtCollection/ArtWorks/WorldPeace/Earth.swift b/SFSymbolsArtCollection/ArtWorks/WorldPeace/Earth.swift deleted file mode 100644 index ae39be7..0000000 --- a/SFSymbolsArtCollection/ArtWorks/WorldPeace/Earth.swift +++ /dev/null @@ -1,36 +0,0 @@ -// -// Earth.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/07/29. -// - -import SwiftUI - -struct Earth: View { - - let baseLength: CGFloat - - var body: some View { - ZStack { - Image(symbol: .circleFill) - .arrangeShape(color: .cyan, - fontSize: baseLength * 0.5) - - Image(symbol: .globeAsiaAustraliaFill) - .arrangeShape(color: .green, - fontSize: baseLength * 0.55, - fontWeight: .ultraLight) - - Image(symbol: .globeAsiaAustralia) - .arrangeShape(fontSize: baseLength * 0.55, - fontWeight: .ultraLight) - } - } -} - -struct Earth_Previews: PreviewProvider { - static var previews: some View { - Earth(baseLength: 400) - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/WorldPeace/Entity/CharacterAppearance.swift b/SFSymbolsArtCollection/ArtWorks/WorldPeace/Entity/CharacterAppearance.swift deleted file mode 100644 index 1b98621..0000000 --- a/SFSymbolsArtCollection/ArtWorks/WorldPeace/Entity/CharacterAppearance.swift +++ /dev/null @@ -1,14 +0,0 @@ -// -// CharacterAppearance.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/09/07. -// - -import SwiftUI - -struct CharacterAppearance: Hashable { - let alphabet: SFAlphabet.Alphabet - let color: Color - let offsetX: CGFloat -} diff --git a/SFSymbolsArtCollection/ArtWorks/WorldPeace/Entity/CharactersType.swift b/SFSymbolsArtCollection/ArtWorks/WorldPeace/Entity/CharactersType.swift deleted file mode 100644 index 24bd3c7..0000000 --- a/SFSymbolsArtCollection/ArtWorks/WorldPeace/Entity/CharactersType.swift +++ /dev/null @@ -1,54 +0,0 @@ -// -// CharactersType.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/09/08. -// - -import CoreGraphics - -enum CharactersType { - case world - case peace - - func characterAppearances(with baseLength: CGFloat) -> [CharacterAppearance] { - switch self { - case .world: - return [ - CharacterAppearance(alphabet: .w, - color: .red, - offsetX: 0), - CharacterAppearance(alphabet: .o, - color: .yellow, - offsetX: baseLength * -0.05), - CharacterAppearance(alphabet: .r, - color: .green, - offsetX: baseLength * -0.1), - CharacterAppearance(alphabet: .l, - color: .blue, - offsetX: baseLength * -0.15), - CharacterAppearance(alphabet: .d, - color: .purple, - offsetX: baseLength * -0.2) - ] - case .peace: - return [ - CharacterAppearance(alphabet: .p, - color: .cyan, - offsetX: 0), - CharacterAppearance(alphabet: .e, - color: .pink, - offsetX: baseLength * -0.05), - CharacterAppearance(alphabet: .a, - color: .mint, - offsetX: baseLength * -0.1), - CharacterAppearance(alphabet: .c, - color: .indigo, - offsetX: baseLength * -0.15), - CharacterAppearance(alphabet: .e, - color: .orange, - offsetX: baseLength * -0.2) - ] - } - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/WorldPeace/FiveCharactersView.swift b/SFSymbolsArtCollection/ArtWorks/WorldPeace/FiveCharactersView.swift deleted file mode 100644 index be3c93d..0000000 --- a/SFSymbolsArtCollection/ArtWorks/WorldPeace/FiveCharactersView.swift +++ /dev/null @@ -1,60 +0,0 @@ -// -// FiveCharactersView.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/09/08. -// - -import SwiftUI - -// MARK: - Initializer -extension FiveCharactersView { - - init(type: CharactersType, baseLength: CGFloat) { - self.baseLength = baseLength - characters = type.characterAppearances(with: baseLength) - } -} - -struct FiveCharactersView: View { - - let baseLength: CGFloat - let characters: [CharacterAppearance] - - var body: some View { - ZStack { - HStack(spacing: 0) { - ForEach(characters, id: \.self) { character in - SFAlphabet(character.alphabet, - fontSize: baseLength * 0.175, - fontWeight: .bold, - offsetX: character.offsetX) - } - } - .offset(x: baseLength * 0.12, - y: 0) - - HStack(spacing: 0) { - ForEach(characters, id: \.self) { character in - SFAlphabet(character.alphabet, - color: character.color, - fontSize: baseLength * 0.175, - fontWeight: .bold, - offsetX: character.offsetX, - offsetY: 0) - } - } - .offset(x: baseLength * 0.1125, - y: 0) - } - } -} - -struct FiveCharactersView_Previews: PreviewProvider { - static var previews: some View { - FiveCharactersView(type: .world, - baseLength: 400) - FiveCharactersView(type: .peace, - baseLength: 400) - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/WorldPeace/SFAlphabet.swift b/SFSymbolsArtCollection/ArtWorks/WorldPeace/SFAlphabet.swift deleted file mode 100644 index bd052dc..0000000 --- a/SFSymbolsArtCollection/ArtWorks/WorldPeace/SFAlphabet.swift +++ /dev/null @@ -1,155 +0,0 @@ -// -// SFCharacter.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/07/29. -// - -import SwiftUI -import SFUserFriendlySymbols - -extension SFAlphabet { - - init(_ alphabet: Alphabet, - color: Color = .black, - frameColor: Color = .white, - fontSize: CGFloat, - fontWeight: Font.Weight = .regular, - flipType: FlipType = .none, - rotationDegrees: CGFloat = 0, - offsetX: CGFloat = 0, - offsetY: CGFloat = 0) { - self.alphabet = alphabet - self.color = color - self.frameColor = frameColor - self.fontSize = fontSize - self.fontWeight = fontWeight - self.flipType = flipType - self.rotationDegrees = rotationDegrees - self.offsetX = offsetX - self.offsetY = offsetY - } -} - -struct SFAlphabet: View { - - enum Alphabet: String { - - case a = "a.circle" - case b = "b.circle" - case c = "c.circle" - case d = "d.circle" - case e = "e.circle" - case f = "f.circle" - case g = "g.circle" - case h = "h.circle" - case i = "i.circle" - case j = "j.circle" - case k = "k.circle" - case l = "l.circle" - case m = "m.circle" - case n = "n.circle" - case o = "o.circle" - case p = "p.circle" - case q = "q.circle" - case r = "r.circle" - case s = "s.circle" - case t = "t.circle" - case u = "u.circle" - case v = "v.circle" - case w = "w.circle" - case x = "x.circle" - case y = "y.circle" - case z = "z.circle" - - var symbolInCircle: SFSymbols { - return SFSymbols(rawValue: self.rawValue) ?? .xmark - } - } - - private let alphabet: Alphabet - private let color: Color - /// Circle-frame color - private let frameColor: Color - private let fontSize: CGFloat - private let fontWeight: Font.Weight - private let flipType: FlipType - private let rotationDegrees: CGFloat - private let offsetX: CGFloat - private let offsetY: CGFloat - - var body: some View { - ZStack { - - Image(symbol: alphabet.symbolInCircle) - .arrangeShape(color: color, - fontSize: fontSize, - fontWeight: fontWeight, - flipType: flipType, - rotationDegrees: rotationDegrees, - offsetX: offsetX, - offsetY: offsetY) - - // Hide Circle-Frame - Group { - - Image(symbol: .circle) - .arrangeShape(color: frameColor, - fontSize: fontSize * 1.1, - fontWeight: fontWeight, - flipType: flipType, - rotationDegrees: rotationDegrees, - offsetX: offsetX, - offsetY: offsetY) - - Image(symbol: .circle) - .arrangeShape(color: frameColor, - fontSize: fontSize * 1.05, - fontWeight: fontWeight, - flipType: flipType, - rotationDegrees: rotationDegrees, - offsetX: offsetX, - offsetY: offsetY) - - Image(symbol: .circle) - .arrangeShape(color: frameColor, - fontSize: fontSize, - fontWeight: fontWeight, - flipType: flipType, - rotationDegrees: rotationDegrees, - offsetX: offsetX, - offsetY: offsetY) - - Image(symbol: .circle) - .arrangeShape(color: frameColor, - fontSize: fontSize * 0.95, - fontWeight: fontWeight, - flipType: flipType, - rotationDegrees: rotationDegrees, - offsetX: offsetX, - offsetY: offsetY) - - Image(symbol: .circle) - .arrangeShape(color: frameColor, - fontSize: fontSize * 0.9, - fontWeight: fontWeight, - flipType: flipType, - rotationDegrees: rotationDegrees, - offsetX: offsetX, - offsetY: offsetY) - } - } - } -} - -struct SFCharacter_Previews: PreviewProvider { - static var previews: some View { - VStack { - SFAlphabet(.a, fontSize: 200) - SFAlphabet(.h, fontSize: 100) - SFAlphabet(.a, fontSize: 25, fontWeight: .black) - SFAlphabet(.a, fontSize: 10, fontWeight: .black) - SFAlphabet(.a, fontSize: 1, fontWeight: .black) - } - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/WorldPeace/WorldPeace.swift b/SFSymbolsArtCollection/ArtWorks/WorldPeace/WorldPeace.swift deleted file mode 100644 index 71a9a32..0000000 --- a/SFSymbolsArtCollection/ArtWorks/WorldPeace/WorldPeace.swift +++ /dev/null @@ -1,42 +0,0 @@ -// -// ColorfulAlphabets.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/07/29. -// - -import SwiftUI - -struct WorldPeace: View { - var body: some View { - - GeometryReader { proxy in - - let baseLength = proxy.baseLength - - VStack { - - FiveCharactersView(type: .world, - baseLength: baseLength) - ZStack { - Earth(baseLength: baseLength) - - Image(symbol: .peacesign) - .arrangeShape(color: .white, - fontSize: baseLength * 0.52, - fontWeight: .thin) - } - - FiveCharactersView(type: .peace, - baseLength: baseLength) - } - .position(proxy.localCenter) - } - } -} - -struct WorldPeace_Previews: PreviewProvider { - static var previews: some View { - WorldPeace() - } -} From 5a9b5e372e6f5040548f5ff70e8c3af2b7fe1b1b Mon Sep 17 00:00:00 2001 From: littleossa Date: Fri, 9 Feb 2024 10:30:24 +0900 Subject: [PATCH 059/108] WIP: PartyAnimalsArt --- .../project.pbxproj | 16 + .../ArtWorks/PartyAnimals/PartyAnimals.swift | 1 + .../PartyAnimals/PartyAnimalsArtView.swift | 414 ++++++++++++++++++ .../PartyAnimalsPreviewView.swift | 325 ++++++++++++++ .../WorldPeace/WorldPeaceArtView.swift | 2 +- 5 files changed, 757 insertions(+), 1 deletion(-) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsPreviewView.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 1979ccf..ea02529 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -40,6 +40,8 @@ 9767DEFA2B751C2C00457DA1 /* WorldPeacePreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEF92B751C2C00457DA1 /* WorldPeacePreviewView.swift */; }; 9767DEFE2B752E0400457DA1 /* WorldPeace+CharacterPosition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEFD2B752E0400457DA1 /* WorldPeace+CharacterPosition.swift */; }; 9767DF002B752E4700457DA1 /* WorldPeaceArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEFF2B752E4700457DA1 /* WorldPeaceArtView.swift */; }; + 9767DF032B759B2D00457DA1 /* PartyAnimalsPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF022B759B2D00457DA1 /* PartyAnimalsPreviewView.swift */; }; + 9767DF052B75AFE200457DA1 /* PartyAnimalsArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF042B75AFE200457DA1 /* PartyAnimalsArtView.swift */; }; 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; @@ -106,6 +108,8 @@ 9767DEF92B751C2C00457DA1 /* WorldPeacePreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorldPeacePreviewView.swift; sourceTree = ""; }; 9767DEFD2B752E0400457DA1 /* WorldPeace+CharacterPosition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorldPeace+CharacterPosition.swift"; sourceTree = ""; }; 9767DEFF2B752E4700457DA1 /* WorldPeaceArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorldPeaceArtView.swift; sourceTree = ""; }; + 9767DF022B759B2D00457DA1 /* PartyAnimalsPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PartyAnimalsPreviewView.swift; sourceTree = ""; }; + 9767DF042B75AFE200457DA1 /* PartyAnimalsArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PartyAnimalsArtView.swift; sourceTree = ""; }; 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; @@ -297,6 +301,15 @@ path = WorldPeace; sourceTree = ""; }; + 9767DF012B759AFC00457DA1 /* PartyAnimals */ = { + isa = PBXGroup; + children = ( + 9767DF042B75AFE200457DA1 /* PartyAnimalsArtView.swift */, + 9767DF022B759B2D00457DA1 /* PartyAnimalsPreviewView.swift */, + ); + path = PartyAnimals; + sourceTree = ""; + }; 97AD530D2B70DBC70034FB5D /* ArtisticWorldOfSFSymbols */ = { isa = PBXGroup; children = ( @@ -343,6 +356,7 @@ 97EF43962B7332FB003648F5 /* Magician */, 97EF439F2B74CA22003648F5 /* CrayonBoy */, 9767DEF82B751C1300457DA1 /* WorldPeace */, + 9767DF012B759AFC00457DA1 /* PartyAnimals */, 97AD531E2B70E2770034FB5D /* AfroBoy */, 97EF43892B725DE7003648F5 /* Nosebleed */, 97EF43912B72D3AF003648F5 /* ImWearingPants */, @@ -597,9 +611,11 @@ 973B2CA428C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift in Sources */, 97EF438D2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift in Sources */, 97EF43A52B74F27D003648F5 /* CrayonBoyArtView.swift in Sources */, + 9767DF052B75AFE200457DA1 /* PartyAnimalsArtView.swift in Sources */, 9748BE352893CB67006DF0BE /* Lion.swift in Sources */, 97624C2C28C2DDAA004E1720 /* Buildings.swift in Sources */, 97AD53222B70E3FA0034FB5D /* AnimatableSymbolView.swift in Sources */, + 9767DF032B759B2D00457DA1 /* PartyAnimalsPreviewView.swift in Sources */, 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */, 97EF43A12B74CA38003648F5 /* CrayonBoyPreviewView.swift in Sources */, 9748BE4A28995877006DF0BE /* DemonWrestlerOutline.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtWorks/PartyAnimals/PartyAnimals.swift b/SFSymbolsArtCollection/ArtWorks/PartyAnimals/PartyAnimals.swift index 1159664..158d397 100644 --- a/SFSymbolsArtCollection/ArtWorks/PartyAnimals/PartyAnimals.swift +++ b/SFSymbolsArtCollection/ArtWorks/PartyAnimals/PartyAnimals.swift @@ -70,5 +70,6 @@ struct PartyAnimals: View { struct PartyAnimals_Previews: PreviewProvider { static var previews: some View { PartyAnimals() + .scaleEffect(0.7) } } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView.swift new file mode 100644 index 0000000..8e3036d --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView.swift @@ -0,0 +1,414 @@ +// +// PartyAnimalsArtView.swift +// SFSymbolsArtCollection +// +// Created by 平岡修 on 2024/02/09. +// + +import SwiftUI + +extension PartyAnimalsArtView { + + enum PawPosition: String, CaseIterable, Identifiable { + case first + case second + case third + case fourth + + struct Value { + let color: Color + let rotationDegrees: CGFloat + let horizontalOffsetRatio: CGFloat + let verticalOffsetRatio: CGFloat + } + + var id: String { self.rawValue } + + var value: Value { + switch self { + case .first: + Value(color: .red, + rotationDegrees: 24, + horizontalOffsetRatio: -0.34, + verticalOffsetRatio: -0.5) + case .second: + Value(color: .orange, + rotationDegrees: -24, + horizontalOffsetRatio: -0.14, + verticalOffsetRatio: -0.36) + case .third: + Value(color: .teal, + rotationDegrees: 30, + horizontalOffsetRatio: -0.3, + verticalOffsetRatio: 0.26) + case .fourth: + Value(color: .blue, + rotationDegrees: -14, + horizontalOffsetRatio: -0.14, + verticalOffsetRatio: 0.44) + } + } + } +} + +struct PartyAnimalsArtView: View { + + @Environment(ArtWorkModel.self) var model + @State private var isAnimating = false + + var body: some View { + + ZStack { + bear() + flog() + lion() + + // MARK: - 􀾟 Paw + ForEach(PawPosition.allCases) { + + AnimatableSymbolView( + name: "pawprint.fill", + initialPosition: .third(.first), + primaryColor: $0.value.color, + widthRatio: 0.13, + heightRatio: 0.13, + rotationDegrees: $0.value.rotationDegrees, + horizontalOffsetRatio: $0.value.horizontalOffsetRatio, + verticalOffsetRatio: $0.value.verticalOffsetRatio, + isAnimating: isAnimating, + symbolCountToWaitFor: 3 + ) + } + } + .navigationTitle("Party animals") + .navigationBarTitleDisplayMode(.inline) + .toolbar(content: { + ToolbarItemGroup(placement: .bottomBar) { + Spacer() + + PlayButton { + isAnimating = true + } + .font(.system(size: 32)) + .disabled(isAnimating) + } + }) + } + + // MARK: - Bear + private func bear() -> some View { + ZStack { + // MARK: - 􀀁 Bear ear + AnimatableSymbolView( + name: "circle.fill", + initialPosition: .third(.third), + primaryColor: .brown, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: 0.08, + verticalOffsetRatio: -0.37, + isAnimating: isAnimating, + symbolCountToWaitFor: 3 + ) + + AnimatableSymbolView( + name: "circle.fill", + initialPosition: .third(.third), + primaryColor: .brown, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: 0.32, + verticalOffsetRatio: -0.37, + isAnimating: isAnimating, + symbolCountToWaitFor: 3 + ) + + // MARK: - 􀩹 Bear Inside ear + AnimatableSymbolView( + name: "button.roundedtop.horizontal.fill", + initialPosition: .third(.fourth), + primaryColor: .palePink, + widthRatio: 0.06, + heightRatio: 0.06, + rotationDegrees: -20, + horizontalOffsetRatio: 0.08, + verticalOffsetRatio: -0.37, + isAnimating: isAnimating, + symbolCountToWaitFor: 4 + ) + + AnimatableSymbolView( + name: "button.roundedtop.horizontal.fill", + initialPosition: .third(.fourth), + primaryColor: .palePink, + widthRatio: 0.06, + heightRatio: 0.06, + rotationDegrees: 20, + horizontalOffsetRatio: 0.32, + verticalOffsetRatio: -0.37, + isAnimating: isAnimating, + symbolCountToWaitFor: 4 + ) + + // MARK: - 􀲟 Bear outline + AnimatableSymbolView( + name: "oval.fill", + initialPosition: .third(.fifth), + primaryColor: .brown, + widthRatio: 0.4, + heightRatio: 0.325, + horizontalOffsetRatio: 0.2, + verticalOffsetRatio: -0.2, + isAnimating: isAnimating, + symbolCountToWaitFor: 5 + ) + + // MARK: - 􀢚 Bear Eye + AnimatableSymbolView( + name: "record.circle.fill", + initialPosition: .third(.sixth), + primaryColor: .white, + secondaryColor: .darkBrown, + widthRatio: 0.05, + heightRatio: 0.05, + horizontalOffsetRatio: 0.13, + verticalOffsetRatio: -0.23, + isAnimating: isAnimating, + symbolCountToWaitFor: 6 + ) + + AnimatableSymbolView( + name: "record.circle.fill", + initialPosition: .third(.sixth), + primaryColor: .white, + secondaryColor: .darkBrown, + widthRatio: 0.05, + heightRatio: 0.05, + horizontalOffsetRatio: 0.27, + verticalOffsetRatio: -0.23, + isAnimating: isAnimating, + symbolCountToWaitFor: 6 + ) + + // MARK: - 􀁹 Bear mouth + AnimatableSymbolView( + name: "arrow.down.circle.fill", + initialPosition: .third(.sixth), + primaryColor: .black, + secondaryColor: .white, + widthRatio: 0.125, + heightRatio: 0.125, + horizontalOffsetRatio: 0.2, + verticalOffsetRatio: -0.15, + isAnimating: isAnimating, + symbolCountToWaitFor: 7 + ) + + // MARK: - 􀆼 Bear Nose + AnimatableSymbolView( + name: "moon.circle.fill", + initialPosition: .third(.seventh), + primaryColor: .white, + secondaryColor: .red, + widthRatio: 0.04, + heightRatio: 0.04, + rotationDegrees: 170, + horizontalOffsetRatio: 0.2, + verticalOffsetRatio: -0.17, + isAnimating: isAnimating, + symbolCountToWaitFor: 8 + ) + } + } + + // MARK: - Flog + private func flog() -> some View { + ZStack { + // MARK: - 􀀁 Flog eye + Image(systemName: "circle.fill") + .arrangeShape( + primaryColor: .green, + width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.32, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.18, forPreview: true) + ) + + Image(systemName: "circle.fill") + .arrangeShape( + primaryColor: .green, + width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.18, forPreview: true) + ) + + // MARK: - 􀢚 Flog Eye + Image(systemName: "record.circle.fill") + .arrangeShape( + primaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.32, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.18, forPreview: true) + ) + + Image(systemName: "record.circle.fill") + .arrangeShape( + primaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.18, forPreview: true) + ) + + // MARK: - 􀲟 Flog outline + Image(systemName: "oval.fill") + .arrangeShape( + primaryColor: .green, + width: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.325, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0, forPreview: true) + ) + + // MARK: - 􀆈 Flog outline + Image(systemName: "chevron.down") + .arrangeShape( + fontWeight: .bold, + width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.025, forPreview: true) + ) + } + } + + // MARK: - Lion + private func lion() -> some View { + ZStack { + + // MARK: - Lion mane + Image(systemName: "seal.fill") + .arrangeShape( + primaryColor: .orange, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.52, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.52, forPreview: true), + rotationDegrees: 20, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.26, forPreview: true) + ) + + Image(systemName: "seal.fill") + .arrangeShape( + primaryColor: .orange, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.52, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.52, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.26, forPreview: true) + ) + + // MARK: - 􀀁 Bear ear + Image(systemName: "circle.fill") + .arrangeShape( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.17, forPreview: true) + ) + + Image(systemName: "circle.fill") + .arrangeShape( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.32, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.17, forPreview: true) + ) + + // MARK: - 􀲟 Lion outline + Image(systemName: "oval.fill") + .arrangeShape( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.26, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.29, forPreview: true) + ) + + // MARK: - 􀢚 Lion Eye + Image(systemName: "record.circle.fill") + .arrangeShape( + primaryColor: .white, + secondaryColor: .darkBrown, + width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.13, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.26, forPreview: true) + ) + + Image(systemName: "record.circle.fill") + .arrangeShape( + primaryColor: .white, + secondaryColor: .darkBrown, + width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.27, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.26, forPreview: true) + ) + + // MARK: - Lion whiskers + Image(systemName: "rays") + .arrangeShape( + primaryColor: .darkBrown, + width: model.calculatingProportionalValue(withRatio: 0.175, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.235, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.33, forPreview: true) + ) + + Image(systemName: "rays") + .arrangeShape( + primaryColor: .darkBrown, + width: model.calculatingProportionalValue(withRatio: 0.175, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.165, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.33, forPreview: true) + ) + + // MARK: - 􀁹 Lion mouth + Image(systemName: "arrow.down.circle.fill") + .arrangeShape( + primaryColor: .black, + secondaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.11, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.34, forPreview: true) + ) + + // MARK: - 􀆼 Lion Nose + Image(systemName: "moon.circle.fill") + .arrangeShape( + primaryColor: .white, + secondaryColor: .darkBrown, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + rotationDegrees: 170, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.32, forPreview: true) + ) + } + } +} + +#Preview { + NavigationStack { + PartyAnimalsArtView() + .environment(ArtWorkModel.preview) + } +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsPreviewView.swift new file mode 100644 index 0000000..b1b1b88 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsPreviewView.swift @@ -0,0 +1,325 @@ +// +// PartyAnimalsPreviewView.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +struct PartyAnimalsPreviewView: View { + + @Environment(ArtWorkModel.self) var model + + var body: some View { + + ZStack { + bear() + flog() + lion() + + // MARK: - 􀾟 Paw + ForEach(PartyAnimalsArtView.PawPosition.allCases) { + + Image(systemName: "pawprint.fill") + .arrangeShape( + primaryColor: $0.value.color, + width: model.calculatingProportionalValue(withRatio: 0.13, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.13, forPreview: true), + rotationDegrees: $0.value.rotationDegrees, + horizontalOffset: model.calculatingProportionalValue(withRatio: $0.value.horizontalOffsetRatio, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: $0.value.verticalOffsetRatio, forPreview: true) + ) + } + } + } + + // MARK: - Bear + private func bear() -> some View { + ZStack { + // MARK: - 􀀁 Bear ear + Image(systemName: "circle.fill") + .arrangeShape( + primaryColor: .brown, + width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.37, forPreview: true) + ) + + Image(systemName: "circle.fill") + .arrangeShape( + primaryColor: .brown, + width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.32, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.37, forPreview: true) + ) + + // MARK: - 􀩹 Bear Inside ear + Image(systemName: "button.roundedtop.horizontal.fill") + .arrangeShape( + primaryColor: .palePink, + width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + rotationDegrees: -20, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.37, forPreview: true) + ) + + Image(systemName: "button.roundedtop.horizontal.fill") + .arrangeShape( + primaryColor: .palePink, + width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + rotationDegrees: 20, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.32, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.37, forPreview: true) + ) + + // MARK: - 􀲟 Bear outline + Image(systemName: "oval.fill") + .arrangeShape( + primaryColor: .brown, + width: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.325, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true) + ) + + // MARK: - 􀢚 Bear Eye + Image(systemName: "record.circle.fill") + .arrangeShape( + primaryColor: .white, + secondaryColor: .darkBrown, + width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.13, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.23, forPreview: true) + ) + + Image(systemName: "record.circle.fill") + .arrangeShape( + primaryColor: .white, + secondaryColor: .darkBrown, + width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.27, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.23, forPreview: true) + ) + + // MARK: - 􀁹 Bear mouth + Image(systemName: "arrow.down.circle.fill") + .arrangeShape( + primaryColor: .black, + secondaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.15, forPreview: true) + ) + + // MARK: - 􀆼 Bear Nose + Image(systemName: "moon.circle.fill") + .arrangeShape( + primaryColor: .white, + secondaryColor: .red, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + rotationDegrees: 170, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.17, forPreview: true) + ) + } + } + + // MARK: - Flog + private func flog() -> some View { + ZStack { + // MARK: - 􀀁 Flog eye + Image(systemName: "circle.fill") + .arrangeShape( + primaryColor: .green, + width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.32, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.18, forPreview: true) + ) + + Image(systemName: "circle.fill") + .arrangeShape( + primaryColor: .green, + width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.18, forPreview: true) + ) + + // MARK: - 􀢚 Flog Eye + Image(systemName: "record.circle.fill") + .arrangeShape( + primaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.32, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.18, forPreview: true) + ) + + Image(systemName: "record.circle.fill") + .arrangeShape( + primaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: -0.18, forPreview: true) + ) + + // MARK: - 􀲟 Flog outline + Image(systemName: "oval.fill") + .arrangeShape( + primaryColor: .green, + width: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.325, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0, forPreview: true) + ) + + // MARK: - 􀆈 Flog outline + Image(systemName: "chevron.down") + .arrangeShape( + fontWeight: .bold, + width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.025, forPreview: true) + ) + } + } + + // MARK: - Lion + private func lion() -> some View { + ZStack { + + // MARK: - Lion mane + Image(systemName: "seal.fill") + .arrangeShape( + primaryColor: .orange, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.52, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.52, forPreview: true), + rotationDegrees: 20, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.26, forPreview: true) + ) + + Image(systemName: "seal.fill") + .arrangeShape( + primaryColor: .orange, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.52, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.52, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.26, forPreview: true) + ) + + // MARK: - 􀀁 Bear ear + Image(systemName: "circle.fill") + .arrangeShape( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.17, forPreview: true) + ) + + Image(systemName: "circle.fill") + .arrangeShape( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.32, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.17, forPreview: true) + ) + + // MARK: - 􀲟 Lion outline + Image(systemName: "oval.fill") + .arrangeShape( + primaryColor: .yellow, + width: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.26, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.29, forPreview: true) + ) + + // MARK: - 􀢚 Lion Eye + Image(systemName: "record.circle.fill") + .arrangeShape( + primaryColor: .white, + secondaryColor: .darkBrown, + width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.13, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.26, forPreview: true) + ) + + Image(systemName: "record.circle.fill") + .arrangeShape( + primaryColor: .white, + secondaryColor: .darkBrown, + width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.27, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.26, forPreview: true) + ) + + // MARK: - Lion whiskers + Image(systemName: "rays") + .arrangeShape( + primaryColor: .darkBrown, + width: model.calculatingProportionalValue(withRatio: 0.175, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.235, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.33, forPreview: true) + ) + + Image(systemName: "rays") + .arrangeShape( + primaryColor: .darkBrown, + width: model.calculatingProportionalValue(withRatio: 0.175, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.165, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.33, forPreview: true) + ) + + // MARK: - 􀁹 Lion mouth + Image(systemName: "arrow.down.circle.fill") + .arrangeShape( + primaryColor: .black, + secondaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.11, forPreview: true), + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.34, forPreview: true) + ) + + // MARK: - 􀆼 Lion Nose + Image(systemName: "moon.circle.fill") + .arrangeShape( + primaryColor: .white, + secondaryColor: .darkBrown, + fontWeight: .ultraLight, + width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), + rotationDegrees: 170, + horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), + verticalOffset: model.calculatingProportionalValue(withRatio: 0.32, forPreview: true) + ) + } + } +} + +#Preview { + PartyAnimalsPreviewView() + .environment(ArtWorkModel.init(screenSize: .init(width: 4600, height: 4600))) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView.swift index 8e8b921..f069b8d 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView.swift @@ -17,7 +17,7 @@ struct WorldPeaceArtView: View { ZStack { // MARK: - Characters black shadow - ForEach(WorldPeaceArtView.CharacterPosition.allCases) { + ForEach(CharacterPosition.allCases) { AnimatableSymbolView( name: "\($0.value.character).circle", From e8c904d0f2f9f72606405317cb044a000b895e06 Mon Sep 17 00:00:00 2001 From: littleossa Date: Fri, 9 Feb 2024 11:17:02 +0900 Subject: [PATCH 060/108] Refactor PawPositon --- .../project.pbxproj | 4 + .../PartyAnimalsArtView+RawPosition.swift | 53 +++ .../PartyAnimals/PartyAnimalsArtView.swift | 423 +++++++++--------- .../PartyAnimalsPreviewView.swift | 9 +- 4 files changed, 280 insertions(+), 209 deletions(-) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView+RawPosition.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index ea02529..8b8ba09 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -42,6 +42,7 @@ 9767DF002B752E4700457DA1 /* WorldPeaceArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEFF2B752E4700457DA1 /* WorldPeaceArtView.swift */; }; 9767DF032B759B2D00457DA1 /* PartyAnimalsPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF022B759B2D00457DA1 /* PartyAnimalsPreviewView.swift */; }; 9767DF052B75AFE200457DA1 /* PartyAnimalsArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF042B75AFE200457DA1 /* PartyAnimalsArtView.swift */; }; + 9767DF092B75C0B500457DA1 /* PartyAnimalsArtView+RawPosition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF082B75C0B500457DA1 /* PartyAnimalsArtView+RawPosition.swift */; }; 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; @@ -110,6 +111,7 @@ 9767DEFF2B752E4700457DA1 /* WorldPeaceArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorldPeaceArtView.swift; sourceTree = ""; }; 9767DF022B759B2D00457DA1 /* PartyAnimalsPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PartyAnimalsPreviewView.swift; sourceTree = ""; }; 9767DF042B75AFE200457DA1 /* PartyAnimalsArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PartyAnimalsArtView.swift; sourceTree = ""; }; + 9767DF082B75C0B500457DA1 /* PartyAnimalsArtView+RawPosition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PartyAnimalsArtView+RawPosition.swift"; sourceTree = ""; }; 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; @@ -306,6 +308,7 @@ children = ( 9767DF042B75AFE200457DA1 /* PartyAnimalsArtView.swift */, 9767DF022B759B2D00457DA1 /* PartyAnimalsPreviewView.swift */, + 9767DF082B75C0B500457DA1 /* PartyAnimalsArtView+RawPosition.swift */, ); path = PartyAnimals; sourceTree = ""; @@ -587,6 +590,7 @@ 97AD531A2B70E0530034FB5D /* Font.Weight+.swift in Sources */, 9748BE6428A3936E006DF0BE /* ArtWorkView.swift in Sources */, 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */, + 9767DF092B75C0B500457DA1 /* PartyAnimalsArtView+RawPosition.swift in Sources */, 9748BE5F289F194E006DF0BE /* RocketFirework.swift in Sources */, 9748BE2E2893C688006DF0BE /* AnimalOutline.swift in Sources */, 9748BE322893C91F006DF0BE /* AnimalEye.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView+RawPosition.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView+RawPosition.swift new file mode 100644 index 0000000..d93bbe4 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView+RawPosition.swift @@ -0,0 +1,53 @@ +// +// PartyAnimalsArtView+RawPosition.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension PartyAnimalsArtView { + + enum PawPosition: String, CaseIterable, Identifiable { + case first + case second + case third + case fourth + + struct Value { + let color: Color + let rotationDegrees: CGFloat + let horizontalOffsetRatio: CGFloat + let verticalOffsetRatio: CGFloat + } + + var id: String { self.rawValue } + + var value: Value { + switch self { + case .first: + Value(color: .red, + rotationDegrees: 24, + horizontalOffsetRatio: -0.34, + verticalOffsetRatio: -0.5) + case .second: + Value(color: .orange, + rotationDegrees: -24, + horizontalOffsetRatio: -0.14, + verticalOffsetRatio: -0.36) + case .third: + Value(color: .teal, + rotationDegrees: 30, + horizontalOffsetRatio: -0.3, + verticalOffsetRatio: 0.26) + case .fourth: + Value(color: .blue, + rotationDegrees: -14, + horizontalOffsetRatio: -0.14, + verticalOffsetRatio: 0.44) + } + } + } +} + diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView.swift index 8e3036d..5d6ac94 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView.swift @@ -2,55 +2,11 @@ // PartyAnimalsArtView.swift // SFSymbolsArtCollection // -// Created by 平岡修 on 2024/02/09. +// Created by Lil Ossa // import SwiftUI -extension PartyAnimalsArtView { - - enum PawPosition: String, CaseIterable, Identifiable { - case first - case second - case third - case fourth - - struct Value { - let color: Color - let rotationDegrees: CGFloat - let horizontalOffsetRatio: CGFloat - let verticalOffsetRatio: CGFloat - } - - var id: String { self.rawValue } - - var value: Value { - switch self { - case .first: - Value(color: .red, - rotationDegrees: 24, - horizontalOffsetRatio: -0.34, - verticalOffsetRatio: -0.5) - case .second: - Value(color: .orange, - rotationDegrees: -24, - horizontalOffsetRatio: -0.14, - verticalOffsetRatio: -0.36) - case .third: - Value(color: .teal, - rotationDegrees: 30, - horizontalOffsetRatio: -0.3, - verticalOffsetRatio: 0.26) - case .fourth: - Value(color: .blue, - rotationDegrees: -14, - horizontalOffsetRatio: -0.14, - verticalOffsetRatio: 0.44) - } - } - } -} - struct PartyAnimalsArtView: View { @Environment(ArtWorkModel.self) var model @@ -76,7 +32,7 @@ struct PartyAnimalsArtView: View { horizontalOffsetRatio: $0.value.horizontalOffsetRatio, verticalOffsetRatio: $0.value.verticalOffsetRatio, isAnimating: isAnimating, - symbolCountToWaitFor: 3 + symbolCountToWaitFor: 2 ) } } @@ -108,7 +64,7 @@ struct PartyAnimalsArtView: View { horizontalOffsetRatio: 0.08, verticalOffsetRatio: -0.37, isAnimating: isAnimating, - symbolCountToWaitFor: 3 + symbolCountToWaitFor: 1 ) AnimatableSymbolView( @@ -120,7 +76,7 @@ struct PartyAnimalsArtView: View { horizontalOffsetRatio: 0.32, verticalOffsetRatio: -0.37, isAnimating: isAnimating, - symbolCountToWaitFor: 3 + symbolCountToWaitFor: 1 ) // MARK: - 􀩹 Bear Inside ear @@ -134,7 +90,7 @@ struct PartyAnimalsArtView: View { horizontalOffsetRatio: 0.08, verticalOffsetRatio: -0.37, isAnimating: isAnimating, - symbolCountToWaitFor: 4 + symbolCountToWaitFor: 0 ) AnimatableSymbolView( @@ -147,7 +103,7 @@ struct PartyAnimalsArtView: View { horizontalOffsetRatio: 0.32, verticalOffsetRatio: -0.37, isAnimating: isAnimating, - symbolCountToWaitFor: 4 + symbolCountToWaitFor: 0 ) // MARK: - 􀲟 Bear outline @@ -160,12 +116,13 @@ struct PartyAnimalsArtView: View { horizontalOffsetRatio: 0.2, verticalOffsetRatio: -0.2, isAnimating: isAnimating, - symbolCountToWaitFor: 5 + symbolCountToWaitFor: 8 ) // MARK: - 􀢚 Bear Eye AnimatableSymbolView( name: "record.circle.fill", + initialPrimaryColor: .systemBackground, initialPosition: .third(.sixth), primaryColor: .white, secondaryColor: .darkBrown, @@ -174,11 +131,12 @@ struct PartyAnimalsArtView: View { horizontalOffsetRatio: 0.13, verticalOffsetRatio: -0.23, isAnimating: isAnimating, - symbolCountToWaitFor: 6 + symbolCountToWaitFor: 7 ) AnimatableSymbolView( name: "record.circle.fill", + initialPrimaryColor: .systemBackground, initialPosition: .third(.sixth), primaryColor: .white, secondaryColor: .darkBrown, @@ -187,13 +145,14 @@ struct PartyAnimalsArtView: View { horizontalOffsetRatio: 0.27, verticalOffsetRatio: -0.23, isAnimating: isAnimating, - symbolCountToWaitFor: 6 + symbolCountToWaitFor: 7 ) // MARK: - 􀁹 Bear mouth AnimatableSymbolView( name: "arrow.down.circle.fill", - initialPosition: .third(.sixth), + initialPrimaryColor: .systemBackground, + initialPosition: .second(.third), primaryColor: .black, secondaryColor: .white, widthRatio: 0.125, @@ -201,12 +160,13 @@ struct PartyAnimalsArtView: View { horizontalOffsetRatio: 0.2, verticalOffsetRatio: -0.15, isAnimating: isAnimating, - symbolCountToWaitFor: 7 + symbolCountToWaitFor: 5 ) // MARK: - 􀆼 Bear Nose AnimatableSymbolView( name: "moon.circle.fill", + initialPrimaryColor: .systemBackground, initialPosition: .third(.seventh), primaryColor: .white, secondaryColor: .red, @@ -216,7 +176,7 @@ struct PartyAnimalsArtView: View { horizontalOffsetRatio: 0.2, verticalOffsetRatio: -0.17, isAnimating: isAnimating, - symbolCountToWaitFor: 8 + symbolCountToWaitFor: 6 ) } } @@ -224,63 +184,82 @@ struct PartyAnimalsArtView: View { // MARK: - Flog private func flog() -> some View { ZStack { - // MARK: - 􀀁 Flog eye - Image(systemName: "circle.fill") - .arrangeShape( - primaryColor: .green, - width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.32, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.18, forPreview: true) - ) + // MARK: - 􀀁 Flog eye outline + AnimatableSymbolView( + name: "circle.fill", + initialPosition: .third(.third), + primaryColor: .green, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: -0.32, + verticalOffsetRatio: -0.18, + isAnimating: isAnimating, + symbolCountToWaitFor: 1 + ) - Image(systemName: "circle.fill") - .arrangeShape( - primaryColor: .green, - width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.18, forPreview: true) - ) + AnimatableSymbolView( + name: "circle.fill", + initialPosition: .third(.third), + primaryColor: .green, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: -0.08, + verticalOffsetRatio: -0.18, + isAnimating: isAnimating, + symbolCountToWaitFor: 1 + ) // MARK: - 􀢚 Flog Eye - Image(systemName: "record.circle.fill") - .arrangeShape( - primaryColor: .white, - width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.32, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.18, forPreview: true) - ) + AnimatableSymbolView( + name: "record.circle.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .third(.sixth), + primaryColor: .white, + widthRatio: 0.05, + heightRatio: 0.05, + horizontalOffsetRatio: -0.32, + verticalOffsetRatio: -0.18, + isAnimating: isAnimating, + symbolCountToWaitFor: 7 + ) - Image(systemName: "record.circle.fill") - .arrangeShape( - primaryColor: .white, - width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.18, forPreview: true) - ) + AnimatableSymbolView( + name: "record.circle.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .third(.sixth), + primaryColor: .white, + widthRatio: 0.05, + heightRatio: 0.05, + horizontalOffsetRatio: -0.08, + verticalOffsetRatio: -0.18, + isAnimating: isAnimating, + symbolCountToWaitFor: 7 + ) // MARK: - 􀲟 Flog outline - Image(systemName: "oval.fill") - .arrangeShape( - primaryColor: .green, - width: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.325, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0, forPreview: true) - ) + AnimatableSymbolView( + name: "oval.fill", + initialPosition: .third(.fifth), + primaryColor: .green, + widthRatio: 0.4, + heightRatio: 0.325, + horizontalOffsetRatio: -0.2, + isAnimating: isAnimating, + symbolCountToWaitFor: 8 + ) - // MARK: - 􀆈 Flog outline - Image(systemName: "chevron.down") - .arrangeShape( - fontWeight: .bold, - width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.025, forPreview: true) - ) + // MARK: - 􀆈 Flog mouth + AnimatableSymbolView( + name: "chevron.down", + initialPosition: .second(.first), + fontWeight: .bold, + widthRatio: 0.1, + heightRatio: 0.05, + horizontalOffsetRatio: -0.2, + verticalOffsetRatio: 0.025, + isAnimating: isAnimating, + symbolCountToWaitFor: 3 + ) } } @@ -289,119 +268,155 @@ struct PartyAnimalsArtView: View { ZStack { // MARK: - Lion mane - Image(systemName: "seal.fill") - .arrangeShape( - primaryColor: .orange, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.52, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.52, forPreview: true), - rotationDegrees: 20, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.26, forPreview: true) - ) + AnimatableSymbolView( + name: "seal.fill", + initialPosition: .third(.second), + primaryColor: .orange, + fontWeight: .ultraLight, + widthRatio: 0.52, + heightRatio: 0.52, + rotationDegrees: 20, + horizontalOffsetRatio: 0.2, + verticalOffsetRatio: 0.26, + isAnimating: isAnimating, + symbolCountToWaitFor: 9 + ) - Image(systemName: "seal.fill") - .arrangeShape( - primaryColor: .orange, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.52, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.52, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.26, forPreview: true) - ) + AnimatableSymbolView( + name: "seal.fill", + initialPosition: .third(.second), + primaryColor: .orange, + fontWeight: .ultraLight, + widthRatio: 0.52, + heightRatio: 0.52, + horizontalOffsetRatio: 0.2, + verticalOffsetRatio: 0.26, + isAnimating: isAnimating, + symbolCountToWaitFor: 9 + ) - // MARK: - 􀀁 Bear ear - Image(systemName: "circle.fill") - .arrangeShape( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.17, forPreview: true) - ) + // MARK: - 􀀁 Lion ear + AnimatableSymbolView( + name: "circle.fill", + initialPosition: .third(.third), + primaryColor: .yellow, + widthRatio: 0.12, + heightRatio: 0.12, + horizontalOffsetRatio: 0.08, + verticalOffsetRatio: 0.17, + isAnimating: isAnimating, + symbolCountToWaitFor: 1 + ) - Image(systemName: "circle.fill") - .arrangeShape( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.32, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.17, forPreview: true) - ) + AnimatableSymbolView( + name: "circle.fill", + initialPosition: .third(.third), + primaryColor: .yellow, + widthRatio: 0.12, + heightRatio: 0.12, + horizontalOffsetRatio: 0.32, + verticalOffsetRatio: 0.17, + isAnimating: isAnimating, + symbolCountToWaitFor: 1 + ) // MARK: - 􀲟 Lion outline - Image(systemName: "oval.fill") - .arrangeShape( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.26, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.29, forPreview: true) - ) + AnimatableSymbolView( + name: "oval.fill", + initialPosition: .third(.fifth), + primaryColor: .yellow, + widthRatio: 0.3, + heightRatio: 0.26, + horizontalOffsetRatio: 0.2, + verticalOffsetRatio: 0.29, + isAnimating: isAnimating, + symbolCountToWaitFor: 8 + ) // MARK: - 􀢚 Lion Eye - Image(systemName: "record.circle.fill") - .arrangeShape( - primaryColor: .white, - secondaryColor: .darkBrown, - width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.13, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.26, forPreview: true) - ) + AnimatableSymbolView( + name: "record.circle.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .third(.sixth), + primaryColor: .white, + secondaryColor: .darkBrown, + widthRatio: 0.05, + heightRatio: 0.05, + horizontalOffsetRatio: 0.13, + verticalOffsetRatio: 0.26, + isAnimating: isAnimating, + symbolCountToWaitFor: 7 + ) - Image(systemName: "record.circle.fill") - .arrangeShape( - primaryColor: .white, - secondaryColor: .darkBrown, - width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.27, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.26, forPreview: true) - ) + AnimatableSymbolView( + name: "record.circle.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .third(.sixth), + primaryColor: .white, + secondaryColor: .darkBrown, + widthRatio: 0.05, + heightRatio: 0.05, + horizontalOffsetRatio: 0.27, + verticalOffsetRatio: 0.26, + isAnimating: isAnimating, + symbolCountToWaitFor: 7 + ) // MARK: - Lion whiskers - Image(systemName: "rays") - .arrangeShape( - primaryColor: .darkBrown, - width: model.calculatingProportionalValue(withRatio: 0.175, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.235, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.33, forPreview: true) - ) + AnimatableSymbolView( + name: "rays", + initialPosition: .second(.second), + primaryColor: .darkBrown, + widthRatio: 0.175, + heightRatio: 0.06, + horizontalOffsetRatio: 0.235, + verticalOffsetRatio: 0.33, + isAnimating: isAnimating, + symbolCountToWaitFor: 4 + ) - Image(systemName: "rays") - .arrangeShape( - primaryColor: .darkBrown, - width: model.calculatingProportionalValue(withRatio: 0.175, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.165, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.33, forPreview: true) - ) + AnimatableSymbolView( + name: "rays", + initialPosition: .second(.second), + primaryColor: .darkBrown, + widthRatio: 0.175, + heightRatio: 0.06, + horizontalOffsetRatio: 0.165, + verticalOffsetRatio: 0.33, + isAnimating: isAnimating, + symbolCountToWaitFor: 4 + ) // MARK: - 􀁹 Lion mouth - Image(systemName: "arrow.down.circle.fill") - .arrangeShape( - primaryColor: .black, - secondaryColor: .white, - width: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.11, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.34, forPreview: true) - ) + AnimatableSymbolView( + name: "arrow.down.circle.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .second(.third), + primaryColor: .black, + secondaryColor: .white, + widthRatio: 0.125, + heightRatio: 0.11, + horizontalOffsetRatio: 0.2, + verticalOffsetRatio: 0.34, + isAnimating: isAnimating, + symbolCountToWaitFor: 5 + ) // MARK: - 􀆼 Lion Nose - Image(systemName: "moon.circle.fill") - .arrangeShape( - primaryColor: .white, - secondaryColor: .darkBrown, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - rotationDegrees: 170, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.32, forPreview: true) - ) + AnimatableSymbolView( + name: "moon.circle.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .third(.seventh), + primaryColor: .white, + secondaryColor: .darkBrown, + widthRatio: 0.04, + heightRatio: 0.04, + rotationDegrees: 170, + horizontalOffsetRatio: 0.2, + verticalOffsetRatio: 0.32, + isAnimating: isAnimating, + symbolCountToWaitFor: 6 + ) } } } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsPreviewView.swift index b1b1b88..3048ecb 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsPreviewView.swift @@ -137,7 +137,7 @@ struct PartyAnimalsPreviewView: View { // MARK: - Flog private func flog() -> some View { ZStack { - // MARK: - 􀀁 Flog eye + // MARK: - 􀀁 Flog eye outline Image(systemName: "circle.fill") .arrangeShape( primaryColor: .green, @@ -181,11 +181,10 @@ struct PartyAnimalsPreviewView: View { primaryColor: .green, width: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true), height: model.calculatingProportionalValue(withRatio: 0.325, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0, forPreview: true) + horizontalOffset: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true) ) - // MARK: - 􀆈 Flog outline + // MARK: - 􀆈 Flog mouth Image(systemName: "chevron.down") .arrangeShape( fontWeight: .bold, @@ -223,7 +222,7 @@ struct PartyAnimalsPreviewView: View { verticalOffset: model.calculatingProportionalValue(withRatio: 0.26, forPreview: true) ) - // MARK: - 􀀁 Bear ear + // MARK: - 􀀁 Lion ear Image(systemName: "circle.fill") .arrangeShape( primaryColor: .yellow, From 4619c57aab09ed3b42cedcd284524f6a899caa63 Mon Sep 17 00:00:00 2001 From: littleossa Date: Fri, 9 Feb 2024 11:18:47 +0900 Subject: [PATCH 061/108] Update ArtGallery --- .../ArtisticWorldOfSFSymbols/ArtGalleryView.swift | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift index 2d0c2d3..f23624d 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift @@ -61,6 +61,13 @@ struct ArtGalleryView: View { .galleryGridItemView(length: model.galleryColumnLength) } + NavigationLink { + PartyAnimalsArtView() + } label: { + PartyAnimalsPreviewView() + .galleryGridItemView(length: model.galleryColumnLength) + } + NavigationLink { AfroBoyArtView() } label: { From 137d8bfc64e6c4fc895df3e97a14069eac8efef5 Mon Sep 17 00:00:00 2001 From: littleossa Date: Fri, 9 Feb 2024 11:20:49 +0900 Subject: [PATCH 062/108] Remove old partyAnimal --- .../project.pbxproj | 56 ------------- .../Animals/Animal/AnimalEye.swift | 33 -------- .../Animals/Animal/AnimalNose.swift | 57 ------------- .../Animals/Animal/AnimalOutline.swift | 57 ------------- .../Animals/Animal/AnimalWhiskers.swift | 38 --------- .../ArtWorks/PartyAnimals/Animals/Bear.swift | 46 ----------- .../ArtWorks/PartyAnimals/Animals/Frog.swift | 45 ----------- .../ArtWorks/PartyAnimals/Animals/Lion.swift | 80 ------------------- .../ArtWorks/PartyAnimals/PartyAnimals.swift | 75 ----------------- 9 files changed, 487 deletions(-) delete mode 100644 SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Animal/AnimalEye.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Animal/AnimalNose.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Animal/AnimalOutline.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Animal/AnimalWhiskers.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Bear.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Frog.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Lion.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/PartyAnimals/PartyAnimals.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 8b8ba09..5951140 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -11,14 +11,6 @@ 973B2CA128C2546C006ED5F0 /* ArrangeShapeWithFont.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973B2CA028C2546C006ED5F0 /* ArrangeShapeWithFont.swift */; }; 973B2CA428C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973B2CA328C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift */; }; 9748BE2028939B04006DF0BE /* FlipType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE1F28939B04006DF0BE /* FlipType.swift */; }; - 9748BE2C2893C428006DF0BE /* Bear.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE2B2893C428006DF0BE /* Bear.swift */; }; - 9748BE2E2893C688006DF0BE /* AnimalOutline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE2D2893C688006DF0BE /* AnimalOutline.swift */; }; - 9748BE302893C706006DF0BE /* AnimalNose.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE2F2893C706006DF0BE /* AnimalNose.swift */; }; - 9748BE322893C91F006DF0BE /* AnimalEye.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE312893C91F006DF0BE /* AnimalEye.swift */; }; - 9748BE352893CB67006DF0BE /* Lion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE342893CB67006DF0BE /* Lion.swift */; }; - 9748BE372893D064006DF0BE /* PartyAnimals.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE362893D064006DF0BE /* PartyAnimals.swift */; }; - 9748BE3A2893D0E3006DF0BE /* Frog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE392893D0E3006DF0BE /* Frog.swift */; }; - 9748BE3C2897AA28006DF0BE /* AnimalWhiskers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE3B2897AA28006DF0BE /* AnimalWhiskers.swift */; }; 9748BE3F2897AE68006DF0BE /* ArmHair.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE3E2897AE68006DF0BE /* ArmHair.swift */; }; 9748BE412897CD6C006DF0BE /* Arm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE402897CD6C006DF0BE /* Arm.swift */; }; 9748BE4328980C4D006DF0BE /* Hair.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE4228980C4D006DF0BE /* Hair.swift */; }; @@ -79,14 +71,6 @@ 973B2CA028C2546C006ED5F0 /* ArrangeShapeWithFont.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrangeShapeWithFont.swift; sourceTree = ""; }; 973B2CA328C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrangeShapeWithWidthAndHeight.swift; sourceTree = ""; }; 9748BE1F28939B04006DF0BE /* FlipType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlipType.swift; sourceTree = ""; }; - 9748BE2B2893C428006DF0BE /* Bear.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bear.swift; sourceTree = ""; }; - 9748BE2D2893C688006DF0BE /* AnimalOutline.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimalOutline.swift; sourceTree = ""; }; - 9748BE2F2893C706006DF0BE /* AnimalNose.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimalNose.swift; sourceTree = ""; }; - 9748BE312893C91F006DF0BE /* AnimalEye.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimalEye.swift; sourceTree = ""; }; - 9748BE342893CB67006DF0BE /* Lion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Lion.swift; sourceTree = ""; }; - 9748BE362893D064006DF0BE /* PartyAnimals.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PartyAnimals.swift; sourceTree = ""; }; - 9748BE392893D0E3006DF0BE /* Frog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Frog.swift; sourceTree = ""; }; - 9748BE3B2897AA28006DF0BE /* AnimalWhiskers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimalWhiskers.swift; sourceTree = ""; }; 9748BE3E2897AE68006DF0BE /* ArmHair.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArmHair.swift; sourceTree = ""; }; 9748BE402897CD6C006DF0BE /* Arm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Arm.swift; sourceTree = ""; }; 9748BE4228980C4D006DF0BE /* Hair.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Hair.swift; sourceTree = ""; }; @@ -188,26 +172,6 @@ path = Enums; sourceTree = ""; }; - 9748BE2A2893C406006DF0BE /* PartyAnimals */ = { - isa = PBXGroup; - children = ( - 9748BE362893D064006DF0BE /* PartyAnimals.swift */, - 97624C3728C81E90004E1720 /* Animals */, - ); - path = PartyAnimals; - sourceTree = ""; - }; - 9748BE382893D079006DF0BE /* Animal */ = { - isa = PBXGroup; - children = ( - 9748BE312893C91F006DF0BE /* AnimalEye.swift */, - 9748BE2D2893C688006DF0BE /* AnimalOutline.swift */, - 9748BE2F2893C706006DF0BE /* AnimalNose.swift */, - 9748BE3B2897AA28006DF0BE /* AnimalWhiskers.swift */, - ); - path = Animal; - sourceTree = ""; - }; 9748BE3D2897ADBD006DF0BE /* ArmHair */ = { isa = PBXGroup; children = ( @@ -276,23 +240,11 @@ 9748BE55289DCB82006DF0BE /* Fireworks */, 9748BE4428980FE4006DF0BE /* DemonWrestler */, 9748BE3D2897ADBD006DF0BE /* ArmHair */, - 9748BE2A2893C406006DF0BE /* PartyAnimals */, 97CD46E528BEF8A000919B65 /* iOSDCJapan2022 */, ); path = ArtWorks; sourceTree = ""; }; - 97624C3728C81E90004E1720 /* Animals */ = { - isa = PBXGroup; - children = ( - 9748BE342893CB67006DF0BE /* Lion.swift */, - 9748BE392893D0E3006DF0BE /* Frog.swift */, - 9748BE2B2893C428006DF0BE /* Bear.swift */, - 9748BE382893D079006DF0BE /* Animal */, - ); - path = Animals; - sourceTree = ""; - }; 9767DEF82B751C1300457DA1 /* WorldPeace */ = { isa = PBXGroup; children = ( @@ -575,25 +527,20 @@ 9748BE4828981096006DF0BE /* DemonWrestlerFace.swift in Sources */, 97AD532D2B717C950034FB5D /* AfroBoyPreviewView.swift in Sources */, 97EF438B2B725E02003648F5 /* NosebleedArtView.swift in Sources */, - 9748BE372893D064006DF0BE /* PartyAnimals.swift in Sources */, 971D9DEA28C9731D00136A36 /* iOSDCJapan2022SymbolType.swift in Sources */, 97AD53182B70DFF30034FB5D /* AnimationValues.swift in Sources */, 9767DEFE2B752E0400457DA1 /* WorldPeace+CharacterPosition.swift in Sources */, 97624C2A28C2BC9A004E1720 /* MediumFirework.swift in Sources */, 97EF43982B733337003648F5 /* MagicianArtView.swift in Sources */, 9767DEFA2B751C2C00457DA1 /* WorldPeacePreviewView.swift in Sources */, - 9748BE3A2893D0E3006DF0BE /* Frog.swift in Sources */, 97CD46E928BF080300919B65 /* iOSDCJapan2022Logo.swift in Sources */, 97AD53242B70E48F0034FB5D /* PlayButton.swift in Sources */, 9748BE2028939B04006DF0BE /* FlipType.swift in Sources */, - 9748BE3C2897AA28006DF0BE /* AnimalWhiskers.swift in Sources */, 97AD531A2B70E0530034FB5D /* Font.Weight+.swift in Sources */, 9748BE6428A3936E006DF0BE /* ArtWorkView.swift in Sources */, 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */, 9767DF092B75C0B500457DA1 /* PartyAnimalsArtView+RawPosition.swift in Sources */, 9748BE5F289F194E006DF0BE /* RocketFirework.swift in Sources */, - 9748BE2E2893C688006DF0BE /* AnimalOutline.swift in Sources */, - 9748BE322893C91F006DF0BE /* AnimalEye.swift in Sources */, 9748BE59289DCE17006DF0BE /* Fireworks.swift in Sources */, 9748BE5D289DD696006DF0BE /* Building.swift in Sources */, 97AD53312B71A5130034FB5D /* GalleryGridView.swift in Sources */, @@ -609,14 +556,12 @@ 97624C3328C4F43F004E1720 /* GeometryProxy+.swift in Sources */, 97EF43952B72DA69003648F5 /* ImWearingPantsArtView.swift in Sources */, 9748BE50289AB439006DF0BE /* DemonWrestlerHand.swift in Sources */, - 9748BE2C2893C428006DF0BE /* Bear.swift in Sources */, 97AD53292B7100670034FB5D /* ArtWorkModel.swift in Sources */, 97EF439C2B7421A7003648F5 /* MagicianPreviewView.swift in Sources */, 973B2CA428C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift in Sources */, 97EF438D2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift in Sources */, 97EF43A52B74F27D003648F5 /* CrayonBoyArtView.swift in Sources */, 9767DF052B75AFE200457DA1 /* PartyAnimalsArtView.swift in Sources */, - 9748BE352893CB67006DF0BE /* Lion.swift in Sources */, 97624C2C28C2DDAA004E1720 /* Buildings.swift in Sources */, 97AD53222B70E3FA0034FB5D /* AnimatableSymbolView.swift in Sources */, 9767DF032B759B2D00457DA1 /* PartyAnimalsPreviewView.swift in Sources */, @@ -628,7 +573,6 @@ 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */, 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */, 9748BE4628981011006DF0BE /* DemonWrestler.swift in Sources */, - 9748BE302893C706006DF0BE /* AnimalNose.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Animal/AnimalEye.swift b/SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Animal/AnimalEye.swift deleted file mode 100644 index dbc145f..0000000 --- a/SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Animal/AnimalEye.swift +++ /dev/null @@ -1,33 +0,0 @@ -// -// AnimalEye.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/07/29. -// - -import SwiftUI - -struct AnimalEye: View { - - let baseLength: CGFloat - let eyeColor: Color - - var body: some View { - ZStack { - Image(symbol: .circleFill) - .arrangeShape(color: eyeColor, - fontSize: baseLength * 0.05) - - Image(symbol: .circleFill) - .arrangeShape(color: .white, - fontSize: baseLength * 0.02) - } - } -} - -struct AnimalEye_Previews: PreviewProvider { - static var previews: some View { - AnimalEye(baseLength: 400, - eyeColor: Color(uiColor: .brown)) - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Animal/AnimalNose.swift b/SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Animal/AnimalNose.swift deleted file mode 100644 index ecc9e6c..0000000 --- a/SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Animal/AnimalNose.swift +++ /dev/null @@ -1,57 +0,0 @@ -// -// BearNose.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/07/29. -// - -import SwiftUI - -struct AnimalNose: View { - - let baseLength: CGFloat - let noseTipColor: Color - let mouthColor: Color - - var body: some View { - ZStack { - Image(symbol: .circleFill) - .arrangeShape(color: .white, - fontSize: baseLength * 0.125) - - Image(symbol: .arrowDown) - .arrangeShape(color: mouthColor, - fontSize: baseLength * 0.09, - offsetY: baseLength * 0.0125) - - // Nose tip - Group { - Image(symbol: .circleFill) - .arrangeShape(color: .white, - fontSize: baseLength * 0.05, - offsetY: baseLength * -0.01) - - Image(symbol: .moonCircleFill) - .arrangeShape(color: noseTipColor, - fontSize: baseLength * 0.05, - fontWeight: .bold, - flipType: .horizontalAndVertical, - offsetY: baseLength * -0.01) - } - } - } -} - -struct AnimalNose_Previews: PreviewProvider { - static var previews: some View { - ZStack { - Rectangle() - .fill(.brown) - .ignoresSafeArea() - - AnimalNose(baseLength: 400, - noseTipColor: .red, - mouthColor: .black) - } - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Animal/AnimalOutline.swift b/SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Animal/AnimalOutline.swift deleted file mode 100644 index f668140..0000000 --- a/SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Animal/AnimalOutline.swift +++ /dev/null @@ -1,57 +0,0 @@ -// -// BearOutline.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/07/29. -// - -import SwiftUI - -struct AnimalOutline: View { - - let baseLength: CGFloat - let faceColor: Color - let earColor: Color - - var body: some View { - ZStack { - Image(symbol: .circleFill) - .arrangeShape(color: faceColor, - fontSize: baseLength * 0.15, - offsetX: baseLength * 0.125, - offsetY: baseLength * -0.15) - - Image(symbol: .rectangleRoundedtopFill) - .arrangeShape(color: earColor, - fontSize: baseLength * 0.06, - rotationDegrees: -20, - offsetX: baseLength * 0.125, - offsetY: baseLength * -0.15) - - Image(symbol: .circleFill) - .arrangeShape(color: faceColor, - fontSize: baseLength * 0.15, - offsetX: baseLength * -0.125, - offsetY: baseLength * -0.15) - - Image(symbol: .rectangleRoundedtopFill) - .arrangeShape(color: earColor, - fontSize: baseLength * 0.06, - rotationDegrees: 20, - offsetX: baseLength * -0.125, - offsetY: baseLength * -0.15) - - Image(symbol: .ovalFill) - .arrangeShape(color: faceColor, - fontSize: baseLength * 0.325) - } - } -} - -struct AnimalOutline_Previews: PreviewProvider { - static var previews: some View { - AnimalOutline(baseLength: 400, - faceColor: .brown, - earColor: .palePink) - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Animal/AnimalWhiskers.swift b/SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Animal/AnimalWhiskers.swift deleted file mode 100644 index 2acb17b..0000000 --- a/SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Animal/AnimalWhiskers.swift +++ /dev/null @@ -1,38 +0,0 @@ -// -// AnimalWhiskers.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/08/01. -// - -import SwiftUI - -struct AnimalWhiskers: View { - - let baseLength: CGFloat - let color: Color - let skinColor: Color - - var body: some View { - ZStack { - Image(symbol: .rays) - .arrangeShape(color: color, - width: baseLength * 0.175, - height: baseLength * 0.1) - - Image(symbol: .rectangleFill) - .arrangeShape(color: skinColor, - fontSize: baseLength * 0.15, - rotationDegrees: 90, - offsetX: baseLength * 0.05) - } - } -} - -struct AnimalWhiskers_Previews: PreviewProvider { - static var previews: some View { - AnimalWhiskers(baseLength: 400, - color: .darkBrown, - skinColor: .red) - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Bear.swift b/SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Bear.swift deleted file mode 100644 index 24c9288..0000000 --- a/SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Bear.swift +++ /dev/null @@ -1,46 +0,0 @@ -// -// Bear.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/07/29. -// - -import SwiftUI - -struct Bear: View { - - let baseLength: CGFloat - - var body: some View { - ZStack { - AnimalOutline(baseLength: baseLength, - faceColor: .brown, - earColor: .palePink) - - // Eyes - Group { - AnimalEye(baseLength: baseLength, - eyeColor: .darkBrown) - .offset(x: baseLength * 0.075, - y: baseLength * -0.04) - - AnimalEye(baseLength: baseLength, - eyeColor: .darkBrown) - .offset(x: baseLength * -0.075, - y: baseLength * -0.04) - } - - AnimalNose(baseLength: baseLength, - noseTipColor: .red, - mouthColor: .black) - .offset(x: 0, - y: baseLength * 0.0375) - } - } -} - -struct Bear_Previews: PreviewProvider { - static var previews: some View { - Bear(baseLength: 400) - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Frog.swift b/SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Frog.swift deleted file mode 100644 index 7d3691c..0000000 --- a/SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Frog.swift +++ /dev/null @@ -1,45 +0,0 @@ -// -// Frog.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/07/29. -// - -import SwiftUI - -struct Frog: View { - - let baseLength: CGFloat - - var body: some View { - ZStack { - AnimalOutline(baseLength: baseLength, - faceColor: .green, - earColor: .green) - - // Eyes - Group { - AnimalEye(baseLength: baseLength, - eyeColor: .black) - .offset(x: baseLength * -0.125, - y: baseLength * -0.15) - - AnimalEye(baseLength: baseLength, - eyeColor: .black) - .offset(x: baseLength * 0.125, - y: baseLength * -0.15) - } - - Image(symbol: .chevronDown) - .arrangeShape(fontSize: baseLength * 0.1, - fontWeight: .bold, - offsetY: baseLength * 0.025) - } - } -} - -struct Frog_Previews: PreviewProvider { - static var previews: some View { - Frog(baseLength: 400) - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Lion.swift b/SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Lion.swift deleted file mode 100644 index 4f710d8..0000000 --- a/SFSymbolsArtCollection/ArtWorks/PartyAnimals/Animals/Lion.swift +++ /dev/null @@ -1,80 +0,0 @@ -// -// Lion.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/07/29. -// - -import SwiftUI - -struct Lion: View { - - let baseLength: CGFloat - - var body: some View { - ZStack { - - // Lion's mane - Group { - Image(symbol: .sealFill) - .arrangeShape(color: .orange, - fontSize: baseLength * 0.575, - fontWeight: .ultraLight) - - Image(symbol: .sealFill) - .arrangeShape(color: .orange, - fontSize: baseLength * 0.575, - fontWeight: .ultraLight, - rotationDegrees: 20) - } - - AnimalOutline(baseLength: baseLength, - faceColor: .yellow, - earColor: .yellow) - .offset(x: 0, - y: baseLength * 0.0375) - - // Whiskers - Group { - AnimalWhiskers(baseLength: baseLength, - color: .darkBrown, - skinColor: .yellow) - .offset(x: baseLength * -0.08, - y: baseLength * 0.075) - - AnimalWhiskers(baseLength: baseLength, - color: .darkBrown, - skinColor: .yellow) - .offset(x: baseLength * -0.08, - y: baseLength * 0.075) - .rotation3DEffect(.degrees(180), - axis: FlipType.horizontal.axis, - anchorZ: 1) - } - - Group { - AnimalEye(baseLength: baseLength, - eyeColor: .darkBrown) - .offset(x: baseLength * -0.075, - y: baseLength * -0.0025) - - AnimalEye(baseLength: baseLength, - eyeColor: .darkBrown) - .offset(x: baseLength * 0.075, - y: baseLength * -0.0025) - } - - AnimalNose(baseLength: baseLength, - noseTipColor: .darkBrown, - mouthColor: .darkBrown) - .offset(x: 0, - y: baseLength * 0.075) - } - } -} - -struct Lion_Previews: PreviewProvider { - static var previews: some View { - Lion(baseLength: 400) - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/PartyAnimals/PartyAnimals.swift b/SFSymbolsArtCollection/ArtWorks/PartyAnimals/PartyAnimals.swift deleted file mode 100644 index 158d397..0000000 --- a/SFSymbolsArtCollection/ArtWorks/PartyAnimals/PartyAnimals.swift +++ /dev/null @@ -1,75 +0,0 @@ -// -// PartyAnimals.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/07/29. -// - -import SwiftUI - -struct PartyAnimals: View { - var body: some View { - - GeometryReader { proxy in - - let baseLength = proxy.baseLength - - VStack { - - HStack { - VStack { - Image(symbol: .pawprintFill) - .arrangeShape(color: .red, - fontSize: baseLength * 0.15, - fontWeight: .regular, - rotationDegrees: 20, - offsetY: baseLength * -0.025) - - Image(symbol: .pawprintFill) - .arrangeShape(color: .blue, - fontSize: baseLength * 0.15, - fontWeight: .regular, - rotationDegrees: -15, - offsetX: baseLength * -0.05, - offsetY: baseLength * -0.025) - } - Bear(baseLength: baseLength) - } - - HStack { - Frog(baseLength: baseLength) - - VStack { - - Image(symbol: .pawprintFill) - .arrangeShape(color: .orange, - fontSize: baseLength * 0.15, - fontWeight: .regular, - rotationDegrees: 15, - offsetY: baseLength * -0.025) - - Image(symbol: .pawprintFill) - .arrangeShape(color: .cyan, - fontSize: baseLength * 0.15, - fontWeight: .regular, - rotationDegrees: -15, - offsetX: baseLength * 0.05, - offsetY: baseLength * -0.025) - } - } - .offset(x: 0, - y: baseLength * 0.025) - - Lion(baseLength: baseLength) - } - .position(proxy.localCenter) - } - } -} - -struct PartyAnimals_Previews: PreviewProvider { - static var previews: some View { - PartyAnimals() - .scaleEffect(0.7) - } -} From 3cb6bfe469fd8106b6dbafffd974fd3c8c8b1e1d Mon Sep 17 00:00:00 2001 From: littleossa Date: Fri, 9 Feb 2024 13:18:41 +0900 Subject: [PATCH 063/108] Refactor AfroBoy --- .../project.pbxproj | 8 ++ .../ArtWorks/ArtWorkView.swift | 2 +- .../AfroBoy/AfroBoyArtView+Element.swift | 82 +++++++++++++++++++ .../ArtWorks/AfroBoy/AfroBoyArtView.swift | 62 ++++---------- .../ArtWorks/AfroBoy/AfroBoyPreviewView.swift | 59 +++++-------- .../Common/Models/SymbolArtElement.swift | 64 +++++++++++++++ 6 files changed, 191 insertions(+), 86 deletions(-) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView+Element.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/SymbolArtElement.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 5951140..5421684 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -35,6 +35,8 @@ 9767DF032B759B2D00457DA1 /* PartyAnimalsPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF022B759B2D00457DA1 /* PartyAnimalsPreviewView.swift */; }; 9767DF052B75AFE200457DA1 /* PartyAnimalsArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF042B75AFE200457DA1 /* PartyAnimalsArtView.swift */; }; 9767DF092B75C0B500457DA1 /* PartyAnimalsArtView+RawPosition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF082B75C0B500457DA1 /* PartyAnimalsArtView+RawPosition.swift */; }; + 9767DF0B2B75D1A100457DA1 /* SymbolArtElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF0A2B75D1A100457DA1 /* SymbolArtElement.swift */; }; + 9767DF0D2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF0C2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift */; }; 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; @@ -96,6 +98,8 @@ 9767DF022B759B2D00457DA1 /* PartyAnimalsPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PartyAnimalsPreviewView.swift; sourceTree = ""; }; 9767DF042B75AFE200457DA1 /* PartyAnimalsArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PartyAnimalsArtView.swift; sourceTree = ""; }; 9767DF082B75C0B500457DA1 /* PartyAnimalsArtView+RawPosition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PartyAnimalsArtView+RawPosition.swift"; sourceTree = ""; }; + 9767DF0A2B75D1A100457DA1 /* SymbolArtElement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolArtElement.swift; sourceTree = ""; }; + 9767DF0C2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AfroBoyArtView+Element.swift"; sourceTree = ""; }; 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; @@ -301,6 +305,7 @@ children = ( 97EF438E2B726D66003648F5 /* ArtWorkModel */, 97AD53172B70DFF30034FB5D /* AnimationValues.swift */, + 9767DF0A2B75D1A100457DA1 /* SymbolArtElement.swift */, ); path = Models; sourceTree = ""; @@ -323,6 +328,7 @@ isa = PBXGroup; children = ( 97AD532A2B71068B0034FB5D /* AfroBoyArtView.swift */, + 9767DF0C2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift */, 97AD532C2B717C950034FB5D /* AfroBoyPreviewView.swift */, ); path = AfroBoy; @@ -519,6 +525,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 9767DF0D2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift in Sources */, 97EF43932B72D3E2003648F5 /* ImWearingPantsPreviewView.swift in Sources */, 97EF439E2B744C4C003648F5 /* Color+.swift in Sources */, 97624C2F28C2E608004E1720 /* SmallFirework.swift in Sources */, @@ -566,6 +573,7 @@ 97AD53222B70E3FA0034FB5D /* AnimatableSymbolView.swift in Sources */, 9767DF032B759B2D00457DA1 /* PartyAnimalsPreviewView.swift in Sources */, 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */, + 9767DF0B2B75D1A100457DA1 /* SymbolArtElement.swift in Sources */, 97EF43A12B74CA38003648F5 /* CrayonBoyPreviewView.swift in Sources */, 9748BE4A28995877006DF0BE /* DemonWrestlerOutline.swift in Sources */, 97EF43902B72D2E4003648F5 /* NosebleedPreviewView.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtWorks/ArtWorkView.swift b/SFSymbolsArtCollection/ArtWorks/ArtWorkView.swift index 40eacb2..63a4cc2 100644 --- a/SFSymbolsArtCollection/ArtWorks/ArtWorkView.swift +++ b/SFSymbolsArtCollection/ArtWorks/ArtWorkView.swift @@ -21,7 +21,7 @@ struct ArtWorkView: View { case .worldPeace: EmptyView() case .partyAnimals: - PartyAnimals() + EmptyView() case .armHair: ArmHair() case .demonWrestler: diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView+Element.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView+Element.swift new file mode 100644 index 0000000..af2c949 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView+Element.swift @@ -0,0 +1,82 @@ +// +// AfroBoyArtView+Element.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension AfroBoyArtView { + + enum Element: String, CaseIterable, Identifiable { + case hair + case outline + case face + case comb + + var id: String { rawValue } + + var value: SymbolArtElement { + switch self { + case .hair: + SymbolArtElement( + symbol: "􁝰", + name: "tree.fill", + initialPosition: .third(.first), + primaryColor: .black, + widthRatio: 0.9, + heightRatio: 0.9, + symbolCountToWaitFor: 0 + ) + case .outline: + SymbolArtElement( + symbol: "􀙧", + name: "shield.fill", + initialPosition: .third(.second), + primaryColor: .paleOrange, + widthRatio: 0.5, + heightRatio: 0.6, + verticalOffsetRatio: 0.17, + symbolCountToWaitFor: 1 + ) + case .face: + SymbolArtElement( + symbol: "􀎽", + name: "faceid", + initialPosition: .third(.third), + primaryColor: .black, + secondaryColor: .paleOrange, + widthRatio: 0.3, + heightRatio: 0.3, + verticalOffsetRatio: 0.16, + symbolCountToWaitFor: 2 + ) + case .comb: + SymbolArtElement( + symbol: "􀦉", + name: "comb.fill", + initialPosition: .third(.fourth), + primaryColor: .red, + widthRatio: 0.2, + heightRatio: 0.2, + horizontalOffsetRatio: -0.2, + verticalOffsetRatio: -0.2, + symbolCountToWaitFor: 3 + ) + } + } + } +} + +#Preview { + NavigationStack { + AfroBoyArtView() + .environment(ArtWorkModel.preview) + } +} + +#Preview { + AfroBoyPreviewView() + .environment(ArtWorkModel.preview) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift index c44ae3f..6702776 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift @@ -9,58 +9,24 @@ import SwiftUI struct AfroBoyArtView: View { - @Environment(ArtWorkModel.self) var model @State private var isAnimating = false var body: some View { ZStack { - - // MARK: - 􁝰 Hair - AnimatableSymbolView( - name: "tree.fill", - initialPosition: .third(.first), - widthRatio: 0.9, - heightRatio: 0.9, - isAnimating: isAnimating, - symbolCountToWaitFor: 0 - ) - - // MARK: - 􀙧 Contour - AnimatableSymbolView( - name: "shield.fill", - initialPosition: .third(.second), - primaryColor: .paleOrange, - widthRatio: 0.5, - heightRatio: 0.6, - verticalOffsetRatio: 0.17, - isAnimating: isAnimating, - symbolCountToWaitFor: 1 - ) - - // MARK: - 􀎽 Face - AnimatableSymbolView( - name: "faceid", - initialPosition: .third(.third), - secondaryColor: .paleOrange, - widthRatio: 0.3, - heightRatio: 0.3, - verticalOffsetRatio: 0.16, - isAnimating: isAnimating, - symbolCountToWaitFor: 2 - ) - - // MARK: - 􀦉 Comb - AnimatableSymbolView( - name: "comb.fill", - initialPosition: .third(.fourth), - primaryColor: .red, - widthRatio: 0.2, - heightRatio: 0.2, - horizontalOffsetRatio: -0.2, - verticalOffsetRatio: -0.2, - isAnimating: isAnimating, - symbolCountToWaitFor: 3 - ) + ForEach(Element.allCases) { + AnimatableSymbolView( + name: $0.value.name, + initialPosition: $0.value.initialPosition, + primaryColor: $0.value.primaryColor, + secondaryColor: $0.value.secondaryColor, + widthRatio: $0.value.widthRatio, + heightRatio: $0.value.heightRatio, + horizontalOffsetRatio: $0.value.horizontalOffsetRatio, + verticalOffsetRatio: $0.value.verticalOffsetRatio, + isAnimating: isAnimating, + symbolCountToWaitFor: $0.value.symbolCountToWaitFor + ) + } } .navigationTitle("Afro boy") .navigationBarTitleDisplayMode(.inline) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift index 534e89d..f10f404 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift @@ -10,46 +10,31 @@ import SwiftUI struct AfroBoyPreviewView: View { @Environment(ArtWorkModel.self) var model - @State private var isAnimating = false var body: some View { ZStack { - - // MARK: - 􁝰 Hair - Image(systemName: "tree.fill") - .arrangeShape( - width: model.calculatingProportionalValue(withRatio: 0.9, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.9, forPreview: true) - ) - - // MARK: - 􀙧 Contour - Image(systemName: "shield.fill") - .arrangeShape( - primaryColor: .paleOrange, - width: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.6, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.17, forPreview: true) - ) - - // MARK: - 􀎽 Face - Image(systemName: "faceid") - .arrangeShape( - primaryColor: .black, - secondaryColor: .paleOrange, - width: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.16, forPreview: true) - ) - - // MARK: - 􀦉 Comb - Image(systemName: "comb.fill") - .arrangeShape( - primaryColor: .red, - width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true) - ) + ForEach(AfroBoyArtView.Element.allCases) { + Image(systemName: $0.value.name) + .arrangeShape( + primaryColor: $0.value.primaryColor, + secondaryColor: $0.value.secondaryColor, + width: model.calculatingProportionalValue( + withRatio: $0.value.widthRatio, + forPreview: true + ), + height: model.calculatingProportionalValue( + withRatio: $0.value.heightRatio, + forPreview: true + ), + horizontalOffset: model.calculatingProportionalValue( + withRatio: $0.value.horizontalOffsetRatio, + forPreview: true + ), + verticalOffset: model.calculatingProportionalValue( + withRatio: $0.value.verticalOffsetRatio, + forPreview: true) + ) + } } } } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/SymbolArtElement.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/SymbolArtElement.swift new file mode 100644 index 0000000..8884900 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/SymbolArtElement.swift @@ -0,0 +1,64 @@ +// +// SymbolArtElement.swift +// SFSymbolsArtCollection +// +// Created Lil Ossa +// + +import SwiftUI + +struct SymbolArtElement { + + let symbol: String + let name: String + let initialPrimaryColor: Color + let initialSecondaryColor: Color + let initialPosition: ArtWorkModel.InitialSymbolRow + let primaryColor: Color + let secondaryColor: Color + let fontWeight: Font.Weight + let widthRatio: CGFloat + let heightRatio: CGFloat + let rotationDegrees: CGFloat + var flip: FlipType + let horizontalOffsetRatio: CGFloat + let verticalOffsetRatio: CGFloat + let symbolCountToWaitFor: Int + let zIndex: CGFloat + + init( + symbol: String, + name: String, + initialPrimaryColor: Color = .black, + initialSecondaryColor: Color = .black, + initialPosition: ArtWorkModel.InitialSymbolRow, + primaryColor: Color, + secondaryColor: Color = .black, + fontWeight: Font.Weight = .regular, + widthRatio: CGFloat, + heightRatio: CGFloat, + rotationDegrees: CGFloat = 0, + flip: FlipType = .none, + horizontalOffsetRatio: CGFloat = 0, + verticalOffsetRatio: CGFloat = 0, + symbolCountToWaitFor: Int, + zIndex: CGFloat = 0 + ) { + self.symbol = symbol + self.name = name + self.initialPrimaryColor = initialPrimaryColor + self.initialSecondaryColor = initialSecondaryColor + self.initialPosition = initialPosition + self.primaryColor = primaryColor + self.secondaryColor = secondaryColor + self.fontWeight = fontWeight + self.widthRatio = widthRatio + self.heightRatio = heightRatio + self.rotationDegrees = rotationDegrees + self.flip = flip + self.horizontalOffsetRatio = horizontalOffsetRatio + self.verticalOffsetRatio = verticalOffsetRatio + self.symbolCountToWaitFor = symbolCountToWaitFor + self.zIndex = zIndex + } +} From 826c7387811ebc16f3eff682ffed89d656e7b1b4 Mon Sep 17 00:00:00 2001 From: littleossa Date: Fri, 9 Feb 2024 13:34:05 +0900 Subject: [PATCH 064/108] Add SymbolArtPreviewView --- .../project.pbxproj | 4 ++ .../ArtWorks/AfroBoy/AfroBoyPreviewView.swift | 25 +------- .../SymbolArtPreviewView.swift | 62 +++++++++++++++++++ 3 files changed, 68 insertions(+), 23 deletions(-) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/SymbolArtPreviewView.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 5421684..67d0db2 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -37,6 +37,7 @@ 9767DF092B75C0B500457DA1 /* PartyAnimalsArtView+RawPosition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF082B75C0B500457DA1 /* PartyAnimalsArtView+RawPosition.swift */; }; 9767DF0B2B75D1A100457DA1 /* SymbolArtElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF0A2B75D1A100457DA1 /* SymbolArtElement.swift */; }; 9767DF0D2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF0C2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift */; }; + 9767DF0F2B75DFB400457DA1 /* SymbolArtPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF0E2B75DFB400457DA1 /* SymbolArtPreviewView.swift */; }; 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; @@ -100,6 +101,7 @@ 9767DF082B75C0B500457DA1 /* PartyAnimalsArtView+RawPosition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PartyAnimalsArtView+RawPosition.swift"; sourceTree = ""; }; 9767DF0A2B75D1A100457DA1 /* SymbolArtElement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolArtElement.swift; sourceTree = ""; }; 9767DF0C2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AfroBoyArtView+Element.swift"; sourceTree = ""; }; + 9767DF0E2B75DFB400457DA1 /* SymbolArtPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolArtPreviewView.swift; sourceTree = ""; }; 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; @@ -338,6 +340,7 @@ isa = PBXGroup; children = ( 97AD53212B70E3FA0034FB5D /* AnimatableSymbolView.swift */, + 9767DF0E2B75DFB400457DA1 /* SymbolArtPreviewView.swift */, 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */, ); path = AnimatableSymbolView; @@ -577,6 +580,7 @@ 97EF43A12B74CA38003648F5 /* CrayonBoyPreviewView.swift in Sources */, 9748BE4A28995877006DF0BE /* DemonWrestlerOutline.swift in Sources */, 97EF43902B72D2E4003648F5 /* NosebleedPreviewView.swift in Sources */, + 9767DF0F2B75DFB400457DA1 /* SymbolArtPreviewView.swift in Sources */, 9748BE4C28995A43006DF0BE /* DemonWrestlerBody.swift in Sources */, 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */, 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift index f10f404..3b8ac1d 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift @@ -8,32 +8,11 @@ import SwiftUI struct AfroBoyPreviewView: View { - - @Environment(ArtWorkModel.self) var model - + var body: some View { ZStack { ForEach(AfroBoyArtView.Element.allCases) { - Image(systemName: $0.value.name) - .arrangeShape( - primaryColor: $0.value.primaryColor, - secondaryColor: $0.value.secondaryColor, - width: model.calculatingProportionalValue( - withRatio: $0.value.widthRatio, - forPreview: true - ), - height: model.calculatingProportionalValue( - withRatio: $0.value.heightRatio, - forPreview: true - ), - horizontalOffset: model.calculatingProportionalValue( - withRatio: $0.value.horizontalOffsetRatio, - forPreview: true - ), - verticalOffset: model.calculatingProportionalValue( - withRatio: $0.value.verticalOffsetRatio, - forPreview: true) - ) + SymbolArtPreviewView(element: $0.value) } } } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/SymbolArtPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/SymbolArtPreviewView.swift new file mode 100644 index 0000000..08f74d1 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/SymbolArtPreviewView.swift @@ -0,0 +1,62 @@ +// +// SymbolArtPreviewView.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +struct SymbolArtPreviewView: View { + + @Environment(ArtWorkModel.self) var model + let forPreview: Bool + let element: SymbolArtElement + + init(forPreview: Bool = true, element: SymbolArtElement) { + self.forPreview = forPreview + self.element = element + } + + var body: some View { + Image(systemName: element.name) + .resizable() + .foregroundStyle(element.primaryColor, element.secondaryColor) + .fontWeight(element.fontWeight) + .frame( + width: model.calculatingProportionalValue( + withRatio: element.widthRatio, + forPreview: forPreview + ), + height: model.calculatingProportionalValue( + withRatio: element.heightRatio, + forPreview: forPreview + ) + ) + .rotationEffect(.degrees(element.rotationDegrees)) + .rotation3DEffect(.degrees(180), axis: element.flip.axis) + .offset( + x: model.calculatingProportionalValue( + withRatio: element.horizontalOffsetRatio, + forPreview: forPreview + ), + y: model.calculatingProportionalValue( + withRatio: element.verticalOffsetRatio, + forPreview: forPreview + ) + ) + .zIndex(element.zIndex) + } +} + +#Preview { + VStack { + SymbolArtPreviewView(element: AfroBoyArtView.Element.face.value) + + SymbolArtPreviewView( + forPreview: false, + element: AfroBoyArtView.Element.face.value + ) + } + .environment(ArtWorkModel.preview) +} From 9307b08416ffb1eb506694529ccff700d65341c8 Mon Sep 17 00:00:00 2001 From: littleossa Date: Fri, 9 Feb 2024 13:39:08 +0900 Subject: [PATCH 065/108] Modify AnimatableSymbolView --- .../AnimatableSymbolView.swift | 58 +++++++------------ 1 file changed, 20 insertions(+), 38 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/AnimatableSymbolView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/AnimatableSymbolView.swift index f23f304..e5df6ba 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/AnimatableSymbolView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/AnimatableSymbolView.swift @@ -9,38 +9,23 @@ import SwiftUI struct AnimatableSymbolView: View { - init( - name: String, - initialPrimaryColor: Color = .black, - initialSecondaryColor: Color = .black, - initialPosition: ArtWorkModel.InitialSymbolRow, - primaryColor: Color = .black, - secondaryColor: Color = .black, - fontWeight: Font.Weight = .regular, - widthRatio: CGFloat, - heightRatio: CGFloat, - rotationDegrees: CGFloat = 0, - flip: FlipType = .none, - horizontalOffsetRatio: CGFloat = 0, - verticalOffsetRatio: CGFloat = 0, - isAnimating: Bool, - symbolCountToWaitFor: Int - ) { - self.name = name - self.initialPrimaryColor = initialPrimaryColor - self.initialSecondaryColor = initialSecondaryColor - self.initialPosition = initialPosition - self.primaryColor = primaryColor - self.secondaryColor = secondaryColor - self.fontWeight = fontWeight - self.widthRatio = widthRatio - self.heightRatio = heightRatio - self.rotationDegrees = rotationDegrees - self.rotationAxis = flip.axis - self.horizontalOffsetRatio = horizontalOffsetRatio - self.verticalOffsetRatio = verticalOffsetRatio + init(element: SymbolArtElement, isAnimating: Bool) { + self.name = element.name + self.initialPrimaryColor = element.initialPrimaryColor + self.initialSecondaryColor = element.initialSecondaryColor + self.initialPosition = element.initialPosition + self.primaryColor = element.primaryColor + self.secondaryColor = element.secondaryColor + self.fontWeight = element.fontWeight + self.widthRatio = element.widthRatio + self.heightRatio = element.heightRatio + self.rotationDegrees = element.rotationDegrees + self.rotationAxis = element.flip.axis + self.horizontalOffsetRatio = element.horizontalOffsetRatio + self.verticalOffsetRatio = element.verticalOffsetRatio + self.zIndex = element.zIndex self.isAnimating = isAnimating - self.symbolCountToWaitFor = symbolCountToWaitFor + self.symbolCountToWaitFor = element.symbolCountToWaitFor } @Environment(ArtWorkModel.self) var model @@ -57,6 +42,7 @@ struct AnimatableSymbolView: View { var rotationAxis: (x: CGFloat, y: CGFloat, z: CGFloat) let horizontalOffsetRatio: CGFloat let verticalOffsetRatio: CGFloat + let zIndex: CGFloat let isAnimating: Bool let symbolCountToWaitFor: Int @@ -188,18 +174,14 @@ struct AnimatableSymbolView: View { CubicKeyframe(0, duration: model.animationDurationPerSymbol * 0.2) } } + .zIndex(zIndex) } } #Preview { AnimatableSymbolView( - name: "nose", - initialPosition: .third(.first), - primaryColor: .red, - widthRatio: 1, - heightRatio: 1, - isAnimating: true, - symbolCountToWaitFor: 0 + element: AfroBoyArtView.Element.hair.value, + isAnimating: true ) .environment(ArtWorkModel.preview) } From 61fdc6116ab5803e3b510bbe0ad2ef568e1f3fbd Mon Sep 17 00:00:00 2001 From: littleossa Date: Fri, 9 Feb 2024 13:39:28 +0900 Subject: [PATCH 066/108] Remove unused arrangeShape method --- .../project.pbxproj | 4 --- .../Extensions/Image+arrangeShape.swift | 34 ------------------- 2 files changed, 38 deletions(-) delete mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/Image+arrangeShape.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 67d0db2..bc90b18 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -65,7 +65,6 @@ 97EF439C2B7421A7003648F5 /* MagicianPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF439B2B7421A7003648F5 /* MagicianPreviewView.swift */; }; 97EF439E2B744C4C003648F5 /* Color+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF439D2B744C4C003648F5 /* Color+.swift */; }; 97EF43A12B74CA38003648F5 /* CrayonBoyPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43A02B74CA38003648F5 /* CrayonBoyPreviewView.swift */; }; - 97EF43A32B74D9BA003648F5 /* Image+arrangeShape.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43A22B74D9BA003648F5 /* Image+arrangeShape.swift */; }; 97EF43A52B74F27D003648F5 /* CrayonBoyArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43A42B74F27D003648F5 /* CrayonBoyArtView.swift */; }; /* End PBXBuildFile section */ @@ -129,7 +128,6 @@ 97EF439B2B7421A7003648F5 /* MagicianPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicianPreviewView.swift; sourceTree = ""; }; 97EF439D2B744C4C003648F5 /* Color+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+.swift"; sourceTree = ""; }; 97EF43A02B74CA38003648F5 /* CrayonBoyPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrayonBoyPreviewView.swift; sourceTree = ""; }; - 97EF43A22B74D9BA003648F5 /* Image+arrangeShape.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Image+arrangeShape.swift"; sourceTree = ""; }; 97EF43A42B74F27D003648F5 /* CrayonBoyArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrayonBoyArtView.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -400,7 +398,6 @@ children = ( 97EF439D2B744C4C003648F5 /* Color+.swift */, 97624C3228C4F43F004E1720 /* GeometryProxy+.swift */, - 97EF43A22B74D9BA003648F5 /* Image+arrangeShape.swift */, 97AD53112B70DEB60034FB5D /* UIDevice+.swift */, 97AD53192B70E0530034FB5D /* Font.Weight+.swift */, ); @@ -554,7 +551,6 @@ 9748BE59289DCE17006DF0BE /* Fireworks.swift in Sources */, 9748BE5D289DD696006DF0BE /* Building.swift in Sources */, 97AD53312B71A5130034FB5D /* GalleryGridView.swift in Sources */, - 97EF43A32B74D9BA003648F5 /* Image+arrangeShape.swift in Sources */, 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */, 9748BE6628A395D5006DF0BE /* ArtWork.swift in Sources */, 97AD532B2B71068B0034FB5D /* AfroBoyArtView.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/Image+arrangeShape.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/Image+arrangeShape.swift deleted file mode 100644 index b0cd9c8..0000000 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/Image+arrangeShape.swift +++ /dev/null @@ -1,34 +0,0 @@ -// -// Image+arrangeShape.swift -// SFSymbolsArtCollection -// -// Created by Lil Ossa -// - -import SwiftUI - -extension Image { - - func arrangeShape( - primaryColor: Color = .black, - secondaryColor: Color = .black, - fontWeight: Font.Weight = .regular, - width: CGFloat, - height: CGFloat, - rotationDegrees: CGFloat = 0, - flip: FlipType = .none, - horizontalOffset: CGFloat = 0, - verticalOffset: CGFloat = 0 - ) -> some View { - self - .resizable() - .foregroundStyle(primaryColor, secondaryColor) - .fontWeight(fontWeight) - .frame(width: width, height: height) - .rotationEffect(.degrees(rotationDegrees)) - .rotation3DEffect(.degrees(180), axis: flip.axis) - .offset(x: horizontalOffset, - y: verticalOffset) - } -} - From 2961f770d1fb4b68b8aaaddfe20d6a57915c5861 Mon Sep 17 00:00:00 2001 From: littleossa Date: Fri, 9 Feb 2024 13:41:18 +0900 Subject: [PATCH 067/108] Remove unused views --- .../project.pbxproj | 8 ---- .../ArtWorks/ArtWorkView.swift | 39 --------------- SFSymbolsArtCollection/ContentView.swift | 48 ------------------- 3 files changed, 95 deletions(-) delete mode 100644 SFSymbolsArtCollection/ArtWorks/ArtWorkView.swift delete mode 100644 SFSymbolsArtCollection/ContentView.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index bc90b18..fc0b4c6 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -23,7 +23,6 @@ 9748BE59289DCE17006DF0BE /* Fireworks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE58289DCE17006DF0BE /* Fireworks.swift */; }; 9748BE5D289DD696006DF0BE /* Building.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE5C289DD696006DF0BE /* Building.swift */; }; 9748BE5F289F194E006DF0BE /* RocketFirework.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE5E289F194E006DF0BE /* RocketFirework.swift */; }; - 9748BE6428A3936E006DF0BE /* ArtWorkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE6328A3936E006DF0BE /* ArtWorkView.swift */; }; 9748BE6628A395D5006DF0BE /* ArtWork.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE6528A395D5006DF0BE /* ArtWork.swift */; }; 97624C2A28C2BC9A004E1720 /* MediumFirework.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C2928C2BC9A004E1720 /* MediumFirework.swift */; }; 97624C2C28C2DDAA004E1720 /* Buildings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C2B28C2DDAA004E1720 /* Buildings.swift */; }; @@ -52,7 +51,6 @@ 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */; }; 97CD46E928BF080300919B65 /* iOSDCJapan2022Logo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */; }; 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11D4F2817381100B2AB32 /* SFSymbolsArtCollectionApp.swift */; }; - 97E11D522817381100B2AB32 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11D512817381100B2AB32 /* ContentView.swift */; }; 97E11D542817381200B2AB32 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97E11D532817381200B2AB32 /* Assets.xcassets */; }; 97E11D572817381200B2AB32 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97E11D562817381200B2AB32 /* Preview Assets.xcassets */; }; 97E11DF028176A0D00B2AB32 /* SFUserFriendlySymbols in Frameworks */ = {isa = PBXBuildFile; productRef = 97E11DEF28176A0D00B2AB32 /* SFUserFriendlySymbols */; }; @@ -86,7 +84,6 @@ 9748BE5C289DD696006DF0BE /* Building.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Building.swift; sourceTree = ""; }; 9748BE5E289F194E006DF0BE /* RocketFirework.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RocketFirework.swift; sourceTree = ""; }; 9748BE62289F4BFB006DF0BE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; - 9748BE6328A3936E006DF0BE /* ArtWorkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtWorkView.swift; sourceTree = ""; }; 9748BE6528A395D5006DF0BE /* ArtWork.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtWork.swift; sourceTree = ""; }; 97624C2928C2BC9A004E1720 /* MediumFirework.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediumFirework.swift; sourceTree = ""; }; 97624C2B28C2DDAA004E1720 /* Buildings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Buildings.swift; sourceTree = ""; }; @@ -116,7 +113,6 @@ 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Logo.swift; sourceTree = ""; }; 97E11D4C2817381100B2AB32 /* SFSymbolsArtCollection.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SFSymbolsArtCollection.app; sourceTree = BUILT_PRODUCTS_DIR; }; 97E11D4F2817381100B2AB32 /* SFSymbolsArtCollectionApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFSymbolsArtCollectionApp.swift; sourceTree = ""; }; - 97E11D512817381100B2AB32 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; 97E11D532817381200B2AB32 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97E11D562817381200B2AB32 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; 97EF438A2B725E02003648F5 /* NosebleedArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NosebleedArtView.swift; sourceTree = ""; }; @@ -239,7 +235,6 @@ 97624C3628C74AA0004E1720 /* ArtWorks */ = { isa = PBXGroup; children = ( - 9748BE6328A3936E006DF0BE /* ArtWorkView.swift */, 9748BE6528A395D5006DF0BE /* ArtWork.swift */, 9748BE55289DCB82006DF0BE /* Fireworks */, 9748BE4428980FE4006DF0BE /* DemonWrestler */, @@ -376,7 +371,6 @@ 9748BE62289F4BFB006DF0BE /* Info.plist */, 97E11D4F2817381100B2AB32 /* SFSymbolsArtCollectionApp.swift */, 97AD530D2B70DBC70034FB5D /* ArtisticWorldOfSFSymbols */, - 97E11D512817381100B2AB32 /* ContentView.swift */, 97624C3628C74AA0004E1720 /* ArtWorks */, 971D9DE628C93EB500136A36 /* Common */, 97E11D532817381200B2AB32 /* Assets.xcassets */, @@ -544,7 +538,6 @@ 97AD53242B70E48F0034FB5D /* PlayButton.swift in Sources */, 9748BE2028939B04006DF0BE /* FlipType.swift in Sources */, 97AD531A2B70E0530034FB5D /* Font.Weight+.swift in Sources */, - 9748BE6428A3936E006DF0BE /* ArtWorkView.swift in Sources */, 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */, 9767DF092B75C0B500457DA1 /* PartyAnimalsArtView+RawPosition.swift in Sources */, 9748BE5F289F194E006DF0BE /* RocketFirework.swift in Sources */, @@ -556,7 +549,6 @@ 97AD532B2B71068B0034FB5D /* AfroBoyArtView.swift in Sources */, 973B2CA128C2546C006ED5F0 /* ArrangeShapeWithFont.swift in Sources */, 9748BE3F2897AE68006DF0BE /* ArmHair.swift in Sources */, - 97E11D522817381100B2AB32 /* ContentView.swift in Sources */, 9748BE412897CD6C006DF0BE /* Arm.swift in Sources */, 9748BE4328980C4D006DF0BE /* Hair.swift in Sources */, 97624C3328C4F43F004E1720 /* GeometryProxy+.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtWorks/ArtWorkView.swift b/SFSymbolsArtCollection/ArtWorks/ArtWorkView.swift deleted file mode 100644 index 63a4cc2..0000000 --- a/SFSymbolsArtCollection/ArtWorks/ArtWorkView.swift +++ /dev/null @@ -1,39 +0,0 @@ -// -// ArtWorkView.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/08/10. -// - -import SwiftUI - -struct ArtWorkView: View { - - @Binding var artwork: ArtWork - - var body: some View { - - switch artwork { - case .crayonBoy: - EmptyView() - case .magician: - EmptyView() - case .worldPeace: - EmptyView() - case .partyAnimals: - EmptyView() - case .armHair: - ArmHair() - case .demonWrestler: - DemonWrestler() - case .fireworks: - Fireworks() - } - } -} - -struct ArtWorkView_Previews: PreviewProvider { - static var previews: some View { - ArtWorkView(artwork: .constant(.crayonBoy)) - } -} diff --git a/SFSymbolsArtCollection/ContentView.swift b/SFSymbolsArtCollection/ContentView.swift deleted file mode 100644 index b604465..0000000 --- a/SFSymbolsArtCollection/ContentView.swift +++ /dev/null @@ -1,48 +0,0 @@ -// -// ContentView.swift -// SFSymbolsArtCollection -// -// - -import SwiftUI - -struct ContentView: View { - - @State private var isPresented = false - @State private var selectedArtWork: ArtWork = .crayonBoy - - var body: some View { - - VStack { - - iOSDCJapan2022Logo() - - List { - ForEach(ArtWork.allCases) { artwork in - Button { - selectedArtWork = artwork - isPresented = true - } label: { - HStack { - Text(artwork.title) - - Spacer() - - Image(symbol: .chevronForward) - .font(.caption.bold()) - } - } - } - } - } - .sheet(isPresented: $isPresented, content: { - ArtWorkView(artwork: $selectedArtWork) - }) - } -} - -struct ContentView_Previews: PreviewProvider { - static var previews: some View { - ContentView() - } -} From 29d15ca2db7ce4484a32dfd7b8e941204c453367 Mon Sep 17 00:00:00 2001 From: littleossa Date: Fri, 9 Feb 2024 14:02:14 +0900 Subject: [PATCH 068/108] Refactor MagicianArtView --- .../project.pbxproj | 4 + .../Magician/MagicianArtView+Element.swift | 221 ++++++++++++++++++ .../ArtWorks/Magician/MagicianArtView.swift | 181 +------------- .../Magician/MagicianPreviewView.swift | 137 +---------- 4 files changed, 232 insertions(+), 311 deletions(-) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView+Element.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index fc0b4c6..0e73c13 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -37,6 +37,7 @@ 9767DF0B2B75D1A100457DA1 /* SymbolArtElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF0A2B75D1A100457DA1 /* SymbolArtElement.swift */; }; 9767DF0D2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF0C2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift */; }; 9767DF0F2B75DFB400457DA1 /* SymbolArtPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF0E2B75DFB400457DA1 /* SymbolArtPreviewView.swift */; }; + 9767DF112B75E8FC00457DA1 /* MagicianArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF102B75E8FC00457DA1 /* MagicianArtView+Element.swift */; }; 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; @@ -98,6 +99,7 @@ 9767DF0A2B75D1A100457DA1 /* SymbolArtElement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolArtElement.swift; sourceTree = ""; }; 9767DF0C2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AfroBoyArtView+Element.swift"; sourceTree = ""; }; 9767DF0E2B75DFB400457DA1 /* SymbolArtPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolArtPreviewView.swift; sourceTree = ""; }; + 9767DF102B75E8FC00457DA1 /* MagicianArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MagicianArtView+Element.swift"; sourceTree = ""; }; 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; @@ -429,6 +431,7 @@ isa = PBXGroup; children = ( 97EF43972B733337003648F5 /* MagicianArtView.swift */, + 9767DF102B75E8FC00457DA1 /* MagicianArtView+Element.swift */, 97EF439B2B7421A7003648F5 /* MagicianPreviewView.swift */, ); path = Magician; @@ -568,6 +571,7 @@ 97EF43A12B74CA38003648F5 /* CrayonBoyPreviewView.swift in Sources */, 9748BE4A28995877006DF0BE /* DemonWrestlerOutline.swift in Sources */, 97EF43902B72D2E4003648F5 /* NosebleedPreviewView.swift in Sources */, + 9767DF112B75E8FC00457DA1 /* MagicianArtView+Element.swift in Sources */, 9767DF0F2B75DFB400457DA1 /* SymbolArtPreviewView.swift in Sources */, 9748BE4C28995A43006DF0BE /* DemonWrestlerBody.swift in Sources */, 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView+Element.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView+Element.swift new file mode 100644 index 0000000..f6df052 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView+Element.swift @@ -0,0 +1,221 @@ +// +// MagicianArtView+Element.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension MagicianArtView { + + enum Element: String, CaseIterable, Identifiable { + case outline + case hatBand + case hat + case hatBrim + case eyeBrowRight + case eyeBrowLeft + case sunGlassesFrameLeading + case sunGlassesFrameCenter + case sunGlassesFrameTrailing + case sunGlassesLensRight + case sunGlassesLensLeft + case nose + case mouth + case tongue + + var id: String { rawValue } + + var value: SymbolArtElement { + switch self { + case .outline: + SymbolArtElement( + symbol: "􀠒", + name: "drop.fill", + initialPosition: .second(.first), + primaryColor: .paleOrange, + widthRatio: 0.5, + heightRatio: 0.75, + rotationDegrees: 180, + verticalOffsetRatio: 0.15, + symbolCountToWaitFor: 0 + ) + case .hatBand: + SymbolArtElement( + symbol: "􀏄", + name: "rectangle.fill", + initialPosition: .second(.second), + primaryColor: .red, + widthRatio: 0.446, + heightRatio: 0.1, + horizontalOffsetRatio: 0.01, + verticalOffsetRatio: -0.15, + symbolCountToWaitFor: 1 + ) + case .hat: + SymbolArtElement( + symbol: "􀈮", + name: "archivebox.fill", + initialPosition: .third(.first), + primaryColor: .black, + widthRatio: 0.525, + heightRatio: 0.525, + rotationDegrees: 180, + verticalOffsetRatio: -0.25, + symbolCountToWaitFor: 2 + ) + case .hatBrim: + SymbolArtElement( + symbol: "􀏄", + name: "rectangle.fill", + initialPosition: .second(.second), + primaryColor: .black, + widthRatio: 0.625, + heightRatio: 0.125, + verticalOffsetRatio: -0.05, + symbolCountToWaitFor: 3 + ) + case .eyeBrowRight: + SymbolArtElement( + symbol: "􀆐", + name: "chevron.compact.up", + initialPosition: .third(.second), + primaryColor: .black, + fontWeight: .thin, + widthRatio: 0.1, + heightRatio: 0.04, + horizontalOffsetRatio: 0.1, + verticalOffsetRatio: 0.03, + symbolCountToWaitFor: 4 + ) + case .eyeBrowLeft: + SymbolArtElement( + symbol: "􀆐", + name: "chevron.compact.up", + initialPosition: .third(.second), + primaryColor: .black, + fontWeight: .thin, + widthRatio: 0.1, + heightRatio: 0.04, + horizontalOffsetRatio: -0.1, + verticalOffsetRatio: 0.03, + symbolCountToWaitFor: 4 + ) + case .sunGlassesFrameLeading: + SymbolArtElement( + symbol: "􀅽", + name: "minus", + initialPosition: .third(.third), + primaryColor: .black, + fontWeight: .thin, + widthRatio: 0.06, + heightRatio: 0.0125, + verticalOffsetRatio: 0.12, + symbolCountToWaitFor: 5 + ) + case .sunGlassesFrameCenter: + SymbolArtElement( + symbol: "􀅽", + name: "minus", + initialPosition: .third(.third), + primaryColor: .black, + fontWeight: .thin, + widthRatio: 0.06, + heightRatio: 0.0125, + horizontalOffsetRatio: 0.2, + verticalOffsetRatio: 0.12, + symbolCountToWaitFor: 5 + ) + case .sunGlassesFrameTrailing: + SymbolArtElement( + symbol: "􀅽", + name: "minus", + initialPosition: .third(.third), + primaryColor: .black, + fontWeight: .thin, + widthRatio: 0.04, + heightRatio: 0.0125, + horizontalOffsetRatio: -0.2, + verticalOffsetRatio: 0.12, + symbolCountToWaitFor: 5 + ) + case .sunGlassesLensRight: + SymbolArtElement( + symbol: "􀆼", + name: "moon.circle.fill", + initialPrimaryColor: .white, + initialPosition: .third(.fourth), + primaryColor: .white, + widthRatio: 0.125, + heightRatio: 0.125, + horizontalOffsetRatio: 0.1, + verticalOffsetRatio: 0.12, + symbolCountToWaitFor: 6 + ) + case .sunGlassesLensLeft: + SymbolArtElement( + symbol: "􀆼", + name: "moon.circle.fill", + initialPrimaryColor: .white, + initialPosition: .third(.fourth), + primaryColor: .white, + widthRatio: 0.125, + heightRatio: 0.125, + horizontalOffsetRatio: -0.1, + verticalOffsetRatio: 0.12, + symbolCountToWaitFor: 6 + ) + case .nose: + SymbolArtElement( + symbol: "􀇈", + name: "cloud.heavyrain", + initialPosition: .third(.fifth), + primaryColor: .black, + fontWeight: .light, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: 0.01, + verticalOffsetRatio: 0.27, + symbolCountToWaitFor: 7 + ) + case .mouth: + SymbolArtElement( + symbol: "􀩻", + name: "button.roundedbottom.horizontal.fill", + initialPosition: .third(.sixth), + primaryColor: .red, + widthRatio: 0.15, + heightRatio: 0.075, + horizontalOffsetRatio: 0.01, + verticalOffsetRatio: 0.4, + symbolCountToWaitFor: 8 + ) + case .tongue: + SymbolArtElement( + symbol: "􀝷", + name: "capsule.fill", + initialPosition: .third(.seventh), + primaryColor: .orange, + widthRatio: 0.145, + heightRatio: 0.025, + horizontalOffsetRatio: 0.01, + verticalOffsetRatio: 0.424, + symbolCountToWaitFor: 9 + ) + } + } + } +} + +#Preview { + NavigationStack { + MagicianArtView() + .environment(ArtWorkModel.preview) + } +} + +#Preview { + MagicianPreviewView() + .environment(ArtWorkModel.preview) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView.swift index e3284eb..ebd70dc 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView.swift @@ -9,187 +9,14 @@ import SwiftUI struct MagicianArtView: View { - @Environment(ArtWorkModel.self) var model @State private var isAnimating = false var body: some View { ZStack { - - // MARK: - 􀠒 Outline - AnimatableSymbolView( - name: "drop.fill", - initialPosition: .second(.first), - primaryColor: .paleOrange, - widthRatio: 0.5, - heightRatio: 0.75, - rotationDegrees: 180, - verticalOffsetRatio: 0.15, - isAnimating: isAnimating, - symbolCountToWaitFor: 0 - ) - - // MARK: - 􀏄 Hat band - AnimatableSymbolView( - name: "rectangle.fill", - initialPosition: .second(.second), - primaryColor: .red, - widthRatio: 0.446, - heightRatio: 0.1, - horizontalOffsetRatio: 0.01, - verticalOffsetRatio: -0.15, - isAnimating: isAnimating, - symbolCountToWaitFor: 1 - ) - - // MARK: - 􀈮 Hat - AnimatableSymbolView( - name: "archivebox.fill", - initialPosition: .third(.first), - widthRatio: 0.525, - heightRatio: 0.525, - rotationDegrees: 180, - verticalOffsetRatio: -0.25, - isAnimating: isAnimating, - symbolCountToWaitFor: 2 - ) - - // MARK: - 􀏄 Hat brim - AnimatableSymbolView( - name: "rectangle.fill", - initialPosition: .second(.second), - widthRatio: 0.625, - heightRatio: 0.125, - verticalOffsetRatio: -0.05, - isAnimating: isAnimating, - symbolCountToWaitFor: 3 - ) - - // MARK: - 􀆐 Eyebrow - AnimatableSymbolView( - name: "chevron.compact.up", - initialPosition: .third(.second), - fontWeight: .thin, - widthRatio: 0.1, - heightRatio: 0.04, - horizontalOffsetRatio: 0.1, - verticalOffsetRatio: 0.03, - isAnimating: isAnimating, - symbolCountToWaitFor: 4 - ) - - AnimatableSymbolView( - name: "chevron.compact.up", - initialPosition: .third(.second), - fontWeight: .thin, - widthRatio: 0.1, - heightRatio: 0.04, - horizontalOffsetRatio: -0.1, - verticalOffsetRatio: 0.03, - isAnimating: isAnimating, - symbolCountToWaitFor: 4 - ) - - // MARK: - 􀅽 Sunglasses frame - AnimatableSymbolView( - name: "minus", - initialPosition: .third(.third), - fontWeight: .thin, - widthRatio: 0.06, - heightRatio: 0.0125, - verticalOffsetRatio: 0.12, - isAnimating: isAnimating, - symbolCountToWaitFor: 5 - ) - - AnimatableSymbolView( - name: "minus", - initialPosition: .third(.third), - fontWeight: .thin, - widthRatio: 0.06, - heightRatio: 0.0125, - horizontalOffsetRatio: 0.2, - verticalOffsetRatio: 0.12, - isAnimating: isAnimating, - symbolCountToWaitFor: 5 - ) - - AnimatableSymbolView( - name: "minus", - initialPosition: .third(.third), - fontWeight: .thin, - widthRatio: 0.04, - heightRatio: 0.0125, - horizontalOffsetRatio: -0.2, - verticalOffsetRatio: 0.12, - isAnimating: isAnimating, - symbolCountToWaitFor: 5 - ) - - // MARK: - 􀆼 Sunglasses lens - AnimatableSymbolView( - name: "moon.circle.fill", - initialPrimaryColor: .white, - initialPosition: .third(.fourth), - primaryColor: .white, - widthRatio: 0.125, - heightRatio: 0.125, - horizontalOffsetRatio: 0.1, - verticalOffsetRatio: 0.12, - isAnimating: isAnimating, - symbolCountToWaitFor: 6 - ) - - AnimatableSymbolView( - name: "moon.circle.fill", - initialPrimaryColor: .white, - initialPosition: .third(.fourth), - primaryColor: .white, - widthRatio: 0.125, - heightRatio: 0.125, - horizontalOffsetRatio: -0.1, - verticalOffsetRatio: 0.12, - isAnimating: isAnimating, - symbolCountToWaitFor: 6 - ) - - // MARK: - 􀇈 Nose - AnimatableSymbolView( - name: "cloud.heavyrain", - initialPosition: .third(.fifth), - fontWeight: .light, - widthRatio: 0.15, - heightRatio: 0.15, - horizontalOffsetRatio: 0.01, - verticalOffsetRatio: 0.27, - isAnimating: isAnimating, - symbolCountToWaitFor: 7 - ) - - // MARK: - 􀩻 Inside mouth - AnimatableSymbolView( - name: "button.roundedbottom.horizontal.fill", - initialPosition: .third(.sixth), - primaryColor: .red, - widthRatio: 0.15, - heightRatio: 0.075, - horizontalOffsetRatio: 0.01, - verticalOffsetRatio: 0.4, - isAnimating: isAnimating, - symbolCountToWaitFor: 8 - ) - - // MARK: - 􀝷 Tongue capsule.fill - AnimatableSymbolView( - name: "capsule.fill", - initialPosition: .third(.seventh), - primaryColor: .orange, - widthRatio: 0.145, - heightRatio: 0.025, - horizontalOffsetRatio: 0.01, - verticalOffsetRatio: 0.424, - isAnimating: isAnimating, - symbolCountToWaitFor: 9 - ) + ForEach(Element.allCases) { + AnimatableSymbolView(element: $0.value, + isAnimating: isAnimating) + } } .navigationTitle("Magician") .navigationBarTitleDisplayMode(.inline) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianPreviewView.swift index 16ea12e..21c947f 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianPreviewView.swift @@ -9,142 +9,11 @@ import SwiftUI struct MagicianPreviewView: View { - @Environment(ArtWorkModel.self) var model - var body: some View { ZStack { - - // MARK: - 􀠒 Outline - Image(systemName: "drop.fill") - .arrangeShape( - primaryColor: .paleOrange, - width: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.75, forPreview: true), - rotationDegrees: 180, - verticalOffset: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true) - ) - - // MARK: - 􀏄 Hat band - Image(systemName: "rectangle.fill") - .arrangeShape( - primaryColor: .red, - width: model.calculatingProportionalValue(withRatio: 0.446, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.15, forPreview: true) - ) - - // MARK: - 􀈮 Hat - Image(systemName: "archivebox.fill") - .arrangeShape( - width: model.calculatingProportionalValue(withRatio: 0.525, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.525, forPreview: true), - rotationDegrees: 180, - verticalOffset: model.calculatingProportionalValue(withRatio: -0.25, forPreview: true) - ) - - // MARK: - 􀏄 Hat brim - Image(systemName: "rectangle.fill") - .arrangeShape( - width: model.calculatingProportionalValue(withRatio: 0.625, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.05, forPreview: true) - ) - - // MARK: - 􀆐 Eyebrow - Image(systemName: "chevron.compact.up") - .arrangeShape( - fontWeight: .thin, - width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true) - ) - - Image(systemName: "chevron.compact.up") - .arrangeShape( - fontWeight: .thin, - width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.1, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true) - ) - - // MARK: - 􀅽 Sunglasses frame - Image(systemName: "minus") - .arrangeShape( - fontWeight: .thin, - width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.0125, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true) - ) - - Image(systemName: "minus") - .arrangeShape( - fontWeight: .thin, - width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.0125, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true) - ) - - Image(systemName: "minus") - .arrangeShape( - fontWeight: .thin, - width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.0125, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true) - ) - - // MARK: - 􀆼 Sunglasses lens - Image(systemName: "moon.circle.fill") - .arrangeShape( - primaryColor: .white, - width: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true) - ) - - Image(systemName: "moon.circle.fill") - .arrangeShape( - primaryColor: .white, - width: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.1, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true) - ) - - // MARK: - 􀇈 Nose - Image(systemName: "cloud.heavyrain") - .arrangeShape( - fontWeight: .light, - width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.27, forPreview: true) - ) - - // MARK: - 􀩻 Inside mouth - Image(systemName: "button.roundedbottom.horizontal.fill") - .arrangeShape( - primaryColor: .red, - width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.075, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true) - ) - - // MARK: - 􀝷 Tongue capsule.fill - Image(systemName: "capsule.fill") - .arrangeShape( - primaryColor: .orange, - width: model.calculatingProportionalValue(withRatio: 0.145, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.025, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.424, forPreview: true) - ) + ForEach(MagicianArtView.Element.allCases) { + SymbolArtPreviewView(element: $0.value) + } } } } From 618fa271b0935898d5e3f89674b7120cae262faf Mon Sep 17 00:00:00 2001 From: littleossa Date: Fri, 9 Feb 2024 14:21:42 +0900 Subject: [PATCH 069/108] Refactor CrayonBoy --- .../project.pbxproj | 4 + .../CrayonBoy/CrayonBoyArtView+Element.swift | 243 ++++++++++++++++++ .../ArtWorks/CrayonBoy/CrayonBoyArtView.swift | 203 +-------------- .../CrayonBoy/CrayonBoyPreviewView.swift | 161 +----------- 4 files changed, 255 insertions(+), 356 deletions(-) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView+Element.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 0e73c13..b820a32 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -38,6 +38,7 @@ 9767DF0D2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF0C2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift */; }; 9767DF0F2B75DFB400457DA1 /* SymbolArtPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF0E2B75DFB400457DA1 /* SymbolArtPreviewView.swift */; }; 9767DF112B75E8FC00457DA1 /* MagicianArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF102B75E8FC00457DA1 /* MagicianArtView+Element.swift */; }; + 9767DF132B75EDB700457DA1 /* CrayonBoyArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF122B75EDB700457DA1 /* CrayonBoyArtView+Element.swift */; }; 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; @@ -100,6 +101,7 @@ 9767DF0C2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AfroBoyArtView+Element.swift"; sourceTree = ""; }; 9767DF0E2B75DFB400457DA1 /* SymbolArtPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolArtPreviewView.swift; sourceTree = ""; }; 9767DF102B75E8FC00457DA1 /* MagicianArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MagicianArtView+Element.swift"; sourceTree = ""; }; + 9767DF122B75EDB700457DA1 /* CrayonBoyArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CrayonBoyArtView+Element.swift"; sourceTree = ""; }; 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; @@ -441,6 +443,7 @@ isa = PBXGroup; children = ( 97EF43A42B74F27D003648F5 /* CrayonBoyArtView.swift */, + 9767DF122B75EDB700457DA1 /* CrayonBoyArtView+Element.swift */, 97EF43A02B74CA38003648F5 /* CrayonBoyPreviewView.swift */, ); path = CrayonBoy; @@ -528,6 +531,7 @@ 97624C2F28C2E608004E1720 /* SmallFirework.swift in Sources */, 9748BE57289DCBB0006DF0BE /* LargeFirework.swift in Sources */, 9767DF002B752E4700457DA1 /* WorldPeaceArtView.swift in Sources */, + 9767DF132B75EDB700457DA1 /* CrayonBoyArtView+Element.swift in Sources */, 9748BE4828981096006DF0BE /* DemonWrestlerFace.swift in Sources */, 97AD532D2B717C950034FB5D /* AfroBoyPreviewView.swift in Sources */, 97EF438B2B725E02003648F5 /* NosebleedArtView.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView+Element.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView+Element.swift new file mode 100644 index 0000000..aa771a1 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView+Element.swift @@ -0,0 +1,243 @@ +// +// CrayonBoyArtView+Element.swift +// SFSymbolsArtCollection +// +// + +import SwiftUI + +extension CrayonBoyArtView { + + enum Element: String, CaseIterable, Identifiable { + case outline + case hair + case hairConcealment + case eyebrowRight + case eyebrowLeft + case eyelidRight + case eyelidLeft + case eyelidConcealmentRight + case eyelidConcealmentLeft + case eyeRight + case eyeLeft + case outlineFrame + case mouth + case mouthFrame + case sideburns + + var id: String { rawValue } + + var value: SymbolArtElement { + switch self { + case .outline: + SymbolArtElement( + symbol: "􀇃", + name: "cloud.fill", + initialPosition: .second(.first), + primaryColor: .paleOrange, + fontWeight: .ultraLight, + widthRatio: 0.75, + heightRatio: 0.5, + rotationDegrees: 8, + flip: .horizontal, + symbolCountToWaitFor: 0 + ) + case .hair: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .second(.second), + primaryColor: .black, + widthRatio: 0.44, + heightRatio: 0.25, + horizontalOffsetRatio: 0.05, + verticalOffsetRatio: -0.125, + symbolCountToWaitFor: 2 + ) + case .hairConcealment: + SymbolArtElement( + symbol: "􀏄", + name: "rectangle.fill", + initialPosition: .third(.fifth), + primaryColor: .paleOrange, + widthRatio: 0.4, + heightRatio: 0.25, + horizontalOffsetRatio: 0.033, + verticalOffsetRatio: -0.05, + symbolCountToWaitFor: 3 + ) + case .eyebrowRight: + SymbolArtElement( + symbol: "􀆍", + name: "control", + initialPosition: .third(.sixth), + primaryColor: .black, + fontWeight: .black, + widthRatio: 0.2, + heightRatio: 0.1, + rotationDegrees: 6, + horizontalOffsetRatio: -0.07, + verticalOffsetRatio: -0.14, + symbolCountToWaitFor: 4 + ) + case .eyebrowLeft: + SymbolArtElement( + symbol: "􀆍", + name: "control", + initialPosition: .third(.sixth), + primaryColor: .black, + fontWeight: .black, + widthRatio: 0.2, + heightRatio: 0.1, + rotationDegrees: 6, + horizontalOffsetRatio: 0.14, + verticalOffsetRatio: -0.12, + symbolCountToWaitFor: 4 + ) + case .eyelidRight: + SymbolArtElement( + symbol: "􀀀", + name: "circle", + initialPosition: .second(.third), + primaryColor: .black, + fontWeight: .ultraLight, + widthRatio: 0.17, + heightRatio: 0.16, + horizontalOffsetRatio: 0.12, + verticalOffsetRatio: -0.01, + symbolCountToWaitFor: 5 + ) + case .eyelidLeft: + SymbolArtElement( + symbol: "􀀀", + name: "circle", + initialPosition: .second(.third), + primaryColor: .black, + fontWeight: .ultraLight, + widthRatio: 0.17, + heightRatio: 0.16, + horizontalOffsetRatio: -0.08, + verticalOffsetRatio: -0.01, + symbolCountToWaitFor: 5 + ) + case .eyelidConcealmentRight: + SymbolArtElement( + symbol: "􀏄", + name: "rectangle.fill", + initialPosition: .third(.fifth), + primaryColor: .paleOrange, + widthRatio: 0.2, + heightRatio: 0.16, + horizontalOffsetRatio: 0.13, + verticalOffsetRatio: 0.06, + symbolCountToWaitFor: 6 + ) + case .eyelidConcealmentLeft: + SymbolArtElement( + symbol: "􀏄", + name: "rectangle.fill", + initialPosition: .third(.fifth), + primaryColor: .paleOrange, + widthRatio: 0.2, + heightRatio: 0.16, + horizontalOffsetRatio: -0.08, + verticalOffsetRatio: 0.06, + symbolCountToWaitFor: 6 + ) + case .eyeRight: + SymbolArtElement( + symbol: "􀢚", + name: "record.circle.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .third(.seventh), + primaryColor: .white, + widthRatio: 0.14, + heightRatio: 0.14, + horizontalOffsetRatio: 0.1, + verticalOffsetRatio: 0.02, + symbolCountToWaitFor: 7 + ) + case .eyeLeft: + SymbolArtElement( + symbol: "􀢚", + name: "record.circle.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .third(.seventh), + primaryColor: .white, + widthRatio: 0.14, + heightRatio: 0.14, + horizontalOffsetRatio: -0.06, + verticalOffsetRatio: 0.016, + symbolCountToWaitFor: 7 + ) + case .outlineFrame: + SymbolArtElement( + symbol: "􀇂", + name: "cloud", + initialPosition: .third(.first), + primaryColor: .black, + fontWeight: .ultraLight, + widthRatio: 0.75, + heightRatio: 0.5, + rotationDegrees: 8, + flip: .horizontal, + symbolCountToWaitFor: 1 + ) + case .mouth: + SymbolArtElement( + symbol: "􀧷", + name: "capsule.portrait.fill", + initialPosition: .third(.second), + primaryColor: .red, + fontWeight: .ultraLight, + widthRatio: 0.1, + heightRatio: 0.15, + rotationDegrees: 16, + horizontalOffsetRatio: -0.09, + verticalOffsetRatio: 0.225, + symbolCountToWaitFor: 8 + ) + case .mouthFrame: + SymbolArtElement( + symbol: "􀧶", + name: "capsule.portrait", + initialPosition: .third(.third), + primaryColor: .black, + fontWeight: .ultraLight, + widthRatio: 0.1, + heightRatio: 0.15, + rotationDegrees: 16, + horizontalOffsetRatio: -0.09, + verticalOffsetRatio: 0.225, + symbolCountToWaitFor: 8 + ) + case .sideburns: + SymbolArtElement( + symbol: "􁹬", + name: "righttriangle.fill", + initialPosition: .third(.fourth), + primaryColor: .black, + widthRatio: 0.064, + heightRatio: 0.2, + rotationDegrees: 170, + flip: .horizontal, + horizontalOffsetRatio: 0.215, + verticalOffsetRatio: -0.07, + symbolCountToWaitFor: 9 + ) + } + } + } +} + +#Preview { + NavigationStack { + CrayonBoyArtView() + .environment(ArtWorkModel.preview) + } +} + +#Preview { + CrayonBoyPreviewView() + .environment(ArtWorkModel.preview) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView.swift index f03503c..1c044bb 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView.swift @@ -9,210 +9,15 @@ import SwiftUI struct CrayonBoyArtView: View { - @Environment(ArtWorkModel.self) var model @State private var isAnimating = false var body: some View { ZStack { - // MARK: - 􀇃 Outline - AnimatableSymbolView( - name: "cloud.fill", - initialPosition: .second(.first), - primaryColor: .paleOrange, - fontWeight: .ultraLight, - widthRatio: 0.75, - heightRatio: 0.5, - rotationDegrees: 8, - flip: .horizontal, - isAnimating: isAnimating, - symbolCountToWaitFor: 0 - ) - - // MARK: - 􀀁 Hair top - AnimatableSymbolView( - name: "circle.fill", - initialPosition: .second(.second), - widthRatio: 0.44, - heightRatio: 0.25, - horizontalOffsetRatio: 0.05, - verticalOffsetRatio: -0.125, - isAnimating: isAnimating, - symbolCountToWaitFor: 2 - ) - - // MARK: - 􀏄 Concealing part for hair - AnimatableSymbolView( - name: "rectangle.fill", - initialPosition: .third(.fifth), - primaryColor: .paleOrange, - widthRatio: 0.4, - heightRatio: 0.25, - horizontalOffsetRatio: 0.033, - verticalOffsetRatio: -0.05, - isAnimating: isAnimating, - symbolCountToWaitFor: 3 - ) - - // MARK: - 􀆍 Eyebrow - AnimatableSymbolView( - name: "control", - initialPosition: .third(.sixth), - fontWeight: .black, - widthRatio: 0.2, - heightRatio: 0.1, - rotationDegrees: 6, - horizontalOffsetRatio: -0.07, - verticalOffsetRatio: -0.14, - isAnimating: isAnimating, - symbolCountToWaitFor: 4 - ) - - AnimatableSymbolView( - name: "control", - initialPosition: .third(.sixth), - fontWeight: .black, - widthRatio: 0.2, - heightRatio: 0.1, - rotationDegrees: 6, - horizontalOffsetRatio: 0.14, - verticalOffsetRatio: -0.12, - isAnimating: isAnimating, - symbolCountToWaitFor: 4 - ) - - // MARK: - 􀀀 Eyelid - AnimatableSymbolView( - name: "circle", - initialPosition: .second(.third), - fontWeight: .ultraLight, - widthRatio: 0.17, - heightRatio: 0.16, - horizontalOffsetRatio: 0.12, - verticalOffsetRatio: -0.01, - isAnimating: isAnimating, - symbolCountToWaitFor: 5 - ) - - AnimatableSymbolView( - name: "circle", - initialPosition: .second(.third), - fontWeight: .ultraLight, - widthRatio: 0.17, - heightRatio: 0.16, - horizontalOffsetRatio: -0.08, - verticalOffsetRatio: -0.01, - isAnimating: isAnimating, - symbolCountToWaitFor: 5 - ) - - // MARK: - 􀏄 Concealing part for Eyelid - AnimatableSymbolView( - name: "rectangle.fill", - initialPosition: .third(.fifth), - primaryColor: .paleOrange, - widthRatio: 0.2, - heightRatio: 0.16, - horizontalOffsetRatio: 0.13, - verticalOffsetRatio: 0.06, - isAnimating: isAnimating, - symbolCountToWaitFor: 6 - ) - - AnimatableSymbolView( - name: "rectangle.fill", - initialPosition: .third(.fifth), - primaryColor: .paleOrange, - widthRatio: 0.2, - heightRatio: 0.16, - horizontalOffsetRatio: -0.08, - verticalOffsetRatio: 0.06, - isAnimating: isAnimating, - symbolCountToWaitFor: 6 - ) - - // MARK: - 􀢚 Eye - AnimatableSymbolView( - name: "record.circle.fill", - initialPrimaryColor: .systemBackground, - initialPosition: .third(.seventh), - primaryColor: .white, - widthRatio: 0.14, - heightRatio: 0.14, - horizontalOffsetRatio: 0.1, - verticalOffsetRatio: 0.02, - isAnimating: isAnimating, - symbolCountToWaitFor: 7 - ) - - AnimatableSymbolView( - name: "record.circle.fill", - initialPrimaryColor: .systemBackground, - initialPosition: .third(.seventh), - primaryColor: .white, - widthRatio: 0.14, - heightRatio: 0.14, - horizontalOffsetRatio: -0.06, - verticalOffsetRatio: 0.016, - isAnimating: isAnimating, - symbolCountToWaitFor: 7 - ) - - // MARK: - 􀇂 Outline frame - AnimatableSymbolView( - name: "cloud", - initialPosition: .third(.first), - fontWeight: .ultraLight, - widthRatio: 0.75, - heightRatio: 0.5, - rotationDegrees: 8, - flip: .horizontal, - isAnimating: isAnimating, - symbolCountToWaitFor: 1 - ) - - // MARK: - 􀧷 Mouth - AnimatableSymbolView( - name: "capsule.portrait.fill", - initialPosition: .third(.second), - primaryColor: .red, - fontWeight: .ultraLight, - widthRatio: 0.1, - heightRatio: 0.15, - rotationDegrees: 16, - horizontalOffsetRatio: -0.09, - verticalOffsetRatio: 0.225, - isAnimating: isAnimating, - symbolCountToWaitFor: 8 - ) - - // MARK: - 􀧶 Mouth frame - AnimatableSymbolView( - name: "capsule.portrait", - initialPosition: .third(.third), - fontWeight: .ultraLight, - widthRatio: 0.1, - heightRatio: 0.15, - rotationDegrees: 16, - horizontalOffsetRatio: -0.09, - verticalOffsetRatio: 0.225, - isAnimating: isAnimating, - symbolCountToWaitFor: 8 - ) - - // MARK: - 􁹬 Sideburns - AnimatableSymbolView( - name: "righttriangle.fill", - initialPosition: .third(.fourth), - widthRatio: 0.064, - heightRatio: 0.2, - rotationDegrees: 170, - flip: .horizontal, - horizontalOffsetRatio: 0.215, - verticalOffsetRatio: -0.07, - isAnimating: isAnimating, - symbolCountToWaitFor: 9 - ) + ForEach(Element.allCases) { + AnimatableSymbolView(element: $0.value, + isAnimating: isAnimating) + } } .navigationTitle("Crayon boy") .navigationBarTitleDisplayMode(.inline) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyPreviewView.swift index 1c68be1..edb1c85 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyPreviewView.swift @@ -8,165 +8,12 @@ import SwiftUI struct CrayonBoyPreviewView: View { - - @Environment(ArtWorkModel.self) var model - - var body: some View { + var body: some View { ZStack { - // MARK: - 􀇃 Outline - Image(systemName: "cloud.fill") - .arrangeShape( - primaryColor: .paleOrange, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.75, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true), - rotationDegrees: 8, - flip: .horizontal - ) - - // MARK: - 􀀁 Hair top - Image(systemName: "circle.fill") - .arrangeShape( - width: model.calculatingProportionalValue(withRatio: 0.44, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.25, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.125, forPreview: true) - ) - - // MARK: - 􀏄 Concealing part for hair - Image(systemName: "rectangle.fill") - .arrangeShape( - primaryColor: .paleOrange, - width: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.25, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.033, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.05, forPreview: true) - ) - - // MARK: - 􀆍 Eyebrow - Image(systemName: "control") - .arrangeShape( - fontWeight: .black, - width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - rotationDegrees: 6, - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.07, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.14, forPreview: true) - ) - - Image(systemName: "control") - .arrangeShape( - fontWeight: .black, - width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - rotationDegrees: 6, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.12, forPreview: true) - ) - - // MARK: - 􀀀 Eyelid - Image(systemName: "circle") - .arrangeShape( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.17, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.16, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.01, forPreview: true) - ) - - Image(systemName: "circle") - .arrangeShape( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.17, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.16, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.01, forPreview: true) - ) - - // MARK: - 􀏄 Concealing part for Eyelid - Image(systemName: "rectangle.fill") - .arrangeShape( - primaryColor: .paleOrange, - width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.16, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.13, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true) - ) - - Image(systemName: "rectangle.fill") - .arrangeShape( - primaryColor: .paleOrange, - width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.16, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true) - ) - - // MARK: - 􀢚 Eye - Image(systemName: "record.circle.fill") - .arrangeShape( - primaryColor: .white, - secondaryColor: .black, - width: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true) - ) - - Image(systemName: "record.circle.fill") - .arrangeShape( - primaryColor: .white, - secondaryColor: .black, - width: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.06, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.016, forPreview: true) - ) - - // MARK: - 􀇂 Outline frame - Image(systemName: "cloud") - .arrangeShape( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.75, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true), - rotationDegrees: 8, - flip: .horizontal - ) - - // MARK: - 􀧷 Mouth - Image(systemName: "capsule.portrait.fill") - .arrangeShape( - primaryColor: .red, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.10, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - rotationDegrees: 16, - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.09, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.225, forPreview: true) - ) - - // MARK: - 􀧶 Mouth frame - Image(systemName: "capsule.portrait") - .arrangeShape( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.10, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - rotationDegrees: 16, - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.09, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.225, forPreview: true) - ) - - // MARK: - 􁹬 Sideburns - Image(systemName: "righttriangle.fill") - .arrangeShape( - width: model.calculatingProportionalValue(withRatio: 0.064, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - rotationDegrees: 170, - flip: .horizontal, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.215, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.07, forPreview: true) - ) + ForEach(CrayonBoyArtView.Element.allCases) { + SymbolArtPreviewView(element: $0.value) + } } } } From b784b013cfbb723334a2c6324a994e0010aac076 Mon Sep 17 00:00:00 2001 From: littleossa Date: Fri, 9 Feb 2024 15:05:16 +0900 Subject: [PATCH 070/108] Refactor WorldPeaceArtView --- .../project.pbxproj | 8 +- .../WorldPeace+CharacterPosition.swift | 100 ----- .../WorldPeaceArtView+Element.swift | 360 ++++++++++++++++++ .../WorldPeace/WorldPeaceArtView.swift | 80 +--- .../WorldPeace/WorldPeacePreviewView.swift | 76 +--- 5 files changed, 370 insertions(+), 254 deletions(-) delete mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeace+CharacterPosition.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView+Element.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index b820a32..2773b80 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -29,7 +29,6 @@ 97624C2F28C2E608004E1720 /* SmallFirework.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C2E28C2E608004E1720 /* SmallFirework.swift */; }; 97624C3328C4F43F004E1720 /* GeometryProxy+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3228C4F43F004E1720 /* GeometryProxy+.swift */; }; 9767DEFA2B751C2C00457DA1 /* WorldPeacePreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEF92B751C2C00457DA1 /* WorldPeacePreviewView.swift */; }; - 9767DEFE2B752E0400457DA1 /* WorldPeace+CharacterPosition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEFD2B752E0400457DA1 /* WorldPeace+CharacterPosition.swift */; }; 9767DF002B752E4700457DA1 /* WorldPeaceArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEFF2B752E4700457DA1 /* WorldPeaceArtView.swift */; }; 9767DF032B759B2D00457DA1 /* PartyAnimalsPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF022B759B2D00457DA1 /* PartyAnimalsPreviewView.swift */; }; 9767DF052B75AFE200457DA1 /* PartyAnimalsArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF042B75AFE200457DA1 /* PartyAnimalsArtView.swift */; }; @@ -39,6 +38,7 @@ 9767DF0F2B75DFB400457DA1 /* SymbolArtPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF0E2B75DFB400457DA1 /* SymbolArtPreviewView.swift */; }; 9767DF112B75E8FC00457DA1 /* MagicianArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF102B75E8FC00457DA1 /* MagicianArtView+Element.swift */; }; 9767DF132B75EDB700457DA1 /* CrayonBoyArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF122B75EDB700457DA1 /* CrayonBoyArtView+Element.swift */; }; + 9767DF152B75F7BE00457DA1 /* WorldPeaceArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF142B75F7BE00457DA1 /* WorldPeaceArtView+Element.swift */; }; 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; @@ -92,7 +92,6 @@ 97624C2E28C2E608004E1720 /* SmallFirework.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmallFirework.swift; sourceTree = ""; }; 97624C3228C4F43F004E1720 /* GeometryProxy+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GeometryProxy+.swift"; sourceTree = ""; }; 9767DEF92B751C2C00457DA1 /* WorldPeacePreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorldPeacePreviewView.swift; sourceTree = ""; }; - 9767DEFD2B752E0400457DA1 /* WorldPeace+CharacterPosition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorldPeace+CharacterPosition.swift"; sourceTree = ""; }; 9767DEFF2B752E4700457DA1 /* WorldPeaceArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorldPeaceArtView.swift; sourceTree = ""; }; 9767DF022B759B2D00457DA1 /* PartyAnimalsPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PartyAnimalsPreviewView.swift; sourceTree = ""; }; 9767DF042B75AFE200457DA1 /* PartyAnimalsArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PartyAnimalsArtView.swift; sourceTree = ""; }; @@ -102,6 +101,7 @@ 9767DF0E2B75DFB400457DA1 /* SymbolArtPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolArtPreviewView.swift; sourceTree = ""; }; 9767DF102B75E8FC00457DA1 /* MagicianArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MagicianArtView+Element.swift"; sourceTree = ""; }; 9767DF122B75EDB700457DA1 /* CrayonBoyArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CrayonBoyArtView+Element.swift"; sourceTree = ""; }; + 9767DF142B75F7BE00457DA1 /* WorldPeaceArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorldPeaceArtView+Element.swift"; sourceTree = ""; }; 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; @@ -252,8 +252,8 @@ isa = PBXGroup; children = ( 9767DEFF2B752E4700457DA1 /* WorldPeaceArtView.swift */, + 9767DF142B75F7BE00457DA1 /* WorldPeaceArtView+Element.swift */, 9767DEF92B751C2C00457DA1 /* WorldPeacePreviewView.swift */, - 9767DEFD2B752E0400457DA1 /* WorldPeace+CharacterPosition.swift */, ); path = WorldPeace; sourceTree = ""; @@ -537,7 +537,7 @@ 97EF438B2B725E02003648F5 /* NosebleedArtView.swift in Sources */, 971D9DEA28C9731D00136A36 /* iOSDCJapan2022SymbolType.swift in Sources */, 97AD53182B70DFF30034FB5D /* AnimationValues.swift in Sources */, - 9767DEFE2B752E0400457DA1 /* WorldPeace+CharacterPosition.swift in Sources */, + 9767DF152B75F7BE00457DA1 /* WorldPeaceArtView+Element.swift in Sources */, 97624C2A28C2BC9A004E1720 /* MediumFirework.swift in Sources */, 97EF43982B733337003648F5 /* MagicianArtView.swift in Sources */, 9767DEFA2B751C2C00457DA1 /* WorldPeacePreviewView.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeace+CharacterPosition.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeace+CharacterPosition.swift deleted file mode 100644 index ca29c2d..0000000 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeace+CharacterPosition.swift +++ /dev/null @@ -1,100 +0,0 @@ -// -// WorldPeace+CharacterPosition.swift -// SFSymbolsArtCollection -// -// Created by Lil Ossa -// - -import SwiftUI - -extension WorldPeaceArtView { - - enum CharacterPosition: String, CaseIterable, Identifiable { - case topFirst - case topSecond - case topThird - case topFourth - case topFifth - case bottomFirst - case bottomSecond - case bottomThird - case bottomFourth - case bottomFifth - - struct Value { - let character: String - let color: Color - let initialPosition: ArtWorkModel.InitialSymbolRow - let horizontalOffsetRatio: CGFloat - let verticalOffsetRatio: CGFloat - } - - var id: String { self.rawValue } - - var value: Value { - switch self { - case .topFirst: - Value(character: "w", - color: .red, - initialPosition: .second(.second), - horizontalOffsetRatio: -0.34, - verticalOffsetRatio: -0.4) - case .topSecond: - Value(character: "o", - color: .yellow, - initialPosition: .third(.sixth), - horizontalOffsetRatio: -0.17, - verticalOffsetRatio: -0.4) - case .topThird: - Value(character: "r", - color: .green, - initialPosition: .second(.first), - - horizontalOffsetRatio: 0, - verticalOffsetRatio: -0.4) - case .topFourth: - Value(character: "l", - color: .blue, - initialPosition: .third(.fifth), - horizontalOffsetRatio: 0.17, - verticalOffsetRatio: -0.4) - case .topFifth: - Value(character: "d", - color: .purple, - initialPosition: .third(.third), - horizontalOffsetRatio: 0.34, - verticalOffsetRatio: -0.4) - case .bottomFirst: - Value(character: "p", - color: .teal, - initialPosition: .third(.seventh), - horizontalOffsetRatio: -0.34, - verticalOffsetRatio: 0.4) - case .bottomSecond: - Value(character: "e", - color: .pink, - initialPosition: .third(.fourth), - horizontalOffsetRatio: -0.17, - verticalOffsetRatio: 0.4) - case .bottomThird: - Value(character: "a", - color: .mint, - initialPosition: .third(.first), - horizontalOffsetRatio: 0, - verticalOffsetRatio: 0.4) - case .bottomFourth: - Value(character: "c", - color: .indigo, - initialPosition: .third(.second), - horizontalOffsetRatio: 0.17, - verticalOffsetRatio: 0.4) - case .bottomFifth: - Value(character: "e", - color: .orange, - initialPosition: .third(.fourth), - horizontalOffsetRatio: 0.34, - verticalOffsetRatio: 0.4) - } - } - } -} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView+Element.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView+Element.swift new file mode 100644 index 0000000..c740c60 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView+Element.swift @@ -0,0 +1,360 @@ +// +// WorldPeaceArtView+Element.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import Foundation + +extension WorldPeaceArtView { + + enum Element: String, CaseIterable, Identifiable { + case shadowForW + case shadowForO + case shadowForR + case shadowForL + case shadowForD + case shadowForP + case shadowForFirstE + case shadowForA + case shadowForC + case shadowForSecondE + case characterW + case characterO + case characterR + case characterL + case characterD + case characterP + case characterFirstE + case characterA + case characterC + case characterSecondE + case sea + case earth + case earthFrame + case peaceSign + + var id: String { rawValue } + + var value: SymbolArtElement { + switch self { + case .shadowForW: + SymbolArtElement( + symbol: "􀀰", + name: "w.circle", + initialPosition: .second(.second), + primaryColor: .black, + secondaryColor: .systemBackground, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: -0.34, + verticalOffsetRatio: -0.4, + symbolCountToWaitFor: 4 + ) + case .shadowForO: + SymbolArtElement( + symbol: "􀀠", + name: "o.circle", + initialPosition: .third(.sixth), + primaryColor: .black, + secondaryColor: .systemBackground, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: -0.17, + verticalOffsetRatio: -0.4, + symbolCountToWaitFor: 4 + ) + case .shadowForR: + SymbolArtElement( + symbol: "􀀦", + name: "r.circle", + initialPosition: .second(.first), + primaryColor: .black, + secondaryColor: .systemBackground, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: 0, + verticalOffsetRatio: -0.4, + symbolCountToWaitFor: 4 + ) + case .shadowForL: + SymbolArtElement( + symbol: "􀀚", + name: "l.circle", + initialPosition: .third(.fifth), + primaryColor: .black, + secondaryColor: .systemBackground, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: 0.17, + verticalOffsetRatio: -0.4, + symbolCountToWaitFor: 4 + ) + case .shadowForD: + SymbolArtElement( + symbol: "􀀊", + name: "d.circle", + initialPosition: .third(.third), + primaryColor: .black, + secondaryColor: .systemBackground, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: 0.34, + verticalOffsetRatio: -0.4, + symbolCountToWaitFor: 4 + ) + case .shadowForP: + SymbolArtElement( + symbol: "􀀢", + name: "p.circle", + initialPosition: .third(.seventh), + primaryColor: .black, + secondaryColor: .systemBackground, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: -0.34, + verticalOffsetRatio: 0.4, + symbolCountToWaitFor: 4 + ) + case .shadowForFirstE: + SymbolArtElement( + symbol: "􀀌", + name: "e.circle", + initialPosition: .third(.fourth), + primaryColor: .black, + secondaryColor: .systemBackground, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: -0.17, + verticalOffsetRatio: 0.4, + symbolCountToWaitFor: 4 + ) + case .shadowForA: + SymbolArtElement( + symbol: "􀀄", + name: "a.circle", + initialPosition: .third(.first), + primaryColor: .black, + secondaryColor: .systemBackground, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: 0, + verticalOffsetRatio: 0.4, + symbolCountToWaitFor: 5 + ) + case .shadowForC: + SymbolArtElement( + symbol: "􀀈", + name: "c.circle", + initialPosition: .third(.second), + primaryColor: .black, + secondaryColor: .systemBackground, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: 0.17, + verticalOffsetRatio: 0.4, + symbolCountToWaitFor: 4 + ) + case .shadowForSecondE: + SymbolArtElement( + symbol: "􀀌", + name: "e.circle", + initialPosition: .third(.fourth), + primaryColor: .black, + secondaryColor: .systemBackground, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: 0.34, + verticalOffsetRatio: 0.4, + symbolCountToWaitFor: 4 + ) + case .characterW: + SymbolArtElement( + symbol: "􀀰", + name: "w.circle", + initialPosition: .second(.second), + primaryColor: .red, + secondaryColor: .systemBackground, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: -0.34, + verticalOffsetRatio: -0.4, + symbolCountToWaitFor: 4 + ) + case .characterO: + SymbolArtElement( + symbol: "􀀠", + name: "o.circle", + initialPosition: .third(.sixth), + primaryColor: .yellow, + secondaryColor: .systemBackground, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: -0.17, + verticalOffsetRatio: -0.4, + symbolCountToWaitFor: 5 + ) + case .characterR: + SymbolArtElement( + symbol: "􀀦", + name: "r.circle", + initialPosition: .second(.first), + primaryColor: .green, + secondaryColor: .systemBackground, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: 0, + verticalOffsetRatio: -0.4, + symbolCountToWaitFor: 5 + ) + case .characterL: + SymbolArtElement( + symbol: "􀀚", + name: "l.circle", + initialPosition: .third(.fifth), + primaryColor: .blue, + secondaryColor: .systemBackground, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: 0.17, + verticalOffsetRatio: -0.4, + symbolCountToWaitFor: 5 + ) + case .characterD: + SymbolArtElement( + symbol: "􀀊", + name: "d.circle", + initialPosition: .third(.third), + primaryColor: .purple, + secondaryColor: .systemBackground, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: 0.34, + verticalOffsetRatio: -0.4, + symbolCountToWaitFor: 5 + ) + case .characterP: + SymbolArtElement( + symbol: "􀀢", + name: "p.circle", + initialPosition: .third(.seventh), + primaryColor: .teal, + secondaryColor: .systemBackground, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: -0.34, + verticalOffsetRatio: 0.4, + symbolCountToWaitFor: 5 + ) + case .characterFirstE: + SymbolArtElement( + symbol: "􀀌", + name: "e.circle", + initialPosition: .third(.fourth), + primaryColor: .pink, + secondaryColor: .systemBackground, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: -0.17, + verticalOffsetRatio: 0.4, + symbolCountToWaitFor: 5 + ) + case .characterA: + SymbolArtElement( + symbol: "􀀄", + name: "a.circle", + initialPosition: .third(.first), + primaryColor: .mint, + secondaryColor: .systemBackground, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: 0, + verticalOffsetRatio: 0.4, + symbolCountToWaitFor: 5 + ) + case .characterC: + SymbolArtElement( + symbol: "􀀈", + name: "c.circle", + initialPosition: .third(.second), + primaryColor: .indigo, + secondaryColor: .systemBackground, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: 0.17, + verticalOffsetRatio: 0.4, + symbolCountToWaitFor: 5 + ) + case .characterSecondE: + SymbolArtElement( + symbol: "􀀌", + name: "e.circle", + initialPosition: .third(.fourth), + primaryColor: .pink, + secondaryColor: .systemBackground, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: 0.34, + verticalOffsetRatio: 0.4, + symbolCountToWaitFor: 5 + ) + case .sea: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .second(.third), + primaryColor: .cyan, + widthRatio: 0.55, + heightRatio: 0.55, + symbolCountToWaitFor: 0 + ) + case .earth: + SymbolArtElement( + symbol: "􀵶", + name: "globe.asia.australia.fill", + initialPosition: .second(.fourth), + primaryColor: .green, + fontWeight: .ultraLight, + widthRatio: 0.55, + heightRatio: 0.55, + symbolCountToWaitFor: 1 + ) + case .earthFrame: + SymbolArtElement( + symbol: "􀵵", + name: "globe.asia.australia", + initialPosition: .second(.fifth), + primaryColor: .black, + fontWeight: .ultraLight, + widthRatio: 0.57, + heightRatio: 0.57, + symbolCountToWaitFor: 2 + ) + case .peaceSign: + SymbolArtElement( + symbol: "􀺎", + name: "peacesign", + initialPosition: .second(.sixth), + primaryColor: .white, + fontWeight: .thin, + widthRatio: 0.535, + heightRatio: 0.535, + symbolCountToWaitFor: 3 + ) + } + } + } +} + +#Preview { + NavigationStack { + WorldPeaceArtView() + .environment(ArtWorkModel.preview) + } +} + +#Preview { + WorldPeacePreviewView() + .environment(ArtWorkModel.preview) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView.swift index f069b8d..d276e4f 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView.swift @@ -9,90 +9,14 @@ import SwiftUI struct WorldPeaceArtView: View { - @Environment(ArtWorkModel.self) var model @State private var isAnimating = false var body: some View { ZStack { - - // MARK: - Characters black shadow - ForEach(CharacterPosition.allCases) { - - AnimatableSymbolView( - name: "\($0.value.character).circle", - initialPosition: $0.value.initialPosition, - secondaryColor: .systemBackground, - widthRatio: 0.15, - heightRatio: 0.15, - horizontalOffsetRatio: $0.value.horizontalOffsetRatio, - verticalOffsetRatio: $0.value.verticalOffsetRatio, - isAnimating: isAnimating, - symbolCountToWaitFor: 4 - ) - } - - // MARK: - Colored Characters - ForEach(WorldPeaceArtView.CharacterPosition.allCases) { - AnimatableSymbolView( - name: "\($0.value.character).circle", - initialPosition: $0.value.initialPosition, - primaryColor: $0.value.color, - secondaryColor: .systemBackground, - widthRatio: 0.15, - heightRatio: 0.15, - horizontalOffsetRatio: $0.value.horizontalOffsetRatio - 0.006, - verticalOffsetRatio: $0.value.verticalOffsetRatio, - isAnimating: isAnimating, - symbolCountToWaitFor: 5 - ) + ForEach(Element.allCases) { + AnimatableSymbolView(element: $0.value, isAnimating: isAnimating) } - - // MARK: - 􀀁 Sea - AnimatableSymbolView( - name: "circle.fill", - initialPosition: .second(.third), - primaryColor: .cyan, - widthRatio: 0.55, - heightRatio: 0.55, - isAnimating: isAnimating, - symbolCountToWaitFor: 0 - ) - - // MARK: - 􀵶 Earth - AnimatableSymbolView( - name: "globe.asia.australia.fill", - initialPosition: .second(.fourth), - primaryColor: .green, - fontWeight: .ultraLight, - widthRatio: 0.55, - heightRatio: 0.55, - isAnimating: isAnimating, - symbolCountToWaitFor: 1 - ) - - // MARK: - 􀵵 Earth frame - AnimatableSymbolView( - name: "globe.asia.australia", - initialPosition: .second(.fifth), - fontWeight: .ultraLight, - widthRatio: 0.57, - heightRatio: 0.57, - isAnimating: isAnimating, - symbolCountToWaitFor: 2 - ) - - // MARK: - 􀺎 Peace sign - AnimatableSymbolView( - name: "peacesign", - initialPosition: .second(.sixth), - primaryColor: .white, - fontWeight: .thin, - widthRatio: 0.535, - heightRatio: 0.535, - isAnimating: isAnimating, - symbolCountToWaitFor: 3 - ) } .navigationTitle("World Peace") .navigationBarTitleDisplayMode(.inline) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeacePreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeacePreviewView.swift index 7f3b83e..e446d90 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeacePreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeacePreviewView.swift @@ -8,86 +8,18 @@ import SwiftUI struct WorldPeacePreviewView: View { - - @Environment(ArtWorkModel.self) var model - + var body: some View { ZStack { - - // MARK: - Characters black shadow - ForEach(WorldPeaceArtView.CharacterPosition.allCases) { - Image(systemName: "\($0.value.character).circle") - .arrangeShape( - secondaryColor: .systemBackground, - fontWeight: .bold, - width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: $0.value.horizontalOffsetRatio, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: $0.value.verticalOffsetRatio, forPreview: true) - ) - } - - // MARK: - Colored Characters - ForEach(WorldPeaceArtView.CharacterPosition.allCases) { - Image(systemName: "\($0.value.character).circle") - .arrangeShape( - primaryColor: $0.value.color, - secondaryColor: .systemBackground, - fontWeight: .bold, - width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: $0.value.horizontalOffsetRatio - 0.006, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: $0.value.verticalOffsetRatio, forPreview: true) - ) + ForEach(WorldPeaceArtView.Element.allCases) { + SymbolArtPreviewView(element: $0.value) } - - // MARK: - 􀀁 Sea - Image(systemName: "circle.fill") - .arrangeShape( - primaryColor: .cyan, - width: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true) - ) - - // MARK: - 􀀁 Sea - Image(systemName: "circle.fill") - .arrangeShape( - primaryColor: .cyan, - width: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true) - ) - - // MARK: - 􀵶 Earth - Image(systemName: "globe.asia.australia.fill") - .arrangeShape( - primaryColor: .green, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.55, forPreview: true) - ) - - // MARK: - 􀵵 Earth frame - Image(systemName: "globe.asia.australia") - .arrangeShape( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.57, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.57, forPreview: true) - ) - - // MARK: - 􀺎 Peace sign - Image(systemName: "peacesign") - .arrangeShape( - primaryColor: .white, - fontWeight: .thin, - width: model.calculatingProportionalValue(withRatio: 0.535, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.535, forPreview: true) - ) } } } #Preview { WorldPeacePreviewView() - .environment(ArtWorkModel.init(screenSize: .init(width: 4600, height: 4600))) + .environment(ArtWorkModel.preview) } From 9bf4e2b1d98f206fd16ca22caa8658dde3163a45 Mon Sep 17 00:00:00 2001 From: littleossa Date: Fri, 9 Feb 2024 15:36:26 +0900 Subject: [PATCH 071/108] Refactor PartyAnimalsArt --- .../project.pbxproj | 8 +- .../PartyAnimalsArtView+Element.swift | 456 ++++++++++++++++++ .../PartyAnimalsArtView+RawPosition.swift | 53 -- .../PartyAnimals/PartyAnimalsArtView.swift | 391 +-------------- .../PartyAnimalsPreviewView.swift | 308 +----------- 5 files changed, 466 insertions(+), 750 deletions(-) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView+Element.swift delete mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView+RawPosition.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 2773b80..a32606b 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -32,13 +32,13 @@ 9767DF002B752E4700457DA1 /* WorldPeaceArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEFF2B752E4700457DA1 /* WorldPeaceArtView.swift */; }; 9767DF032B759B2D00457DA1 /* PartyAnimalsPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF022B759B2D00457DA1 /* PartyAnimalsPreviewView.swift */; }; 9767DF052B75AFE200457DA1 /* PartyAnimalsArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF042B75AFE200457DA1 /* PartyAnimalsArtView.swift */; }; - 9767DF092B75C0B500457DA1 /* PartyAnimalsArtView+RawPosition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF082B75C0B500457DA1 /* PartyAnimalsArtView+RawPosition.swift */; }; 9767DF0B2B75D1A100457DA1 /* SymbolArtElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF0A2B75D1A100457DA1 /* SymbolArtElement.swift */; }; 9767DF0D2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF0C2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift */; }; 9767DF0F2B75DFB400457DA1 /* SymbolArtPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF0E2B75DFB400457DA1 /* SymbolArtPreviewView.swift */; }; 9767DF112B75E8FC00457DA1 /* MagicianArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF102B75E8FC00457DA1 /* MagicianArtView+Element.swift */; }; 9767DF132B75EDB700457DA1 /* CrayonBoyArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF122B75EDB700457DA1 /* CrayonBoyArtView+Element.swift */; }; 9767DF152B75F7BE00457DA1 /* WorldPeaceArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF142B75F7BE00457DA1 /* WorldPeaceArtView+Element.swift */; }; + 9767DF172B75FF0700457DA1 /* PartyAnimalsArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF162B75FF0700457DA1 /* PartyAnimalsArtView+Element.swift */; }; 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; @@ -95,13 +95,13 @@ 9767DEFF2B752E4700457DA1 /* WorldPeaceArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorldPeaceArtView.swift; sourceTree = ""; }; 9767DF022B759B2D00457DA1 /* PartyAnimalsPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PartyAnimalsPreviewView.swift; sourceTree = ""; }; 9767DF042B75AFE200457DA1 /* PartyAnimalsArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PartyAnimalsArtView.swift; sourceTree = ""; }; - 9767DF082B75C0B500457DA1 /* PartyAnimalsArtView+RawPosition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PartyAnimalsArtView+RawPosition.swift"; sourceTree = ""; }; 9767DF0A2B75D1A100457DA1 /* SymbolArtElement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolArtElement.swift; sourceTree = ""; }; 9767DF0C2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AfroBoyArtView+Element.swift"; sourceTree = ""; }; 9767DF0E2B75DFB400457DA1 /* SymbolArtPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolArtPreviewView.swift; sourceTree = ""; }; 9767DF102B75E8FC00457DA1 /* MagicianArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MagicianArtView+Element.swift"; sourceTree = ""; }; 9767DF122B75EDB700457DA1 /* CrayonBoyArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CrayonBoyArtView+Element.swift"; sourceTree = ""; }; 9767DF142B75F7BE00457DA1 /* WorldPeaceArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorldPeaceArtView+Element.swift"; sourceTree = ""; }; + 9767DF162B75FF0700457DA1 /* PartyAnimalsArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PartyAnimalsArtView+Element.swift"; sourceTree = ""; }; 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; @@ -262,8 +262,8 @@ isa = PBXGroup; children = ( 9767DF042B75AFE200457DA1 /* PartyAnimalsArtView.swift */, + 9767DF162B75FF0700457DA1 /* PartyAnimalsArtView+Element.swift */, 9767DF022B759B2D00457DA1 /* PartyAnimalsPreviewView.swift */, - 9767DF082B75C0B500457DA1 /* PartyAnimalsArtView+RawPosition.swift */, ); path = PartyAnimals; sourceTree = ""; @@ -525,6 +525,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 9767DF172B75FF0700457DA1 /* PartyAnimalsArtView+Element.swift in Sources */, 9767DF0D2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift in Sources */, 97EF43932B72D3E2003648F5 /* ImWearingPantsPreviewView.swift in Sources */, 97EF439E2B744C4C003648F5 /* Color+.swift in Sources */, @@ -546,7 +547,6 @@ 9748BE2028939B04006DF0BE /* FlipType.swift in Sources */, 97AD531A2B70E0530034FB5D /* Font.Weight+.swift in Sources */, 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */, - 9767DF092B75C0B500457DA1 /* PartyAnimalsArtView+RawPosition.swift in Sources */, 9748BE5F289F194E006DF0BE /* RocketFirework.swift in Sources */, 9748BE59289DCE17006DF0BE /* Fireworks.swift in Sources */, 9748BE5D289DD696006DF0BE /* Building.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView+Element.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView+Element.swift new file mode 100644 index 0000000..39dd52e --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView+Element.swift @@ -0,0 +1,456 @@ +// +// PartyAnimalsArtView+Element.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension PartyAnimalsArtView { + + enum Element: String, CaseIterable, Identifiable { + case bearEarRight + case bearEarLeft + case bearEarInsideRight + case bearEarInsideLeft + case bearOutline + case bearEyeRight + case bearEyeLeft + case bearMouth + case bearNose + case flogEyeOutlineRight + case flogEyeOutlineLeft + case flogEyeRight + case flogEyeLeft + case flogOutline + case flogMouth + case lionManeFirst + case lionManeSecond + case lionEarRight + case lionEarLeft + case lionOutline + case lionEyeRight + case lionEyeLeft + case lionWhiskersRight + case lionWhiskersLeft + case lionMouth + case lionNose + case pawFirst + case pawSecond + case pawThird + case pawFourth + + var id: String { rawValue } + + var value: SymbolArtElement { + switch self { + case .bearEarRight: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.third), + primaryColor: .brown, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: 0.08, + verticalOffsetRatio: -0.37, + symbolCountToWaitFor: 1 + ) + case .bearEarLeft: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.third), + primaryColor: .brown, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: 0.32, + verticalOffsetRatio: -0.37, + symbolCountToWaitFor: 1 + ) + case .bearEarInsideRight: + SymbolArtElement( + symbol: "􀩹", + name: "button.roundedtop.horizontal.fill", + initialPosition: .third(.fourth), + primaryColor: .palePink, + widthRatio: 0.06, + heightRatio: 0.06, + rotationDegrees: -20, + horizontalOffsetRatio: 0.08, + verticalOffsetRatio: -0.37, + symbolCountToWaitFor: 0 + ) + case .bearEarInsideLeft: + SymbolArtElement( + symbol: "􀩹", + name: "button.roundedtop.horizontal.fill", + initialPosition: .third(.fourth), + primaryColor: .palePink, + widthRatio: 0.06, + heightRatio: 0.06, + rotationDegrees: 20, + horizontalOffsetRatio: 0.32, + verticalOffsetRatio: -0.37, + symbolCountToWaitFor: 0 + ) + case .bearOutline: + SymbolArtElement( + symbol: "􀲟", + name: "oval.fill", + initialPosition: .third(.fifth), + primaryColor: .brown, + widthRatio: 0.4, + heightRatio: 0.325, + horizontalOffsetRatio: 0.2, + verticalOffsetRatio: -0.2, + symbolCountToWaitFor: 8 + ) + case .bearEyeRight: + SymbolArtElement( + symbol: "􀢚", + name: "record.circle.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .third(.sixth), + primaryColor: .white, + secondaryColor: .darkBrown, + widthRatio: 0.05, + heightRatio: 0.05, + horizontalOffsetRatio: 0.13, + verticalOffsetRatio: -0.23, + symbolCountToWaitFor: 7 + ) + + case .bearEyeLeft: + SymbolArtElement( + symbol: "􀢚", + name: "record.circle.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .third(.sixth), + primaryColor: .white, + secondaryColor: .darkBrown, + widthRatio: 0.05, + heightRatio: 0.05, + horizontalOffsetRatio: 0.27, + verticalOffsetRatio: -0.23, + symbolCountToWaitFor: 7 + ) + case .bearMouth: + SymbolArtElement( + symbol: "􀁹", + name: "arrow.down.circle.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .second(.third), + primaryColor: .black, + secondaryColor: .white, + widthRatio: 0.125, + heightRatio: 0.125, + horizontalOffsetRatio: 0.2, + verticalOffsetRatio: -0.15, + symbolCountToWaitFor: 5 + ) + case .bearNose: + SymbolArtElement( + symbol: "􀆼", + name: "moon.circle.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .third(.seventh), + primaryColor: .white, + secondaryColor: .red, + widthRatio: 0.04, + heightRatio: 0.04, + rotationDegrees: 170, + horizontalOffsetRatio: 0.2, + verticalOffsetRatio: -0.17, + symbolCountToWaitFor: 6 + ) + case .flogEyeOutlineRight: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.third), + primaryColor: .green, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: -0.32, + verticalOffsetRatio: -0.18, + symbolCountToWaitFor: 1 + ) + case .flogEyeOutlineLeft: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.third), + primaryColor: .green, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: -0.08, + verticalOffsetRatio: -0.18, + symbolCountToWaitFor: 1 + ) + case .flogEyeRight: + SymbolArtElement( + symbol: "􀢚", + name: "record.circle.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .third(.sixth), + primaryColor: .white, + widthRatio: 0.05, + heightRatio: 0.05, + horizontalOffsetRatio: -0.32, + verticalOffsetRatio: -0.18, + symbolCountToWaitFor: 7 + ) + case .flogEyeLeft: + SymbolArtElement( + symbol: "􀢚", + name: "record.circle.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .third(.sixth), + primaryColor: .white, + widthRatio: 0.05, + heightRatio: 0.05, + horizontalOffsetRatio: -0.08, + verticalOffsetRatio: -0.18, + symbolCountToWaitFor: 7 + ) + case .flogOutline: + SymbolArtElement( + symbol: "􀲟", + name: "oval.fill", + initialPosition: .third(.fifth), + primaryColor: .green, + widthRatio: 0.4, + heightRatio: 0.325, + horizontalOffsetRatio: -0.2, + symbolCountToWaitFor: 8 + ) + case .flogMouth: + SymbolArtElement( + symbol: "􀆈", + name: "chevron.down", + initialPosition: .second(.first), + primaryColor: .black, + fontWeight: .bold, + widthRatio: 0.1, + heightRatio: 0.05, + horizontalOffsetRatio: -0.2, + verticalOffsetRatio: 0.025, + symbolCountToWaitFor: 3 + ) + case .lionManeFirst: + // MARK: - Lion mane + SymbolArtElement( + symbol: "􀟇", + name: "seal.fill", + initialPosition: .third(.second), + primaryColor: .orange, + fontWeight: .ultraLight, + widthRatio: 0.52, + heightRatio: 0.52, + rotationDegrees: 20, + horizontalOffsetRatio: 0.2, + verticalOffsetRatio: 0.26, + symbolCountToWaitFor: 9 + ) + case .lionManeSecond: + SymbolArtElement( + symbol: "􀟇", + name: "seal.fill", + initialPosition: .third(.second), + primaryColor: .orange, + fontWeight: .ultraLight, + widthRatio: 0.52, + heightRatio: 0.52, + horizontalOffsetRatio: 0.2, + verticalOffsetRatio: 0.26, + symbolCountToWaitFor: 9 + ) + case .lionEarRight: + // MARK: - 􀀁 Lion ear + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.third), + primaryColor: .yellow, + widthRatio: 0.12, + heightRatio: 0.12, + horizontalOffsetRatio: 0.08, + verticalOffsetRatio: 0.17, + symbolCountToWaitFor: 1 + ) + case .lionEarLeft: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.third), + primaryColor: .yellow, + widthRatio: 0.12, + heightRatio: 0.12, + horizontalOffsetRatio: 0.32, + verticalOffsetRatio: 0.17, + symbolCountToWaitFor: 1 + ) + case .lionOutline: + // MARK: - Lion outline + SymbolArtElement( + symbol: "􀲟", + name: "oval.fill", + initialPosition: .third(.fifth), + primaryColor: .yellow, + widthRatio: 0.3, + heightRatio: 0.26, + horizontalOffsetRatio: 0.2, + verticalOffsetRatio: 0.29, + symbolCountToWaitFor: 8 + ) + case .lionEyeRight: + SymbolArtElement( + symbol: "􀢚", + name: "record.circle.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .third(.sixth), + primaryColor: .white, + secondaryColor: .darkBrown, + widthRatio: 0.05, + heightRatio: 0.05, + horizontalOffsetRatio: 0.13, + verticalOffsetRatio: 0.26, + symbolCountToWaitFor: 7 + ) + case .lionEyeLeft: + SymbolArtElement( + symbol: "􀢚", + name: "record.circle.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .third(.sixth), + primaryColor: .white, + secondaryColor: .darkBrown, + widthRatio: 0.05, + heightRatio: 0.05, + horizontalOffsetRatio: 0.27, + verticalOffsetRatio: 0.26, + symbolCountToWaitFor: 7 + ) + case .lionWhiskersRight: + SymbolArtElement( + symbol: "􀇯", + name: "rays", + initialPosition: .second(.second), + primaryColor: .darkBrown, + widthRatio: 0.175, + heightRatio: 0.06, + horizontalOffsetRatio: 0.235, + verticalOffsetRatio: 0.33, + symbolCountToWaitFor: 4 + ) + case .lionWhiskersLeft: + SymbolArtElement( + symbol: "􀇯", + name: "rays", + initialPosition: .second(.second), + primaryColor: .darkBrown, + widthRatio: 0.175, + heightRatio: 0.06, + horizontalOffsetRatio: 0.165, + verticalOffsetRatio: 0.33, + symbolCountToWaitFor: 4 + ) + case .lionMouth: + SymbolArtElement( + symbol: "􀁹", + name: "arrow.down.circle.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .second(.third), + primaryColor: .black, + secondaryColor: .white, + widthRatio: 0.125, + heightRatio: 0.11, + horizontalOffsetRatio: 0.2, + verticalOffsetRatio: 0.34, + symbolCountToWaitFor: 5 + ) + case .lionNose: + SymbolArtElement( + symbol: "􀆼", + name: "moon.circle.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .third(.seventh), + primaryColor: .white, + secondaryColor: .darkBrown, + widthRatio: 0.04, + heightRatio: 0.04, + rotationDegrees: 170, + horizontalOffsetRatio: 0.2, + verticalOffsetRatio: 0.32, + symbolCountToWaitFor: 6 + ) + case .pawFirst: + SymbolArtElement( + symbol: "􀾟", + name: "pawprint.fill", + initialPosition: .third(.first), + primaryColor: .red, + widthRatio: 0.13, + heightRatio: 0.13, + rotationDegrees: 24, + horizontalOffsetRatio: -0.34, + verticalOffsetRatio: -0.5, + symbolCountToWaitFor: 2 + ) + case .pawSecond: + SymbolArtElement( + symbol: "􀾟", + name: "pawprint.fill", + initialPosition: .third(.first), + primaryColor: .orange, + widthRatio: 0.13, + heightRatio: 0.13, + rotationDegrees: -24, + horizontalOffsetRatio: -0.14, + verticalOffsetRatio: -0.36, + symbolCountToWaitFor: 2 + ) + case .pawThird: + SymbolArtElement( + symbol: "􀾟", + name: "pawprint.fill", + initialPosition: .third(.first), + primaryColor: .teal, + widthRatio: 0.13, + heightRatio: 0.13, + rotationDegrees: 30, + horizontalOffsetRatio: -0.3, + verticalOffsetRatio: 0.26, + symbolCountToWaitFor: 2 + ) + case .pawFourth: + SymbolArtElement( + symbol: "􀾟", + name: "pawprint.fill", + initialPosition: .third(.first), + primaryColor: .blue, + widthRatio: 0.13, + heightRatio: 0.13, + rotationDegrees: -14, + horizontalOffsetRatio: -0.14, + verticalOffsetRatio: 0.44, + symbolCountToWaitFor: 2 + ) + } + } + } +} + +#Preview { + NavigationStack { + PartyAnimalsArtView() + .environment(ArtWorkModel.preview) + } +} + +#Preview { + PartyAnimalsPreviewView() + .environment(ArtWorkModel.preview) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView+RawPosition.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView+RawPosition.swift deleted file mode 100644 index d93bbe4..0000000 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView+RawPosition.swift +++ /dev/null @@ -1,53 +0,0 @@ -// -// PartyAnimalsArtView+RawPosition.swift -// SFSymbolsArtCollection -// -// Created by Lil Ossa -// - -import SwiftUI - -extension PartyAnimalsArtView { - - enum PawPosition: String, CaseIterable, Identifiable { - case first - case second - case third - case fourth - - struct Value { - let color: Color - let rotationDegrees: CGFloat - let horizontalOffsetRatio: CGFloat - let verticalOffsetRatio: CGFloat - } - - var id: String { self.rawValue } - - var value: Value { - switch self { - case .first: - Value(color: .red, - rotationDegrees: 24, - horizontalOffsetRatio: -0.34, - verticalOffsetRatio: -0.5) - case .second: - Value(color: .orange, - rotationDegrees: -24, - horizontalOffsetRatio: -0.14, - verticalOffsetRatio: -0.36) - case .third: - Value(color: .teal, - rotationDegrees: 30, - horizontalOffsetRatio: -0.3, - verticalOffsetRatio: 0.26) - case .fourth: - Value(color: .blue, - rotationDegrees: -14, - horizontalOffsetRatio: -0.14, - verticalOffsetRatio: 0.44) - } - } - } -} - diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView.swift index 5d6ac94..97202ab 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView.swift @@ -9,31 +9,13 @@ import SwiftUI struct PartyAnimalsArtView: View { - @Environment(ArtWorkModel.self) var model @State private var isAnimating = false var body: some View { ZStack { - bear() - flog() - lion() - - // MARK: - 􀾟 Paw - ForEach(PawPosition.allCases) { - - AnimatableSymbolView( - name: "pawprint.fill", - initialPosition: .third(.first), - primaryColor: $0.value.color, - widthRatio: 0.13, - heightRatio: 0.13, - rotationDegrees: $0.value.rotationDegrees, - horizontalOffsetRatio: $0.value.horizontalOffsetRatio, - verticalOffsetRatio: $0.value.verticalOffsetRatio, - isAnimating: isAnimating, - symbolCountToWaitFor: 2 - ) + ForEach(Element.allCases) { + AnimatableSymbolView(element: $0.value, isAnimating: isAnimating) } } .navigationTitle("Party animals") @@ -50,375 +32,6 @@ struct PartyAnimalsArtView: View { } }) } - - // MARK: - Bear - private func bear() -> some View { - ZStack { - // MARK: - 􀀁 Bear ear - AnimatableSymbolView( - name: "circle.fill", - initialPosition: .third(.third), - primaryColor: .brown, - widthRatio: 0.15, - heightRatio: 0.15, - horizontalOffsetRatio: 0.08, - verticalOffsetRatio: -0.37, - isAnimating: isAnimating, - symbolCountToWaitFor: 1 - ) - - AnimatableSymbolView( - name: "circle.fill", - initialPosition: .third(.third), - primaryColor: .brown, - widthRatio: 0.15, - heightRatio: 0.15, - horizontalOffsetRatio: 0.32, - verticalOffsetRatio: -0.37, - isAnimating: isAnimating, - symbolCountToWaitFor: 1 - ) - - // MARK: - 􀩹 Bear Inside ear - AnimatableSymbolView( - name: "button.roundedtop.horizontal.fill", - initialPosition: .third(.fourth), - primaryColor: .palePink, - widthRatio: 0.06, - heightRatio: 0.06, - rotationDegrees: -20, - horizontalOffsetRatio: 0.08, - verticalOffsetRatio: -0.37, - isAnimating: isAnimating, - symbolCountToWaitFor: 0 - ) - - AnimatableSymbolView( - name: "button.roundedtop.horizontal.fill", - initialPosition: .third(.fourth), - primaryColor: .palePink, - widthRatio: 0.06, - heightRatio: 0.06, - rotationDegrees: 20, - horizontalOffsetRatio: 0.32, - verticalOffsetRatio: -0.37, - isAnimating: isAnimating, - symbolCountToWaitFor: 0 - ) - - // MARK: - 􀲟 Bear outline - AnimatableSymbolView( - name: "oval.fill", - initialPosition: .third(.fifth), - primaryColor: .brown, - widthRatio: 0.4, - heightRatio: 0.325, - horizontalOffsetRatio: 0.2, - verticalOffsetRatio: -0.2, - isAnimating: isAnimating, - symbolCountToWaitFor: 8 - ) - - // MARK: - 􀢚 Bear Eye - AnimatableSymbolView( - name: "record.circle.fill", - initialPrimaryColor: .systemBackground, - initialPosition: .third(.sixth), - primaryColor: .white, - secondaryColor: .darkBrown, - widthRatio: 0.05, - heightRatio: 0.05, - horizontalOffsetRatio: 0.13, - verticalOffsetRatio: -0.23, - isAnimating: isAnimating, - symbolCountToWaitFor: 7 - ) - - AnimatableSymbolView( - name: "record.circle.fill", - initialPrimaryColor: .systemBackground, - initialPosition: .third(.sixth), - primaryColor: .white, - secondaryColor: .darkBrown, - widthRatio: 0.05, - heightRatio: 0.05, - horizontalOffsetRatio: 0.27, - verticalOffsetRatio: -0.23, - isAnimating: isAnimating, - symbolCountToWaitFor: 7 - ) - - // MARK: - 􀁹 Bear mouth - AnimatableSymbolView( - name: "arrow.down.circle.fill", - initialPrimaryColor: .systemBackground, - initialPosition: .second(.third), - primaryColor: .black, - secondaryColor: .white, - widthRatio: 0.125, - heightRatio: 0.125, - horizontalOffsetRatio: 0.2, - verticalOffsetRatio: -0.15, - isAnimating: isAnimating, - symbolCountToWaitFor: 5 - ) - - // MARK: - 􀆼 Bear Nose - AnimatableSymbolView( - name: "moon.circle.fill", - initialPrimaryColor: .systemBackground, - initialPosition: .third(.seventh), - primaryColor: .white, - secondaryColor: .red, - widthRatio: 0.04, - heightRatio: 0.04, - rotationDegrees: 170, - horizontalOffsetRatio: 0.2, - verticalOffsetRatio: -0.17, - isAnimating: isAnimating, - symbolCountToWaitFor: 6 - ) - } - } - - // MARK: - Flog - private func flog() -> some View { - ZStack { - // MARK: - 􀀁 Flog eye outline - AnimatableSymbolView( - name: "circle.fill", - initialPosition: .third(.third), - primaryColor: .green, - widthRatio: 0.15, - heightRatio: 0.15, - horizontalOffsetRatio: -0.32, - verticalOffsetRatio: -0.18, - isAnimating: isAnimating, - symbolCountToWaitFor: 1 - ) - - AnimatableSymbolView( - name: "circle.fill", - initialPosition: .third(.third), - primaryColor: .green, - widthRatio: 0.15, - heightRatio: 0.15, - horizontalOffsetRatio: -0.08, - verticalOffsetRatio: -0.18, - isAnimating: isAnimating, - symbolCountToWaitFor: 1 - ) - - // MARK: - 􀢚 Flog Eye - AnimatableSymbolView( - name: "record.circle.fill", - initialPrimaryColor: .systemBackground, - initialPosition: .third(.sixth), - primaryColor: .white, - widthRatio: 0.05, - heightRatio: 0.05, - horizontalOffsetRatio: -0.32, - verticalOffsetRatio: -0.18, - isAnimating: isAnimating, - symbolCountToWaitFor: 7 - ) - - AnimatableSymbolView( - name: "record.circle.fill", - initialPrimaryColor: .systemBackground, - initialPosition: .third(.sixth), - primaryColor: .white, - widthRatio: 0.05, - heightRatio: 0.05, - horizontalOffsetRatio: -0.08, - verticalOffsetRatio: -0.18, - isAnimating: isAnimating, - symbolCountToWaitFor: 7 - ) - - // MARK: - 􀲟 Flog outline - AnimatableSymbolView( - name: "oval.fill", - initialPosition: .third(.fifth), - primaryColor: .green, - widthRatio: 0.4, - heightRatio: 0.325, - horizontalOffsetRatio: -0.2, - isAnimating: isAnimating, - symbolCountToWaitFor: 8 - ) - - // MARK: - 􀆈 Flog mouth - AnimatableSymbolView( - name: "chevron.down", - initialPosition: .second(.first), - fontWeight: .bold, - widthRatio: 0.1, - heightRatio: 0.05, - horizontalOffsetRatio: -0.2, - verticalOffsetRatio: 0.025, - isAnimating: isAnimating, - symbolCountToWaitFor: 3 - ) - } - } - - // MARK: - Lion - private func lion() -> some View { - ZStack { - - // MARK: - Lion mane - AnimatableSymbolView( - name: "seal.fill", - initialPosition: .third(.second), - primaryColor: .orange, - fontWeight: .ultraLight, - widthRatio: 0.52, - heightRatio: 0.52, - rotationDegrees: 20, - horizontalOffsetRatio: 0.2, - verticalOffsetRatio: 0.26, - isAnimating: isAnimating, - symbolCountToWaitFor: 9 - ) - - AnimatableSymbolView( - name: "seal.fill", - initialPosition: .third(.second), - primaryColor: .orange, - fontWeight: .ultraLight, - widthRatio: 0.52, - heightRatio: 0.52, - horizontalOffsetRatio: 0.2, - verticalOffsetRatio: 0.26, - isAnimating: isAnimating, - symbolCountToWaitFor: 9 - ) - - // MARK: - 􀀁 Lion ear - AnimatableSymbolView( - name: "circle.fill", - initialPosition: .third(.third), - primaryColor: .yellow, - widthRatio: 0.12, - heightRatio: 0.12, - horizontalOffsetRatio: 0.08, - verticalOffsetRatio: 0.17, - isAnimating: isAnimating, - symbolCountToWaitFor: 1 - ) - - AnimatableSymbolView( - name: "circle.fill", - initialPosition: .third(.third), - primaryColor: .yellow, - widthRatio: 0.12, - heightRatio: 0.12, - horizontalOffsetRatio: 0.32, - verticalOffsetRatio: 0.17, - isAnimating: isAnimating, - symbolCountToWaitFor: 1 - ) - - // MARK: - 􀲟 Lion outline - AnimatableSymbolView( - name: "oval.fill", - initialPosition: .third(.fifth), - primaryColor: .yellow, - widthRatio: 0.3, - heightRatio: 0.26, - horizontalOffsetRatio: 0.2, - verticalOffsetRatio: 0.29, - isAnimating: isAnimating, - symbolCountToWaitFor: 8 - ) - - // MARK: - 􀢚 Lion Eye - AnimatableSymbolView( - name: "record.circle.fill", - initialPrimaryColor: .systemBackground, - initialPosition: .third(.sixth), - primaryColor: .white, - secondaryColor: .darkBrown, - widthRatio: 0.05, - heightRatio: 0.05, - horizontalOffsetRatio: 0.13, - verticalOffsetRatio: 0.26, - isAnimating: isAnimating, - symbolCountToWaitFor: 7 - ) - - AnimatableSymbolView( - name: "record.circle.fill", - initialPrimaryColor: .systemBackground, - initialPosition: .third(.sixth), - primaryColor: .white, - secondaryColor: .darkBrown, - widthRatio: 0.05, - heightRatio: 0.05, - horizontalOffsetRatio: 0.27, - verticalOffsetRatio: 0.26, - isAnimating: isAnimating, - symbolCountToWaitFor: 7 - ) - - // MARK: - Lion whiskers - AnimatableSymbolView( - name: "rays", - initialPosition: .second(.second), - primaryColor: .darkBrown, - widthRatio: 0.175, - heightRatio: 0.06, - horizontalOffsetRatio: 0.235, - verticalOffsetRatio: 0.33, - isAnimating: isAnimating, - symbolCountToWaitFor: 4 - ) - - AnimatableSymbolView( - name: "rays", - initialPosition: .second(.second), - primaryColor: .darkBrown, - widthRatio: 0.175, - heightRatio: 0.06, - horizontalOffsetRatio: 0.165, - verticalOffsetRatio: 0.33, - isAnimating: isAnimating, - symbolCountToWaitFor: 4 - ) - - // MARK: - 􀁹 Lion mouth - AnimatableSymbolView( - name: "arrow.down.circle.fill", - initialPrimaryColor: .systemBackground, - initialPosition: .second(.third), - primaryColor: .black, - secondaryColor: .white, - widthRatio: 0.125, - heightRatio: 0.11, - horizontalOffsetRatio: 0.2, - verticalOffsetRatio: 0.34, - isAnimating: isAnimating, - symbolCountToWaitFor: 5 - ) - - // MARK: - 􀆼 Lion Nose - AnimatableSymbolView( - name: "moon.circle.fill", - initialPrimaryColor: .systemBackground, - initialPosition: .third(.seventh), - primaryColor: .white, - secondaryColor: .darkBrown, - widthRatio: 0.04, - heightRatio: 0.04, - rotationDegrees: 170, - horizontalOffsetRatio: 0.2, - verticalOffsetRatio: 0.32, - isAnimating: isAnimating, - symbolCountToWaitFor: 6 - ) - } - } } #Preview { diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsPreviewView.swift index 3048ecb..46aa9fb 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsPreviewView.swift @@ -8,317 +8,17 @@ import SwiftUI struct PartyAnimalsPreviewView: View { - - @Environment(ArtWorkModel.self) var model - - var body: some View { + var body: some View { ZStack { - bear() - flog() - lion() - - // MARK: - 􀾟 Paw - ForEach(PartyAnimalsArtView.PawPosition.allCases) { - - Image(systemName: "pawprint.fill") - .arrangeShape( - primaryColor: $0.value.color, - width: model.calculatingProportionalValue(withRatio: 0.13, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.13, forPreview: true), - rotationDegrees: $0.value.rotationDegrees, - horizontalOffset: model.calculatingProportionalValue(withRatio: $0.value.horizontalOffsetRatio, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: $0.value.verticalOffsetRatio, forPreview: true) - ) + ForEach(PartyAnimalsArtView.Element.allCases) { + SymbolArtPreviewView(element: $0.value) } } } - - // MARK: - Bear - private func bear() -> some View { - ZStack { - // MARK: - 􀀁 Bear ear - Image(systemName: "circle.fill") - .arrangeShape( - primaryColor: .brown, - width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.37, forPreview: true) - ) - - Image(systemName: "circle.fill") - .arrangeShape( - primaryColor: .brown, - width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.32, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.37, forPreview: true) - ) - - // MARK: - 􀩹 Bear Inside ear - Image(systemName: "button.roundedtop.horizontal.fill") - .arrangeShape( - primaryColor: .palePink, - width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - rotationDegrees: -20, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.37, forPreview: true) - ) - - Image(systemName: "button.roundedtop.horizontal.fill") - .arrangeShape( - primaryColor: .palePink, - width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - rotationDegrees: 20, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.32, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.37, forPreview: true) - ) - - // MARK: - 􀲟 Bear outline - Image(systemName: "oval.fill") - .arrangeShape( - primaryColor: .brown, - width: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.325, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true) - ) - - // MARK: - 􀢚 Bear Eye - Image(systemName: "record.circle.fill") - .arrangeShape( - primaryColor: .white, - secondaryColor: .darkBrown, - width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.13, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.23, forPreview: true) - ) - - Image(systemName: "record.circle.fill") - .arrangeShape( - primaryColor: .white, - secondaryColor: .darkBrown, - width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.27, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.23, forPreview: true) - ) - - // MARK: - 􀁹 Bear mouth - Image(systemName: "arrow.down.circle.fill") - .arrangeShape( - primaryColor: .black, - secondaryColor: .white, - width: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.15, forPreview: true) - ) - - // MARK: - 􀆼 Bear Nose - Image(systemName: "moon.circle.fill") - .arrangeShape( - primaryColor: .white, - secondaryColor: .red, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - rotationDegrees: 170, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.17, forPreview: true) - ) - } - } - - // MARK: - Flog - private func flog() -> some View { - ZStack { - // MARK: - 􀀁 Flog eye outline - Image(systemName: "circle.fill") - .arrangeShape( - primaryColor: .green, - width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.32, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.18, forPreview: true) - ) - - Image(systemName: "circle.fill") - .arrangeShape( - primaryColor: .green, - width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.18, forPreview: true) - ) - - // MARK: - 􀢚 Flog Eye - Image(systemName: "record.circle.fill") - .arrangeShape( - primaryColor: .white, - width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.32, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.18, forPreview: true) - ) - - Image(systemName: "record.circle.fill") - .arrangeShape( - primaryColor: .white, - width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.18, forPreview: true) - ) - - // MARK: - 􀲟 Flog outline - Image(systemName: "oval.fill") - .arrangeShape( - primaryColor: .green, - width: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.325, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true) - ) - - // MARK: - 􀆈 Flog mouth - Image(systemName: "chevron.down") - .arrangeShape( - fontWeight: .bold, - width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.025, forPreview: true) - ) - } - } - - // MARK: - Lion - private func lion() -> some View { - ZStack { - - // MARK: - Lion mane - Image(systemName: "seal.fill") - .arrangeShape( - primaryColor: .orange, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.52, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.52, forPreview: true), - rotationDegrees: 20, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.26, forPreview: true) - ) - - Image(systemName: "seal.fill") - .arrangeShape( - primaryColor: .orange, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.52, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.52, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.26, forPreview: true) - ) - - // MARK: - 􀀁 Lion ear - Image(systemName: "circle.fill") - .arrangeShape( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.17, forPreview: true) - ) - - Image(systemName: "circle.fill") - .arrangeShape( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.32, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.17, forPreview: true) - ) - - // MARK: - 􀲟 Lion outline - Image(systemName: "oval.fill") - .arrangeShape( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.26, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.29, forPreview: true) - ) - - // MARK: - 􀢚 Lion Eye - Image(systemName: "record.circle.fill") - .arrangeShape( - primaryColor: .white, - secondaryColor: .darkBrown, - width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.13, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.26, forPreview: true) - ) - - Image(systemName: "record.circle.fill") - .arrangeShape( - primaryColor: .white, - secondaryColor: .darkBrown, - width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.27, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.26, forPreview: true) - ) - - // MARK: - Lion whiskers - Image(systemName: "rays") - .arrangeShape( - primaryColor: .darkBrown, - width: model.calculatingProportionalValue(withRatio: 0.175, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.235, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.33, forPreview: true) - ) - - Image(systemName: "rays") - .arrangeShape( - primaryColor: .darkBrown, - width: model.calculatingProportionalValue(withRatio: 0.175, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.165, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.33, forPreview: true) - ) - - // MARK: - 􀁹 Lion mouth - Image(systemName: "arrow.down.circle.fill") - .arrangeShape( - primaryColor: .black, - secondaryColor: .white, - width: model.calculatingProportionalValue(withRatio: 0.125, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.11, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.34, forPreview: true) - ) - - // MARK: - 􀆼 Lion Nose - Image(systemName: "moon.circle.fill") - .arrangeShape( - primaryColor: .white, - secondaryColor: .darkBrown, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - rotationDegrees: 170, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.32, forPreview: true) - ) - } - } } #Preview { PartyAnimalsPreviewView() - .environment(ArtWorkModel.init(screenSize: .init(width: 4600, height: 4600))) + .environment(ArtWorkModel.preview) } From 34beaceea990cc6cdd8140425b2641daefab8970 Mon Sep 17 00:00:00 2001 From: littleossa Date: Fri, 9 Feb 2024 15:53:27 +0900 Subject: [PATCH 072/108] Refactor Nosebleed --- .../project.pbxproj | 4 + .../Nosebleed/NosebleedArtView+Element.swift | 235 ++++++++++++++++++ .../ArtWorks/Nosebleed/NosebleedArtView.swift | 200 +-------------- .../Nosebleed/NosebleedPreviewView.swift | 153 +----------- 4 files changed, 249 insertions(+), 343 deletions(-) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView+Element.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index a32606b..efb9790 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -39,6 +39,7 @@ 9767DF132B75EDB700457DA1 /* CrayonBoyArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF122B75EDB700457DA1 /* CrayonBoyArtView+Element.swift */; }; 9767DF152B75F7BE00457DA1 /* WorldPeaceArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF142B75F7BE00457DA1 /* WorldPeaceArtView+Element.swift */; }; 9767DF172B75FF0700457DA1 /* PartyAnimalsArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF162B75FF0700457DA1 /* PartyAnimalsArtView+Element.swift */; }; + 9767DF192B76032600457DA1 /* NosebleedArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF182B76032600457DA1 /* NosebleedArtView+Element.swift */; }; 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; @@ -102,6 +103,7 @@ 9767DF122B75EDB700457DA1 /* CrayonBoyArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CrayonBoyArtView+Element.swift"; sourceTree = ""; }; 9767DF142B75F7BE00457DA1 /* WorldPeaceArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorldPeaceArtView+Element.swift"; sourceTree = ""; }; 9767DF162B75FF0700457DA1 /* PartyAnimalsArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PartyAnimalsArtView+Element.swift"; sourceTree = ""; }; + 9767DF182B76032600457DA1 /* NosebleedArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NosebleedArtView+Element.swift"; sourceTree = ""; }; 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; @@ -406,6 +408,7 @@ isa = PBXGroup; children = ( 97EF438A2B725E02003648F5 /* NosebleedArtView.swift */, + 9767DF182B76032600457DA1 /* NosebleedArtView+Element.swift */, 97EF438F2B72D2E4003648F5 /* NosebleedPreviewView.swift */, ); path = Nosebleed; @@ -525,6 +528,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 9767DF192B76032600457DA1 /* NosebleedArtView+Element.swift in Sources */, 9767DF172B75FF0700457DA1 /* PartyAnimalsArtView+Element.swift in Sources */, 9767DF0D2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift in Sources */, 97EF43932B72D3E2003648F5 /* ImWearingPantsPreviewView.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView+Element.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView+Element.swift new file mode 100644 index 0000000..581ae64 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView+Element.swift @@ -0,0 +1,235 @@ +// +// NosebleedArtView+Element.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension NosebleedArtView { + + enum Element: String, CaseIterable, Identifiable { + case outline + case nosebleedBottom + case nosebleedBottomConcealment + case mouth + case mouthConcealment + case nosebleedTop + case nosebleedTopConcealmentRight + case nosebleedTopConcealmentLeft + case eyeRight + case eyeLeft + case tissue + case tissueFrame + case nose + case noseConcealment + + var id: String { rawValue } + + var value: SymbolArtElement { + switch self { + case .outline: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.first), + primaryColor: .awesomeYellow, + widthRatio: 0.65, + heightRatio: 0.65, + symbolCountToWaitFor: 3 + ) + case .nosebleedBottom: + SymbolArtElement( + symbol: "􀭧", + name: "cellularbars", + initialPosition: .third(.second), + primaryColor: .red, + fontWeight: .ultraLight, + widthRatio: 0.2, + heightRatio: 0.5, + rotationDegrees: 180, + horizontalOffsetRatio: 0.09, + verticalOffsetRatio: 0.074, + symbolCountToWaitFor: 1 + ) + case .nosebleedBottomConcealment: + SymbolArtElement( + symbol: "􀏄", + name: "rectangle.fill", + initialPosition: .third(.third), + primaryColor: .awesomeYellow, + widthRatio: 0.1, + heightRatio: 0.14, + horizontalOffsetRatio: 0.09, + verticalOffsetRatio: 0.15, + symbolCountToWaitFor: 2 + ) + case .mouth: + SymbolArtElement( + symbol: "􀓩", + name: "lasso", + initialPosition: .third(.fourth), + primaryColor: .black, + fontWeight: .ultraLight, + widthRatio: 0.4, + heightRatio: 0.3, + rotationDegrees: 170, + horizontalOffsetRatio: 0.01, + verticalOffsetRatio: 0.05, + symbolCountToWaitFor: 0 + ) + case .mouthConcealment: + SymbolArtElement( + symbol: "􀏄", + name: "rectangle.fill", + initialPosition: .third(.third), + primaryColor: .awesomeYellow, + widthRatio: 0.5, + heightRatio: 0.3, + rotationDegrees: 176, + verticalOffsetRatio: -0.03, + symbolCountToWaitFor: 2 + ) + case .nosebleedTop: + SymbolArtElement( + symbol: "􀭧", + name: "cellularbars", + initialPosition: .third(.second), + primaryColor: .red, + fontWeight: .ultraLight, + widthRatio: 0.2, + heightRatio: 0.12, + rotationDegrees: 180, + horizontalOffsetRatio: 0.033, + verticalOffsetRatio: 0.096, + symbolCountToWaitFor: 1 + ) + case .nosebleedTopConcealmentRight: + SymbolArtElement( + symbol: "􀏄", + name: "rectangle.fill", + initialPosition: .third(.third), + primaryColor: .awesomeYellow, + widthRatio: 0.1, + heightRatio: 0.1, + horizontalOffsetRatio: 0.09, + verticalOffsetRatio: 0.06, + symbolCountToWaitFor: 2 + ) + case .nosebleedTopConcealmentLeft: + SymbolArtElement( + symbol: "􀏄", + name: "rectangle.fill", + initialPosition: .third(.third), + primaryColor: .awesomeYellow, + widthRatio: 0.04, + heightRatio: 0.14, + horizontalOffsetRatio: -0.047, + verticalOffsetRatio: 0.09, + symbolCountToWaitFor: 2 + ) + case .eyeRight: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.first), + primaryColor: .black, + widthRatio: 0.06, + heightRatio: 0.06, + horizontalOffsetRatio: 0.117, + verticalOffsetRatio: -0.176, + symbolCountToWaitFor: 3 + ) + case .eyeLeft: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.first), + primaryColor: .black, + widthRatio: 0.06, + heightRatio: 0.06, + horizontalOffsetRatio: -0.113, + verticalOffsetRatio: -0.17, + symbolCountToWaitFor: 3 + ) + case .tissue: + SymbolArtElement( + symbol: "􀥨", + name: "doc.plaintext.fill", + initialPosition: .third(.fifth), + primaryColor: .white, + fontWeight: .ultraLight, + widthRatio: 0.04, + heightRatio: 0.08, + rotationDegrees: 188, + horizontalOffsetRatio: -0.052, + verticalOffsetRatio: 0.083, + symbolCountToWaitFor: 6 + ) + case .tissueFrame: + SymbolArtElement( + symbol: "􀉆", + name: "doc.plaintext", + initialPosition: .third(.sixth), + primaryColor: .black, + fontWeight: .light, + widthRatio: 0.04, + heightRatio: 0.08, + rotationDegrees: 188, + horizontalOffsetRatio: -0.052, + verticalOffsetRatio: 0.083, + symbolCountToWaitFor: 6 + ) + case .nose: + SymbolArtElement( + symbol: "􀥰", + name: "triangleshape", + initialPosition: .third(.seventh), + primaryColor: .black, + fontWeight: .light, + widthRatio: 0.15, + heightRatio: 0.14, + rotationDegrees: -4, + horizontalOffsetRatio: -0.013, + verticalOffsetRatio: -0.02, + symbolCountToWaitFor: 4 + ) + case .noseConcealment: + SymbolArtElement( + symbol: "􀏄", + name: "rectangle.fill", + initialPosition: .third(.third), + primaryColor: .awesomeYellow, + widthRatio: 0.02, + heightRatio: 0.13, + rotationDegrees: 148, + horizontalOffsetRatio: 0.007, + verticalOffsetRatio: -0.046, + symbolCountToWaitFor: 5 + ) + } + } + + var isNosebleed: Bool { + switch self { + case .nosebleedBottom, .nosebleedTop: + true + default: + false + } + } + } +} + +#Preview { + NavigationStack { + NosebleedArtView() + .environment(ArtWorkModel.preview) + } +} + +#Preview { + NosebleedArtPreviewView() + .environment(ArtWorkModel.preview) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift index 26c1b13..a43739c 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift @@ -16,200 +16,12 @@ struct NosebleedArtView: View { var body: some View { ZStack { - - // MARK: - 􀀁 Contour - AnimatableSymbolView( - name: "circle.fill", - initialPosition: .third(.first), - primaryColor: .awesomeYellow, - widthRatio: 0.65, - heightRatio: 0.65, - isAnimating: isAnimating, - symbolCountToWaitFor: 3 - ) - - // MARK: - 􀭧 Nosebleed bottom - AnimatableSymbolView( - name: "cellularbars", - initialPosition: .third(.second), - primaryColor: .red, - fontWeight: .ultraLight, - widthRatio: 0.2, - heightRatio: 0.5, - rotationDegrees: 180, - horizontalOffsetRatio: 0.09, - verticalOffsetRatio: 0.074, - isAnimating: isAnimating, - symbolCountToWaitFor: 1 - ) - .symbolEffect(.variableColor.hideInactiveLayers, - options: .speed(0.6).repeating, - isActive: isEffectActivated) - - // MARK: - 􀏄 Concealing part for nosebleed bottom - AnimatableSymbolView( - name: "rectangle.fill", - initialPosition: .third(.third), - primaryColor: .awesomeYellow, - widthRatio: 0.1, - heightRatio: 0.14, - horizontalOffsetRatio: 0.09, - verticalOffsetRatio: 0.15, - isAnimating: isAnimating, - symbolCountToWaitFor: 2 - ) - - // MARK: - 􀓩 Mouth - AnimatableSymbolView( - name: "lasso", - initialPosition: .third(.fourth), - fontWeight: .ultraLight, - widthRatio: 0.4, - heightRatio: 0.3, - rotationDegrees: 170, - horizontalOffsetRatio: 0.01, - verticalOffsetRatio: 0.05, - isAnimating: isAnimating, - symbolCountToWaitFor: 0 - ) - - // MARK: - 􀏄 Concealing part for Mouth - AnimatableSymbolView( - name: "rectangle.fill", - initialPosition: .third(.third), - primaryColor: .awesomeYellow, - widthRatio: 0.5, - heightRatio: 0.3, - rotationDegrees: 176, - verticalOffsetRatio: -0.03, - isAnimating: isAnimating, - symbolCountToWaitFor: 2 - ) - - // MARK: - 􀭧 Nosebleed top - AnimatableSymbolView( - name: "cellularbars", - initialPosition: .third(.second), - primaryColor: .red, - fontWeight: .ultraLight, - widthRatio: 0.2, - heightRatio: 0.12, - rotationDegrees: 180, - horizontalOffsetRatio: 0.033, - verticalOffsetRatio: 0.096, - isAnimating: isAnimating, - symbolCountToWaitFor: 1 - ) - .symbolEffect(.variableColor.hideInactiveLayers, - options: .speed(0.6).repeating, - isActive: isEffectActivated) - - // MARK: - 􀏄 Concealing part for nosebleed top right - AnimatableSymbolView( - name: "rectangle.fill", - initialPosition: .third(.third), - primaryColor: .awesomeYellow, - widthRatio: 0.1, - heightRatio: 0.1, - horizontalOffsetRatio: 0.09, - verticalOffsetRatio: 0.06, - isAnimating: isAnimating, - symbolCountToWaitFor: 2 - ) - - // MARK: - 􀏄 Concealing part for nosebleed top left - AnimatableSymbolView( - name: "rectangle.fill", - initialPosition: .third(.third), - primaryColor: .awesomeYellow, - widthRatio: 0.04, - heightRatio: 0.14, - horizontalOffsetRatio: -0.047, - verticalOffsetRatio: 0.09, - isAnimating: isAnimating, - symbolCountToWaitFor: 2 - ) - - // MARK: - 􀀁 Right eye - AnimatableSymbolView( - name: "circle.fill", - initialPosition: .third(.first), - widthRatio: 0.06, - heightRatio: 0.06, - horizontalOffsetRatio: 0.117, - verticalOffsetRatio: -0.176, - isAnimating: isAnimating, - symbolCountToWaitFor: 3 - ) - - // MARK: - 􀀁 Left eye - AnimatableSymbolView( - name: "circle.fill", - initialPosition: .third(.first), - widthRatio: 0.06, - heightRatio: 0.06, - horizontalOffsetRatio: -0.113, - verticalOffsetRatio: -0.17, - isAnimating: isAnimating, - symbolCountToWaitFor: 3 - ) - - // MARK: - 􀥨 Tissue - AnimatableSymbolView( - name: "doc.plaintext.fill", - initialPosition: .third(.fifth), - primaryColor: .white, - fontWeight: .ultraLight, - widthRatio: 0.04, - heightRatio: 0.08, - rotationDegrees: 188, - horizontalOffsetRatio: -0.052, - verticalOffsetRatio: 0.083, - isAnimating: isAnimating, - symbolCountToWaitFor: 6 - ) - - // MARK: - 􀉆 Tissue frame - AnimatableSymbolView( - name: "doc.plaintext", - initialPosition: .third(.sixth), - fontWeight: .light, - widthRatio: 0.04, - heightRatio: 0.08, - rotationDegrees: 188, - horizontalOffsetRatio: -0.052, - verticalOffsetRatio: 0.083, - isAnimating: isAnimating, - symbolCountToWaitFor: 6 - ) - - // MARK: - 􀥰 Nose - AnimatableSymbolView( - name: "triangleshape", - initialPosition: .third(.seventh), - fontWeight: .light, - widthRatio: 0.15, - heightRatio: 0.14, - rotationDegrees: -4, - horizontalOffsetRatio: -0.013, - verticalOffsetRatio: -0.02, - isAnimating: isAnimating, - symbolCountToWaitFor: 4 - ) - - // MARK: - 􀏄 Concealing part for nose - AnimatableSymbolView( - name: "rectangle.fill", - initialPosition: .third(.third), - primaryColor: .awesomeYellow, - widthRatio: 0.02, - heightRatio: 0.13, - rotationDegrees: 148, - horizontalOffsetRatio: 0.007, - verticalOffsetRatio: -0.046, - isAnimating: isAnimating, - symbolCountToWaitFor: 5 - ) + ForEach(Element.allCases) { + AnimatableSymbolView(element: $0.value, isAnimating: isAnimating) + .symbolEffect(.variableColor.hideInactiveLayers, + options: .speed(0.6).repeating, + isActive: $0.isNosebleed ? isEffectActivated : false) + } } .navigationTitle("Nosebleed") .navigationBarTitleDisplayMode(.inline) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedPreviewView.swift index d0653b3..c2f6cd4 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedPreviewView.swift @@ -8,158 +8,13 @@ import SwiftUI struct NosebleedArtPreviewView: View { - - @Environment(ArtWorkModel.self) var model - + var body: some View { ZStack { - - // MARK: - 􀀁 Contour - Image(systemName: "circle.fill") - .arrangeShape( - primaryColor: .awesomeYellow, - width: model.calculatingProportionalValue(withRatio: 0.65, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.65, forPreview: true) - ) - - // MARK: - 􀭧 Nosebleed bottom - Image(systemName: "cellularbars") - .arrangeShape( - primaryColor: .red, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true), - rotationDegrees: 180, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.0741, forPreview: true) - ) - - // MARK: - 􀏄 Concealing part for nosebleed bottom - Image(systemName: "rectangle.fill") - .arrangeShape( - primaryColor: .awesomeYellow, - width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true) - ) - - // MARK: - 􀓩 Mouth - Image(systemName: "lasso") - .arrangeShape( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), - rotationDegrees: 170, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true) - ) - - // MARK: - 􀏄 Concealing part for Mouth - Image(systemName: "rectangle.fill") - .arrangeShape( - primaryColor: .awesomeYellow, - width: model.calculatingProportionalValue(withRatio: 0.5, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), - rotationDegrees: 176, - verticalOffset: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true) - ) - - // MARK: - 􀭧 Nosebleed top - Image(systemName: "cellularbars") - .arrangeShape( - primaryColor: .red, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.12, forPreview: true), - rotationDegrees: 180, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.033, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.096, forPreview: true) - ) - - // MARK: - 􀏄 Nosebleed top right hide - Image(systemName: "rectangle.fill") - .arrangeShape( - primaryColor: .awesomeYellow, - width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true) - ) - - // MARK: - 􀏄 Nosebleed top left hide - Image(systemName: "rectangle.fill") - .arrangeShape( - primaryColor: .awesomeYellow, - width: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.053, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true) - ) - - // MARK: - 􀀁 Right eye - Image(systemName: "circle.fill") - .arrangeShape( - width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.117, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.176, forPreview: true) - ) - - // MARK: - 􀀁 Left eye - Image(systemName: "circle.fill") - .arrangeShape( - width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.113, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.17, forPreview: true) - ) - - // MARK: - 􀥨 Tissue - Image(systemName: "doc.plaintext.fill") - .arrangeShape( - primaryColor: .white, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true), - rotationDegrees: 188, - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.052, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.083, forPreview: true) - ) - - // MARK: - 􀉆 Tissue frame - Image(systemName: "doc.plaintext") - .arrangeShape( - fontWeight: .light, - width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true), - rotationDegrees: 188, - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.052, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.083, forPreview: true) - ) - - // MARK: - 􀥰 Nose - Image(systemName: "triangleshape") - .arrangeShape( - fontWeight: .light, - width: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), - rotationDegrees: -4, - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.013, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.02, forPreview: true) - ) - - // MARK: - 􀏄 Nose hide - Image(systemName: "rectangle.fill") - .arrangeShape( - primaryColor: .awesomeYellow, - width: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.13, forPreview: true), - rotationDegrees: 148, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.007, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.046, forPreview: true) - ) + ForEach(NosebleedArtView.Element.allCases) { + SymbolArtPreviewView(element: $0.value) + } } } } From b458cf89b263abd12ade5e2271c8f8dc4241d5d0 Mon Sep 17 00:00:00 2001 From: littleossa Date: Fri, 9 Feb 2024 17:15:33 +0900 Subject: [PATCH 073/108] Import SwiftUI at WorldPeaceArtView --- .../ArtWorks/WorldPeace/WorldPeaceArtView+Element.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView+Element.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView+Element.swift index c740c60..62b03e8 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView+Element.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView+Element.swift @@ -5,7 +5,7 @@ // Created by Lil Ossa // -import Foundation +import SwiftUI extension WorldPeaceArtView { From 383f0c73ea7f18330a0167590f9b000aeecf735b Mon Sep 17 00:00:00 2001 From: littleossa Date: Fri, 9 Feb 2024 19:06:33 +0900 Subject: [PATCH 074/108] Refactor I am wearing pants --- .../project.pbxproj | 20 + .../ImWearingPantsArtView+FaceElement.swift | 330 ++++++++++ ...earingPantsArtView+FinishPoseElement.swift | 368 +++++++++++ .../Element/ImWearingPantsArtView+Pose.swift | 100 +++ .../ImWearingPantsArtView.swift | 603 +----------------- .../ImWearingPantsPreviewView.swift | 452 +------------ .../ArtWorkModel+InitialSymbolRow.swift | 3 + .../Models/ArtWorkModel/ArtWorkModel.swift | 2 + 8 files changed, 843 insertions(+), 1035 deletions(-) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+FaceElement.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+FinishPoseElement.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+Pose.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index efb9790..7dee390 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -40,6 +40,9 @@ 9767DF152B75F7BE00457DA1 /* WorldPeaceArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF142B75F7BE00457DA1 /* WorldPeaceArtView+Element.swift */; }; 9767DF172B75FF0700457DA1 /* PartyAnimalsArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF162B75FF0700457DA1 /* PartyAnimalsArtView+Element.swift */; }; 9767DF192B76032600457DA1 /* NosebleedArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF182B76032600457DA1 /* NosebleedArtView+Element.swift */; }; + 9767DF1B2B762DA000457DA1 /* ImWearingPantsArtView+FinishPoseElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF1A2B762DA000457DA1 /* ImWearingPantsArtView+FinishPoseElement.swift */; }; + 9767DF1D2B762E1200457DA1 /* ImWearingPantsArtView+Pose.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF1C2B762E1200457DA1 /* ImWearingPantsArtView+Pose.swift */; }; + 9767DF1F2B762E9000457DA1 /* ImWearingPantsArtView+FaceElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF1E2B762E9000457DA1 /* ImWearingPantsArtView+FaceElement.swift */; }; 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; @@ -104,6 +107,9 @@ 9767DF142B75F7BE00457DA1 /* WorldPeaceArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorldPeaceArtView+Element.swift"; sourceTree = ""; }; 9767DF162B75FF0700457DA1 /* PartyAnimalsArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PartyAnimalsArtView+Element.swift"; sourceTree = ""; }; 9767DF182B76032600457DA1 /* NosebleedArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NosebleedArtView+Element.swift"; sourceTree = ""; }; + 9767DF1A2B762DA000457DA1 /* ImWearingPantsArtView+FinishPoseElement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ImWearingPantsArtView+FinishPoseElement.swift"; sourceTree = ""; }; + 9767DF1C2B762E1200457DA1 /* ImWearingPantsArtView+Pose.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ImWearingPantsArtView+Pose.swift"; sourceTree = ""; }; + 9767DF1E2B762E9000457DA1 /* ImWearingPantsArtView+FaceElement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ImWearingPantsArtView+FaceElement.swift"; sourceTree = ""; }; 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; @@ -270,6 +276,16 @@ path = PartyAnimals; sourceTree = ""; }; + 9767DF202B762EF300457DA1 /* Element */ = { + isa = PBXGroup; + children = ( + 9767DF1E2B762E9000457DA1 /* ImWearingPantsArtView+FaceElement.swift */, + 9767DF1A2B762DA000457DA1 /* ImWearingPantsArtView+FinishPoseElement.swift */, + 9767DF1C2B762E1200457DA1 /* ImWearingPantsArtView+Pose.swift */, + ); + path = Element; + sourceTree = ""; + }; 97AD530D2B70DBC70034FB5D /* ArtisticWorldOfSFSymbols */ = { isa = PBXGroup; children = ( @@ -427,6 +443,7 @@ isa = PBXGroup; children = ( 97EF43942B72DA69003648F5 /* ImWearingPantsArtView.swift */, + 9767DF202B762EF300457DA1 /* Element */, 97EF43922B72D3E2003648F5 /* ImWearingPantsPreviewView.swift */, ); path = ImWearingPants; @@ -565,12 +582,15 @@ 97624C3328C4F43F004E1720 /* GeometryProxy+.swift in Sources */, 97EF43952B72DA69003648F5 /* ImWearingPantsArtView.swift in Sources */, 9748BE50289AB439006DF0BE /* DemonWrestlerHand.swift in Sources */, + 9767DF1D2B762E1200457DA1 /* ImWearingPantsArtView+Pose.swift in Sources */, 97AD53292B7100670034FB5D /* ArtWorkModel.swift in Sources */, 97EF439C2B7421A7003648F5 /* MagicianPreviewView.swift in Sources */, 973B2CA428C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift in Sources */, 97EF438D2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift in Sources */, + 9767DF1B2B762DA000457DA1 /* ImWearingPantsArtView+FinishPoseElement.swift in Sources */, 97EF43A52B74F27D003648F5 /* CrayonBoyArtView.swift in Sources */, 9767DF052B75AFE200457DA1 /* PartyAnimalsArtView.swift in Sources */, + 9767DF1F2B762E9000457DA1 /* ImWearingPantsArtView+FaceElement.swift in Sources */, 97624C2C28C2DDAA004E1720 /* Buildings.swift in Sources */, 97AD53222B70E3FA0034FB5D /* AnimatableSymbolView.swift in Sources */, 9767DF032B759B2D00457DA1 /* PartyAnimalsPreviewView.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+FaceElement.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+FaceElement.swift new file mode 100644 index 0000000..0bf64a1 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+FaceElement.swift @@ -0,0 +1,330 @@ +// +// ImWearingPantsArtView+FaceElement.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension ImWearingPantsArtView { + enum FaceElement: String, CaseIterable, Identifiable { + case musicFirst + case musicSecond + case faceBackground + case face + case joe + case nose + case eyebrowRight + case eyebrowLeft + case eyebrowConcealmentRight + case eyebrowConcealmentLeft + case eyeFrameRight + case eyeFrameLeft + case eyeRight + case eyeLeft + case mouthTop + case mouthBottom + case teethRight + case teethLeft + case hairTop + case hairRight + case hairLeft + + var id: String { rawValue } + + var value: SymbolArtElement { + switch self { + case .musicFirst: + SymbolArtElement( + symbol: "􀑪", + name: "music.note", + initialPosition: .second(.first), + primaryColor: .black, + widthRatio: 0.1, + heightRatio: 0.15, + horizontalOffsetRatio: 0.35, + verticalOffsetRatio: -0.5, + symbolCountToWaitFor: 0 + ) + case .musicSecond: + SymbolArtElement( + symbol: "􀫀", + name: "music.quarternote.3", + initialPosition: .second(.second), + primaryColor: .black, + widthRatio: 0.2, + heightRatio: 0.15, + horizontalOffsetRatio: -0.34, + verticalOffsetRatio: -0.38, + symbolCountToWaitFor: 1 + ) + case .faceBackground: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .second(.third), + primaryColor: .systemBackground, + widthRatio: 0.2, + heightRatio: 0.2, + verticalOffsetRatio: -0.4, + symbolCountToWaitFor: 2 + ) + case .face: + SymbolArtElement( + symbol: "􀧷", + name: "capsule.portrait.fill", + initialPosition: .second(.fourth), + primaryColor: .yellow, + fontWeight: .ultraLight, + widthRatio: 0.16, + heightRatio: 0.22, + verticalOffsetRatio: -0.4, + symbolCountToWaitFor: 2 + ) + case .joe: + SymbolArtElement( + symbol: "􀧷", + name: "capsule.portrait.fill", + initialPosition: .second(.fourth), + primaryColor: .yellow, + widthRatio: 0.1, + heightRatio: 0.16, + verticalOffsetRatio: -0.35, + symbolCountToWaitFor: 2 + ) + case .nose: + SymbolArtElement( + symbol: "􀨯", + name: "nose", + initialPosition: .second(.fifth), + primaryColor: .black, + fontWeight: .ultraLight, + widthRatio: 0.045, + heightRatio: 0.06, + verticalOffsetRatio: -0.38, + symbolCountToWaitFor: 3 + ) + case .eyebrowRight: + SymbolArtElement( + symbol: "􀦭", + name: "eyebrow", + initialPosition: .second(.sixth), + primaryColor: .black, + fontWeight: .ultraLight, + widthRatio: 0.04, + heightRatio: 0.04, + horizontalOffsetRatio: 0.03, + verticalOffsetRatio: -0.41, + symbolCountToWaitFor: 4 + ) + case .eyebrowLeft: + SymbolArtElement( + symbol: "􀦭", + name: "eyebrow", + initialPosition: .second(.sixth), + primaryColor: .black, + fontWeight: .ultraLight, + widthRatio: 0.045, + heightRatio: 0.04, + flip: .horizontal, + horizontalOffsetRatio: -0.03, + verticalOffsetRatio: -0.408, + symbolCountToWaitFor: 4 + ) + case .eyebrowConcealmentRight: + SymbolArtElement( + symbol: "􀧷", + name: "capsule.portrait.fill", + initialPosition: .second(.fourth), + primaryColor: .yellow, + widthRatio: 0.05, + heightRatio: 0.02, + rotationDegrees: -10, + horizontalOffsetRatio: -0.035, + verticalOffsetRatio: -0.396, + symbolCountToWaitFor: 5 + ) + case .eyebrowConcealmentLeft: + SymbolArtElement( + symbol: "􀧷", + name: "capsule.portrait.fill", + initialPosition: .second(.fourth), + primaryColor: .yellow, + widthRatio: 0.05, + heightRatio: 0.02, + rotationDegrees: 10, + horizontalOffsetRatio: 0.035, + verticalOffsetRatio: -0.396, + symbolCountToWaitFor: 5 + ) + case .eyeFrameRight: + SymbolArtElement( + symbol: "􀋭", + name: "eye", + initialPosition: .second(.seventh), + primaryColor: .black, + fontWeight: .ultraLight, + widthRatio: 0.04, + heightRatio: 0.02, + horizontalOffsetRatio: 0.03, + verticalOffsetRatio: -0.4, + symbolCountToWaitFor: 5 + ) + case .eyeFrameLeft: + SymbolArtElement( + symbol: "􀋭", + name: "eye", + initialPosition: .second(.seventh), + primaryColor: .black, + fontWeight: .ultraLight, + widthRatio: 0.04, + heightRatio: 0.02, + horizontalOffsetRatio: -0.03, + verticalOffsetRatio: -0.4, + symbolCountToWaitFor: 5 + ) + case .eyeRight: + SymbolArtElement( + symbol: "􀋮", + name: "eye.fill", + initialPosition: .third(.seventh), + primaryColor: .white, + widthRatio: 0.04, + heightRatio: 0.02, + horizontalOffsetRatio: 0.03, + verticalOffsetRatio: -0.4, + symbolCountToWaitFor: 5 + ) + case .eyeLeft: + SymbolArtElement( + symbol: "􀋮", + name: "eye.fill", + initialPosition: .third(.seventh), + primaryColor: .white, + widthRatio: 0.04, + heightRatio: 0.02, + horizontalOffsetRatio: -0.03, + verticalOffsetRatio: -0.4, + symbolCountToWaitFor: 5 + ) + case .mouthTop: + SymbolArtElement( + symbol: "􀦪", + name: "mouth.fill", + initialPosition: .third(.third), + primaryColor: .red, + widthRatio: 0.06, + heightRatio: 0.02, + verticalOffsetRatio: -0.32, + symbolCountToWaitFor: 6 + ) + case .mouthBottom: + SymbolArtElement( + symbol: "􀦪", + name: "mouth.fill", + initialPosition: .third(.third), + primaryColor: .red, + widthRatio: 0.06, + heightRatio: 0.02, + verticalOffsetRatio: -0.33, + symbolCountToWaitFor: 6 + ) + case .teethRight: + SymbolArtElement( + symbol: "􁒀", + name: "window.casement.closed", + initialSecondaryColor: .clear, + initialPosition: .third(.fourth), + primaryColor: .black, + secondaryColor: .white, + fontWeight: .ultraLight, + widthRatio: 0.015, + heightRatio: 0.029, + rotationDegrees: 90, + horizontalOffsetRatio: 0.013, + verticalOffsetRatio: -0.328, + symbolCountToWaitFor: 7 + ) + case .teethLeft: + SymbolArtElement( + symbol: "􁒀", + name: "window.casement.closed", + initialSecondaryColor: .clear, + initialPosition: .third(.fourth), + primaryColor: .black, + secondaryColor: .white, + fontWeight: .ultraLight, + widthRatio: 0.015, + heightRatio: 0.029, + rotationDegrees: 90, + horizontalOffsetRatio: -0.014, + verticalOffsetRatio: -0.328, + symbolCountToWaitFor: 7 + ) + case .hairTop: + SymbolArtElement( + symbol: "􀲟", + name: "oval.fill", + initialPosition: .third(.fifth), + primaryColor: .black, + fontWeight: .ultraLight, + widthRatio: 0.14, + heightRatio: 0.057, + horizontalOffsetRatio: -0.001, + verticalOffsetRatio: -0.49, + symbolCountToWaitFor: 8 + ) + case .hairRight: + SymbolArtElement( + symbol: "􀠒", + name: "drop.fill", + initialPosition: .third(.sixth), + primaryColor: .black, + fontWeight: .ultraLight, + widthRatio: 0.05, + heightRatio: 0.06, + rotationDegrees: -65, + horizontalOffsetRatio: 0.04, + verticalOffsetRatio: -0.48, + symbolCountToWaitFor: 9 + ) + case .hairLeft: + SymbolArtElement( + symbol: "􀠒", + name: "drop.fill", + initialPosition: .third(.sixth), + primaryColor: .black, + fontWeight: .ultraLight, + widthRatio: 0.05, + heightRatio: 0.1, + rotationDegrees: 95, + horizontalOffsetRatio: -0.03, + verticalOffsetRatio: -0.47, + symbolCountToWaitFor: 9 + ) + } + } + + var isMusic: Bool { + switch self { + case .musicFirst, .musicSecond: + true + default: + false + } + } + } +} + +#Preview { + NavigationStack { + ImWearingPantsArtView() + .environment(ArtWorkModel.preview) + } +} + +#Preview { + ImWearingPantsPreviewView() + .environment(ArtWorkModel.preview) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+FinishPoseElement.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+FinishPoseElement.swift new file mode 100644 index 0000000..1574cbb --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+FinishPoseElement.swift @@ -0,0 +1,368 @@ +// +// ImWearingPantsArtView+FinishPoseElement.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension ImWearingPantsArtView { + + enum FinishPoseElement: String, CaseIterable, Identifiable { + case body + case chestShadowRight + case chestShadowLeft + case handConcealmentRight + case handConcealmentLeft + case neck + case neckShapingConcealmentRight + case neckShapingConcealmentLeft + case chestRight + case chestLeft + case armRight + case armLeft + case pants + case pantsHoleConcealment + case pantsPatternFirst + case pantsPatternSecond + case pantsPatternThird + case pantsPatternFourth + case pantsConcealmentRight + case pantsConcealmentLeft + case abdomen + case bellyButton + case nippleRight + case nippleLeft + + var id: String { rawValue } + + var value: SymbolArtElement { + switch self { + case .body: + SymbolArtElement( + symbol: "􁗅", + name: "figure.arms.open", + initialPosition: .none, + primaryColor: .yellow, + widthRatio: 0.6, + heightRatio: 1, + symbolCountToWaitFor: 0 + ) + case .chestShadowRight: + SymbolArtElement( + symbol: "􀆹", + name: "moon", + initialPosition: .none, + primaryColor: .black.opacity(0.6), + fontWeight: .ultraLight, + widthRatio: 0.06, + heightRatio: 0.015, + rotationDegrees: -10, + horizontalOffsetRatio: -0.09, + verticalOffsetRatio: -0.125, + symbolCountToWaitFor: 0 + ) + case .chestShadowLeft: + SymbolArtElement( + symbol: "􀆹", + name: "moon", + initialPosition: .none, + primaryColor: .black.opacity(0.6), + fontWeight: .ultraLight, + widthRatio: 0.06, + heightRatio: 0.015, + rotationDegrees: -10, + flip: .horizontal, + horizontalOffsetRatio: 0.085, + verticalOffsetRatio: -0.125, + symbolCountToWaitFor: 0 + ) + case .handConcealmentRight: + SymbolArtElement( + symbol: "􀏄", + name: "rectangle.fill", + initialPosition: .none, + primaryColor: .systemBackground, + fontWeight: .black, + widthRatio: 0.3, + heightRatio: 0.4, + horizontalOffsetRatio: -0.25, + verticalOffsetRatio: -0.1, + symbolCountToWaitFor: 0 + ) + case .handConcealmentLeft: + SymbolArtElement( + symbol: "􀏄", + name: "rectangle.fill", + initialPosition: .none, + primaryColor: .systemBackground, + fontWeight: .black, + widthRatio: 0.3, + heightRatio: 0.4, + horizontalOffsetRatio: 0.25, + verticalOffsetRatio: -0.1, + symbolCountToWaitFor: 0 + ) + case .neck: + SymbolArtElement( + symbol: "􀊡", + name: "speaker.fill", + initialPosition: .none, + primaryColor: .yellow, + widthRatio: 0.2, + heightRatio: 0.38, + rotationDegrees: 90, + horizontalOffsetRatio: -0.005, + verticalOffsetRatio: -0.27, + symbolCountToWaitFor: 0 + ) + case .neckShapingConcealmentRight: + SymbolArtElement( + symbol: "􀂓", + name: "square.fill", + initialPosition: .none, + primaryColor: .systemBackground, + widthRatio: 0.2, + heightRatio: 0.2, + rotationDegrees: 90, + horizontalOffsetRatio: 0.14, + verticalOffsetRatio: -0.385, + symbolCountToWaitFor: 0 + ) + case .neckShapingConcealmentLeft: + SymbolArtElement( + symbol: "􀂓", + name: "square.fill", + initialPosition: .none, + primaryColor: .systemBackground, + widthRatio: 0.2, + heightRatio: 0.2, + rotationDegrees: 90, + horizontalOffsetRatio: -0.14, + verticalOffsetRatio: -0.385, + symbolCountToWaitFor: 0 + ) + case .chestRight: + SymbolArtElement( + symbol: "􀆺", + name: "moon.fill", + initialPosition: .none, + primaryColor: .yellow, + widthRatio: 0.06, + heightRatio: 0.04, + rotationDegrees: -10, + horizontalOffsetRatio: -0.09, + verticalOffsetRatio: -0.138, + symbolCountToWaitFor: 0 + ) + case .chestLeft: + SymbolArtElement( + symbol: "􀆺", + name: "moon.fill", + initialPosition: .none, + primaryColor: .yellow, + widthRatio: 0.06, + heightRatio: 0.04, + rotationDegrees: -10, + flip: .horizontal, + horizontalOffsetRatio: 0.085, + verticalOffsetRatio: -0.138, + symbolCountToWaitFor: 0 + ) + case .armRight: + SymbolArtElement( + symbol: "􀆊", + name: "chevron.right", + initialPosition: .none, + primaryColor: .yellow, + fontWeight: .black, + widthRatio: 0.2, + heightRatio: 0.3, + horizontalOffsetRatio: 0.2, + verticalOffsetRatio: -0.08, + symbolCountToWaitFor: 0 + ) + case .armLeft: + SymbolArtElement( + symbol: "􀆉", + name: "chevron.left", + initialPosition: .none, + primaryColor: .yellow, + fontWeight: .black, + widthRatio: 0.2, + heightRatio: 0.3, + horizontalOffsetRatio: -0.2, + verticalOffsetRatio: -0.08, + symbolCountToWaitFor: 0 + ) + // UnderLayer + case .pants: + SymbolArtElement( + symbol: "􁉨", + name: "parkingsign.steeringwheel", + initialPosition: .third(.first), + primaryColor: .palePink, + fontWeight: .ultraLight, + widthRatio: 0.35, + heightRatio: 0.2, + horizontalOffsetRatio: -0.07, + verticalOffsetRatio: 0.03, + symbolCountToWaitFor: 16 + ) + case .pantsHoleConcealment: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .none, + primaryColor: .palePink, + widthRatio: 0.06, + heightRatio: 0.06, + horizontalOffsetRatio: -0.01, + verticalOffsetRatio: 0.04, + symbolCountToWaitFor: 0 + ) + case .pantsPatternFirst: + SymbolArtElement( + symbol: "􁁌", + name: "fan.fill", + initialPosition: .none, + primaryColor: .white, + widthRatio: 0.04, + heightRatio: 0.04, + horizontalOffsetRatio: -0.01, + verticalOffsetRatio: 0.04, + symbolCountToWaitFor: 0 + ) + case .pantsPatternSecond: + SymbolArtElement( + symbol: "􁁌", + name: "fan.fill", + initialPosition: .none, + primaryColor: .white, + widthRatio: 0.04, + heightRatio: 0.04, + horizontalOffsetRatio: -0.08, + verticalOffsetRatio: 0.02, + symbolCountToWaitFor: 0 + ) + case .pantsPatternThird: + SymbolArtElement( + symbol: "􁁌", + name: "fan.fill", + initialPosition: .none, + primaryColor: .white, + widthRatio: 0.04, + heightRatio: 0.04, + horizontalOffsetRatio: 0.08, + verticalOffsetRatio: 0.02, + symbolCountToWaitFor: 0 + ) + case .pantsPatternFourth: + SymbolArtElement( + symbol: "􁁌", + name: "fan.fill", + initialPosition: .none, + primaryColor: .white, + widthRatio: 0.04, + heightRatio: 0.04, + verticalOffsetRatio: 0.099, + symbolCountToWaitFor: 0 + ) + case .pantsConcealmentRight: + SymbolArtElement( + symbol: "􀲟", + name: "oval.fill", + initialPosition: .none, + primaryColor: .yellow, + widthRatio: 0.11, + heightRatio: 0.03, + rotationDegrees: 45, + horizontalOffsetRatio: -0.07, + verticalOffsetRatio: 0.09, + symbolCountToWaitFor: 0 + ) + case .pantsConcealmentLeft: + SymbolArtElement( + symbol: "􀲟", + name: "oval.fill", + initialPosition: .none, + primaryColor: .yellow, + widthRatio: 0.11, + heightRatio: 0.03, + rotationDegrees: -47, + horizontalOffsetRatio: 0.06, + verticalOffsetRatio: 0.089, + symbolCountToWaitFor: 0 + ) + case .abdomen: + SymbolArtElement( + symbol: "􁎘", + name: "visionpro.fill", + initialPosition: .none, + primaryColor: .yellow, + fontWeight: .ultraLight, + widthRatio: 0.25, + heightRatio: 0.15, + rotationDegrees: 180, + verticalOffsetRatio: -0.045, + symbolCountToWaitFor: 0 + ) + case .bellyButton: + SymbolArtElement( + symbol: "􀥤", + name: "poweron", + initialPosition: .none, + primaryColor: .black, + fontWeight: .ultraLight, + widthRatio: 0.02, + heightRatio: 0.002, + rotationDegrees: 180, + symbolCountToWaitFor: 0 + ) + case .nippleRight: + SymbolArtElement( + symbol: "􀕩", + name: "smallcircle.filled.circle.fill", + initialPosition: .none, + primaryColor: .yellow, + secondaryColor: .brown, + fontWeight: .ultraLight, + widthRatio: 0.02, + heightRatio: 0.01, + rotationDegrees: 15, + horizontalOffsetRatio: 0.09, + verticalOffsetRatio: -0.138, + symbolCountToWaitFor: 0 + ) + case .nippleLeft: + SymbolArtElement( + symbol: "􀕩", + name: "smallcircle.filled.circle.fill", + initialPosition: .none, + primaryColor: .yellow, + secondaryColor: .brown, + fontWeight: .ultraLight, + widthRatio: 0.02, + heightRatio: 0.01, + rotationDegrees: -15, + horizontalOffsetRatio: -0.09, + verticalOffsetRatio: -0.14, + symbolCountToWaitFor: 0 + ) + } + } + } +} + +#Preview { + NavigationStack { + ImWearingPantsArtView() + .environment(ArtWorkModel.preview) + } +} + +#Preview { + ImWearingPantsPreviewView() + .environment(ArtWorkModel.preview) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+Pose.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+Pose.swift new file mode 100644 index 0000000..9903937 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+Pose.swift @@ -0,0 +1,100 @@ +// +// ImWearingPantsArtView+Pose.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension ImWearingPantsArtView { + + enum Pose: String { + case walk = "figure.walk" + case discSport = "figure.disc.sports" + case martialArts = "figure.martial.arts" + case strengthTraining = "figure.strengthtraining.traditional" + case football = "figure.australian.football" + case intervalTraining = "figure.highintensity.intervaltraining" + case finish = "" + + var element: SymbolArtElement { + SymbolArtElement( + symbol: symbol, + name: rawValue, + initialPosition: .third(.second), + primaryColor: .yellow, + widthRatio: 0.6, + heightRatio: 1, + symbolCountToWaitFor: 10 + ) + } + + var symbol: String { + switch self { + case .walk: + "􀝢" + case .discSport: + "􁔣" + case .martialArts: + "􁔳" + case .strengthTraining: + "􁐃" + case .football: + "􁒒" + case .intervalTraining: + "􁌎" + case .finish: + "" + } + } + + var next: Pose { + switch self { + case .walk: + .discSport + case .discSport: + .martialArts + case .martialArts: + .strengthTraining + case .strengthTraining: + .football + case .football: + .intervalTraining + case .intervalTraining: + .finish + case .finish: + .finish + } + } + + var isFinished: Bool { + self == .finish + } + + var offsetXRatio: CGFloat { + switch self { + case .walk, .discSport, .strengthTraining, .finish: + 0 + case .martialArts: + 0.04 + case .football: + -0.1 + case .intervalTraining: + -0.01 + } + } + } +} + +#Preview { + NavigationStack { + ImWearingPantsArtView() + .environment(ArtWorkModel.preview) + } +} + +#Preview { + ImWearingPantsPreviewView() + .environment(ArtWorkModel.preview) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift index aaa690c..d07557f 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift @@ -9,48 +9,6 @@ import SwiftUI struct ImWearingPantsArtView: View { - enum Pose: String { - case walk = "figure.walk" - case discSport = "figure.disc.sports" - case martialArts = "figure.martial.arts" - case strengthTraining = "figure.strengthtraining.traditional" - case football = "figure.australian.football" - case intervalTraining = "figure.highintensity.intervaltraining" - case finish = "" - - var next: Pose { - switch self { - case .walk: - .discSport - case .discSport: - .martialArts - case .martialArts: - .strengthTraining - case .strengthTraining: - .football - case .football: - .intervalTraining - case .intervalTraining: - .finish - case .finish: - .finish - } - } - - var offsetXRatio: CGFloat { - switch self { - case .walk, .discSport, .strengthTraining, .finish: - 0 - case .martialArts: - 0.04 - case .football: - -0.1 - case .intervalTraining: - -0.01 - } - } - } - @Environment(ArtWorkModel.self) var model @State private var isAnimating = false @State private var isChangingPose = false @@ -64,559 +22,24 @@ struct ImWearingPantsArtView: View { ZStack { // MARK: - Current pose - AnimatableSymbolView( - name: currentPose.rawValue, - initialPosition: .third(.second), - primaryColor: .yellow, - widthRatio: 0.6, - heightRatio: 1, - isAnimating: isAnimating, - symbolCountToWaitFor: 10 - ) - .contentTransition(isChangingPose ? .symbolEffect(.replace) : .identity) - .offset(x: model.calculatingProportionalValue(withRatio: currentPose.offsetXRatio)) - - // MARK: - 􁉨 Pants - AnimatableSymbolView( - name: "parkingsign.steeringwheel", - initialPosition: .third(.first), - primaryColor: .palePink, - fontWeight: .ultraLight, - widthRatio: 0.35, - heightRatio: 0.2, - horizontalOffsetRatio: -0.07, - verticalOffsetRatio: 0.03, - isAnimating: isAnimating, - symbolCountToWaitFor: 16 - ) - .zIndex(0.1) + AnimatableSymbolView(element: currentPose.element, isAnimating: isAnimating) + .contentTransition(isChangingPose ? .symbolEffect(.replace) : .identity) + .offset(x: model.calculatingProportionalValue(withRatio: currentPose.offsetXRatio)) - if currentPose == .finish { + ForEach(FinishPoseElement.allCases) { - Group { - - // MARK: - 􁗅 Pose - Image(systemName: "figure.arms.open") - .arrangeShape( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.6), - height: model.calculatingProportionalValue(withRatio: 1) - ) - - // MARK: - 􀆹 Chest shadow - Image(systemName: "moon") - .arrangeShape( - primaryColor: .black.opacity(0.6), - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.06), - height: model.calculatingProportionalValue(withRatio: 0.015), - rotationDegrees: -10, - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.09), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.125) - ) - - Image(systemName: "moon") - .arrangeShape( - primaryColor: .black.opacity(0.6), - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.06), - height: model.calculatingProportionalValue(withRatio: 0.015), - rotationDegrees: -10, - flip: .horizontal, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.085), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.125) - ) - - // MARK: - 􀏄 Parts for shaping - Image(systemName: "rectangle.fill") - .arrangeShape( - primaryColor: .systemBackground, - fontWeight: .black, - width: model.calculatingProportionalValue(withRatio: 0.3), - height: model.calculatingProportionalValue(withRatio: 0.4), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.25), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.1) - ) - - Image(systemName: "rectangle.fill") - .arrangeShape( - primaryColor: .systemBackground, - fontWeight: .black, - width: model.calculatingProportionalValue(withRatio: 0.3), - height: model.calculatingProportionalValue(withRatio: 0.4), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.25), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.1) - ) - - // MARK: - 􀊡 Neck - Image(systemName: "speaker.fill") - .arrangeShape( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.2), - height: model.calculatingProportionalValue(withRatio: 0.38), - rotationDegrees: 90, - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.005), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.27) - ) - - // MARK: - 􀂓 Parts for shaping - Image(systemName: "square.fill") - .arrangeShape( - primaryColor: .systemBackground, - width: model.calculatingProportionalValue(withRatio: 0.2), - height: model.calculatingProportionalValue(withRatio: 0.2), - rotationDegrees: 90, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.14), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.385) - ) - - Image(systemName: "square.fill") - .arrangeShape( - primaryColor: .systemBackground, - width: model.calculatingProportionalValue(withRatio: 0.2), - height: model.calculatingProportionalValue(withRatio: 0.2), - rotationDegrees: 90, - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.14), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.385) - ) - - // MARK: - 􀆺 Chest - Image(systemName: "moon.fill") - .arrangeShape( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.06), - height: model.calculatingProportionalValue(withRatio: 0.04), - rotationDegrees: -10, - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.09), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.138) - ) - - Image(systemName: "moon.fill") - .arrangeShape( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.06), - height: model.calculatingProportionalValue(withRatio: 0.04), - rotationDegrees: -10, - flip: .horizontal, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.085), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.138) - ) - - // MARK: - 􀆉 Left arm - Image(systemName: "chevron.left") - .arrangeShape( - primaryColor: .yellow, - fontWeight: .black, - width: model.calculatingProportionalValue(withRatio: 0.2), - height: model.calculatingProportionalValue(withRatio: 0.3), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.2), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.08) - ) - - // MARK: - 􀆊 Right artm - Image(systemName: "chevron.right") - .arrangeShape( - primaryColor: .yellow, - fontWeight: .black, - width: model.calculatingProportionalValue(withRatio: 0.2), - height: model.calculatingProportionalValue(withRatio: 0.3), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.08) - ) + if $0 == .pants { + AnimatableSymbolView(element: $0.value, isAnimating: isAnimating) + } else if currentPose.isFinished { + SymbolArtPreviewView(forPreview: false, element: $0.value) + .transition(.symbolEffect(.appear)) } - .transition(.symbolEffect(.appear)) - - Group { - // MARK: - 􀀁 Pant center hole cover - Image(systemName: "circle.fill") - .arrangeShape( - primaryColor: .palePink, - width: model.calculatingProportionalValue(withRatio: 0.06), - height: model.calculatingProportionalValue(withRatio: 0.06), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.01), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.04) - ) - - // MARK: - 􁁌 Patterns on pants - Image(systemName: "fan.fill") - .arrangeShape( - primaryColor: .white, - width: model.calculatingProportionalValue(withRatio: 0.04), - height: model.calculatingProportionalValue(withRatio: 0.04), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.01), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.04) - ) - - Image(systemName: "fan.fill") - .arrangeShape( - primaryColor: .white, - width: model.calculatingProportionalValue(withRatio: 0.04), - height: model.calculatingProportionalValue(withRatio: 0.04), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.08), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.02) - ) - - Image(systemName: "fan.fill") - .arrangeShape( - primaryColor: .white, - width: model.calculatingProportionalValue(withRatio: 0.04), - height: model.calculatingProportionalValue(withRatio: 0.04), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.08), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.02) - ) - - Image(systemName: "fan.fill") - .arrangeShape( - primaryColor: .white, - width: model.calculatingProportionalValue(withRatio: 0.04), - height: model.calculatingProportionalValue(withRatio: 0.04), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.099) - ) - - // MARK: - 􀲟 Concealing part for pants - Image(systemName: "oval.fill") - .arrangeShape( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.11), - height: model.calculatingProportionalValue(withRatio: 0.03), - rotationDegrees: 45, - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.07), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.09) - ) - - Image(systemName: "oval.fill") - .arrangeShape( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.11), - height: model.calculatingProportionalValue(withRatio: 0.03), - rotationDegrees: -47, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.06), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.089) - ) - - // MARK: - 􁎘 Abdomen - Image(systemName: "visionpro.fill") - .arrangeShape( - primaryColor: .yellow, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.25), - height: model.calculatingProportionalValue(withRatio: 0.15), - rotationDegrees: 180, - verticalOffset: model.calculatingProportionalValue(withRatio: -0.045) - ) - - // MARK: - 􀥤 Belly button - Image(systemName: "poweron") - .arrangeShape( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.02), - height: model.calculatingProportionalValue(withRatio: 0.002), - rotationDegrees: 180 - ) - - // MARK: - 􀕩 Niple - Image(systemName: "smallcircle.filled.circle.fill") - .arrangeShape( - primaryColor: .yellow, - secondaryColor: .brown, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.02), - height: model.calculatingProportionalValue(withRatio: 0.01), - rotationDegrees: 15, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.09), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.138) - ) - - Image(systemName: "smallcircle.filled.circle.fill") - .arrangeShape( - primaryColor: .yellow, - secondaryColor: .brown, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.02), - height: model.calculatingProportionalValue(withRatio: 0.01), - rotationDegrees: -15, - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.09), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.14) - ) - } - .zIndex(0.2) - .transition(.symbolEffect(.appear)) } - // MARK: - 􀑪 Music - AnimatableSymbolView( - name: "music.note", - initialPosition: .second(.first), - widthRatio: 0.1, - heightRatio: 0.15, - horizontalOffsetRatio: 0.35, - verticalOffsetRatio: -0.5, - isAnimating: isAnimating, - symbolCountToWaitFor: 0 - ) - .symbolEffect(.bounce, value: musicCount) - - // MARK: - 􀫀 Music 3 - AnimatableSymbolView( - name: "music.quarternote.3", - initialPosition: .second(.second), - widthRatio: 0.2, - heightRatio: 0.15, - horizontalOffsetRatio: -0.34, - verticalOffsetRatio: -0.38, - isAnimating: isAnimating, - symbolCountToWaitFor: 1 - ) - .symbolEffect(.bounce, value: musicCount) - - // MARK: - 􀀁 Face background - AnimatableSymbolView( - name: "circle.fill", - initialPosition: .second(.third), - primaryColor: .systemBackground, - widthRatio: 0.2, - heightRatio: 0.2, - verticalOffsetRatio: -0.4, - isAnimating: isAnimating, - symbolCountToWaitFor: 2 - ) - - // MARK: - 􀧷 Contour - AnimatableSymbolView( - name: "capsule.portrait.fill", - initialPosition: .second(.fourth), - primaryColor: .yellow, - fontWeight: .ultraLight, - widthRatio: 0.16, - heightRatio: 0.22, - verticalOffsetRatio: -0.4, - isAnimating: isAnimating, - symbolCountToWaitFor: 2 - ) - - // MARK: - 􀧷 Contour bottom - AnimatableSymbolView( - name: "capsule.portrait.fill", - initialPosition: .second(.fourth), - primaryColor: .yellow, - widthRatio: 0.1, - heightRatio: 0.16, - verticalOffsetRatio: -0.35, - isAnimating: isAnimating, - symbolCountToWaitFor: 2 - ) - - // MARK: - 􀨯 nose - AnimatableSymbolView( - name: "nose", - initialPosition: .second(.fifth), - fontWeight: .ultraLight, - widthRatio: 0.045, - heightRatio: 0.06, - verticalOffsetRatio: -0.38, - isAnimating: isAnimating, - symbolCountToWaitFor: 3 - ) - - // MARK: - 􀦭 Right eyebrow - AnimatableSymbolView( - name: "eyebrow", - initialPosition: .second(.sixth), - fontWeight: .ultraLight, - widthRatio: 0.04, - heightRatio: 0.04, - horizontalOffsetRatio: 0.03, - verticalOffsetRatio: -0.41, - isAnimating: isAnimating, - symbolCountToWaitFor: 4 - ) - - // MARK: - 􀦭 Left eyebrow - AnimatableSymbolView( - name: "eyebrow", - initialPosition: .second(.sixth), - fontWeight: .ultraLight, - widthRatio: 0.045, - heightRatio: 0.04, - flip: .horizontal, - horizontalOffsetRatio: -0.03, - verticalOffsetRatio: -0.408, - isAnimating: isAnimating, - symbolCountToWaitFor: 4 - ) - - // MARK: - 􀧷 Concealing part for eyebrow - AnimatableSymbolView( - name: "capsule.portrait.fill", - initialPosition: .second(.fourth), - primaryColor: .yellow, - widthRatio: 0.05, - heightRatio: 0.02, - rotationDegrees: -10, - horizontalOffsetRatio: -0.035, - verticalOffsetRatio: -0.396, - isAnimating: isAnimating, - symbolCountToWaitFor: 5 - ) - - AnimatableSymbolView( - name: "capsule.portrait.fill", - initialPosition: .second(.fourth), - primaryColor: .yellow, - widthRatio: 0.05, - heightRatio: 0.02, - rotationDegrees: 10, - horizontalOffsetRatio: 0.035, - verticalOffsetRatio: -0.396, - isAnimating: isAnimating, - symbolCountToWaitFor: 5 - ) - - // MARK: - 􀋭 Right eye - AnimatableSymbolView( - name: "eye", - initialPosition: .second(.seventh), - fontWeight: .ultraLight, - widthRatio: 0.04, - heightRatio: 0.02, - horizontalOffsetRatio: 0.03, - verticalOffsetRatio: -0.4, - isAnimating: isAnimating, - symbolCountToWaitFor: 5 - ) - - // MARK: - 􀋭 Left eye - AnimatableSymbolView( - name: "eye", - initialPosition: .second(.seventh), - fontWeight: .ultraLight, - widthRatio: 0.04, - heightRatio: 0.02, - horizontalOffsetRatio: -0.03, - verticalOffsetRatio: -0.4, - isAnimating: isAnimating, - symbolCountToWaitFor: 5 - ) - - // MARK: - 􀋮 Right eye.fill - AnimatableSymbolView( - name: "eye.fill", - initialPosition: .third(.seventh), - primaryColor: .white, - widthRatio: 0.04, - heightRatio: 0.02, - horizontalOffsetRatio: 0.03, - verticalOffsetRatio: -0.4, - isAnimating: isAnimating, - symbolCountToWaitFor: 5 - ) - - // MARK: - 􀋮 Left eye.fill - AnimatableSymbolView( - name: "eye.fill", - initialPosition: .third(.seventh), - primaryColor: .white, - widthRatio: 0.04, - heightRatio: 0.02, - horizontalOffsetRatio: -0.03, - verticalOffsetRatio: -0.4, - isAnimating: isAnimating, - symbolCountToWaitFor: 5 - ) - - // MARK: - 􀦪 Mouth - AnimatableSymbolView( - name: "mouth.fill", - initialPosition: .third(.third), - primaryColor: .red, - widthRatio: 0.06, - heightRatio: 0.02, - verticalOffsetRatio: -0.32, - isAnimating: isAnimating, - symbolCountToWaitFor: 6 - ) - - AnimatableSymbolView( - name: "mouth.fill", - initialPosition: .third(.third), - primaryColor: .red, - widthRatio: 0.06, - heightRatio: 0.02, - verticalOffsetRatio: -0.33, - isAnimating: isAnimating, - symbolCountToWaitFor: 6 - ) - - // MARK: - 􁒀 Teeth - AnimatableSymbolView( - name: "window.casement.closed", - initialSecondaryColor: .clear, - initialPosition: .third(.fourth), - secondaryColor: .white, - fontWeight: .ultraLight, - widthRatio: 0.015, - heightRatio: 0.029, - rotationDegrees: 90, - horizontalOffsetRatio: 0.013, - verticalOffsetRatio: -0.328, - isAnimating: isAnimating, - symbolCountToWaitFor: 7 - ) - - AnimatableSymbolView( - name: "window.casement.closed", - initialSecondaryColor: .clear, - initialPosition: .third(.fourth), - secondaryColor: .white, - fontWeight: .ultraLight, - widthRatio: 0.015, - heightRatio: 0.029, - rotationDegrees: 90, - horizontalOffsetRatio: -0.014, - verticalOffsetRatio: -0.328, - isAnimating: isAnimating, - symbolCountToWaitFor: 7 - ) - - // MARK: - 􀲟 Hair - AnimatableSymbolView( - name: "oval.fill", - initialPosition: .third(.fifth), - fontWeight: .ultraLight, - widthRatio: 0.14, - heightRatio: 0.057, - horizontalOffsetRatio: -0.001, - verticalOffsetRatio: -0.49, - isAnimating: isAnimating, - symbolCountToWaitFor: 8 - ) - - // MARK: - 􀠒 Hair - AnimatableSymbolView( - name: "drop.fill", - initialPosition: .third(.sixth), - fontWeight: .ultraLight, - widthRatio: 0.05, - heightRatio: 0.06, - rotationDegrees: -65, - horizontalOffsetRatio: 0.04, - verticalOffsetRatio: -0.48, - isAnimating: isAnimating, - symbolCountToWaitFor: 9 - ) - - AnimatableSymbolView( - name: "drop.fill", - initialPosition: .third(.sixth), - fontWeight: .ultraLight, - widthRatio: 0.05, - heightRatio: 0.1, - rotationDegrees: 95, - horizontalOffsetRatio: -0.03, - verticalOffsetRatio: -0.47, - isAnimating: isAnimating, - symbolCountToWaitFor: 9 - ) + ForEach(FaceElement.allCases) { + AnimatableSymbolView(element: $0.value, isAnimating: isAnimating) + .symbolEffect(.bounce, value: $0.isMusic ? musicCount : 0) + } } .navigationTitle("I'm wearing pants") .navigationBarTitleDisplayMode(.inline) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift index 61d1255..644fa7f 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift @@ -8,454 +8,16 @@ import SwiftUI struct ImWearingPantsPreviewView: View { - - @Environment(ArtWorkModel.self) var model - - var body: some View { + var body: some View { ZStack { + ForEach(ImWearingPantsArtView.FinishPoseElement.allCases) { + SymbolArtPreviewView(element: $0.value) + } - // MARK: - 􀑪 Music - Image(systemName: "music.note") - .resizable() - .foregroundStyle(.black) - .frame(width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.35, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.5, forPreview: true)) - - // MARK: - 􀫀 Music 3 - Image(systemName: "music.quarternote.3") - .resizable() - .foregroundStyle(.black) - .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.34, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.38, forPreview: true)) - - // MARK: - 􁗅 Pose - Image(systemName: "figure.arms.open") - .resizable() - .foregroundStyle(.yellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.6, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 1, forPreview: true)) - - // MARK: - 􀆹 Chest shadow - Image(systemName: "moon") - .arrangeShape( - primaryColor: .black.opacity(0.6), - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.015, forPreview: true), - rotationDegrees: -10, - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.09, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.125, forPreview: true) - ) - - Image(systemName: "moon") - .arrangeShape( - primaryColor: .black.opacity(0.6), - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.015, forPreview: true), - rotationDegrees: -10, - flip: .horizontal, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.085, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.125, forPreview: true) - ) - - // MARK: - 􀏄 Parts for shaping - Image(systemName: "rectangle.fill") - .resizable() - .foregroundStyle(Color.systemBackground) - .fontWeight(.black) - .frame(width: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.25, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.1, forPreview: true)) - - Image(systemName: "rectangle.fill") - .resizable() - .foregroundStyle(Color.systemBackground) - .fontWeight(.black) - .frame(width: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.4, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.25, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.1, forPreview: true)) - - // MARK: - 􀊡 Neck - Image(systemName: "speaker.fill") - .resizable() - .foregroundStyle(.yellow) - .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.38, forPreview: true)) - .rotationEffect(.degrees(90)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.005, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.27, forPreview: true)) - - // MARK: - 􀂓 Parts for shaping - Image(systemName: "square.fill") - .resizable() - .foregroundStyle(Color.systemBackground) - .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.385, forPreview: true)) - - Image(systemName: "square.fill") - .resizable() - .foregroundStyle(Color.systemBackground) - .frame(width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true)) - .offset(x: model.calculatingProportionalValue(withRatio: -0.14, forPreview: true), - y: model.calculatingProportionalValue(withRatio: -0.385, forPreview: true)) - - // MARK: - 􀆺 Chest - Image(systemName: "moon.fill") - .arrangeShape( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - rotationDegrees: -10, - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.09, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.138, forPreview: true) - ) - - Image(systemName: "moon.fill") - .arrangeShape( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - rotationDegrees: -10, - flip: .horizontal, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.085, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.138, forPreview: true) - ) - - // MARK: - 􀆉 Left arm - Image(systemName: "chevron.left") - .arrangeShape( - primaryColor: .yellow, - fontWeight: .black, - width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.2, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true) - ) - - // MARK: - 􀆊 Right artm - Image(systemName: "chevron.right") - .arrangeShape( - primaryColor: .yellow, - fontWeight: .black, - width: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.3, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true) - ) - - // MARK: - 􁉨 Pants - Image(systemName: "parkingsign.steeringwheel") - .arrangeShape( - primaryColor: .palePink, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.35, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.2, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.07, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true) - ) - - // MARK: - 􀀁 Pant center hole cover - Image(systemName: "circle.fill") - .arrangeShape( - primaryColor: .palePink, - width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.01, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true) - ) - - // MARK: - 􁁌 Patterns on pants - Image(systemName: "fan.fill") - .arrangeShape( - primaryColor: .white, - width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.01, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true) - ) - - Image(systemName: "fan.fill") - .arrangeShape( - primaryColor: .white, - width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.08, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true) - ) - - Image(systemName: "fan.fill") - .arrangeShape( - primaryColor: .white, - width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.08, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true) - ) - - Image(systemName: "fan.fill") - .arrangeShape( - primaryColor: .white, - width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.099, forPreview: true) - ) - - // MARK: - 􀲟 Concealing part for pants - Image(systemName: "oval.fill") - .arrangeShape( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.11, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true), - rotationDegrees: 45, - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.07, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true) - ) - - Image(systemName: "oval.fill") - .arrangeShape( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.11, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true), - rotationDegrees: -47, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: 0.089, forPreview: true) - ) - - // MARK: - 􁎘 Abdomen - Image(systemName: "visionpro.fill") - .arrangeShape( - primaryColor: .yellow, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.25, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.15, forPreview: true), - rotationDegrees: 180, - verticalOffset: model.calculatingProportionalValue(withRatio: -0.045, forPreview: true) - ) - - // MARK: - 􀥤 Belly button - Image(systemName: "poweron") - .arrangeShape( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.002, forPreview: true), - rotationDegrees: 180 - ) - - // MARK: - 􀕩 Niple - Image(systemName: "smallcircle.filled.circle.fill") - .arrangeShape( - primaryColor: .yellow, - secondaryColor: .brown, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), - rotationDegrees: 15, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.09, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.138, forPreview: true) - ) - - Image(systemName: "smallcircle.filled.circle.fill") - .arrangeShape( - primaryColor: .yellow, - secondaryColor: .brown, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.01, forPreview: true), - rotationDegrees: -15, - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.09, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.14, forPreview: true) - ) - - // MARK: - 􀧷 Contour - Image(systemName: "capsule.portrait.fill") - .arrangeShape( - primaryColor: .yellow, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.16, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.22, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.4, forPreview: true) - ) - - Image(systemName: "capsule.portrait.fill") - .arrangeShape( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.16, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.35, forPreview: true) - ) - - // MARK: - 􀨯 Nose - Image(systemName: "nose") - .arrangeShape( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.045, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.38, forPreview: true) - ) - - // MARK: - 􀦭 Eyebrow - Image(systemName: "eyebrow") - .arrangeShape( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - rotationDegrees: 10, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.41, forPreview: true) - ) - - Image(systemName: "eyebrow") - .arrangeShape( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.045, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - flip: .horizontal, - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.408, forPreview: true) - ) - - // MARK: - 􀧷 Concealing part for eyebrow - Image(systemName: "capsule.portrait.fill") - .arrangeShape( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), - rotationDegrees: -10, - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.035, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.396, forPreview: true) - ) - - Image(systemName: "capsule.portrait.fill") - .arrangeShape( - primaryColor: .yellow, - width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), - rotationDegrees: 10, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.035, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.396, forPreview: true) - ) - - // MARK: - 􀋭 Eye frame - Image(systemName: "eye") - .arrangeShape( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.4, forPreview: true) - ) - - Image(systemName: "eye") - .arrangeShape( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.4, forPreview: true) - ) - - // MARK: - 􀋮 Eye - Image(systemName: "eye.fill") - .arrangeShape( - primaryColor: .white, - width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.03, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.4, forPreview: true) - ) - - Image(systemName: "eye.fill") - .arrangeShape( - primaryColor: .white, - width: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.4, forPreview: true) - ) - - // MARK: - 􀦪 Mouth - Image(systemName: "mouth.fill") - .arrangeShape( - primaryColor: .red, - width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.32, forPreview: true) - ) - - Image(systemName: "mouth.fill") - .arrangeShape( - primaryColor: .red, - width: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.02, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.33, forPreview: true) - ) - - // MARK: - 􁒀 Teeth - Image(systemName: "window.casement.closed") - .arrangeShape( - primaryColor: .black, - secondaryColor: .white, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.015, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.029, forPreview: true), - rotationDegrees: 90, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.013, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.328, forPreview: true) - ) - - Image(systemName: "window.casement.closed") - .arrangeShape( - primaryColor: .black, - secondaryColor: .white, - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.015, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.029, forPreview: true), - rotationDegrees: 90, - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.014, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.328, forPreview: true) - ) - - // MARK: - 􀲟 Hair - Image(systemName: "oval.fill") - .arrangeShape( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.14, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.057, forPreview: true), - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.001, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.49, forPreview: true) - ) - - // MARK: - 􀠒 Off-center part hair style - Image(systemName: "drop.fill") - .arrangeShape( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.06, forPreview: true), - rotationDegrees: -65, - horizontalOffset: model.calculatingProportionalValue(withRatio: 0.04, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.48, forPreview: true) - ) - - Image(systemName: "drop.fill") - .arrangeShape( - fontWeight: .ultraLight, - width: model.calculatingProportionalValue(withRatio: 0.05, forPreview: true), - height: model.calculatingProportionalValue(withRatio: 0.1, forPreview: true), - rotationDegrees: 95, - horizontalOffset: model.calculatingProportionalValue(withRatio: -0.03, forPreview: true), - verticalOffset: model.calculatingProportionalValue(withRatio: -0.47, forPreview: true) - ) + ForEach(ImWearingPantsArtView.FaceElement.allCases) { + SymbolArtPreviewView(element: $0.value) + } } } } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel+InitialSymbolRow.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel+InitialSymbolRow.swift index 020da5e..dcaea57 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel+InitialSymbolRow.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel+InitialSymbolRow.swift @@ -11,6 +11,7 @@ import SwiftUI extension ArtWorkModel { enum InitialSymbolRow { + case none case first(InitialSymbolColumn) case second(InitialSymbolColumn) case third(InitialSymbolColumn) @@ -46,6 +47,8 @@ extension ArtWorkModel { var offsetYRatio: CGFloat { switch self { + case .none: + 0 case .first: 0.63 case .second: diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel.swift index 426dce1..6d0a069 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel.swift @@ -44,6 +44,8 @@ class ArtWorkModel { func calculatingInitialOffsetX(forPosition symbolRow: InitialSymbolRow) -> CGFloat { let ratio: CGFloat switch symbolRow { + case .none: + ratio = 0 case let .first(symbolColumn): ratio = symbolColumn.offsetXRatio case let .second(symbolColumn): From ffdb54d0a5a789167873ccecb00fa337af48ddac Mon Sep 17 00:00:00 2001 From: littleossa Date: Fri, 9 Feb 2024 19:06:53 +0900 Subject: [PATCH 075/108] Fix AfroBoyArt --- .../ArtWorks/AfroBoy/AfroBoyArtView.swift | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift index 6702776..965ad47 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift @@ -14,18 +14,7 @@ struct AfroBoyArtView: View { var body: some View { ZStack { ForEach(Element.allCases) { - AnimatableSymbolView( - name: $0.value.name, - initialPosition: $0.value.initialPosition, - primaryColor: $0.value.primaryColor, - secondaryColor: $0.value.secondaryColor, - widthRatio: $0.value.widthRatio, - heightRatio: $0.value.heightRatio, - horizontalOffsetRatio: $0.value.horizontalOffsetRatio, - verticalOffsetRatio: $0.value.verticalOffsetRatio, - isAnimating: isAnimating, - symbolCountToWaitFor: $0.value.symbolCountToWaitFor - ) + AnimatableSymbolView(element: $0.value, isAnimating: isAnimating) } } .navigationTitle("Afro boy") From cc78ce5e92daa0eab39b68abd93fc0e613e81f02 Mon Sep 17 00:00:00 2001 From: littleossa Date: Fri, 9 Feb 2024 19:11:58 +0900 Subject: [PATCH 076/108] Rename to shouldResizeForCoverImage --- .../project.pbxproj | 8 +++---- .../ArtWorks/AfroBoy/AfroBoyPreviewView.swift | 2 +- .../CrayonBoy/CrayonBoyPreviewView.swift | 2 +- .../ImWearingPantsArtView.swift | 2 +- .../ImWearingPantsPreviewView.swift | 4 ++-- .../Magician/MagicianPreviewView.swift | 2 +- .../Nosebleed/NosebleedPreviewView.swift | 2 +- .../PartyAnimalsPreviewView.swift | 2 +- .../WorldPeace/WorldPeacePreviewView.swift | 2 +- ...wView.swift => SymbolArtDisplayView.swift} | 22 +++++++++---------- 10 files changed, 24 insertions(+), 24 deletions(-) rename SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/{SymbolArtPreviewView.swift => SymbolArtDisplayView.swift} (69%) diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 7dee390..c8e9773 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -34,7 +34,7 @@ 9767DF052B75AFE200457DA1 /* PartyAnimalsArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF042B75AFE200457DA1 /* PartyAnimalsArtView.swift */; }; 9767DF0B2B75D1A100457DA1 /* SymbolArtElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF0A2B75D1A100457DA1 /* SymbolArtElement.swift */; }; 9767DF0D2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF0C2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift */; }; - 9767DF0F2B75DFB400457DA1 /* SymbolArtPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF0E2B75DFB400457DA1 /* SymbolArtPreviewView.swift */; }; + 9767DF0F2B75DFB400457DA1 /* SymbolArtDisplayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF0E2B75DFB400457DA1 /* SymbolArtDisplayView.swift */; }; 9767DF112B75E8FC00457DA1 /* MagicianArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF102B75E8FC00457DA1 /* MagicianArtView+Element.swift */; }; 9767DF132B75EDB700457DA1 /* CrayonBoyArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF122B75EDB700457DA1 /* CrayonBoyArtView+Element.swift */; }; 9767DF152B75F7BE00457DA1 /* WorldPeaceArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF142B75F7BE00457DA1 /* WorldPeaceArtView+Element.swift */; }; @@ -101,7 +101,7 @@ 9767DF042B75AFE200457DA1 /* PartyAnimalsArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PartyAnimalsArtView.swift; sourceTree = ""; }; 9767DF0A2B75D1A100457DA1 /* SymbolArtElement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolArtElement.swift; sourceTree = ""; }; 9767DF0C2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AfroBoyArtView+Element.swift"; sourceTree = ""; }; - 9767DF0E2B75DFB400457DA1 /* SymbolArtPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolArtPreviewView.swift; sourceTree = ""; }; + 9767DF0E2B75DFB400457DA1 /* SymbolArtDisplayView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolArtDisplayView.swift; sourceTree = ""; }; 9767DF102B75E8FC00457DA1 /* MagicianArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MagicianArtView+Element.swift"; sourceTree = ""; }; 9767DF122B75EDB700457DA1 /* CrayonBoyArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CrayonBoyArtView+Element.swift"; sourceTree = ""; }; 9767DF142B75F7BE00457DA1 /* WorldPeaceArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorldPeaceArtView+Element.swift"; sourceTree = ""; }; @@ -355,7 +355,7 @@ isa = PBXGroup; children = ( 97AD53212B70E3FA0034FB5D /* AnimatableSymbolView.swift */, - 9767DF0E2B75DFB400457DA1 /* SymbolArtPreviewView.swift */, + 9767DF0E2B75DFB400457DA1 /* SymbolArtDisplayView.swift */, 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */, ); path = AnimatableSymbolView; @@ -600,7 +600,7 @@ 9748BE4A28995877006DF0BE /* DemonWrestlerOutline.swift in Sources */, 97EF43902B72D2E4003648F5 /* NosebleedPreviewView.swift in Sources */, 9767DF112B75E8FC00457DA1 /* MagicianArtView+Element.swift in Sources */, - 9767DF0F2B75DFB400457DA1 /* SymbolArtPreviewView.swift in Sources */, + 9767DF0F2B75DFB400457DA1 /* SymbolArtDisplayView.swift in Sources */, 9748BE4C28995A43006DF0BE /* DemonWrestlerBody.swift in Sources */, 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */, 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift index 3b8ac1d..055179e 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift @@ -12,7 +12,7 @@ struct AfroBoyPreviewView: View { var body: some View { ZStack { ForEach(AfroBoyArtView.Element.allCases) { - SymbolArtPreviewView(element: $0.value) + SymbolArtDisplayView(element: $0.value) } } } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyPreviewView.swift index edb1c85..4c2828b 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyPreviewView.swift @@ -12,7 +12,7 @@ struct CrayonBoyPreviewView: View { var body: some View { ZStack { ForEach(CrayonBoyArtView.Element.allCases) { - SymbolArtPreviewView(element: $0.value) + SymbolArtDisplayView(element: $0.value) } } } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift index d07557f..9c8aa7d 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift @@ -31,7 +31,7 @@ struct ImWearingPantsArtView: View { if $0 == .pants { AnimatableSymbolView(element: $0.value, isAnimating: isAnimating) } else if currentPose.isFinished { - SymbolArtPreviewView(forPreview: false, element: $0.value) + SymbolArtDisplayView(shouldResizeForCoverImage: false, element: $0.value) .transition(.symbolEffect(.appear)) } } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift index 644fa7f..e5a0a92 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift @@ -12,11 +12,11 @@ struct ImWearingPantsPreviewView: View { var body: some View { ZStack { ForEach(ImWearingPantsArtView.FinishPoseElement.allCases) { - SymbolArtPreviewView(element: $0.value) + SymbolArtDisplayView(element: $0.value) } ForEach(ImWearingPantsArtView.FaceElement.allCases) { - SymbolArtPreviewView(element: $0.value) + SymbolArtDisplayView(element: $0.value) } } } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianPreviewView.swift index 21c947f..9f8495a 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianPreviewView.swift @@ -12,7 +12,7 @@ struct MagicianPreviewView: View { var body: some View { ZStack { ForEach(MagicianArtView.Element.allCases) { - SymbolArtPreviewView(element: $0.value) + SymbolArtDisplayView(element: $0.value) } } } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedPreviewView.swift index c2f6cd4..7ea08ac 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedPreviewView.swift @@ -13,7 +13,7 @@ struct NosebleedArtPreviewView: View { ZStack { ForEach(NosebleedArtView.Element.allCases) { - SymbolArtPreviewView(element: $0.value) + SymbolArtDisplayView(element: $0.value) } } } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsPreviewView.swift index 46aa9fb..c985af3 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsPreviewView.swift @@ -12,7 +12,7 @@ struct PartyAnimalsPreviewView: View { var body: some View { ZStack { ForEach(PartyAnimalsArtView.Element.allCases) { - SymbolArtPreviewView(element: $0.value) + SymbolArtDisplayView(element: $0.value) } } } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeacePreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeacePreviewView.swift index e446d90..d4df211 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeacePreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeacePreviewView.swift @@ -13,7 +13,7 @@ struct WorldPeacePreviewView: View { ZStack { ForEach(WorldPeaceArtView.Element.allCases) { - SymbolArtPreviewView(element: $0.value) + SymbolArtDisplayView(element: $0.value) } } } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/SymbolArtPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/SymbolArtDisplayView.swift similarity index 69% rename from SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/SymbolArtPreviewView.swift rename to SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/SymbolArtDisplayView.swift index 08f74d1..eb1853e 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/SymbolArtPreviewView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/SymbolArtDisplayView.swift @@ -7,14 +7,14 @@ import SwiftUI -struct SymbolArtPreviewView: View { +struct SymbolArtDisplayView: View { @Environment(ArtWorkModel.self) var model - let forPreview: Bool + let shouldResizeForCoverImage: Bool let element: SymbolArtElement - init(forPreview: Bool = true, element: SymbolArtElement) { - self.forPreview = forPreview + init(shouldResizeForCoverImage: Bool = true, element: SymbolArtElement) { + self.shouldResizeForCoverImage = shouldResizeForCoverImage self.element = element } @@ -26,11 +26,11 @@ struct SymbolArtPreviewView: View { .frame( width: model.calculatingProportionalValue( withRatio: element.widthRatio, - forPreview: forPreview + forPreview: shouldResizeForCoverImage ), height: model.calculatingProportionalValue( withRatio: element.heightRatio, - forPreview: forPreview + forPreview: shouldResizeForCoverImage ) ) .rotationEffect(.degrees(element.rotationDegrees)) @@ -38,11 +38,11 @@ struct SymbolArtPreviewView: View { .offset( x: model.calculatingProportionalValue( withRatio: element.horizontalOffsetRatio, - forPreview: forPreview + forPreview: shouldResizeForCoverImage ), y: model.calculatingProportionalValue( withRatio: element.verticalOffsetRatio, - forPreview: forPreview + forPreview: shouldResizeForCoverImage ) ) .zIndex(element.zIndex) @@ -51,10 +51,10 @@ struct SymbolArtPreviewView: View { #Preview { VStack { - SymbolArtPreviewView(element: AfroBoyArtView.Element.face.value) + SymbolArtDisplayView(element: AfroBoyArtView.Element.face.value) - SymbolArtPreviewView( - forPreview: false, + SymbolArtDisplayView( + shouldResizeForCoverImage: false, element: AfroBoyArtView.Element.face.value ) } From 4a54f0ae55ef396dfeaa285e902662784a62fcd0 Mon Sep 17 00:00:00 2001 From: littleossa Date: Sat, 10 Feb 2024 05:44:42 +0900 Subject: [PATCH 077/108] Refactor calculatingPortionalValue --- .../Common/Models/ArtWorkModel/ArtWorkModel.swift | 11 ++++++++--- .../AnimatableSymbolView/SymbolArtDisplayView.swift | 8 ++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel.swift index 6d0a069..f29dd53 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel.swift @@ -60,10 +60,15 @@ class ArtWorkModel { return calculatingProportionalValue(withRatio: symbolRow.offsetYRatio) } - /// The value calculated from baseLength using the given ratio. - func calculatingProportionalValue(withRatio ratio: CGFloat, forPreview isForPreview: Bool = false) -> CGFloat { + /// Calculates and returns the proportional value based on the provided ratio. + /// + /// - Parameters: + /// - ratio: The ratio used for calculation. + /// - shouldResizeForCoverImage: A Boolean value indicating whether the value should be adjusted for cover images. Default is false. + /// - Returns: The calculated proportional value. + func calculatingProportionalValue(withRatio ratio: CGFloat, shouldResizeForCoverImage: Bool = false) -> CGFloat { - if isForPreview { + if shouldResizeForCoverImage { return (galleryColumnLength - galleryColumnSpacing) * ratio } return baseLength * ratio diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/SymbolArtDisplayView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/SymbolArtDisplayView.swift index eb1853e..13bf7ac 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/SymbolArtDisplayView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/SymbolArtDisplayView.swift @@ -26,11 +26,11 @@ struct SymbolArtDisplayView: View { .frame( width: model.calculatingProportionalValue( withRatio: element.widthRatio, - forPreview: shouldResizeForCoverImage + shouldResizeForCoverImage: shouldResizeForCoverImage ), height: model.calculatingProportionalValue( withRatio: element.heightRatio, - forPreview: shouldResizeForCoverImage + shouldResizeForCoverImage: shouldResizeForCoverImage ) ) .rotationEffect(.degrees(element.rotationDegrees)) @@ -38,11 +38,11 @@ struct SymbolArtDisplayView: View { .offset( x: model.calculatingProportionalValue( withRatio: element.horizontalOffsetRatio, - forPreview: shouldResizeForCoverImage + shouldResizeForCoverImage: shouldResizeForCoverImage ), y: model.calculatingProportionalValue( withRatio: element.verticalOffsetRatio, - forPreview: shouldResizeForCoverImage + shouldResizeForCoverImage: shouldResizeForCoverImage ) ) .zIndex(element.zIndex) From 2ec57487f8d5419eca5b86466049c0c266727700 Mon Sep 17 00:00:00 2001 From: littleossa Date: Sat, 10 Feb 2024 07:33:08 +0900 Subject: [PATCH 078/108] Add ArmHairArt --- .../project.pbxproj | 20 ++ .../ArtGalleryView.swift | 7 + .../ArmHair/ArmHairArtView+CoverArt.swift | 49 +++++ .../ArmHair/ArmHairArtView+Element.swift | 118 ++++++++++++ .../ArtWorks/ArmHair/ArmHairArtView.swift | 173 ++++++++++++++++++ 5 files changed, 367 insertions(+) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView+CoverArt.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView+Element.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index c8e9773..125c7b0 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -43,6 +43,9 @@ 9767DF1B2B762DA000457DA1 /* ImWearingPantsArtView+FinishPoseElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF1A2B762DA000457DA1 /* ImWearingPantsArtView+FinishPoseElement.swift */; }; 9767DF1D2B762E1200457DA1 /* ImWearingPantsArtView+Pose.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF1C2B762E1200457DA1 /* ImWearingPantsArtView+Pose.swift */; }; 9767DF1F2B762E9000457DA1 /* ImWearingPantsArtView+FaceElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF1E2B762E9000457DA1 /* ImWearingPantsArtView+FaceElement.swift */; }; + 9767DF232B7658E200457DA1 /* ArmHairArtView+CoverArt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF222B7658E200457DA1 /* ArmHairArtView+CoverArt.swift */; }; + 9767DF252B76C9BE00457DA1 /* ArmHairArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF242B76C9BE00457DA1 /* ArmHairArtView.swift */; }; + 9767DF272B76CCE300457DA1 /* ArmHairArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF262B76CCE300457DA1 /* ArmHairArtView+Element.swift */; }; 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; @@ -110,6 +113,9 @@ 9767DF1A2B762DA000457DA1 /* ImWearingPantsArtView+FinishPoseElement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ImWearingPantsArtView+FinishPoseElement.swift"; sourceTree = ""; }; 9767DF1C2B762E1200457DA1 /* ImWearingPantsArtView+Pose.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ImWearingPantsArtView+Pose.swift"; sourceTree = ""; }; 9767DF1E2B762E9000457DA1 /* ImWearingPantsArtView+FaceElement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ImWearingPantsArtView+FaceElement.swift"; sourceTree = ""; }; + 9767DF222B7658E200457DA1 /* ArmHairArtView+CoverArt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ArmHairArtView+CoverArt.swift"; sourceTree = ""; }; + 9767DF242B76C9BE00457DA1 /* ArmHairArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArmHairArtView.swift; sourceTree = ""; }; + 9767DF262B76CCE300457DA1 /* ArmHairArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ArmHairArtView+Element.swift"; sourceTree = ""; }; 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; @@ -286,6 +292,16 @@ path = Element; sourceTree = ""; }; + 9767DF212B7658CB00457DA1 /* ArmHair */ = { + isa = PBXGroup; + children = ( + 9767DF242B76C9BE00457DA1 /* ArmHairArtView.swift */, + 9767DF262B76CCE300457DA1 /* ArmHairArtView+Element.swift */, + 9767DF222B7658E200457DA1 /* ArmHairArtView+CoverArt.swift */, + ); + path = ArmHair; + sourceTree = ""; + }; 97AD530D2B70DBC70034FB5D /* ArtisticWorldOfSFSymbols */ = { isa = PBXGroup; children = ( @@ -334,6 +350,7 @@ 97EF439F2B74CA22003648F5 /* CrayonBoy */, 9767DEF82B751C1300457DA1 /* WorldPeace */, 9767DF012B759AFC00457DA1 /* PartyAnimals */, + 9767DF212B7658CB00457DA1 /* ArmHair */, 97AD531E2B70E2770034FB5D /* AfroBoy */, 97EF43892B725DE7003648F5 /* Nosebleed */, 97EF43912B72D3AF003648F5 /* ImWearingPants */, @@ -574,6 +591,7 @@ 97AD53312B71A5130034FB5D /* GalleryGridView.swift in Sources */, 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */, 9748BE6628A395D5006DF0BE /* ArtWork.swift in Sources */, + 9767DF272B76CCE300457DA1 /* ArmHairArtView+Element.swift in Sources */, 97AD532B2B71068B0034FB5D /* AfroBoyArtView.swift in Sources */, 973B2CA128C2546C006ED5F0 /* ArrangeShapeWithFont.swift in Sources */, 9748BE3F2897AE68006DF0BE /* ArmHair.swift in Sources */, @@ -582,6 +600,7 @@ 97624C3328C4F43F004E1720 /* GeometryProxy+.swift in Sources */, 97EF43952B72DA69003648F5 /* ImWearingPantsArtView.swift in Sources */, 9748BE50289AB439006DF0BE /* DemonWrestlerHand.swift in Sources */, + 9767DF232B7658E200457DA1 /* ArmHairArtView+CoverArt.swift in Sources */, 9767DF1D2B762E1200457DA1 /* ImWearingPantsArtView+Pose.swift in Sources */, 97AD53292B7100670034FB5D /* ArtWorkModel.swift in Sources */, 97EF439C2B7421A7003648F5 /* MagicianPreviewView.swift in Sources */, @@ -601,6 +620,7 @@ 97EF43902B72D2E4003648F5 /* NosebleedPreviewView.swift in Sources */, 9767DF112B75E8FC00457DA1 /* MagicianArtView+Element.swift in Sources */, 9767DF0F2B75DFB400457DA1 /* SymbolArtDisplayView.swift in Sources */, + 9767DF252B76C9BE00457DA1 /* ArmHairArtView.swift in Sources */, 9748BE4C28995A43006DF0BE /* DemonWrestlerBody.swift in Sources */, 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */, 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift index f23624d..7edf627 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift @@ -68,6 +68,13 @@ struct ArtGalleryView: View { .galleryGridItemView(length: model.galleryColumnLength) } + NavigationLink { + ArmHairArtView() + } label: { + ArmHairArtView.CoverArt() + .galleryGridItemView(length: model.galleryColumnLength) + } + NavigationLink { AfroBoyArtView() } label: { diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView+CoverArt.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView+CoverArt.swift new file mode 100644 index 0000000..e7d3d4f --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView+CoverArt.swift @@ -0,0 +1,49 @@ +// +// ArmHairArtView+CoverArt.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension ArmHairArtView { + + struct CoverArt: View { + + @Environment(ArtWorkModel.self) var model + + var hairOffset: CGSize { + let lowestX = model.calculatingProportionalValue(withRatio: -0.14, shouldResizeForCoverImage: true) + let highestX = model.calculatingProportionalValue(withRatio: 0.246, shouldResizeForCoverImage: true) + let lowestY = model.calculatingProportionalValue(withRatio: -0.075, shouldResizeForCoverImage: true) + let highestY = model.calculatingProportionalValue(withRatio: 0.02, shouldResizeForCoverImage: true) + return CGSize( + width: CGFloat.random(in: lowestX...highestX), + height: CGFloat.random(in: lowestY...highestY) + ) + } + + var body: some View { + ZStack { + ForEach(Element.allCases) { + SymbolArtDisplayView(shouldResizeForCoverImage: true, element: $0.value) + } + + ForEach(0..<250) { _ in + Image(systemName: "alternatingcurrent") + .foregroundStyle(.black) + .font(.system(size: model.calculatingProportionalValue(withRatio: 0.0825, shouldResizeForCoverImage: true))) + .fontWeight(.thin) + .rotationEffect(.degrees(100)) + .offset(hairOffset) + } + } + } + } +} + +#Preview { + ArmHairArtView.CoverArt() + .environment(ArtWorkModel.preview) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView+Element.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView+Element.swift new file mode 100644 index 0000000..4ad1062 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView+Element.swift @@ -0,0 +1,118 @@ +// +// ArmHairArtView+Element.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension ArmHairArtView { + + enum Element: String, CaseIterable, Identifiable { + case armFrame + case arm + case handFirst + case handSecond + case handFrame + case handConcealment + + var id: String { rawValue } + + var value: SymbolArtElement { + switch self { + case .armFrame: + SymbolArtElement( + symbol: "􀏄", + name: "rectangle.fill", + initialPosition: .third(.first), + primaryColor: .paleOrange, + fontWeight: .light, + widthRatio: 0.5, + heightRatio: 0.125, + symbolCountToWaitFor: 1 + ) + case .arm: + SymbolArtElement( + symbol: "􀏃", + name: "rectangle", + initialPosition: .third(.second), + primaryColor: .black, + fontWeight: .ultraLight, + widthRatio: 0.54, + heightRatio: 0.13, + symbolCountToWaitFor: 0 + ) + + case .handFrame: + SymbolArtElement( + symbol: "􀉻", + name: "hand.raised", + initialPosition: .third(.fourth), + primaryColor: .black, + fontWeight: .ultraLight, + widthRatio: 0.225, + heightRatio: 0.225, + rotationDegrees: -90, + horizontalOffsetRatio: -0.24, + verticalOffsetRatio: -0.02, + symbolCountToWaitFor: 2 + ) + + case .handFirst: + SymbolArtElement( + symbol: "􀉼", + name: "hand.raised.fill", + initialPosition: .third(.third), + primaryColor: .paleOrange, + widthRatio: 0.21, + heightRatio: 0.225, + rotationDegrees: -90, + horizontalOffsetRatio: -0.24, + verticalOffsetRatio: -0.02, + symbolCountToWaitFor: 3 + ) + + case .handSecond: + SymbolArtElement( + symbol: "􀉼", + name: "hand.raised.fill", + initialPosition: .third(.third), + primaryColor: .paleOrange, + fontWeight: .black, + widthRatio: 0.188, + heightRatio: 0.225, + rotationDegrees: -90, + horizontalOffsetRatio: -0.236, + verticalOffsetRatio: -0.01, + symbolCountToWaitFor: 3 + ) + + case .handConcealment: + SymbolArtElement( + symbol: "􀏄", + name: "rectangle.fill", + initialPosition: .third(.first), + primaryColor: .paleOrange, + widthRatio: 0.1, + heightRatio: 0.12, + horizontalOffsetRatio: -0.14, + verticalOffsetRatio: -0.0, + symbolCountToWaitFor: 1 + ) + } + } + } +} + +#Preview { + NavigationStack { + ArmHairArtView() + .environment(ArtWorkModel.preview) + } +} + +#Preview { + ArmHairArtView.CoverArt() + .environment(ArtWorkModel.preview) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView.swift new file mode 100644 index 0000000..30bc1c5 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView.swift @@ -0,0 +1,173 @@ +// +// ArmHairArtView.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +struct ArmHairArtView: View { + + @Environment(ArtWorkModel.self) var model + @State private var isAnimating = false + + private let hairAnimationDuration = 3.0 + + var hairOffset: CGSize { + let lowestX = model.calculatingProportionalValue(withRatio: -0.14) + let highestX = model.calculatingProportionalValue(withRatio: 0.246) + let lowestY = model.calculatingProportionalValue(withRatio: -0.075) + let highestY = model.calculatingProportionalValue(withRatio: 0.02) + return CGSize( + width: CGFloat.random(in: lowestX...highestX), + height: CGFloat.random(in: lowestY...highestY) + ) + } + + var randomOffsetRatio: CGSize { + let range: ClosedRange = -0.45...0.45 + let offsetX = model.calculatingProportionalValue(withRatio: CGFloat.random(in: range)) + let offsetY = model.calculatingProportionalValue(withRatio: CGFloat.random(in: range)) + return CGSize( + width: offsetX, + height: offsetY + ) + } + + var randomRotationDegrees: CGFloat { + CGFloat.random(in: -720...7200) + } + + var body: some View { + ZStack { + ForEach(ArmHairArtView.Element.allCases) { + AnimatableSymbolView(element: $0.value, isAnimating: isAnimating) + } + + ForEach(0..<250) { _ in + Image(systemName: "alternatingcurrent") + .resizable() + .foregroundStyle(.black) + .keyframeAnimator( + initialValue: AnimationValues( + width: model.initialSymbolLength, + height: model.initialSymbolLength, + offsetX: model.calculatingInitialOffsetX(forPosition: .third(.fifth)), + offsetY: model.calculatingInitialOffsetY(forPosition: .third(.fifth)) + ), + trigger: isAnimating + ) { content, value in + + SymbolNameFrameView( + name: "alternatingcurrent", + length: model.initialSymbolLength, + frameOpacity: value.symbolNameVisibleValue + ) { + + Group { + if value.symbolNameVisibleValue == 1 { + content + .scaledToFit() + } else { + content + } + } + .foregroundStyle( + value.primaryColor, + value.secondaryColor + ) + .fontWeight(value.fontWeight) + .frame( + width: value.width, + height: value.height + ) + .rotationEffect(.degrees(value.rotationDegrees)) + } + .offset(value.offset) + + } keyframes: { value in + + KeyframeTrack(\.fontWeightValue) { + LinearKeyframe( + value.fontWeightValue, + duration: model.waitingTime(forCount: 4) + ) + CubicKeyframe(Font.Weight.thin.animatableValue, duration: hairAnimationDuration) + } + + KeyframeTrack(\.width) { + LinearKeyframe( + value.height, + duration: model.waitingTime(forCount: 4) + ) + CubicKeyframe(model.calculatingProportionalValue(withRatio: 0.08), duration: hairAnimationDuration) + } + + KeyframeTrack(\.height) { + LinearKeyframe( + value.height, + duration: model.waitingTime(forCount: 4) + ) + CubicKeyframe(model.calculatingProportionalValue(withRatio: 0.024), duration: hairAnimationDuration) + } + + KeyframeTrack(\.rotationDegrees) { + LinearKeyframe( + value.rotationDegrees, + duration: model.waitingTime(forCount: 4) + ) + LinearKeyframe(randomRotationDegrees, duration: hairAnimationDuration * 0.1) + LinearKeyframe(randomRotationDegrees, duration: hairAnimationDuration * 0.1) + LinearKeyframe(randomRotationDegrees, duration: hairAnimationDuration * 0.1) + LinearKeyframe(randomRotationDegrees, duration: hairAnimationDuration * 0.1) + LinearKeyframe(randomRotationDegrees, duration: hairAnimationDuration * 0.1) + LinearKeyframe(randomRotationDegrees, duration: hairAnimationDuration * 0.1) + LinearKeyframe(randomRotationDegrees, duration: hairAnimationDuration * 0.1) + LinearKeyframe(100, duration: hairAnimationDuration * 0.3) + } + + KeyframeTrack(\.offset) { + LinearKeyframe( + value.offset, + duration: model.waitingTime(forCount: 4) + ) + LinearKeyframe(randomOffsetRatio, duration: hairAnimationDuration * 0.1) + LinearKeyframe(randomOffsetRatio, duration: hairAnimationDuration * 0.1) + LinearKeyframe(randomOffsetRatio, duration: hairAnimationDuration * 0.1) + LinearKeyframe(randomOffsetRatio, duration: hairAnimationDuration * 0.1) + LinearKeyframe(randomOffsetRatio, duration: hairAnimationDuration * 0.1) + LinearKeyframe(randomOffsetRatio, duration: hairAnimationDuration * 0.1) + LinearKeyframe(randomOffsetRatio, duration: hairAnimationDuration * 0.1) + LinearKeyframe(hairOffset, duration: hairAnimationDuration * 0.3) + } + + KeyframeTrack(\.symbolNameVisibleValue) { + LinearKeyframe(1, duration: model.waitingTime(forCount: 4)) + CubicKeyframe(0, duration: model.animationDurationPerSymbol * 0.2) + } + } + } + } + .navigationTitle("Arm hair") + .navigationBarTitleDisplayMode(.inline) + .toolbar(content: { + ToolbarItemGroup(placement: .bottomBar) { + Spacer() + + PlayButton { + isAnimating = true + } + .font(.system(size: 32)) + .disabled(isAnimating) + } + }) + } +} + +#Preview { + NavigationStack { + ArmHairArtView() + .environment(ArtWorkModel.preview) + } +} From c9b6fe7f40c344fcd788a1961f87738f77bf99d4 Mon Sep 17 00:00:00 2001 From: littleossa Date: Sat, 10 Feb 2024 07:33:54 +0900 Subject: [PATCH 079/108] Remove old arm hair --- .../project.pbxproj | 20 ------ .../ArtWorks/ArmHair/Arm.swift | 61 ------------------- .../ArtWorks/ArmHair/ArmHair.swift | 41 ------------- .../ArtWorks/ArmHair/Hair.swift | 27 -------- 4 files changed, 149 deletions(-) delete mode 100644 SFSymbolsArtCollection/ArtWorks/ArmHair/Arm.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/ArmHair/ArmHair.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/ArmHair/Hair.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 125c7b0..93cf1a0 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -11,9 +11,6 @@ 973B2CA128C2546C006ED5F0 /* ArrangeShapeWithFont.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973B2CA028C2546C006ED5F0 /* ArrangeShapeWithFont.swift */; }; 973B2CA428C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973B2CA328C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift */; }; 9748BE2028939B04006DF0BE /* FlipType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE1F28939B04006DF0BE /* FlipType.swift */; }; - 9748BE3F2897AE68006DF0BE /* ArmHair.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE3E2897AE68006DF0BE /* ArmHair.swift */; }; - 9748BE412897CD6C006DF0BE /* Arm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE402897CD6C006DF0BE /* Arm.swift */; }; - 9748BE4328980C4D006DF0BE /* Hair.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE4228980C4D006DF0BE /* Hair.swift */; }; 9748BE4628981011006DF0BE /* DemonWrestler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE4528981011006DF0BE /* DemonWrestler.swift */; }; 9748BE4828981096006DF0BE /* DemonWrestlerFace.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE4728981096006DF0BE /* DemonWrestlerFace.swift */; }; 9748BE4A28995877006DF0BE /* DemonWrestlerOutline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE4928995877006DF0BE /* DemonWrestlerOutline.swift */; }; @@ -80,9 +77,6 @@ 973B2CA028C2546C006ED5F0 /* ArrangeShapeWithFont.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrangeShapeWithFont.swift; sourceTree = ""; }; 973B2CA328C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrangeShapeWithWidthAndHeight.swift; sourceTree = ""; }; 9748BE1F28939B04006DF0BE /* FlipType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlipType.swift; sourceTree = ""; }; - 9748BE3E2897AE68006DF0BE /* ArmHair.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArmHair.swift; sourceTree = ""; }; - 9748BE402897CD6C006DF0BE /* Arm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Arm.swift; sourceTree = ""; }; - 9748BE4228980C4D006DF0BE /* Hair.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Hair.swift; sourceTree = ""; }; 9748BE4528981011006DF0BE /* DemonWrestler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemonWrestler.swift; sourceTree = ""; }; 9748BE4728981096006DF0BE /* DemonWrestlerFace.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemonWrestlerFace.swift; sourceTree = ""; }; 9748BE4928995877006DF0BE /* DemonWrestlerOutline.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemonWrestlerOutline.swift; sourceTree = ""; }; @@ -190,16 +184,6 @@ path = Enums; sourceTree = ""; }; - 9748BE3D2897ADBD006DF0BE /* ArmHair */ = { - isa = PBXGroup; - children = ( - 9748BE3E2897AE68006DF0BE /* ArmHair.swift */, - 9748BE402897CD6C006DF0BE /* Arm.swift */, - 9748BE4228980C4D006DF0BE /* Hair.swift */, - ); - path = ArmHair; - sourceTree = ""; - }; 9748BE4428980FE4006DF0BE /* DemonWrestler */ = { isa = PBXGroup; children = ( @@ -256,7 +240,6 @@ 9748BE6528A395D5006DF0BE /* ArtWork.swift */, 9748BE55289DCB82006DF0BE /* Fireworks */, 9748BE4428980FE4006DF0BE /* DemonWrestler */, - 9748BE3D2897ADBD006DF0BE /* ArmHair */, 97CD46E528BEF8A000919B65 /* iOSDCJapan2022 */, ); path = ArtWorks; @@ -594,9 +577,6 @@ 9767DF272B76CCE300457DA1 /* ArmHairArtView+Element.swift in Sources */, 97AD532B2B71068B0034FB5D /* AfroBoyArtView.swift in Sources */, 973B2CA128C2546C006ED5F0 /* ArrangeShapeWithFont.swift in Sources */, - 9748BE3F2897AE68006DF0BE /* ArmHair.swift in Sources */, - 9748BE412897CD6C006DF0BE /* Arm.swift in Sources */, - 9748BE4328980C4D006DF0BE /* Hair.swift in Sources */, 97624C3328C4F43F004E1720 /* GeometryProxy+.swift in Sources */, 97EF43952B72DA69003648F5 /* ImWearingPantsArtView.swift in Sources */, 9748BE50289AB439006DF0BE /* DemonWrestlerHand.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtWorks/ArmHair/Arm.swift b/SFSymbolsArtCollection/ArtWorks/ArmHair/Arm.swift deleted file mode 100644 index c9887cd..0000000 --- a/SFSymbolsArtCollection/ArtWorks/ArmHair/Arm.swift +++ /dev/null @@ -1,61 +0,0 @@ -// -// Arm.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/08/01. -// - -import SwiftUI - -struct Arm: View { - - let baseLength: CGFloat - let skinColor: Color = .paleOrange - - var body: some View { - HStack(spacing: 0) { - - // Arm - ZStack { - Image(symbol: .rectangleFill) - .arrangeShape(color: skinColor, - width: baseLength * 0.5, - height: baseLength * 0.125, - fontWeight: .light) - - Image(symbol: .rectangle) - .arrangeShape(width: baseLength * 0.5, - height: baseLength * 0.125, - fontWeight: .thin) - } - - ZStack { - - // Hand - ZStack { - Image(symbol: .handRaisedFill) - .arrangeShape(color: skinColor, - fontSize: baseLength * 0.225, - rotationDegrees: -90) - - Image(symbol: .handRaised) - .arrangeShape(fontSize: baseLength * 0.25, - fontWeight: .light, - rotationDegrees: -90) - } - .offset(x: -20, y: 5) - - Image(symbol: .rectangleFill) - .arrangeShape(color: skinColor, - fontSize: baseLength * 0.1, - offsetX: baseLength * -0.125) - } - } - } -} - -struct Arm_Previews: PreviewProvider { - static var previews: some View { - Arm(baseLength: 400) - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/ArmHair/ArmHair.swift b/SFSymbolsArtCollection/ArtWorks/ArmHair/ArmHair.swift deleted file mode 100644 index 92adcfe..0000000 --- a/SFSymbolsArtCollection/ArtWorks/ArmHair/ArmHair.swift +++ /dev/null @@ -1,41 +0,0 @@ -// -// ArmHair.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/08/01. -// - -import SwiftUI - -struct ArmHair: View { - - var body: some View { - - GeometryReader { proxy in - - let baseLength = proxy.baseLength - - let lowestX = Int(baseLength * -0.35) - let highestX = Int(baseLength * 0.1) - let lowestY = Int(baseLength * -0.075) - let highestY = Int(baseLength * 0.02) - - ZStack { - Arm(baseLength: baseLength) - - ForEach(0..<250) { _ in - Hair(baseLength: baseLength) - .offset(x: CGFloat(Int.random(in: lowestX...highestX)), - y: CGFloat(Int.random(in: lowestY...highestY))) - } - } - .position(proxy.localCenter) - } - } -} - -struct ArmHair_Previews: PreviewProvider { - static var previews: some View { - ArmHair() - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/ArmHair/Hair.swift b/SFSymbolsArtCollection/ArtWorks/ArmHair/Hair.swift deleted file mode 100644 index 37d14d6..0000000 --- a/SFSymbolsArtCollection/ArtWorks/ArmHair/Hair.swift +++ /dev/null @@ -1,27 +0,0 @@ -// -// Hair.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/08/01. -// - -import SwiftUI - -struct Hair: View { - - let baseLength: CGFloat - - var body: some View { - - Image(symbol: .alternatingcurrent) - .arrangeShape(fontSize: baseLength * 0.0825, - fontWeight: .thin, - rotationDegrees: 100) - } -} - -struct Hair_Previews: PreviewProvider { - static var previews: some View { - Hair(baseLength: 400) - } -} From 8ff7fd74ab317c44fa712419239584aef6c5e113 Mon Sep 17 00:00:00 2001 From: littleossa Date: Sat, 10 Feb 2024 07:42:05 +0900 Subject: [PATCH 080/108] Update armHair animation --- .../ArtWorks/ArmHair/ArmHairArtView+CoverArt.swift | 2 +- .../ArtWorks/ArmHair/ArmHairArtView.swift | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView+CoverArt.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView+CoverArt.swift index e7d3d4f..c6e5d7f 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView+CoverArt.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView+CoverArt.swift @@ -30,7 +30,7 @@ extension ArmHairArtView { SymbolArtDisplayView(shouldResizeForCoverImage: true, element: $0.value) } - ForEach(0..<250) { _ in + ForEach(0..<260) { _ in Image(systemName: "alternatingcurrent") .foregroundStyle(.black) .font(.system(size: model.calculatingProportionalValue(withRatio: 0.0825, shouldResizeForCoverImage: true))) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView.swift index 30bc1c5..3f942a0 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView.swift @@ -36,7 +36,7 @@ struct ArmHairArtView: View { } var randomRotationDegrees: CGFloat { - CGFloat.random(in: -720...7200) + CGFloat.random(in: -720...720) } var body: some View { @@ -45,7 +45,7 @@ struct ArmHairArtView: View { AnimatableSymbolView(element: $0.value, isAnimating: isAnimating) } - ForEach(0..<250) { _ in + ForEach(0..<260) { _ in Image(systemName: "alternatingcurrent") .resizable() .foregroundStyle(.black) @@ -124,7 +124,8 @@ struct ArmHairArtView: View { LinearKeyframe(randomRotationDegrees, duration: hairAnimationDuration * 0.1) LinearKeyframe(randomRotationDegrees, duration: hairAnimationDuration * 0.1) LinearKeyframe(randomRotationDegrees, duration: hairAnimationDuration * 0.1) - LinearKeyframe(100, duration: hairAnimationDuration * 0.3) + LinearKeyframe(randomRotationDegrees, duration: hairAnimationDuration * 0.1) + LinearKeyframe(100, duration: hairAnimationDuration * 0.1) } KeyframeTrack(\.offset) { From 9d52832c52fb2669498254adf074cea74195a728 Mon Sep 17 00:00:00 2001 From: littleossa Date: Sat, 10 Feb 2024 07:42:55 +0900 Subject: [PATCH 081/108] Remove unused zIndex property --- .../Views/AnimatableSymbolView/AnimatableSymbolView.swift | 3 --- 1 file changed, 3 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/AnimatableSymbolView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/AnimatableSymbolView.swift index e5df6ba..87486fd 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/AnimatableSymbolView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/AnimatableSymbolView.swift @@ -23,7 +23,6 @@ struct AnimatableSymbolView: View { self.rotationAxis = element.flip.axis self.horizontalOffsetRatio = element.horizontalOffsetRatio self.verticalOffsetRatio = element.verticalOffsetRatio - self.zIndex = element.zIndex self.isAnimating = isAnimating self.symbolCountToWaitFor = element.symbolCountToWaitFor } @@ -42,7 +41,6 @@ struct AnimatableSymbolView: View { var rotationAxis: (x: CGFloat, y: CGFloat, z: CGFloat) let horizontalOffsetRatio: CGFloat let verticalOffsetRatio: CGFloat - let zIndex: CGFloat let isAnimating: Bool let symbolCountToWaitFor: Int @@ -174,7 +172,6 @@ struct AnimatableSymbolView: View { CubicKeyframe(0, duration: model.animationDurationPerSymbol * 0.2) } } - .zIndex(zIndex) } } From ab9374e536f7e62df21da83852e20d099c8e2426 Mon Sep 17 00:00:00 2001 From: littleossa Date: Sat, 10 Feb 2024 07:54:21 +0900 Subject: [PATCH 082/108] Refactor CoverArt --- .../project.pbxproj | 56 +++++++++---------- .../ArtGalleryView.swift | 14 ++--- .../AfroBoy/AfroBoyArtView+CoverArt.swift | 27 +++++++++ .../AfroBoy/AfroBoyArtView+Element.swift | 2 +- .../ArtWorks/AfroBoy/AfroBoyPreviewView.swift | 24 -------- .../CrayonBoy/CrayonBoyArtView+CoverArt.swift | 27 +++++++++ .../CrayonBoy/CrayonBoyArtView+Element.swift | 2 +- .../CrayonBoy/CrayonBoyPreviewView.swift | 24 -------- .../ImWearingPantsArtView+FaceElement.swift | 2 +- ...earingPantsArtView+FinishPoseElement.swift | 2 +- .../Element/ImWearingPantsArtView+Pose.swift | 2 +- .../ImWearingPantsArtView+CoverArt.swift | 31 ++++++++++ .../ImWearingPantsPreviewView.swift | 28 ---------- .../Magician/MagicianArtView+CoverArt.swift | 27 +++++++++ .../Magician/MagicianArtView+Element.swift | 2 +- .../Magician/MagicianPreviewView.swift | 24 -------- .../Nosebleed/NosebleedArtView+CoverArt.swift | 28 ++++++++++ .../Nosebleed/NosebleedArtView+Element.swift | 2 +- .../Nosebleed/NosebleedPreviewView.swift | 25 --------- .../PartyAnimalsArtView+CoverArt.swift | 27 +++++++++ .../PartyAnimalsArtView+Element.swift | 2 +- .../PartyAnimalsPreviewView.swift | 24 -------- .../WorldPeaceArtView+CoverArt.swift | 28 ++++++++++ .../WorldPeaceArtView+Element.swift | 2 +- .../WorldPeace/WorldPeacePreviewView.swift | 25 --------- 25 files changed, 239 insertions(+), 218 deletions(-) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView+CoverArt.swift delete mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView+CoverArt.swift delete mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyPreviewView.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView+CoverArt.swift delete mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView+CoverArt.swift delete mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianPreviewView.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView+CoverArt.swift delete mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedPreviewView.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView+CoverArt.swift delete mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsPreviewView.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView+CoverArt.swift delete mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeacePreviewView.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 93cf1a0..371bc03 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -25,9 +25,9 @@ 97624C2C28C2DDAA004E1720 /* Buildings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C2B28C2DDAA004E1720 /* Buildings.swift */; }; 97624C2F28C2E608004E1720 /* SmallFirework.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C2E28C2E608004E1720 /* SmallFirework.swift */; }; 97624C3328C4F43F004E1720 /* GeometryProxy+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3228C4F43F004E1720 /* GeometryProxy+.swift */; }; - 9767DEFA2B751C2C00457DA1 /* WorldPeacePreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEF92B751C2C00457DA1 /* WorldPeacePreviewView.swift */; }; + 9767DEFA2B751C2C00457DA1 /* WorldPeaceArtView+CoverArt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEF92B751C2C00457DA1 /* WorldPeaceArtView+CoverArt.swift */; }; 9767DF002B752E4700457DA1 /* WorldPeaceArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEFF2B752E4700457DA1 /* WorldPeaceArtView.swift */; }; - 9767DF032B759B2D00457DA1 /* PartyAnimalsPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF022B759B2D00457DA1 /* PartyAnimalsPreviewView.swift */; }; + 9767DF032B759B2D00457DA1 /* PartyAnimalsArtView+CoverArt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF022B759B2D00457DA1 /* PartyAnimalsArtView+CoverArt.swift */; }; 9767DF052B75AFE200457DA1 /* PartyAnimalsArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF042B75AFE200457DA1 /* PartyAnimalsArtView.swift */; }; 9767DF0B2B75D1A100457DA1 /* SymbolArtElement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF0A2B75D1A100457DA1 /* SymbolArtElement.swift */; }; 9767DF0D2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF0C2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift */; }; @@ -52,7 +52,7 @@ 97AD53242B70E48F0034FB5D /* PlayButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53232B70E48F0034FB5D /* PlayButton.swift */; }; 97AD53292B7100670034FB5D /* ArtWorkModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53282B7100670034FB5D /* ArtWorkModel.swift */; }; 97AD532B2B71068B0034FB5D /* AfroBoyArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD532A2B71068B0034FB5D /* AfroBoyArtView.swift */; }; - 97AD532D2B717C950034FB5D /* AfroBoyPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD532C2B717C950034FB5D /* AfroBoyPreviewView.swift */; }; + 97AD532D2B717C950034FB5D /* AfroBoyArtView+CoverArt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD532C2B717C950034FB5D /* AfroBoyArtView+CoverArt.swift */; }; 97AD53312B71A5130034FB5D /* GalleryGridView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53302B71A5130034FB5D /* GalleryGridView.swift */; }; 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */; }; 97CD46E928BF080300919B65 /* iOSDCJapan2022Logo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */; }; @@ -62,13 +62,13 @@ 97E11DF028176A0D00B2AB32 /* SFUserFriendlySymbols in Frameworks */ = {isa = PBXBuildFile; productRef = 97E11DEF28176A0D00B2AB32 /* SFUserFriendlySymbols */; }; 97EF438B2B725E02003648F5 /* NosebleedArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438A2B725E02003648F5 /* NosebleedArtView.swift */; }; 97EF438D2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438C2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift */; }; - 97EF43902B72D2E4003648F5 /* NosebleedPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438F2B72D2E4003648F5 /* NosebleedPreviewView.swift */; }; - 97EF43932B72D3E2003648F5 /* ImWearingPantsPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43922B72D3E2003648F5 /* ImWearingPantsPreviewView.swift */; }; + 97EF43902B72D2E4003648F5 /* NosebleedArtView+CoverArt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438F2B72D2E4003648F5 /* NosebleedArtView+CoverArt.swift */; }; + 97EF43932B72D3E2003648F5 /* ImWearingPantsArtView+CoverArt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43922B72D3E2003648F5 /* ImWearingPantsArtView+CoverArt.swift */; }; 97EF43952B72DA69003648F5 /* ImWearingPantsArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43942B72DA69003648F5 /* ImWearingPantsArtView.swift */; }; 97EF43982B733337003648F5 /* MagicianArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43972B733337003648F5 /* MagicianArtView.swift */; }; - 97EF439C2B7421A7003648F5 /* MagicianPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF439B2B7421A7003648F5 /* MagicianPreviewView.swift */; }; + 97EF439C2B7421A7003648F5 /* MagicianArtView+CoverArt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF439B2B7421A7003648F5 /* MagicianArtView+CoverArt.swift */; }; 97EF439E2B744C4C003648F5 /* Color+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF439D2B744C4C003648F5 /* Color+.swift */; }; - 97EF43A12B74CA38003648F5 /* CrayonBoyPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43A02B74CA38003648F5 /* CrayonBoyPreviewView.swift */; }; + 97EF43A12B74CA38003648F5 /* CrayonBoyArtView+CoverArt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43A02B74CA38003648F5 /* CrayonBoyArtView+CoverArt.swift */; }; 97EF43A52B74F27D003648F5 /* CrayonBoyArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF43A42B74F27D003648F5 /* CrayonBoyArtView.swift */; }; /* End PBXBuildFile section */ @@ -92,9 +92,9 @@ 97624C2B28C2DDAA004E1720 /* Buildings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Buildings.swift; sourceTree = ""; }; 97624C2E28C2E608004E1720 /* SmallFirework.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmallFirework.swift; sourceTree = ""; }; 97624C3228C4F43F004E1720 /* GeometryProxy+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GeometryProxy+.swift"; sourceTree = ""; }; - 9767DEF92B751C2C00457DA1 /* WorldPeacePreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorldPeacePreviewView.swift; sourceTree = ""; }; + 9767DEF92B751C2C00457DA1 /* WorldPeaceArtView+CoverArt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorldPeaceArtView+CoverArt.swift"; sourceTree = ""; }; 9767DEFF2B752E4700457DA1 /* WorldPeaceArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorldPeaceArtView.swift; sourceTree = ""; }; - 9767DF022B759B2D00457DA1 /* PartyAnimalsPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PartyAnimalsPreviewView.swift; sourceTree = ""; }; + 9767DF022B759B2D00457DA1 /* PartyAnimalsArtView+CoverArt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PartyAnimalsArtView+CoverArt.swift"; sourceTree = ""; }; 9767DF042B75AFE200457DA1 /* PartyAnimalsArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PartyAnimalsArtView.swift; sourceTree = ""; }; 9767DF0A2B75D1A100457DA1 /* SymbolArtElement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolArtElement.swift; sourceTree = ""; }; 9767DF0C2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AfroBoyArtView+Element.swift"; sourceTree = ""; }; @@ -119,7 +119,7 @@ 97AD53232B70E48F0034FB5D /* PlayButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayButton.swift; sourceTree = ""; }; 97AD53282B7100670034FB5D /* ArtWorkModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtWorkModel.swift; sourceTree = ""; }; 97AD532A2B71068B0034FB5D /* AfroBoyArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AfroBoyArtView.swift; sourceTree = ""; }; - 97AD532C2B717C950034FB5D /* AfroBoyPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AfroBoyPreviewView.swift; sourceTree = ""; }; + 97AD532C2B717C950034FB5D /* AfroBoyArtView+CoverArt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AfroBoyArtView+CoverArt.swift"; sourceTree = ""; }; 97AD53302B71A5130034FB5D /* GalleryGridView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GalleryGridView.swift; sourceTree = ""; }; 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Symbol.swift; sourceTree = ""; }; 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Logo.swift; sourceTree = ""; }; @@ -129,13 +129,13 @@ 97E11D562817381200B2AB32 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; 97EF438A2B725E02003648F5 /* NosebleedArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NosebleedArtView.swift; sourceTree = ""; }; 97EF438C2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ArtWorkModel+InitialSymbolRow.swift"; sourceTree = ""; }; - 97EF438F2B72D2E4003648F5 /* NosebleedPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NosebleedPreviewView.swift; sourceTree = ""; }; - 97EF43922B72D3E2003648F5 /* ImWearingPantsPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImWearingPantsPreviewView.swift; sourceTree = ""; }; + 97EF438F2B72D2E4003648F5 /* NosebleedArtView+CoverArt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NosebleedArtView+CoverArt.swift"; sourceTree = ""; }; + 97EF43922B72D3E2003648F5 /* ImWearingPantsArtView+CoverArt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ImWearingPantsArtView+CoverArt.swift"; sourceTree = ""; }; 97EF43942B72DA69003648F5 /* ImWearingPantsArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImWearingPantsArtView.swift; sourceTree = ""; }; 97EF43972B733337003648F5 /* MagicianArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicianArtView.swift; sourceTree = ""; }; - 97EF439B2B7421A7003648F5 /* MagicianPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MagicianPreviewView.swift; sourceTree = ""; }; + 97EF439B2B7421A7003648F5 /* MagicianArtView+CoverArt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MagicianArtView+CoverArt.swift"; sourceTree = ""; }; 97EF439D2B744C4C003648F5 /* Color+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Color+.swift"; sourceTree = ""; }; - 97EF43A02B74CA38003648F5 /* CrayonBoyPreviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrayonBoyPreviewView.swift; sourceTree = ""; }; + 97EF43A02B74CA38003648F5 /* CrayonBoyArtView+CoverArt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CrayonBoyArtView+CoverArt.swift"; sourceTree = ""; }; 97EF43A42B74F27D003648F5 /* CrayonBoyArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrayonBoyArtView.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -250,7 +250,7 @@ children = ( 9767DEFF2B752E4700457DA1 /* WorldPeaceArtView.swift */, 9767DF142B75F7BE00457DA1 /* WorldPeaceArtView+Element.swift */, - 9767DEF92B751C2C00457DA1 /* WorldPeacePreviewView.swift */, + 9767DEF92B751C2C00457DA1 /* WorldPeaceArtView+CoverArt.swift */, ); path = WorldPeace; sourceTree = ""; @@ -260,7 +260,7 @@ children = ( 9767DF042B75AFE200457DA1 /* PartyAnimalsArtView.swift */, 9767DF162B75FF0700457DA1 /* PartyAnimalsArtView+Element.swift */, - 9767DF022B759B2D00457DA1 /* PartyAnimalsPreviewView.swift */, + 9767DF022B759B2D00457DA1 /* PartyAnimalsArtView+CoverArt.swift */, ); path = PartyAnimals; sourceTree = ""; @@ -346,7 +346,7 @@ children = ( 97AD532A2B71068B0034FB5D /* AfroBoyArtView.swift */, 9767DF0C2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift */, - 97AD532C2B717C950034FB5D /* AfroBoyPreviewView.swift */, + 97AD532C2B717C950034FB5D /* AfroBoyArtView+CoverArt.swift */, ); path = AfroBoy; sourceTree = ""; @@ -425,7 +425,7 @@ children = ( 97EF438A2B725E02003648F5 /* NosebleedArtView.swift */, 9767DF182B76032600457DA1 /* NosebleedArtView+Element.swift */, - 97EF438F2B72D2E4003648F5 /* NosebleedPreviewView.swift */, + 97EF438F2B72D2E4003648F5 /* NosebleedArtView+CoverArt.swift */, ); path = Nosebleed; sourceTree = ""; @@ -444,7 +444,7 @@ children = ( 97EF43942B72DA69003648F5 /* ImWearingPantsArtView.swift */, 9767DF202B762EF300457DA1 /* Element */, - 97EF43922B72D3E2003648F5 /* ImWearingPantsPreviewView.swift */, + 97EF43922B72D3E2003648F5 /* ImWearingPantsArtView+CoverArt.swift */, ); path = ImWearingPants; sourceTree = ""; @@ -454,7 +454,7 @@ children = ( 97EF43972B733337003648F5 /* MagicianArtView.swift */, 9767DF102B75E8FC00457DA1 /* MagicianArtView+Element.swift */, - 97EF439B2B7421A7003648F5 /* MagicianPreviewView.swift */, + 97EF439B2B7421A7003648F5 /* MagicianArtView+CoverArt.swift */, ); path = Magician; sourceTree = ""; @@ -464,7 +464,7 @@ children = ( 97EF43A42B74F27D003648F5 /* CrayonBoyArtView.swift */, 9767DF122B75EDB700457DA1 /* CrayonBoyArtView+Element.swift */, - 97EF43A02B74CA38003648F5 /* CrayonBoyPreviewView.swift */, + 97EF43A02B74CA38003648F5 /* CrayonBoyArtView+CoverArt.swift */, ); path = CrayonBoy; sourceTree = ""; @@ -548,21 +548,21 @@ 9767DF192B76032600457DA1 /* NosebleedArtView+Element.swift in Sources */, 9767DF172B75FF0700457DA1 /* PartyAnimalsArtView+Element.swift in Sources */, 9767DF0D2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift in Sources */, - 97EF43932B72D3E2003648F5 /* ImWearingPantsPreviewView.swift in Sources */, + 97EF43932B72D3E2003648F5 /* ImWearingPantsArtView+CoverArt.swift in Sources */, 97EF439E2B744C4C003648F5 /* Color+.swift in Sources */, 97624C2F28C2E608004E1720 /* SmallFirework.swift in Sources */, 9748BE57289DCBB0006DF0BE /* LargeFirework.swift in Sources */, 9767DF002B752E4700457DA1 /* WorldPeaceArtView.swift in Sources */, 9767DF132B75EDB700457DA1 /* CrayonBoyArtView+Element.swift in Sources */, 9748BE4828981096006DF0BE /* DemonWrestlerFace.swift in Sources */, - 97AD532D2B717C950034FB5D /* AfroBoyPreviewView.swift in Sources */, + 97AD532D2B717C950034FB5D /* AfroBoyArtView+CoverArt.swift in Sources */, 97EF438B2B725E02003648F5 /* NosebleedArtView.swift in Sources */, 971D9DEA28C9731D00136A36 /* iOSDCJapan2022SymbolType.swift in Sources */, 97AD53182B70DFF30034FB5D /* AnimationValues.swift in Sources */, 9767DF152B75F7BE00457DA1 /* WorldPeaceArtView+Element.swift in Sources */, 97624C2A28C2BC9A004E1720 /* MediumFirework.swift in Sources */, 97EF43982B733337003648F5 /* MagicianArtView.swift in Sources */, - 9767DEFA2B751C2C00457DA1 /* WorldPeacePreviewView.swift in Sources */, + 9767DEFA2B751C2C00457DA1 /* WorldPeaceArtView+CoverArt.swift in Sources */, 97CD46E928BF080300919B65 /* iOSDCJapan2022Logo.swift in Sources */, 97AD53242B70E48F0034FB5D /* PlayButton.swift in Sources */, 9748BE2028939B04006DF0BE /* FlipType.swift in Sources */, @@ -583,7 +583,7 @@ 9767DF232B7658E200457DA1 /* ArmHairArtView+CoverArt.swift in Sources */, 9767DF1D2B762E1200457DA1 /* ImWearingPantsArtView+Pose.swift in Sources */, 97AD53292B7100670034FB5D /* ArtWorkModel.swift in Sources */, - 97EF439C2B7421A7003648F5 /* MagicianPreviewView.swift in Sources */, + 97EF439C2B7421A7003648F5 /* MagicianArtView+CoverArt.swift in Sources */, 973B2CA428C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift in Sources */, 97EF438D2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift in Sources */, 9767DF1B2B762DA000457DA1 /* ImWearingPantsArtView+FinishPoseElement.swift in Sources */, @@ -592,12 +592,12 @@ 9767DF1F2B762E9000457DA1 /* ImWearingPantsArtView+FaceElement.swift in Sources */, 97624C2C28C2DDAA004E1720 /* Buildings.swift in Sources */, 97AD53222B70E3FA0034FB5D /* AnimatableSymbolView.swift in Sources */, - 9767DF032B759B2D00457DA1 /* PartyAnimalsPreviewView.swift in Sources */, + 9767DF032B759B2D00457DA1 /* PartyAnimalsArtView+CoverArt.swift in Sources */, 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */, 9767DF0B2B75D1A100457DA1 /* SymbolArtElement.swift in Sources */, - 97EF43A12B74CA38003648F5 /* CrayonBoyPreviewView.swift in Sources */, + 97EF43A12B74CA38003648F5 /* CrayonBoyArtView+CoverArt.swift in Sources */, 9748BE4A28995877006DF0BE /* DemonWrestlerOutline.swift in Sources */, - 97EF43902B72D2E4003648F5 /* NosebleedPreviewView.swift in Sources */, + 97EF43902B72D2E4003648F5 /* NosebleedArtView+CoverArt.swift in Sources */, 9767DF112B75E8FC00457DA1 /* MagicianArtView+Element.swift in Sources */, 9767DF0F2B75DFB400457DA1 /* SymbolArtDisplayView.swift in Sources */, 9767DF252B76C9BE00457DA1 /* ArmHairArtView.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift index 7edf627..0a7715c 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift @@ -43,28 +43,28 @@ struct ArtGalleryView: View { NavigationLink { MagicianArtView() } label: { - MagicianPreviewView() + MagicianArtView.CoverArt() .galleryGridItemView(length: model.galleryColumnLength) } NavigationLink { CrayonBoyArtView() } label: { - CrayonBoyPreviewView() + CrayonBoyArtView.CoverArt() .galleryGridItemView(length: model.galleryColumnLength) } NavigationLink { WorldPeaceArtView() } label: { - WorldPeacePreviewView() + WorldPeaceArtView.CoverArt() .galleryGridItemView(length: model.galleryColumnLength) } NavigationLink { PartyAnimalsArtView() } label: { - PartyAnimalsPreviewView() + PartyAnimalsArtView.CoverArt() .galleryGridItemView(length: model.galleryColumnLength) } @@ -78,21 +78,21 @@ struct ArtGalleryView: View { NavigationLink { AfroBoyArtView() } label: { - AfroBoyPreviewView() + AfroBoyArtView.CoverArt() .galleryGridItemView(length: model.galleryColumnLength) } NavigationLink { NosebleedArtView() } label: { - NosebleedArtPreviewView() + NosebleedArtView.CoverArt() .galleryGridItemView(length: model.galleryColumnLength) } NavigationLink { ImWearingPantsArtView() } label: { - ImWearingPantsPreviewView() + ImWearingPantsArtView.CoverArt() .galleryGridItemView(length: model.galleryColumnLength) } } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView+CoverArt.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView+CoverArt.swift new file mode 100644 index 0000000..52b8dbd --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView+CoverArt.swift @@ -0,0 +1,27 @@ +// +// AfroBoyArtView+CoverArt.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension AfroBoyArtView { + + struct CoverArt: View { + + var body: some View { + ZStack { + ForEach(Element.allCases) { + SymbolArtDisplayView(element: $0.value) + } + } + } + } +} + +#Preview { + AfroBoyArtView.CoverArt() + .environment(ArtWorkModel.preview) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView+Element.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView+Element.swift index af2c949..2d40c5f 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView+Element.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView+Element.swift @@ -77,6 +77,6 @@ extension AfroBoyArtView { } #Preview { - AfroBoyPreviewView() + AfroBoyArtView.CoverArt() .environment(ArtWorkModel.preview) } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift deleted file mode 100644 index 055179e..0000000 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyPreviewView.swift +++ /dev/null @@ -1,24 +0,0 @@ -// -// AfroBoyPreviewView.swift -// SFSymbolsArtCollection -// -// Created by Lil Ossa -// - -import SwiftUI - -struct AfroBoyPreviewView: View { - - var body: some View { - ZStack { - ForEach(AfroBoyArtView.Element.allCases) { - SymbolArtDisplayView(element: $0.value) - } - } - } -} - -#Preview { - AfroBoyPreviewView() - .environment(ArtWorkModel.preview) -} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView+CoverArt.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView+CoverArt.swift new file mode 100644 index 0000000..df3c218 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView+CoverArt.swift @@ -0,0 +1,27 @@ +// +// CrayonBoyArtView+CoverArt.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension CrayonBoyArtView { + + struct CoverArt: View { + + var body: some View { + ZStack { + ForEach(Element.allCases) { + SymbolArtDisplayView(element: $0.value) + } + } + } + } +} + +#Preview { + CrayonBoyArtView.CoverArt() + .environment(ArtWorkModel.preview) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView+Element.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView+Element.swift index aa771a1..67297e1 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView+Element.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView+Element.swift @@ -238,6 +238,6 @@ extension CrayonBoyArtView { } #Preview { - CrayonBoyPreviewView() + CrayonBoyArtView.CoverArt() .environment(ArtWorkModel.preview) } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyPreviewView.swift deleted file mode 100644 index 4c2828b..0000000 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyPreviewView.swift +++ /dev/null @@ -1,24 +0,0 @@ -// -// CrayonBoyPreviewView.swift -// SFSymbolsArtCollection -// -// Created by Lil Ossa -// - -import SwiftUI - -struct CrayonBoyPreviewView: View { - - var body: some View { - ZStack { - ForEach(CrayonBoyArtView.Element.allCases) { - SymbolArtDisplayView(element: $0.value) - } - } - } -} - -#Preview { - CrayonBoyPreviewView() - .environment(ArtWorkModel.preview) -} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+FaceElement.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+FaceElement.swift index 0bf64a1..44b67f2 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+FaceElement.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+FaceElement.swift @@ -325,6 +325,6 @@ extension ImWearingPantsArtView { } #Preview { - ImWearingPantsPreviewView() + ImWearingPantsArtView.CoverArt() .environment(ArtWorkModel.preview) } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+FinishPoseElement.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+FinishPoseElement.swift index 1574cbb..0515a40 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+FinishPoseElement.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+FinishPoseElement.swift @@ -363,6 +363,6 @@ extension ImWearingPantsArtView { } #Preview { - ImWearingPantsPreviewView() + ImWearingPantsArtView.CoverArt() .environment(ArtWorkModel.preview) } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+Pose.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+Pose.swift index 9903937..2781d84 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+Pose.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+Pose.swift @@ -95,6 +95,6 @@ extension ImWearingPantsArtView { } #Preview { - ImWearingPantsPreviewView() + ImWearingPantsArtView.CoverArt() .environment(ArtWorkModel.preview) } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView+CoverArt.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView+CoverArt.swift new file mode 100644 index 0000000..d545b80 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView+CoverArt.swift @@ -0,0 +1,31 @@ +// +// ImWearingPantsArtView+CoverArt.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension ImWearingPantsArtView { + + struct CoverArt: View { + + var body: some View { + ZStack { + ForEach(FinishPoseElement.allCases) { + SymbolArtDisplayView(element: $0.value) + } + + ForEach(FaceElement.allCases) { + SymbolArtDisplayView(element: $0.value) + } + } + } + } +} + +#Preview { + ImWearingPantsArtView.CoverArt() + .environment(ArtWorkModel.preview) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift deleted file mode 100644 index e5a0a92..0000000 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsPreviewView.swift +++ /dev/null @@ -1,28 +0,0 @@ -// -// ImWearingPantsPreviewView.swift -// SFSymbolsArtCollection -// -// Created by Lil Ossa -// - -import SwiftUI - -struct ImWearingPantsPreviewView: View { - - var body: some View { - ZStack { - ForEach(ImWearingPantsArtView.FinishPoseElement.allCases) { - SymbolArtDisplayView(element: $0.value) - } - - ForEach(ImWearingPantsArtView.FaceElement.allCases) { - SymbolArtDisplayView(element: $0.value) - } - } - } -} - -#Preview { - ImWearingPantsPreviewView() - .environment(ArtWorkModel.preview) -} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView+CoverArt.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView+CoverArt.swift new file mode 100644 index 0000000..4676d34 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView+CoverArt.swift @@ -0,0 +1,27 @@ +// +// MagicianArtView+CoverArt.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension MagicianArtView { + + struct CoverArt: View { + + var body: some View { + ZStack { + ForEach(Element.allCases) { + SymbolArtDisplayView(element: $0.value) + } + } + } + } +} + +#Preview { + MagicianArtView.CoverArt() + .environment(ArtWorkModel.preview) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView+Element.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView+Element.swift index f6df052..25549c3 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView+Element.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView+Element.swift @@ -216,6 +216,6 @@ extension MagicianArtView { } #Preview { - MagicianPreviewView() + MagicianArtView.CoverArt() .environment(ArtWorkModel.preview) } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianPreviewView.swift deleted file mode 100644 index 9f8495a..0000000 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianPreviewView.swift +++ /dev/null @@ -1,24 +0,0 @@ -// -// MagicianPreviewView.swift -// SFSymbolsArtCollection -// -// Created by Lil Ossa -// - -import SwiftUI - -struct MagicianPreviewView: View { - - var body: some View { - ZStack { - ForEach(MagicianArtView.Element.allCases) { - SymbolArtDisplayView(element: $0.value) - } - } - } -} - -#Preview { - MagicianPreviewView() - .environment(ArtWorkModel.preview) -} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView+CoverArt.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView+CoverArt.swift new file mode 100644 index 0000000..e4d50ad --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView+CoverArt.swift @@ -0,0 +1,28 @@ +// +// NosebleedArtView+CoverArt.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension NosebleedArtView { + + struct CoverArt: View { + + var body: some View { + + ZStack { + ForEach(Element.allCases) { + SymbolArtDisplayView(element: $0.value) + } + } + } + } +} + +#Preview { + NosebleedArtView.CoverArt() + .environment(ArtWorkModel.preview) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView+Element.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView+Element.swift index 581ae64..b750ecc 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView+Element.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView+Element.swift @@ -230,6 +230,6 @@ extension NosebleedArtView { } #Preview { - NosebleedArtPreviewView() + NosebleedArtView.CoverArt() .environment(ArtWorkModel.preview) } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedPreviewView.swift deleted file mode 100644 index 7ea08ac..0000000 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedPreviewView.swift +++ /dev/null @@ -1,25 +0,0 @@ -// -// NosebleedPreviewView.swift -// SFSymbolsArtCollection -// -// Created by Lil Ossa -// - -import SwiftUI - -struct NosebleedArtPreviewView: View { - - var body: some View { - - ZStack { - ForEach(NosebleedArtView.Element.allCases) { - SymbolArtDisplayView(element: $0.value) - } - } - } -} - -#Preview { - NosebleedArtPreviewView() - .environment(ArtWorkModel.preview) -} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView+CoverArt.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView+CoverArt.swift new file mode 100644 index 0000000..3483625 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView+CoverArt.swift @@ -0,0 +1,27 @@ +// +// PartyAnimalsArtView+CoverArt.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension PartyAnimalsArtView { + + struct CoverArt: View { + + var body: some View { + ZStack { + ForEach(Element.allCases) { + SymbolArtDisplayView(element: $0.value) + } + } + } + } +} + +#Preview { + PartyAnimalsArtView.CoverArt() + .environment(ArtWorkModel.preview) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView+Element.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView+Element.swift index 39dd52e..1908358 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView+Element.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView+Element.swift @@ -451,6 +451,6 @@ extension PartyAnimalsArtView { } #Preview { - PartyAnimalsPreviewView() + PartyAnimalsArtView.CoverArt() .environment(ArtWorkModel.preview) } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsPreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsPreviewView.swift deleted file mode 100644 index c985af3..0000000 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsPreviewView.swift +++ /dev/null @@ -1,24 +0,0 @@ -// -// PartyAnimalsPreviewView.swift -// SFSymbolsArtCollection -// -// Created by Lil Ossa -// - -import SwiftUI - -struct PartyAnimalsPreviewView: View { - - var body: some View { - ZStack { - ForEach(PartyAnimalsArtView.Element.allCases) { - SymbolArtDisplayView(element: $0.value) - } - } - } -} - -#Preview { - PartyAnimalsPreviewView() - .environment(ArtWorkModel.preview) -} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView+CoverArt.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView+CoverArt.swift new file mode 100644 index 0000000..782dc58 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView+CoverArt.swift @@ -0,0 +1,28 @@ +// +// WorldPeaceArtView+CoverArt.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension WorldPeaceArtView { + + struct CoverArt: View { + + var body: some View { + + ZStack { + ForEach(Element.allCases) { + SymbolArtDisplayView(element: $0.value) + } + } + } + } +} + +#Preview { + WorldPeaceArtView.CoverArt() + .environment(ArtWorkModel.preview) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView+Element.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView+Element.swift index 62b03e8..f63728b 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView+Element.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView+Element.swift @@ -355,6 +355,6 @@ extension WorldPeaceArtView { } #Preview { - WorldPeacePreviewView() + WorldPeaceArtView.CoverArt() .environment(ArtWorkModel.preview) } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeacePreviewView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeacePreviewView.swift deleted file mode 100644 index d4df211..0000000 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeacePreviewView.swift +++ /dev/null @@ -1,25 +0,0 @@ -// -// WorldPeacePreviewView.swift -// SFSymbolsArtCollection -// -// Created by Lil Ossa -// - -import SwiftUI - -struct WorldPeacePreviewView: View { - - var body: some View { - - ZStack { - ForEach(WorldPeaceArtView.Element.allCases) { - SymbolArtDisplayView(element: $0.value) - } - } - } -} - -#Preview { - WorldPeacePreviewView() - .environment(ArtWorkModel.preview) -} From 5fe1cbc65d4cbbb37544da25c44ea3a50c9f73bd Mon Sep 17 00:00:00 2001 From: littleossa Date: Sat, 10 Feb 2024 07:58:02 +0900 Subject: [PATCH 083/108] Rename shouldResizeForCoverImage to shouldResizeForCoverArt --- .../ArmHair/ArmHairArtView+CoverArt.swift | 12 ++++++------ .../ImWearingPants/ImWearingPantsArtView.swift | 2 +- .../Models/ArtWorkModel/ArtWorkModel.swift | 6 +++--- .../SymbolArtDisplayView.swift | 16 ++++++++-------- .../Common/Views/GalleryGridView.swift | 2 +- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView+CoverArt.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView+CoverArt.swift index c6e5d7f..50e1d36 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView+CoverArt.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView+CoverArt.swift @@ -14,10 +14,10 @@ extension ArmHairArtView { @Environment(ArtWorkModel.self) var model var hairOffset: CGSize { - let lowestX = model.calculatingProportionalValue(withRatio: -0.14, shouldResizeForCoverImage: true) - let highestX = model.calculatingProportionalValue(withRatio: 0.246, shouldResizeForCoverImage: true) - let lowestY = model.calculatingProportionalValue(withRatio: -0.075, shouldResizeForCoverImage: true) - let highestY = model.calculatingProportionalValue(withRatio: 0.02, shouldResizeForCoverImage: true) + let lowestX = model.calculatingProportionalValue(withRatio: -0.14, shouldResizeForCoverArt: true) + let highestX = model.calculatingProportionalValue(withRatio: 0.246, shouldResizeForCoverArt: true) + let lowestY = model.calculatingProportionalValue(withRatio: -0.075, shouldResizeForCoverArt: true) + let highestY = model.calculatingProportionalValue(withRatio: 0.02, shouldResizeForCoverArt: true) return CGSize( width: CGFloat.random(in: lowestX...highestX), height: CGFloat.random(in: lowestY...highestY) @@ -27,13 +27,13 @@ extension ArmHairArtView { var body: some View { ZStack { ForEach(Element.allCases) { - SymbolArtDisplayView(shouldResizeForCoverImage: true, element: $0.value) + SymbolArtDisplayView(shouldResizeForCoverArt: true, element: $0.value) } ForEach(0..<260) { _ in Image(systemName: "alternatingcurrent") .foregroundStyle(.black) - .font(.system(size: model.calculatingProportionalValue(withRatio: 0.0825, shouldResizeForCoverImage: true))) + .font(.system(size: model.calculatingProportionalValue(withRatio: 0.0825, shouldResizeForCoverArt: true))) .fontWeight(.thin) .rotationEffect(.degrees(100)) .offset(hairOffset) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift index 9c8aa7d..20ff197 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift @@ -31,7 +31,7 @@ struct ImWearingPantsArtView: View { if $0 == .pants { AnimatableSymbolView(element: $0.value, isAnimating: isAnimating) } else if currentPose.isFinished { - SymbolArtDisplayView(shouldResizeForCoverImage: false, element: $0.value) + SymbolArtDisplayView(shouldResizeForCoverArt: false, element: $0.value) .transition(.symbolEffect(.appear)) } } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel.swift index f29dd53..2821597 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel.swift @@ -64,11 +64,11 @@ class ArtWorkModel { /// /// - Parameters: /// - ratio: The ratio used for calculation. - /// - shouldResizeForCoverImage: A Boolean value indicating whether the value should be adjusted for cover images. Default is false. + /// - shouldResizeForCoverImage: A Boolean value indicating whether the value should be adjusted for cover arts. Default is false. /// - Returns: The calculated proportional value. - func calculatingProportionalValue(withRatio ratio: CGFloat, shouldResizeForCoverImage: Bool = false) -> CGFloat { + func calculatingProportionalValue(withRatio ratio: CGFloat, shouldResizeForCoverArt: Bool = false) -> CGFloat { - if shouldResizeForCoverImage { + if shouldResizeForCoverArt { return (galleryColumnLength - galleryColumnSpacing) * ratio } return baseLength * ratio diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/SymbolArtDisplayView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/SymbolArtDisplayView.swift index 13bf7ac..25c9dcf 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/SymbolArtDisplayView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/AnimatableSymbolView/SymbolArtDisplayView.swift @@ -10,11 +10,11 @@ import SwiftUI struct SymbolArtDisplayView: View { @Environment(ArtWorkModel.self) var model - let shouldResizeForCoverImage: Bool + let shouldResizeForCoverArt: Bool let element: SymbolArtElement - init(shouldResizeForCoverImage: Bool = true, element: SymbolArtElement) { - self.shouldResizeForCoverImage = shouldResizeForCoverImage + init(shouldResizeForCoverArt: Bool = true, element: SymbolArtElement) { + self.shouldResizeForCoverArt = shouldResizeForCoverArt self.element = element } @@ -26,11 +26,11 @@ struct SymbolArtDisplayView: View { .frame( width: model.calculatingProportionalValue( withRatio: element.widthRatio, - shouldResizeForCoverImage: shouldResizeForCoverImage + shouldResizeForCoverArt: shouldResizeForCoverArt ), height: model.calculatingProportionalValue( withRatio: element.heightRatio, - shouldResizeForCoverImage: shouldResizeForCoverImage + shouldResizeForCoverArt: shouldResizeForCoverArt ) ) .rotationEffect(.degrees(element.rotationDegrees)) @@ -38,11 +38,11 @@ struct SymbolArtDisplayView: View { .offset( x: model.calculatingProportionalValue( withRatio: element.horizontalOffsetRatio, - shouldResizeForCoverImage: shouldResizeForCoverImage + shouldResizeForCoverArt: shouldResizeForCoverArt ), y: model.calculatingProportionalValue( withRatio: element.verticalOffsetRatio, - shouldResizeForCoverImage: shouldResizeForCoverImage + shouldResizeForCoverArt: shouldResizeForCoverArt ) ) .zIndex(element.zIndex) @@ -54,7 +54,7 @@ struct SymbolArtDisplayView: View { SymbolArtDisplayView(element: AfroBoyArtView.Element.face.value) SymbolArtDisplayView( - shouldResizeForCoverImage: false, + shouldResizeForCoverArt: false, element: AfroBoyArtView.Element.face.value ) } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/GalleryGridView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/GalleryGridView.swift index 818970a..408f144 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/GalleryGridView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/GalleryGridView.swift @@ -51,7 +51,7 @@ struct GalleryGridItemView: View { } #Preview { - AfroBoyPreviewView() + AfroBoyArtView.CoverArt() .environment(ArtWorkModel.preview) .galleryGridItemView(length: 1024 / 4) } From 041c5e5375177ce0339de56dd72fbae9f8cad340 Mon Sep 17 00:00:00 2001 From: littleossa Date: Sat, 10 Feb 2024 07:59:11 +0900 Subject: [PATCH 084/108] Refactor ImWearingPants directory --- SFSymbolsArtCollection.xcodeproj/project.pbxproj | 14 +++----------- .../ImWearingPantsArtView+FaceElement.swift | 0 .../ImWearingPantsArtView+FinishPoseElement.swift | 0 .../{Element => }/ImWearingPantsArtView+Pose.swift | 0 4 files changed, 3 insertions(+), 11 deletions(-) rename SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/{Element => }/ImWearingPantsArtView+FaceElement.swift (100%) rename SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/{Element => }/ImWearingPantsArtView+FinishPoseElement.swift (100%) rename SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/{Element => }/ImWearingPantsArtView+Pose.swift (100%) diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 371bc03..0f94211 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -265,16 +265,6 @@ path = PartyAnimals; sourceTree = ""; }; - 9767DF202B762EF300457DA1 /* Element */ = { - isa = PBXGroup; - children = ( - 9767DF1E2B762E9000457DA1 /* ImWearingPantsArtView+FaceElement.swift */, - 9767DF1A2B762DA000457DA1 /* ImWearingPantsArtView+FinishPoseElement.swift */, - 9767DF1C2B762E1200457DA1 /* ImWearingPantsArtView+Pose.swift */, - ); - path = Element; - sourceTree = ""; - }; 9767DF212B7658CB00457DA1 /* ArmHair */ = { isa = PBXGroup; children = ( @@ -443,8 +433,10 @@ isa = PBXGroup; children = ( 97EF43942B72DA69003648F5 /* ImWearingPantsArtView.swift */, - 9767DF202B762EF300457DA1 /* Element */, 97EF43922B72D3E2003648F5 /* ImWearingPantsArtView+CoverArt.swift */, + 9767DF1E2B762E9000457DA1 /* ImWearingPantsArtView+FaceElement.swift */, + 9767DF1A2B762DA000457DA1 /* ImWearingPantsArtView+FinishPoseElement.swift */, + 9767DF1C2B762E1200457DA1 /* ImWearingPantsArtView+Pose.swift */, ); path = ImWearingPants; sourceTree = ""; diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+FaceElement.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView+FaceElement.swift similarity index 100% rename from SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+FaceElement.swift rename to SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView+FaceElement.swift diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+FinishPoseElement.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView+FinishPoseElement.swift similarity index 100% rename from SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+FinishPoseElement.swift rename to SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView+FinishPoseElement.swift diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+Pose.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView+Pose.swift similarity index 100% rename from SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/Element/ImWearingPantsArtView+Pose.swift rename to SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView+Pose.swift From a9372bd42535c68079fc3808218ea40e2dd5ac79 Mon Sep 17 00:00:00 2001 From: littleossa Date: Sat, 10 Feb 2024 18:48:20 +0900 Subject: [PATCH 085/108] Fix mistaken offset y --- .../Models/ArtWorkModel/ArtWorkModel+InitialSymbolRow.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel+InitialSymbolRow.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel+InitialSymbolRow.swift index dcaea57..6c5ccfd 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel+InitialSymbolRow.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel+InitialSymbolRow.swift @@ -50,7 +50,7 @@ extension ArtWorkModel { case .none: 0 case .first: - 0.63 + 0.18 case .second: 0.34 case .third: From 0908ddc35d69744489e238a3ed551e45135e511b Mon Sep 17 00:00:00 2001 From: littleossa Date: Sun, 11 Feb 2024 05:34:09 +0900 Subject: [PATCH 086/108] Add DemonWrestler --- .../project.pbxproj | 14 +- .../ArtGalleryView.swift | 7 + .../Body/DemonWrestlerBody.swift | 0 .../Body/DemonWrestlerHand.swift | 0 .../DemonWrestler/DemonWrestler.swift | 3 +- .../DemonWrestlerArtView+CoverArt.swift | 27 ++ .../DemonWrestlerArtView+Element.swift | 356 ++++++++++++++++++ .../DemonWrestler/DemonWrestlerArtView.swift | 41 ++ .../Face/DemonWrestlerFace.swift | 0 .../Face/DemonWrestlerOutline.swift | 3 +- 10 files changed, 448 insertions(+), 3 deletions(-) rename SFSymbolsArtCollection/{ => ArtisticWorldOfSFSymbols}/ArtWorks/DemonWrestler/Body/DemonWrestlerBody.swift (100%) rename SFSymbolsArtCollection/{ => ArtisticWorldOfSFSymbols}/ArtWorks/DemonWrestler/Body/DemonWrestlerHand.swift (100%) rename SFSymbolsArtCollection/{ => ArtisticWorldOfSFSymbols}/ArtWorks/DemonWrestler/DemonWrestler.swift (95%) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestlerArtView+CoverArt.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestlerArtView+Element.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestlerArtView.swift rename SFSymbolsArtCollection/{ => ArtisticWorldOfSFSymbols}/ArtWorks/DemonWrestler/Face/DemonWrestlerFace.swift (100%) rename SFSymbolsArtCollection/{ => ArtisticWorldOfSFSymbols}/ArtWorks/DemonWrestler/Face/DemonWrestlerOutline.swift (96%) diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 0f94211..96ac458 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -43,6 +43,9 @@ 9767DF232B7658E200457DA1 /* ArmHairArtView+CoverArt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF222B7658E200457DA1 /* ArmHairArtView+CoverArt.swift */; }; 9767DF252B76C9BE00457DA1 /* ArmHairArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF242B76C9BE00457DA1 /* ArmHairArtView.swift */; }; 9767DF272B76CCE300457DA1 /* ArmHairArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF262B76CCE300457DA1 /* ArmHairArtView+Element.swift */; }; + 9767DF292B76FF0400457DA1 /* DemonWrestlerArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF282B76FF0400457DA1 /* DemonWrestlerArtView.swift */; }; + 9767DF2B2B776D5800457DA1 /* DemonWrestlerArtView+CoverArt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF2A2B776D5800457DA1 /* DemonWrestlerArtView+CoverArt.swift */; }; + 9767DF2D2B776DA100457DA1 /* DemonWrestlerArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF2C2B776DA100457DA1 /* DemonWrestlerArtView+Element.swift */; }; 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; @@ -110,6 +113,9 @@ 9767DF222B7658E200457DA1 /* ArmHairArtView+CoverArt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ArmHairArtView+CoverArt.swift"; sourceTree = ""; }; 9767DF242B76C9BE00457DA1 /* ArmHairArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArmHairArtView.swift; sourceTree = ""; }; 9767DF262B76CCE300457DA1 /* ArmHairArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ArmHairArtView+Element.swift"; sourceTree = ""; }; + 9767DF282B76FF0400457DA1 /* DemonWrestlerArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemonWrestlerArtView.swift; sourceTree = ""; }; + 9767DF2A2B776D5800457DA1 /* DemonWrestlerArtView+CoverArt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DemonWrestlerArtView+CoverArt.swift"; sourceTree = ""; }; + 9767DF2C2B776DA100457DA1 /* DemonWrestlerArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DemonWrestlerArtView+Element.swift"; sourceTree = ""; }; 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; @@ -187,6 +193,9 @@ 9748BE4428980FE4006DF0BE /* DemonWrestler */ = { isa = PBXGroup; children = ( + 9767DF282B76FF0400457DA1 /* DemonWrestlerArtView.swift */, + 9767DF2C2B776DA100457DA1 /* DemonWrestlerArtView+Element.swift */, + 9767DF2A2B776D5800457DA1 /* DemonWrestlerArtView+CoverArt.swift */, 9748BE4528981011006DF0BE /* DemonWrestler.swift */, 97624C3428C74A41004E1720 /* Face */, 97624C3528C74A50004E1720 /* Body */, @@ -239,7 +248,6 @@ children = ( 9748BE6528A395D5006DF0BE /* ArtWork.swift */, 9748BE55289DCB82006DF0BE /* Fireworks */, - 9748BE4428980FE4006DF0BE /* DemonWrestler */, 97CD46E528BEF8A000919B65 /* iOSDCJapan2022 */, ); path = ArtWorks; @@ -324,6 +332,7 @@ 9767DEF82B751C1300457DA1 /* WorldPeace */, 9767DF012B759AFC00457DA1 /* PartyAnimals */, 9767DF212B7658CB00457DA1 /* ArmHair */, + 9748BE4428980FE4006DF0BE /* DemonWrestler */, 97AD531E2B70E2770034FB5D /* AfroBoy */, 97EF43892B725DE7003648F5 /* Nosebleed */, 97EF43912B72D3AF003648F5 /* ImWearingPants */, @@ -543,7 +552,9 @@ 97EF43932B72D3E2003648F5 /* ImWearingPantsArtView+CoverArt.swift in Sources */, 97EF439E2B744C4C003648F5 /* Color+.swift in Sources */, 97624C2F28C2E608004E1720 /* SmallFirework.swift in Sources */, + 9767DF2B2B776D5800457DA1 /* DemonWrestlerArtView+CoverArt.swift in Sources */, 9748BE57289DCBB0006DF0BE /* LargeFirework.swift in Sources */, + 9767DF2D2B776DA100457DA1 /* DemonWrestlerArtView+Element.swift in Sources */, 9767DF002B752E4700457DA1 /* WorldPeaceArtView.swift in Sources */, 9767DF132B75EDB700457DA1 /* CrayonBoyArtView+Element.swift in Sources */, 9748BE4828981096006DF0BE /* DemonWrestlerFace.swift in Sources */, @@ -567,6 +578,7 @@ 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */, 9748BE6628A395D5006DF0BE /* ArtWork.swift in Sources */, 9767DF272B76CCE300457DA1 /* ArmHairArtView+Element.swift in Sources */, + 9767DF292B76FF0400457DA1 /* DemonWrestlerArtView.swift in Sources */, 97AD532B2B71068B0034FB5D /* AfroBoyArtView.swift in Sources */, 973B2CA128C2546C006ED5F0 /* ArrangeShapeWithFont.swift in Sources */, 97624C3328C4F43F004E1720 /* GeometryProxy+.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift index 0a7715c..d68a5b4 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift @@ -75,6 +75,13 @@ struct ArtGalleryView: View { .galleryGridItemView(length: model.galleryColumnLength) } + NavigationLink { + DemonWrestlerArtView() + } label: { + DemonWrestlerArtView.CoverArt() + .galleryGridItemView(length: model.galleryColumnLength) + } + NavigationLink { AfroBoyArtView() } label: { diff --git a/SFSymbolsArtCollection/ArtWorks/DemonWrestler/Body/DemonWrestlerBody.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Body/DemonWrestlerBody.swift similarity index 100% rename from SFSymbolsArtCollection/ArtWorks/DemonWrestler/Body/DemonWrestlerBody.swift rename to SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Body/DemonWrestlerBody.swift diff --git a/SFSymbolsArtCollection/ArtWorks/DemonWrestler/Body/DemonWrestlerHand.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Body/DemonWrestlerHand.swift similarity index 100% rename from SFSymbolsArtCollection/ArtWorks/DemonWrestler/Body/DemonWrestlerHand.swift rename to SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Body/DemonWrestlerHand.swift diff --git a/SFSymbolsArtCollection/ArtWorks/DemonWrestler/DemonWrestler.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestler.swift similarity index 95% rename from SFSymbolsArtCollection/ArtWorks/DemonWrestler/DemonWrestler.swift rename to SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestler.swift index 1fd2a17..519fb96 100644 --- a/SFSymbolsArtCollection/ArtWorks/DemonWrestler/DemonWrestler.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestler.swift @@ -32,7 +32,8 @@ struct DemonWrestler: View { .offset(x: baseLength * -0.1875, y: baseLength * -0.465) } - .position(proxy.localCenter) + .scaleEffect(0.8) + .offset(y: 100) } } } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestlerArtView+CoverArt.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestlerArtView+CoverArt.swift new file mode 100644 index 0000000..a4edb6b --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestlerArtView+CoverArt.swift @@ -0,0 +1,27 @@ +// +// DemonWrestlerArtView+CoverArt.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension DemonWrestlerArtView { + + struct CoverArt: View { + + var body: some View { + ZStack { + ForEach(Element.allCases) { + SymbolArtDisplayView(element: $0.value) + } + } + } + } +} + +#Preview { + DemonWrestlerArtView.CoverArt() + .environment(ArtWorkModel.preview) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestlerArtView+Element.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestlerArtView+Element.swift new file mode 100644 index 0000000..664ecbc --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestlerArtView+Element.swift @@ -0,0 +1,356 @@ +// +// DemonWrestlerArtView+Element.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension DemonWrestlerArtView { + + enum Element: String, CaseIterable, Identifiable { + case body + case neck + case pants + case handRight + case handLeft + case hornRight + case hornLeft + case handGloveRight + case handGloveLeft + case hat + case outlineFrame + case outline + case hatCenterTip + case numberFour + case eyeBagRight + case eyeBagLeft + case eyeFrameRight + case eyeFrameLeft + case eyeRight + case eyeLeft + case nose + case mouth + case mouthFrame + case scar + + var id: String { rawValue } + + var value: SymbolArtElement { + switch self { + case .body: + SymbolArtElement( + symbol: "􀝻", + name: "figure.wave", + initialPosition: .first(.first), + primaryColor: .paleOrange, + widthRatio: 0.6, + heightRatio: 0.84, + symbolCountToWaitFor: 0) + case .neck: + SymbolArtElement( + symbol: "􀡸", + name: "powerplug.fill", + initialPosition: .first(.second), + primaryColor: .paleOrange, + widthRatio: 0.2, + heightRatio: 0.3, + rotationDegrees: 90, + horizontalOffsetRatio: 0.03, + verticalOffsetRatio: -0.18, + symbolCountToWaitFor: 1) + case .pants: + SymbolArtElement( + symbol: "􀒋", + name: "pencil.tip", + initialPosition: .first(.third), + primaryColor: .black, + widthRatio: 0.2, + heightRatio: 0.35, + rotationDegrees: 180, + horizontalOffsetRatio: 0.02, + verticalOffsetRatio: -0.047, + symbolCountToWaitFor: 2) + case .handRight: + SymbolArtElement( + symbol: "􁗪", + name: "hand.raised.fingers.spread.fill", + initialPosition: .second(.fourth), + primaryColor: .black, + widthRatio: 0.14, + heightRatio: 0.1375, + horizontalOffsetRatio: -0.235, + verticalOffsetRatio: -0.48, + symbolCountToWaitFor: 3) + + case .handLeft: + SymbolArtElement( + symbol: "􁗪", + name: "hand.raised.fingers.spread.fill", + initialPosition: .second(.fourth), + primaryColor: .black, + widthRatio: 0.14, + heightRatio: 0.1375, + rotationDegrees: 180, + horizontalOffsetRatio: 0.23, + verticalOffsetRatio: 0.19, + symbolCountToWaitFor: 3) + + case .hornRight: + SymbolArtElement( + symbol: "􀒘", + name: "bolt.horizontal.fill", + initialPosition: .second(.fifth), + primaryColor: .red, + widthRatio: 0.17, + heightRatio: 0.2, + rotationDegrees: 138, + flip: .vertical, + horizontalOffsetRatio: -0.12, + verticalOffsetRatio: -0.44, + symbolCountToWaitFor: 4) + + case .hornLeft: + SymbolArtElement( + symbol: "􀒘", + name: "bolt.horizontal.fill", + initialPosition: .second(.fifth), + primaryColor: .red, + widthRatio: 0.17, + heightRatio: 0.2, + rotationDegrees: 138, + horizontalOffsetRatio: 0.16, + verticalOffsetRatio: -0.44, + symbolCountToWaitFor: 4) + + case .handGloveRight: + SymbolArtElement( + symbol: "􀳈", + name: "cone.fill", + initialPosition: .second(.sixth), + primaryColor: .black, + widthRatio: 0.14, + heightRatio: 0.2, + horizontalOffsetRatio: -0.24, + verticalOffsetRatio: -0.39, + symbolCountToWaitFor: 5) + + case .handGloveLeft: + SymbolArtElement( + symbol: "􀳈", + name: "cone.fill", + initialPosition: .second(.sixth), + primaryColor: .black, + widthRatio: 0.14, + heightRatio: 0.2, + rotationDegrees: 180, + horizontalOffsetRatio: 0.235, + verticalOffsetRatio: 0.1, + symbolCountToWaitFor: 5) + + case .hat: + SymbolArtElement( + symbol: "􀙧", + name: "shield.fill", + initialPosition: .second(.seventh), + primaryColor: .black, + widthRatio: 0.3, + heightRatio: 0.3, + rotationDegrees: 180, + horizontalOffsetRatio: 0.018, + verticalOffsetRatio: -0.4, + symbolCountToWaitFor: 6) + + case .outlineFrame: + SymbolArtElement( + symbol: "􀧶", + name: "capsule.portrait", + initialPosition: .second(.second), + primaryColor: .black.opacity(0.3), + fontWeight: .ultraLight, + widthRatio: 0.19, + heightRatio: 0.26, + horizontalOffsetRatio: 0.018, + verticalOffsetRatio: -0.296, + symbolCountToWaitFor: 7) + + case .outline: + SymbolArtElement( + symbol: "􀧷", + name: "capsule.portrait.fill", + initialPosition: .second(.third), + primaryColor: .paleOrange, + fontWeight: .ultraLight, + widthRatio: 0.2025, + heightRatio: 0.26, + horizontalOffsetRatio: 0.018, + verticalOffsetRatio: -0.3, + symbolCountToWaitFor: 7) + + case .hatCenterTip: + SymbolArtElement( + symbol: "􀙧", + name: "shield.fill", + initialPosition: .second(.seventh), + primaryColor: .black, + widthRatio: 0.14, + heightRatio: 0.18, + horizontalOffsetRatio: 0.018, + verticalOffsetRatio: -0.44, + symbolCountToWaitFor: 6) + + case .numberFour: + SymbolArtElement( + symbol: "􀘘", + name: "4.alt.circle.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .third(.first), + primaryColor: .red, + secondaryColor: .black, + widthRatio: 0.12, + heightRatio: 0.12, + horizontalOffsetRatio: 0.018, + verticalOffsetRatio: -0.45, + symbolCountToWaitFor: 8) + + case .eyeBagRight: + SymbolArtElement( + symbol: "􁹩", + name: "lightspectrum.horizontal", + initialPosition: .third(.second), + primaryColor: .indigo, + widthRatio: 0.05, + heightRatio: 0.038, + horizontalOffsetRatio: 0.058, + verticalOffsetRatio: -0.32, + symbolCountToWaitFor: 9) + + case .eyeBagLeft: + SymbolArtElement( + symbol: "􁹩", + name: "lightspectrum.horizontal", + initialPosition: .third(.second), + primaryColor: .indigo, + widthRatio: 0.05, + heightRatio: 0.038, + horizontalOffsetRatio: -0.03, + verticalOffsetRatio: -0.32, + symbolCountToWaitFor: 9) + + case .eyeFrameRight: + SymbolArtElement( + symbol: "􀋭", + name: "eye", + initialPosition: .third(.third), + primaryColor: .black, + widthRatio: 0.05, + heightRatio: 0.025, + horizontalOffsetRatio: 0.058, + verticalOffsetRatio: -0.328, + symbolCountToWaitFor: 10) + + case .eyeFrameLeft: + SymbolArtElement( + symbol: "􀋭", + name: "eye", + initialPosition: .third(.third), + primaryColor: .black, + widthRatio: 0.05, + heightRatio: 0.025, + horizontalOffsetRatio: -0.03, + verticalOffsetRatio: -0.328, + symbolCountToWaitFor: 10) + + case .eyeRight: + SymbolArtElement( + symbol: "􀋮", + name: "eye.fill", + initialPosition: .third(.fourth), + primaryColor: .white, + widthRatio: 0.05, + heightRatio: 0.025, + horizontalOffsetRatio: 0.058, + verticalOffsetRatio: -0.328, + symbolCountToWaitFor: 10) + + case .eyeLeft: + SymbolArtElement( + symbol: "􀋮", + name: "eye.fill", + initialPosition: .third(.fourth), + primaryColor: .white, + widthRatio: 0.05, + heightRatio: 0.025, + horizontalOffsetRatio: -0.03, + verticalOffsetRatio: -0.328, + symbolCountToWaitFor: 10) + + case .nose: + SymbolArtElement( + symbol: "􀨯", + name: "nose", + initialPosition: .third(.fifth), + primaryColor: .black, + fontWeight: .thin, + widthRatio: 0.05, + heightRatio: 0.05, + horizontalOffsetRatio: 0.018, + verticalOffsetRatio: -0.28, + symbolCountToWaitFor: 11) + + case .mouth: + SymbolArtElement( + symbol: "􀦪", + name: "mouth.fill", + initialPosition: .third(.sixth), + primaryColor: .red, + fontWeight: .thin, + widthRatio: 0.07, + heightRatio: 0.03, + horizontalOffsetRatio: 0.018, + verticalOffsetRatio: -0.21, + symbolCountToWaitFor: 12) + + case .mouthFrame: + SymbolArtElement( + symbol: "􀦩", + name: "mouth", + initialPosition: .third(.seventh), + primaryColor: .black, + fontWeight: .thin, + widthRatio: 0.07, + heightRatio: 0.03, + horizontalOffsetRatio: 0.018, + verticalOffsetRatio: -0.21, + symbolCountToWaitFor: 12) + + case .scar: + SymbolArtElement( + symbol: "􀜟", + name: "waveform.path.ecg", + initialPosition: .second(.first), + primaryColor: .indigo, + fontWeight: .thin, + widthRatio: 0.05, + heightRatio: 0.03, + rotationDegrees: -15, + horizontalOffsetRatio: 0.07, + verticalOffsetRatio: -0.248, + symbolCountToWaitFor: 13) + } + } + } +} + +#Preview { + NavigationStack { + DemonWrestlerArtView() + .environment(ArtWorkModel.preview) + } +} + +#Preview { + DemonWrestlerArtView.CoverArt() + .environment(ArtWorkModel.preview) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestlerArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestlerArtView.swift new file mode 100644 index 0000000..3040c46 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestlerArtView.swift @@ -0,0 +1,41 @@ +// +// DemonWrestlerArtView.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +struct DemonWrestlerArtView: View { + + @State private var isAnimating = false + + var body: some View { + ZStack { + ForEach(Element.allCases) { + AnimatableSymbolView(element: $0.value, isAnimating: isAnimating) + } + } + .navigationTitle("Demon wrestler") + .navigationBarTitleDisplayMode(.inline) + .toolbar(content: { + ToolbarItemGroup(placement: .bottomBar) { + Spacer() + + PlayButton { + isAnimating = true + } + .font(.system(size: 32)) + .disabled(isAnimating) + } + }) + } +} + +#Preview { + NavigationStack { + DemonWrestlerArtView() + .environment(ArtWorkModel.preview) + } +} diff --git a/SFSymbolsArtCollection/ArtWorks/DemonWrestler/Face/DemonWrestlerFace.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Face/DemonWrestlerFace.swift similarity index 100% rename from SFSymbolsArtCollection/ArtWorks/DemonWrestler/Face/DemonWrestlerFace.swift rename to SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Face/DemonWrestlerFace.swift diff --git a/SFSymbolsArtCollection/ArtWorks/DemonWrestler/Face/DemonWrestlerOutline.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Face/DemonWrestlerOutline.swift similarity index 96% rename from SFSymbolsArtCollection/ArtWorks/DemonWrestler/Face/DemonWrestlerOutline.swift rename to SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Face/DemonWrestlerOutline.swift index 50c7774..4689bfa 100644 --- a/SFSymbolsArtCollection/ArtWorks/DemonWrestler/Face/DemonWrestlerOutline.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Face/DemonWrestlerOutline.swift @@ -62,7 +62,8 @@ struct DemonWrestlerOutline: View { fontWeight: .bold) Image(symbol: ._4AltCircleFill) - .arrangeShape(fontSize: baseLength * 0.15, + .arrangeShape(color: .blue, + fontSize: baseLength * 0.15, fontWeight: .bold) } .offset(x: 0, y: baseLength * -0.175) From 5633516418a65d47cabf23dc15cc566ffbb5fb66 Mon Sep 17 00:00:00 2001 From: littleossa Date: Sun, 11 Feb 2024 05:35:00 +0900 Subject: [PATCH 087/108] Remove old demon wrestler --- .../project.pbxproj | 36 ------- .../Body/DemonWrestlerBody.swift | 87 ----------------- .../Body/DemonWrestlerHand.swift | 62 ------------ .../DemonWrestler/DemonWrestler.swift | 45 --------- .../Face/DemonWrestlerFace.swift | 70 -------------- .../Face/DemonWrestlerOutline.swift | 94 ------------------- 6 files changed, 394 deletions(-) delete mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Body/DemonWrestlerBody.swift delete mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Body/DemonWrestlerHand.swift delete mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestler.swift delete mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Face/DemonWrestlerFace.swift delete mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Face/DemonWrestlerOutline.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 96ac458..501a11a 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -11,11 +11,6 @@ 973B2CA128C2546C006ED5F0 /* ArrangeShapeWithFont.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973B2CA028C2546C006ED5F0 /* ArrangeShapeWithFont.swift */; }; 973B2CA428C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973B2CA328C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift */; }; 9748BE2028939B04006DF0BE /* FlipType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE1F28939B04006DF0BE /* FlipType.swift */; }; - 9748BE4628981011006DF0BE /* DemonWrestler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE4528981011006DF0BE /* DemonWrestler.swift */; }; - 9748BE4828981096006DF0BE /* DemonWrestlerFace.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE4728981096006DF0BE /* DemonWrestlerFace.swift */; }; - 9748BE4A28995877006DF0BE /* DemonWrestlerOutline.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE4928995877006DF0BE /* DemonWrestlerOutline.swift */; }; - 9748BE4C28995A43006DF0BE /* DemonWrestlerBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE4B28995A43006DF0BE /* DemonWrestlerBody.swift */; }; - 9748BE50289AB439006DF0BE /* DemonWrestlerHand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE4F289AB439006DF0BE /* DemonWrestlerHand.swift */; }; 9748BE57289DCBB0006DF0BE /* LargeFirework.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE56289DCBB0006DF0BE /* LargeFirework.swift */; }; 9748BE59289DCE17006DF0BE /* Fireworks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE58289DCE17006DF0BE /* Fireworks.swift */; }; 9748BE5D289DD696006DF0BE /* Building.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE5C289DD696006DF0BE /* Building.swift */; }; @@ -80,11 +75,6 @@ 973B2CA028C2546C006ED5F0 /* ArrangeShapeWithFont.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrangeShapeWithFont.swift; sourceTree = ""; }; 973B2CA328C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrangeShapeWithWidthAndHeight.swift; sourceTree = ""; }; 9748BE1F28939B04006DF0BE /* FlipType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlipType.swift; sourceTree = ""; }; - 9748BE4528981011006DF0BE /* DemonWrestler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemonWrestler.swift; sourceTree = ""; }; - 9748BE4728981096006DF0BE /* DemonWrestlerFace.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemonWrestlerFace.swift; sourceTree = ""; }; - 9748BE4928995877006DF0BE /* DemonWrestlerOutline.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemonWrestlerOutline.swift; sourceTree = ""; }; - 9748BE4B28995A43006DF0BE /* DemonWrestlerBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemonWrestlerBody.swift; sourceTree = ""; }; - 9748BE4F289AB439006DF0BE /* DemonWrestlerHand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemonWrestlerHand.swift; sourceTree = ""; }; 9748BE56289DCBB0006DF0BE /* LargeFirework.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LargeFirework.swift; sourceTree = ""; }; 9748BE58289DCE17006DF0BE /* Fireworks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Fireworks.swift; sourceTree = ""; }; 9748BE5C289DD696006DF0BE /* Building.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Building.swift; sourceTree = ""; }; @@ -196,9 +186,6 @@ 9767DF282B76FF0400457DA1 /* DemonWrestlerArtView.swift */, 9767DF2C2B776DA100457DA1 /* DemonWrestlerArtView+Element.swift */, 9767DF2A2B776D5800457DA1 /* DemonWrestlerArtView+CoverArt.swift */, - 9748BE4528981011006DF0BE /* DemonWrestler.swift */, - 97624C3428C74A41004E1720 /* Face */, - 97624C3528C74A50004E1720 /* Body */, ); path = DemonWrestler; sourceTree = ""; @@ -225,24 +212,6 @@ path = Buildings; sourceTree = ""; }; - 97624C3428C74A41004E1720 /* Face */ = { - isa = PBXGroup; - children = ( - 9748BE4728981096006DF0BE /* DemonWrestlerFace.swift */, - 9748BE4928995877006DF0BE /* DemonWrestlerOutline.swift */, - ); - path = Face; - sourceTree = ""; - }; - 97624C3528C74A50004E1720 /* Body */ = { - isa = PBXGroup; - children = ( - 9748BE4B28995A43006DF0BE /* DemonWrestlerBody.swift */, - 9748BE4F289AB439006DF0BE /* DemonWrestlerHand.swift */, - ); - path = Body; - sourceTree = ""; - }; 97624C3628C74AA0004E1720 /* ArtWorks */ = { isa = PBXGroup; children = ( @@ -557,7 +526,6 @@ 9767DF2D2B776DA100457DA1 /* DemonWrestlerArtView+Element.swift in Sources */, 9767DF002B752E4700457DA1 /* WorldPeaceArtView.swift in Sources */, 9767DF132B75EDB700457DA1 /* CrayonBoyArtView+Element.swift in Sources */, - 9748BE4828981096006DF0BE /* DemonWrestlerFace.swift in Sources */, 97AD532D2B717C950034FB5D /* AfroBoyArtView+CoverArt.swift in Sources */, 97EF438B2B725E02003648F5 /* NosebleedArtView.swift in Sources */, 971D9DEA28C9731D00136A36 /* iOSDCJapan2022SymbolType.swift in Sources */, @@ -583,7 +551,6 @@ 973B2CA128C2546C006ED5F0 /* ArrangeShapeWithFont.swift in Sources */, 97624C3328C4F43F004E1720 /* GeometryProxy+.swift in Sources */, 97EF43952B72DA69003648F5 /* ImWearingPantsArtView.swift in Sources */, - 9748BE50289AB439006DF0BE /* DemonWrestlerHand.swift in Sources */, 9767DF232B7658E200457DA1 /* ArmHairArtView+CoverArt.swift in Sources */, 9767DF1D2B762E1200457DA1 /* ImWearingPantsArtView+Pose.swift in Sources */, 97AD53292B7100670034FB5D /* ArtWorkModel.swift in Sources */, @@ -600,15 +567,12 @@ 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */, 9767DF0B2B75D1A100457DA1 /* SymbolArtElement.swift in Sources */, 97EF43A12B74CA38003648F5 /* CrayonBoyArtView+CoverArt.swift in Sources */, - 9748BE4A28995877006DF0BE /* DemonWrestlerOutline.swift in Sources */, 97EF43902B72D2E4003648F5 /* NosebleedArtView+CoverArt.swift in Sources */, 9767DF112B75E8FC00457DA1 /* MagicianArtView+Element.swift in Sources */, 9767DF0F2B75DFB400457DA1 /* SymbolArtDisplayView.swift in Sources */, 9767DF252B76C9BE00457DA1 /* ArmHairArtView.swift in Sources */, - 9748BE4C28995A43006DF0BE /* DemonWrestlerBody.swift in Sources */, 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */, 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */, - 9748BE4628981011006DF0BE /* DemonWrestler.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Body/DemonWrestlerBody.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Body/DemonWrestlerBody.swift deleted file mode 100644 index fc3e014..0000000 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Body/DemonWrestlerBody.swift +++ /dev/null @@ -1,87 +0,0 @@ -// -// ElectricMagneticWaveManBody.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/08/02. -// - -import SwiftUI - -struct DemonWrestlerBody: View { - - let baseLength: CGFloat - let skinColor: Color = .paleOrange - - var body: some View { - ZStack { - - Image(symbol: .figureWave) - .arrangeShape(color: skinColor, - fontSize: baseLength * 0.825) - - Image(symbol: .powerplugFill) - .arrangeShape(color: skinColor, - fontSize: baseLength * 0.1875, - fontWeight: .bold, - rotationDegrees: -90, - offsetX: baseLength * 0.0275, - offsetY: baseLength * -0.19) - - Image(symbol: .locationFill) - .arrangeShape(fontSize: baseLength * 0.125, - rotationDegrees: -132, - offsetX: baseLength * 0.02, - offsetY: baseLength * 0.04) - - Group { - Image(symbol: .minus) - .arrangeShape(fontSize: baseLength * 0.15, - fontWeight: .bold, - rotationDegrees: 70, - offsetX: baseLength * 0.065, - offsetY: baseLength * -0.025) - - Image(symbol: .minus) - .arrangeShape(fontSize: baseLength * 0.15, - fontWeight: .bold, - rotationDegrees: 75, - offsetX: baseLength * 0.096, - offsetY: baseLength * -0.125) - - Image(symbol: .minus) - .arrangeShape(fontSize: baseLength * 0.1025, - fontWeight: .black, - rotationDegrees: 80, - offsetX: baseLength * 0.1143, - offsetY: baseLength * -0.2) - - Image(symbol: .minus) - .arrangeShape(fontSize: baseLength * 0.15, - fontWeight: .bold, - rotationDegrees: -70, - offsetX: baseLength * -0.0225, - offsetY: baseLength * -0.025) - - Image(symbol: .minus) - .arrangeShape(fontSize: baseLength * 0.15, - fontWeight: .bold, - rotationDegrees: -75, - offsetX: baseLength * -0.0525, - offsetY: baseLength * -0.125) - - Image(symbol: .minus) - .arrangeShape(fontSize: baseLength * 0.1025, - fontWeight: .black, - rotationDegrees: -80, - offsetX: baseLength * -0.07, - offsetY: baseLength * -0.2) - } - } - } -} - -struct DemonWrestlerBody_Previews: PreviewProvider { - static var previews: some View { - DemonWrestlerBody(baseLength: 400) - } -} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Body/DemonWrestlerHand.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Body/DemonWrestlerHand.swift deleted file mode 100644 index e252105..0000000 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Body/DemonWrestlerHand.swift +++ /dev/null @@ -1,62 +0,0 @@ -// -// ElectricMagneticWaveLeftHand.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/08/03. -// - -import SwiftUI - -struct DemonWrestlerHand: View { - - enum HandType { - case left - case right - - var appearance: HandAppearance { - switch self { - case .left: - return HandAppearance(coneFlipType: .vertical, - handFlipType: .horizontalAndVertical, - offsetYMagnification: 0.0875) - case .right: - return HandAppearance(coneFlipType: .none, - handFlipType: .none, - offsetYMagnification: -0.0875) - } - } - - struct HandAppearance { - let coneFlipType: FlipType - let handFlipType: FlipType - let offsetYMagnification: CGFloat - } - } - - let type: HandType - let baseLength: CGFloat - - var body: some View { - ZStack { - Image(symbol: .coneFill) - .arrangeShape(width: baseLength * 0.1125, - height: baseLength * 0.2, - flipType: type.appearance.coneFlipType) - - Image(symbol: .handRaisedFill) - .arrangeShape(fontSize: baseLength * 0.1375, - flipType: type.appearance.handFlipType, - offsetY: baseLength * type.appearance.offsetYMagnification) - } - } -} - -struct DemonWrestlerHand_Previews: PreviewProvider { - static var previews: some View { - DemonWrestlerHand(type: .left, - baseLength: 400) - - DemonWrestlerHand(type: .right, - baseLength: 400) - } -} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestler.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestler.swift deleted file mode 100644 index 519fb96..0000000 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestler.swift +++ /dev/null @@ -1,45 +0,0 @@ -// -// ElectroMagneticWaveMan.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/08/01. -// - -import SwiftUI -import SFUserFriendlySymbols - -struct DemonWrestler: View { - - var body: some View { - - GeometryReader { proxy in - let baseLength = proxy.baseLength * 1.2 - - ZStack { - DemonWrestlerBody(baseLength: baseLength) - - DemonWrestlerHand(type: .left, - baseLength: baseLength) - .offset(x: baseLength * 0.19, - y: baseLength * 0.14) - - DemonWrestlerFace(baseLength: baseLength) - .offset(x: baseLength * 0.025, - y: baseLength * -0.325) - - DemonWrestlerHand(type: .right, - baseLength: baseLength) - .offset(x: baseLength * -0.1875, - y: baseLength * -0.465) - } - .scaleEffect(0.8) - .offset(y: 100) - } - } -} - -struct DemonWrestler_Previews: PreviewProvider { - static var previews: some View { - DemonWrestler() - } -} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Face/DemonWrestlerFace.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Face/DemonWrestlerFace.swift deleted file mode 100644 index 6c6ce09..0000000 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Face/DemonWrestlerFace.swift +++ /dev/null @@ -1,70 +0,0 @@ -// -// ElectroMagneticWaveManFace.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/08/01. -// - -import SwiftUI -import SFUserFriendlySymbols - -struct DemonWrestlerFace: View { - - let baseLength: CGFloat - - var body: some View { - ZStack { - DemonWrestlerOutline(baseLength: baseLength) - - VStack(spacing: 1) { - HStack(spacing: 5) { - - ForEach(0..<2) { _ in - ZStack { - Image(symbol: .capsuleFill) - .arrangeShape(color: .indigo, - fontSize: baseLength * 0.033, - offsetY: baseLength * 0.005) - - Image(symbol: .eye) - .arrangeShape(fontSize: baseLength * 0.035) - - Image(symbol: .eyeFill) - .arrangeShape(color: .white, - fontSize: baseLength * 0.031) - } - } - } - - Image(symbol: .nose) - .arrangeShape(fontSize: baseLength * 0.05, - fontWeight: .thin) - - Spacer() - .frame(height: 8) - - ZStack { - Image(symbol: .mouth) - .arrangeShape(fontSize: baseLength * 0.05, - fontWeight: .bold) - - Image(symbol: .mouthFill) - .arrangeShape(color: .red, - fontSize: baseLength * 0.05) - } - } - - Image(symbol: .waveformPath) - .arrangeShape(color: .red, - fontSize: 20, - rotationDegrees: 45, - offsetX: 25) - } - } -} - -struct DemonWrestlerFace_Previews: PreviewProvider { - static var previews: some View { - DemonWrestlerFace(baseLength: 400) - } -} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Face/DemonWrestlerOutline.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Face/DemonWrestlerOutline.swift deleted file mode 100644 index 4689bfa..0000000 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/Face/DemonWrestlerOutline.swift +++ /dev/null @@ -1,94 +0,0 @@ -// -// ElectroMagneticWaveOutline.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/08/02. -// - -import SwiftUI - -struct DemonWrestlerOutline: View { - - let baseLength: CGFloat - - var body: some View { - ZStack { - - // Hat - Group { - - // horns - Group { - Image(symbol: .boltHorizontalFill) - .arrangeShape(color: .red, - fontSize: baseLength * 0.2, - rotationDegrees: 55, - offsetX: baseLength * 0.15, - offsetY: baseLength * -0.2) - - Image(symbol: .boltHorizontal) - .arrangeShape(fontSize: baseLength * 0.25, - fontWeight: .light, - rotationDegrees: 55, - offsetX: baseLength * 0.14, - offsetY: baseLength * -0.19) - - Image(symbol: .boltHorizontalFill) - .arrangeShape(color: .red, - fontSize: baseLength * 0.2, - flipType: .vertical, - rotationDegrees: -55, - offsetX: baseLength * -0.15, - offsetY: baseLength * -0.2) - - Image(symbol: .boltHorizontal) - .arrangeShape(fontSize: baseLength * 0.25, - fontWeight: .light, - flipType: .vertical, - rotationDegrees: -55, - offsetX: baseLength * -0.14, - offsetY: baseLength * -0.19) - } - - Image(symbol: .shieldFill) - .arrangeShape(fontSize: baseLength * 0.375, - flipType: .vertical, - offsetY: baseLength * -0.1) - - ZStack { - Image(symbol: .circleFill) - .arrangeShape(color: .red, - fontSize: baseLength * 0.1, - fontWeight: .bold) - - Image(symbol: ._4AltCircleFill) - .arrangeShape(color: .blue, - fontSize: baseLength * 0.15, - fontWeight: .bold) - } - .offset(x: 0, y: baseLength * -0.175) - } - - ZStack { - Image(symbol: .capsulePortrait) - .arrangeShape(fontSize: baseLength * 0.2025, - fontWeight: .light) - - Image(symbol: .capsulePortraitFill) - .arrangeShape(color: .paleOrange, - fontSize: baseLength * 0.2) - } - - Image(symbol: .chevronCompactDown) - .arrangeShape(fontSize: baseLength * 0.2, - fontWeight: .bold, - offsetY: baseLength * -0.1175) - } - } -} - -struct DemonWrestlerOutline_Previews: PreviewProvider { - static var previews: some View { - DemonWrestlerOutline(baseLength: 400) - } -} From cfa445d40fd47bd0d3fb5406b8a501e7c8007f92 Mon Sep 17 00:00:00 2001 From: littleossa Date: Sun, 11 Feb 2024 06:01:31 +0900 Subject: [PATCH 088/108] Add question mark to Crayonboy --- .../Fireworks/Buildings/Building.swift | 14 ++-- .../ArtWorks/Fireworks/Fireworks.swift | 18 ++--- .../ArtWorks/Fireworks/LargeFirework.swift | 66 +++++++++---------- .../ArtWorks/Fireworks/MediumFirework.swift | 22 +++---- .../ArtWorks/Fireworks/RocketFirework.swift | 46 ++++++------- .../ArtWorks/Fireworks/SmallFirework.swift | 11 ++-- .../iOSDCJapan2022/iOSDCJapan2022Logo.swift | 6 +- .../CrayonBoy/CrayonBoyArtView+CoverArt.swift | 31 ++++++++- 8 files changed, 122 insertions(+), 92 deletions(-) diff --git a/SFSymbolsArtCollection/ArtWorks/Fireworks/Buildings/Building.swift b/SFSymbolsArtCollection/ArtWorks/Fireworks/Buildings/Building.swift index af79cf7..7bdf28b 100644 --- a/SFSymbolsArtCollection/ArtWorks/Fireworks/Buildings/Building.swift +++ b/SFSymbolsArtCollection/ArtWorks/Fireworks/Buildings/Building.swift @@ -17,13 +17,13 @@ struct Building: View { ZStack { - Image(symbol: .rectanglePortraitFill) - .arrangeShape(color: lightColor, - fontSize: fontSize * 0.9) - - Image(symbol: .buildingFill) - .arrangeShape(color: color, - fontSize: fontSize) +// Image(symbol: .rectanglePortraitFill) +// .arrangeShape(color: lightColor, +// fontSize: fontSize * 0.9) +// +// Image(symbol: .buildingFill) +// .arrangeShape(color: color, +// fontSize: fontSize) } } } diff --git a/SFSymbolsArtCollection/ArtWorks/Fireworks/Fireworks.swift b/SFSymbolsArtCollection/ArtWorks/Fireworks/Fireworks.swift index 6ff42b1..2bbcbc1 100644 --- a/SFSymbolsArtCollection/ArtWorks/Fireworks/Fireworks.swift +++ b/SFSymbolsArtCollection/ArtWorks/Fireworks/Fireworks.swift @@ -17,10 +17,10 @@ struct Fireworks: View { // Background ZStack { - Image(symbol: .rectangleFill) - .arrangeShape(color: .midnightNavy, - width: proxy.size.width * 1.5, - height: proxy.size.height * 1.5) +// Image(symbol: .rectangleFill) +// .arrangeShape(color: .midnightNavy, +// width: proxy.size.width * 1.5, +// height: proxy.size.height * 1.5) } .position(proxy.localCenter) @@ -91,11 +91,11 @@ struct Fireworks: View { HStack(spacing: 0) { - // Audience - ForEach(0..<4) { _ in - Image(symbol: .person3SequenceFill) - .arrangeShape(fontSize: baseLength * 0.13) - } +// // Audience +// ForEach(0..<4) { _ in +// Image(symbol: .person3SequenceFill) +// .arrangeShape(fontSize: baseLength * 0.13) +// } } } } diff --git a/SFSymbolsArtCollection/ArtWorks/Fireworks/LargeFirework.swift b/SFSymbolsArtCollection/ArtWorks/Fireworks/LargeFirework.swift index cd98c62..cd58532 100644 --- a/SFSymbolsArtCollection/ArtWorks/Fireworks/LargeFirework.swift +++ b/SFSymbolsArtCollection/ArtWorks/Fireworks/LargeFirework.swift @@ -20,43 +20,43 @@ struct LargeFirework: View { // DotRadiowaves Group { - Image(symbol: .dotRadiowavesRight) - .arrangeShape(color: color, - fontSize: baseLength * 0.25, - fontWeight: .bold, - offsetX: baseLength * 0.095) +// Image(symbol: .dotRadiowavesRight) +// .arrangeShape(color: color, +// fontSize: baseLength * 0.25, +// fontWeight: .bold, +// offsetX: baseLength * 0.095) - Image(symbol: .dotRadiowavesRight) - .arrangeShape(color: color, - fontSize: baseLength * 0.25, - fontWeight: .bold, - flipType: .horizontal, - offsetX: baseLength * -0.095) +// Image(symbol: .dotRadiowavesRight) +// .arrangeShape(color: color, +// fontSize: baseLength * 0.25, +// fontWeight: .bold, +// flipType: .horizontal, +// offsetX: baseLength * -0.095) +// +// Image(symbol: .dotRadiowavesRight) +// .arrangeShape(color: color, +// fontSize: baseLength * 0.25, +// fontWeight: .bold, +// rotationDegrees: 90, +// offsetY: baseLength * -0.095) - Image(symbol: .dotRadiowavesRight) - .arrangeShape(color: color, - fontSize: baseLength * 0.25, - fontWeight: .bold, - rotationDegrees: 90, - offsetY: baseLength * -0.095) - - Image(symbol: .dotRadiowavesRight) - .arrangeShape(color: color, - fontSize: baseLength * 0.25, - fontWeight: .bold, - rotationDegrees: -90, - offsetY: baseLength * 0.095) +// Image(symbol: .dotRadiowavesRight) +// .arrangeShape(color: color, +// fontSize: baseLength * 0.25, +// fontWeight: .bold, +// rotationDegrees: -90, +// offsetY: baseLength * 0.095) } - Image(symbol: .circleDotted) - .arrangeShape(color: dotColor, - fontSize: baseLength * 0.55, - fontWeight: .ultraLight, - rotationDegrees: baseLength * 0.225) - - Image(symbol: .circleFill) - .arrangeShape(color: dotColor, - fontSize: baseLength * 0.085) +// Image(symbol: .circleDotted) +// .arrangeShape(color: dotColor, +// fontSize: baseLength * 0.55, +// fontWeight: .ultraLight, +// rotationDegrees: baseLength * 0.225) +// +// Image(symbol: .circleFill) +// .arrangeShape(color: dotColor, +// fontSize: baseLength * 0.085) } } } diff --git a/SFSymbolsArtCollection/ArtWorks/Fireworks/MediumFirework.swift b/SFSymbolsArtCollection/ArtWorks/Fireworks/MediumFirework.swift index 4cd75cd..3ffa452 100644 --- a/SFSymbolsArtCollection/ArtWorks/Fireworks/MediumFirework.swift +++ b/SFSymbolsArtCollection/ArtWorks/Fireworks/MediumFirework.swift @@ -16,17 +16,17 @@ struct MediumFirework: View { var body: some View { ZStack { - Image(symbol: .helm) - .arrangeShape(color: color, - fontSize: baseLength * 0.25) - - Image(symbol: .circleDotted) - .arrangeShape(color: dotColor, - fontSize: baseLength * 0.30) - - Image(symbol: .circleFill) - .arrangeShape(color: dotColor, - fontSize: baseLength * 0.037) +// Image(symbol: .helm) +// .arrangeShape(color: color, +// fontSize: baseLength * 0.25) +// +// Image(symbol: .circleDotted) +// .arrangeShape(color: dotColor, +// fontSize: baseLength * 0.30) +// +// Image(symbol: .circleFill) +// .arrangeShape(color: dotColor, +// fontSize: baseLength * 0.037) } } } diff --git a/SFSymbolsArtCollection/ArtWorks/Fireworks/RocketFirework.swift b/SFSymbolsArtCollection/ArtWorks/Fireworks/RocketFirework.swift index ef0287e..79835d4 100644 --- a/SFSymbolsArtCollection/ArtWorks/Fireworks/RocketFirework.swift +++ b/SFSymbolsArtCollection/ArtWorks/Fireworks/RocketFirework.swift @@ -15,32 +15,32 @@ struct RocketFirework: View { var body: some View { ZStack { - Image(symbol: .circleFill) - .arrangeShape(color: color, - fontSize: baseLength * 0.05, - offsetY: baseLength * -0.35) +// Image(symbol: .circleFill) +// .arrangeShape(color: color, +// fontSize: baseLength * 0.05, +// offsetY: baseLength * -0.35) // AlternatingCurrents Group { - Image(symbol: .alternatingcurrent) - .arrangeShape(color: color, - width: baseLength * 0.25, - height: baseLength * 0.025, - rotationDegrees: 90, - offsetY: baseLength * -0.22) - - Image(symbol: .alternatingcurrent) - .arrangeShape(color: color, - width: baseLength * 0.25, - height: baseLength * 0.025, - rotationDegrees: 90) - - Image(symbol: .alternatingcurrent) - .arrangeShape(color: color, - width: baseLength * 0.25, - height: baseLength * 0.025, - rotationDegrees: 90, - offsetY: baseLength * 0.22) +// Image(symbol: .alternatingcurrent) +// .arrangeShape(color: color, +// width: baseLength * 0.25, +// height: baseLength * 0.025, +// rotationDegrees: 90, +// offsetY: baseLength * -0.22) +// +// Image(symbol: .alternatingcurrent) +// .arrangeShape(color: color, +// width: baseLength * 0.25, +// height: baseLength * 0.025, +// rotationDegrees: 90) +// +// Image(symbol: .alternatingcurrent) +// .arrangeShape(color: color, +// width: baseLength * 0.25, +// height: baseLength * 0.025, +// rotationDegrees: 90, +// offsetY: baseLength * 0.22) } } } diff --git a/SFSymbolsArtCollection/ArtWorks/Fireworks/SmallFirework.swift b/SFSymbolsArtCollection/ArtWorks/Fireworks/SmallFirework.swift index 5d987d8..f510283 100644 --- a/SFSymbolsArtCollection/ArtWorks/Fireworks/SmallFirework.swift +++ b/SFSymbolsArtCollection/ArtWorks/Fireworks/SmallFirework.swift @@ -15,12 +15,13 @@ struct SmallFirework: View { let offsetY: CGFloat var body: some View { + ZStack {} - Image(symbol: .timelapse) - .arrangeShape(color: color, - fontSize: fontSize, - offsetX: offsetX, - offsetY: offsetY) +// Image(symbol: .timelapse) +// .arrangeShape(color: color, +// fontSize: fontSize, +// offsetX: offsetX, +// offsetY: offsetY) } } diff --git a/SFSymbolsArtCollection/ArtWorks/iOSDCJapan2022/iOSDCJapan2022Logo.swift b/SFSymbolsArtCollection/ArtWorks/iOSDCJapan2022/iOSDCJapan2022Logo.swift index 319c036..dc75907 100644 --- a/SFSymbolsArtCollection/ArtWorks/iOSDCJapan2022/iOSDCJapan2022Logo.swift +++ b/SFSymbolsArtCollection/ArtWorks/iOSDCJapan2022/iOSDCJapan2022Logo.swift @@ -25,9 +25,9 @@ struct iOSDCJapan2022Logo: View { y: baseLength * appearance.offsetYMagnification) } - Image(symbol: .circleSquareFill) - .arrangeShape(color: .white, - fontSize: baseLength) +// Image(symbol: .circleSquareFill) +// .arrangeShape(color: .white, +// fontSize: baseLength) } .position(proxy.localCenter) } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView+CoverArt.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView+CoverArt.swift index df3c218..c02ec8b 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView+CoverArt.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView+CoverArt.swift @@ -8,14 +8,43 @@ import SwiftUI extension CrayonBoyArtView { - + struct CoverArt: View { + + @Environment(ArtWorkModel.self) var model var body: some View { ZStack { ForEach(Element.allCases) { SymbolArtDisplayView(element: $0.value) } + + Image(systemName: "cloud.fill") + .resizable() + .foregroundStyle(.black.opacity(0.9)) + .frame( + width: model.calculatingProportionalValue( + withRatio: 0.85, + shouldResizeForCoverArt: true + ), + height: model.calculatingProportionalValue( + withRatio: 0.6, + shouldResizeForCoverArt: true + ) + ) + .rotationEffect(.degrees(8)) + .rotation3DEffect( + .degrees(180), + axis: (x: 0, y: 1, z: 0) + ) + + Image(systemName: "questionmark.app.fill") + .foregroundStyle(.white, .black.opacity(0.9)) + .font(.system(size: model.calculatingProportionalValue( + withRatio: 0.4, + shouldResizeForCoverArt: true + ))) + .bold() } } } From 5f226c3ef1d5e0aec0010a1d227d2c688e2ed5c8 Mon Sep 17 00:00:00 2001 From: littleossa Date: Sun, 11 Feb 2024 06:04:53 +0900 Subject: [PATCH 089/108] Add comment ArtWorkModel.preview --- .../Common/Models/ArtWorkModel/ArtWorkModel.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel.swift index 2821597..3e74fd9 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/ArtWorkModel/ArtWorkModel.swift @@ -10,6 +10,7 @@ import SwiftUI @Observable class ArtWorkModel { + /// this model is for Xcode preview that provides base length for iPad Pro 12.9. static let preview = ArtWorkModel(screenSize: CGSize(width: 1024, height: 1024)) init(screenSize: CGSize) { From 09dd971a255d9adc9ef7a0a75f7f49520b0b33a8 Mon Sep 17 00:00:00 2001 From: littleossa Date: Sun, 11 Feb 2024 17:47:17 +0900 Subject: [PATCH 090/108] Add FireworksArtView+CoverArt --- .../project.pbxproj | 20 + .../ArtGalleryView.swift | 10 + .../Fireworks/FireworksArtView+CoverArt.swift | 22 + .../Fireworks/FireworksArtView+Element.swift | 426 ++++++++++++++++++ .../ArtWorks/Fireworks/FireworksArtView.swift | 44 ++ .../Common/Views/GalleryGridView.swift | 10 +- .../Extensions/Color+.swift | 1 + 7 files changed, 529 insertions(+), 4 deletions(-) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView+CoverArt.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView+Element.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 501a11a..5bb6170 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -41,6 +41,9 @@ 9767DF292B76FF0400457DA1 /* DemonWrestlerArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF282B76FF0400457DA1 /* DemonWrestlerArtView.swift */; }; 9767DF2B2B776D5800457DA1 /* DemonWrestlerArtView+CoverArt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF2A2B776D5800457DA1 /* DemonWrestlerArtView+CoverArt.swift */; }; 9767DF2D2B776DA100457DA1 /* DemonWrestlerArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DF2C2B776DA100457DA1 /* DemonWrestlerArtView+Element.swift */; }; + 9778A4932B781DCE001BF9E8 /* FireworksArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9778A4922B781DCE001BF9E8 /* FireworksArtView.swift */; }; + 9778A4952B78C076001BF9E8 /* FireworksArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9778A4942B78C076001BF9E8 /* FireworksArtView+Element.swift */; }; + 9778A4972B78C0C2001BF9E8 /* FireworksArtView+CoverArt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9778A4962B78C0C2001BF9E8 /* FireworksArtView+CoverArt.swift */; }; 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; @@ -106,6 +109,9 @@ 9767DF282B76FF0400457DA1 /* DemonWrestlerArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemonWrestlerArtView.swift; sourceTree = ""; }; 9767DF2A2B776D5800457DA1 /* DemonWrestlerArtView+CoverArt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DemonWrestlerArtView+CoverArt.swift"; sourceTree = ""; }; 9767DF2C2B776DA100457DA1 /* DemonWrestlerArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DemonWrestlerArtView+Element.swift"; sourceTree = ""; }; + 9778A4922B781DCE001BF9E8 /* FireworksArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FireworksArtView.swift; sourceTree = ""; }; + 9778A4942B78C076001BF9E8 /* FireworksArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FireworksArtView+Element.swift"; sourceTree = ""; }; + 9778A4962B78C0C2001BF9E8 /* FireworksArtView+CoverArt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FireworksArtView+CoverArt.swift"; sourceTree = ""; }; 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; @@ -252,6 +258,16 @@ path = ArmHair; sourceTree = ""; }; + 9778A4912B781DA6001BF9E8 /* Fireworks */ = { + isa = PBXGroup; + children = ( + 9778A4922B781DCE001BF9E8 /* FireworksArtView.swift */, + 9778A4942B78C076001BF9E8 /* FireworksArtView+Element.swift */, + 9778A4962B78C0C2001BF9E8 /* FireworksArtView+CoverArt.swift */, + ); + path = Fireworks; + sourceTree = ""; + }; 97AD530D2B70DBC70034FB5D /* ArtisticWorldOfSFSymbols */ = { isa = PBXGroup; children = ( @@ -302,6 +318,7 @@ 9767DF012B759AFC00457DA1 /* PartyAnimals */, 9767DF212B7658CB00457DA1 /* ArmHair */, 9748BE4428980FE4006DF0BE /* DemonWrestler */, + 9778A4912B781DA6001BF9E8 /* Fireworks */, 97AD531E2B70E2770034FB5D /* AfroBoy */, 97EF43892B725DE7003648F5 /* Nosebleed */, 97EF43912B72D3AF003648F5 /* ImWearingPants */, @@ -519,6 +536,7 @@ 9767DF172B75FF0700457DA1 /* PartyAnimalsArtView+Element.swift in Sources */, 9767DF0D2B75DDEC00457DA1 /* AfroBoyArtView+Element.swift in Sources */, 97EF43932B72D3E2003648F5 /* ImWearingPantsArtView+CoverArt.swift in Sources */, + 9778A4952B78C076001BF9E8 /* FireworksArtView+Element.swift in Sources */, 97EF439E2B744C4C003648F5 /* Color+.swift in Sources */, 97624C2F28C2E608004E1720 /* SmallFirework.swift in Sources */, 9767DF2B2B776D5800457DA1 /* DemonWrestlerArtView+CoverArt.swift in Sources */, @@ -529,6 +547,7 @@ 97AD532D2B717C950034FB5D /* AfroBoyArtView+CoverArt.swift in Sources */, 97EF438B2B725E02003648F5 /* NosebleedArtView.swift in Sources */, 971D9DEA28C9731D00136A36 /* iOSDCJapan2022SymbolType.swift in Sources */, + 9778A4932B781DCE001BF9E8 /* FireworksArtView.swift in Sources */, 97AD53182B70DFF30034FB5D /* AnimationValues.swift in Sources */, 9767DF152B75F7BE00457DA1 /* WorldPeaceArtView+Element.swift in Sources */, 97624C2A28C2BC9A004E1720 /* MediumFirework.swift in Sources */, @@ -544,6 +563,7 @@ 9748BE5D289DD696006DF0BE /* Building.swift in Sources */, 97AD53312B71A5130034FB5D /* GalleryGridView.swift in Sources */, 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */, + 9778A4972B78C0C2001BF9E8 /* FireworksArtView+CoverArt.swift in Sources */, 9748BE6628A395D5006DF0BE /* ArtWork.swift in Sources */, 9767DF272B76CCE300457DA1 /* ArmHairArtView+Element.swift in Sources */, 9767DF292B76FF0400457DA1 /* DemonWrestlerArtView.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift index d68a5b4..4d715d7 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift @@ -82,6 +82,16 @@ struct ArtGalleryView: View { .galleryGridItemView(length: model.galleryColumnLength) } + NavigationLink { + FireworksArtView() + } label: { + FireworksArtView.CoverArt() + .galleryGridItemView( + backgroundColor: .midnightNavy, + length: model.galleryColumnLength + ) + } + NavigationLink { AfroBoyArtView() } label: { diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView+CoverArt.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView+CoverArt.swift new file mode 100644 index 0000000..1c013bb --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView+CoverArt.swift @@ -0,0 +1,22 @@ +// +// FireworksArtView+CoverArt.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension FireworksArtView { + + struct CoverArt: View { + + var body: some View { + ZStack { + ForEach(Element.allCases) { + SymbolArtDisplayView(element: $0.value) + } + } + } + } +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView+Element.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView+Element.swift new file mode 100644 index 0000000..fd4d57b --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView+Element.swift @@ -0,0 +1,426 @@ +// +// FireworksArtView+Element.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension FireworksArtView { + + enum Element: String, CaseIterable, Identifiable { + case moon + case rocketFireworkYellow + case rocketFireworkYellowConcealmentRight + case rocketFireworkYellowConcealmentLeft + case rocketFireworkYellowTop + case rocketFireworkWhite + case rocketFireworkWhiteConcealmentRight + case rocketFireworkWhiteConcealmentLeft + case rocketFireworkWhiteTop + case buildingLarge + case buildingSmall + case litBuildingLarge + case litBuildingSmall + case personRight + case personLeft + case personCenterRight + case personCenterLeft + case smallFireworkPink + case smallFireworkYellow + case smallFireworkGreen + case mediumFirework + case largeHorizontalFireworkLeft + case largeVerticalFireworkLeft + case largeDotFireworkLeft + case largeHorizontalFireworkRight + case largeVerticalFireworkRight + case largeDotFireworkRight + + var id: String { rawValue } + + var value: SymbolArtElement { + switch self { + case .moon: + SymbolArtElement( + symbol: "􀇁", + name: "moon.stars.fill", + initialPosition: .none, + primaryColor: .yellow.opacity(0.7), + secondaryColor: .awesomeYellow.opacity(0.6), + widthRatio: 0.12, + heightRatio: 0.12, + horizontalOffsetRatio: 0.4, + verticalOffsetRatio: -0.51, + symbolCountToWaitFor: 0 + ) + + case .rocketFireworkYellow: + SymbolArtElement( + symbol: "􁎄", + name: "water.waves", + initialPosition: .none, + primaryColor: .yellow, + fontWeight: .ultraLight, + widthRatio: 0.57, + heightRatio: 0.2, + rotationDegrees: 90, + horizontalOffsetRatio: -0.01, + verticalOffsetRatio: 0.305, + symbolCountToWaitFor: 0 + ) + + case .rocketFireworkYellowConcealmentRight: + SymbolArtElement( + symbol: "􀏄", + name: "rectangle.fill", + initialPosition: .none, + primaryColor: .midnightNavy, + widthRatio: 0.1, + heightRatio: 0.57, + horizontalOffsetRatio: -0.1, + verticalOffsetRatio: 0.3, + symbolCountToWaitFor: 0 + ) + + case .rocketFireworkYellowConcealmentLeft: + SymbolArtElement( + symbol: "􀏄", + name: "rectangle.fill", + initialPosition: .none, + primaryColor: .midnightNavy, + widthRatio: 0.1, + heightRatio: 0.57, + horizontalOffsetRatio: 0.08, + verticalOffsetRatio: 0.3, + symbolCountToWaitFor: 0 + ) + + case .rocketFireworkYellowTop: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .none, + primaryColor: .yellow, + widthRatio: 0.04, + heightRatio: 0.045, + horizontalOffsetRatio: -0.02, + verticalOffsetRatio: 0.03, + symbolCountToWaitFor: 0 + ) + + case .rocketFireworkWhite: + SymbolArtElement( + symbol: "􁎄", + name: "water.waves", + initialPosition: .none, + primaryColor: .white, + fontWeight: .ultraLight, + widthRatio: 0.43, + heightRatio: 0.2, + rotationDegrees: 90, + horizontalOffsetRatio: -0.18, + verticalOffsetRatio: 0.37, + symbolCountToWaitFor: 0 + ) + + case .rocketFireworkWhiteConcealmentRight: + SymbolArtElement( + symbol: "􀏄", + name: "rectangle.fill", + initialPosition: .none, + primaryColor: .midnightNavy, + widthRatio: 0.08, + heightRatio: 0.46, + horizontalOffsetRatio: -0.09, + verticalOffsetRatio: 0.355, + symbolCountToWaitFor: 0 + ) + + case .rocketFireworkWhiteConcealmentLeft: + SymbolArtElement( + symbol: "􀏄", + name: "rectangle.fill", + initialPosition: .none, + primaryColor: .midnightNavy, + widthRatio: 0.08, + heightRatio: 0.46, + horizontalOffsetRatio: -0.26, + verticalOffsetRatio: 0.355, + symbolCountToWaitFor: 0 + ) + + case .rocketFireworkWhiteTop: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .none, + primaryColor: .white, + widthRatio: 0.04, + heightRatio: 0.045, + horizontalOffsetRatio: -0.19, + verticalOffsetRatio: 0.2, + symbolCountToWaitFor: 0 + ) + + case .buildingLarge: + SymbolArtElement( + symbol: "􀏄", + name: "rectangle.fill", + initialPosition: .third(.third), + primaryColor: .yellow, + widthRatio: 0.18, + heightRatio: 0.3, + horizontalOffsetRatio: 0.07, + verticalOffsetRatio: 0.434, + symbolCountToWaitFor: 0 + ) + case .buildingSmall: + SymbolArtElement( + symbol: "􀏄", + name: "rectangle.fill", + initialPosition: .third(.third), + primaryColor: .yellow, + widthRatio: 0.1, + heightRatio: 0.17, + horizontalOffsetRatio: -0.09, + verticalOffsetRatio: 0.497, + symbolCountToWaitFor: 0 + ) + case .litBuildingLarge: + SymbolArtElement( + symbol: "􀮆", + name: "building.fill", + initialPosition: .third(.second), + primaryColor: .lightGray, + widthRatio: 0.2, + heightRatio: 0.3, + horizontalOffsetRatio: 0.07, + verticalOffsetRatio: 0.434, + symbolCountToWaitFor: 0 + ) + case .litBuildingSmall: + SymbolArtElement( + symbol: "􀮆", + name: "building.fill", + initialPosition: .third(.second), + primaryColor: .lightGray, + widthRatio: 0.12, + heightRatio: 0.17, + horizontalOffsetRatio: -0.09, + verticalOffsetRatio: 0.497, + symbolCountToWaitFor: 0 + ) + case .personRight: + SymbolArtElement( + symbol: "􀻸", + name: "person.3.sequence.fill", + initialPosition: .none, + primaryColor: .black, + secondaryColor: .black, + widthRatio: 0.2, + heightRatio: 0.1, + flip: .horizontal, + horizontalOffsetRatio: 0.34, + verticalOffsetRatio: 0.538, + symbolCountToWaitFor: 0 + ) + + case .personLeft: + SymbolArtElement( + symbol: "􀻸", + name: "person.3.sequence.fill", + initialPosition: .none, + primaryColor: .black, + secondaryColor: .black, + widthRatio: 0.2, + heightRatio: 0.1, + horizontalOffsetRatio: -0.34, + verticalOffsetRatio: 0.538, + symbolCountToWaitFor: 0 + ) + case .personCenterRight: + SymbolArtElement( + symbol: "􀝋", + name: "person.3.fill", + initialPosition: .none, + primaryColor: .black, + secondaryColor: .black, + widthRatio: 0.2, + heightRatio: 0.1, + horizontalOffsetRatio: 0.12, + verticalOffsetRatio: 0.538, + symbolCountToWaitFor: 0 + ) + case .personCenterLeft: + SymbolArtElement( + symbol: "􀝋", + name: "person.3.fill", + initialPosition: .none, + primaryColor: .black, + secondaryColor: .black, + widthRatio: 0.2, + heightRatio: 0.1, + horizontalOffsetRatio: -0.12, + verticalOffsetRatio: 0.538, + symbolCountToWaitFor: 0 + ) + + case .smallFireworkPink: + SymbolArtElement( + symbol: "􀇲", + name: "timelapse", + initialPosition: .none, + primaryColor: .pink, + widthRatio: 0.125, + heightRatio: 0.125, + horizontalOffsetRatio: -0.225, + verticalOffsetRatio: 0.125, + symbolCountToWaitFor: 0 + ) + case .smallFireworkYellow: + SymbolArtElement( + symbol: "􀇲", + name: "timelapse", + initialPosition: .none, + primaryColor: .yellow, + widthRatio: 0.125, + heightRatio: 0.125, + horizontalOffsetRatio: -0.075, + verticalOffsetRatio: 0.25, + symbolCountToWaitFor: 0 + ) + case .smallFireworkGreen: + SymbolArtElement( + symbol: "􀇲", + name: "timelapse", + initialPosition: .none, + primaryColor: .green, + widthRatio: 0.125, + heightRatio: 0.125, + horizontalOffsetRatio: 0.34, + verticalOffsetRatio: 0.18, + symbolCountToWaitFor: 0 + ) + case .mediumFirework: + SymbolArtElement( + symbol: "􂁞", + name: "fireworks", + initialPosition: .none, + primaryColor: .yellow, + secondaryColor: .red, + widthRatio: 0.24, + heightRatio: 0.24, + horizontalOffsetRatio: 0.14, + verticalOffsetRatio: 0.07, + symbolCountToWaitFor: 0 + ) + case .largeHorizontalFireworkLeft: + SymbolArtElement( + symbol: "􀌙", + name: "dot.radiowaves.left.and.right", + initialPosition: .none, + primaryColor: .white, + secondaryColor: .red, + fontWeight: .black, + widthRatio: 0.347, + heightRatio: 0.235, + horizontalOffsetRatio: -0.17, + verticalOffsetRatio: -0.18, + symbolCountToWaitFor: 0 + ) + case .largeVerticalFireworkLeft: + SymbolArtElement( + symbol: "􀌙", + name: "dot.radiowaves.left.and.right", + initialPosition: .none, + primaryColor: .white, + secondaryColor: .red, + fontWeight: .black, + widthRatio: 0.347, + heightRatio: 0.235, + rotationDegrees: 90, + horizontalOffsetRatio: -0.17, + verticalOffsetRatio: -0.18, + symbolCountToWaitFor: 0 + ) + + case .largeDotFireworkLeft: + SymbolArtElement( + symbol: "􁅃", + name: "circle.dotted", + initialPosition: .none, + primaryColor: .white, + fontWeight: .ultraLight, + widthRatio: 0.42, + heightRatio: 0.42, + rotationDegrees: 90, + horizontalOffsetRatio: -0.17, + verticalOffsetRatio: -0.18, + symbolCountToWaitFor: 0 + ) + + case .largeHorizontalFireworkRight: + SymbolArtElement( + symbol: "􀌙", + name: "dot.radiowaves.left.and.right", + initialPosition: .none, + primaryColor: .yellow, + secondaryColor: .white, + fontWeight: .black, + widthRatio: 0.347, + heightRatio: 0.235, + horizontalOffsetRatio: 0.105, + verticalOffsetRatio: -0.34, + symbolCountToWaitFor: 0 + ) + case .largeVerticalFireworkRight: + SymbolArtElement( + symbol: "􀌙", + name: "dot.radiowaves.left.and.right", + initialPosition: .none, + primaryColor: .yellow, + secondaryColor: .white, + fontWeight: .black, + widthRatio: 0.347, + heightRatio: 0.235, + rotationDegrees: 90, + horizontalOffsetRatio: 0.1, + verticalOffsetRatio: -0.34, + symbolCountToWaitFor: 0 + ) + case .largeDotFireworkRight: + SymbolArtElement( + symbol: "􁅃", + name: "circle.dotted", + initialPosition: .none, + primaryColor: .yellow, + secondaryColor: .white, + fontWeight: .ultraLight, + widthRatio: 0.42, + heightRatio: 0.42, + rotationDegrees: 90, + horizontalOffsetRatio: 0.1, + verticalOffsetRatio: -0.34, + symbolCountToWaitFor: 0 + ) + } + } + } +} + +#Preview { + NavigationStack { + FireworksArtView() + .environment(ArtWorkModel.preview) + } +} + +#Preview { + Color.midnightNavy + .overlay { + FireworksArtView.CoverArt() + .environment(ArtWorkModel.preview) + } +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView.swift new file mode 100644 index 0000000..7638158 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView.swift @@ -0,0 +1,44 @@ +// +// FireworksArtView.swift +// SFSymbolsArtCollection +// +// Created Lil Ossa +// + +import SwiftUI + +struct FireworksArtView: View { + + @State private var isAnimating = false + + var body: some View { + + ZStack { + Color.midnightNavy + + ForEach(Element.allCases) { + SymbolArtDisplayView(shouldResizeForCoverArt: false, element: $0.value) + } + } + .navigationTitle("Fireworks") + .navigationBarTitleDisplayMode(.inline) + .toolbar(content: { + ToolbarItemGroup(placement: .bottomBar) { + Spacer() + + PlayButton { + isAnimating = true + } + .font(.system(size: 32)) + .disabled(isAnimating) + } + }) + } +} + +#Preview { + NavigationStack { + FireworksArtView() + .environment(ArtWorkModel.preview) + } +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/GalleryGridView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/GalleryGridView.swift index 408f144..d0396c1 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/GalleryGridView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Views/GalleryGridView.swift @@ -9,8 +9,8 @@ import SwiftUI extension View { - func galleryGridItemView(length: CGFloat) -> some View { - GalleryGridItemView(length: length) { + func galleryGridItemView(backgroundColor: Color = .white, length: CGFloat) -> some View { + GalleryGridItemView(backgroundColor: backgroundColor, length: length) { self } } @@ -18,11 +18,13 @@ extension View { struct GalleryGridItemView: View { - init(length: CGFloat, @ViewBuilder content: () -> Content) { + init(backgroundColor: Color = .white, length: CGFloat, @ViewBuilder content: () -> Content) { + self.backgroundColor = backgroundColor self.length = length self.content = content() } + let backgroundColor: Color let length: CGFloat let content: Content @@ -45,7 +47,7 @@ struct GalleryGridItemView: View { } .frame(width: length, height: length) - .background(RoundedRectangle(cornerRadius: 12).fill(.white).shadow(radius: 4)) + .background(RoundedRectangle(cornerRadius: 12).fill(backgroundColor).shadow(radius: 4)) .padding(.top, 16) } } diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/Color+.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/Color+.swift index 276e0b7..5631093 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/Color+.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Extensions/Color+.swift @@ -9,4 +9,5 @@ import SwiftUI extension Color { static let systemBackground: Color = .init(uiColor: .systemBackground) + static let lightGray: Color = .init(uiColor: .lightGray) } From a3e62022e24050d93acc547720acd33f9dc0dc09 Mon Sep 17 00:00:00 2001 From: littleossa Date: Sun, 11 Feb 2024 17:47:44 +0900 Subject: [PATCH 091/108] Remove old fireworksArt --- .../project.pbxproj | 44 ------- .../Fireworks/Buildings/Building.swift | 37 ------ .../Fireworks/Buildings/Buildings.swift | 45 ------- .../ArtWorks/Fireworks/Fireworks.swift | 110 ------------------ .../ArtWorks/Fireworks/LargeFirework.swift | 71 ----------- .../ArtWorks/Fireworks/MediumFirework.swift | 40 ------- .../ArtWorks/Fireworks/RocketFirework.swift | 54 --------- .../ArtWorks/Fireworks/SmallFirework.swift | 35 ------ 8 files changed, 436 deletions(-) delete mode 100644 SFSymbolsArtCollection/ArtWorks/Fireworks/Buildings/Building.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/Fireworks/Buildings/Buildings.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/Fireworks/Fireworks.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/Fireworks/LargeFirework.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/Fireworks/MediumFirework.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/Fireworks/RocketFirework.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/Fireworks/SmallFirework.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 5bb6170..46815c0 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -11,14 +11,7 @@ 973B2CA128C2546C006ED5F0 /* ArrangeShapeWithFont.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973B2CA028C2546C006ED5F0 /* ArrangeShapeWithFont.swift */; }; 973B2CA428C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973B2CA328C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift */; }; 9748BE2028939B04006DF0BE /* FlipType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE1F28939B04006DF0BE /* FlipType.swift */; }; - 9748BE57289DCBB0006DF0BE /* LargeFirework.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE56289DCBB0006DF0BE /* LargeFirework.swift */; }; - 9748BE59289DCE17006DF0BE /* Fireworks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE58289DCE17006DF0BE /* Fireworks.swift */; }; - 9748BE5D289DD696006DF0BE /* Building.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE5C289DD696006DF0BE /* Building.swift */; }; - 9748BE5F289F194E006DF0BE /* RocketFirework.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE5E289F194E006DF0BE /* RocketFirework.swift */; }; 9748BE6628A395D5006DF0BE /* ArtWork.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE6528A395D5006DF0BE /* ArtWork.swift */; }; - 97624C2A28C2BC9A004E1720 /* MediumFirework.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C2928C2BC9A004E1720 /* MediumFirework.swift */; }; - 97624C2C28C2DDAA004E1720 /* Buildings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C2B28C2DDAA004E1720 /* Buildings.swift */; }; - 97624C2F28C2E608004E1720 /* SmallFirework.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C2E28C2E608004E1720 /* SmallFirework.swift */; }; 97624C3328C4F43F004E1720 /* GeometryProxy+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3228C4F43F004E1720 /* GeometryProxy+.swift */; }; 9767DEFA2B751C2C00457DA1 /* WorldPeaceArtView+CoverArt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEF92B751C2C00457DA1 /* WorldPeaceArtView+CoverArt.swift */; }; 9767DF002B752E4700457DA1 /* WorldPeaceArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEFF2B752E4700457DA1 /* WorldPeaceArtView.swift */; }; @@ -78,15 +71,8 @@ 973B2CA028C2546C006ED5F0 /* ArrangeShapeWithFont.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrangeShapeWithFont.swift; sourceTree = ""; }; 973B2CA328C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrangeShapeWithWidthAndHeight.swift; sourceTree = ""; }; 9748BE1F28939B04006DF0BE /* FlipType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlipType.swift; sourceTree = ""; }; - 9748BE56289DCBB0006DF0BE /* LargeFirework.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LargeFirework.swift; sourceTree = ""; }; - 9748BE58289DCE17006DF0BE /* Fireworks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Fireworks.swift; sourceTree = ""; }; - 9748BE5C289DD696006DF0BE /* Building.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Building.swift; sourceTree = ""; }; - 9748BE5E289F194E006DF0BE /* RocketFirework.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RocketFirework.swift; sourceTree = ""; }; 9748BE62289F4BFB006DF0BE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; 9748BE6528A395D5006DF0BE /* ArtWork.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtWork.swift; sourceTree = ""; }; - 97624C2928C2BC9A004E1720 /* MediumFirework.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediumFirework.swift; sourceTree = ""; }; - 97624C2B28C2DDAA004E1720 /* Buildings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Buildings.swift; sourceTree = ""; }; - 97624C2E28C2E608004E1720 /* SmallFirework.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmallFirework.swift; sourceTree = ""; }; 97624C3228C4F43F004E1720 /* GeometryProxy+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GeometryProxy+.swift"; sourceTree = ""; }; 9767DEF92B751C2C00457DA1 /* WorldPeaceArtView+CoverArt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorldPeaceArtView+CoverArt.swift"; sourceTree = ""; }; 9767DEFF2B752E4700457DA1 /* WorldPeaceArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorldPeaceArtView.swift; sourceTree = ""; }; @@ -196,33 +182,10 @@ path = DemonWrestler; sourceTree = ""; }; - 9748BE55289DCB82006DF0BE /* Fireworks */ = { - isa = PBXGroup; - children = ( - 9748BE58289DCE17006DF0BE /* Fireworks.swift */, - 9748BE56289DCBB0006DF0BE /* LargeFirework.swift */, - 97624C2928C2BC9A004E1720 /* MediumFirework.swift */, - 97624C2E28C2E608004E1720 /* SmallFirework.swift */, - 9748BE5E289F194E006DF0BE /* RocketFirework.swift */, - 97624C2D28C2E43C004E1720 /* Buildings */, - ); - path = Fireworks; - sourceTree = ""; - }; - 97624C2D28C2E43C004E1720 /* Buildings */ = { - isa = PBXGroup; - children = ( - 97624C2B28C2DDAA004E1720 /* Buildings.swift */, - 9748BE5C289DD696006DF0BE /* Building.swift */, - ); - path = Buildings; - sourceTree = ""; - }; 97624C3628C74AA0004E1720 /* ArtWorks */ = { isa = PBXGroup; children = ( 9748BE6528A395D5006DF0BE /* ArtWork.swift */, - 9748BE55289DCB82006DF0BE /* Fireworks */, 97CD46E528BEF8A000919B65 /* iOSDCJapan2022 */, ); path = ArtWorks; @@ -538,9 +501,7 @@ 97EF43932B72D3E2003648F5 /* ImWearingPantsArtView+CoverArt.swift in Sources */, 9778A4952B78C076001BF9E8 /* FireworksArtView+Element.swift in Sources */, 97EF439E2B744C4C003648F5 /* Color+.swift in Sources */, - 97624C2F28C2E608004E1720 /* SmallFirework.swift in Sources */, 9767DF2B2B776D5800457DA1 /* DemonWrestlerArtView+CoverArt.swift in Sources */, - 9748BE57289DCBB0006DF0BE /* LargeFirework.swift in Sources */, 9767DF2D2B776DA100457DA1 /* DemonWrestlerArtView+Element.swift in Sources */, 9767DF002B752E4700457DA1 /* WorldPeaceArtView.swift in Sources */, 9767DF132B75EDB700457DA1 /* CrayonBoyArtView+Element.swift in Sources */, @@ -550,7 +511,6 @@ 9778A4932B781DCE001BF9E8 /* FireworksArtView.swift in Sources */, 97AD53182B70DFF30034FB5D /* AnimationValues.swift in Sources */, 9767DF152B75F7BE00457DA1 /* WorldPeaceArtView+Element.swift in Sources */, - 97624C2A28C2BC9A004E1720 /* MediumFirework.swift in Sources */, 97EF43982B733337003648F5 /* MagicianArtView.swift in Sources */, 9767DEFA2B751C2C00457DA1 /* WorldPeaceArtView+CoverArt.swift in Sources */, 97CD46E928BF080300919B65 /* iOSDCJapan2022Logo.swift in Sources */, @@ -558,9 +518,6 @@ 9748BE2028939B04006DF0BE /* FlipType.swift in Sources */, 97AD531A2B70E0530034FB5D /* Font.Weight+.swift in Sources */, 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */, - 9748BE5F289F194E006DF0BE /* RocketFirework.swift in Sources */, - 9748BE59289DCE17006DF0BE /* Fireworks.swift in Sources */, - 9748BE5D289DD696006DF0BE /* Building.swift in Sources */, 97AD53312B71A5130034FB5D /* GalleryGridView.swift in Sources */, 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */, 9778A4972B78C0C2001BF9E8 /* FireworksArtView+CoverArt.swift in Sources */, @@ -581,7 +538,6 @@ 97EF43A52B74F27D003648F5 /* CrayonBoyArtView.swift in Sources */, 9767DF052B75AFE200457DA1 /* PartyAnimalsArtView.swift in Sources */, 9767DF1F2B762E9000457DA1 /* ImWearingPantsArtView+FaceElement.swift in Sources */, - 97624C2C28C2DDAA004E1720 /* Buildings.swift in Sources */, 97AD53222B70E3FA0034FB5D /* AnimatableSymbolView.swift in Sources */, 9767DF032B759B2D00457DA1 /* PartyAnimalsArtView+CoverArt.swift in Sources */, 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtWorks/Fireworks/Buildings/Building.swift b/SFSymbolsArtCollection/ArtWorks/Fireworks/Buildings/Building.swift deleted file mode 100644 index 7bdf28b..0000000 --- a/SFSymbolsArtCollection/ArtWorks/Fireworks/Buildings/Building.swift +++ /dev/null @@ -1,37 +0,0 @@ -// -// Building.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/08/06. -// - -import SwiftUI - -struct Building: View { - - let fontSize: CGFloat - let color: Color - let lightColor: Color - - var body: some View { - - ZStack { - -// Image(symbol: .rectanglePortraitFill) -// .arrangeShape(color: lightColor, -// fontSize: fontSize * 0.9) -// -// Image(symbol: .buildingFill) -// .arrangeShape(color: color, -// fontSize: fontSize) - } - } -} - -struct Building_Previews: PreviewProvider { - static var previews: some View { - Building(fontSize: 180, - color: .black, - lightColor: .yellow) - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/Fireworks/Buildings/Buildings.swift b/SFSymbolsArtCollection/ArtWorks/Fireworks/Buildings/Buildings.swift deleted file mode 100644 index f132731..0000000 --- a/SFSymbolsArtCollection/ArtWorks/Fireworks/Buildings/Buildings.swift +++ /dev/null @@ -1,45 +0,0 @@ -// -// Buildings.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/09/03. -// - -import SwiftUI - -struct Buildings: View { - - let baseLength: CGFloat - let color: Color - let lightColor: Color - - var body: some View { - - HStack(spacing: 0) { - - Spacer() - - Building(fontSize: baseLength * 0.25, - color: color, - lightColor: lightColor) - .offset(x: baseLength * 0.09, - y: baseLength * 0.1) - - Building(fontSize: baseLength * 0.45, - color: color, - lightColor: lightColor) - - Spacer() - } - .offset(x: baseLength * -0.05, - y: 0) - } -} - -struct Buildings_Previews: PreviewProvider { - static var previews: some View { - Buildings(baseLength: 400, - color: .black, - lightColor: .yellow) - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/Fireworks/Fireworks.swift b/SFSymbolsArtCollection/ArtWorks/Fireworks/Fireworks.swift deleted file mode 100644 index 2bbcbc1..0000000 --- a/SFSymbolsArtCollection/ArtWorks/Fireworks/Fireworks.swift +++ /dev/null @@ -1,110 +0,0 @@ -// -// Fireworks.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/08/06. -// - -import SwiftUI - -struct Fireworks: View { - - var body: some View { - - GeometryReader { proxy in - - let baseLength = proxy.baseLength - - // Background - ZStack { -// Image(symbol: .rectangleFill) -// .arrangeShape(color: .midnightNavy, -// width: proxy.size.width * 1.5, -// height: proxy.size.height * 1.5) - } - .position(proxy.localCenter) - - ZStack { - - // SmallFireworks - Group { - SmallFirework(color: .pink, - fontSize: baseLength * 0.125, - offsetX: baseLength * -0.225, - offsetY: baseLength * 0.125) - - SmallFirework(color: .init(.yellow), - fontSize: baseLength * 0.125, - offsetX: baseLength * -0.075, - offsetY: baseLength * 0.25) - - SmallFirework(color: .green, - fontSize: baseLength * 0.125, - offsetX: baseLength * 0.15, - offsetY: baseLength * 0.2) - } - - // LargeFireworks - Group { - LargeFirework(baseLength: baseLength, - color: Color(uiColor: .red), - dotColor: .white) - .offset(x: baseLength * -0.1, - y: baseLength * -0.3) - - LargeFirework(baseLength: baseLength, - color: .white, - dotColor: .yellow) - .offset(x: baseLength * 0.1, - y: baseLength * -0.5) - } - - // RocketFireworks - Group { - RocketFirework(baseLength: baseLength, - color: .yellow) - .offset(x: baseLength * 0.0025, - y: baseLength * 0.325) - - RocketFirework(baseLength: baseLength, - color: .white) - .offset(x: baseLength * -0.2, - y: baseLength * 0.5) - } - - MediumFirework(baseLength: baseLength, - color: .init(uiColor: .yellow), - dotColor: .red) - .offset(x: baseLength * 0.225, - y: baseLength * 0.075) - - VStack { - Spacer() - - Buildings(baseLength: baseLength * 0.77, - color: .gray, - lightColor: .yellow) - } - - VStack { - Spacer() - - HStack(spacing: 0) { - -// // Audience -// ForEach(0..<4) { _ in -// Image(symbol: .person3SequenceFill) -// .arrangeShape(fontSize: baseLength * 0.13) -// } - } - } - } - } - } -} - -struct Fireworks_Previews: PreviewProvider { - static var previews: some View { - Fireworks() - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/Fireworks/LargeFirework.swift b/SFSymbolsArtCollection/ArtWorks/Fireworks/LargeFirework.swift deleted file mode 100644 index cd58532..0000000 --- a/SFSymbolsArtCollection/ArtWorks/Fireworks/LargeFirework.swift +++ /dev/null @@ -1,71 +0,0 @@ -// -// LargeFirework.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/08/06. -// - -import SwiftUI - -struct LargeFirework: View { - - let baseLength: CGFloat - let color: Color - let dotColor: Color - - var body: some View { - - ZStack { - - // DotRadiowaves - Group { - -// Image(symbol: .dotRadiowavesRight) -// .arrangeShape(color: color, -// fontSize: baseLength * 0.25, -// fontWeight: .bold, -// offsetX: baseLength * 0.095) - -// Image(symbol: .dotRadiowavesRight) -// .arrangeShape(color: color, -// fontSize: baseLength * 0.25, -// fontWeight: .bold, -// flipType: .horizontal, -// offsetX: baseLength * -0.095) -// -// Image(symbol: .dotRadiowavesRight) -// .arrangeShape(color: color, -// fontSize: baseLength * 0.25, -// fontWeight: .bold, -// rotationDegrees: 90, -// offsetY: baseLength * -0.095) - -// Image(symbol: .dotRadiowavesRight) -// .arrangeShape(color: color, -// fontSize: baseLength * 0.25, -// fontWeight: .bold, -// rotationDegrees: -90, -// offsetY: baseLength * 0.095) - } - -// Image(symbol: .circleDotted) -// .arrangeShape(color: dotColor, -// fontSize: baseLength * 0.55, -// fontWeight: .ultraLight, -// rotationDegrees: baseLength * 0.225) -// -// Image(symbol: .circleFill) -// .arrangeShape(color: dotColor, -// fontSize: baseLength * 0.085) - } - } -} - -struct Firework_Previews: PreviewProvider { - static var previews: some View { - - LargeFirework(baseLength: 400, - color: .red, - dotColor: .yellow) - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/Fireworks/MediumFirework.swift b/SFSymbolsArtCollection/ArtWorks/Fireworks/MediumFirework.swift deleted file mode 100644 index 3ffa452..0000000 --- a/SFSymbolsArtCollection/ArtWorks/Fireworks/MediumFirework.swift +++ /dev/null @@ -1,40 +0,0 @@ -// -// MediumFirework.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/09/03. -// - -import SwiftUI - -struct MediumFirework: View { - - let baseLength: CGFloat - let color: Color - let dotColor: Color - - var body: some View { - - ZStack { -// Image(symbol: .helm) -// .arrangeShape(color: color, -// fontSize: baseLength * 0.25) -// -// Image(symbol: .circleDotted) -// .arrangeShape(color: dotColor, -// fontSize: baseLength * 0.30) -// -// Image(symbol: .circleFill) -// .arrangeShape(color: dotColor, -// fontSize: baseLength * 0.037) - } - } -} - -struct FMediumFirework_Previews: PreviewProvider { - static var previews: some View { - MediumFirework(baseLength: 400, - color: .red, - dotColor: .init(uiColor: .yellow)) - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/Fireworks/RocketFirework.swift b/SFSymbolsArtCollection/ArtWorks/Fireworks/RocketFirework.swift deleted file mode 100644 index 79835d4..0000000 --- a/SFSymbolsArtCollection/ArtWorks/Fireworks/RocketFirework.swift +++ /dev/null @@ -1,54 +0,0 @@ -// -// RocketFirework.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/08/07. -// - -import SwiftUI - -struct RocketFirework: View { - - let baseLength: CGFloat - let color: Color - - var body: some View { - - ZStack { -// Image(symbol: .circleFill) -// .arrangeShape(color: color, -// fontSize: baseLength * 0.05, -// offsetY: baseLength * -0.35) - - // AlternatingCurrents - Group { -// Image(symbol: .alternatingcurrent) -// .arrangeShape(color: color, -// width: baseLength * 0.25, -// height: baseLength * 0.025, -// rotationDegrees: 90, -// offsetY: baseLength * -0.22) -// -// Image(symbol: .alternatingcurrent) -// .arrangeShape(color: color, -// width: baseLength * 0.25, -// height: baseLength * 0.025, -// rotationDegrees: 90) -// -// Image(symbol: .alternatingcurrent) -// .arrangeShape(color: color, -// width: baseLength * 0.25, -// height: baseLength * 0.025, -// rotationDegrees: 90, -// offsetY: baseLength * 0.22) - } - } - } -} - -struct RocketFirework_Previews: PreviewProvider { - static var previews: some View { - RocketFirework(baseLength: 400, - color: .red) - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/Fireworks/SmallFirework.swift b/SFSymbolsArtCollection/ArtWorks/Fireworks/SmallFirework.swift deleted file mode 100644 index f510283..0000000 --- a/SFSymbolsArtCollection/ArtWorks/Fireworks/SmallFirework.swift +++ /dev/null @@ -1,35 +0,0 @@ -// -// SmallFirework.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/09/03. -// - -import SwiftUI - -struct SmallFirework: View { - - let color: Color - let fontSize: CGFloat - let offsetX: CGFloat - let offsetY: CGFloat - - var body: some View { - ZStack {} - -// Image(symbol: .timelapse) -// .arrangeShape(color: color, -// fontSize: fontSize, -// offsetX: offsetX, -// offsetY: offsetY) - } -} - -struct SmallFirework_Previews: PreviewProvider { - static var previews: some View { - SmallFirework(color: .pink, - fontSize: 50, - offsetX: 0, - offsetY: 0) - } -} From 7b8420218e22ae8ad416b4ecadb9c85c482c95f8 Mon Sep 17 00:00:00 2001 From: littleossa Date: Sun, 11 Feb 2024 20:19:31 +0900 Subject: [PATCH 092/108] Add opacity in AnimationValues --- .../Common/Models/AnimationValues.swift | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/AnimationValues.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/AnimationValues.swift index c40d8cc..fbd7609 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/AnimationValues.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/Common/Models/AnimationValues.swift @@ -19,7 +19,8 @@ struct AnimationValues { rotationDegrees: CGFloat = 0, rotationAxis: (x: CGFloat, y: CGFloat, z: CGFloat) = (x: 0, y: 0, z: 0), offsetX: CGFloat = 0, - offsetY: CGFloat = 0 + offsetY: CGFloat = 0, + opacity: CGFloat = 1 ) { self.primaryColor = primaryColor.resolve(in: .init()) self.secondaryColor = secondaryColor.resolve(in: .init()) @@ -30,6 +31,7 @@ struct AnimationValues { self.rotationDegrees = rotationDegrees self.rotationAxis = rotationAxis self.offset = .init(width: offsetX, height: offsetY) + self.opacity = opacity } var primaryColor: Color.Resolved @@ -41,6 +43,7 @@ struct AnimationValues { var rotationDegrees: CGFloat var rotationAxis: (x: CGFloat, y: CGFloat, z: CGFloat) var offset: CGSize + var opacity: CGFloat var fontWeight: Font.Weight { return .init(animatableValue: fontWeightValue) From f9c781d3b808b4b3c7325cd943bcfa8d1a18bc79 Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 12 Feb 2024 00:09:39 +0900 Subject: [PATCH 093/108] Add FireworksArtView --- .../Fireworks/FireworksArtView+Element.swift | 19 +- .../ArtWorks/Fireworks/FireworksArtView.swift | 754 +++++++++++++++++- 2 files changed, 759 insertions(+), 14 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView+Element.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView+Element.swift index fd4d57b..530394c 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView+Element.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView+Element.swift @@ -19,10 +19,10 @@ extension FireworksArtView { case rocketFireworkWhiteConcealmentRight case rocketFireworkWhiteConcealmentLeft case rocketFireworkWhiteTop - case buildingLarge - case buildingSmall case litBuildingLarge case litBuildingSmall + case buildingLarge + case buildingSmall case personRight case personLeft case personCenterRight @@ -164,7 +164,7 @@ extension FireworksArtView { symbolCountToWaitFor: 0 ) - case .buildingLarge: + case .litBuildingLarge: SymbolArtElement( symbol: "􀏄", name: "rectangle.fill", @@ -176,7 +176,8 @@ extension FireworksArtView { verticalOffsetRatio: 0.434, symbolCountToWaitFor: 0 ) - case .buildingSmall: + + case .litBuildingSmall: SymbolArtElement( symbol: "􀏄", name: "rectangle.fill", @@ -188,7 +189,8 @@ extension FireworksArtView { verticalOffsetRatio: 0.497, symbolCountToWaitFor: 0 ) - case .litBuildingLarge: + + case .buildingLarge: SymbolArtElement( symbol: "􀮆", name: "building.fill", @@ -200,7 +202,8 @@ extension FireworksArtView { verticalOffsetRatio: 0.434, symbolCountToWaitFor: 0 ) - case .litBuildingSmall: + + case .buildingSmall: SymbolArtElement( symbol: "􀮆", name: "building.fill", @@ -212,6 +215,7 @@ extension FireworksArtView { verticalOffsetRatio: 0.497, symbolCountToWaitFor: 0 ) + case .personRight: SymbolArtElement( symbol: "􀻸", @@ -355,7 +359,6 @@ extension FireworksArtView { fontWeight: .ultraLight, widthRatio: 0.42, heightRatio: 0.42, - rotationDegrees: 90, horizontalOffsetRatio: -0.17, verticalOffsetRatio: -0.18, symbolCountToWaitFor: 0 @@ -396,11 +399,9 @@ extension FireworksArtView { name: "circle.dotted", initialPosition: .none, primaryColor: .yellow, - secondaryColor: .white, fontWeight: .ultraLight, widthRatio: 0.42, heightRatio: 0.42, - rotationDegrees: 90, horizontalOffsetRatio: 0.1, verticalOffsetRatio: -0.34, symbolCountToWaitFor: 0 diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView.swift index 7638158..3395736 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView.swift @@ -9,16 +9,20 @@ import SwiftUI struct FireworksArtView: View { + @Environment(ArtWorkModel.self) var model @State private var isAnimating = false + @State private var isBouncedMediumFirework = false var body: some View { ZStack { - Color.midnightNavy - - ForEach(Element.allCases) { - SymbolArtDisplayView(shouldResizeForCoverArt: false, element: $0.value) - } + background + sun + moon + rocketFireworks + buildings + people + fireworks } .navigationTitle("Fireworks") .navigationBarTitleDisplayMode(.inline) @@ -33,6 +37,746 @@ struct FireworksArtView: View { .disabled(isAnimating) } }) + .onChange(of: isAnimating) { _, newValue in + if newValue { + Timer.scheduledTimer(withTimeInterval: 15, repeats: false) { _ in + isBouncedMediumFirework = true + } + } + } + } + + // MARK: - Background + private var background: some View { + Color.midnightNavy + .keyframeAnimator( + initialValue: AnimationValues( + width: 0, + height: 0, + opacity: 0 + ), + trigger: isAnimating + ) { content, value in + content + .opacity(value.opacity) + } keyframes: { value in + KeyframeTrack(\.opacity) { + CubicKeyframe(1, duration: 4) + } + } + } + + // MARK: - 􀆮 Sun + private var sun: some View { + Image(systemName: "sun.max.fill") + .resizable() + .foregroundStyle(.orange) + .keyframeAnimator( + initialValue: AnimationValues( + width: model.calculatingProportionalValue(withRatio: 0.12), + height: model.calculatingProportionalValue(withRatio: 0.12), + offsetX: model.calculatingProportionalValue(withRatio: 0.4), + offsetY: model.calculatingProportionalValue(withRatio: -0.51) + ), + trigger: isAnimating + ) { content, value in + content + .frame(width: value.width, height: value.height) + .offset(value.offset) + } keyframes: { value in + KeyframeTrack(\.opacity) { + CubicKeyframe(1, duration: 4) + } + + KeyframeTrack(\.offset) { + CubicKeyframe( + CGSize(width: model.calculatingProportionalValue(withRatio: 0.8), + height: model.calculatingProportionalValue(withRatio: -0.31)), + duration: 4 + ) + } + } + } + + // MARK: - 􀇁 Moon + private var moon: some View { + Image(systemName: "moon.stars.fill") + .resizable() + .keyframeAnimator( + initialValue: AnimationValues( + primaryColor: .yellow.opacity(0.7), + secondaryColor: .awesomeYellow.opacity(0.6), + width: model.calculatingProportionalValue(withRatio: 0.12), + height: model.calculatingProportionalValue(withRatio: 0.12), + offsetX: model.calculatingProportionalValue(withRatio: -0.6), + offsetY: model.calculatingProportionalValue(withRatio: -0.41) + ), + trigger: isAnimating + ) { content, value in + content + .foregroundStyle(value.primaryColor, value.secondaryColor) + .frame(width: value.width, height: value.height) + .offset(value.offset) + } keyframes: { value in + KeyframeTrack(\.opacity) { + CubicKeyframe(1, duration: 4) + } + + KeyframeTrack(\.offset) { + CubicKeyframe( + CGSize( + width: model.calculatingProportionalValue(withRatio: -0.4), + height: model.calculatingProportionalValue(withRatio: -0.44) + ), + duration: 2 + ) + + CubicKeyframe( + CGSize( + width: model.calculatingProportionalValue(withRatio: 0.4), + height: model.calculatingProportionalValue(withRatio: -0.51) + ), + duration: 4 + ) + } + } + } + + private var rocketFireworks: some View { + ZStack { + // MARK: - RocketFireworkRed + rocketFirework(.red) + .keyframeAnimator( + initialValue: AnimationValues( + width: 0, + height: 0, + offsetX: model.calculatingProportionalValue(withRatio: -0.215), + offsetY: model.calculatingProportionalValue(withRatio: 0.48), + opacity: 0 + ), + trigger: isAnimating + ) { content, value in + content + .offset(value.offset) + .opacity(value.opacity) + } keyframes: { value in + KeyframeTrack(\.offset) { + LinearKeyframe(CGSize( + width: model.calculatingProportionalValue(withRatio: -0.215), + height: model.calculatingProportionalValue(withRatio: 0.48)), duration: 7) + CubicKeyframe(CGSize( + width: model.calculatingProportionalValue(withRatio: -0.215), + height: model.calculatingProportionalValue(withRatio: 0.23) + ), duration: 3) + } + + KeyframeTrack(\.opacity) { + LinearKeyframe(0, duration: 7) + CubicKeyframe(1, duration: 3) + CubicKeyframe(0, duration: 1) + } + } + + // MARK: - RocketFireworkYellow + rocketFirework(.yellow) + .keyframeAnimator( + initialValue: AnimationValues( + width: 0, + height: 0, + offsetX: model.calculatingProportionalValue(withRatio: -0.076), + offsetY: model.calculatingProportionalValue(withRatio: 0.48), + opacity: 0 + ), + trigger: isAnimating + ) { content, value in + content + .offset(value.offset) + .opacity(value.opacity) + } keyframes: { value in + KeyframeTrack(\.offset) { + LinearKeyframe(CGSize( + width: model.calculatingProportionalValue(withRatio: -0.076), + height: model.calculatingProportionalValue(withRatio: 0.48)), duration: 9) + CubicKeyframe(CGSize( + width: model.calculatingProportionalValue(withRatio: -0.076), + height: model.calculatingProportionalValue(withRatio: 0.36) + ), duration: 2) + } + + KeyframeTrack(\.opacity) { + LinearKeyframe(0, duration: 9) + CubicKeyframe(1, duration: 2) + CubicKeyframe(0, duration: 1) + } + } + + // MARK: - RocketFireworkYellow + rocketFirework(.green) + .keyframeAnimator( + initialValue: AnimationValues( + width: 0, + height: 0, + offsetX: model.calculatingProportionalValue(withRatio: 0.34), + offsetY: model.calculatingProportionalValue(withRatio: 0.48), + opacity: 0 + ), + trigger: isAnimating + ) { content, value in + content + .offset(value.offset) + .opacity(value.opacity) + } keyframes: { value in + KeyframeTrack(\.offset) { + LinearKeyframe(CGSize( + width: model.calculatingProportionalValue(withRatio: 0.34), + height: model.calculatingProportionalValue(withRatio: 0.48)), duration: 10) + CubicKeyframe(CGSize( + width: model.calculatingProportionalValue(withRatio: 0.34), + height: model.calculatingProportionalValue(withRatio: 0.28) + ), duration: 2) + } + + KeyframeTrack(\.opacity) { + LinearKeyframe(0, duration: 10) + CubicKeyframe(1, duration: 2) + CubicKeyframe(0, duration: 1) + } + } + + // MARK: - RocketMediumFirework + rocketFirework(.red) + .keyframeAnimator( + initialValue: AnimationValues( + width: 0, + height: 0, + offsetX: model.calculatingProportionalValue(withRatio: 0.16), + offsetY: model.calculatingProportionalValue(withRatio: 0.48), + opacity: 0 + ), + trigger: isAnimating + ) { content, value in + content + .offset(value.offset) + .opacity(value.opacity) + } keyframes: { value in + KeyframeTrack(\.offset) { + LinearKeyframe(CGSize( + width: model.calculatingProportionalValue(withRatio: 0.16), + height: model.calculatingProportionalValue(withRatio: 0.48)), duration: 12) + CubicKeyframe(CGSize( + width: model.calculatingProportionalValue(withRatio: 0.16), + height: model.calculatingProportionalValue(withRatio: 0.18) + ), duration: 2) + } + + KeyframeTrack(\.opacity) { + LinearKeyframe(0, duration: 12) + CubicKeyframe(1, duration: 2) + CubicKeyframe(0, duration: 1) + } + } + + // MARK: - RocketLargeFirework + rocketFirework(.white) + .keyframeAnimator( + initialValue: AnimationValues( + width: 0, + height: 0, + offsetX: model.calculatingProportionalValue(withRatio: -0.1), + offsetY: model.calculatingProportionalValue(withRatio: 0.48), + opacity: 0 + ), + trigger: isAnimating + ) { content, value in + content + .offset(value.offset) + .opacity(value.opacity) + } keyframes: { value in + KeyframeTrack(\.offset) { + LinearKeyframe(CGSize( + width: model.calculatingProportionalValue(withRatio: -0.1), + height: model.calculatingProportionalValue(withRatio: 0.48)), duration: 14) + CubicKeyframe(CGSize( + width: model.calculatingProportionalValue(withRatio: -0.1), + height: model.calculatingProportionalValue(withRatio: 0) + ), duration: 3) + } + + KeyframeTrack(\.opacity) { + LinearKeyframe(0, duration: 15) + CubicKeyframe(1, duration: 1) + CubicKeyframe(0, duration: 1) + } + } + + // MARK: - RocketLargeFirework Yellow + rocketFirework(.yellow) + .keyframeAnimator( + initialValue: AnimationValues( + width: 0, + height: 0, + offsetX: model.calculatingProportionalValue(withRatio: 0.11), + offsetY: model.calculatingProportionalValue(withRatio: 0.48), + opacity: 0 + ), + trigger: isAnimating + ) { content, value in + content + .offset(value.offset) + .opacity(value.opacity) + } keyframes: { value in + KeyframeTrack(\.offset) { + LinearKeyframe(CGSize( + width: model.calculatingProportionalValue(withRatio: 0.11), + height: model.calculatingProportionalValue(withRatio: 0.48)), duration: 16) + CubicKeyframe(CGSize( + width: model.calculatingProportionalValue(withRatio: 0.11), + height: model.calculatingProportionalValue(withRatio: -0.23) + ), duration: 3) + } + + KeyframeTrack(\.opacity) { + LinearKeyframe(0, duration: 16) + CubicKeyframe(1, duration: 1) + CubicKeyframe(0, duration: 1) + } + } + } + } + + private var buildings: some View { + ZStack { + // MARK: - 􀏄 LitBuildingLarge + Image(systemName: "rectangle.fill") + .resizable() + .keyframeAnimator( + initialValue: AnimationValues( + width: model.calculatingProportionalValue(withRatio: 0.18), + height: model.calculatingProportionalValue(withRatio: 0.3), + offsetX: model.calculatingProportionalValue(withRatio: 0.07), + offsetY: model.calculatingProportionalValue(withRatio: 0.434) + ), + trigger: isAnimating + ) { content, value in + content + .foregroundStyle(.yellow) + .frame(width: value.width, height: value.height) + .offset(value.offset) + } keyframes: { value in + KeyframeTrack(\.opacity) { + CubicKeyframe(1, duration: 4) + } + } + + // MARK: - 􀏄 LitBuildingLarge + Image(systemName: "rectangle.fill") + .resizable() + .keyframeAnimator( + initialValue: AnimationValues( + primaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.18), + height: model.calculatingProportionalValue(withRatio: 0.3), + offsetX: model.calculatingProportionalValue(withRatio: 0.07), + offsetY: model.calculatingProportionalValue(withRatio: 0.434) + ), + trigger: isAnimating + ) { content, value in + content + .foregroundStyle(value.primaryColor) + .frame(width: value.width, height: value.height) + .offset(value.offset) + } keyframes: { value in + KeyframeTrack(\.primaryColor) { + CubicKeyframe(Color.yellow.resolve(in: .init()), duration: 6) + } + } + + // MARK: - 􀏄 LitBuildingSmall + Image(systemName: "rectangle.fill") + .resizable() + .keyframeAnimator( + initialValue: AnimationValues( + primaryColor: .white, + width: model.calculatingProportionalValue(withRatio: 0.1), + height: model.calculatingProportionalValue(withRatio: 0.17), + offsetX: model.calculatingProportionalValue(withRatio: -0.09), + offsetY: model.calculatingProportionalValue(withRatio: 0.497) + ), + trigger: isAnimating + ) { content, value in + content + .foregroundStyle(value.primaryColor) + .frame(width: value.width, height: value.height) + .offset(value.offset) + } keyframes: { value in + KeyframeTrack(\.primaryColor) { + CubicKeyframe(Color.yellow.resolve(in: .init()), duration: 6) + } + } + + // MARK: - 􀮆 BuildingLarge + Image(systemName: "building.fill") + .resizable() + .keyframeAnimator( + initialValue: AnimationValues( + primaryColor: .gray, + width: model.calculatingProportionalValue(withRatio: 0.2), + height: model.calculatingProportionalValue(withRatio: 0.3), + offsetX: model.calculatingProportionalValue(withRatio: 0.07), + offsetY: model.calculatingProportionalValue(withRatio: 0.434) + ), + trigger: isAnimating + ) { content, value in + content + .foregroundStyle(value.primaryColor) + .frame(width: value.width, height: value.height) + .offset(value.offset) + } keyframes: { value in + KeyframeTrack(\.primaryColor) { + CubicKeyframe(Color.lightGray.resolve(in: .init()), duration: 6) + } + } + + // MARK: - 􀮆 BuildingSmall + Image(systemName: "building.fill") + .resizable() + .keyframeAnimator( + initialValue: AnimationValues( + primaryColor: .gray, + width: model.calculatingProportionalValue(withRatio: 0.12), + height: model.calculatingProportionalValue(withRatio: 0.17), + offsetX: model.calculatingProportionalValue(withRatio: -0.09), + offsetY: model.calculatingProportionalValue(withRatio: 0.497) + ), + trigger: isAnimating + ) { content, value in + content + .foregroundStyle(value.primaryColor) + .frame(width: value.width, height: value.height) + .offset(value.offset) + } keyframes: { value in + KeyframeTrack(\.primaryColor) { + CubicKeyframe(Color.lightGray.resolve(in: .init()), duration: 6) + } + } + } + } + + private var people: some View { + ZStack { + // MARK: - 􀻸 PersonRight + Image(systemName: "person.3.sequence.fill") + .resizable() + .foregroundStyle(.black) + .keyframeAnimator( + initialValue: AnimationValues( + width: model.calculatingProportionalValue(withRatio: 0.2), + height: model.calculatingProportionalValue(withRatio: 0.1), + offsetX: model.calculatingProportionalValue(withRatio: 0.64), + offsetY: model.calculatingProportionalValue(withRatio: 0.538) + ), + trigger: isAnimating + ) { content, value in + content + .foregroundStyle(value.primaryColor) + .frame(width: value.width, height: value.height) + .rotation3DEffect( + .degrees(180), + axis: FlipType.horizontal.axis + ) + .offset(value.offset) + } keyframes: { value in + KeyframeTrack(\.offset) { + LinearKeyframe( + CGSize( + width: model.calculatingProportionalValue(withRatio: 0.64), + height: model.calculatingProportionalValue(withRatio: 0.538) + ), + duration: 4 + ) + CubicKeyframe( + CGSize( + width: model.calculatingProportionalValue(withRatio: 0.34), + height: model.calculatingProportionalValue(withRatio: 0.538) + ), + duration: 2 + ) + } + } + + // MARK: - 􀻸 PersonLeft + Image(systemName: "person.3.sequence.fill") + .resizable() + .foregroundStyle(.black) + .keyframeAnimator( + initialValue: AnimationValues( + width: model.calculatingProportionalValue(withRatio: 0.2), + height: model.calculatingProportionalValue(withRatio: 0.1), + offsetX: model.calculatingProportionalValue(withRatio: -0.64), + offsetY: model.calculatingProportionalValue(withRatio: 0.538) + ), + trigger: isAnimating + ) { content, value in + content + .foregroundStyle(value.primaryColor) + .frame(width: value.width, height: value.height) + .offset(value.offset) + } keyframes: { value in + KeyframeTrack(\.offset) { + LinearKeyframe( + CGSize( + width: model.calculatingProportionalValue(withRatio: -0.64), + height: model.calculatingProportionalValue(withRatio: 0.538) + ), + duration: 4 + ) + CubicKeyframe( + CGSize( + width: model.calculatingProportionalValue(withRatio: -0.34), + height: model.calculatingProportionalValue(withRatio: 0.538) + ), + duration: 2 + ) + } + } + + // MARK: - 􀝋 personCenterRight + Image(systemName: "person.3.fill") + .resizable() + .foregroundStyle(.black) + .keyframeAnimator( + initialValue: AnimationValues( + width: model.calculatingProportionalValue(withRatio: 0.2), + height: model.calculatingProportionalValue(withRatio: 0.1), + offsetX: model.calculatingProportionalValue(withRatio: 0.12), + offsetY: model.calculatingProportionalValue(withRatio: 0.538), + opacity: 0 + ), + trigger: isAnimating + ) { content, value in + content + .foregroundStyle(value.primaryColor) + .frame(width: value.width, height: value.height) + .offset(value.offset) + .opacity(value.opacity) + } keyframes: { value in + KeyframeTrack(\.opacity) { + CubicKeyframe(0, duration: 5) + CubicKeyframe(1, duration: 2) + } + } + + // MARK: - 􀝋 personCenterRight + Image(systemName: "person.3.fill") + .resizable() + .foregroundStyle(.black) + .keyframeAnimator( + initialValue: AnimationValues( + width: model.calculatingProportionalValue(withRatio: 0.2), + height: model.calculatingProportionalValue(withRatio: 0.1), + offsetX: model.calculatingProportionalValue(withRatio: -0.12), + offsetY: model.calculatingProportionalValue(withRatio: 0.538), + opacity: 0 + ), + trigger: isAnimating + ) { content, value in + content + .foregroundStyle(value.primaryColor) + .frame(width: value.width, height: value.height) + .offset(value.offset) + .opacity(value.opacity) + } keyframes: { value in + KeyframeTrack(\.opacity) { + CubicKeyframe(0, duration: 5) + CubicKeyframe(1, duration: 2) + } + } + } + } + + private var fireworks: some View { + ZStack { + // MARK: - 􀇲 smallFireworkPink + Image(systemName: "timelapse") + .resizable() + .foregroundStyle(.pink) + .frame(width: model.calculatingProportionalValue(withRatio: 0.125), + height: model.calculatingProportionalValue(withRatio: 0.125)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.225), + y: model.calculatingProportionalValue(withRatio: 0.125)) + .keyframeAnimator(initialValue: 0, trigger: isAnimating) { content, value in + content + .opacity(value) + } keyframes: { value in + KeyframeTrack { + LinearKeyframe(0, duration: 10) + CubicKeyframe(1, duration: 1) + CubicKeyframe(0, duration: 2) + } + } + + // MARK: - 􀇲 smallFireworkYellow + Image(systemName: "timelapse") + .resizable() + .foregroundStyle(.yellow) + .frame(width: model.calculatingProportionalValue(withRatio: 0.125), + height: model.calculatingProportionalValue(withRatio: 0.125)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.075), + y: model.calculatingProportionalValue(withRatio: 0.25)) + .keyframeAnimator(initialValue: 0, trigger: isAnimating) { content, value in + content + .opacity(value) + } keyframes: { value in + KeyframeTrack { + LinearKeyframe(0, duration: 12) + CubicKeyframe(1, duration: 1) + CubicKeyframe(0, duration: 2) + } + } + + // MARK: - 􀇲 smallFireworkGreen + Image(systemName: "timelapse") + .resizable() + .foregroundStyle(.green) + .frame(width: model.calculatingProportionalValue(withRatio: 0.125), + height: model.calculatingProportionalValue(withRatio: 0.125)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.34), + y: model.calculatingProportionalValue(withRatio: 0.18)) + .keyframeAnimator(initialValue: 0, trigger: isAnimating) { content, value in + content + .opacity(value) + } keyframes: { value in + KeyframeTrack { + LinearKeyframe(0, duration: 13) + CubicKeyframe(1, duration: 1) + CubicKeyframe(0, duration: 2) + } + } + + // MARK: - 􂁞 mediumFirework + Image(systemName: "fireworks") + .resizable() + .foregroundStyle(.yellow, .red) + .frame(width: model.calculatingProportionalValue(withRatio: 0.24), + height: model.calculatingProportionalValue(withRatio: 0.24)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.14), + y: model.calculatingProportionalValue(withRatio: 0.07)) + .keyframeAnimator(initialValue: 0, trigger: isAnimating) { content, value in + content + .opacity(value) + } keyframes: { value in + KeyframeTrack { + LinearKeyframe(0, duration: 15) + CubicKeyframe(1, duration: 1) + CubicKeyframe(0, duration: 2) + } + } + .symbolEffect(.bounce, value: isBouncedMediumFirework) + + largeFirework(primaryColor: .white, secondaryColor: .red) + .offset(x: model.calculatingProportionalValue(withRatio: -0.17), + y: model.calculatingProportionalValue(withRatio: -0.18)) + .keyframeAnimator(initialValue: 0, trigger: isAnimating) { content, value in + content + .opacity(value) + .scaleEffect(value) + } keyframes: { value in + KeyframeTrack { + LinearKeyframe(0, duration: 18) + CubicKeyframe(2, duration: 1) + CubicKeyframe(0, duration: 2) + } + } + .symbolEffect(.variableColor.dimInactiveLayers, + options: .repeating.speed(2), + isActive: true) + + largeFirework(primaryColor: .yellow, secondaryColor: .white) + .offset(x: model.calculatingProportionalValue(withRatio: 0.105), + y: model.calculatingProportionalValue(withRatio: -0.34)) + .keyframeAnimator(initialValue: 0, trigger: isAnimating) { content, value in + content + .opacity(value) + .scaleEffect(value) + } keyframes: { value in + KeyframeTrack { + LinearKeyframe(0, duration: 19) + CubicKeyframe(1.2, duration: 1) + CubicKeyframe(0, duration: 2) + } + } + .symbolEffect(.variableColor.dimInactiveLayers, + options: .repeating.speed(2), + isActive: true) + } + } + + // MARK: - RocketFirework + private func rocketFirework(_ color: Color) -> some View { + + ZStack { + // MARK: - 􁎄 Rocket smoke + Image(systemName: "water.waves") + .resizable() + .foregroundStyle(color) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.2), + height: model.calculatingProportionalValue(withRatio: 0.1)) + .rotationEffect(.degrees(90)) + + // MARK: - 􀏄 Rocket smoke right concealment + Image(systemName: "rectangle.fill") + .resizable() + .foregroundStyle(.midnightNavy) + .frame(width: model.calculatingProportionalValue(withRatio: 0.05), + height: model.calculatingProportionalValue(withRatio: 0.2)) + .offset(x: model.calculatingProportionalValue(withRatio: 0.046)) + + // MARK: - 􀏄 Rocket smoke left concealment + Image(systemName: "rectangle.fill") + .resizable() + .foregroundStyle(.midnightNavy) + .frame(width: model.calculatingProportionalValue(withRatio: 0.05), + height: model.calculatingProportionalValue(withRatio: 0.2)) + .offset(x: model.calculatingProportionalValue(withRatio: -0.046)) + + // MARK: - 􀀁 Rocket smoke top + Image(systemName: "circle.fill") + .resizable() + .foregroundStyle(color) + .frame(width: model.calculatingProportionalValue(withRatio: 0.03), + height: model.calculatingProportionalValue(withRatio: 0.04)) + .offset(y: model.calculatingProportionalValue(withRatio: -0.1)) + } + } + + private func largeFirework(primaryColor: Color, secondaryColor: Color) -> some View { + ZStack { + // MARK: - 􀌙 large horizontal firework + Image(systemName: "dot.radiowaves.left.and.right") + .resizable() + .foregroundStyle(primaryColor, secondaryColor) + .fontWeight(.black) + .frame(width: model.calculatingProportionalValue(withRatio: 0.347), + height: model.calculatingProportionalValue(withRatio: 0.235)) + + // MARK: - 􀌙 large vertical firework + Image(systemName: "dot.radiowaves.left.and.right") + .resizable() + .foregroundStyle(primaryColor, secondaryColor) + .fontWeight(.black) + .frame(width: model.calculatingProportionalValue(withRatio: 0.347), + height: model.calculatingProportionalValue(withRatio: 0.235)) + .rotationEffect(.degrees(90)) + + // MARK: - 􁅃 large dot firework + Image(systemName: "circle.dotted") + .resizable() + .foregroundStyle(primaryColor) + .fontWeight(.ultraLight) + .frame(width: model.calculatingProportionalValue(withRatio: 0.42), + height: model.calculatingProportionalValue(withRatio: 0.42)) + } } } From 9ec151f7a3fd4a5d22a16f3219097d57a9ad6a3a Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 12 Feb 2024 00:11:34 +0900 Subject: [PATCH 094/108] Refactor FireworksArt --- .../ArtWorks/Fireworks/FireworksArtView.swift | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView.swift index 3395736..7ed9033 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView.swift @@ -45,7 +45,17 @@ struct FireworksArtView: View { } } } +} + +#Preview { + NavigationStack { + FireworksArtView() + .environment(ArtWorkModel.preview) + } +} +// MARK: - Private components +extension FireworksArtView { // MARK: - Background private var background: some View { Color.midnightNavy @@ -779,10 +789,3 @@ struct FireworksArtView: View { } } } - -#Preview { - NavigationStack { - FireworksArtView() - .environment(ArtWorkModel.preview) - } -} From d73fecae528c55b51b78f5f90205ce27d7f60280 Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 12 Feb 2024 06:29:40 +0900 Subject: [PATCH 095/108] Remove iosdc 2022 logo --- .../project.pbxproj | 28 ------- .../Entity/iOSDCJapan2022SymbolType.swift | 51 ------------ .../iOSDCJapan2022/iOSDCJapan2022Logo.swift | 41 ---------- .../iOSDCJapan2022/iOSDCJapan2022Symbol.swift | 80 ------------------- 4 files changed, 200 deletions(-) delete mode 100644 SFSymbolsArtCollection/ArtWorks/iOSDCJapan2022/Entity/iOSDCJapan2022SymbolType.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/iOSDCJapan2022/iOSDCJapan2022Logo.swift delete mode 100644 SFSymbolsArtCollection/ArtWorks/iOSDCJapan2022/iOSDCJapan2022Symbol.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 46815c0..af2ef8e 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 971D9DEA28C9731D00136A36 /* iOSDCJapan2022SymbolType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 971D9DE928C9731D00136A36 /* iOSDCJapan2022SymbolType.swift */; }; 973B2CA128C2546C006ED5F0 /* ArrangeShapeWithFont.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973B2CA028C2546C006ED5F0 /* ArrangeShapeWithFont.swift */; }; 973B2CA428C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973B2CA328C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift */; }; 9748BE2028939B04006DF0BE /* FlipType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE1F28939B04006DF0BE /* FlipType.swift */; }; @@ -48,8 +47,6 @@ 97AD532B2B71068B0034FB5D /* AfroBoyArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD532A2B71068B0034FB5D /* AfroBoyArtView.swift */; }; 97AD532D2B717C950034FB5D /* AfroBoyArtView+CoverArt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD532C2B717C950034FB5D /* AfroBoyArtView+CoverArt.swift */; }; 97AD53312B71A5130034FB5D /* GalleryGridView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53302B71A5130034FB5D /* GalleryGridView.swift */; }; - 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */; }; - 97CD46E928BF080300919B65 /* iOSDCJapan2022Logo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */; }; 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11D4F2817381100B2AB32 /* SFSymbolsArtCollectionApp.swift */; }; 97E11D542817381200B2AB32 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97E11D532817381200B2AB32 /* Assets.xcassets */; }; 97E11D572817381200B2AB32 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97E11D562817381200B2AB32 /* Preview Assets.xcassets */; }; @@ -67,7 +64,6 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 971D9DE928C9731D00136A36 /* iOSDCJapan2022SymbolType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022SymbolType.swift; sourceTree = ""; }; 973B2CA028C2546C006ED5F0 /* ArrangeShapeWithFont.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrangeShapeWithFont.swift; sourceTree = ""; }; 973B2CA328C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrangeShapeWithWidthAndHeight.swift; sourceTree = ""; }; 9748BE1F28939B04006DF0BE /* FlipType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlipType.swift; sourceTree = ""; }; @@ -109,8 +105,6 @@ 97AD532A2B71068B0034FB5D /* AfroBoyArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AfroBoyArtView.swift; sourceTree = ""; }; 97AD532C2B717C950034FB5D /* AfroBoyArtView+CoverArt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AfroBoyArtView+CoverArt.swift"; sourceTree = ""; }; 97AD53302B71A5130034FB5D /* GalleryGridView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GalleryGridView.swift; sourceTree = ""; }; - 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Symbol.swift; sourceTree = ""; }; - 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSDCJapan2022Logo.swift; sourceTree = ""; }; 97E11D4C2817381100B2AB32 /* SFSymbolsArtCollection.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SFSymbolsArtCollection.app; sourceTree = BUILT_PRODUCTS_DIR; }; 97E11D4F2817381100B2AB32 /* SFSymbolsArtCollectionApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SFSymbolsArtCollectionApp.swift; sourceTree = ""; }; 97E11D532817381200B2AB32 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -147,14 +141,6 @@ path = Common; sourceTree = ""; }; - 971D9DEB28C973AD00136A36 /* Entity */ = { - isa = PBXGroup; - children = ( - 971D9DE928C9731D00136A36 /* iOSDCJapan2022SymbolType.swift */, - ); - path = Entity; - sourceTree = ""; - }; 973B2CA228C2584F006ED5F0 /* ViewModifiers */ = { isa = PBXGroup; children = ( @@ -186,7 +172,6 @@ isa = PBXGroup; children = ( 9748BE6528A395D5006DF0BE /* ArtWork.swift */, - 97CD46E528BEF8A000919B65 /* iOSDCJapan2022 */, ); path = ArtWorks; sourceTree = ""; @@ -309,16 +294,6 @@ path = AnimatableSymbolView; sourceTree = ""; }; - 97CD46E528BEF8A000919B65 /* iOSDCJapan2022 */ = { - isa = PBXGroup; - children = ( - 97CD46E828BF080200919B65 /* iOSDCJapan2022Logo.swift */, - 97CD46E328BEF84100919B65 /* iOSDCJapan2022Symbol.swift */, - 971D9DEB28C973AD00136A36 /* Entity */, - ); - path = iOSDCJapan2022; - sourceTree = ""; - }; 97E11D432817381100B2AB32 = { isa = PBXGroup; children = ( @@ -507,13 +482,11 @@ 9767DF132B75EDB700457DA1 /* CrayonBoyArtView+Element.swift in Sources */, 97AD532D2B717C950034FB5D /* AfroBoyArtView+CoverArt.swift in Sources */, 97EF438B2B725E02003648F5 /* NosebleedArtView.swift in Sources */, - 971D9DEA28C9731D00136A36 /* iOSDCJapan2022SymbolType.swift in Sources */, 9778A4932B781DCE001BF9E8 /* FireworksArtView.swift in Sources */, 97AD53182B70DFF30034FB5D /* AnimationValues.swift in Sources */, 9767DF152B75F7BE00457DA1 /* WorldPeaceArtView+Element.swift in Sources */, 97EF43982B733337003648F5 /* MagicianArtView.swift in Sources */, 9767DEFA2B751C2C00457DA1 /* WorldPeaceArtView+CoverArt.swift in Sources */, - 97CD46E928BF080300919B65 /* iOSDCJapan2022Logo.swift in Sources */, 97AD53242B70E48F0034FB5D /* PlayButton.swift in Sources */, 9748BE2028939B04006DF0BE /* FlipType.swift in Sources */, 97AD531A2B70E0530034FB5D /* Font.Weight+.swift in Sources */, @@ -540,7 +513,6 @@ 9767DF1F2B762E9000457DA1 /* ImWearingPantsArtView+FaceElement.swift in Sources */, 97AD53222B70E3FA0034FB5D /* AnimatableSymbolView.swift in Sources */, 9767DF032B759B2D00457DA1 /* PartyAnimalsArtView+CoverArt.swift in Sources */, - 97CD46E428BEF84100919B65 /* iOSDCJapan2022Symbol.swift in Sources */, 9767DF0B2B75D1A100457DA1 /* SymbolArtElement.swift in Sources */, 97EF43A12B74CA38003648F5 /* CrayonBoyArtView+CoverArt.swift in Sources */, 97EF43902B72D2E4003648F5 /* NosebleedArtView+CoverArt.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtWorks/iOSDCJapan2022/Entity/iOSDCJapan2022SymbolType.swift b/SFSymbolsArtCollection/ArtWorks/iOSDCJapan2022/Entity/iOSDCJapan2022SymbolType.swift deleted file mode 100644 index a997897..0000000 --- a/SFSymbolsArtCollection/ArtWorks/iOSDCJapan2022/Entity/iOSDCJapan2022SymbolType.swift +++ /dev/null @@ -1,51 +0,0 @@ -// -// iOSDCJapan2022SymbolType.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/09/08. -// - -import SwiftUI - -enum iOSDCJapan2022SymbolType: String, Identifiable, CaseIterable { - case green - case orange - case blue - case punk - - var id: String { self.rawValue } - - var configuration: SymbolAppearance { - switch self { - case .green: - return SymbolAppearance(color: .green, - sizeMagnification: 0.25, - offsetXMagnification: 0.1, - offsetYMagnification: -0.15) - - case .orange: - return SymbolAppearance(color: .orange, - sizeMagnification: 0.2, - offsetXMagnification: -0.07, - offsetYMagnification: 0.17) - case .blue: - return SymbolAppearance(color: .blue, - sizeMagnification: 0.16, - offsetXMagnification: -0.22, - offsetYMagnification: -0.12) - - case .punk: - return SymbolAppearance(color: .pink, - sizeMagnification: 0.12, - offsetXMagnification: 0.2, - offsetYMagnification: 0.15) - } - } - - struct SymbolAppearance { - let color: Color - let sizeMagnification: CGFloat - let offsetXMagnification: CGFloat - let offsetYMagnification: CGFloat - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/iOSDCJapan2022/iOSDCJapan2022Logo.swift b/SFSymbolsArtCollection/ArtWorks/iOSDCJapan2022/iOSDCJapan2022Logo.swift deleted file mode 100644 index dc75907..0000000 --- a/SFSymbolsArtCollection/ArtWorks/iOSDCJapan2022/iOSDCJapan2022Logo.swift +++ /dev/null @@ -1,41 +0,0 @@ -// -// iOSDCJapan2022Logo.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/08/31. -// - -import SwiftUI - -struct iOSDCJapan2022Logo: View { - - var body: some View { - - GeometryReader { proxy in - - let baseLength = proxy.baseLength * 2 - - ZStack { - ForEach(iOSDCJapan2022SymbolType.allCases) { type in - let appearance = type.configuration - - iOSDCJapan2022Symbol(size: baseLength * appearance.sizeMagnification, - color: appearance.color) - .offset(x: baseLength * appearance.offsetXMagnification, - y: baseLength * appearance.offsetYMagnification) - } - -// Image(symbol: .circleSquareFill) -// .arrangeShape(color: .white, -// fontSize: baseLength) - } - .position(proxy.localCenter) - } - } -} - -struct iOSDCJapan2022Logo_Previews: PreviewProvider { - static var previews: some View { - iOSDCJapan2022Logo() - } -} diff --git a/SFSymbolsArtCollection/ArtWorks/iOSDCJapan2022/iOSDCJapan2022Symbol.swift b/SFSymbolsArtCollection/ArtWorks/iOSDCJapan2022/iOSDCJapan2022Symbol.swift deleted file mode 100644 index 36fcda1..0000000 --- a/SFSymbolsArtCollection/ArtWorks/iOSDCJapan2022/iOSDCJapan2022Symbol.swift +++ /dev/null @@ -1,80 +0,0 @@ -// -// iOSDCJapan2022.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/08/31. -// - -import SwiftUI - -extension iOSDCJapan2022Symbol { - - init(size: CGFloat, color: Color) { - self.size = size - self.color = color - innerSlowmoSize = size * 0.73 - dotSize = size * 0.13 - - let x0_34Value = size * 0.34 - let x0_58Value = size * 0.58 - let x0_68Value = size * 0.68 - - dotOffsets = [ - DotOffset(x: 0, y: -x0_68Value), - DotOffset(x: x0_34Value, y: -x0_58Value), - DotOffset(x: x0_58Value, y: -x0_34Value), - DotOffset(x: x0_68Value, y: 0), - DotOffset(x: x0_58Value, y: x0_34Value), - DotOffset(x: x0_34Value, y: x0_58Value), - DotOffset(x: 0, y: x0_68Value), - DotOffset(x: -x0_34Value, y: x0_58Value), - DotOffset(x: -x0_58Value, y: x0_34Value), - DotOffset(x: -x0_68Value, y: 0), - DotOffset(x: -x0_34Value, y: -x0_58Value), - DotOffset(x: -x0_58Value, y: -x0_34Value), - ] - } - - struct DotOffset: Hashable { - let x: CGFloat - let y: CGFloat - } -} - -struct iOSDCJapan2022Symbol: View { - - let size: CGFloat - let color: Color - let innerSlowmoSize: CGFloat - let dotSize: CGFloat - let dotOffsets: [DotOffset] - - var body: some View { - ZStack { - Image(systemName: "slowmo") - .arrangeShape(color: color, - fontSize: size) - - Image(systemName: "slowmo") - .arrangeShape(color: color, - fontSize: innerSlowmoSize, - fontWeight: .bold) - - ForEach(dotOffsets, id: \.self) { offset in - Image(systemName: "circle.fill") - .arrangeShape(color: color, - fontSize: dotSize, - offsetX: offset.x, - offsetY: offset.y) - } - } - } -} - -struct iOSDCJapan2022Symbol_Previews: PreviewProvider { - static var previews: some View { - iOSDCJapan2022Symbol(size: 100, color: .black) - iOSDCJapan2022Symbol(size: 50, color: .red) - iOSDCJapan2022Symbol(size: 25, color: .gray) - } -} From 177880ff268ff71382a453ddaf7b9f437ba59be8 Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 12 Feb 2024 06:30:24 +0900 Subject: [PATCH 096/108] Remove unused files --- .../project.pbxproj | 36 ----------- SFSymbolsArtCollection/ArtWorks/ArtWork.swift | 39 ------------ .../ViewModifiers/ArrangeShapeWithFont.swift | 54 ---------------- .../ArrangeShapeWithWidthAndHeight.swift | 62 ------------------- 4 files changed, 191 deletions(-) delete mode 100644 SFSymbolsArtCollection/ArtWorks/ArtWork.swift delete mode 100644 SFSymbolsArtCollection/Common/ViewModifiers/ArrangeShapeWithFont.swift delete mode 100644 SFSymbolsArtCollection/Common/ViewModifiers/ArrangeShapeWithWidthAndHeight.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index af2ef8e..b9eb94d 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -7,10 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 973B2CA128C2546C006ED5F0 /* ArrangeShapeWithFont.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973B2CA028C2546C006ED5F0 /* ArrangeShapeWithFont.swift */; }; - 973B2CA428C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973B2CA328C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift */; }; 9748BE2028939B04006DF0BE /* FlipType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE1F28939B04006DF0BE /* FlipType.swift */; }; - 9748BE6628A395D5006DF0BE /* ArtWork.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9748BE6528A395D5006DF0BE /* ArtWork.swift */; }; 97624C3328C4F43F004E1720 /* GeometryProxy+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97624C3228C4F43F004E1720 /* GeometryProxy+.swift */; }; 9767DEFA2B751C2C00457DA1 /* WorldPeaceArtView+CoverArt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEF92B751C2C00457DA1 /* WorldPeaceArtView+CoverArt.swift */; }; 9767DF002B752E4700457DA1 /* WorldPeaceArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9767DEFF2B752E4700457DA1 /* WorldPeaceArtView.swift */; }; @@ -64,11 +61,8 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 973B2CA028C2546C006ED5F0 /* ArrangeShapeWithFont.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrangeShapeWithFont.swift; sourceTree = ""; }; - 973B2CA328C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrangeShapeWithWidthAndHeight.swift; sourceTree = ""; }; 9748BE1F28939B04006DF0BE /* FlipType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlipType.swift; sourceTree = ""; }; 9748BE62289F4BFB006DF0BE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; - 9748BE6528A395D5006DF0BE /* ArtWork.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtWork.swift; sourceTree = ""; }; 97624C3228C4F43F004E1720 /* GeometryProxy+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GeometryProxy+.swift"; sourceTree = ""; }; 9767DEF92B751C2C00457DA1 /* WorldPeaceArtView+CoverArt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "WorldPeaceArtView+CoverArt.swift"; sourceTree = ""; }; 9767DEFF2B752E4700457DA1 /* WorldPeaceArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorldPeaceArtView.swift; sourceTree = ""; }; @@ -133,23 +127,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 971D9DE628C93EB500136A36 /* Common */ = { - isa = PBXGroup; - children = ( - 973B2CA228C2584F006ED5F0 /* ViewModifiers */, - ); - path = Common; - sourceTree = ""; - }; - 973B2CA228C2584F006ED5F0 /* ViewModifiers */ = { - isa = PBXGroup; - children = ( - 973B2CA028C2546C006ED5F0 /* ArrangeShapeWithFont.swift */, - 973B2CA328C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift */, - ); - path = ViewModifiers; - sourceTree = ""; - }; 9748BE1E28939AE5006DF0BE /* Enums */ = { isa = PBXGroup; children = ( @@ -168,14 +145,6 @@ path = DemonWrestler; sourceTree = ""; }; - 97624C3628C74AA0004E1720 /* ArtWorks */ = { - isa = PBXGroup; - children = ( - 9748BE6528A395D5006DF0BE /* ArtWork.swift */, - ); - path = ArtWorks; - sourceTree = ""; - }; 9767DEF82B751C1300457DA1 /* WorldPeace */ = { isa = PBXGroup; children = ( @@ -316,8 +285,6 @@ 9748BE62289F4BFB006DF0BE /* Info.plist */, 97E11D4F2817381100B2AB32 /* SFSymbolsArtCollectionApp.swift */, 97AD530D2B70DBC70034FB5D /* ArtisticWorldOfSFSymbols */, - 97624C3628C74AA0004E1720 /* ArtWorks */, - 971D9DE628C93EB500136A36 /* Common */, 97E11D532817381200B2AB32 /* Assets.xcassets */, 97E11D552817381200B2AB32 /* Preview Content */, ); @@ -494,18 +461,15 @@ 97AD53312B71A5130034FB5D /* GalleryGridView.swift in Sources */, 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */, 9778A4972B78C0C2001BF9E8 /* FireworksArtView+CoverArt.swift in Sources */, - 9748BE6628A395D5006DF0BE /* ArtWork.swift in Sources */, 9767DF272B76CCE300457DA1 /* ArmHairArtView+Element.swift in Sources */, 9767DF292B76FF0400457DA1 /* DemonWrestlerArtView.swift in Sources */, 97AD532B2B71068B0034FB5D /* AfroBoyArtView.swift in Sources */, - 973B2CA128C2546C006ED5F0 /* ArrangeShapeWithFont.swift in Sources */, 97624C3328C4F43F004E1720 /* GeometryProxy+.swift in Sources */, 97EF43952B72DA69003648F5 /* ImWearingPantsArtView.swift in Sources */, 9767DF232B7658E200457DA1 /* ArmHairArtView+CoverArt.swift in Sources */, 9767DF1D2B762E1200457DA1 /* ImWearingPantsArtView+Pose.swift in Sources */, 97AD53292B7100670034FB5D /* ArtWorkModel.swift in Sources */, 97EF439C2B7421A7003648F5 /* MagicianArtView+CoverArt.swift in Sources */, - 973B2CA428C25DAA006ED5F0 /* ArrangeShapeWithWidthAndHeight.swift in Sources */, 97EF438D2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift in Sources */, 9767DF1B2B762DA000457DA1 /* ImWearingPantsArtView+FinishPoseElement.swift in Sources */, 97EF43A52B74F27D003648F5 /* CrayonBoyArtView.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtWorks/ArtWork.swift b/SFSymbolsArtCollection/ArtWorks/ArtWork.swift deleted file mode 100644 index 54dc1ab..0000000 --- a/SFSymbolsArtCollection/ArtWorks/ArtWork.swift +++ /dev/null @@ -1,39 +0,0 @@ -// -// ArtWork.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/08/10. -// - -import Foundation - -enum ArtWork: Identifiable, CaseIterable { - case crayonBoy - case magician - case worldPeace - case partyAnimals - case armHair - case demonWrestler - case fireworks - - var title: String { - switch self { - case .crayonBoy: - return "Crayon Boy" - case .magician: - return "Magician" - case .worldPeace: - return "WORLD PEACE" - case .partyAnimals: - return "Party Animals" - case .armHair: - return "Arm Hair" - case .demonWrestler: - return "Demon Wrestler" - case .fireworks: - return "Fireworks" - } - } - - var id: String { self.title } -} diff --git a/SFSymbolsArtCollection/Common/ViewModifiers/ArrangeShapeWithFont.swift b/SFSymbolsArtCollection/Common/ViewModifiers/ArrangeShapeWithFont.swift deleted file mode 100644 index 54f2c7e..0000000 --- a/SFSymbolsArtCollection/Common/ViewModifiers/ArrangeShapeWithFont.swift +++ /dev/null @@ -1,54 +0,0 @@ -// -// ArrangeShape.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/09/03. -// - -import SwiftUI - -struct ArrangeShapeWithFontModifier: ViewModifier { - - let color: Color - let fontSize: CGFloat - let fontWeight: Font.Weight - let flipType: FlipType - let rotationDegrees: CGFloat - let offsetX: CGFloat - let offsetY: CGFloat - - func body(content: Content) -> some View { - content - .font(.system(size: fontSize, - weight: fontWeight, - design: .default)) - .rotation3DEffect(.degrees(180), - axis: flipType.axis, - anchorZ: 1) - .rotation3DEffect(.degrees(rotationDegrees), - axis: (x: 0, y: 0, z: -1), - anchorZ: 1) - .offset(x: offsetX, y: offsetY) - .foregroundColor(color) - } -} - -extension Image { - - func arrangeShape(color: Color = .black, - fontSize: CGFloat, - fontWeight: Font.Weight = .regular, - flipType: FlipType = .none, - rotationDegrees: CGFloat = 0, - offsetX: CGFloat = 0, - offsetY: CGFloat = 0) -> some View { - - self.modifier(ArrangeShapeWithFontModifier(color: color, - fontSize: fontSize, - fontWeight: fontWeight, - flipType: flipType, - rotationDegrees: rotationDegrees, - offsetX: offsetX, - offsetY: offsetY)) - } -} diff --git a/SFSymbolsArtCollection/Common/ViewModifiers/ArrangeShapeWithWidthAndHeight.swift b/SFSymbolsArtCollection/Common/ViewModifiers/ArrangeShapeWithWidthAndHeight.swift deleted file mode 100644 index 273ccbd..0000000 --- a/SFSymbolsArtCollection/Common/ViewModifiers/ArrangeShapeWithWidthAndHeight.swift +++ /dev/null @@ -1,62 +0,0 @@ -// -// ArrangeShapeWidthAndHeight.swift -// SFSymbolsArtCollection -// -// Created by 平岡修 on 2022/09/03. -// - -import Foundation - -import SwiftUI - -struct ArrangeShapeWithWidthAndHeightModifier: ViewModifier { - - let color: Color - let width: CGFloat? - let height: CGFloat? - let fontWeight: Font.Weight - let flipType: FlipType - let rotationDegrees: CGFloat - let offsetX: CGFloat - let offsetY: CGFloat - - func body(content: Content) -> some View { - content - .frame(width: width, - height: height) - .font(.body.weight(fontWeight)) - .rotation3DEffect(.degrees(180), - axis: flipType.axis, - anchorZ: 1) - .rotation3DEffect(.degrees(rotationDegrees), - axis: (x: 0, y: 0, z: -1), - anchorZ: 1) - .offset(x: offsetX, y: offsetY) - .foregroundColor(color) - - } -} - -extension Image { - - func arrangeShape(color: Color = .black, - width: CGFloat? = nil, - height: CGFloat? = nil, - fontWeight: Font.Weight = .regular, - flipType: FlipType = .none, - rotationDegrees: CGFloat = 0, - offsetX: CGFloat = 0, - offsetY: CGFloat = 0) -> some View { - - self - .resizable() - .modifier(ArrangeShapeWithWidthAndHeightModifier(color: color, - width: width, - height: height, - fontWeight: fontWeight, - flipType: flipType, - rotationDegrees: rotationDegrees, - offsetX: offsetX, - offsetY: offsetY)) - } -} From c66e246a2385cb0d0902bf76109af76639a15096 Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 12 Feb 2024 06:31:48 +0900 Subject: [PATCH 097/108] Remove SFUserFriendlySymbols --- .../project.pbxproj | 23 ------------------- .../xcshareddata/swiftpm/Package.resolved | 14 ----------- 2 files changed, 37 deletions(-) delete mode 100644 SFSymbolsArtCollection.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index b9eb94d..0e37b89 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -47,7 +47,6 @@ 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97E11D4F2817381100B2AB32 /* SFSymbolsArtCollectionApp.swift */; }; 97E11D542817381200B2AB32 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97E11D532817381200B2AB32 /* Assets.xcassets */; }; 97E11D572817381200B2AB32 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97E11D562817381200B2AB32 /* Preview Assets.xcassets */; }; - 97E11DF028176A0D00B2AB32 /* SFUserFriendlySymbols in Frameworks */ = {isa = PBXBuildFile; productRef = 97E11DEF28176A0D00B2AB32 /* SFUserFriendlySymbols */; }; 97EF438B2B725E02003648F5 /* NosebleedArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438A2B725E02003648F5 /* NosebleedArtView.swift */; }; 97EF438D2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438C2B726CE6003648F5 /* ArtWorkModel+InitialSymbolRow.swift */; }; 97EF43902B72D2E4003648F5 /* NosebleedArtView+CoverArt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97EF438F2B72D2E4003648F5 /* NosebleedArtView+CoverArt.swift */; }; @@ -120,7 +119,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 97E11DF028176A0D00B2AB32 /* SFUserFriendlySymbols in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -378,7 +376,6 @@ ); name = SFSymbolsArtCollection; packageProductDependencies = ( - 97E11DEF28176A0D00B2AB32 /* SFUserFriendlySymbols */, ); productName = SFSymbolsArtCollection; productReference = 97E11D4C2817381100B2AB32 /* SFSymbolsArtCollection.app */; @@ -409,7 +406,6 @@ ); mainGroup = 97E11D432817381100B2AB32; packageReferences = ( - 97E11DEE28176A0D00B2AB32 /* XCRemoteSwiftPackageReference "SFUserFriendlySymbols" */, ); productRefGroup = 97E11D4D2817381100B2AB32 /* Products */; projectDirPath = ""; @@ -693,25 +689,6 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ - -/* Begin XCRemoteSwiftPackageReference section */ - 97E11DEE28176A0D00B2AB32 /* XCRemoteSwiftPackageReference "SFUserFriendlySymbols" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/littleossa/SFUserFriendlySymbols.git"; - requirement = { - kind = upToNextMajorVersion; - minimumVersion = 0.4.0; - }; - }; -/* End XCRemoteSwiftPackageReference section */ - -/* Begin XCSwiftPackageProductDependency section */ - 97E11DEF28176A0D00B2AB32 /* SFUserFriendlySymbols */ = { - isa = XCSwiftPackageProductDependency; - package = 97E11DEE28176A0D00B2AB32 /* XCRemoteSwiftPackageReference "SFUserFriendlySymbols" */; - productName = SFUserFriendlySymbols; - }; -/* End XCSwiftPackageProductDependency section */ }; rootObject = 97E11D442817381100B2AB32 /* Project object */; } diff --git a/SFSymbolsArtCollection.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/SFSymbolsArtCollection.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 4b6b578..0000000 --- a/SFSymbolsArtCollection.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,14 +0,0 @@ -{ - "pins" : [ - { - "identity" : "sfuserfriendlysymbols", - "kind" : "remoteSourceControl", - "location" : "https://github.com/littleossa/SFUserFriendlySymbols.git", - "state" : { - "revision" : "9d003e1c818de1dbe34a36b197ce11d9524a54d9", - "version" : "0.4.0" - } - } - ], - "version" : 2 -} From 816884b5e2468c86a21a9720ff69dc8c7223f826 Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 12 Feb 2024 17:39:31 +0900 Subject: [PATCH 098/108] Add SweetBeanBunMan --- .../project.pbxproj | 12 + .../ArtGalleryView.swift | 7 + .../SweetBeanBunManArtView.swift | 313 ++++++++++++++++++ 3 files changed, 332 insertions(+) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtView.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 0e37b89..593bca6 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -33,6 +33,7 @@ 9778A4932B781DCE001BF9E8 /* FireworksArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9778A4922B781DCE001BF9E8 /* FireworksArtView.swift */; }; 9778A4952B78C076001BF9E8 /* FireworksArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9778A4942B78C076001BF9E8 /* FireworksArtView+Element.swift */; }; 9778A4972B78C0C2001BF9E8 /* FireworksArtView+CoverArt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9778A4962B78C0C2001BF9E8 /* FireworksArtView+CoverArt.swift */; }; + 9778A49D2B7974E4001BF9E8 /* SweetBeanBunManArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9778A49C2B7974E4001BF9E8 /* SweetBeanBunManArtView.swift */; }; 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; @@ -87,6 +88,7 @@ 9778A4922B781DCE001BF9E8 /* FireworksArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FireworksArtView.swift; sourceTree = ""; }; 9778A4942B78C076001BF9E8 /* FireworksArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FireworksArtView+Element.swift"; sourceTree = ""; }; 9778A4962B78C0C2001BF9E8 /* FireworksArtView+CoverArt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FireworksArtView+CoverArt.swift"; sourceTree = ""; }; + 9778A49C2B7974E4001BF9E8 /* SweetBeanBunManArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SweetBeanBunManArtView.swift; sourceTree = ""; }; 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; @@ -183,6 +185,14 @@ path = Fireworks; sourceTree = ""; }; + 9778A49B2B7974A3001BF9E8 /* SweetBeanBunMan */ = { + isa = PBXGroup; + children = ( + 9778A49C2B7974E4001BF9E8 /* SweetBeanBunManArtView.swift */, + ); + path = SweetBeanBunMan; + sourceTree = ""; + }; 97AD530D2B70DBC70034FB5D /* ArtisticWorldOfSFSymbols */ = { isa = PBXGroup; children = ( @@ -235,6 +245,7 @@ 9748BE4428980FE4006DF0BE /* DemonWrestler */, 9778A4912B781DA6001BF9E8 /* Fireworks */, 97AD531E2B70E2770034FB5D /* AfroBoy */, + 9778A49B2B7974A3001BF9E8 /* SweetBeanBunMan */, 97EF43892B725DE7003648F5 /* Nosebleed */, 97EF43912B72D3AF003648F5 /* ImWearingPants */, ); @@ -478,6 +489,7 @@ 97EF43902B72D2E4003648F5 /* NosebleedArtView+CoverArt.swift in Sources */, 9767DF112B75E8FC00457DA1 /* MagicianArtView+Element.swift in Sources */, 9767DF0F2B75DFB400457DA1 /* SymbolArtDisplayView.swift in Sources */, + 9778A49D2B7974E4001BF9E8 /* SweetBeanBunManArtView.swift in Sources */, 9767DF252B76C9BE00457DA1 /* ArmHairArtView.swift in Sources */, 97E11D502817381100B2AB32 /* SFSymbolsArtCollectionApp.swift in Sources */, 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift index 4d715d7..fb7a450 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift @@ -92,6 +92,13 @@ struct ArtGalleryView: View { ) } + NavigationLink { + SweetBeanBunManArtView() + } label: { + SweetBeanBunManArtView.CoverArt() + .galleryGridItemView(length: model.galleryColumnLength) + } + NavigationLink { AfroBoyArtView() } label: { diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtView.swift new file mode 100644 index 0000000..64ff7cb --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtView.swift @@ -0,0 +1,313 @@ +// +// SweetBeanBunManArtView.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension SweetBeanBunManArtView { + + enum Element: String, CaseIterable, Identifiable { + case sweetBeans + case face + case eyeConcealmentRight + case eyeConcealmentLeft + case mouthConcealmentRight + case mouthConcealmentLeft + case eyebrowRight + case eyebrowLeft + case eyebrowConcealmentRight + case eyebrowConcealmentLeft + case eyeRight + case eyeLeft + case mouth + case mouthConcealment + case centerNose + + var id: String { rawValue } + + var value: SymbolArtElement { + switch self { + case .sweetBeans: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.first), + primaryColor: .darkBrown, + widthRatio: 0.7, + heightRatio: 0.7, + symbolCountToWaitFor: 0 + ) + case .face: + SymbolArtElement( + symbol: "􁺱", + name: "ev.plug.ac.gb.t.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .third(.second), + primaryColor: .orange, + secondaryColor: .paleOrange, + widthRatio: 0.8, + heightRatio: 0.7, + verticalOffsetRatio: 0.05, + symbolCountToWaitFor: 1 + ) + case .eyeConcealmentRight: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.first), + primaryColor: .paleOrange, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: 0.1, + verticalOffsetRatio: -0.14, + symbolCountToWaitFor: 2 + ) + case .eyeConcealmentLeft: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.first), + primaryColor: .paleOrange, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: -0.1, + verticalOffsetRatio: -0.14, + symbolCountToWaitFor: 2 + ) + case .mouthConcealmentRight: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.first), + primaryColor: .paleOrange, + widthRatio: 0.175, + heightRatio: 0.175, + horizontalOffsetRatio: 0.1, + verticalOffsetRatio: 0.19, + symbolCountToWaitFor: 2 + ) + case .mouthConcealmentLeft: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.first), + primaryColor: .paleOrange, + widthRatio: 0.175, + heightRatio: 0.175, + horizontalOffsetRatio: -0.11, + verticalOffsetRatio: 0.19, + symbolCountToWaitFor: 2 + ) + case .eyebrowRight: + SymbolArtElement( + symbol: "􀙱", + name: "wave.3.left", + initialPosition: .third(.third), + primaryColor: .black, + widthRatio: 0.1, + heightRatio: 0.2, + rotationDegrees: 90, + horizontalOffsetRatio: 0.12, + verticalOffsetRatio: -0.19, + symbolCountToWaitFor: 3 + ) + + case .eyebrowLeft: + SymbolArtElement( + symbol: "􀙱", + name: "wave.3.left", + initialPosition: .third(.third), + primaryColor: .black, + widthRatio: 0.1, + heightRatio: 0.2, + rotationDegrees: 90, + horizontalOffsetRatio: -0.12, + verticalOffsetRatio: -0.19, + symbolCountToWaitFor: 3 + ) + case .eyebrowConcealmentRight: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.first), + primaryColor: .paleOrange, + widthRatio: 0.16, + heightRatio: 0.1, + horizontalOffsetRatio: 0.12, + verticalOffsetRatio: -0.17, + symbolCountToWaitFor: 4 + ) + case .eyebrowConcealmentLeft: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.first), + primaryColor: .paleOrange, + widthRatio: 0.16, + heightRatio: 0.1, + horizontalOffsetRatio: -0.12, + verticalOffsetRatio: -0.17, + symbolCountToWaitFor: 4 + ) + case .eyeRight: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.first), + primaryColor: .black, + widthRatio: 0.05, + heightRatio: 0.1, + horizontalOffsetRatio: 0.12, + verticalOffsetRatio: -0.15, + symbolCountToWaitFor: 5 + ) + case .eyeLeft: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.first), + primaryColor: .black, + widthRatio: 0.05, + heightRatio: 0.1, + horizontalOffsetRatio: -0.12, + verticalOffsetRatio: -0.15, + symbolCountToWaitFor: 5 + ) + case .mouth: + SymbolArtElement( + symbol: "􀼭", + name: "rainbow", + initialPosition: .third(.fourth), + primaryColor: .black, + widthRatio: 0.4, + heightRatio: 0.1, + rotationDegrees: 180, + verticalOffsetRatio: 0.2, + symbolCountToWaitFor: 6 + ) + case .mouthConcealment: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.first), + primaryColor: .paleOrange, + widthRatio: 0.3486, + heightRatio: 0.135, + horizontalOffsetRatio: 0.003, + verticalOffsetRatio: 0.17, + symbolCountToWaitFor: 7 + ) + case .centerNose: + SymbolArtElement( + symbol: "􀜫", + name: "stop.circle.fill", + initialPrimaryColor: .white, + initialPosition: .third(.fifth), + primaryColor: .white, + secondaryColor: .red, + widthRatio: 0.2, + heightRatio: 0.2, + verticalOffsetRatio: 0.01, + symbolCountToWaitFor: 8 + ) + } + } + } +} + +struct SweetBeanBunManArtView: View { + + @State private var isAnimating = false + + var body: some View { + ZStack { + ForEach(Element.allCases) { + AnimatableSymbolView(element: $0.value, isAnimating: isAnimating) + } + } + .navigationTitle("Sweet bean bun man") + .navigationBarTitleDisplayMode(.inline) + .toolbar(content: { + ToolbarItemGroup(placement: .bottomBar) { + Spacer() + + PlayButton { + isAnimating = true + } + .font(.system(size: 32)) + .disabled(isAnimating) + } + }) + } +} + +#Preview { + NavigationStack { + SweetBeanBunManArtView() + .environment(ArtWorkModel.preview) + } +} + +extension SweetBeanBunManArtView { + + struct CoverArt: View { + + @Environment(ArtWorkModel.self) var model + + var body: some View { + ZStack { + ForEach(Element.allCases) { + SymbolArtDisplayView(element: $0.value) + } + + Image(systemName: "circle.fill") + .resizable() + .foregroundStyle(.black.opacity(0.9)) + .frame( + width: model.calculatingProportionalValue( + withRatio: 0.7, + shouldResizeForCoverArt: true + ), + height: model.calculatingProportionalValue( + withRatio: 0.7, + shouldResizeForCoverArt: true + ) + ) + + Image(systemName: "ev.plug.ac.gb.t.fill") + .resizable() + .foregroundStyle(.black.opacity(0.9)) + .frame( + width: model.calculatingProportionalValue( + withRatio: 0.8, + shouldResizeForCoverArt: true + ), + height: model.calculatingProportionalValue( + withRatio: 0.7, + shouldResizeForCoverArt: true + ) + ) + .offset(y: model.calculatingProportionalValue( + withRatio: 0.05, + shouldResizeForCoverArt: true + )) + + Image(systemName: "questionmark.app.fill") + .foregroundStyle(.white, .black.opacity(0.9)) + .font(.system(size: model.calculatingProportionalValue( + withRatio: 0.4, + shouldResizeForCoverArt: true + ))) + .bold() + } + } + } +} + +#Preview { + SweetBeanBunManArtView.CoverArt() + .environment(ArtWorkModel.preview) +} From fb3b952407e048917f1a48b662ec50658a82b191 Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 12 Feb 2024 17:59:32 +0900 Subject: [PATCH 099/108] Update SweetBeanBunMan face --- .../SweetBeanBunManArtView.swift | 61 ++++++++++++------- 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtView.swift index 64ff7cb..ed66e59 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtView.swift @@ -23,8 +23,9 @@ extension SweetBeanBunManArtView { case eyeRight case eyeLeft case mouth - case mouthConcealment case centerNose + case eyeMinusRight + case eyeMinusLeft var id: String { rawValue } @@ -109,7 +110,7 @@ extension SweetBeanBunManArtView { primaryColor: .black, widthRatio: 0.1, heightRatio: 0.2, - rotationDegrees: 90, + rotationDegrees: 115, horizontalOffsetRatio: 0.12, verticalOffsetRatio: -0.19, symbolCountToWaitFor: 3 @@ -123,7 +124,7 @@ extension SweetBeanBunManArtView { primaryColor: .black, widthRatio: 0.1, heightRatio: 0.2, - rotationDegrees: 90, + rotationDegrees: 65, horizontalOffsetRatio: -0.12, verticalOffsetRatio: -0.19, symbolCountToWaitFor: 3 @@ -134,8 +135,9 @@ extension SweetBeanBunManArtView { name: "circle.fill", initialPosition: .third(.first), primaryColor: .paleOrange, - widthRatio: 0.16, + widthRatio: 0.18, heightRatio: 0.1, + rotationDegrees: 30, horizontalOffsetRatio: 0.12, verticalOffsetRatio: -0.17, symbolCountToWaitFor: 4 @@ -146,8 +148,9 @@ extension SweetBeanBunManArtView { name: "circle.fill", initialPosition: .third(.first), primaryColor: .paleOrange, - widthRatio: 0.16, + widthRatio: 0.18, heightRatio: 0.1, + rotationDegrees: -30, horizontalOffsetRatio: -0.12, verticalOffsetRatio: -0.17, symbolCountToWaitFor: 4 @@ -178,28 +181,16 @@ extension SweetBeanBunManArtView { ) case .mouth: SymbolArtElement( - symbol: "􀼭", - name: "rainbow", + symbol: "􁕋", + name: "stairs", initialPosition: .third(.fourth), primaryColor: .black, - widthRatio: 0.4, - heightRatio: 0.1, - rotationDegrees: 180, - verticalOffsetRatio: 0.2, + widthRatio: 0.3, + heightRatio: 0.2, + rotationDegrees: 30, + verticalOffsetRatio: 0.23, symbolCountToWaitFor: 6 ) - case .mouthConcealment: - SymbolArtElement( - symbol: "􀀁", - name: "circle.fill", - initialPosition: .third(.first), - primaryColor: .paleOrange, - widthRatio: 0.3486, - heightRatio: 0.135, - horizontalOffsetRatio: 0.003, - verticalOffsetRatio: 0.17, - symbolCountToWaitFor: 7 - ) case .centerNose: SymbolArtElement( symbol: "􀜫", @@ -211,6 +202,30 @@ extension SweetBeanBunManArtView { widthRatio: 0.2, heightRatio: 0.2, verticalOffsetRatio: 0.01, + symbolCountToWaitFor: 7 + ) + case .eyeMinusRight: + SymbolArtElement( + symbol: "􀅽", + name: "minus", + initialPosition: .third(.sixth), + primaryColor: .black, + widthRatio: 0.07, + heightRatio: 0.01, + horizontalOffsetRatio: 0.12, + verticalOffsetRatio: -0.15, + symbolCountToWaitFor: 8 + ) + case .eyeMinusLeft: + SymbolArtElement( + symbol: "􀅽", + name: "minus", + initialPosition: .third(.sixth), + primaryColor: .black, + widthRatio: 0.07, + heightRatio: 0.01, + horizontalOffsetRatio: -0.12, + verticalOffsetRatio: -0.15, symbolCountToWaitFor: 8 ) } From 75bc1e5e711bfa8e2fc948f5deb13ef28587584b Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 12 Feb 2024 18:10:35 +0900 Subject: [PATCH 100/108] Refactor SweetBeanBunManArtWork --- .../project.pbxproj | 8 + .../SweetBeanBunManArtView.swift | 287 ------------------ .../SweetBeanBunManArtWork+CoverArt.swift | 70 +++++ .../SweetBeanBunManArtWork+Element.swift | 246 +++++++++++++++ 4 files changed, 324 insertions(+), 287 deletions(-) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtWork+CoverArt.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtWork+Element.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 593bca6..a47aac6 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -34,6 +34,8 @@ 9778A4952B78C076001BF9E8 /* FireworksArtView+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9778A4942B78C076001BF9E8 /* FireworksArtView+Element.swift */; }; 9778A4972B78C0C2001BF9E8 /* FireworksArtView+CoverArt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9778A4962B78C0C2001BF9E8 /* FireworksArtView+CoverArt.swift */; }; 9778A49D2B7974E4001BF9E8 /* SweetBeanBunManArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9778A49C2B7974E4001BF9E8 /* SweetBeanBunManArtView.swift */; }; + 9778A49F2B7A179F001BF9E8 /* SweetBeanBunManArtWork+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9778A49E2B7A179F001BF9E8 /* SweetBeanBunManArtWork+Element.swift */; }; + 9778A4A12B7A17CD001BF9E8 /* SweetBeanBunManArtWork+CoverArt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9778A4A02B7A17CD001BF9E8 /* SweetBeanBunManArtWork+CoverArt.swift */; }; 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; @@ -89,6 +91,8 @@ 9778A4942B78C076001BF9E8 /* FireworksArtView+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FireworksArtView+Element.swift"; sourceTree = ""; }; 9778A4962B78C0C2001BF9E8 /* FireworksArtView+CoverArt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FireworksArtView+CoverArt.swift"; sourceTree = ""; }; 9778A49C2B7974E4001BF9E8 /* SweetBeanBunManArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SweetBeanBunManArtView.swift; sourceTree = ""; }; + 9778A49E2B7A179F001BF9E8 /* SweetBeanBunManArtWork+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SweetBeanBunManArtWork+Element.swift"; sourceTree = ""; }; + 9778A4A02B7A17CD001BF9E8 /* SweetBeanBunManArtWork+CoverArt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SweetBeanBunManArtWork+CoverArt.swift"; sourceTree = ""; }; 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; @@ -189,6 +193,8 @@ isa = PBXGroup; children = ( 9778A49C2B7974E4001BF9E8 /* SweetBeanBunManArtView.swift */, + 9778A49E2B7A179F001BF9E8 /* SweetBeanBunManArtWork+Element.swift */, + 9778A4A02B7A17CD001BF9E8 /* SweetBeanBunManArtWork+CoverArt.swift */, ); path = SweetBeanBunMan; sourceTree = ""; @@ -453,8 +459,10 @@ 9767DF2B2B776D5800457DA1 /* DemonWrestlerArtView+CoverArt.swift in Sources */, 9767DF2D2B776DA100457DA1 /* DemonWrestlerArtView+Element.swift in Sources */, 9767DF002B752E4700457DA1 /* WorldPeaceArtView.swift in Sources */, + 9778A4A12B7A17CD001BF9E8 /* SweetBeanBunManArtWork+CoverArt.swift in Sources */, 9767DF132B75EDB700457DA1 /* CrayonBoyArtView+Element.swift in Sources */, 97AD532D2B717C950034FB5D /* AfroBoyArtView+CoverArt.swift in Sources */, + 9778A49F2B7A179F001BF9E8 /* SweetBeanBunManArtWork+Element.swift in Sources */, 97EF438B2B725E02003648F5 /* NosebleedArtView.swift in Sources */, 9778A4932B781DCE001BF9E8 /* FireworksArtView.swift in Sources */, 97AD53182B70DFF30034FB5D /* AnimationValues.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtView.swift index ed66e59..606ffc1 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtView.swift @@ -7,232 +7,6 @@ import SwiftUI -extension SweetBeanBunManArtView { - - enum Element: String, CaseIterable, Identifiable { - case sweetBeans - case face - case eyeConcealmentRight - case eyeConcealmentLeft - case mouthConcealmentRight - case mouthConcealmentLeft - case eyebrowRight - case eyebrowLeft - case eyebrowConcealmentRight - case eyebrowConcealmentLeft - case eyeRight - case eyeLeft - case mouth - case centerNose - case eyeMinusRight - case eyeMinusLeft - - var id: String { rawValue } - - var value: SymbolArtElement { - switch self { - case .sweetBeans: - SymbolArtElement( - symbol: "􀀁", - name: "circle.fill", - initialPosition: .third(.first), - primaryColor: .darkBrown, - widthRatio: 0.7, - heightRatio: 0.7, - symbolCountToWaitFor: 0 - ) - case .face: - SymbolArtElement( - symbol: "􁺱", - name: "ev.plug.ac.gb.t.fill", - initialPrimaryColor: .systemBackground, - initialPosition: .third(.second), - primaryColor: .orange, - secondaryColor: .paleOrange, - widthRatio: 0.8, - heightRatio: 0.7, - verticalOffsetRatio: 0.05, - symbolCountToWaitFor: 1 - ) - case .eyeConcealmentRight: - SymbolArtElement( - symbol: "􀀁", - name: "circle.fill", - initialPosition: .third(.first), - primaryColor: .paleOrange, - widthRatio: 0.15, - heightRatio: 0.15, - horizontalOffsetRatio: 0.1, - verticalOffsetRatio: -0.14, - symbolCountToWaitFor: 2 - ) - case .eyeConcealmentLeft: - SymbolArtElement( - symbol: "􀀁", - name: "circle.fill", - initialPosition: .third(.first), - primaryColor: .paleOrange, - widthRatio: 0.15, - heightRatio: 0.15, - horizontalOffsetRatio: -0.1, - verticalOffsetRatio: -0.14, - symbolCountToWaitFor: 2 - ) - case .mouthConcealmentRight: - SymbolArtElement( - symbol: "􀀁", - name: "circle.fill", - initialPosition: .third(.first), - primaryColor: .paleOrange, - widthRatio: 0.175, - heightRatio: 0.175, - horizontalOffsetRatio: 0.1, - verticalOffsetRatio: 0.19, - symbolCountToWaitFor: 2 - ) - case .mouthConcealmentLeft: - SymbolArtElement( - symbol: "􀀁", - name: "circle.fill", - initialPosition: .third(.first), - primaryColor: .paleOrange, - widthRatio: 0.175, - heightRatio: 0.175, - horizontalOffsetRatio: -0.11, - verticalOffsetRatio: 0.19, - symbolCountToWaitFor: 2 - ) - case .eyebrowRight: - SymbolArtElement( - symbol: "􀙱", - name: "wave.3.left", - initialPosition: .third(.third), - primaryColor: .black, - widthRatio: 0.1, - heightRatio: 0.2, - rotationDegrees: 115, - horizontalOffsetRatio: 0.12, - verticalOffsetRatio: -0.19, - symbolCountToWaitFor: 3 - ) - - case .eyebrowLeft: - SymbolArtElement( - symbol: "􀙱", - name: "wave.3.left", - initialPosition: .third(.third), - primaryColor: .black, - widthRatio: 0.1, - heightRatio: 0.2, - rotationDegrees: 65, - horizontalOffsetRatio: -0.12, - verticalOffsetRatio: -0.19, - symbolCountToWaitFor: 3 - ) - case .eyebrowConcealmentRight: - SymbolArtElement( - symbol: "􀀁", - name: "circle.fill", - initialPosition: .third(.first), - primaryColor: .paleOrange, - widthRatio: 0.18, - heightRatio: 0.1, - rotationDegrees: 30, - horizontalOffsetRatio: 0.12, - verticalOffsetRatio: -0.17, - symbolCountToWaitFor: 4 - ) - case .eyebrowConcealmentLeft: - SymbolArtElement( - symbol: "􀀁", - name: "circle.fill", - initialPosition: .third(.first), - primaryColor: .paleOrange, - widthRatio: 0.18, - heightRatio: 0.1, - rotationDegrees: -30, - horizontalOffsetRatio: -0.12, - verticalOffsetRatio: -0.17, - symbolCountToWaitFor: 4 - ) - case .eyeRight: - SymbolArtElement( - symbol: "􀀁", - name: "circle.fill", - initialPosition: .third(.first), - primaryColor: .black, - widthRatio: 0.05, - heightRatio: 0.1, - horizontalOffsetRatio: 0.12, - verticalOffsetRatio: -0.15, - symbolCountToWaitFor: 5 - ) - case .eyeLeft: - SymbolArtElement( - symbol: "􀀁", - name: "circle.fill", - initialPosition: .third(.first), - primaryColor: .black, - widthRatio: 0.05, - heightRatio: 0.1, - horizontalOffsetRatio: -0.12, - verticalOffsetRatio: -0.15, - symbolCountToWaitFor: 5 - ) - case .mouth: - SymbolArtElement( - symbol: "􁕋", - name: "stairs", - initialPosition: .third(.fourth), - primaryColor: .black, - widthRatio: 0.3, - heightRatio: 0.2, - rotationDegrees: 30, - verticalOffsetRatio: 0.23, - symbolCountToWaitFor: 6 - ) - case .centerNose: - SymbolArtElement( - symbol: "􀜫", - name: "stop.circle.fill", - initialPrimaryColor: .white, - initialPosition: .third(.fifth), - primaryColor: .white, - secondaryColor: .red, - widthRatio: 0.2, - heightRatio: 0.2, - verticalOffsetRatio: 0.01, - symbolCountToWaitFor: 7 - ) - case .eyeMinusRight: - SymbolArtElement( - symbol: "􀅽", - name: "minus", - initialPosition: .third(.sixth), - primaryColor: .black, - widthRatio: 0.07, - heightRatio: 0.01, - horizontalOffsetRatio: 0.12, - verticalOffsetRatio: -0.15, - symbolCountToWaitFor: 8 - ) - case .eyeMinusLeft: - SymbolArtElement( - symbol: "􀅽", - name: "minus", - initialPosition: .third(.sixth), - primaryColor: .black, - widthRatio: 0.07, - heightRatio: 0.01, - horizontalOffsetRatio: -0.12, - verticalOffsetRatio: -0.15, - symbolCountToWaitFor: 8 - ) - } - } - } -} - struct SweetBeanBunManArtView: View { @State private var isAnimating = false @@ -265,64 +39,3 @@ struct SweetBeanBunManArtView: View { .environment(ArtWorkModel.preview) } } - -extension SweetBeanBunManArtView { - - struct CoverArt: View { - - @Environment(ArtWorkModel.self) var model - - var body: some View { - ZStack { - ForEach(Element.allCases) { - SymbolArtDisplayView(element: $0.value) - } - - Image(systemName: "circle.fill") - .resizable() - .foregroundStyle(.black.opacity(0.9)) - .frame( - width: model.calculatingProportionalValue( - withRatio: 0.7, - shouldResizeForCoverArt: true - ), - height: model.calculatingProportionalValue( - withRatio: 0.7, - shouldResizeForCoverArt: true - ) - ) - - Image(systemName: "ev.plug.ac.gb.t.fill") - .resizable() - .foregroundStyle(.black.opacity(0.9)) - .frame( - width: model.calculatingProportionalValue( - withRatio: 0.8, - shouldResizeForCoverArt: true - ), - height: model.calculatingProportionalValue( - withRatio: 0.7, - shouldResizeForCoverArt: true - ) - ) - .offset(y: model.calculatingProportionalValue( - withRatio: 0.05, - shouldResizeForCoverArt: true - )) - - Image(systemName: "questionmark.app.fill") - .foregroundStyle(.white, .black.opacity(0.9)) - .font(.system(size: model.calculatingProportionalValue( - withRatio: 0.4, - shouldResizeForCoverArt: true - ))) - .bold() - } - } - } -} - -#Preview { - SweetBeanBunManArtView.CoverArt() - .environment(ArtWorkModel.preview) -} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtWork+CoverArt.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtWork+CoverArt.swift new file mode 100644 index 0000000..b038da7 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtWork+CoverArt.swift @@ -0,0 +1,70 @@ +// +// SweetBeanBunManArtWork+CoverArt.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension SweetBeanBunManArtView { + + struct CoverArt: View { + + @Environment(ArtWorkModel.self) var model + + var body: some View { + ZStack { + ForEach(Element.allCases) { + SymbolArtDisplayView(element: $0.value) + } + + Image(systemName: "circle.fill") + .resizable() + .foregroundStyle(.black.opacity(0.9)) + .frame( + width: model.calculatingProportionalValue( + withRatio: 0.7, + shouldResizeForCoverArt: true + ), + height: model.calculatingProportionalValue( + withRatio: 0.7, + shouldResizeForCoverArt: true + ) + ) + + Image(systemName: "ev.plug.ac.gb.t.fill") + .resizable() + .foregroundStyle(.black.opacity(0.9)) + .frame( + width: model.calculatingProportionalValue( + withRatio: 0.8, + shouldResizeForCoverArt: true + ), + height: model.calculatingProportionalValue( + withRatio: 0.7, + shouldResizeForCoverArt: true + ) + ) + .offset(y: model.calculatingProportionalValue( + withRatio: 0.05, + shouldResizeForCoverArt: true + )) + + Image(systemName: "questionmark.app.fill") + .foregroundStyle(.white, .black.opacity(0.9)) + .font(.system(size: model.calculatingProportionalValue( + withRatio: 0.4, + shouldResizeForCoverArt: true + ))) + .bold() + } + } + } +} + +#Preview { + SweetBeanBunManArtView.CoverArt() + .environment(ArtWorkModel.preview) +} + diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtWork+Element.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtWork+Element.swift new file mode 100644 index 0000000..143ab97 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtWork+Element.swift @@ -0,0 +1,246 @@ +// +// SweetBeanBunManArtWork+Element.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension SweetBeanBunManArtView { + + enum Element: String, CaseIterable, Identifiable { + case sweetBeans + case face + case eyeConcealmentRight + case eyeConcealmentLeft + case mouthConcealmentRight + case mouthConcealmentLeft + case eyebrowRight + case eyebrowLeft + case eyebrowConcealmentRight + case eyebrowConcealmentLeft + case eyeRight + case eyeLeft + case mouth + case centerNose + case eyeMinusRight + case eyeMinusLeft + + var id: String { rawValue } + + var value: SymbolArtElement { + switch self { + case .sweetBeans: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.first), + primaryColor: .darkBrown, + widthRatio: 0.7, + heightRatio: 0.7, + symbolCountToWaitFor: 0 + ) + case .face: + SymbolArtElement( + symbol: "􁺱", + name: "ev.plug.ac.gb.t.fill", + initialPrimaryColor: .systemBackground, + initialPosition: .third(.second), + primaryColor: .orange, + secondaryColor: .paleOrange, + widthRatio: 0.8, + heightRatio: 0.7, + verticalOffsetRatio: 0.05, + symbolCountToWaitFor: 1 + ) + case .eyeConcealmentRight: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.first), + primaryColor: .paleOrange, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: 0.1, + verticalOffsetRatio: -0.14, + symbolCountToWaitFor: 2 + ) + case .eyeConcealmentLeft: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.first), + primaryColor: .paleOrange, + widthRatio: 0.15, + heightRatio: 0.15, + horizontalOffsetRatio: -0.1, + verticalOffsetRatio: -0.14, + symbolCountToWaitFor: 2 + ) + case .mouthConcealmentRight: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.first), + primaryColor: .paleOrange, + widthRatio: 0.175, + heightRatio: 0.175, + horizontalOffsetRatio: 0.1, + verticalOffsetRatio: 0.19, + symbolCountToWaitFor: 2 + ) + case .mouthConcealmentLeft: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.first), + primaryColor: .paleOrange, + widthRatio: 0.175, + heightRatio: 0.175, + horizontalOffsetRatio: -0.11, + verticalOffsetRatio: 0.19, + symbolCountToWaitFor: 2 + ) + case .eyebrowRight: + SymbolArtElement( + symbol: "􀙱", + name: "wave.3.left", + initialPosition: .third(.third), + primaryColor: .black, + widthRatio: 0.1, + heightRatio: 0.2, + rotationDegrees: 115, + horizontalOffsetRatio: 0.12, + verticalOffsetRatio: -0.19, + symbolCountToWaitFor: 3 + ) + + case .eyebrowLeft: + SymbolArtElement( + symbol: "􀙱", + name: "wave.3.left", + initialPosition: .third(.third), + primaryColor: .black, + widthRatio: 0.1, + heightRatio: 0.2, + rotationDegrees: 65, + horizontalOffsetRatio: -0.12, + verticalOffsetRatio: -0.19, + symbolCountToWaitFor: 3 + ) + case .eyebrowConcealmentRight: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.first), + primaryColor: .paleOrange, + widthRatio: 0.18, + heightRatio: 0.1, + rotationDegrees: 30, + horizontalOffsetRatio: 0.12, + verticalOffsetRatio: -0.17, + symbolCountToWaitFor: 4 + ) + case .eyebrowConcealmentLeft: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.first), + primaryColor: .paleOrange, + widthRatio: 0.18, + heightRatio: 0.1, + rotationDegrees: -30, + horizontalOffsetRatio: -0.12, + verticalOffsetRatio: -0.17, + symbolCountToWaitFor: 4 + ) + case .eyeRight: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.first), + primaryColor: .black, + widthRatio: 0.05, + heightRatio: 0.1, + horizontalOffsetRatio: 0.12, + verticalOffsetRatio: -0.15, + symbolCountToWaitFor: 5 + ) + case .eyeLeft: + SymbolArtElement( + symbol: "􀀁", + name: "circle.fill", + initialPosition: .third(.first), + primaryColor: .black, + widthRatio: 0.05, + heightRatio: 0.1, + horizontalOffsetRatio: -0.12, + verticalOffsetRatio: -0.15, + symbolCountToWaitFor: 5 + ) + case .mouth: + SymbolArtElement( + symbol: "􁕋", + name: "stairs", + initialPosition: .third(.fourth), + primaryColor: .black, + widthRatio: 0.3, + heightRatio: 0.2, + rotationDegrees: 30, + verticalOffsetRatio: 0.23, + symbolCountToWaitFor: 6 + ) + case .centerNose: + SymbolArtElement( + symbol: "􀜫", + name: "stop.circle.fill", + initialPrimaryColor: .white, + initialPosition: .third(.fifth), + primaryColor: .white, + secondaryColor: .red, + widthRatio: 0.2, + heightRatio: 0.2, + verticalOffsetRatio: 0.01, + symbolCountToWaitFor: 7 + ) + case .eyeMinusRight: + SymbolArtElement( + symbol: "􀅽", + name: "minus", + initialPosition: .third(.sixth), + primaryColor: .black, + widthRatio: 0.07, + heightRatio: 0.01, + horizontalOffsetRatio: 0.12, + verticalOffsetRatio: -0.15, + symbolCountToWaitFor: 8 + ) + case .eyeMinusLeft: + SymbolArtElement( + symbol: "􀅽", + name: "minus", + initialPosition: .third(.sixth), + primaryColor: .black, + widthRatio: 0.07, + heightRatio: 0.01, + horizontalOffsetRatio: -0.12, + verticalOffsetRatio: -0.15, + symbolCountToWaitFor: 8 + ) + } + } + } +} + +#Preview { + NavigationStack { + SweetBeanBunManArtView() + .environment(ArtWorkModel.preview) + } +} + +#Preview { + SweetBeanBunManArtView.CoverArt() + .environment(ArtWorkModel.preview) +} From 7f8dc7eec7b2a9fb5c2f67ac82c2fe12bb46f630 Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 12 Feb 2024 18:41:31 +0900 Subject: [PATCH 101/108] Refactor ArtGalleryView --- .../ArtGalleryView.swift | 193 +++++++++--------- 1 file changed, 95 insertions(+), 98 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift index fb7a450..a6851d5 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift @@ -18,113 +18,34 @@ extension ArtGalleryView { struct ArtGalleryView: View { + @State private var path = NavigationPath() private let model: ArtWorkModel private let columns: [GridItem] var body: some View { - VStack { - - // Navigation pathの状態によって、この部分の表示非表示を切り替えれるか？ -// Spacer() -// .frame(height: 60) -// -// Text("SF Symbols Art") -// .font(.largeTitle) -// .bold() -// -// Text("is just the art created by combining SF Symbols") -// - NavigationStack { - ScrollView { - LazyVGrid(columns: columns) { - - Group { - NavigationLink { - MagicianArtView() - } label: { - MagicianArtView.CoverArt() - .galleryGridItemView(length: model.galleryColumnLength) - } - - NavigationLink { - CrayonBoyArtView() - } label: { - CrayonBoyArtView.CoverArt() - .galleryGridItemView(length: model.galleryColumnLength) - } - - NavigationLink { - WorldPeaceArtView() - } label: { - WorldPeaceArtView.CoverArt() - .galleryGridItemView(length: model.galleryColumnLength) - } - - NavigationLink { - PartyAnimalsArtView() - } label: { - PartyAnimalsArtView.CoverArt() - .galleryGridItemView(length: model.galleryColumnLength) - } - - NavigationLink { - ArmHairArtView() - } label: { - ArmHairArtView.CoverArt() - .galleryGridItemView(length: model.galleryColumnLength) - } - - NavigationLink { - DemonWrestlerArtView() - } label: { - DemonWrestlerArtView.CoverArt() - .galleryGridItemView(length: model.galleryColumnLength) - } - - NavigationLink { - FireworksArtView() - } label: { - FireworksArtView.CoverArt() - .galleryGridItemView( - backgroundColor: .midnightNavy, - length: model.galleryColumnLength - ) - } - - NavigationLink { - SweetBeanBunManArtView() - } label: { - SweetBeanBunManArtView.CoverArt() - .galleryGridItemView(length: model.galleryColumnLength) - } - - NavigationLink { - AfroBoyArtView() - } label: { - AfroBoyArtView.CoverArt() - .galleryGridItemView(length: model.galleryColumnLength) - } - - NavigationLink { - NosebleedArtView() - } label: { - NosebleedArtView.CoverArt() - .galleryGridItemView(length: model.galleryColumnLength) - } - - NavigationLink { - ImWearingPantsArtView() - } label: { - ImWearingPantsArtView.CoverArt() - .galleryGridItemView(length: model.galleryColumnLength) - } + NavigationStack(path: $path) { + ScrollView { + LazyVGrid(columns: columns) { + + ForEach(ArtWorkPath.allCases) { path in + NavigationLink(value: path) { + path.coverArt + .galleryGridItemView( + backgroundColor: path.coverArtBackground, + length: model.galleryColumnLength + ) } } - .padding(.horizontal, 24) } - .navigationTitle("Art Gallery") + .padding(.horizontal, 24) + .navigationDestination(for: ArtWorkPath.self) { path in + path.destination + .navigationTitle(path.rawValue) + .navigationBarTitleDisplayMode(.inline) + } } + .navigationTitle("Art Gallery") } .environment(model) } @@ -134,3 +55,79 @@ struct ArtGalleryView: View { ArtGalleryView(screenSize: .init(width: 1024, height: 1024)) } + +enum ArtWorkPath: String, CaseIterable, Identifiable { + case magician = "Magician" + case crayonBoy = "Crayon boy" + case worldPeace = "World peace" + case partyAnimals = "Party animals" + case armHair = "Arm hair" + case demonWrestler = "Demon wrestler" + case fireworks = "Fireworks" + case afroBoy = "Afro boy" + case sweetBeanBunMan = "Sweet bean bun man" + case nosebleed = "Nosebleed" + case imWearingPants = "ImWearingPants" + + var id: String { rawValue } + + @ViewBuilder + var coverArt: some View { + switch self { + case .magician: + MagicianArtView.CoverArt() + case .crayonBoy: + CrayonBoyArtView.CoverArt() + case .worldPeace: + WorldPeaceArtView.CoverArt() + case .partyAnimals: + PartyAnimalsArtView.CoverArt() + case .armHair: + ArmHairArtView.CoverArt() + case .demonWrestler: + DemonWrestlerArtView.CoverArt() + case .fireworks: + FireworksArtView.CoverArt() + case .afroBoy: + AfroBoyArtView.CoverArt() + case .sweetBeanBunMan: + SweetBeanBunManArtView.CoverArt() + case .nosebleed: + NosebleedArtView.CoverArt() + case .imWearingPants: + ImWearingPantsArtView.CoverArt() + } + } + + var coverArtBackground: Color { + self == .fireworks ? .midnightNavy : .white + } + + @ViewBuilder + var destination: some View { + switch self { + case .magician: + MagicianArtView() + case .crayonBoy: + CrayonBoyArtView() + case .worldPeace: + WorldPeaceArtView() + case .partyAnimals: + PartyAnimalsArtView() + case .armHair: + ArmHairArtView() + case .demonWrestler: + DemonWrestlerArtView() + case .fireworks: + FireworksArtView() + case .afroBoy: + AfroBoyArtView() + case .sweetBeanBunMan: + SweetBeanBunManArtView() + case .nosebleed: + NosebleedArtView() + case .imWearingPants: + ImWearingPantsArtView() + } + } +} From 72b0b1ee35dfbd7f24e2cf0cefa432ae8dcb3b47 Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 12 Feb 2024 18:43:38 +0900 Subject: [PATCH 102/108] Refactor ArtGallery --- .../project.pbxproj | 14 +- .../ArtGalleryView+ArtWorkPath.swift | 88 ++++++++++++ .../ArtGallery/ArtGalleryView.swift | 57 ++++++++ .../ArtGalleryView.swift | 133 ------------------ 4 files changed, 158 insertions(+), 134 deletions(-) create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGallery/ArtGalleryView+ArtWorkPath.swift create mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGallery/ArtGalleryView.swift delete mode 100644 SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index a47aac6..768e769 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -36,6 +36,7 @@ 9778A49D2B7974E4001BF9E8 /* SweetBeanBunManArtView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9778A49C2B7974E4001BF9E8 /* SweetBeanBunManArtView.swift */; }; 9778A49F2B7A179F001BF9E8 /* SweetBeanBunManArtWork+Element.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9778A49E2B7A179F001BF9E8 /* SweetBeanBunManArtWork+Element.swift */; }; 9778A4A12B7A17CD001BF9E8 /* SweetBeanBunManArtWork+CoverArt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9778A4A02B7A17CD001BF9E8 /* SweetBeanBunManArtWork+CoverArt.swift */; }; + 9778A4A32B7A1F87001BF9E8 /* ArtGalleryView+ArtWorkPath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9778A4A22B7A1F87001BF9E8 /* ArtGalleryView+ArtWorkPath.swift */; }; 97AD530C2B70DA2F0034FB5D /* ArtGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */; }; 97AD53102B70DE230034FB5D /* SymbolNameFrameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */; }; 97AD53122B70DEB60034FB5D /* UIDevice+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97AD53112B70DEB60034FB5D /* UIDevice+.swift */; }; @@ -93,6 +94,7 @@ 9778A49C2B7974E4001BF9E8 /* SweetBeanBunManArtView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SweetBeanBunManArtView.swift; sourceTree = ""; }; 9778A49E2B7A179F001BF9E8 /* SweetBeanBunManArtWork+Element.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SweetBeanBunManArtWork+Element.swift"; sourceTree = ""; }; 9778A4A02B7A17CD001BF9E8 /* SweetBeanBunManArtWork+CoverArt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SweetBeanBunManArtWork+CoverArt.swift"; sourceTree = ""; }; + 9778A4A22B7A1F87001BF9E8 /* ArtGalleryView+ArtWorkPath.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ArtGalleryView+ArtWorkPath.swift"; sourceTree = ""; }; 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtGalleryView.swift; sourceTree = ""; }; 97AD530F2B70DE230034FB5D /* SymbolNameFrameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SymbolNameFrameView.swift; sourceTree = ""; }; 97AD53112B70DEB60034FB5D /* UIDevice+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIDevice+.swift"; sourceTree = ""; }; @@ -199,10 +201,19 @@ path = SweetBeanBunMan; sourceTree = ""; }; - 97AD530D2B70DBC70034FB5D /* ArtisticWorldOfSFSymbols */ = { + 9778A4A42B7A1FA6001BF9E8 /* ArtGallery */ = { isa = PBXGroup; children = ( 97AD530B2B70DA2F0034FB5D /* ArtGalleryView.swift */, + 9778A4A22B7A1F87001BF9E8 /* ArtGalleryView+ArtWorkPath.swift */, + ); + path = ArtGallery; + sourceTree = ""; + }; + 97AD530D2B70DBC70034FB5D /* ArtisticWorldOfSFSymbols */ = { + isa = PBXGroup; + children = ( + 9778A4A42B7A1FA6001BF9E8 /* ArtGallery */, 97AD531B2B70E0A10034FB5D /* ArtWorks */, 97AD530E2B70DDD10034FB5D /* Common */, 97E11E412819727A00B2AB32 /* Extensions */, @@ -496,6 +507,7 @@ 97EF43A12B74CA38003648F5 /* CrayonBoyArtView+CoverArt.swift in Sources */, 97EF43902B72D2E4003648F5 /* NosebleedArtView+CoverArt.swift in Sources */, 9767DF112B75E8FC00457DA1 /* MagicianArtView+Element.swift in Sources */, + 9778A4A32B7A1F87001BF9E8 /* ArtGalleryView+ArtWorkPath.swift in Sources */, 9767DF0F2B75DFB400457DA1 /* SymbolArtDisplayView.swift in Sources */, 9778A49D2B7974E4001BF9E8 /* SweetBeanBunManArtView.swift in Sources */, 9767DF252B76C9BE00457DA1 /* ArmHairArtView.swift in Sources */, diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGallery/ArtGalleryView+ArtWorkPath.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGallery/ArtGalleryView+ArtWorkPath.swift new file mode 100644 index 0000000..13b7029 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGallery/ArtGalleryView+ArtWorkPath.swift @@ -0,0 +1,88 @@ +// +// ArtGalleryView+ArtWorkPath.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension ArtGalleryView { + + enum ArtWorkPath: String, CaseIterable, Identifiable { + case magician = "Magician" + case crayonBoy = "Crayon boy" + case worldPeace = "World peace" + case partyAnimals = "Party animals" + case armHair = "Arm hair" + case demonWrestler = "Demon wrestler" + case fireworks = "Fireworks" + case afroBoy = "Afro boy" + case sweetBeanBunMan = "Sweet bean bun man" + case nosebleed = "Nosebleed" + case imWearingPants = "ImWearingPants" + + var id: String { rawValue } + + @ViewBuilder + var coverArt: some View { + switch self { + case .magician: + MagicianArtView.CoverArt() + case .crayonBoy: + CrayonBoyArtView.CoverArt() + case .worldPeace: + WorldPeaceArtView.CoverArt() + case .partyAnimals: + PartyAnimalsArtView.CoverArt() + case .armHair: + ArmHairArtView.CoverArt() + case .demonWrestler: + DemonWrestlerArtView.CoverArt() + case .fireworks: + FireworksArtView.CoverArt() + case .afroBoy: + AfroBoyArtView.CoverArt() + case .sweetBeanBunMan: + SweetBeanBunManArtView.CoverArt() + case .nosebleed: + NosebleedArtView.CoverArt() + case .imWearingPants: + ImWearingPantsArtView.CoverArt() + } + } + + var coverArtBackground: Color { + self == .fireworks ? .midnightNavy : .white + } + + @ViewBuilder + var destination: some View { + switch self { + case .magician: + MagicianArtView() + case .crayonBoy: + CrayonBoyArtView() + case .worldPeace: + WorldPeaceArtView() + case .partyAnimals: + PartyAnimalsArtView() + case .armHair: + ArmHairArtView() + case .demonWrestler: + DemonWrestlerArtView() + case .fireworks: + FireworksArtView() + case .afroBoy: + AfroBoyArtView() + case .sweetBeanBunMan: + SweetBeanBunManArtView() + case .nosebleed: + NosebleedArtView() + case .imWearingPants: + ImWearingPantsArtView() + } + } + } +} + diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGallery/ArtGalleryView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGallery/ArtGalleryView.swift new file mode 100644 index 0000000..0a00eb8 --- /dev/null +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGallery/ArtGalleryView.swift @@ -0,0 +1,57 @@ +// +// ArtGalleryView.swift +// SFSymbolsArtCollection +// +// Created by Lil Ossa +// + +import SwiftUI + +extension ArtGalleryView { + + init(screenSize: CGSize) { + self.model = ArtWorkModel(screenSize: screenSize) + self.columns = Array(repeating: GridItem(.fixed(model.galleryColumnLength), spacing: model.galleryColumnSpacing), + count: model.galleryColumnCount) + } +} + +struct ArtGalleryView: View { + + @State private var path = NavigationPath() + private let model: ArtWorkModel + private let columns: [GridItem] + + var body: some View { + + NavigationStack(path: $path) { + ScrollView { + LazyVGrid(columns: columns) { + + ForEach(ArtWorkPath.allCases) { path in + NavigationLink(value: path) { + path.coverArt + .galleryGridItemView( + backgroundColor: path.coverArtBackground, + length: model.galleryColumnLength + ) + } + } + } + .padding(.horizontal, 24) + .navigationDestination(for: ArtWorkPath.self) { path in + path.destination + .navigationTitle(path.rawValue) + .navigationBarTitleDisplayMode(.inline) + } + } + .navigationTitle("Art Gallery") + } + .environment(model) + } +} + +#Preview { + ArtGalleryView(screenSize: .init(width: 1024, + height: 1024)) +} diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift deleted file mode 100644 index a6851d5..0000000 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtGalleryView.swift +++ /dev/null @@ -1,133 +0,0 @@ -// -// ArtGalleryView.swift -// SFSymbolsArtCollection -// -// Created by Lil Ossa -// - -import SwiftUI - -extension ArtGalleryView { - - init(screenSize: CGSize) { - self.model = ArtWorkModel(screenSize: screenSize) - self.columns = Array(repeating: GridItem(.fixed(model.galleryColumnLength), spacing: model.galleryColumnSpacing), - count: model.galleryColumnCount) - } -} - -struct ArtGalleryView: View { - - @State private var path = NavigationPath() - private let model: ArtWorkModel - private let columns: [GridItem] - - var body: some View { - - NavigationStack(path: $path) { - ScrollView { - LazyVGrid(columns: columns) { - - ForEach(ArtWorkPath.allCases) { path in - NavigationLink(value: path) { - path.coverArt - .galleryGridItemView( - backgroundColor: path.coverArtBackground, - length: model.galleryColumnLength - ) - } - } - } - .padding(.horizontal, 24) - .navigationDestination(for: ArtWorkPath.self) { path in - path.destination - .navigationTitle(path.rawValue) - .navigationBarTitleDisplayMode(.inline) - } - } - .navigationTitle("Art Gallery") - } - .environment(model) - } -} - -#Preview { - ArtGalleryView(screenSize: .init(width: 1024, - height: 1024)) -} - -enum ArtWorkPath: String, CaseIterable, Identifiable { - case magician = "Magician" - case crayonBoy = "Crayon boy" - case worldPeace = "World peace" - case partyAnimals = "Party animals" - case armHair = "Arm hair" - case demonWrestler = "Demon wrestler" - case fireworks = "Fireworks" - case afroBoy = "Afro boy" - case sweetBeanBunMan = "Sweet bean bun man" - case nosebleed = "Nosebleed" - case imWearingPants = "ImWearingPants" - - var id: String { rawValue } - - @ViewBuilder - var coverArt: some View { - switch self { - case .magician: - MagicianArtView.CoverArt() - case .crayonBoy: - CrayonBoyArtView.CoverArt() - case .worldPeace: - WorldPeaceArtView.CoverArt() - case .partyAnimals: - PartyAnimalsArtView.CoverArt() - case .armHair: - ArmHairArtView.CoverArt() - case .demonWrestler: - DemonWrestlerArtView.CoverArt() - case .fireworks: - FireworksArtView.CoverArt() - case .afroBoy: - AfroBoyArtView.CoverArt() - case .sweetBeanBunMan: - SweetBeanBunManArtView.CoverArt() - case .nosebleed: - NosebleedArtView.CoverArt() - case .imWearingPants: - ImWearingPantsArtView.CoverArt() - } - } - - var coverArtBackground: Color { - self == .fireworks ? .midnightNavy : .white - } - - @ViewBuilder - var destination: some View { - switch self { - case .magician: - MagicianArtView() - case .crayonBoy: - CrayonBoyArtView() - case .worldPeace: - WorldPeaceArtView() - case .partyAnimals: - PartyAnimalsArtView() - case .armHair: - ArmHairArtView() - case .demonWrestler: - DemonWrestlerArtView() - case .fireworks: - FireworksArtView() - case .afroBoy: - AfroBoyArtView() - case .sweetBeanBunMan: - SweetBeanBunManArtView() - case .nosebleed: - NosebleedArtView() - case .imWearingPants: - ImWearingPantsArtView() - } - } -} From c11f4df5235930f5def8d212e02fd35c838a8c79 Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 12 Feb 2024 18:46:23 +0900 Subject: [PATCH 103/108] Refactor ArtWorkTitle --- .../ArtWorks/AfroBoy/AfroBoyArtView.swift | 2 -- .../ArtWorks/ArmHair/ArmHairArtView.swift | 2 -- .../ArtWorks/CrayonBoy/CrayonBoyArtView.swift | 2 -- .../ArtWorks/DemonWrestler/DemonWrestlerArtView.swift | 2 -- .../ArtWorks/Fireworks/FireworksArtView.swift | 2 -- .../ArtWorks/ImWearingPants/ImWearingPantsArtView.swift | 2 -- .../ArtWorks/Magician/MagicianArtView.swift | 2 -- .../ArtWorks/Nosebleed/NosebleedArtView.swift | 2 -- .../ArtWorks/PartyAnimals/PartyAnimalsArtView.swift | 2 -- .../ArtWorks/SweetBeanBunMan/SweetBeanBunManArtView.swift | 2 -- .../ArtWorks/WorldPeace/WorldPeaceArtView.swift | 2 -- 11 files changed, 22 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift index 965ad47..bd40b2e 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/AfroBoy/AfroBoyArtView.swift @@ -17,8 +17,6 @@ struct AfroBoyArtView: View { AnimatableSymbolView(element: $0.value, isAnimating: isAnimating) } } - .navigationTitle("Afro boy") - .navigationBarTitleDisplayMode(.inline) .toolbar(content: { ToolbarItemGroup(placement: .bottomBar) { Spacer() diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView.swift index 3f942a0..73a1fc5 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ArmHair/ArmHairArtView.swift @@ -150,8 +150,6 @@ struct ArmHairArtView: View { } } } - .navigationTitle("Arm hair") - .navigationBarTitleDisplayMode(.inline) .toolbar(content: { ToolbarItemGroup(placement: .bottomBar) { Spacer() diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView.swift index 1c044bb..b8b52dc 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/CrayonBoy/CrayonBoyArtView.swift @@ -19,8 +19,6 @@ struct CrayonBoyArtView: View { isAnimating: isAnimating) } } - .navigationTitle("Crayon boy") - .navigationBarTitleDisplayMode(.inline) .toolbar(content: { ToolbarItemGroup(placement: .bottomBar) { Spacer() diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestlerArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestlerArtView.swift index 3040c46..b277deb 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestlerArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/DemonWrestler/DemonWrestlerArtView.swift @@ -17,8 +17,6 @@ struct DemonWrestlerArtView: View { AnimatableSymbolView(element: $0.value, isAnimating: isAnimating) } } - .navigationTitle("Demon wrestler") - .navigationBarTitleDisplayMode(.inline) .toolbar(content: { ToolbarItemGroup(placement: .bottomBar) { Spacer() diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView.swift index 7ed9033..da5809c 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Fireworks/FireworksArtView.swift @@ -24,8 +24,6 @@ struct FireworksArtView: View { people fireworks } - .navigationTitle("Fireworks") - .navigationBarTitleDisplayMode(.inline) .toolbar(content: { ToolbarItemGroup(placement: .bottomBar) { Spacer() diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift index 20ff197..aceca1c 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/ImWearingPants/ImWearingPantsArtView.swift @@ -41,8 +41,6 @@ struct ImWearingPantsArtView: View { .symbolEffect(.bounce, value: $0.isMusic ? musicCount : 0) } } - .navigationTitle("I'm wearing pants") - .navigationBarTitleDisplayMode(.inline) .toolbar(content: { ToolbarItemGroup(placement: .bottomBar) { Spacer() diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView.swift index ebd70dc..2000b35 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Magician/MagicianArtView.swift @@ -18,8 +18,6 @@ struct MagicianArtView: View { isAnimating: isAnimating) } } - .navigationTitle("Magician") - .navigationBarTitleDisplayMode(.inline) .toolbar(content: { ToolbarItemGroup(placement: .bottomBar) { Spacer() diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift index a43739c..ae99545 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/Nosebleed/NosebleedArtView.swift @@ -23,8 +23,6 @@ struct NosebleedArtView: View { isActive: $0.isNosebleed ? isEffectActivated : false) } } - .navigationTitle("Nosebleed") - .navigationBarTitleDisplayMode(.inline) .toolbar(content: { ToolbarItemGroup(placement: .bottomBar) { Spacer() diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView.swift index 97202ab..36d94de 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/PartyAnimals/PartyAnimalsArtView.swift @@ -18,8 +18,6 @@ struct PartyAnimalsArtView: View { AnimatableSymbolView(element: $0.value, isAnimating: isAnimating) } } - .navigationTitle("Party animals") - .navigationBarTitleDisplayMode(.inline) .toolbar(content: { ToolbarItemGroup(placement: .bottomBar) { Spacer() diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtView.swift index 606ffc1..ba7efbe 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/SweetBeanBunMan/SweetBeanBunManArtView.swift @@ -17,8 +17,6 @@ struct SweetBeanBunManArtView: View { AnimatableSymbolView(element: $0.value, isAnimating: isAnimating) } } - .navigationTitle("Sweet bean bun man") - .navigationBarTitleDisplayMode(.inline) .toolbar(content: { ToolbarItemGroup(placement: .bottomBar) { Spacer() diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView.swift index d276e4f..d482224 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView.swift @@ -18,8 +18,6 @@ struct WorldPeaceArtView: View { AnimatableSymbolView(element: $0.value, isAnimating: isAnimating) } } - .navigationTitle("World Peace") - .navigationBarTitleDisplayMode(.inline) .toolbar(content: { ToolbarItemGroup(placement: .bottomBar) { Spacer() From f39b02d8e294cdf34acb085f32dca9df7c93ae3b Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 12 Feb 2024 21:01:54 +0900 Subject: [PATCH 104/108] Add app icon --- .../AppIcon.appiconset/Contents.json | 90 +----------------- .../AppIcon.appiconset/icon.png | Bin 0 -> 110884 bytes 2 files changed, 3 insertions(+), 87 deletions(-) create mode 100644 SFSymbolsArtCollection/Assets.xcassets/AppIcon.appiconset/icon.png diff --git a/SFSymbolsArtCollection/Assets.xcassets/AppIcon.appiconset/Contents.json b/SFSymbolsArtCollection/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..a657e33 100644 --- a/SFSymbolsArtCollection/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/SFSymbolsArtCollection/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,93 +1,9 @@ { "images" : [ { - "idiom" : "iphone", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "iphone", - "scale" : "3x", - "size" : "20x20" - }, - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "iphone", - "scale" : "3x", - "size" : "29x29" - }, - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "iphone", - "scale" : "3x", - "size" : "40x40" - }, - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "60x60" - }, - { - "idiom" : "iphone", - "scale" : "3x", - "size" : "60x60" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { - "idiom" : "ios-marketing", - "scale" : "1x", + "filename" : "icon.png", + "idiom" : "universal", + "platform" : "ios", "size" : "1024x1024" } ], diff --git a/SFSymbolsArtCollection/Assets.xcassets/AppIcon.appiconset/icon.png b/SFSymbolsArtCollection/Assets.xcassets/AppIcon.appiconset/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..06bae03fed9d6f8481714e1ad6f393478cf49d45 GIT binary patch literal 110884 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%0Dq-L~qDmsOe_myHQ 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 Date: Mon, 12 Feb 2024 21:03:07 +0900 Subject: [PATCH 105/108] Update App version 2.0.0 --- SFSymbolsArtCollection.xcodeproj/project.pbxproj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 768e769..7b7e7a8 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -571,7 +571,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.4; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -627,7 +627,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 15.4; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -643,7 +643,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 0; DEVELOPMENT_ASSET_PATHS = "\"SFSymbolsArtCollection/Preview Content\""; DEVELOPMENT_TEAM = 2V4975L824; ENABLE_PREVIEWS = YES; @@ -659,7 +659,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.2; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = jp.co.hotmail.lilossa.SFSymbolsArtCollection; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; @@ -674,7 +674,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 0; DEVELOPMENT_ASSET_PATHS = "\"SFSymbolsArtCollection/Preview Content\""; DEVELOPMENT_TEAM = 2V4975L824; ENABLE_PREVIEWS = YES; @@ -690,7 +690,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.2; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = jp.co.hotmail.lilossa.SFSymbolsArtCollection; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; From de140475c2f5a2574258c66d4cea158962d405da Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 12 Feb 2024 21:04:54 +0900 Subject: [PATCH 106/108] Modify Display name to Art collection --- SFSymbolsArtCollection.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SFSymbolsArtCollection.xcodeproj/project.pbxproj b/SFSymbolsArtCollection.xcodeproj/project.pbxproj index 7b7e7a8..afd4668 100644 --- a/SFSymbolsArtCollection.xcodeproj/project.pbxproj +++ b/SFSymbolsArtCollection.xcodeproj/project.pbxproj @@ -649,6 +649,7 @@ ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = SFSymbolsArtCollection/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = "Art collection"; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchScreen_Generation = YES; @@ -680,6 +681,7 @@ ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = SFSymbolsArtCollection/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = "Art collection"; INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchScreen_Generation = YES; From cdafd268167e753c0fe595f66c19d6d26ee80b1d Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 12 Feb 2024 22:12:13 +0900 Subject: [PATCH 107/108] Update README --- README.md | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index ec7779c..0683576 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,33 @@ # SFSymbolsArtCollection -The Art collection made from SF Symbols +The art collection of **SF Symbols art**. -## Art works + -### Magician - +## What's SFSymbols art -### WORLD PEACE - +SF Symbols art is simply the art created by combining SF Symbols. -### Party Animals - +You can experience that through SwiftUI with variable color, symbol effects, and keyframe animations, advancing SF Symbols art even further. -### Arm Hair - +## How amazing SFSymbols art is -### Demon Wrestler - +Check some previews below. + +### Nosebleed + +https://github.com/littleossa/SFSymbolsArtCollection/assets/67716751/e4ecc405-ea26-4bfd-a1b2-af02256c3d22 + +### Arm hair + +https://github.com/littleossa/SFSymbolsArtCollection/assets/67716751/8775c0b8-851b-4607-9394-558d8479190f ### Fireworks - -Let's enjoy SF Symbols Art. +https://github.com/littleossa/SFSymbolsArtCollection/assets/67716751/ed369c58-0315-4123-bc64-2bd0237b369c + +Other wonderful SFSymbols' artworks are also here, so please feel free to check them out. + +I would be delighted if you could give it a star. + +Have a good day with SFSymbols art. From fd96a6bba2423b3f1ea5df26d7fc4eb2c4878a39 Mon Sep 17 00:00:00 2001 From: littleossa Date: Mon, 19 Feb 2024 10:48:44 +0900 Subject: [PATCH 108/108] Fix World peace alphabet positons --- .../WorldPeaceArtView+Element.swift | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView+Element.swift b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView+Element.swift index f63728b..3a3ec4e 100644 --- a/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView+Element.swift +++ b/SFSymbolsArtCollection/ArtisticWorldOfSFSymbols/ArtWorks/WorldPeace/WorldPeaceArtView+Element.swift @@ -178,9 +178,9 @@ extension WorldPeaceArtView { secondaryColor: .systemBackground, widthRatio: 0.15, heightRatio: 0.15, - horizontalOffsetRatio: -0.34, + horizontalOffsetRatio: -0.345, verticalOffsetRatio: -0.4, - symbolCountToWaitFor: 4 + symbolCountToWaitFor: 5 ) case .characterO: SymbolArtElement( @@ -191,7 +191,7 @@ extension WorldPeaceArtView { secondaryColor: .systemBackground, widthRatio: 0.15, heightRatio: 0.15, - horizontalOffsetRatio: -0.17, + horizontalOffsetRatio: -0.175, verticalOffsetRatio: -0.4, symbolCountToWaitFor: 5 ) @@ -204,7 +204,7 @@ extension WorldPeaceArtView { secondaryColor: .systemBackground, widthRatio: 0.15, heightRatio: 0.15, - horizontalOffsetRatio: 0, + horizontalOffsetRatio: -0.005, verticalOffsetRatio: -0.4, symbolCountToWaitFor: 5 ) @@ -217,7 +217,7 @@ extension WorldPeaceArtView { secondaryColor: .systemBackground, widthRatio: 0.15, heightRatio: 0.15, - horizontalOffsetRatio: 0.17, + horizontalOffsetRatio: 0.165, verticalOffsetRatio: -0.4, symbolCountToWaitFor: 5 ) @@ -230,7 +230,7 @@ extension WorldPeaceArtView { secondaryColor: .systemBackground, widthRatio: 0.15, heightRatio: 0.15, - horizontalOffsetRatio: 0.34, + horizontalOffsetRatio: 0.335, verticalOffsetRatio: -0.4, symbolCountToWaitFor: 5 ) @@ -243,7 +243,7 @@ extension WorldPeaceArtView { secondaryColor: .systemBackground, widthRatio: 0.15, heightRatio: 0.15, - horizontalOffsetRatio: -0.34, + horizontalOffsetRatio: -0.345, verticalOffsetRatio: 0.4, symbolCountToWaitFor: 5 ) @@ -256,7 +256,7 @@ extension WorldPeaceArtView { secondaryColor: .systemBackground, widthRatio: 0.15, heightRatio: 0.15, - horizontalOffsetRatio: -0.17, + horizontalOffsetRatio: -0.175, verticalOffsetRatio: 0.4, symbolCountToWaitFor: 5 ) @@ -269,7 +269,7 @@ extension WorldPeaceArtView { secondaryColor: .systemBackground, widthRatio: 0.15, heightRatio: 0.15, - horizontalOffsetRatio: 0, + horizontalOffsetRatio: -0.005, verticalOffsetRatio: 0.4, symbolCountToWaitFor: 5 ) @@ -282,7 +282,7 @@ extension WorldPeaceArtView { secondaryColor: .systemBackground, widthRatio: 0.15, heightRatio: 0.15, - horizontalOffsetRatio: 0.17, + horizontalOffsetRatio: 0.165, verticalOffsetRatio: 0.4, symbolCountToWaitFor: 5 ) @@ -295,7 +295,7 @@ extension WorldPeaceArtView { secondaryColor: .systemBackground, widthRatio: 0.15, heightRatio: 0.15, - horizontalOffsetRatio: 0.34, + horizontalOffsetRatio: 0.335, verticalOffsetRatio: 0.4, symbolCountToWaitFor: 5 )