Skip to content

Commit

Permalink
에셋 아이콘, 애니메이션 및 폰트 시스템 추가
Browse files Browse the repository at this point in the history
  • Loading branch information
@chosun-sangnom
chosun-sangnom committed Nov 6, 2024
1 parent ef08a60 commit dfa5f09
Show file tree
Hide file tree
Showing 6 changed files with 78 additions and 33 deletions.
88 changes: 56 additions & 32 deletions hearo/hearo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,28 @@
007BEFCE2CB159AD00C0E9FD /* WorkingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 007BEFCD2CB159AD00C0E9FD /* WorkingView.swift */; };
007BEFD02CB159BF00C0E9FD /* WorkingViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 007BEFCF2CB159BF00C0E9FD /* WorkingViewModel.swift */; };
00A04EA72CB7CBB20031DECC /* SpoqaHanSansNeo_OTF_original in Resources */ = {isa = PBXBuildFile; fileRef = 00A04EA62CB7CBB20031DECC /* SpoqaHanSansNeo_OTF_original */; };

112177742CC283BC000A146F /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 112177732CC283BC000A146F /* WidgetKit.framework */; };
112177762CC283BC000A146F /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 112177752CC283BC000A146F /* SwiftUI.framework */; };
112177792CC283BC000A146F /* LiveActivityBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 112177782CC283BC000A146F /* LiveActivityBundle.swift */; };
1121777B2CC283BC000A146F /* LiveActivityLiveActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1121777A2CC283BC000A146F /* LiveActivityLiveActivity.swift */; };
112177812CC283BD000A146F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 112177802CC283BD000A146F /* Assets.xcassets */; };
112177852CC283BD000A146F /* LiveActivityExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 112177712CC283BC000A146F /* LiveActivityExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };

1159334C2CDB2A7C005902F2 /* HornSoundClassifier_V11.mlmodel in Sources */ = {isa = PBXBuildFile; fileRef = 1159334B2CDB2A7C005902F2 /* HornSoundClassifier_V11.mlmodel */; };

11D7CAC32CDB8AA500F6B323 /* FontDesignSystem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11D7CAC22CDB8A9F00F6B323 /* FontDesignSystem.swift */; };
11D7CAC82CDB8C1B00F6B323 /* Pretendard-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 11D7CAC62CDB8C1B00F6B323 /* Pretendard-Medium.otf */; };
11D7CAC92CDB8C1B00F6B323 /* Pretendard-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 11D7CAC72CDB8C1B00F6B323 /* Pretendard-Regular.otf */; };
11D7CACA2CDB8C1B00F6B323 /* Pretendard-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = 11D7CAC52CDB8C1B00F6B323 /* Pretendard-Light.otf */; };
11D7CACB2CDB8C1B00F6B323 /* Pretendard-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 11D7CAC62CDB8C1B00F6B323 /* Pretendard-Medium.otf */; };
11D7CACC2CDB8C1B00F6B323 /* Pretendard-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 11D7CAC72CDB8C1B00F6B323 /* Pretendard-Regular.otf */; };
11D7CACD2CDB8C1B00F6B323 /* Pretendard-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = 11D7CAC52CDB8C1B00F6B323 /* Pretendard-Light.otf */; };
11D7CACE2CDB8C1B00F6B323 /* Pretendard-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 11D7CAC62CDB8C1B00F6B323 /* Pretendard-Medium.otf */; };
11D7CACF2CDB8C1B00F6B323 /* Pretendard-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 11D7CAC72CDB8C1B00F6B323 /* Pretendard-Regular.otf */; };
11D7CAD02CDB8C1B00F6B323 /* Pretendard-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = 11D7CAC52CDB8C1B00F6B323 /* Pretendard-Light.otf */; };
11D7CAD62CDB8C6900F6B323 /* OnboardingNotiPermissionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11D7CAD12CDB8C6900F6B323 /* OnboardingNotiPermissionView.swift */; };
11D7CAD72CDB8C6900F6B323 /* OnboardingStandRecommendView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11D7CAD32CDB8C6900F6B323 /* OnboardingStandRecommendView.swift */; };
11D7CAD82CDB8C6900F6B323 /* OnboardingWarningView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11D7CAD42CDB8C6900F6B323 /* OnboardingWarningView.swift */; };
11D7CAD92CDB8C6900F6B323 /* OnboardingWelcomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11D7CAD52CDB8C6900F6B323 /* OnboardingWelcomeView.swift */; };
11D7CADA2CDB8C6900F6B323 /* OnboardingPrivacyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11D7CAD22CDB8C6900F6B323 /* OnboardingPrivacyView.swift */; };
64F73A252CBAC9F100D2A140 /* HornSoundDetector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64F73A242CBAC9F100D2A140 /* HornSoundDetector.swift */; };
64F73A272CBAD1C000D2A140 /* SoundDetectorViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64F73A262CBAD1C000D2A140 /* SoundDetectorViewModel.swift */; };
/* End PBXBuildFile section */
Expand Down Expand Up @@ -149,17 +161,23 @@
007BEFCF2CB159BF00C0E9FD /* WorkingViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkingViewModel.swift; sourceTree = "<group>"; };
00A04EA62CB7CBB20031DECC /* SpoqaHanSansNeo_OTF_original */ = {isa = PBXFileReference; lastKnownFileType = folder; path = SpoqaHanSansNeo_OTF_original; sourceTree = "<group>"; };
00A04EA82CB7CC320031DECC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };

112177712CC283BC000A146F /* LiveActivityExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = LiveActivityExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
112177732CC283BC000A146F /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = System/Library/Frameworks/WidgetKit.framework; sourceTree = SDKROOT; };
112177752CC283BC000A146F /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; };
112177782CC283BC000A146F /* LiveActivityBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveActivityBundle.swift; sourceTree = "<group>"; };
1121777A2CC283BC000A146F /* LiveActivityLiveActivity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveActivityLiveActivity.swift; sourceTree = "<group>"; };
112177802CC283BD000A146F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
112177822CC283BD000A146F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };

1159334B2CDB2A7C005902F2 /* HornSoundClassifier_V11.mlmodel */ = {isa = PBXFileReference; lastKnownFileType = file.mlmodel; path = HornSoundClassifier_V11.mlmodel; sourceTree = "<group>"; };

11D7CAC22CDB8A9F00F6B323 /* FontDesignSystem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FontDesignSystem.swift; sourceTree = "<group>"; };
11D7CAC52CDB8C1B00F6B323 /* Pretendard-Light.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Light.otf"; sourceTree = "<group>"; };
11D7CAC62CDB8C1B00F6B323 /* Pretendard-Medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Medium.otf"; sourceTree = "<group>"; };
11D7CAC72CDB8C1B00F6B323 /* Pretendard-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Pretendard-Regular.otf"; sourceTree = "<group>"; };
11D7CAD12CDB8C6900F6B323 /* OnboardingNotiPermissionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingNotiPermissionView.swift; sourceTree = "<group>"; };
11D7CAD22CDB8C6900F6B323 /* OnboardingPrivacyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingPrivacyView.swift; sourceTree = "<group>"; };
11D7CAD32CDB8C6900F6B323 /* OnboardingStandRecommendView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingStandRecommendView.swift; sourceTree = "<group>"; };
11D7CAD42CDB8C6900F6B323 /* OnboardingWarningView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingWarningView.swift; sourceTree = "<group>"; };
11D7CAD52CDB8C6900F6B323 /* OnboardingWelcomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingWelcomeView.swift; sourceTree = "<group>"; };
64F73A242CBAC9F100D2A140 /* HornSoundDetector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = HornSoundDetector.swift; path = hearo/Sources/Presentations/Working/ViewModel/HornSoundDetector.swift; sourceTree = SOURCE_ROOT; };
64F73A262CBAD1C000D2A140 /* SoundDetectorViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SoundDetectorViewModel.swift; path = hearo/Sources/Presentations/Working/ViewModel/SoundDetectorViewModel.swift; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -222,12 +240,12 @@
00078BD42CAFC6F200FB3F70 /* View */ = {
isa = PBXGroup;
children = (
11D7CAD12CDB8C6900F6B323 /* OnboardingNotiPermissionView.swift */,
11D7CAD22CDB8C6900F6B323 /* OnboardingPrivacyView.swift */,
11D7CAD32CDB8C6900F6B323 /* OnboardingStandRecommendView.swift */,
11D7CAD42CDB8C6900F6B323 /* OnboardingWarningView.swift */,
11D7CAD52CDB8C6900F6B323 /* OnboardingWelcomeView.swift */,
00078BE62CAFC79E00FB3F70 /* OnboardingView.swift */,
645C1B152CCBB3BF00251157 /* OnboardingWelcomeView.swift */,
645C1B172CCBB53C00251157 /* OnboardingNotiPermissionView.swift */,
645C1B192CCBBB4800251157 /* OnboardingPrivacyView.swift */,
645C1B1B2CCBBE7000251157 /* OnboardingWarningView.swift */,
645C1B1D2CCBBFAB00251157 /* OnboardingStandRecommendView.swift */,
);
path = View;
sourceTree = "<group>";
Expand Down Expand Up @@ -340,6 +358,8 @@
children = (
00A04EA62CB7CBB20031DECC /* SpoqaHanSansNeo_OTF_original */,
001C6F832CAFBC6C00B03767 /* Assets.xcassets */,
11D7CAC22CDB8A9F00F6B323 /* FontDesignSystem.swift */,
11D7CAC42CDB8BAF00F6B323 /* Font */,
);
path = Resources;
sourceTree = "<group>";
Expand Down Expand Up @@ -405,7 +425,6 @@
isa = PBXGroup;
children = (
001C9F5D2CCF7984004EC4D2 /* Preview Content */,
00AD926C2CD227A200DDA11B /* HearoadWatch.entitlements */,
001C9F852CD0CA11004EC4D2 /* HearoadWatch-Watch-App-Info.plist */,
001C9F572CCF7983004EC4D2 /* HearoadWatchApp.swift */,
001C9F832CCF81A1004EC4D2 /* WatchSessionManager.swift */,
Expand Down Expand Up @@ -493,9 +512,7 @@
00A04EA32CB7CA510031DECC /* Helper */ = {
isa = PBXGroup;
children = (

1159334B2CDB2A7C005902F2 /* HornSoundClassifier_V11.mlmodel */,

64F73A242CBAC9F100D2A140 /* HornSoundDetector.swift */,
64F73A262CBAD1C000D2A140 /* SoundDetectorViewModel.swift */,
001D669A2CDB3E11005746AC /* Haptic.swift */,
Expand Down Expand Up @@ -523,6 +540,16 @@
path = LiveActivity;
sourceTree = "<group>";
};
11D7CAC42CDB8BAF00F6B323 /* Font */ = {
isa = PBXGroup;
children = (
11D7CAC52CDB8C1B00F6B323 /* Pretendard-Light.otf */,
11D7CAC62CDB8C1B00F6B323 /* Pretendard-Medium.otf */,
11D7CAC72CDB8C1B00F6B323 /* Pretendard-Regular.otf */,
);
path = Font;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -720,6 +747,9 @@
buildActionMask = 2147483647;
files = (
001C6F872CAFBC6C00B03767 /* Preview Assets.xcassets in Resources */,
11D7CACE2CDB8C1B00F6B323 /* Pretendard-Medium.otf in Resources */,
11D7CACF2CDB8C1B00F6B323 /* Pretendard-Regular.otf in Resources */,
11D7CAD02CDB8C1B00F6B323 /* Pretendard-Light.otf in Resources */,
001C6F842CAFBC6C00B03767 /* Assets.xcassets in Resources */,
00A04EA72CB7CBB20031DECC /* SpoqaHanSansNeo_OTF_original in Resources */,
);
Expand All @@ -744,6 +774,9 @@
buildActionMask = 2147483647;
files = (
001C9F5F2CCF7984004EC4D2 /* Preview Assets.xcassets in Resources */,
11D7CACB2CDB8C1B00F6B323 /* Pretendard-Medium.otf in Resources */,
11D7CACC2CDB8C1B00F6B323 /* Pretendard-Regular.otf in Resources */,
11D7CACD2CDB8C1B00F6B323 /* Pretendard-Light.otf in Resources */,
001C9F5C2CCF7984004EC4D2 /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -767,6 +800,9 @@
buildActionMask = 2147483647;
files = (
112177812CC283BD000A146F /* Assets.xcassets in Resources */,
11D7CAC82CDB8C1B00F6B323 /* Pretendard-Medium.otf in Resources */,
11D7CAC92CDB8C1B00F6B323 /* Pretendard-Regular.otf in Resources */,
11D7CACA2CDB8C1B00F6B323 /* Pretendard-Light.otf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -777,24 +813,24 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
645C1B1C2CCBBE7000251157 /* OnboardingWarningView.swift in Sources */,
00078BED2CAFC7BA00FB3F70 /* HomeViewModel.swift in Sources */,
645C1B162CCBB3BF00251157 /* OnboardingWelcomeView.swift in Sources */,
645C1B1E2CCBBFAB00251157 /* OnboardingStandRecommendView.swift in Sources */,
00078BE12CAFC77000FB3F70 /* FinishViewModel.swift in Sources */,
00FC15162CDA10B700FBCE0C /* HornSoundClassifier_V9.mlmodel in Sources */,
001D669B2CDB3E11005746AC /* Haptic.swift in Sources */,
11D7CAC32CDB8AA500F6B323 /* FontDesignSystem.swift in Sources */,
00078BEB2CAFC7B000FB3F70 /* HomeView.swift in Sources */,
0045C6BA2CC02969009B4261 /* WarningViewModel.swift in Sources */,
001C6F7E2CAFBC6900B03767 /* hearoApp.swift in Sources */,

00078BE92CAFC7A800FB3F70 /* OnboardingViewModel.swift in Sources */,
00078BDF2CAFC75900FB3F70 /* FinishView.swift in Sources */,
64F73A272CBAD1C000D2A140 /* SoundDetectorViewModel.swift in Sources */,
007BEFCE2CB159AD00C0E9FD /* WorkingView.swift in Sources */,
007BEFD02CB159BF00C0E9FD /* WorkingViewModel.swift in Sources */,
64F73A252CBAC9F100D2A140 /* HornSoundDetector.swift in Sources */,
645C1B1A2CCBBB4800251157 /* OnboardingPrivacyView.swift in Sources */,
11D7CAD62CDB8C6900F6B323 /* OnboardingNotiPermissionView.swift in Sources */,
11D7CAD72CDB8C6900F6B323 /* OnboardingStandRecommendView.swift in Sources */,
11D7CAD82CDB8C6900F6B323 /* OnboardingWarningView.swift in Sources */,
11D7CAD92CDB8C6900F6B323 /* OnboardingWelcomeView.swift in Sources */,
11D7CADA2CDB8C6900F6B323 /* OnboardingPrivacyView.swift in Sources */,
0045C6B82CC0295F009B4261 /* WarningView.swift in Sources */,
1159334C2CDB2A7C005902F2 /* HornSoundClassifier_V11.mlmodel in Sources */,
00078BE72CAFC79E00FB3F70 /* OnboardingView.swift in Sources */,
Expand Down Expand Up @@ -1016,9 +1052,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"hearo/Preview Content\"";

DEVELOPMENT_TEAM = GT56H2MYWV;

ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = hearo/Info.plist;
Expand Down Expand Up @@ -1053,9 +1087,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"hearo/Preview Content\"";

DEVELOPMENT_TEAM = GT56H2MYWV;

ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = hearo/Info.plist;
Expand Down Expand Up @@ -1165,9 +1197,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"HearoadWatch Watch App/Preview Content\"";

DEVELOPMENT_TEAM = GT56H2MYWV;

ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "HearoadWatch-Watch-App-Info.plist";
Expand Down Expand Up @@ -1198,9 +1228,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"HearoadWatch Watch App/Preview Content\"";

DEVELOPMENT_TEAM = GT56H2MYWV;

ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "HearoadWatch-Watch-App-Info.plist";
Expand Down Expand Up @@ -1312,9 +1340,7 @@
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;

DEVELOPMENT_TEAM = GT56H2MYWV;

GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = LiveActivity/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = LiveActivity;
Expand Down Expand Up @@ -1342,9 +1368,7 @@
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;

DEVELOPMENT_TEAM = GT56H2MYWV;

GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = LiveActivity/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = LiveActivity;
Expand Down
6 changes: 6 additions & 0 deletions hearo/hearo/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
<string>SpoqaHanSansNeo-Bold.otf</string>
</array>
</dict>
<key>UIAppFonts</key>
<array>
<string>Pretendard-Regular.otf</string>
<string>Pretendard-Light.otf</string>
<string>Pretendard-Medium.otf</string>
</array>
<key>UIBackgroundModes</key>
<array>
<string>audio</string>
Expand Down
Binary file added hearo/hearo/Resources/Font/Pretendard-Light.otf
View file
Binary file not shown.
Binary file added hearo/hearo/Resources/Font/Pretendard-Regular.otf
View file
Binary file not shown.
15 changes: 15 additions & 0 deletions hearo/hearo/Resources/FontDesignSystem.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// FontDesignSystem.swift
// hearo
//
// Created by 김준수(엘빈) on 11/6/24.
//

import SwiftUI

extension Font {
static let title0 = Font.custom("Pretendard-Medium", size: 18) // Medium
static let title1 = Font.custom("Pretendard-Light", size: 18) // Light
static let title2 = Font.custom("Pretendard-Regular", size: 15) // Regular
static let mainTitle = Font.custom("Pretendard-Medium", size: 24) // Medium
}
2 changes: 1 addition & 1 deletion hearo/hearo/Sources/Presentations/OnBoarding/View/OnboardingNotiPermissionView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct OnboardingNotiPermissionView: View {
}

Spacer().frame(height: 19)

HStack {
Spacer().frame(width: 16)

Expand Down

0 comments on commit dfa5f09

Please sign in to comment.