diff --git a/SodaLive/Sources/Content/Main/ContentMainView.swift b/SodaLive/Sources/Content/Main/ContentMainView.swift index 5fc4e5a..edb9df7 100644 --- a/SodaLive/Sources/Content/Main/ContentMainView.swift +++ b/SodaLive/Sources/Content/Main/ContentMainView.swift @@ -57,7 +57,7 @@ struct ContentMainView: View { .strokeBorder(lineWidth: 1) .foregroundColor(Color.graybb) ) - .padding(.bottom, 26.7) + .padding(.bottom, 40) .padding(.horizontal, 13.3) .onTapGesture { UserDefaults.set("", forKey: .searchChannel) @@ -65,7 +65,7 @@ struct ContentMainView: View { } ContentMainCreatorRankingView() - .padding(.bottom, 26.7) + .padding(.bottom, 40) .padding(.horizontal, 13.3) ContentMainRecommendSeriesView() diff --git a/SodaLive/Sources/SearchChannel/SearchChannelView.swift b/SodaLive/Sources/SearchChannel/SearchChannelView.swift index abb3736..5c35f49 100644 --- a/SodaLive/Sources/SearchChannel/SearchChannelView.swift +++ b/SodaLive/Sources/SearchChannel/SearchChannelView.swift @@ -16,52 +16,41 @@ struct SearchChannelView: View { var body: some View { BaseView(isLoading: $viewModel.isLoading) { VStack(spacing: 0) { + DetailNavigationBar(title: "채널 탐색") + HStack(spacing: 0) { - Image("ic_back") - .resizable() - .frame(width: 20, height: 20) - .padding(13.3) - .onTapGesture { - AppState.shared.back() - } + Image("ic_title_search_black") - HStack(spacing: 0) { - Image("ic_title_search_black") - - FocusedTextField( - text: $viewModel.channel, - isFirstResponder: isFocused - ) - .padding(.horizontal, 13.3) - .onAppear { - DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) { - isFocused = true - } - } - - if !viewModel.channel.isEmpty { - Image("ic_close_white") - .resizable() - .frame(width: 20, height: 20) - .onTapGesture { - viewModel.channel = "" - } + FocusedTextField( + text: $viewModel.channel, + isFirstResponder: isFocused + ) + .padding(.horizontal, 13.3) + .onAppear { + DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) { + isFocused = true } } - .padding(.horizontal, 21.3) - .frame(height: 50) - .frame(maxWidth: .infinity) - .background(Color.gray22) - .overlay( - RoundedRectangle(cornerRadius: 6.7) - .strokeBorder(lineWidth: 1) - .foregroundColor(Color.graybb) - ) + + if !viewModel.channel.isEmpty { + Image("ic_close_white") + .resizable() + .frame(width: 20, height: 20) + .onTapGesture { + viewModel.channel = "" + } + } } - .padding(.horizontal, 13.3) + .padding(.horizontal, 21.3) .frame(height: 50) - .background(Color.black) - .padding(.top, 13.3) + .frame(maxWidth: .infinity) + .background(Color.gray22) + .overlay( + RoundedRectangle(cornerRadius: 6.7) + .strokeBorder(lineWidth: 1) + .foregroundColor(Color.graybb) + ) + .padding(.horizontal, 13.3) ScrollView(.vertical, showsIndicators: false) { if viewModel.channelResponses.count > 0 { @@ -91,13 +80,12 @@ struct SearchChannelView: View { Text("검색 결과가 없습니다.") .font(.custom(Font.medium.rawValue, size: 18.3)) .foregroundColor(.white) - .padding(.top, 40) + .padding(.top, 20) } } - .padding(.vertical, 40) - .padding(.horizontal, 26.7) + .padding(.vertical, 20) + .padding(.horizontal, 13.3) } - .padding(.horizontal, 13.3) .popup(isPresented: $viewModel.isShowPopup, type: .toast, position: .top, autohideIn: 2) { GeometryReader { geo in HStack {