Skip to content

Commit adc5833

Browse files
Merge pull request #133 from DeveloperAcademy-POSTECH/feat/#123-WatchUI
수정
2 parents dd6eb68 + 988d515 commit adc5833

File tree

4 files changed

+18
-9
lines changed

4 files changed

+18
-9
lines changed

hearo/HearoadWatch-Watch-App-Info.plist

+7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>UIAppFonts</key>
6+
<array>
7+
<string>Pretendard-SemiBold.otf</string>
8+
<string>Pretendard-Light.otf</string>
9+
<string>Pretendard-Regular.otf</string>
10+
<string>Pretendard-Medium.otf</string>
11+
</array>
512
<key>WKCompanionAppBundleIdentifier </key>
613
<string>com.ada.hearoad</string>
714
</dict>

hearo/hearo.xcodeproj/project.pbxproj

+8-6
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
112177812CC283BD000A146F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 112177802CC283BD000A146F /* Assets.xcassets */; };
5151
112177852CC283BD000A146F /* LiveActivityExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 112177712CC283BC000A146F /* LiveActivityExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
5252
11A2D0882CDE344500BF2BAF /* FontDesignSystem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00D1B7572CDDD9D800BA2AF1 /* FontDesignSystem.swift */; };
53+
11FD4D332D0134C800FB04F0 /* Pretendard-SemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 64D66A8A2CF465AD00CDB1D9 /* Pretendard-SemiBold.otf */; };
5354
646A53882D00A4A8008A81AC /* SplashView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 646A53872D00A4A8008A81AC /* SplashView.swift */; };
5455
646A538A2D00ACE1008A81AC /* WatchHomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 646A53892D00ACE1008A81AC /* WatchHomeView.swift */; };
5556
646A538C2D00B02D008A81AC /* WatchWorkingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 646A538B2D00B02D008A81AC /* WatchWorkingView.swift */; };
@@ -789,6 +790,7 @@
789790
isa = PBXResourcesBuildPhase;
790791
buildActionMask = 2147483647;
791792
files = (
793+
11FD4D332D0134C800FB04F0 /* Pretendard-SemiBold.otf in Resources */,
792794
001C9F5F2CCF7984004EC4D2 /* Preview Assets.xcassets in Resources */,
793795
001C9F5C2CCF7984004EC4D2 /* Assets.xcassets in Resources */,
794796
);
@@ -1070,7 +1072,7 @@
10701072
CODE_SIGN_STYLE = Automatic;
10711073
CURRENT_PROJECT_VERSION = 1;
10721074
DEVELOPMENT_ASSET_PATHS = "hearo/Preview\\ Content HearoadWatch\\ Watch\\ App";
1073-
DEVELOPMENT_TEAM = J5N8Y9F8Z8;
1075+
DEVELOPMENT_TEAM = GT56H2MYWV;
10741076
ENABLE_PREVIEWS = YES;
10751077
GENERATE_INFOPLIST_FILE = YES;
10761078
INFOPLIST_FILE = hearo/Info.plist;
@@ -1107,7 +1109,7 @@
11071109
CODE_SIGN_STYLE = Automatic;
11081110
CURRENT_PROJECT_VERSION = 1;
11091111
DEVELOPMENT_ASSET_PATHS = "hearo/Preview\\ Content HearoadWatch\\ Watch\\ App";
1110-
DEVELOPMENT_TEAM = J5N8Y9F8Z8;
1112+
DEVELOPMENT_TEAM = GT56H2MYWV;
11111113
ENABLE_PREVIEWS = YES;
11121114
GENERATE_INFOPLIST_FILE = YES;
11131115
INFOPLIST_FILE = hearo/Info.plist;
@@ -1216,7 +1218,7 @@
12161218
CODE_SIGN_STYLE = Automatic;
12171219
CURRENT_PROJECT_VERSION = 1;
12181220
DEVELOPMENT_ASSET_PATHS = "hearo HearoadWatch\\ Watch\\ App/Preview\\ Content";
1219-
DEVELOPMENT_TEAM = J5N8Y9F8Z8;
1221+
DEVELOPMENT_TEAM = GT56H2MYWV;
12201222
ENABLE_PREVIEWS = YES;
12211223
GENERATE_INFOPLIST_FILE = YES;
12221224
INFOPLIST_FILE = "HearoadWatch-Watch-App-Info.plist";
@@ -1247,7 +1249,7 @@
12471249
CODE_SIGN_STYLE = Automatic;
12481250
CURRENT_PROJECT_VERSION = 1;
12491251
DEVELOPMENT_ASSET_PATHS = "hearo HearoadWatch\\ Watch\\ App/Preview\\ Content";
1250-
DEVELOPMENT_TEAM = J5N8Y9F8Z8;
1252+
DEVELOPMENT_TEAM = GT56H2MYWV;
12511253
ENABLE_PREVIEWS = YES;
12521254
GENERATE_INFOPLIST_FILE = YES;
12531255
INFOPLIST_FILE = "HearoadWatch-Watch-App-Info.plist";
@@ -1355,7 +1357,7 @@
13551357
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
13561358
CODE_SIGN_STYLE = Automatic;
13571359
CURRENT_PROJECT_VERSION = 1;
1358-
DEVELOPMENT_TEAM = J5N8Y9F8Z8;
1360+
DEVELOPMENT_TEAM = GT56H2MYWV;
13591361
GENERATE_INFOPLIST_FILE = YES;
13601362
INFOPLIST_FILE = LiveActivity/Info.plist;
13611363
INFOPLIST_KEY_CFBundleDisplayName = LiveActivity;
@@ -1383,7 +1385,7 @@
13831385
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
13841386
CODE_SIGN_STYLE = Automatic;
13851387
CURRENT_PROJECT_VERSION = 1;
1386-
DEVELOPMENT_TEAM = J5N8Y9F8Z8;
1388+
DEVELOPMENT_TEAM = GT56H2MYWV;
13871389
GENERATE_INFOPLIST_FILE = YES;
13881390
INFOPLIST_FILE = LiveActivity/Info.plist;
13891391
INFOPLIST_KEY_CFBundleDisplayName = LiveActivity;

hearo/hearo/Assets.xcassets/SVGIcon/Icon.imageset/Contents.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"images" : [
33
{
4-
"filename" : "Icon 오후 9.05.06 3.png",
4+
"filename" : "Icon 오후 9.05.06 3.png",
55
"idiom" : "universal",
66
"scale" : "1x"
77
},
88
{
9-
"filename" : "Icon 오후 9.05.06 4.png",
9+
"filename" : "Icon 오후 9.05.06 4.png",
1010
"idiom" : "universal",
1111
"scale" : "2x"
1212
},

hearo/hearo/Assets.xcassets/SVGIcon/StartButton.imageset/Contents.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"scale" : "2x"
1212
},
1313
{
14-
"filename" : "시작하기.svg",
14+
"filename" : "시작하기.svg",
1515
"idiom" : "universal",
1616
"scale" : "3x"
1717
}

0 commit comments

Comments
 (0)