klaus
/
sodalive-ios
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

룰렛 설정 

- 확률 총합 추가
This commit is contained in:
Yu Sung 2024-05-16 14:21:54 +09:00
parent 6bf5fcde7f
commit fd2230dbe1
3 changed files with 56 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsOptionView.swift
View File

@ -13,6 +13,7 @@ struct RouletteSettingsOptionView: View {
let index: Int let index: Int
let onClickDelete: () -> Void let onClickDelete: () -> Void
let calculateTotalPercentage: () -> Void
var body: some View { var body: some View {
VStack(spacing: 6.7) { VStack(spacing: 6.7) {
@ -55,6 +56,8 @@ struct RouletteSettingsOptionView: View {
if newValue.count > 5 { if newValue.count > 5 {
option.percentage = String(newValue.prefix(5)) option.percentage = String(newValue.prefix(5))
} }
calculateTotalPercentage()
} }
Text("%") Text("%")
@ -76,7 +79,8 @@ struct RouletteSettingsOptionView_Previews: PreviewProvider {
RouletteSettingsOptionView( RouletteSettingsOptionView(
option: RouletteOption(title: "옵션1", percentage: ""), option: RouletteOption(title: "옵션1", percentage: ""),
index: 2, index: 2,
onClickDelete: {} onClickDelete: {},
calculateTotalPercentage: {}
) )
} }
} }

42
SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsView.swift
View File

@ -64,7 +64,7 @@ struct RouletteSettingsView: View {
HStack(spacing: 0) { HStack(spacing: 0) {
Text("룰렛을 활성화 하시겠습니까?") Text("룰렛을 활성화 하시겠습니까?")
.font(.custom(Font.bold.rawValue, size: 16)) .font(.custom(Font.bold.rawValue, size: 16))
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color.grayee)
Spacer() Spacer()
@ -80,7 +80,7 @@ struct RouletteSettingsView: View {
VStack(alignment: .leading, spacing: 13.3) { VStack(alignment: .leading, spacing: 13.3) {
Text("룰렛 금액 설정") Text("룰렛 금액 설정")
.font(.custom(Font.bold.rawValue, size: 16)) .font(.custom(Font.bold.rawValue, size: 16))
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color.grayee)
HStack(spacing: 8) { HStack(spacing: 8) {
TextField("룰렛 금액을 입력해 주세요 (최소 5캔)", text: Binding( TextField("룰렛 금액을 입력해 주세요 (최소 5캔)", text: Binding(
@ -94,19 +94,19 @@ struct RouletteSettingsView: View {
.autocapitalization(.none) .autocapitalization(.none)
.disableAutocorrection(true) .disableAutocorrection(true)
.font(.custom(Font.medium.rawValue, size: 13.3)) .font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color.grayee)
.keyboardType(.numberPad) .keyboardType(.numberPad)
.padding(.horizontal, 13.3) .padding(.horizontal, 13.3)
.padding(.vertical, 16.7) .padding(.vertical, 16.7)
.frame(maxWidth: .infinity) .frame(maxWidth: .infinity)
.background(Color(hex: "222222")) .background(Color.gray22)
.cornerRadius(6.7) .cornerRadius(6.7)
Spacer() Spacer()
Text("캔") Text("캔")
.font(.custom(Font.bold.rawValue, size: 16.7)) .font(.custom(Font.bold.rawValue, size: 16.7))
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color.grayee)
} }
} }
.padding(.top, 26.7) .padding(.top, 26.7)
@ -114,12 +114,12 @@ struct RouletteSettingsView: View {
VStack(alignment: .leading, spacing: 21.3) { VStack(alignment: .leading, spacing: 21.3) {
Text("룰렛 옵션 설정") Text("룰렛 옵션 설정")
.font(.custom(Font.bold.rawValue, size: 16)) .font(.custom(Font.bold.rawValue, size: 16))
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color.grayee)
HStack(spacing: 0) { HStack(spacing: 0) {
Text("※ 룰렛 옵션은 최소 2개,\n최대 10개까지 설정할 수 있습니다.") Text("※ 룰렛 옵션은 최소 2개,\n최대 10개까지 설정할 수 있습니다.")
.font(.custom(Font.medium.rawValue, size: 13.3)) .font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "ff5c49")) .foregroundColor(Color.mainRed)
Spacer() Spacer()
@ -129,12 +129,26 @@ struct RouletteSettingsView: View {
} }
.padding(.top, 26.7) .padding(.top, 26.7)
HStack(spacing: 0) {
Text("옵션 확률 합계")
.font(.custom(Font.medium.rawValue, size: 14.7))
.foregroundColor(Color.grayee)
Spacer()
Text("( \(String(format: "%.2f", viewModel.totalPercentage))% )")
.font(.custom(Font.medium.rawValue, size: 14.7))
.foregroundColor(Color.grayee)
}
.padding(.top, 21.3)
LazyVStack(spacing: 21.3) { LazyVStack(spacing: 21.3) {
ForEach(viewModel.options.indices, id: \.self) { index in ForEach(viewModel.options.indices, id: \.self) { index in
RouletteSettingsOptionView( RouletteSettingsOptionView(
option: viewModel.options[index], option: viewModel.options[index],
index: index, index: index,
onClickDelete: { viewModel.deleteOption(index: index) } onClickDelete: { viewModel.deleteOption(index: index) },
calculateTotalPercentage: { viewModel.calculateTotalPercentage() }
) )
} }
} }
@ -149,13 +163,13 @@ struct RouletteSettingsView: View {
HStack(spacing: 13.3) { HStack(spacing: 13.3) {
Text("미리보기") Text("미리보기")
.font(.custom(Font.bold.rawValue, size: 18.3)) .font(.custom(Font.bold.rawValue, size: 18.3))
.foregroundColor(Color(hex: "3bb9f1")) .foregroundColor(Color.button)
.padding(.vertical, 16) .padding(.vertical, 16)
.frame(maxWidth: .infinity) .frame(maxWidth: .infinity)
.overlay( .overlay(
RoundedRectangle(cornerRadius: 10) RoundedRectangle(cornerRadius: 10)
.strokeBorder(lineWidth: 1) .strokeBorder(lineWidth: 1)
.foregroundColor(Color(hex: "3bb9f1")) .foregroundColor(Color.button)
) )
.onTapGesture { .onTapGesture {
viewModel.onClickPreview() viewModel.onClickPreview()
@ -166,7 +180,7 @@ struct RouletteSettingsView: View {
.foregroundColor(.white) .foregroundColor(.white)
.padding(.vertical, 16) .padding(.vertical, 16)
.frame(maxWidth: .infinity) .frame(maxWidth: .infinity)
.background(Color(hex: "3bb9f1")) .background(Color.button)
.cornerRadius(10) .cornerRadius(10)
.onTapGesture { .onTapGesture {
viewModel.createOrUpdateRoulette { viewModel.createOrUpdateRoulette {
@ -176,12 +190,12 @@ struct RouletteSettingsView: View {
} }
} }
.padding(13.3) .padding(13.3)
.background(Color(hex: "222222")) .background(Color.gray22)
.cornerRadius(16.7, corners: [.topLeft, .topRight]) .cornerRadius(16.7, corners: [.topLeft, .topRight])
if proxy.safeAreaInsets.bottom > 0 { if proxy.safeAreaInsets.bottom > 0 {
Rectangle() Rectangle()
.foregroundColor(Color(hex: "222222")) .foregroundColor(Color.gray22)
.frame(width: screenSize().width, height: 15.3) .frame(width: screenSize().width, height: 15.3)
} }
} }
@ -206,7 +220,7 @@ struct RouletteSettingsView: View {
.padding(.vertical, 13.3) .padding(.vertical, 13.3)
.frame(width: geo.size.width - 66.7, alignment: .center) .frame(width: geo.size.width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12)) .font(.custom(Font.medium.rawValue, size: 12))
.background(Color(hex: "9970ff")) .background(Color.button)
.foregroundColor(Color.white) .foregroundColor(Color.white)
.multilineTextAlignment(.center) .multilineTextAlignment(.center)
.cornerRadius(20) .cornerRadius(20)

29
SodaLive/Sources/Live/Room/Routlette/Config/RouletteSettingsViewModel.swift
View File

@ -46,20 +46,19 @@ final class RouletteSettingsViewModel: ObservableObject {
private var rouletteId = 0 private var rouletteId = 0
@Published var rouletteList = [GetNewRouletteResponse]() @Published var rouletteList = [GetNewRouletteResponse]()
@Published var totalPercentage = Float(0)
func addOption() { func addOption() {
if (options.count >= 10) { if (options.count >= 10) {
return return
} }
options.append(RouletteOption(title: "", percentage: "")) options.append(RouletteOption(title: "", percentage: ""))
calculateTotalPercentage()
} }
func deleteOption(index: Int) { func deleteOption(index: Int) {
options.remove(at: index) options.remove(at: index)
} calculateTotalPercentage()
private func removeAllAndAddOptions(options: [RouletteOption]) {
self.options.removeAll()
self.options.append(contentsOf: options)
} }
func getAllRoulette(creatorId: Int) { func getAllRoulette(creatorId: Int) {
@ -311,7 +310,9 @@ final class RouletteSettingsViewModel: ObservableObject {
let options = roulette.items.map { let options = roulette.items.map {
RouletteOption(title: $0.title, percentage: String($0.percentage)) RouletteOption(title: $0.title, percentage: String($0.percentage))
} }
removeAllAndAddOptions(options: options)
self.options.removeAll()
self.options.append(contentsOf: options)
} else { } else {
self.canText = "" self.canText = ""
self.isActive = false self.isActive = false
@ -322,5 +323,21 @@ final class RouletteSettingsViewModel: ObservableObject {
self.addOption() self.addOption()
} }
} }
calculateTotalPercentage()
}
func calculateTotalPercentage() {
let totalPercent = options.map {
let percentage = Float($0.percentage)
if let percentage = percentage {
return percentage
} else {
return Float(0)
}
}.reduce(0, +)
self.totalPercentage = totalPercent
} }
} }