라이브 성별 제한 옵션 추가
라이브 생성과 수정 요청에 성별 제한 값을 포함한다. 라이브 정보 조회 응답에 성별 제한 값을 제공한다.
This commit is contained in:
@@ -14,6 +14,7 @@ struct CreateLiveRoomRequest: Encodable {
|
||||
let tags: [String]
|
||||
let numberOfPeople: Int
|
||||
var isAdult: Bool = false
|
||||
var genderRestriction: LiveRoomCreateViewModel.GenderRestriction = .ALL
|
||||
var price = 0
|
||||
var type: LiveRoomCreateViewModel.LiveRoomType = .OPEN
|
||||
var password: String? = nil
|
||||
|
||||
@@ -13,4 +13,5 @@ struct GetRecentRoomInfoResponse: Decodable {
|
||||
let coverImageUrl: String
|
||||
let coverImagePath: String
|
||||
let numberOfPeople: Int
|
||||
let genderRestriction: LiveRoomCreateViewModel.GenderRestriction
|
||||
}
|
||||
|
||||
@@ -175,6 +175,10 @@ struct LiveRoomCreateView: View {
|
||||
AdultSettingView()
|
||||
.frame(width: screenSize().width - 26.7)
|
||||
.padding(.top, 33.3)
|
||||
|
||||
GenderRestrictionView()
|
||||
.frame(width: screenSize().width - 26.7)
|
||||
.padding(.top, 33.3)
|
||||
}
|
||||
|
||||
PriceSettingView()
|
||||
@@ -698,6 +702,56 @@ struct LiveRoomCreateView: View {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
func GenderRestrictionView() -> some View {
|
||||
VStack(spacing: 13.3) {
|
||||
Text(I18n.CreateLive.genderRestrictionTitle)
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color.grayee)
|
||||
.frame(width: screenSize().width - 26.7, alignment: .leading)
|
||||
|
||||
HStack(spacing: 13.3) {
|
||||
GenderRestrictionSelectButton(
|
||||
title: I18n.CreateLive.genderAll,
|
||||
restriction: .ALL,
|
||||
buttonWidth: (screenSize().width - 53) / 3
|
||||
)
|
||||
|
||||
GenderRestrictionSelectButton(
|
||||
title: I18n.CreateLive.genderMaleOnly,
|
||||
restriction: .MALE_ONLY,
|
||||
buttonWidth: (screenSize().width - 53) / 3
|
||||
)
|
||||
|
||||
GenderRestrictionSelectButton(
|
||||
title: I18n.CreateLive.genderFemaleOnly,
|
||||
restriction: .FEMALE_ONLY,
|
||||
buttonWidth: (screenSize().width - 53) / 3
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
func GenderRestrictionSelectButton(
|
||||
title: String,
|
||||
restriction: LiveRoomCreateViewModel.GenderRestriction,
|
||||
buttonWidth: CGFloat
|
||||
) -> some View {
|
||||
SelectedButtonView(
|
||||
title: title,
|
||||
isActive: true,
|
||||
isSelected: viewModel.genderRestriction == restriction
|
||||
)
|
||||
.frame(width: buttonWidth)
|
||||
.onTapGesture {
|
||||
hideKeyboard()
|
||||
if viewModel.genderRestriction != restriction {
|
||||
viewModel.genderRestriction = restriction
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
func PriceSettingView() -> some View {
|
||||
|
||||
@@ -23,6 +23,10 @@ final class LiveRoomCreateViewModel: ObservableObject {
|
||||
enum LiveRoomType: String, Codable {
|
||||
case OPEN, PRIVATE
|
||||
}
|
||||
|
||||
enum GenderRestriction: String, Codable {
|
||||
case ALL, MALE_ONLY, FEMALE_ONLY
|
||||
}
|
||||
|
||||
let prices = [0, 100, 300, 500, 1000, 2000]
|
||||
|
||||
@@ -61,6 +65,7 @@ final class LiveRoomCreateViewModel: ObservableObject {
|
||||
}
|
||||
|
||||
@Published var isAdult = false
|
||||
@Published var genderRestriction: GenderRestriction = .ALL
|
||||
@Published var priceString = "0" {
|
||||
didSet {
|
||||
if priceString.count > 5 {
|
||||
@@ -134,6 +139,7 @@ final class LiveRoomCreateViewModel: ObservableObject {
|
||||
self.coverImageUrl = data.coverImageUrl
|
||||
self.coverImagePath = data.coverImagePath
|
||||
self.numberOfPeople = String(data.numberOfPeople)
|
||||
self.genderRestriction = data.genderRestriction
|
||||
|
||||
self.errorMessage = I18n.CreateLive.recentDataLoaded
|
||||
self.isShowPopup = true
|
||||
@@ -173,6 +179,7 @@ final class LiveRoomCreateViewModel: ObservableObject {
|
||||
tags: tags,
|
||||
numberOfPeople: Int(numberOfPeople)!,
|
||||
isAdult: isAdult,
|
||||
genderRestriction: genderRestriction,
|
||||
price: price,
|
||||
type: roomType,
|
||||
password: (roomType == .PRIVATE && !password.trimmingCharacters(in: .whitespaces).isEmpty) ? password : nil,
|
||||
|
||||
@@ -14,6 +14,7 @@ struct GetRoomDetailResponse: Decodable {
|
||||
let notice: String
|
||||
let isPaid: Bool
|
||||
let isAdult: Bool
|
||||
let genderRestriction: LiveRoomCreateViewModel.GenderRestriction?
|
||||
let isPrivateRoom: Bool
|
||||
let password: String?
|
||||
let tags: [String]
|
||||
|
||||
@@ -17,4 +17,5 @@ struct EditLiveRoomInfoRequest: Encodable {
|
||||
var menuPan: String = ""
|
||||
var isActiveMenuPan: Bool? = nil
|
||||
var isAdult: Bool? = nil
|
||||
var genderRestriction: LiveRoomCreateViewModel.GenderRestriction? = nil
|
||||
}
|
||||
|
||||
@@ -45,13 +45,17 @@ struct LiveRoomEditView: View {
|
||||
NumberOfPeopleLimitView()
|
||||
.frame(width: screenSize().width - 26.7)
|
||||
.padding(.top, 33.3)
|
||||
|
||||
GenderRestrictionView()
|
||||
.frame(width: screenSize().width - 26.7)
|
||||
.padding(.top, 33.3)
|
||||
|
||||
if !viewModel.isLoading {
|
||||
Text("라이브 수정")
|
||||
.appFont(size: 18.3, weight: .bold)
|
||||
.foregroundColor(Color.white)
|
||||
.frame(width: screenSize().width - 26.7, height: 50)
|
||||
.background(Color(hex: "9970ff"))
|
||||
.background(Color.button)
|
||||
.cornerRadius(10)
|
||||
.padding(.top, 30)
|
||||
.onTapGesture {
|
||||
@@ -87,7 +91,7 @@ struct LiveRoomEditView: View {
|
||||
.padding(.vertical, 13.3)
|
||||
.frame(width: geo.size.width - 66.7, alignment: .center)
|
||||
.appFont(size: 12, weight: .medium)
|
||||
.background(Color(hex: "9970ff"))
|
||||
.background(Color.button)
|
||||
.foregroundColor(Color.white)
|
||||
.multilineTextAlignment(.center)
|
||||
.cornerRadius(20)
|
||||
@@ -175,7 +179,7 @@ struct LiveRoomEditView: View {
|
||||
.frame(width: buttonWidth, height: 48.7)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: 6.7)
|
||||
.stroke(Color(hex: "9970ff"), lineWidth: 1.3)
|
||||
.stroke(Color.button, lineWidth: 1.3)
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -195,7 +199,7 @@ struct LiveRoomEditView: View {
|
||||
.frame(width: buttonWidth, height: 48.7)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: 6.7)
|
||||
.stroke(Color(hex: "9970ff"), lineWidth: 1.3)
|
||||
.stroke(Color.button, lineWidth: 1.3)
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -227,6 +231,56 @@ struct LiveRoomEditView: View {
|
||||
.cornerRadius(6.7)
|
||||
}
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
func GenderRestrictionView() -> some View {
|
||||
VStack(spacing: 13.3) {
|
||||
Text(I18n.CreateLive.genderRestrictionTitle)
|
||||
.appFont(size: 16.7, weight: .bold)
|
||||
.foregroundColor(Color(hex: "eeeeee"))
|
||||
.frame(width: screenSize().width - 26.7, alignment: .leading)
|
||||
|
||||
HStack(spacing: 13.3) {
|
||||
GenderRestrictionSelectButton(
|
||||
title: I18n.CreateLive.genderAll,
|
||||
restriction: .ALL,
|
||||
buttonWidth: (screenSize().width - 53) / 3
|
||||
)
|
||||
|
||||
GenderRestrictionSelectButton(
|
||||
title: I18n.CreateLive.genderMaleOnly,
|
||||
restriction: .MALE_ONLY,
|
||||
buttonWidth: (screenSize().width - 53) / 3
|
||||
)
|
||||
|
||||
GenderRestrictionSelectButton(
|
||||
title: I18n.CreateLive.genderFemaleOnly,
|
||||
restriction: .FEMALE_ONLY,
|
||||
buttonWidth: (screenSize().width - 53) / 3
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
func GenderRestrictionSelectButton(
|
||||
title: String,
|
||||
restriction: LiveRoomCreateViewModel.GenderRestriction,
|
||||
buttonWidth: CGFloat
|
||||
) -> some View {
|
||||
SelectedButtonView(
|
||||
title: title,
|
||||
isActive: true,
|
||||
isSelected: viewModel.genderRestriction == restriction
|
||||
)
|
||||
.frame(width: buttonWidth)
|
||||
.onTapGesture {
|
||||
hideKeyboard()
|
||||
if viewModel.genderRestriction != restriction {
|
||||
viewModel.genderRestriction = restriction
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
func SelectDateView() -> some View {
|
||||
|
||||
@@ -24,6 +24,7 @@ final class LiveRoomEditViewModel: ObservableObject {
|
||||
@Published var numberOfPeople = ""
|
||||
@Published var reservationDateString: String = ""
|
||||
@Published var reservationTimeString: String = ""
|
||||
@Published var genderRestriction: LiveRoomCreateViewModel.GenderRestriction = .ALL
|
||||
|
||||
@Published var errorMessage = ""
|
||||
@Published var isShowPopup = false
|
||||
@@ -51,6 +52,7 @@ final class LiveRoomEditViewModel: ObservableObject {
|
||||
title = room!.title
|
||||
notice = room!.notice
|
||||
numberOfPeople = String(room!.numberOfParticipantsTotal)
|
||||
genderRestriction = room!.genderRestriction ?? .ALL
|
||||
|
||||
if let beginDate = room!.beginDateTimeUtc.parseUtcIsoDate() {
|
||||
reservationDate = beginDate
|
||||
@@ -80,14 +82,16 @@ final class LiveRoomEditViewModel: ObservableObject {
|
||||
notice: room.notice != notice ? notice : nil,
|
||||
numberOfPeople: room.numberOfParticipantsTotal != Int(numberOfPeople)! ? Int(numberOfPeople)! : nil,
|
||||
beginDateTimeString: beginDateTimeStr != beginDateTime ? beginDateTime : nil,
|
||||
timezone: TimeZone.current.identifier
|
||||
timezone: TimeZone.current.identifier,
|
||||
genderRestriction: (room.genderRestriction ?? .ALL) != genderRestriction ? genderRestriction : nil
|
||||
)
|
||||
|
||||
if (
|
||||
request.title == nil &&
|
||||
request.notice == nil &&
|
||||
request.numberOfPeople == nil &&
|
||||
request.beginDateTimeString == nil
|
||||
request.beginDateTimeString == nil &&
|
||||
request.genderRestriction == nil
|
||||
) {
|
||||
self.errorMessage = "변경사항이 없습니다."
|
||||
self.isShowPopup = true
|
||||
|
||||
Reference in New Issue
Block a user