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

메인페이지, 팝업 다이얼로그 - 기본색상 9970ff -> 3bb9f1로 변경

This commit is contained in:
Yu Sung 2024-01-09 19:32:33 +09:00
parent bfcc430349
commit a836215d37
40 changed files with 83 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
SodaLive/Resources/Assets.xcassets/btn_make_live.imageset/btn_make_live.png vendored
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

2
SodaLive/Sources/Content/Main/Banner/ContentMainBannerView.swift
View File

@ -73,7 +73,7 @@ struct ContentMainBannerView: View {
HStack(spacing: 4) { HStack(spacing: 4) {
ForEach(0..<viewModel.bannerList.count, id: \.self) { index in ForEach(0..<viewModel.bannerList.count, id: \.self) { index in
Capsule() Capsule()
.foregroundColor(index == viewModel.currentIndex ? Color(hex: "9970ff") : Color(hex: "909090")) .foregroundColor(index == viewModel.currentIndex ? Color(hex: "3bb9f1") : Color(hex: "909090"))
.frame( .frame(
width: index == viewModel.currentIndex ? 18 : 6, width: index == viewModel.currentIndex ? 18 : 6,
height: 6 height: 6

4
SodaLive/Sources/Content/Main/ContentMainView.swift
View File

@ -25,7 +25,7 @@ struct ContentMainView: View {
VStack(alignment: .leading, spacing: 0) { VStack(alignment: .leading, spacing: 0) {
Text("콘텐츠 마켓") Text("콘텐츠 마켓")
.font(.custom(Font.bold.rawValue, size: 21.3)) .font(.custom(Font.bold.rawValue, size: 21.3))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
.padding(.bottom, 26.7) .padding(.bottom, 26.7)
.padding(.horizontal, 13.3) .padding(.horizontal, 13.3)
@ -69,7 +69,7 @@ struct ContentMainView: View {
.foregroundColor(.white) .foregroundColor(.white)
} }
.padding(13.3) .padding(13.3)
.background(Color(hex: "9970ff")) .background(Color(hex: "3bb9f1"))
.cornerRadius(44) .cornerRadius(44)
.padding(.trailing, 16.7) .padding(.trailing, 16.7)
.padding(.bottom, 16.7) .padding(.bottom, 16.7)

6
SodaLive/Sources/Content/Main/NewContent/ContentMainNewContentThemeView.swift
View File

@ -20,18 +20,18 @@ struct ContentMainNewContentThemeView: View {
let theme = themes[index] let theme = themes[index]
Text(theme) Text(theme)
.font(.custom(Font.medium.rawValue, size: 14.7)) .font(.custom(Font.medium.rawValue, size: 14.7))
.foregroundColor(Color(hex: selectedTheme == theme ? "9970ff" : "777777")) .foregroundColor(Color(hex: selectedTheme == theme ? "3bb9f1" : "777777"))
.padding(.horizontal, 13.3) .padding(.horizontal, 13.3)
.padding(.vertical, 9.3) .padding(.vertical, 9.3)
.border( .border(
Color(hex: selectedTheme == theme ? "9970ff" : "eeeeee"), Color(hex: selectedTheme == theme ? "3bb9f1" : "eeeeee"),
width: 0.5 width: 0.5
) )
.cornerRadius(16.7) .cornerRadius(16.7)
.overlay( .overlay(
RoundedRectangle(cornerRadius: CGFloat(16.7)) RoundedRectangle(cornerRadius: CGFloat(16.7))
.stroke(lineWidth: 0.5) .stroke(lineWidth: 0.5)
.foregroundColor(Color(hex: selectedTheme == theme ? "9970ff" : "eeeeee")) .foregroundColor(Color(hex: selectedTheme == theme ? "3bb9f1" : "eeeeee"))
) )
.onTapGesture { .onTapGesture {
if selectedTheme != theme { if selectedTheme != theme {

10
SodaLive/Sources/Dialog/LiveRoomPasswordDialog.swift
View File

@ -50,14 +50,14 @@ struct LiveRoomPasswordDialog: View {
HStack(spacing: 13.3) { HStack(spacing: 13.3) {
Text("취소") Text("취소")
.font(.custom(Font.bold.rawValue, size: 15.3)) .font(.custom(Font.bold.rawValue, size: 15.3))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
.padding(.vertical, 16) .padding(.vertical, 16)
.frame(width: (geo.size.width - 66.7) / 3) .frame(width: (geo.size.width - 66.7) / 3)
.background(Color(hex: "9970ff").opacity(0.13)) .background(Color(hex: "13181b"))
.cornerRadius(8) .cornerRadius(8)
.overlay( .overlay(
RoundedRectangle(cornerRadius: 8) RoundedRectangle(cornerRadius: 8)
.stroke(Color(hex: "9970ff"), lineWidth: 1) .stroke(Color(hex: "3bb9f1"), lineWidth: 1)
) )
.onTapGesture { .onTapGesture {
isShowing = false isShowing = false
@ -79,7 +79,7 @@ struct LiveRoomPasswordDialog: View {
} }
.padding(.vertical, 16) .padding(.vertical, 16)
.frame(width: (geo.size.width - 66.7) * 2 / 3) .frame(width: (geo.size.width - 66.7) * 2 / 3)
.background(Color(hex: "9970ff")) .background(Color(hex: "3bb9f1"))
.cornerRadius(8) .cornerRadius(8)
.onTapGesture { .onTapGesture {
if password.trimmingCharacters(in: .whitespaces).isEmpty { if password.trimmingCharacters(in: .whitespaces).isEmpty {
@ -95,7 +95,7 @@ struct LiveRoomPasswordDialog: View {
.foregroundColor(Color(hex: "ffffff")) .foregroundColor(Color(hex: "ffffff"))
.padding(.vertical, 16) .padding(.vertical, 16)
.frame(width: (geo.size.width - 66.7) * 2 / 3) .frame(width: (geo.size.width - 66.7) * 2 / 3)
.background(Color(hex: "9970ff")) .background(Color(hex: "3bb9f1"))
.cornerRadius(8) .cornerRadius(8)
.onTapGesture { .onTapGesture {
if password.trimmingCharacters(in: .whitespaces).isEmpty { if password.trimmingCharacters(in: .whitespaces).isEmpty {

8
SodaLive/Sources/Dialog/SodaDialog.swift
View File

@ -57,14 +57,14 @@ struct SodaDialog: View {
if cancelButtonTitle.count > 0 { if cancelButtonTitle.count > 0 {
Text(cancelButtonTitle) Text(cancelButtonTitle)
.font(.custom(Font.bold.rawValue, size: 15.3)) .font(.custom(Font.bold.rawValue, size: 15.3))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
.padding(.vertical, 16) .padding(.vertical, 16)
.frame(width: (geo.size.width - 66.7) / 3) .frame(width: (geo.size.width - 66.7) / 3)
.background(Color(hex: "9970ff").opacity(0.13)) .background(Color(hex: "13181b"))
.cornerRadius(8) .cornerRadius(8)
.overlay( .overlay(
RoundedRectangle(cornerRadius: 8) RoundedRectangle(cornerRadius: 8)
.stroke(Color(hex: "9970ff"), lineWidth: 1) .stroke(Color(hex: "3bb9f1"), lineWidth: 1)
) )
.onTapGesture { .onTapGesture {
cancelButtonAction() cancelButtonAction()
@ -76,7 +76,7 @@ struct SodaDialog: View {
.foregroundColor(Color(hex: "ffffff")) .foregroundColor(Color(hex: "ffffff"))
.padding(.vertical, 16) .padding(.vertical, 16)
.frame(width: (geo.size.width - 66.7) * 2 / 3) .frame(width: (geo.size.width - 66.7) * 2 / 3)
.background(Color(hex: "9970ff")) .background(Color(hex: "3bb9f1"))
.cornerRadius(8) .cornerRadius(8)
.onTapGesture { .onTapGesture {
confirmButtonAction() confirmButtonAction()

2
SodaLive/Sources/Explorer/ExplorerSectionView.swift
View File

@ -114,7 +114,7 @@ struct ExplorerSectionView: View {
Text(creator.tags) Text(creator.tags)
.font(.custom(Font.medium.rawValue, size: 10)) .font(.custom(Font.medium.rawValue, size: 10))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
.lineLimit(1) .lineLimit(1)
.frame(width: 93.3) .frame(width: 93.3)
.padding(.top, 3.3) .padding(.top, 3.3)

2
SodaLive/Sources/Explorer/ExplorerView.swift
View File

@ -101,7 +101,7 @@ struct ExplorerView: 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(hex: "3bb9f1"))
.foregroundColor(Color.white) .foregroundColor(Color.white)
.multilineTextAlignment(.center) .multilineTextAlignment(.center)
.cornerRadius(20) .cornerRadius(20)

2
SodaLive/Sources/Follow/FollowCreatorView.swift
View File

@ -69,7 +69,7 @@ struct FollowCreatorView: View {
.padding(.vertical, 13.3) .padding(.vertical, 13.3)
.frame(width: screenSize().width - 66.7, alignment: .center) .frame(width: screenSize().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(hex: "3bb9f1"))
.foregroundColor(Color.white) .foregroundColor(Color.white)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.cornerRadius(20) .cornerRadius(20)

10
SodaLive/Sources/Live/Cancel/LiveCancelDialog.swift
View File

@ -32,21 +32,21 @@ struct LiveCancelDialog: View {
.cornerRadius(6.7) .cornerRadius(6.7)
.overlay( .overlay(
RoundedRectangle(cornerRadius: 6.7) RoundedRectangle(cornerRadius: 6.7)
.stroke(Color(hex: "9970ff"), lineWidth: 1.3) .stroke(Color(hex: "3bb9f1"), lineWidth: 1.3)
) )
.padding(.top, 13.3) .padding(.top, 13.3)
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: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
.padding(.vertical, 16) .padding(.vertical, 16)
.padding(.horizontal, 48) .padding(.horizontal, 48)
.background(Color(hex: "9970ff").opacity(0.2)) .background(Color(hex: "13181b"))
.cornerRadius(10) .cornerRadius(10)
.overlay( .overlay(
RoundedRectangle(cornerRadius: 10) RoundedRectangle(cornerRadius: 10)
.stroke(Color(hex: "9970ff"), lineWidth: 1.3) .stroke(Color(hex: "3bb9f1"), lineWidth: 1.3)
) )
.onTapGesture { .onTapGesture {
isShowCancelPopup = false isShowCancelPopup = false
@ -57,7 +57,7 @@ struct LiveCancelDialog: View {
.foregroundColor(.white) .foregroundColor(.white)
.padding(.vertical, 16) .padding(.vertical, 16)
.padding(.horizontal, 48) .padding(.horizontal, 48)
.background(Color(hex: "9970ff")) .background(Color(hex: "3bb9f1"))
.cornerRadius(10) .cornerRadius(10)
.onTapGesture { .onTapGesture {
confirmAction(reason.trimmingCharacters(in: .whitespacesAndNewlines) != placeholder ? reason : "") confirmAction(reason.trimmingCharacters(in: .whitespacesAndNewlines) != placeholder ? reason : "")

2
SodaLive/Sources/Live/EventBanner/SectionEventBannerView.swift
View File

@ -58,7 +58,7 @@ struct SectionEventBannerView: View {
HStack(spacing: 4) { HStack(spacing: 4) {
ForEach(0..<items.count, id: \.self) { index in ForEach(0..<items.count, id: \.self) { index in
Capsule() Capsule()
.foregroundColor(index == currentIndex ? Color(hex: "9970ff") : Color(hex: "909090")) .foregroundColor(index == currentIndex ? Color(hex: "3bb9f1") : Color(hex: "909090"))
.frame( .frame(
width: index == currentIndex ? 18 : 6, width: index == currentIndex ? 18 : 6,
height: 6 height: 6

2
SodaLive/Sources/Live/LiveView.swift
View File

@ -125,7 +125,7 @@ struct LiveView: View {
.padding(.horizontal, 6.7) .padding(.horizontal, 6.7)
.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(hex: "3bb9f1"))
.foregroundColor(Color.white) .foregroundColor(Color.white)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)

2
SodaLive/Sources/Live/Now/All/LiveNowAllItemView.swift
View File

@ -57,7 +57,7 @@ struct LiveNowAllItemView: View {
.foregroundColor( .foregroundColor(
Color( Color(
hex: item.numberOfPeople > item.numberOfParticipate ? hex: item.numberOfPeople > item.numberOfParticipate ?
"9970ff" : "3bb9f1" :
"ffd300" "ffd300"
) )
) )

2
SodaLive/Sources/Live/Recommend/SectionRecommendLiveView.swift
View File

@ -67,7 +67,7 @@ struct SectionRecommendLiveView: View {
HStack(spacing: 4) { HStack(spacing: 4) {
ForEach(0..<items.count, id: \.self) { index in ForEach(0..<items.count, id: \.self) { index in
Capsule() Capsule()
.foregroundColor(index == currentIndex ? Color(hex: "9970ff") : Color(hex: "909090")) .foregroundColor(index == currentIndex ? Color(hex: "3bb9f1") : Color(hex: "909090"))
.frame( .frame(
width: index == currentIndex ? 18 : 6, width: index == currentIndex ? 18 : 6,
height: 6 height: 6

6
SodaLive/Sources/Live/RecommendChannel/SectionRecommendChannelView.swift
View File

@ -29,7 +29,7 @@ struct SectionRecommendChannelView: View {
Text("채널") Text("채널")
.font(.custom(Font.bold.rawValue, size: 18.3)) .font(.custom(Font.bold.rawValue, size: 18.3))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
Spacer() Spacer()
@ -63,7 +63,7 @@ struct SectionRecommendChannelView: View {
Circle() Circle()
.strokeBorder(lineWidth: 3) .strokeBorder(lineWidth: 3)
.foregroundColor( .foregroundColor(
Color(hex: "9970ff") Color(hex: "3bb9f1")
.opacity(item.isOnAir ? 1 : 0) .opacity(item.isOnAir ? 1 : 0)
) )
) )
@ -74,7 +74,7 @@ struct SectionRecommendChannelView: View {
.foregroundColor(.white) .foregroundColor(.white)
.padding(.vertical, 2.7) .padding(.vertical, 2.7)
.padding(.horizontal, 5.7) .padding(.horizontal, 5.7)
.background(Color(hex: "9970ff")) .background(Color(hex: "3bb9f1"))
.cornerRadius(6.7) .cornerRadius(6.7)
} }
} }

2
SodaLive/Sources/Live/Reservation/All/LiveReservationAllView.swift
View File

@ -73,7 +73,7 @@ struct LiveReservationAllView: View {
.foregroundColor(Color.white) .foregroundColor(Color.white)
} }
.frame(width: 200, height: 33.3, alignment: .center) .frame(width: 200, height: 33.3, alignment: .center)
.background(Color(hex: "9970ff")) .background(Color(hex: "3bb9f1"))
.cornerRadius(4.7) .cornerRadius(4.7)
.padding(.top, 10.7) .padding(.top, 10.7)
.onTapGesture { .onTapGesture {

4
SodaLive/Sources/Live/Room/Dialog/LiveRoomDialogView.swift
View File

@ -52,7 +52,7 @@ struct LiveRoomDialogView: View {
if let confirmTitle = confirmTitle, let confirmAction = confirmAction { if let confirmTitle = confirmTitle, let confirmAction = confirmAction {
Text(confirmTitle) Text(confirmTitle)
.font(.custom(Font.medium.rawValue, size: 10)) .font(.custom(Font.medium.rawValue, size: 10))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
.padding(.horizontal, 8) .padding(.horizontal, 8)
.padding(.vertical, 8.3) .padding(.vertical, 8.3)
.background(Color.white) .background(Color.white)
@ -64,7 +64,7 @@ struct LiveRoomDialogView: View {
.padding(.top, confirmTitle != nil || cancelTitle != nil ? 10 : 0) .padding(.top, confirmTitle != nil || cancelTitle != nil ? 10 : 0)
} }
.padding(.vertical, 20) .padding(.vertical, 20)
.background(Color(hex: "9970ff")) .background(Color(hex: "3bb9f1"))
.cornerRadius(16.7) .cornerRadius(16.7)
.padding(.horizontal, 26.7) .padding(.horizontal, 26.7)
.frame(width: screenSize().width) .frame(width: screenSize().width)

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

@ -179,7 +179,7 @@ struct LiveRoomProfilesDialogView: View {
Text("\(roomInfo.participantsCount)") Text("\(roomInfo.participantsCount)")
.font(.custom(Font.medium.rawValue, size: 14)) .font(.custom(Font.medium.rawValue, size: 14))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
.padding(.leading, 6.7) .padding(.leading, 6.7)
Text("/\(roomInfo.totalAvailableParticipantsCount)") Text("/\(roomInfo.totalAvailableParticipantsCount)")

2
SodaLive/Sources/Main/Home/TabButton.swift
View File

@ -38,7 +38,7 @@ struct TabButton_Previews: PreviewProvider {
action: {}, action: {},
image: { "ic_tabbar_live_selected" }, image: { "ic_tabbar_live_selected" },
fontName: { Font.bold.rawValue }, fontName: { Font.bold.rawValue },
color: { Color(hex: "9970ff") }, color: { Color(hex: "3bb9f1") },
width: UIScreen.main.bounds.width / 4 width: UIScreen.main.bounds.width / 4
) )
} }

12
SodaLive/Sources/Message/MessageFilterTabView.swift
View File

@ -15,13 +15,13 @@ struct MessageFilterTabView: View {
HStack(spacing: 6.7) { HStack(spacing: 6.7) {
Text("받은 메시지") Text("받은 메시지")
.font(.custom(Font.medium.rawValue, size: 12)) .font(.custom(Font.medium.rawValue, size: 12))
.foregroundColor(Color(hex: currentFilterTab == .receive ? "9970ff" : "777777")) .foregroundColor(Color(hex: currentFilterTab == .receive ? "3bb9f1" : "777777"))
.padding(.horizontal, 25) .padding(.horizontal, 25)
.padding(.vertical, 10.7) .padding(.vertical, 10.7)
.overlay( .overlay(
RoundedRectangle(cornerRadius: 16.7) RoundedRectangle(cornerRadius: 16.7)
.stroke( .stroke(
Color(hex: currentFilterTab == .receive ? "9970ff" : "777777"), Color(hex: currentFilterTab == .receive ? "3bb9f1" : "777777"),
lineWidth: 1 lineWidth: 1
) )
) )
@ -33,13 +33,13 @@ struct MessageFilterTabView: View {
Text("보낸 메시지") Text("보낸 메시지")
.font(.custom(Font.medium.rawValue, size: 12)) .font(.custom(Font.medium.rawValue, size: 12))
.foregroundColor(Color(hex: currentFilterTab == .sent ? "9970ff" : "777777")) .foregroundColor(Color(hex: currentFilterTab == .sent ? "3bb9f1" : "777777"))
.padding(.horizontal, 25) .padding(.horizontal, 25)
.padding(.vertical, 10.7) .padding(.vertical, 10.7)
.overlay( .overlay(
RoundedRectangle(cornerRadius: 16.7) RoundedRectangle(cornerRadius: 16.7)
.stroke( .stroke(
Color(hex: currentFilterTab == .sent ? "9970ff" : "777777"), Color(hex: currentFilterTab == .sent ? "3bb9f1" : "777777"),
lineWidth: 1 lineWidth: 1
) )
) )
@ -51,13 +51,13 @@ struct MessageFilterTabView: View {
Text("보관함") Text("보관함")
.font(.custom(Font.medium.rawValue, size: 12)) .font(.custom(Font.medium.rawValue, size: 12))
.foregroundColor(Color(hex: currentFilterTab == .keep ? "9970ff" : "777777")) .foregroundColor(Color(hex: currentFilterTab == .keep ? "3bb9f1" : "777777"))
.padding(.horizontal, 25) .padding(.horizontal, 25)
.padding(.vertical, 10.7) .padding(.vertical, 10.7)
.overlay( .overlay(
RoundedRectangle(cornerRadius: 16.7) RoundedRectangle(cornerRadius: 16.7)
.stroke( .stroke(
Color(hex: currentFilterTab == .keep ? "9970ff" : "777777"), Color(hex: currentFilterTab == .keep ? "3bb9f1" : "777777"),
lineWidth: 1 lineWidth: 1
) )
) )

4
SodaLive/Sources/Message/MessageView.swift
View File

@ -53,7 +53,7 @@ struct MessageView: View {
if viewModel.currentTab == .text { if viewModel.currentTab == .text {
Rectangle() Rectangle()
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
.frame(width: tabWidth, height: 3) .frame(width: tabWidth, height: 3)
} }
} }
@ -72,7 +72,7 @@ struct MessageView: View {
if viewModel.currentTab == .voice { if viewModel.currentTab == .voice {
Rectangle() Rectangle()
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
.frame(width: tabWidth, height: 3) .frame(width: tabWidth, height: 3)
} }
} }

16
SodaLive/Sources/Message/Text/Detail/TextMessageDetailView.swift
View File

@ -93,7 +93,7 @@ struct TextMessageDetailView: View {
width: (screenSize().width - 40) / 3, width: (screenSize().width - 40) / 3,
height: 48.7 height: 48.7
) )
.background(Color(hex: "9970ff")) .background(Color(hex: "3bb9f1"))
.cornerRadius(6.7) .cornerRadius(6.7)
.onTapGesture { .onTapGesture {
AppState.shared.setAppStep(step: .writeTextMessage(userId: messageItem.senderId, nickname: messageItem.senderNickname)) AppState.shared.setAppStep(step: .writeTextMessage(userId: messageItem.senderId, nickname: messageItem.senderNickname))
@ -101,12 +101,12 @@ struct TextMessageDetailView: View {
Text("보관") Text("보관")
.font(.custom(Font.bold.rawValue, size: 14.7)) .font(.custom(Font.bold.rawValue, size: 14.7))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
.frame( .frame(
width: (screenSize().width - 40) / 3, width: (screenSize().width - 40) / 3,
height: 48.7 height: 48.7
) )
.background(Color(hex: "1f1734")) .background(Color(hex: "13181b"))
.cornerRadius(6.7) .cornerRadius(6.7)
.onTapGesture { .onTapGesture {
if messageItem.isKept { if messageItem.isKept {
@ -120,12 +120,12 @@ struct TextMessageDetailView: View {
Text("삭제") Text("삭제")
.font(.custom(Font.bold.rawValue, size: 14.7)) .font(.custom(Font.bold.rawValue, size: 14.7))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
.frame( .frame(
width: (screenSize().width - 40) / 3, width: (screenSize().width - 40) / 3,
height: 48.7 height: 48.7
) )
.background(Color(hex: "1f1734")) .background(Color(hex: "13181b"))
.cornerRadius(6.7) .cornerRadius(6.7)
.onTapGesture { .onTapGesture {
viewModel.deleteMessage { back() } viewModel.deleteMessage { back() }
@ -136,12 +136,12 @@ struct TextMessageDetailView: View {
} else { } else {
Text("삭제") Text("삭제")
.font(.custom(Font.bold.rawValue, size: 14.7)) .font(.custom(Font.bold.rawValue, size: 14.7))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
.frame( .frame(
width: screenSize().width - 26.7, width: screenSize().width - 26.7,
height: 48.7 height: 48.7
) )
.background(Color(hex: "1f1734")) .background(Color(hex: "13181b"))
.cornerRadius(6.7) .cornerRadius(6.7)
.onTapGesture { .onTapGesture {
viewModel.deleteMessage { back() } viewModel.deleteMessage { back() }
@ -159,7 +159,7 @@ struct TextMessageDetailView: View {
.padding(.horizontal, 6.7) .padding(.horizontal, 6.7)
.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(hex: "3bb9f1"))
.foregroundColor(Color.white) .foregroundColor(Color.white)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)

0
SodaLive/Sources/Message/SelectRecipient/SelectRecipientView.swift → SodaLive/Sources/Message/Text/SelectRecipient/SelectRecipientView.swift
View File

0
SodaLive/Sources/Message/SelectRecipient/SelectRecipientViewModel.swift → SodaLive/Sources/Message/Text/SelectRecipient/SelectRecipientViewModel.swift
View File

2
SodaLive/Sources/Message/Text/TextMessageView.swift
View File

@ -84,7 +84,7 @@ struct TextMessageView: View {
.resizable() .resizable()
.padding(13.3) .padding(13.3)
.frame(width: 53.3, height: 53.3) .frame(width: 53.3, height: 53.3)
.background(Color(hex: "9970ff")) .background(Color(hex: "3bb9f1"))
.cornerRadius(26.7) .cornerRadius(26.7)
.padding(.bottom, 33.3) .padding(.bottom, 33.3)
.padding(.trailing, 6.7) .padding(.trailing, 6.7)

10
SodaLive/Sources/Message/Text/Write/TextMessageWriteView.swift
View File

@ -23,7 +23,7 @@ struct TextMessageWriteView: View {
HStack(spacing: 0) { HStack(spacing: 0) {
Text("취소") Text("취소")
.font(.custom(Font.medium.rawValue, size: 16.7)) .font(.custom(Font.medium.rawValue, size: 16.7))
.foregroundColor(Color(hex: "9970ff").opacity(0)) .foregroundColor(Color(hex: "3bb9f1").opacity(0))
Spacer() Spacer()
@ -35,7 +35,7 @@ struct TextMessageWriteView: View {
Text("취소") Text("취소")
.font(.custom(Font.medium.rawValue, size: 16.7)) .font(.custom(Font.medium.rawValue, size: 16.7))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
.onTapGesture { .onTapGesture {
AppState.shared.back() AppState.shared.back()
} }
@ -90,7 +90,7 @@ struct TextMessageWriteView: View {
.cornerRadius(6.7) .cornerRadius(6.7)
.overlay( .overlay(
RoundedRectangle(cornerRadius: 6.7) RoundedRectangle(cornerRadius: 6.7)
.stroke(Color(hex: "9970ff"), lineWidth: 1.3) .stroke(Color(hex: "3bb9f1"), lineWidth: 1.3)
) )
.padding(.top, 13.3) .padding(.top, 13.3)
@ -100,7 +100,7 @@ struct TextMessageWriteView: View {
.font(.custom(Font.bold.rawValue, size: 14.7)) .font(.custom(Font.bold.rawValue, size: 14.7))
.foregroundColor(Color(hex: "eeeeee")) .foregroundColor(Color(hex: "eeeeee"))
.frame(width: screenSize().width - 26.7, height: 48.7) .frame(width: screenSize().width - 26.7, height: 48.7)
.background(Color(hex: "9970ff")) .background(Color(hex: "3bb9f1"))
.cornerRadius(6.7) .cornerRadius(6.7)
.padding(.bottom, 13.3) .padding(.bottom, 13.3)
.onTapGesture { .onTapGesture {
@ -125,7 +125,7 @@ struct TextMessageWriteView: View {
.padding(.horizontal, 6.7) .padding(.horizontal, 6.7)
.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(hex: "3bb9f1"))
.foregroundColor(Color.white) .foregroundColor(Color.white)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)

30
SodaLive/Sources/Message/Voice/VoiceMessageView.swift
View File

@ -92,7 +92,7 @@ struct VoiceMessageView: View {
.resizable() .resizable()
.padding(13.3) .padding(13.3)
.frame(width: 53.3, height: 53.3) .frame(width: 53.3, height: 53.3)
.background(Color(hex: "9970ff")) .background(Color(hex: "3bb9f1"))
.cornerRadius(26.7) .cornerRadius(26.7)
.padding(.bottom, 33.3) .padding(.bottom, 33.3)
.onTapGesture { .onTapGesture {
@ -135,15 +135,15 @@ struct VoiceMessageView: 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: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
.padding(.vertical, 16) .padding(.vertical, 16)
.frame(width: (screenSize().width - 66.7) / 3) .frame(width: (screenSize().width - 66.7) / 3)
.background(Color(hex: "9970ff").opacity(0.2)) .background(Color(hex: "13181b"))
.cornerRadius(10) .cornerRadius(10)
.overlay( .overlay(
RoundedRectangle(cornerRadius: 10) RoundedRectangle(cornerRadius: 10)
.stroke( .stroke(
Color(hex: "9970ff"), Color(hex: "3bb9f1"),
lineWidth: 1 lineWidth: 1
) )
) )
@ -156,7 +156,7 @@ struct VoiceMessageView: View {
.foregroundColor(.white) .foregroundColor(.white)
.padding(.vertical, 16) .padding(.vertical, 16)
.frame(width: (screenSize().width - 66.7) * 2 / 3) .frame(width: (screenSize().width - 66.7) * 2 / 3)
.background(Color(hex: "9970ff")) .background(Color(hex: "3bb9f1"))
.cornerRadius(10) .cornerRadius(10)
.onTapGesture { .onTapGesture {
viewModel.isShowSavePopup = false viewModel.isShowSavePopup = false
@ -185,7 +185,7 @@ struct VoiceMessageView: View {
.padding(.horizontal, 6.7) .padding(.horizontal, 6.7)
.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(hex: "3bb9f1"))
.foregroundColor(Color.white) .foregroundColor(Color.white)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
@ -195,24 +195,6 @@ struct VoiceMessageView: View {
} }
} }
} }
.popup(isPresented: $soundManager.isShowPopup, type: .toast, position: .top, autohideIn: 2) {
GeometryReader { geo in
HStack {
Spacer()
Text(soundManager.errorMessage)
.padding(.vertical, 13.3)
.padding(.horizontal, 6.7)
.frame(width: geo.size.width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.background(Color(hex: "9970ff"))
.foregroundColor(Color.white)
.multilineTextAlignment(.leading)
.fixedSize(horizontal: false, vertical: true)
.cornerRadius(20)
Spacer()
}
}
}
.onAppear { .onAppear {
viewModel.refresh() viewModel.refresh()
} }

2
SodaLive/Sources/Message/Voice/Write/VoiceMessageWriteView.swift
View File

@ -245,7 +245,7 @@ struct VoiceMessageWriteView: View {
.padding(.horizontal, 6.7) .padding(.horizontal, 6.7)
.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(hex: "3bb9f1"))
.foregroundColor(Color.white) .foregroundColor(Color.white)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)

2
SodaLive/Sources/MyPage/OrderList/OrderListAllView.swift
View File

@ -88,7 +88,7 @@ struct OrderListAllView: View {
.padding(.vertical, 13.3) .padding(.vertical, 13.3)
.frame(width: screenSize().width - 66.7, alignment: .center) .frame(width: screenSize().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(hex: "3bb9f1"))
.foregroundColor(Color.white) .foregroundColor(Color.white)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.cornerRadius(20) .cornerRadius(20)

4
SodaLive/Sources/MyPage/Profile/Nickname/NicknameUpdateView.swift
View File

@ -47,7 +47,7 @@ struct NicknameUpdateView: View {
.padding(.vertical, 13.3) .padding(.vertical, 13.3)
.overlay( .overlay(
RoundedRectangle(cornerRadius: 8) RoundedRectangle(cornerRadius: 8)
.stroke(Color(hex: "9970ff"), lineWidth: 1) .stroke(Color(hex: "3bb9f1"), lineWidth: 1)
) )
.padding(.top, 21.3) .padding(.top, 21.3)
.onTapGesture { .onTapGesture {
@ -62,7 +62,7 @@ struct NicknameUpdateView: View {
.foregroundColor(Color.white) .foregroundColor(Color.white)
.padding(.vertical, 16) .padding(.vertical, 16)
.frame(width: screenSize().width - 26.7) .frame(width: screenSize().width - 26.7)
.background(Color(hex: "9970ff")) .background(Color(hex: "3bb9f1"))
.cornerRadius(10) .cornerRadius(10)
.padding(.vertical, 13.7) .padding(.vertical, 13.7)
.frame(width: screenSize().width) .frame(width: screenSize().width)

4
SodaLive/Sources/Report/CheersReportDialogView.swift
View File

@ -61,14 +61,14 @@ struct CheersReportDialogView: View {
Text("취소") Text("취소")
.font(.custom(Font.medium.rawValue, size: 13.3)) .font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
.onTapGesture { .onTapGesture {
isShowing = false isShowing = false
} }
Text("신고") Text("신고")
.font(.custom(Font.medium.rawValue, size: 13.3)) .font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
.onTapGesture { .onTapGesture {
if let selectedIndex = selectedIndex { if let selectedIndex = selectedIndex {
isShowing = false isShowing = false

4
SodaLive/Sources/Report/ProfileReportDialogView.swift
View File

@ -33,14 +33,14 @@ struct ProfileReportDialogView: View {
Text("취소") Text("취소")
.font(.custom(Font.medium.rawValue, size: 13.3)) .font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
.onTapGesture { .onTapGesture {
isShowing = false isShowing = false
} }
Text("신고") Text("신고")
.font(.custom(Font.medium.rawValue, size: 13.3)) .font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
.onTapGesture { .onTapGesture {
isShowing = false isShowing = false
confirmAction() confirmAction()

4
SodaLive/Sources/Report/UserBlockConfirmDialogView.swift
View File

@ -51,14 +51,14 @@ struct UserBlockConfirmDialogView: View {
Text("취소") Text("취소")
.font(.custom(Font.medium.rawValue, size: 13.3)) .font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
.onTapGesture { .onTapGesture {
isShowing = false isShowing = false
} }
Text("차단") Text("차단")
.font(.custom(Font.medium.rawValue, size: 13.3)) .font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
.onTapGesture { .onTapGesture {
isShowing = false isShowing = false
confirmAction() confirmAction()

4
SodaLive/Sources/Report/UserReportDialogView.swift
View File

@ -62,14 +62,14 @@ struct UserReportDialogView: View {
Text("취소") Text("취소")
.font(.custom(Font.medium.rawValue, size: 13.3)) .font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
.onTapGesture { .onTapGesture {
isShowing = false isShowing = false
} }
Text("신고") Text("신고")
.font(.custom(Font.medium.rawValue, size: 13.3)) .font(.custom(Font.medium.rawValue, size: 13.3))
.foregroundColor(Color(hex: "9970ff")) .foregroundColor(Color(hex: "3bb9f1"))
.onTapGesture { .onTapGesture {
if let selectedIndex = selectedIndex { if let selectedIndex = selectedIndex {
isShowing = false isShowing = false

2
SodaLive/Sources/Settings/Event/EventListView.swift
View File

@ -50,7 +50,7 @@ struct EventListView: View {
.padding(.horizontal, 6.7) .padding(.horizontal, 6.7)
.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(hex: "3bb9f1"))
.foregroundColor(Color.white) .foregroundColor(Color.white)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)

2
SodaLive/Sources/Settings/Notice/NoticeListView.swift
View File

@ -59,7 +59,7 @@ struct NoticeListView: View {
.padding(.horizontal, 6.7) .padding(.horizontal, 6.7)
.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(hex: "3bb9f1"))
.foregroundColor(Color.white) .foregroundColor(Color.white)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)

2
SodaLive/Sources/Settings/Notification/NotificationSettingsDialog.swift
View File

@ -79,7 +79,7 @@ struct NotificationSettingsDialog: View {
.foregroundColor(Color(hex: "ffffff")) .foregroundColor(Color(hex: "ffffff"))
.padding(.vertical, 16) .padding(.vertical, 16)
.frame(width: (geo.size.width - 66.7) * 2 / 3) .frame(width: (geo.size.width - 66.7) * 2 / 3)
.background(Color(hex: "9970ff")) .background(Color(hex: "3bb9f1"))
.cornerRadius(8) .cornerRadius(8)
.padding(.top, 33.3) .padding(.top, 33.3)
.onTapGesture { .onTapGesture {

2
SodaLive/Sources/Settings/Notification/NotificationSettingsView.swift
View File

@ -95,7 +95,7 @@ struct NotificationSettingsView: View {
.padding(.horizontal, 6.7) .padding(.horizontal, 6.7)
.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(hex: "3bb9f1"))
.foregroundColor(Color.white) .foregroundColor(Color.white)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)

2
SodaLive/Sources/Settings/SettingsView.swift
View File

@ -233,7 +233,7 @@ struct SettingsView: View {
.padding(.horizontal, 6.7) .padding(.horizontal, 6.7)
.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(hex: "3bb9f1"))
.foregroundColor(Color.white) .foregroundColor(Color.white)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)

6
SodaLive/Sources/Settings/SignOut/SignOutView.swift
View File

@ -21,7 +21,7 @@ struct SignOutView: View {
VStack(spacing: 13.3) { VStack(spacing: 13.3) {
Text("정말로 탈퇴하실 거에요?\n한 번 더 생각해보지 않으실래요?") Text("정말로 탈퇴하실 거에요?\n한 번 더 생각해보지 않으실래요?")
.font(.custom(Font.bold.rawValue, size: 20)) .font(.custom(Font.bold.rawValue, size: 20))
.foregroundColor(Color(hex: "a285eb")) .foregroundColor(Color(hex: "3bb9f1"))
.frame(width: screenSize().width - 26.7, alignment: .leading) .frame(width: screenSize().width - 26.7, alignment: .leading)
Text("계정을 삭제하려는 이유를 선택해주세요.\n서비스 개선에 중요한 자료로 활용하겠습니다.") Text("계정을 삭제하려는 이유를 선택해주세요.\n서비스 개선에 중요한 자료로 활용하겠습니다.")
@ -96,7 +96,7 @@ struct SignOutView: View {
.foregroundColor(.white) .foregroundColor(.white)
.padding(.vertical, 16) .padding(.vertical, 16)
.frame(width: screenSize().width - 26.7) .frame(width: screenSize().width - 26.7)
.background(Color(hex: "9970ff")) .background(Color(hex: "3bb9f1"))
.cornerRadius(6.7) .cornerRadius(6.7)
.padding(.top, 26.7) .padding(.top, 26.7)
.onTapGesture { .onTapGesture {
@ -117,7 +117,7 @@ struct SignOutView: View {
.padding(.horizontal, 6.7) .padding(.horizontal, 6.7)
.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(hex: "3bb9f1"))
.foregroundColor(Color.white) .foregroundColor(Color.white)
.multilineTextAlignment(.leading) .multilineTextAlignment(.leading)
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)