diff --git a/SodaLive/Sources/Content/Create/ContentCreateView.swift b/SodaLive/Sources/Content/Create/ContentCreateView.swift index ba34e77..5e83807 100644 --- a/SodaLive/Sources/Content/Create/ContentCreateView.swift +++ b/SodaLive/Sources/Content/Create/ContentCreateView.swift @@ -221,7 +221,7 @@ struct ContentCreateView: View { .frame(maxWidth: .infinity, alignment: .leading) HStack(spacing: 0) { - TextField("가격을 입력하세요(10코인 이상)", text: $viewModel.priceString) + TextField("가격을 입력하세요(10캔 이상)", text: $viewModel.priceString) .autocapitalization(.none) .disableAutocorrection(true) .font(.custom(Font.bold.rawValue, size: 14.7)) @@ -232,7 +232,7 @@ struct ContentCreateView: View { Spacer() - Text("코인") + Text("캔") .font(.custom(Font.medium.rawValue, size: 13.3)) .foregroundColor(Color(hex: "777777")) } @@ -258,7 +258,7 @@ struct ContentCreateView: View { .foregroundColor(Color(hex: "777777")) .frame(maxWidth: .infinity, alignment: .leading) - Text("※ 콘텐츠의 최소금액은 10코인 입니다") + Text("※ 콘텐츠의 최소금액은 10캔 입니다") .font(.custom(Font.medium.rawValue, size: 13.3)) .foregroundColor(Color(hex: "777777")) .frame(maxWidth: .infinity, alignment: .leading) diff --git a/SodaLive/Sources/Content/Create/ContentCreateViewModel.swift b/SodaLive/Sources/Content/Create/ContentCreateViewModel.swift index 7974a48..33b7855 100644 --- a/SodaLive/Sources/Content/Create/ContentCreateViewModel.swift +++ b/SodaLive/Sources/Content/Create/ContentCreateViewModel.swift @@ -206,7 +206,7 @@ final class ContentCreateViewModel: ObservableObject { } if !isFree && price < 10 { - errorMessage = "콘텐츠의 최소금액은 10코인 입니다." + errorMessage = "콘텐츠의 최소금액은 10캔 입니다." isShowPopup = true return false } diff --git a/SodaLive/Sources/Content/Detail/ContentDetailViewModel.swift b/SodaLive/Sources/Content/Detail/ContentDetailViewModel.swift index 8f031cc..579de24 100644 --- a/SodaLive/Sources/Content/Detail/ContentDetailViewModel.swift +++ b/SodaLive/Sources/Content/Detail/ContentDetailViewModel.swift @@ -397,7 +397,7 @@ final class ContentDetailViewModel: ObservableObject { func donation(can: Int, comment: String) { if can <= 0 { - self.errorMessage = "1코인 이상 후원하실 수 있습니다." + self.errorMessage = "1캔 이상 후원하실 수 있습니다." self.isShowPopup = true } else if comment.trimmingCharacters(in: .whitespaces).isEmpty { self.errorMessage = "함께 보낼 메시지를 입력하세요." @@ -422,7 +422,7 @@ final class ContentDetailViewModel: ObservableObject { if decoded.success { UserDefaults.set(UserDefaults.int(forKey: .can) - can, forKey: .can) - self.errorMessage = "\(can)코인을 후원하셨습니다." + self.errorMessage = "\(can)캔을 후원하셨습니다." self.isShowPopup = true self.getAudioContentDetail() diff --git a/SodaLive/Sources/Content/Detail/ContentOrderConfirmDialogView.swift b/SodaLive/Sources/Content/Detail/ContentOrderConfirmDialogView.swift index 9006e2e..2d30808 100644 --- a/SodaLive/Sources/Content/Detail/ContentOrderConfirmDialogView.swift +++ b/SodaLive/Sources/Content/Detail/ContentOrderConfirmDialogView.swift @@ -87,7 +87,7 @@ struct ContentOrderConfirmDialogView: View { .cornerRadius(5.3) .padding(.top, 21.3) - Text("콘텐츠를 \(orderType == .RENTAL ? "대여" : "소장")하시겠습니까?\n아래 코인이 차감됩니다.") + Text("콘텐츠를 \(orderType == .RENTAL ? "대여" : "소장")하시겠습니까?\n아래 캔이 차감됩니다.") .font(.custom(Font.medium.rawValue, size: 13.3)) .foregroundColor(Color(hex: "eeeeee")) .fixedSize(horizontal: false, vertical: true) diff --git a/SodaLive/Sources/Content/Detail/LiveRoomDonationDialogView.swift b/SodaLive/Sources/Content/Detail/LiveRoomDonationDialogView.swift index 51bb190..37a6628 100644 --- a/SodaLive/Sources/Content/Detail/LiveRoomDonationDialogView.swift +++ b/SodaLive/Sources/Content/Detail/LiveRoomDonationDialogView.swift @@ -108,9 +108,8 @@ struct LiveRoomDonationDialogView: View { .background(Color(hex: "9970ff")) .cornerRadius(6.7) .onTapGesture { - if !donationCan.trimmingCharacters(in: .whitespaces).isEmpty, - let coin = Int(donationCan) { - donationCan = "\(coin + 100)" + if !donationCan.trimmingCharacters(in: .whitespaces).isEmpty, let can = Int(donationCan) { + donationCan = "\(can + 100)" } else { donationCan = "\(100)" } diff --git a/SodaLive/Sources/Explorer/Profile/GetCreatorProfileResponse.swift b/SodaLive/Sources/Explorer/Profile/GetCreatorProfileResponse.swift index f836c2b..540dcfa 100644 --- a/SodaLive/Sources/Explorer/Profile/GetCreatorProfileResponse.swift +++ b/SodaLive/Sources/Explorer/Profile/GetCreatorProfileResponse.swift @@ -36,7 +36,7 @@ struct UserDonationRankingResponse: Decodable { let userId: Int let nickname: String let profileImage: String - let donationCoin: Int? + let donationCan: Int? } struct SimilarCreatorResponse: Decodable { diff --git a/SodaLive/Sources/Explorer/Profile/UserProfileLiveView.swift b/SodaLive/Sources/Explorer/Profile/UserProfileLiveView.swift index 7cb1460..c8df798 100644 --- a/SodaLive/Sources/Explorer/Profile/UserProfileLiveView.swift +++ b/SodaLive/Sources/Explorer/Profile/UserProfileLiveView.swift @@ -130,7 +130,7 @@ struct UserProfileLiveView: View { onClickParticipant(liveRoom) } } else { - Text("\(liveRoom.price)코인으로 지금 참여하기") + Text("\(liveRoom.price)캔으로 지금 참여하기") .font(.custom(Font.bold.rawValue, size: 13.3)) .foregroundColor(Color(hex: "ffffff")) .frame( @@ -155,7 +155,7 @@ struct UserProfileLiveView: View { .background(Color(hex: "525252")) .cornerRadius(5.3) } else { - Text("\(liveRoom.price > 0 ? "\(liveRoom.price)코인으로 " : "")예약하기") + Text("\(liveRoom.price > 0 ? "\(liveRoom.price)캔으로 " : "")예약하기") .font(.custom(Font.bold.rawValue, size: 13.3)) .foregroundColor(Color(hex: "000000")) .frame( diff --git a/SodaLive/Sources/Explorer/Profile/UserProfileViewModel.swift b/SodaLive/Sources/Explorer/Profile/UserProfileViewModel.swift index 228d39c..877e576 100644 --- a/SodaLive/Sources/Explorer/Profile/UserProfileViewModel.swift +++ b/SodaLive/Sources/Explorer/Profile/UserProfileViewModel.swift @@ -122,7 +122,7 @@ final class UserProfileViewModel: ObservableObject { if ($0.price == 0 || $0.isPaid) { self.reservation(roomId: roomId) } else { - self.paymentDialogTitle = "\($0.price)코인으로 예약" + self.paymentDialogTitle = "\($0.price)캔으로 예약" self.paymentDialogDesc = "'\($0.title)' 라이브에 참여하기 위해 결제합니다." self.paymentDialogConfirmTitle = "결제 후 예약하기" self.paymentDialogConfirmAction = { [unowned self] in @@ -200,7 +200,7 @@ final class UserProfileViewModel: ObservableObject { } self.isShowPasswordDialog = true } else { - self.paymentDialogTitle = "\($0.price)코인으로 입장" + self.paymentDialogTitle = "\($0.price)캔으로 입장" self.paymentDialogDesc = "'\($0.title)' 라이브에 참여하기 위해 결제합니다." self.paymentDialogConfirmTitle = "결제 후 참여하기" self.paymentDialogConfirmAction = { [unowned self] in diff --git a/SodaLive/Sources/Live/LiveView.swift b/SodaLive/Sources/Live/LiveView.swift index e57080b..3ac01fc 100644 --- a/SodaLive/Sources/Live/LiveView.swift +++ b/SodaLive/Sources/Live/LiveView.swift @@ -124,7 +124,7 @@ struct LiveView: View { if viewModel.isShowPasswordDialog { LiveRoomPasswordDialog( isShowing: $viewModel.isShowPasswordDialog, - can: viewModel.secretOrPasswordDialogCoin, + can: viewModel.secretOrPasswordDialogCan, confirmAction: viewModel.passwordDialogConfirmAction ) } diff --git a/SodaLive/Sources/Live/LiveViewModel.swift b/SodaLive/Sources/Live/LiveViewModel.swift index 6258e9b..baa5e2a 100644 --- a/SodaLive/Sources/Live/LiveViewModel.swift +++ b/SodaLive/Sources/Live/LiveViewModel.swift @@ -36,7 +36,7 @@ final class LiveViewModel: ObservableObject { @Published var paymentDialogConfirmAction = {} @Published var paymentDialogConfirmTitle = "" - @Published var secretOrPasswordDialogCoin = 0 + @Published var secretOrPasswordDialogCan = 0 @Published var passwordDialogConfirmAction: (String) -> Void = { _ in } @Published var isShowPasswordDialog = false @@ -71,7 +71,7 @@ final class LiveViewModel: ObservableObject { paymentDialogDesc = "" paymentDialogConfirmAction = {} - secretOrPasswordDialogCoin = 0 + secretOrPasswordDialogCan = 0 passwordDialogConfirmAction = { _ in } } @@ -390,7 +390,7 @@ final class LiveViewModel: ObservableObject { if ($0.price == 0 || $0.isPaid) { self.reservation(roomId: roomId) } else { - self.paymentDialogTitle = "\($0.price)코인으로 예약" + self.paymentDialogTitle = "\($0.price)캔으로 예약" self.paymentDialogDesc = "'\($0.title)' 라이브에 참여하기 위해 결제합니다." self.paymentDialogConfirmTitle = "결제 후 예약하기" self.paymentDialogConfirmAction = { [unowned self] in diff --git a/SodaLive/Sources/Live/Reservation/Complete/LiveReservationCompleteView.swift b/SodaLive/Sources/Live/Reservation/Complete/LiveReservationCompleteView.swift index 5d4d011..de4891b 100644 --- a/SodaLive/Sources/Live/Reservation/Complete/LiveReservationCompleteView.swift +++ b/SodaLive/Sources/Live/Reservation/Complete/LiveReservationCompleteView.swift @@ -97,7 +97,7 @@ struct LiveReservationCompleteView: View { VStack(spacing: 13.3) { HStack(spacing: 0) { - Text("보유코인") + Text("보유캔") .font(.custom(Font.medium.rawValue, size: 14.7)) .foregroundColor(Color(hex: "777777")) @@ -107,14 +107,14 @@ struct LiveReservationCompleteView: View { .font(.custom(Font.bold.rawValue, size: 15.3)) .foregroundColor(Color(hex: "eeeeee")) - Text(" 코인") + Text(" 캔") .font(.custom(Font.medium.rawValue, size: 14.7)) .foregroundColor(Color(hex: "eeeeee")) } .frame(width: screenSize().width - 53.4, alignment: .leading) HStack(spacing: 0) { - Text("결제코인") + Text("결제캔") .font(.custom(Font.medium.rawValue, size: 14.7)) .foregroundColor(Color(hex: "777777")) @@ -124,14 +124,14 @@ struct LiveReservationCompleteView: View { .font(.custom(Font.bold.rawValue, size: 15.3)) .foregroundColor(Color(hex: "eeeeee")) - Text(" 코인") + Text(" 캔") .font(.custom(Font.medium.rawValue, size: 14.7)) .foregroundColor(Color(hex: "eeeeee")) } .frame(width: screenSize().width - 53.4, alignment: .leading) HStack(spacing: 0) { - Text("잔여코인") + Text("잔여캔") .font(.custom(Font.medium.rawValue, size: 14.7)) .foregroundColor(Color(hex: "777777")) @@ -141,7 +141,7 @@ struct LiveReservationCompleteView: View { .font(.custom(Font.bold.rawValue, size: 15.3)) .foregroundColor(Color(hex: "eeeeee")) - Text(" 코인") + Text(" 캔") .font(.custom(Font.medium.rawValue, size: 14.7)) .foregroundColor(Color(hex: "eeeeee")) } diff --git a/SodaLive/Sources/Live/Reservation/LiveReservationItemView.swift b/SodaLive/Sources/Live/Reservation/LiveReservationItemView.swift index 633fc58..0819f82 100644 --- a/SodaLive/Sources/Live/Reservation/LiveReservationItemView.swift +++ b/SodaLive/Sources/Live/Reservation/LiveReservationItemView.swift @@ -63,7 +63,7 @@ struct LiveReservationItemView: View { .cornerRadius(10) } else { if item.price > 0 { - Text("\(item.price)코인") + Text("\(item.price)캔") .font(.custom(Font.medium.rawValue, size: 12)) .foregroundColor( Color(hex: "e2e2e2") diff --git a/SodaLive/Sources/Live/Room/Create/LiveRoomCreateView.swift b/SodaLive/Sources/Live/Room/Create/LiveRoomCreateView.swift index 209ba37..80c3599 100644 --- a/SodaLive/Sources/Live/Room/Create/LiveRoomCreateView.swift +++ b/SodaLive/Sources/Live/Room/Create/LiveRoomCreateView.swift @@ -725,7 +725,7 @@ struct LiveRoomCreateView: View { Spacer() - Text("코인") + Text("캔") .font(.custom(Font.medium.rawValue, size: 14.7)) .foregroundColor( Color(hex: "9970ff") @@ -754,7 +754,7 @@ struct LiveRoomCreateView: View { @ViewBuilder func PriceButtonView(price: Int, buttonWidth: CGFloat) -> some View { HStack(spacing: 6.7) { - Text(price == 0 ? "무료" : "\(price) 코인") + Text(price == 0 ? "무료" : "\(price) 캔") .font(.custom( viewModel.price == price ? Font.bold.rawValue : diff --git a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingItemView.swift b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingItemView.swift index 73cd528..38ac457 100644 --- a/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingItemView.swift +++ b/SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingItemView.swift @@ -67,7 +67,7 @@ struct LiveRoomDonationRankingItemView: View { Spacer() if item.can > 0 { - Text("\(item.can) 코인") + Text("\(item.can) 캔") .font(.custom(Font.medium.rawValue, size: 13.3)) .foregroundColor(Color(hex: "eeeeee")) } diff --git a/SodaLive/Sources/Live/Room/LiveRoomViewModel.swift b/SodaLive/Sources/Live/Room/LiveRoomViewModel.swift index 1b24d73..5a8243c 100644 --- a/SodaLive/Sources/Live/Room/LiveRoomViewModel.swift +++ b/SodaLive/Sources/Live/Room/LiveRoomViewModel.swift @@ -321,7 +321,7 @@ final class LiveRoomViewModel: NSObject, ObservableObject { self.isLoading = false if decoded.success { - let rawMessage = "\(can)코인을 후원하셨습니다." + let rawMessage = "\(can)캔을 후원하셨습니다." let donationRawMessage = LiveRoomChatRawMessage( type: .DONATION, message: rawMessage, @@ -377,7 +377,7 @@ final class LiveRoomViewModel: NSObject, ObservableObject { } .store(in: &subscription) } else { - popupContent = "1코인 이상 후원하실 수 있습니다." + popupContent = "1캔 이상 후원하실 수 있습니다." isShowPopup = true } } @@ -409,14 +409,14 @@ final class LiveRoomViewModel: NSObject, ObservableObject { if let message = decoded.message { self.errorMessage = message } else { - self.popupContent = "후원에 실패한 코인이 환불되지 않았습니다\n고객센터로 문의해주세요." + self.popupContent = "후원에 실패한 캔이 환불되지 않았습니다\n고객센터로 문의해주세요." } self.isShowPopup = true } } catch { self.isLoading = false - self.popupContent = "후원에 실패한 코인이 환불되지 않았습니다\n고객센터로 문의해주세요." + self.popupContent = "후원에 실패한 캔이 환불되지 않았습니다\n고객센터로 문의해주세요." self.isShowPopup = true } } diff --git a/SodaLive/Sources/MyPage/Can/Payment/CanPaymentView.swift b/SodaLive/Sources/MyPage/Can/Payment/CanPaymentView.swift index 275b718..169ccf2 100644 --- a/SodaLive/Sources/MyPage/Can/Payment/CanPaymentView.swift +++ b/SodaLive/Sources/MyPage/Can/Payment/CanPaymentView.swift @@ -79,7 +79,7 @@ struct CanPaymentView: View { .font(.custom(Font.medium.rawValue, size: 12)) .foregroundColor(Color(hex: "777777")) - Text("충전된 코인의 유효기간은 충전 후 5년 입니다.") + Text("충전된 캔의 유효기간은 충전 후 5년 입니다.") .font(.custom(Font.medium.rawValue, size: 12)) .foregroundColor(Color(hex: "777777")) .fixedSize(horizontal: false, vertical: true) @@ -92,7 +92,7 @@ struct CanPaymentView: View { .font(.custom(Font.medium.rawValue, size: 12)) .foregroundColor(Color(hex: "777777")) - Text("결제 취소는 결제 후 7일 이내에만 할 수 있습니다.\n단, 코인의 일부를 사용하면 결제 취소를 할 수 없습니다.") + Text("결제 취소는 결제 후 7일 이내에만 할 수 있습니다.\n단, 캔의 일부를 사용하면 결제 취소를 할 수 없습니다.") .font(.custom(Font.medium.rawValue, size: 12)) .foregroundColor(Color(hex: "777777")) .fixedSize(horizontal: false, vertical: true) diff --git a/SodaLive/Sources/Settings/SignOut/SignOutView.swift b/SodaLive/Sources/Settings/SignOut/SignOutView.swift index 9282536..7f825d2 100644 --- a/SodaLive/Sources/Settings/SignOut/SignOutView.swift +++ b/SodaLive/Sources/Settings/SignOut/SignOutView.swift @@ -74,7 +74,7 @@ struct SignOutView: View { .foregroundColor(Color(hex: "232323")) .padding(.top, 20) - Text("계정을 삭제하면 회원님의 모든 콘텐츠와 활동 길고, 코인충전 및 적립, 사용내역 등의 기록이 삭제됩니다. 삭제된 정보는 복구할 수 없으니 신중히 결정해주세요.\n코인 충전하기를 통해 적립한 코인은 계정 삭제시 환불이 불가합니다. 또한 환불 신청 후 환불처리가 되기 전에 계정을 삭제하는 경우 포인트 사용내역을 확인할 수 없어 환불이 불가합니다.") + Text("계정을 삭제하면 회원님의 모든 콘텐츠와 활동 길고, 캔충전 및 적립, 사용내역 등의 기록이 삭제됩니다. 삭제된 정보는 복구할 수 없으니 신중히 결정해주세요.\n캔 충전하기를 통해 적립한 캔은 계정 삭제시 환불이 불가합니다. 또한 환불 신청 후 환불처리가 되기 전에 계정을 삭제하는 경우 포인트 사용내역을 확인할 수 없어 환불이 불가합니다.") .font(.custom(Font.medium.rawValue, size: 12)) .foregroundColor(Color(hex: "ff5c49")) .fixedSize(horizontal: false, vertical: true)