diff --git a/SodaLive/Sources/Content/All/ContentNewAllView.swift b/SodaLive/Sources/Content/All/ContentNewAllView.swift index b5d434f..94f9dd6 100644 --- a/SodaLive/Sources/Content/All/ContentNewAllView.swift +++ b/SodaLive/Sources/Content/All/ContentNewAllView.swift @@ -20,17 +20,16 @@ struct ContentNewAllView: View { var body: some View { NavigationView { BaseView(isLoading: $viewModel.isLoading) { - VStack(alignment: .leading, spacing: 0) { - DetailNavigationBar(title: "새로운 콘텐츠") + VStack(alignment: .leading, spacing: 13.3) { + DetailNavigationBar(title: "새로운 단편") - Text("※ 최근 2주간 등록된 새로운 콘텐츠 입니다.") + Text("※ 최근 2주간 등록된 새로운 단편 입니다.") .font(.custom(Font.medium.rawValue, size: 14.7)) - .foregroundColor(Color(hex: "bbbbbb")) + .foregroundColor(.graybb) .padding(.horizontal, 13.3) .padding(.vertical, 8) .frame(width: screenSize().width, alignment: .leading) - .background(Color(hex: "222222")) - .padding(.top, 13.3) + .background(Color.gray22) ContentMainNewContentThemeView( themes: viewModel.themeList, @@ -38,7 +37,8 @@ struct ContentNewAllView: View { viewModel.selectedTheme = $0 }, selectedTheme: $viewModel.selectedTheme - ).padding(.top, 13.3) + ) + .padding(.horizontal, 13.3) HStack(spacing: 0) { Text("전체") @@ -55,8 +55,7 @@ struct ContentNewAllView: View { .foregroundColor(Color(hex: "e2e2e2")) .padding(.leading, 2) } - .padding(.vertical, 13.3) - .padding(.horizontal, 20) + .padding(.horizontal, 13.3) ScrollView(.vertical, showsIndicators: false) { LazyVGrid(columns: columns, spacing: 32) { @@ -69,6 +68,7 @@ struct ContentNewAllView: View { } } } + .padding(.horizontal, 13.3) } } .onAppear { diff --git a/SodaLive/Sources/Content/Main/V2/Content/ContentMainTabContentView.swift b/SodaLive/Sources/Content/Main/V2/Content/ContentMainTabContentView.swift index 9357aed..d3c4e6b 100644 --- a/SodaLive/Sources/Content/Main/V2/Content/ContentMainTabContentView.swift +++ b/SodaLive/Sources/Content/Main/V2/Content/ContentMainTabContentView.swift @@ -23,7 +23,10 @@ struct ContentMainTabContentView: View { if !viewModel.contentThemeList.isEmpty { ContentMainNewContentViewV2( title: "새로운 단편", - onClickMore: {}, + onClickMore: { + AppState.shared + .setAppStep(step: .newContentAll) + }, themeList: viewModel.contentThemeList, contentList: viewModel.newContentList ) {