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

라이브 UI 변경

Browse Source
This commit is contained in:
Yu Sung
2024-01-18 17:32:14 +09:00
parent 7ce5a36172
commit 01833fbc1f
37 changed files with 1763 additions and 1135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingDialog.swift
View File

@@ -20,7 +20,7 @@ struct LiveRoomDonationRankingDialog: View {
HStack(spacing: 0) {
Text("현재 라이브 후원랭킹")
.font(.custom(Font.bold.rawValue, size: 14.7))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
Spacer()
@@ -35,16 +35,16 @@ struct LiveRoomDonationRankingDialog: View {
HStack(spacing: 0) {
Text("전체")
.font(.custom(Font.medium.rawValue, size: 14.7))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
Text("\(donationStatus.totalCount)")
.font(.custom(Font.medium.rawValue, size: 12))
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color.button)
.padding(.leading, 6.7)
Text("명")
.font(.custom(Font.medium.rawValue, size: 12))
.foregroundColor(Color(hex: "777777"))
.foregroundColor(Color.gray77)
Spacer()
}
@@ -66,7 +66,7 @@ struct LiveRoomDonationRankingDialog: View {
}
}
.padding(20)
.background(Color(hex: "222222"))
.background(Color.gray22)
.cornerRadius(8)
if viewModel.isLoading {
@@ -80,7 +80,7 @@ struct LiveRoomDonationRankingDialog: View {
.padding(.vertical, 13.3)
.frame(width: screenSize().width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.background(Color(hex: "9970ff"))
.background(Color.button)
.foregroundColor(Color.white)
.multilineTextAlignment(.leading)
.cornerRadius(20)

8
SodaLive/Sources/Live/Room/Dialog/LiveRoomDonationRankingTotalCanView.swift
View File

@@ -15,22 +15,22 @@ struct LiveRoomDonationRankingTotalCanView: View {
HStack(alignment: .center, spacing: 0) {
Text("합계")
.font(.custom(Font.bold.rawValue, size: 13.3))
.foregroundColor(Color(hex: "d2d2d2"))
.foregroundColor(Color.grayd2)
Spacer()
Text("\(totalCan)")
.font(.custom(Font.medium.rawValue, size: 16))
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color.button)
Text("캔")
.font(.custom(Font.medium.rawValue, size: 10.7))
.foregroundColor(Color(hex: "bbbbbb"))
.foregroundColor(Color.graybb)
.padding(.leading, 4)
}
.padding(.horizontal, 18.7)
.padding(.vertical, 10.7)
.background(Color(hex: "13181b"))
.background(Color.bg)
.cornerRadius(8)
}
}

10
SodaLive/Sources/Live/Room/Dialog/LiveRoomNoChattingDialogView.swift
View File

@@ -43,14 +43,14 @@ struct LiveRoomNoChattingDialogView: View {
HStack(spacing: 13.3) {
Text("취소")
.font(.custom(Font.bold.rawValue, size: 15.3))
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color.button)
.padding(.vertical, 16)
.frame(width: (screenSize().width - 80) / 2)
.background(Color(hex: "9970ff").opacity(0.13))
.background(Color.button.opacity(0.13))
.cornerRadius(8)
.overlay(
RoundedRectangle(cornerRadius: 8)
.stroke(Color(hex: "9970ff"), lineWidth: 1)
.stroke(Color.button, lineWidth: 1)
)
.onTapGesture { cancelAction() }
@@ -59,7 +59,7 @@ struct LiveRoomNoChattingDialogView: View {
.foregroundColor(Color(hex: "ffffff"))
.padding(.vertical, 16)
.frame(width: (screenSize().width - 80) / 2)
.background(Color(hex: "9970ff"))
.background(Color.button)
.cornerRadius(8)
.onTapGesture { confirmAction() }
}
@@ -67,7 +67,7 @@ struct LiveRoomNoChattingDialogView: View {
.padding(.top, 40)
.padding(.bottom, 16.7)
.padding(.horizontal, 16.7)
.background(Color(hex: "222222"))
.background(Color.gray22)
.cornerRadius(10)
}
}

6
SodaLive/Sources/Live/Room/Dialog/LiveRoomProfileDialog.swift
View File

@@ -46,7 +46,7 @@ struct LiveRoomProfileDialog: View {
if profileInfo.role == .LISTENER, let onClickInviteSpeaker = onClickInviteSpeaker {
Text("스피커로 초대")
.font(.custom(Font.medium.rawValue, size: 10))
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(.button)
.padding(.horizontal, 15.4)
.padding(.vertical, 8.3)
.background(Color.white)
@@ -61,7 +61,7 @@ struct LiveRoomProfileDialog: View {
let onClickChangeListener = onClickChangeListener {
Text("리스너로 변경")
.font(.custom(Font.medium.rawValue, size: 10))
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(.button)
.padding(.horizontal, 15.4)
.padding(.vertical, 8.3)
.background(Color.white)
@@ -79,7 +79,7 @@ struct LiveRoomProfileDialog: View {
}
.padding(20)
.frame(width: screenSize().width - 53.4)
.background(Color(hex: "9970ff"))
.background(Color.button)
.cornerRadius(16.7)
}
}

34
SodaLive/Sources/Live/Room/Dialog/LiveRoomProfileItemTitleView.swift
View File

@@ -18,19 +18,19 @@ struct LiveRoomProfileItemTitleView: View {
HStack(spacing: 0) {
Text(title)
.font(.custom(Font.bold.rawValue, size: 13))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
if let count = count {
Text("\(count)")
.font(.custom(Font.medium.rawValue, size: 13))
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color.button)
.padding(.leading, 6.7)
}
if let totalCount = totalCount {
Text("/\(totalCount > 4 ? 4 : totalCount - 1)")
.font(.custom(Font.medium.rawValue, size: 13))
.foregroundColor(Color(hex: "bbbbbb"))
.foregroundColor(Color.graybb)
}
Spacer()
@@ -59,14 +59,14 @@ struct LiveRoomProfileItemMasterView: View {
Text(nickname)
.font(.custom(Font.medium.rawValue, size: 14))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
.padding(.leading, 4)
}
.padding(.horizontal, 16.7)
Rectangle()
.frame(height: 1)
.foregroundColor(Color(hex: "909090").opacity(0.3))
.foregroundColor(Color.gray90.opacity(0.3))
}
}
}
@@ -101,7 +101,7 @@ struct LiveRoomProfileItemUserView: View {
Text(nickname)
.font(.custom(Font.medium.rawValue, size: 14))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
.lineLimit(2)
.multilineTextAlignment(.leading)
.padding(.leading, 4)
@@ -109,7 +109,7 @@ struct LiveRoomProfileItemUserView: View {
} else {
Text(nickname)
.font(.custom(Font.medium.rawValue, size: 14))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
.lineLimit(2)
.multilineTextAlignment(.leading)
.padding(.horizontal, 10)
@@ -120,14 +120,14 @@ struct LiveRoomProfileItemUserView: View {
if role == .LISTENER && isStaff {
Text("스피커로 초대")
.font(.custom(Font.medium.rawValue, size: 10))
.foregroundColor(Color(hex: "ffffff"))
.foregroundColor(.white)
.padding(.horizontal, 5.5)
.padding(.vertical, 12)
.background(Color(hex: "9970ff").opacity(0.3))
.background(Color.button.opacity(0.3))
.cornerRadius(6.7)
.overlay(
RoundedRectangle(cornerRadius: 6.7)
.stroke(Color(hex: "9970ff"), lineWidth: 1)
.stroke(Color.button, lineWidth: 1)
)
.onTapGesture {
onClickInviteSpeaker(userId)
@@ -137,10 +137,10 @@ struct LiveRoomProfileItemUserView: View {
if role == .SPEAKER && (userId == UserDefaults.int(forKey: .userId) || isStaff) {
Text("리스너로 변경")
.font(.custom(Font.medium.rawValue, size: 10))
.foregroundColor(Color(hex: "ffffff"))
.foregroundColor(.white)
.padding(.horizontal, 5.5)
.padding(.vertical, 12)
.background(Color(hex: "9970ff"))
.background(Color.button)
.cornerRadius(6.7)
.onTapGesture {
onClickChangeListener(userId)
@@ -150,14 +150,14 @@ struct LiveRoomProfileItemUserView: View {
if role != .MANAGER && creatorId == UserDefaults.int(forKey: .userId) {
Text("채금")
.font(.custom(Font.medium.rawValue, size: 10))
.foregroundColor(Color(hex: "ffffff"))
.foregroundColor(.white)
.padding(.horizontal, 5.5)
.padding(.vertical, 12)
.background(Color(hex: "9970ff").opacity(0.3))
.background(Color.button.opacity(0.3))
.cornerRadius(6.7)
.overlay(
RoundedRectangle(cornerRadius: 6.7)
.stroke(Color(hex: "9970ff"), lineWidth: 1)
.stroke(Color.button, lineWidth: 1)
)
.cornerRadius(6.7)
.padding(.leading, 10)
@@ -177,7 +177,7 @@ struct LiveRoomProfileItemUserView: View {
Rectangle()
.frame(height: 1)
.foregroundColor(Color(hex: "909090").opacity(0.3))
.foregroundColor(Color.gray90.opacity(0.3))
}
.padding(.horizontal, 16.7)
}
@@ -200,7 +200,7 @@ struct LiveRoomProfileRequestSpeakerView: View {
.padding(.vertical, 8)
.overlay(
RoundedRectangle(cornerRadius: 5.3)
.stroke(Color(hex: "909090"), lineWidth: 1)
.stroke(Color.gray90, lineWidth: 1)
)
.onTapGesture {
onClickRequestSpeaker()

8
SodaLive/Sources/Live/Room/Dialog/LiveRoomProfilesDialogView.swift
View File

@@ -175,16 +175,16 @@ struct LiveRoomProfilesDialogView: View {
HStack(spacing: 0) {
Text("참여자")
.font(.custom(Font.bold.rawValue, size: 15))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
Text("\(roomInfo.participantsCount)")
.font(.custom(Font.medium.rawValue, size: 14))
.foregroundColor(Color(hex: "3bb9f1"))
.foregroundColor(Color.button)
.padding(.leading, 6.7)
Text("/\(roomInfo.totalAvailableParticipantsCount)")
.font(.custom(Font.medium.rawValue, size: 14))
.foregroundColor(Color(hex: "bbbbbb"))
.foregroundColor(Color.graybb)
Spacer()
@@ -204,7 +204,7 @@ struct LiveRoomProfilesDialogView: View {
}
.padding(.vertical, 26.7)
.padding(.horizontal, 13.3)
.background(Color(hex: "222222").edgesIgnoringSafeArea(.all))
.background(Color.gray22.edgesIgnoringSafeArea(.all))
.cornerRadius(16.7)
if viewModel.isShowPopup {

30
SodaLive/Sources/Live/Room/Dialog/LiveRoomUserProfileDialogView.swift
View File

@@ -31,7 +31,7 @@ struct LiveRoomUserProfileDialogView: View {
HStack(spacing: 0) {
Text("프로필")
.font(.custom(Font.bold.rawValue, size: 15))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
Spacer()
@@ -46,14 +46,14 @@ struct LiveRoomUserProfileDialogView: View {
HStack(spacing: 8) {
Text(userProfile.nickname)
.font(.custom(Font.bold.rawValue, size: 18.3))
.foregroundColor(Color(hex: "eeeeee"))
.foregroundColor(Color.grayee)
Text(userProfile.gender)
.font(.custom(Font.medium.rawValue, size: 11.3))
.foregroundColor(Color(hex: "ffffff"))
.foregroundColor(.white)
.padding(.horizontal, 5.3)
.padding(.vertical, 3)
.background(Color(hex: "555555"))
.background(Color.gray55)
.cornerRadius(23.3)
if let isFollowing = userProfile.isFollowing {
@@ -92,14 +92,14 @@ struct LiveRoomUserProfileDialogView: View {
if let isSpeaker = userProfile.isSpeaker {
Text(isSpeaker ? "리스너 변경" : "스피커 초대")
.font(.custom(Font.bold.rawValue, size: 15))
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color.button)
.frame(maxWidth: .infinity)
.padding(.vertical, 13)
.cornerRadius(8)
.overlay(
RoundedRectangle(cornerRadius: 8)
.strokeBorder(lineWidth: 1)
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color.button)
)
.onTapGesture {
if isSpeaker {
@@ -115,14 +115,14 @@ struct LiveRoomUserProfileDialogView: View {
if let isManager = userProfile.isManager {
Text(isManager ? "스탭 해제" : "스탭 지정")
.font(.custom(Font.bold.rawValue, size: 15))
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color.button)
.frame(maxWidth: .infinity)
.padding(.vertical, 13)
.cornerRadius(8)
.overlay(
RoundedRectangle(cornerRadius: 8)
.strokeBorder(lineWidth: 1)
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color.button)
)
.onTapGesture {
if isManager {
@@ -139,14 +139,14 @@ struct LiveRoomUserProfileDialogView: View {
(userProfile.isSpeaker != nil && userProfile.isManager != nil) {
Text("내보내기")
.font(.custom(Font.bold.rawValue, size: 15))
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color.button)
.frame(maxWidth: .infinity)
.padding(.vertical, 13)
.cornerRadius(8)
.overlay(
RoundedRectangle(cornerRadius: 8)
.strokeBorder(lineWidth: 1)
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color.button)
)
.onTapGesture {
viewModel.kickOutId = userProfile.userId
@@ -160,14 +160,14 @@ struct LiveRoomUserProfileDialogView: View {
if let _ = userProfile.isManager {
Text("3분간 채팅금지")
.font(.custom(Font.bold.rawValue, size: 15))
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color.button)
.frame(maxWidth: .infinity)
.padding(.vertical, 13)
.cornerRadius(8)
.overlay(
RoundedRectangle(cornerRadius: 8)
.strokeBorder(lineWidth: 1)
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color.button)
)
.onTapGesture { onClickNoChatting(userProfile.userId, userProfile.nickname, userProfile.profileUrl) }
.padding(.top, 21.3)
@@ -176,7 +176,7 @@ struct LiveRoomUserProfileDialogView: View {
if let _ = userProfile.isFollowing, !userProfile.tags.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
Text(userProfile.tags)
.font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color.button)
.lineSpacing(3)
.padding(.top, 21.3)
}
@@ -184,7 +184,7 @@ struct LiveRoomUserProfileDialogView: View {
if let _ = userProfile.isFollowing, !userProfile.introduce.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
Text(userProfile.introduce)
.font(.custom(Font.medium.rawValue, size: 12))
.foregroundColor(Color(hex: "909090"))
.foregroundColor(Color.button)
.lineLimit(introduceLineLimit)
.lineSpacing(3)
.fixedSize(horizontal: false, vertical: true)
@@ -203,7 +203,7 @@ struct LiveRoomUserProfileDialogView: View {
.padding(.horizontal, 13.3)
.padding(.top, 13.3)
.padding(.bottom, 20)
.background(Color(hex: "222222"))
.background(Color.gray22)
.cornerRadius(8)
if viewModel.isShowKickOutPopup {