From 5c3bf18d2748fd228a96e722d5a3b636d000c91b Mon Sep 17 00:00:00 2001 From: Yu Sung Date: Sun, 5 Jan 2025 18:25:35 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A9=94=EC=9D=B8=20-=20=EC=98=A4=EB=94=94?= =?UTF-8?q?=EC=85=98=20=ED=83=AD=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Contents.json | 2 +- .../ic_tabbar_audition_normal.png | Bin 0 -> 1693 bytes .../Contents.json | 2 +- .../ic_tabbar_audition_selected.png | Bin 0 -> 1844 bytes .../ic_tabbar_explorer_normal.png | Bin 1508 -> 0 bytes .../ic_tabbar_explorer_selected.png | Bin 1619 -> 0 bytes SodaLive/Sources/Audition/AuditionView.swift | 18 +++++++++ .../Sources/Main/Home/BottomTabView.swift | 38 +++++++++--------- SodaLive/Sources/Main/Home/HomeView.swift | 8 ++-- .../Sources/Main/Home/HomeViewModel.swift | 2 +- 10 files changed, 44 insertions(+), 26 deletions(-) rename SodaLive/Resources/Assets.xcassets/tab/{ic_tabbar_explorer_normal.imageset => ic_tabbar_audition_normal.imageset}/Contents.json (83%) create mode 100644 SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_audition_normal.imageset/ic_tabbar_audition_normal.png rename SodaLive/Resources/Assets.xcassets/tab/{ic_tabbar_explorer_selected.imageset => ic_tabbar_audition_selected.imageset}/Contents.json (83%) create mode 100644 SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_audition_selected.imageset/ic_tabbar_audition_selected.png delete mode 100644 SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_explorer_normal.imageset/ic_tabbar_explorer_normal.png delete mode 100644 SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_explorer_selected.imageset/ic_tabbar_explorer_selected.png create mode 100644 SodaLive/Sources/Audition/AuditionView.swift diff --git a/SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_explorer_normal.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_audition_normal.imageset/Contents.json similarity index 83% rename from SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_explorer_normal.imageset/Contents.json rename to SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_audition_normal.imageset/Contents.json index f7f4095..fba5dde 100644 --- a/SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_explorer_normal.imageset/Contents.json +++ b/SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_audition_normal.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "ic_tabbar_explorer_normal.png", + "filename" : "ic_tabbar_audition_normal.png", "idiom" : "universal", "scale" : "3x" } diff --git a/SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_audition_normal.imageset/ic_tabbar_audition_normal.png b/SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_audition_normal.imageset/ic_tabbar_audition_normal.png new file mode 100644 index 0000000000000000000000000000000000000000..be44b2a0da33a8ffde575ce3abf03e0b9c08b706 GIT binary patch literal 1693 zcmV;O24eY%P)+2FCM~)mha^%R7HLk9%YVCHrrfQz6If{rvH+VC8k6Mpu>27efhx{M`Y8*8Tnck7~8r_j%vt z_m~J*@MstPAgIG1exB`)01%;WKEXv zHfhtm#rZc==L}Q$&pDT6=vf|zH@3lB!_Za@hf;VAVGd!2Bb~#9k098d;T0X+zr&F! zWI*uY;h~cSS^5SaUqE;fmgYGiK~px(IVq@4wj*MMskmfeO(!oeFTZhG7as5;3`bSL z+#Os)Lv=&PHBC@rKTeoRLY9dNEe1+y_-MHxJOHw_@SNJ!lX|%ht*iIYZg-qy=|E*x zMiilxZQ%hYVM(SucmPW{y$u%)>dJ`o8-kt+Pb6_r)6>%}@h8~{u_Qd;BusNwuOY~Y zcJ)wYi>W3g^~TbC2W=pOmxg`ja78)q>(0k#eyd<2B3DNwR@R(c+|ct=k*~;#imQU+ zBn;seluMH!TgrLgwrH0XkR}BLDN_@tgTmk*YJ`T`&d$zqAbTPLPLtNt$f*B?c|Za% zB^CCp%gY<1{4?}CYhv2<-@*YWVJ)-zZD^wYe`k7!KFudRRf-3|>|!Sc5;bylZlLz9tbQ(rJs62V;Gpo0WrZD zhb5t~(|q$E9kpM=G!VUQUT z4%(@x*G%!WbhC1Pe!eGCfJq7t>L40Kw_y=pDBc~>~j-Nc)*J=<|!SE>a9=oHgrDvz);i7lzjGWsWFy+g|=A1uWHh+W&thV5|4Kg z42b+0Y%$mwDX=i-l?TD8Feldp_!)1Tw&gIj=Ck$h(gc@O1H-HFN+0wY)0F< zh=JH!Ep#eEnP;xg43r(grHDm>bEnZz8L`&IqmXEC310J772fCD3ZmI;7U$>Z2iXx9 z71(R)yS7tJWMy5vE@C3l?je(Q5NvB2>oZ++eWnlxYL!I2pOh?-cz@VJI#|qORkI)G z!xSBoXpIA?d+#)4iBw+zkTha6H88TMAaTZJ2a z&19}S*jFNOkIBgbj*GazWm`}4c^r1rZlneBh>Rdj{K&UH>QY9 literal 0 HcmV?d00001 diff --git a/SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_explorer_selected.imageset/Contents.json b/SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_audition_selected.imageset/Contents.json similarity index 83% rename from SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_explorer_selected.imageset/Contents.json rename to SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_audition_selected.imageset/Contents.json index 7b4fa2f..6331d40 100644 --- a/SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_explorer_selected.imageset/Contents.json +++ b/SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_audition_selected.imageset/Contents.json @@ -9,7 +9,7 @@ "scale" : "2x" }, { - "filename" : "ic_tabbar_explorer_selected.png", + "filename" : "ic_tabbar_audition_selected.png", "idiom" : "universal", "scale" : "3x" } diff --git a/SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_audition_selected.imageset/ic_tabbar_audition_selected.png b/SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_audition_selected.imageset/ic_tabbar_audition_selected.png new file mode 100644 index 0000000000000000000000000000000000000000..0c15f1cc408ae99ffc1aa0e5e52ae6b48c697ca7 GIT binary patch literal 1844 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 KMNUMnLSTXmce!`~ diff --git a/SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_explorer_selected.imageset/ic_tabbar_explorer_selected.png b/SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_explorer_selected.imageset/ic_tabbar_explorer_selected.png deleted file mode 100644 index 4c85af2c36bf61f101192c1a87a9bdfec460a016..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1619 zcmV-Z2CVssP)y|7l_XN!N^J;8^oPVbp*JMdnEnBc-2+Dw`UemjapFJ% z5`^XuTu1_^lAe0>@)tM>DiqqC$D4Ih-0bXncf9Km$scL6v1fmM{bt_0_htdQbm`Ki z%l{XI6c}5p4-<$

Pwa_Q0#3KJY1IbY1$10^Iye+|Rt^F}4KozYl+M1fH z)Pb@0lF)D z!GwXN#cEgxoIDA&o)cw-Cga+IQvAw{&Mdj!;YD49Gnl9ac=f>6N%p^G~PTB$fbC1B03vahgO+4RUhL{8j9{a8y5CvfoI>-ihZ9-W! zSsBd+2_;Z4NywYN*SRZn7zHlz_N}2Qx9?{n6DSx_PWr#3YNrzQW{A9P#ndJ;@+`z4 zSTIn|cVn(lz!9K5wv@s#O;O~!LlA>tr-i1u*BA(N2J$xN(6=Z+ya_Q7Avf@4E=bT; ztlSQy`y8MHZIXdw0x4JTc2Tqp4nsLMf(1&wJJaafZCod)Az-}b;Hcp7#G7xJ5jGJNQ>p0R$17zA6Gls~{gb1;%N95Ztqsq&^aNw5tu2=mgW3*~In zvUcE@S;x)BYD?yELV{16G)Fc{K%UFA&?#QO@rgIv^7fvukt4sjWu-vDoP_Tf19lK| z{3ngVyOEctKjdFo%^DIJu0e=0#3Xc5aWzLiJrtnw2|{*8q(+2=&& zCx}U?;ND&+vo-z76zRgi`Ex0XKK=d;IQ7OD8y4q{X(}(g*(5Tdg1v72RGE@*?oC1$ z(uUFy-8V7~uU#*pQ0fX73g-=na9P0oT&;*yrX9b#dmnVY*v~eXOt102rZbu(&`#== zcRxZxmkSVL-4N5$eznwUy(yAlZ#jg-{ea^gy~-zrta0fFtm!)q`7a;BlNU0&8_xi` z3js?ne4l|=!IDUk_|~QDHhYMmC5{}Ia@To3JHEDuHeFm>b^NP`I-KQhLJRDUmIB1; zm4`dyclW@SSc_>BKhzfpMIrcVSax0aHW$hrJ!!BPg|M!!J-y0gII3{D)=#tA8%J18 z)Is$Jysy~wsMyP;Jf4?$Hye6TXN4@0De6n+5Oa0s;#j^vXwvUUad*O0<<=&G`5A0%TY;K{D>yk4}6Y z{!`(H)Ke3hkBKMRx_q$tPIl3C)hLI3WoS1mKMV&uoE?>V{`9V2BIPZ&knu<$J;Y|B zIx=euH={EsLcGOeH{ZrJb=hi%o~jCGMxQlDQDY6yKZ}iEr!7k-BKQDZ6z4+BJdf|m zCT|;bkN+&j3+hVXO7A1}MNsyWl;}hSH>1V#>ff-dxJp4Vzz;g`?8%hcrHpW-s~+fl zHfo9&RWwg?m5qSuFg3wx5k)kQ{|hX*YC6BYn&%O))v#PS%#o24p9Y;!9CiY8yN z?-|EZuqH$_>DMuW&O5e(HCnV3P!^!Bk@r%nj^NqjD@x?8y)Iq4bm`J*{sl`bcXc^8 Rni&89002ovPDHLkV1i&p@K^u< diff --git a/SodaLive/Sources/Audition/AuditionView.swift b/SodaLive/Sources/Audition/AuditionView.swift new file mode 100644 index 0000000..61e6656 --- /dev/null +++ b/SodaLive/Sources/Audition/AuditionView.swift @@ -0,0 +1,18 @@ +// +// AuditionView.swift +// SodaLive +// +// Created by klaus on 1/5/25. +// + +import SwiftUI + +struct AuditionView: View { + var body: some View { + Text("오디션") + } +} + +#Preview { + AuditionView() +} diff --git a/SodaLive/Sources/Main/Home/BottomTabView.swift b/SodaLive/Sources/Main/Home/BottomTabView.swift index b137a63..e13217a 100644 --- a/SodaLive/Sources/Main/Home/BottomTabView.swift +++ b/SodaLive/Sources/Main/Home/BottomTabView.swift @@ -34,8 +34,8 @@ struct BottomTabView: View { }, color: { currentTab == .content ? - Color(hex: "3bb9f1") : - Color(hex: "bbbbbb") + Color.button : + Color.graybb }, width: tabWidth ) @@ -59,33 +59,33 @@ struct BottomTabView: View { }, color: { currentTab == .live ? - Color(hex: "3bb9f1") : - Color(hex: "bbbbbb") + Color.button : + Color.graybb }, width: tabWidth ) TabButton( - title: "탐색", + title: "오디션", action: { - if currentTab != .explorer { - currentTab = .explorer + if currentTab != .audition { + currentTab = .audition } }, image: { - currentTab == .explorer ? - "ic_tabbar_explorer_selected" : - "ic_tabbar_explorer_normal" + currentTab == .audition ? + "ic_tabbar_audition_selected" : + "ic_tabbar_audition_normal" }, fontName: { - currentTab == .explorer ? + currentTab == .audition ? Font.bold.rawValue : Font.medium.rawValue }, color: { - currentTab == .explorer ? - Color(hex: "3bb9f1") : - Color(hex: "bbbbbb") + currentTab == .audition ? + Color.button : + Color.graybb }, width: tabWidth ) @@ -109,8 +109,8 @@ struct BottomTabView: View { }, color: { currentTab == .message ? - Color(hex: "3bb9f1") : - Color(hex: "bbbbbb") + Color.button : + Color.graybb }, width: tabWidth ) @@ -134,13 +134,13 @@ struct BottomTabView: View { }, color: { currentTab == .mypage ? - Color(hex: "3bb9f1") : - Color(hex: "bbbbbb") + Color.button : + Color.graybb }, width: tabWidth ) } - .background(Color(hex: "111111")) + .background(Color.gray11) } } diff --git a/SodaLive/Sources/Main/Home/HomeView.swift b/SodaLive/Sources/Main/Home/HomeView.swift index 0580752..f774917 100644 --- a/SodaLive/Sources/Main/Home/HomeView.swift +++ b/SodaLive/Sources/Main/Home/HomeView.swift @@ -21,7 +21,7 @@ struct HomeView: View { @StateObject var contentPlayerPlayManager = ContentPlayerPlayManager.shared private let liveView = LiveView() - private let explorer = ExplorerView() + private let audition = AuditionView() private let messageView = MessageView() private let contentView = ContentMainView() @@ -40,9 +40,9 @@ struct HomeView: View { .frame(width: viewModel.currentTab == .live ? proxy.size.width : 0) .opacity(viewModel.currentTab == .live ? 1.0 : 0.01) - explorer - .frame(width: viewModel.currentTab == .explorer ? proxy.size.width : 0) - .opacity(viewModel.currentTab == .explorer ? 1.0 : 0.01) + audition + .frame(width: viewModel.currentTab == .audition ? proxy.size.width : 0) + .opacity(viewModel.currentTab == .audition ? 1.0 : 0.01) messageView .frame(width: viewModel.currentTab == .message ? proxy.size.width : 0) diff --git a/SodaLive/Sources/Main/Home/HomeViewModel.swift b/SodaLive/Sources/Main/Home/HomeViewModel.swift index 8132058..729e3db 100644 --- a/SodaLive/Sources/Main/Home/HomeViewModel.swift +++ b/SodaLive/Sources/Main/Home/HomeViewModel.swift @@ -21,7 +21,7 @@ final class HomeViewModel: ObservableObject { private let playbackTrackingRepository = PlaybackTrackingRepository() enum CurrentTab: String { - case content, live, explorer, message, mypage + case content, live, audition, message, mypage } @Published var currentTab: CurrentTab = .content