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 0000000..be44b2a Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_audition_normal.imageset/ic_tabbar_audition_normal.png differ 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 0000000..0c15f1c Binary files /dev/null and b/SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_audition_selected.imageset/ic_tabbar_audition_selected.png differ diff --git a/SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_explorer_normal.imageset/ic_tabbar_explorer_normal.png b/SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_explorer_normal.imageset/ic_tabbar_explorer_normal.png deleted file mode 100644 index 75d9c45..0000000 Binary files a/SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_explorer_normal.imageset/ic_tabbar_explorer_normal.png and /dev/null differ 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 4c85af2..0000000 Binary files a/SodaLive/Resources/Assets.xcassets/tab/ic_tabbar_explorer_selected.imageset/ic_tabbar_explorer_selected.png and /dev/null differ 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