Skip to content

Commit 37e768c

Browse files
KimPilGyeomKimPilGyeom
authored
Merge pull request #73 from DeveloperAcademy-POSTECH/fix/#65-LiveActivityFix
[Fix]/#65-LiveActivityFix
2 parents e7159ba + 9e8f14a commit 37e768c

File tree

42 files changed

+755
-105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+755
-105
lines changed

‎hearo/HearoadWatch Watch App/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "Icon 오후 9.05.06.png",
4+
"filename" : "Icon 오후 9.05.06.png",
55
"idiom" : "universal",
66
"platform" : "watchos",
77
"size" : "1024x1024"

‎hearo/LiveActivity/Assets.xcassets/Caution.imageset/Caution 1.svg

Lines changed: 5 additions & 0 deletions
Loading

‎hearo/LiveActivity/Assets.xcassets/Caution.imageset/Caution 2.svg

Lines changed: 5 additions & 0 deletions
Loading

‎hearo/LiveActivity/Assets.xcassets/Caution.imageset/Caution.svg

Lines changed: 5 additions & 0 deletions
Loading

‎hearo/LiveActivity/Assets.xcassets/Caution.imageset/Contents.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "Caution.svg",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "Caution 1.svg",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"filename" : "Caution 2.svg",
15+
"idiom" : "universal",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"author" : "xcode",
21+
"version" : 1
22+
}
23+
}

‎hearo/LiveActivity/LiveActivityLiveActivity.swift

Lines changed: 44 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,39 @@
55
// Created by 김준수(엘빈) on 10/18/24.
66
//
77

8-
9-
108
import ActivityKit
119
import WidgetKit
1210
import SwiftUI
1311

1412
// 라이브 액티비티 속성 정의
1513
struct LiveActivityAttributes: ActivityAttributes {
1614
public struct ContentState: Codable, Hashable {
17-
// 현재 상태를 나타내는 속성을 정의 (예: 경고 여부)
18-
// 하지만 필요 없다면 이 속성을 추가적으로 활용할 수 있습니다.
15+
// 현재 상태를 나타내는 속성을 정의
1916
}
20-
17+
2118
var name: String // 이름 속성만 유지
2219
}
20+
2321
struct LiveActivityLiveActivity: Widget {
2422
var body: some WidgetConfiguration {
2523
ActivityConfiguration(for: LiveActivityAttributes.self) { context in
26-
// UI 구성
24+
// Live Activity 구성
2725
HStack {
28-
VStack {
29-
Text("소리 수집이 중지되었습니다.") // 변경된 메시지
30-
.font(.headline)
31-
.foregroundColor(.white)
26+
VStack(alignment: .leading) {
27+
Text("히어로드")
28+
.font(.LiveActivitySub)
29+
.foregroundColor(Color("MainFontColor"))
30+
Text("소리수집이\n중지되었습니다.")
31+
.font(.LiveActivityMain)
32+
.foregroundColor(Color("MainFontColor"))
3233
}
3334

3435
Spacer()
3536

36-
Image(systemName: "exclamationmark.triangle") // 경고 아이콘
37+
Image("Caution") // "Caution" 이미지를 왼쪽에 추가
3738
.resizable()
3839
.scaledToFit()
39-
.frame(width: 40, height: 40)
40+
.frame(width: 91, height: 91)
4041
.foregroundColor(.white)
4142
}
4243
.padding()
@@ -47,21 +48,42 @@ struct LiveActivityLiveActivity: Widget {
4748
.activitySystemActionForegroundColor(Color.white)
4849
} dynamicIsland: { context in
4950
DynamicIsland {
50-
DynamicIslandExpandedRegion(.leading) {
51-
Image(systemName: "exclamationmark.triangle")
52-
}
5351
DynamicIslandExpandedRegion(.center) {
54-
Text("소리 수집이 중지되었습니다.") // 동일한 메시지
55-
}
56-
DynamicIslandExpandedRegion(.trailing) {
57-
// 추가 아이콘이나 요소가 필요하다면 여기에 추가
52+
HStack {
53+
Image("Caution") // 아이콘
54+
.resizable()
55+
.scaledToFit()
56+
.frame(width: 59, height: 59, alignment: .top)
57+
.foregroundColor(.white)
58+
59+
Spacer() // 아이콘과 텍스트 사이 간격
60+
61+
VStack(alignment: .leading) { // 텍스트 영역
62+
Text("히어로드")
63+
.font(.LiveActivitySub)
64+
.foregroundColor(Color("SubFontColor"))
65+
Text("소리수집이 중지되었습니다.")
66+
.font(.medium)
67+
.foregroundColor(Color("MainFontColor"))
68+
}
69+
}
70+
.padding() // 전체 패딩 추가
71+
.frame(maxWidth: .infinity, maxHeight: 82) // HStack 최대 너비 설정
5872
}
5973
} compactLeading: {
60-
Image(systemName: "exclamationmark.triangle")
74+
Image("Caution")
75+
.resizable()
76+
.scaledToFit()
77+
.frame(width: 30, height: 30)
6178
} compactTrailing: {
62-
Text("수집 중지")
79+
Text("수집중지")
80+
.font(.DaynamicIsland)
81+
.foregroundColor(Color("MainFontColor"))
6382
} minimal: {
64-
Image(systemName: "exclamationmark.triangle")
83+
Image("Caution")
84+
.resizable()
85+
.scaledToFit()
86+
.frame(width: 30, height: 30)
6587
}
6688
}
6789
}

‎hearo/hearo.xcodeproj/project.pbxproj

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
1121777B2CC283BC000A146F /* LiveActivityLiveActivity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1121777A2CC283BC000A146F /* LiveActivityLiveActivity.swift */; };
4646
112177812CC283BD000A146F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 112177802CC283BD000A146F /* Assets.xcassets */; };
4747
112177852CC283BD000A146F /* LiveActivityExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 112177712CC283BC000A146F /* LiveActivityExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
48+
11A2D0882CDE344500BF2BAF /* FontDesignSystem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00D1B7572CDDD9D800BA2AF1 /* FontDesignSystem.swift */; };
4849
64F73A252CBAC9F100D2A140 /* HornSoundDetector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64F73A242CBAC9F100D2A140 /* HornSoundDetector.swift */; };
4950
64F73A272CBAD1C000D2A140 /* SoundDetectorViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64F73A262CBAD1C000D2A140 /* SoundDetectorViewModel.swift */; };
5051
/* End PBXBuildFile section */
@@ -841,6 +842,7 @@
841842
buildActionMask = 2147483647;
842843
files = (
843844
112177792CC283BC000A146F /* LiveActivityBundle.swift in Sources */,
845+
11A2D0882CDE344500BF2BAF /* FontDesignSystem.swift in Sources */,
844846
1121777B2CC283BC000A146F /* LiveActivityLiveActivity.swift in Sources */,
845847
);
846848
runOnlyForDeploymentPostprocessing = 0;
@@ -1008,7 +1010,7 @@
10081010
CODE_SIGN_STYLE = Automatic;
10091011
CURRENT_PROJECT_VERSION = 1;
10101012
DEVELOPMENT_ASSET_PATHS = "\"hearo/Preview Content\"";
1011-
DEVELOPMENT_TEAM = J5N8Y9F8Z8;
1013+
DEVELOPMENT_TEAM = GT56H2MYWV;
10121014
ENABLE_PREVIEWS = YES;
10131015
GENERATE_INFOPLIST_FILE = YES;
10141016
INFOPLIST_FILE = hearo/Info.plist;
@@ -1042,7 +1044,7 @@
10421044
CODE_SIGN_STYLE = Automatic;
10431045
CURRENT_PROJECT_VERSION = 1;
10441046
DEVELOPMENT_ASSET_PATHS = "\"hearo/Preview Content\"";
1045-
DEVELOPMENT_TEAM = J5N8Y9F8Z8;
1047+
DEVELOPMENT_TEAM = GT56H2MYWV;
10461048
ENABLE_PREVIEWS = YES;
10471049
GENERATE_INFOPLIST_FILE = YES;
10481050
INFOPLIST_FILE = hearo/Info.plist;
@@ -1148,7 +1150,7 @@
11481150
CODE_SIGN_STYLE = Automatic;
11491151
CURRENT_PROJECT_VERSION = 1;
11501152
DEVELOPMENT_ASSET_PATHS = "\"HearoadWatch Watch App/Preview Content\"";
1151-
DEVELOPMENT_TEAM = J5N8Y9F8Z8;
1153+
DEVELOPMENT_TEAM = GT56H2MYWV;
11521154
ENABLE_PREVIEWS = YES;
11531155
GENERATE_INFOPLIST_FILE = YES;
11541156
INFOPLIST_FILE = "HearoadWatch-Watch-App-Info.plist";
@@ -1179,7 +1181,7 @@
11791181
CODE_SIGN_STYLE = Automatic;
11801182
CURRENT_PROJECT_VERSION = 1;
11811183
DEVELOPMENT_ASSET_PATHS = "\"HearoadWatch Watch App/Preview Content\"";
1182-
DEVELOPMENT_TEAM = J5N8Y9F8Z8;
1184+
DEVELOPMENT_TEAM = GT56H2MYWV;
11831185
ENABLE_PREVIEWS = YES;
11841186
GENERATE_INFOPLIST_FILE = YES;
11851187
INFOPLIST_FILE = "HearoadWatch-Watch-App-Info.plist";
@@ -1287,7 +1289,7 @@
12871289
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
12881290
CODE_SIGN_STYLE = Automatic;
12891291
CURRENT_PROJECT_VERSION = 1;
1290-
DEVELOPMENT_TEAM = J5N8Y9F8Z8;
1292+
DEVELOPMENT_TEAM = GT56H2MYWV;
12911293
GENERATE_INFOPLIST_FILE = YES;
12921294
INFOPLIST_FILE = LiveActivity/Info.plist;
12931295
INFOPLIST_KEY_CFBundleDisplayName = LiveActivity;
@@ -1315,7 +1317,7 @@
13151317
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
13161318
CODE_SIGN_STYLE = Automatic;
13171319
CURRENT_PROJECT_VERSION = 1;
1318-
DEVELOPMENT_TEAM = J5N8Y9F8Z8;
1320+
DEVELOPMENT_TEAM = GT56H2MYWV;
13191321
GENERATE_INFOPLIST_FILE = YES;
13201322
INFOPLIST_FILE = LiveActivity/Info.plist;
13211323
INFOPLIST_KEY_CFBundleDisplayName = LiveActivity;

0 commit comments

Comments
 (0)