From 4b38187330ad58faccf2274659cbf89d5eaa639b Mon Sep 17 00:00:00 2001 From: Yu Sung Date: Mon, 24 Mar 2025 10:14:04 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=20=EC=83=81?= =?UTF-8?q?=EB=8B=A8=EC=97=90=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ic_message.imageset/Contents.json | 21 ++++++++++++ .../ic_message.imageset/ic_message.png | Bin 0 -> 1714 bytes .../Recommend/SectionRecommendLiveView.swift | 9 ++++- SodaLive/Sources/Message/MessageView.swift | 32 ++++++++++-------- 4 files changed, 47 insertions(+), 15 deletions(-) create mode 100644 SodaLive/Resources/Assets.xcassets/ic_message.imageset/Contents.json create mode 100644 SodaLive/Resources/Assets.xcassets/ic_message.imageset/ic_message.png 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 0000000000000000000000000000000000000000..30dc94a75fbad0de25337a9d9095a77108cc07e8 GIT binary patch literal 1714 zcmV;j22J^iP)<&UIh&!;h0;dDffxQ)2TS2lFNU0!B1t=BBTfx6G;!e1XKs@FF z$obBhObloSe(pTE16MRL0F;hyb$HLQ;y@y{ymHuc{6mKq6RxhV_B0_^lo&1CwT|v| z_`vZsg<-G5j>EUq!X^wbS7zmDaWAK&}{^j-pb06B`S@;n=+)Ce4jb z;~!c&=E8MY>u^Awtqu=dtV88>tHX-ZmJ~WXhs-M(Ea0X^yii5?T>h#>)MW_TVu4?D z$Y>(iQr(-nrnzFo;$kEPR5TOVN;giCzo)stR`}=?;f!Vq3o38;V~Xl#$Vr*v{FxSl zKG)o_PDN9oGrmJr7fyE~9yA!j9i;?i>ucFeUNk)5s_6--8zPjgvL&Yr!71u-#dJhm zOnulFb4}63bVOXyg@UppAIDg@VYygKba5;*OasI%+u_pc#4bdgdGPL$aEn%Of=~3u zKs6F7ym}_6Ml5~_EfmL)9%&3trK{+T;#6%J4Mp6EoGy%^f{4avSjiM!oq{e5E@^|S zDO7WtdEXzXr59;bv*ma48sIT2k8+yOw&LA4LbO!Rv>^CG*QigCSxnK)eGLQU9Ba2W zOS8rf@gOYdcpQ1+=yQGUz}Z`4Pw^}TU%a)Xj64x(<>wA6_@G;w5d+0@MO=$*IeCJv zx)N2taZ58`qE%@r(&dDAKd5UM*a9R%y`+{5>s($6x-7#4s6G%Ku z&S~DY>{k>3l-6#!mOGLb>%iiXS*WTIB`fA2 znc>uNDFy}VW9aW4$49BMP<75fy`$2%(C~viK{*V|C@#i_@}u>gL^2!6tn@BPpD1|Ke|B51jy5HeBwrFVZP>mjjq9`(`rqd45h2#t~oG+T2mfx*0 zj#S0k_8~9G_Uaz1 zk9nYeqn0*ejjdf2$Nw22&3Mt=!6Z)(wQ$E}!EO6dI(GUzq}nB18EZ9rF_RX1{zK8k zpsc5TpQ&#s9d^R!dz6XYu^`M4Q&A!yCw3b*OaSUn=EjojnLK2Rt$D}W|K&LC%BMOZ zJc2ir4qHF&%s=nsADT}z9k1k1s@B?IyI8wlThR8vJ2CL9BU2V@CGu5f+tDJqFSq04 zRx}-d(fFDA4W%RF__V8qnK)5l*u*Vd%Sd#NTh8;oX{RaP zYQE6KVAvE~G7mcRamGcx(NQ!p=sypsC;=GawI>vxgH`sK8BbZPyRA_iJe#_b&*$6& zHU9;d{m-MnHHshQsqgkVS}b#mgud<=vl0$<@2=Ub&t~h)faG4qYt~};N;uTL_Z7WS zoFYB0cYvx3VyyG6FEbuL+3X~=s3mnFK*;s#sJn@HFGE`jqFxMFwc+i(97L|s2|GuN z`uKM~Z@CK$>Mnyh#Q=4$iA#Ke(nE9+MP^dWi>Wg)#jDC3F{gk3q6geFd7iAK;rD9~ zqn*g2iaOVa^DzXR`a#axI#CXNx8i)CW>qzzeC8vq^Lb8!qW($-d&4uDD>!v5HG)p| zY6rGJDd2(6asCY?PG40GE>8C;tdy&p2QI2_Gn&U#1c3 zE0z8~NyL*R7t#gQhk@)TRph5uTr1m)*aTz2$IrJ+{b8X00r18c%k5w+1poj507*qo IM6N<$g2HYvjsO4v literal 0 HcmV?d00001 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) } }