diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeProgressView.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeProgressView.swift index 240dadcb..8cdf6c6d 100644 --- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeProgressView.swift +++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeProgressView.swift @@ -125,6 +125,7 @@ extension ChallengeProgressView { } .padding(.horizontal, 25.adjustedW) } + .frame(width: 326.adjustedW, height: 320.adjustedH) .padding(.top, 16.adjustedH) .background( RoundedRectangle(cornerRadius: 10) diff --git a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeSelectMissionView.swift b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeSelectMissionView.swift index d7b67b1b..c197ca10 100644 --- a/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeSelectMissionView.swift +++ b/Cherrish-iOS/Cherrish-iOS/Presentation/Feature/ChallengeView/View/ChallengeSelectMissionView.swift @@ -17,7 +17,7 @@ struct ChallengeSelectMissionView: View { VStack { VStack { HStack { - VStack(alignment: .leading, spacing: 4.adjustedH) { + VStack(alignment: .leading) { TypographyText("챌린지 기간 동안\n진행할 미션을 선택해주세요.", style: .title1_sb_18, color: .gray1000 @@ -28,6 +28,7 @@ struct ChallengeSelectMissionView: View { color: .gray700 ) .frame(height: 20.adjustedH) + .padding(.top, 4.adjustedH) } Spacer() } diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/illustration_challenge_start.imageset/Contents.json b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/illustration_challenge_start.imageset/Contents.json index 89c70133..4f56c7aa 100644 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/illustration_challenge_start.imageset/Contents.json +++ b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/illustration_challenge_start.imageset/Contents.json @@ -1,8 +1,19 @@ { "images" : [ { - "filename" : "illustration_challenge_start-1.svg", - "idiom" : "universal" + "filename" : "illustration_challenge_start.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "illustration_challenge_start@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "illustration_challenge_start@3x.png", + "idiom" : "universal", + "scale" : "3x" } ], "info" : { diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/illustration_challenge_start.imageset/illustration_challenge_start-1.svg b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/illustration_challenge_start.imageset/illustration_challenge_start-1.svg deleted file mode 100644 index 577e02e2..00000000 --- a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/illustration_challenge_start.imageset/illustration_challenge_start-1.svg +++ /dev/null @@ -1,297 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/illustration_challenge_start.imageset/illustration_challenge_start.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/illustration_challenge_start.imageset/illustration_challenge_start.png new file mode 100644 index 00000000..ddb52a72 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/illustration_challenge_start.imageset/illustration_challenge_start.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/illustration_challenge_start.imageset/illustration_challenge_start@2x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/illustration_challenge_start.imageset/illustration_challenge_start@2x.png new file mode 100644 index 00000000..5720efa9 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/illustration_challenge_start.imageset/illustration_challenge_start@2x.png differ diff --git a/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/illustration_challenge_start.imageset/illustration_challenge_start@3x.png b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/illustration_challenge_start.imageset/illustration_challenge_start@3x.png new file mode 100644 index 00000000..2d4f4f74 Binary files /dev/null and b/Cherrish-iOS/Cherrish-iOS/Resources/Assets.xcassets/ChallengeImage/illustration_challenge_start.imageset/illustration_challenge_start@3x.png differ