diff --git a/SodaLive/Sources/Main/Home/BottomTabView.swift b/SodaLive/Sources/Main/Home/BottomTabView.swift index 2af95c1..765fab8 100644 --- a/SodaLive/Sources/Main/Home/BottomTabView.swift +++ b/SodaLive/Sources/Main/Home/BottomTabView.swift @@ -40,31 +40,6 @@ struct BottomTabView: View { width: tabWidth ) - TabButton( - title: "채팅", - action: { - if currentTab != .chat { - currentTab = .chat - } - }, - image: { - currentTab == .chat ? - "ic_chat_selected" : - "ic_chat" - }, - fontName: { - currentTab == .chat ? - Font.bold.rawValue : - Font.medium.rawValue - }, - color: { - currentTab == .chat ? - Color.button : - Color.graybb - }, - width: tabWidth - ) - TabButton( title: "라이브", action: { @@ -90,6 +65,31 @@ struct BottomTabView: View { width: tabWidth ) + TabButton( + title: "채팅", + action: { + if currentTab != .chat { + currentTab = .chat + } + }, + image: { + currentTab == .chat ? + "ic_chat_selected" : + "ic_chat" + }, + fontName: { + currentTab == .chat ? + Font.bold.rawValue : + Font.medium.rawValue + }, + color: { + currentTab == .chat ? + Color.button : + Color.graybb + }, + width: tabWidth + ) + TabButton( title: "마이", action: { diff --git a/SodaLive/Sources/Main/Home/HomeView.swift b/SodaLive/Sources/Main/Home/HomeView.swift index 502f58a..fd7cd6b 100644 --- a/SodaLive/Sources/Main/Home/HomeView.swift +++ b/SodaLive/Sources/Main/Home/HomeView.swift @@ -33,14 +33,14 @@ struct HomeView: View { .frame(width: viewModel.currentTab == .home ? proxy.size.width : 0) .opacity(viewModel.currentTab == .home ? 1.0 : 0.01) - chatTabView - .frame(width: viewModel.currentTab == .chat ? proxy.size.width : 0) - .opacity(viewModel.currentTab == .chat ? 1.0 : 0.01) - liveView .frame(width: viewModel.currentTab == .live ? proxy.size.width : 0) .opacity(viewModel.currentTab == .live ? 1.0 : 0.01) + chatTabView + .frame(width: viewModel.currentTab == .chat ? proxy.size.width : 0) + .opacity(viewModel.currentTab == .chat ? 1.0 : 0.01) + if viewModel.currentTab == .mypage { MyPageView() }