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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,13 +15,13 @@ struct MessageFilterTabView: View {
HStack(spacing: 6.7) {
Text("받은 메시지")
.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(.vertical, 10.7)
.overlay(
RoundedRectangle(cornerRadius: 16.7)
.stroke(
Color(hex: currentFilterTab == .receive ? "9970ff" : "777777"),
Color(hex: currentFilterTab == .receive ? "3bb9f1" : "777777"),
lineWidth: 1
)
)
@@ -33,13 +33,13 @@ struct MessageFilterTabView: View {
Text("보낸 메시지")
.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(.vertical, 10.7)
.overlay(
RoundedRectangle(cornerRadius: 16.7)
.stroke(
Color(hex: currentFilterTab == .sent ? "9970ff" : "777777"),
Color(hex: currentFilterTab == .sent ? "3bb9f1" : "777777"),
lineWidth: 1
)
)
@@ -51,13 +51,13 @@ struct MessageFilterTabView: View {
Text("보관함")
.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(.vertical, 10.7)
.overlay(
RoundedRectangle(cornerRadius: 16.7)
.stroke(
Color(hex: currentFilterTab == .keep ? "9970ff" : "777777"),
Color(hex: currentFilterTab == .keep ? "3bb9f1" : "777777"),
lineWidth: 1
)
)

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

@@ -53,7 +53,7 @@ struct MessageView: View {
if viewModel.currentTab == .text {
Rectangle()
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color(hex: "3bb9f1"))
.frame(width: tabWidth, height: 3)
}
}
@@ -72,7 +72,7 @@ struct MessageView: View {
if viewModel.currentTab == .voice {
Rectangle()
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color(hex: "3bb9f1"))
.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,
height: 48.7
)
.background(Color(hex: "9970ff"))
.background(Color(hex: "3bb9f1"))
.cornerRadius(6.7)
.onTapGesture {
AppState.shared.setAppStep(step: .writeTextMessage(userId: messageItem.senderId, nickname: messageItem.senderNickname))
@@ -101,12 +101,12 @@ struct TextMessageDetailView: View {
Text("보관")
.font(.custom(Font.bold.rawValue, size: 14.7))
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color(hex: "3bb9f1"))
.frame(
width: (screenSize().width - 40) / 3,
height: 48.7
)
.background(Color(hex: "1f1734"))
.background(Color(hex: "13181b"))
.cornerRadius(6.7)
.onTapGesture {
if messageItem.isKept {
@@ -120,12 +120,12 @@ struct TextMessageDetailView: View {
Text("삭제")
.font(.custom(Font.bold.rawValue, size: 14.7))
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color(hex: "3bb9f1"))
.frame(
width: (screenSize().width - 40) / 3,
height: 48.7
)
.background(Color(hex: "1f1734"))
.background(Color(hex: "13181b"))
.cornerRadius(6.7)
.onTapGesture {
viewModel.deleteMessage { back() }
@@ -136,12 +136,12 @@ struct TextMessageDetailView: View {
} else {
Text("삭제")
.font(.custom(Font.bold.rawValue, size: 14.7))
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color(hex: "3bb9f1"))
.frame(
width: screenSize().width - 26.7,
height: 48.7
)
.background(Color(hex: "1f1734"))
.background(Color(hex: "13181b"))
.cornerRadius(6.7)
.onTapGesture {
viewModel.deleteMessage { back() }
@@ -159,7 +159,7 @@ struct TextMessageDetailView: View {
.padding(.horizontal, 6.7)
.frame(width: geo.size.width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.background(Color(hex: "9970ff"))
.background(Color(hex: "3bb9f1"))
.foregroundColor(Color.white)
.multilineTextAlignment(.leading)
.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()
.padding(13.3)
.frame(width: 53.3, height: 53.3)
.background(Color(hex: "9970ff"))
.background(Color(hex: "3bb9f1"))
.cornerRadius(26.7)
.padding(.bottom, 33.3)
.padding(.trailing, 6.7)

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

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

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

@@ -92,7 +92,7 @@ struct VoiceMessageView: View {
.resizable()
.padding(13.3)
.frame(width: 53.3, height: 53.3)
.background(Color(hex: "9970ff"))
.background(Color(hex: "3bb9f1"))
.cornerRadius(26.7)
.padding(.bottom, 33.3)
.onTapGesture {
@@ -135,15 +135,15 @@ struct VoiceMessageView: View {
HStack(spacing: 13.3) {
Text("취소")
.font(.custom(Font.bold.rawValue, size: 18.3))
.foregroundColor(Color(hex: "9970ff"))
.foregroundColor(Color(hex: "3bb9f1"))
.padding(.vertical, 16)
.frame(width: (screenSize().width - 66.7) / 3)
.background(Color(hex: "9970ff").opacity(0.2))
.background(Color(hex: "13181b"))
.cornerRadius(10)
.overlay(
RoundedRectangle(cornerRadius: 10)
.stroke(
Color(hex: "9970ff"),
Color(hex: "3bb9f1"),
lineWidth: 1
)
)
@@ -156,7 +156,7 @@ struct VoiceMessageView: View {
.foregroundColor(.white)
.padding(.vertical, 16)
.frame(width: (screenSize().width - 66.7) * 2 / 3)
.background(Color(hex: "9970ff"))
.background(Color(hex: "3bb9f1"))
.cornerRadius(10)
.onTapGesture {
viewModel.isShowSavePopup = false
@@ -185,7 +185,7 @@ struct VoiceMessageView: View {
.padding(.horizontal, 6.7)
.frame(width: geo.size.width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.background(Color(hex: "9970ff"))
.background(Color(hex: "3bb9f1"))
.foregroundColor(Color.white)
.multilineTextAlignment(.leading)
.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 {
viewModel.refresh()
}

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

@@ -245,7 +245,7 @@ struct VoiceMessageWriteView: View {
.padding(.horizontal, 6.7)
.frame(width: geo.size.width - 66.7, alignment: .center)
.font(.custom(Font.medium.rawValue, size: 12))
.background(Color(hex: "9970ff"))
.background(Color(hex: "3bb9f1"))
.foregroundColor(Color.white)
.multilineTextAlignment(.leading)
.fixedSize(horizontal: false, vertical: true)