Skip to content

Commit c9abd43

Browse files
authored
Merge pull request #166 from TEAM-Cherrish/fix/#163-qa2
fix: #163 2차QA 반영
2 parents f2c9001 + 04822d7 commit c9abd43

7 files changed

Lines changed: 16 additions & 300 deletions

File tree

Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeProgressView.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ extension ChallengeProgressView {
8585
}
8686
.padding(.horizontal, 25.adjustedW)
8787
}
88+
.frame(width: 326.adjustedW, height: 320.adjustedH)
8889
.padding(.top, 16.adjustedH)
8990
.background(
9091
RoundedRectangle(cornerRadius: 10)

Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeSelectMissionView.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ struct ChallengeSelectMissionView: View {
1717
VStack {
1818
VStack {
1919
HStack {
20-
VStack(alignment: .leading, spacing: 4.adjustedH) {
20+
VStack(alignment: .leading) {
2121
TypographyText("챌린지 기간 동안\n진행할 미션을 선택해주세요.",
2222
style: .title1_sb_18,
2323
color: .gray1000
@@ -28,6 +28,7 @@ struct ChallengeSelectMissionView: View {
2828
color: .gray700
2929
)
3030
.frame(height: 20.adjustedH)
31+
.padding(.top, 4.adjustedH)
3132
}
3233
Spacer()
3334
}

Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/illustration_challenge_start.imageset/Contents.json

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
11
{
22
"images" : [
33
{
4-
"filename" : "illustration_challenge_start-1.svg",
5-
"idiom" : "universal"
4+
"filename" : "illustration_challenge_start.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "illustration_challenge_start@2x.png",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"filename" : "illustration_challenge_start@3x.png",
15+
"idiom" : "universal",
16+
"scale" : "3x"
617
}
718
],
819
"info" : {

Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/illustration_challenge_start.imageset/illustration_challenge_start-1.svg

Lines changed: 0 additions & 297 deletions
This file was deleted.
Loading
Loading
Loading

0 commit comments

Comments
 (0)