diff --git a/SodaLive/Resources/Assets.xcassets/ic_point.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/ic_point.imageset/Contents.json new file mode 100644 index 0000000..7477522 --- /dev/null +++ b/SodaLive/Resources/Assets.xcassets/ic_point.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ic_point.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SodaLive/Resources/Assets.xcassets/ic_point.imageset/ic_point.png b/SodaLive/Resources/Assets.xcassets/ic_point.imageset/ic_point.png new file mode 100644 index 0000000..d41e9a9 Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/ic_point.imageset/ic_point.png differ diff --git a/SodaLive/Sources/MyPage/CanCardView.swift b/SodaLive/Sources/MyPage/CanCardView.swift index 356f715..717d452 100644 --- a/SodaLive/Sources/MyPage/CanCardView.swift +++ b/SodaLive/Sources/MyPage/CanCardView.swift @@ -66,6 +66,7 @@ struct CanCardView_Previews: PreviewProvider { profileUrl: "https://test-cf.sodalive.net/profile/default-profile.png", chargeCan: 0, rewardCan: 150, + point: 100, youtubeUrl: "", instagramUrl: "", websiteUrl: "", diff --git a/SodaLive/Sources/MyPage/MyInfoCardView.swift b/SodaLive/Sources/MyPage/MyInfoCardView.swift index b56812a..312b2e2 100644 --- a/SodaLive/Sources/MyPage/MyInfoCardView.swift +++ b/SodaLive/Sources/MyPage/MyInfoCardView.swift @@ -90,6 +90,7 @@ struct MyInfoCardView_Previews: PreviewProvider { profileUrl: "https://test-cf.sodalive.net/profile/default-profile.png", chargeCan: 0, rewardCan: 150, + point: 100, youtubeUrl: "", instagramUrl: "", websiteUrl: "", diff --git a/SodaLive/Sources/MyPage/MyPageResponse.swift b/SodaLive/Sources/MyPage/MyPageResponse.swift index 1635cf1..c32bdec 100644 --- a/SodaLive/Sources/MyPage/MyPageResponse.swift +++ b/SodaLive/Sources/MyPage/MyPageResponse.swift @@ -12,6 +12,7 @@ struct MyPageResponse: Decodable { let profileUrl: String let chargeCan: Int let rewardCan: Int + let point: Int let youtubeUrl: String? let instagramUrl: String? let websiteUrl: String? diff --git a/SodaLive/Sources/MyPage/MyPageView.swift b/SodaLive/Sources/MyPage/MyPageView.swift index 5c0956f..2b35a7b 100644 --- a/SodaLive/Sources/MyPage/MyPageView.swift +++ b/SodaLive/Sources/MyPage/MyPageView.swift @@ -123,6 +123,24 @@ struct MyPageView: View { } .frame(width: screenSize().width - 26.7) .padding(.top, 26.7) + + HStack(spacing: 6.7) { + Text("\(data.point)") + .font(.custom(Font.bold.rawValue, size: 18.3)) + .foregroundColor(.grayee) + + Image("ic_point") + .resizable() + .frame(width: 20, height: 20) + + Spacer() + } + .padding(.horizontal, 13.3) + .padding(.vertical, 16.7) + .frame(width: screenSize().width - 26.7) + .background(Color.gray22) + .cornerRadius(6.7) + .padding(.top, 13.3) } if data.isAuth { diff --git a/SodaLive/Sources/MyPage/ReservationStatusView.swift b/SodaLive/Sources/MyPage/ReservationStatusView.swift index 9c194eb..55e7fa9 100644 --- a/SodaLive/Sources/MyPage/ReservationStatusView.swift +++ b/SodaLive/Sources/MyPage/ReservationStatusView.swift @@ -56,6 +56,7 @@ struct ReservationStatusView_Previews: PreviewProvider { profileUrl: "https://test-cf.sodalive.net/profile/default-profile.png", chargeCan: 0, rewardCan: 150, + point: 100, youtubeUrl: "", instagramUrl: "", websiteUrl: "",