From 8070fa3bef7ca9e9fee4491c7d81f65c3781c22e Mon Sep 17 00:00:00 2001 From: Yu Sung Date: Sat, 22 Feb 2025 09:12:34 +0900 Subject: [PATCH] =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=20=EB=8B=A4=EC=8B=9C=EB=93=A3=EA=B8=B0=20=ED=83=AD=20?= =?UTF-8?q?-=20=EC=83=88=EB=A1=9C=EC=9A=B4=20=EB=8B=A4=EC=8B=9C=EB=93=A3?= =?UTF-8?q?=EA=B8=B0=20=EC=A0=84=EC=B2=B4=EB=B3=B4=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SodaLive/Sources/App/AppStep.swift | 2 + .../V2/Asmr/All/ContentMainAsmrAllView.swift | 1 + .../Replay/All/ContentMainReplayAllView.swift | 76 +++++++++++++++++++ .../V2/Replay/ContentMainTabReplayView.swift | 5 +- SodaLive/Sources/ContentView.swift | 3 + 5 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 SodaLive/Sources/Content/Main/V2/Replay/All/ContentMainReplayAllView.swift diff --git a/SodaLive/Sources/App/AppStep.swift b/SodaLive/Sources/App/AppStep.swift index 568de4a..c355d28 100644 --- a/SodaLive/Sources/App/AppStep.swift +++ b/SodaLive/Sources/App/AppStep.swift @@ -149,4 +149,6 @@ enum AppStep { case newAlarmContentAll case newAsmrContentAll + + case newReplayContentAll } diff --git a/SodaLive/Sources/Content/Main/V2/Asmr/All/ContentMainAsmrAllView.swift b/SodaLive/Sources/Content/Main/V2/Asmr/All/ContentMainAsmrAllView.swift index 1c0f612..6f34371 100644 --- a/SodaLive/Sources/Content/Main/V2/Asmr/All/ContentMainAsmrAllView.swift +++ b/SodaLive/Sources/Content/Main/V2/Asmr/All/ContentMainAsmrAllView.swift @@ -66,6 +66,7 @@ struct ContentMainAsmrAllView: View { viewModel.selectedTheme = "ASMR" } } + .navigationBarHidden(true) } } } diff --git a/SodaLive/Sources/Content/Main/V2/Replay/All/ContentMainReplayAllView.swift b/SodaLive/Sources/Content/Main/V2/Replay/All/ContentMainReplayAllView.swift new file mode 100644 index 0000000..6b0460e --- /dev/null +++ b/SodaLive/Sources/Content/Main/V2/Replay/All/ContentMainReplayAllView.swift @@ -0,0 +1,76 @@ +// +// ContentMainReplayAllView.swift +// SodaLive +// +// Created by klaus on 2/22/25. +// + +import SwiftUI + +struct ContentMainReplayAllView: View { + + @StateObject var viewModel = ContentNewAllViewModel() + + let columns = [ + GridItem(.flexible(), alignment: .top), + GridItem(.flexible(), alignment: .top), + GridItem(.flexible(), alignment: .top) + ] + + var body: some View { + NavigationView { + BaseView(isLoading: $viewModel.isLoading) { + VStack(alignment: .leading, spacing: 13.3) { + DetailNavigationBar(title: "새로운 라이브 다시듣기") + + Text("※ 최근 2주간 등록된 새로운 라이브 다시듣기 입니다.") + .font(.custom(Font.medium.rawValue, size: 14.7)) + .foregroundColor(.graybb) + .padding(.horizontal, 13.3) + .padding(.vertical, 8) + .frame(width: screenSize().width, alignment: .leading) + .background(Color.gray22) + + HStack(spacing: 0) { + Text("전체") + .font(.custom(Font.medium.rawValue, size: 13.3)) + .foregroundColor(Color(hex: "e2e2e2")) + + Text("\(viewModel.totalCount)") + .font(.custom(Font.medium.rawValue, size: 13.3)) + .foregroundColor(Color(hex: "ff5c49")) + .padding(.leading, 8) + + Text("개") + .font(.custom(Font.medium.rawValue, size: 13.3)) + .foregroundColor(Color(hex: "e2e2e2")) + .padding(.leading, 2) + } + .padding(.horizontal, 13.3) + + ScrollView(.vertical, showsIndicators: false) { + LazyVGrid(columns: columns, spacing: 32) { + ForEach(0..