diff --git a/SodaLive/Resources/Assets.xcassets/ic_message.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/ic_message.imageset/Contents.json new file mode 100644 index 0000000..598b8f4 --- /dev/null +++ b/SodaLive/Resources/Assets.xcassets/ic_message.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ic_message.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/SodaLive/Resources/Assets.xcassets/ic_message.imageset/ic_message.png b/SodaLive/Resources/Assets.xcassets/ic_message.imageset/ic_message.png new file mode 100644 index 0000000..30dc94a Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/ic_message.imageset/ic_message.png differ diff --git a/SodaLive/Sources/Live/Recommend/SectionRecommendLiveView.swift b/SodaLive/Sources/Live/Recommend/SectionRecommendLiveView.swift index c8c4a1f..759a3a2 100644 --- a/SodaLive/Sources/Live/Recommend/SectionRecommendLiveView.swift +++ b/SodaLive/Sources/Live/Recommend/SectionRecommendLiveView.swift @@ -23,7 +23,14 @@ struct SectionRecommendLiveView: View { Text("라이브") .font(.custom(Font.bold.rawValue, size: 18.3)) - .foregroundColor(Color(hex: "eeeeee")) + .foregroundColor(.grayee) + + Spacer() + + Image("ic_message") + .onTapGesture { + AppState.shared.setAppStep(step: .message) + } } .frame(width: screenSize().width - 26.7, alignment: .leading) diff --git a/SodaLive/Sources/Message/MessageView.swift b/SodaLive/Sources/Message/MessageView.swift index fb080a3..7bad883 100644 --- a/SodaLive/Sources/Message/MessageView.swift +++ b/SodaLive/Sources/Message/MessageView.swift @@ -13,24 +13,28 @@ struct MessageView: View { var body: some View { GeometryReader { geo in - VStack { - HomeNavigationBar(title: "메시지") {} + ZStack { + Color.black - Tab() - - Text("※ 보관하지 않은 받은 메시지는 3일 후, 자동 삭제됩니다.") - .font(.custom(Font.medium.rawValue, size: 13.3)) - .padding(.top, 20) - - switch viewModel.currentTab { - case .text: - TextMessageView() + VStack { + DetailNavigationBar(title: "메시지") - case .voice: - VoiceMessageView() + Tab() + + Text("※ 보관하지 않은 받은 메시지는 3일 후, 자동 삭제됩니다.") + .font(.custom(Font.medium.rawValue, size: 13.3)) + .padding(.top, 20) + + switch viewModel.currentTab { + case .text: + TextMessageView() + + case .voice: + VoiceMessageView() + } } + .frame(width: geo.size.width, height: geo.size.height) } - .frame(width: geo.size.width, height: geo.size.height) } }