klaus/sodalive-ios
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(detail): 콘텐츠/시리즈 상세 로딩 실패 시 자동 복귀를 적용한다

Browse Source
This commit is contained in:
Yu Sung
2026-02-26 01:20:37 +09:00
parent db68aa90d2
commit 38fb818f4b
4 changed files with 119 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
SodaLive/Sources/Content/Detail/ContentDetailView.swift
View File

@@ -21,6 +21,8 @@ struct ContentDetailView: View {
@State private var isShowCommentListView = false
@State private var isShowFollowNotifyDialog: Bool = false
@State private var creatorId: Int = 0
@State private var didTriggerAutoBackOnLoadFailure: Bool = false
@State private var isViewVisible: Bool = false
var body: some View {
GeometryReader { proxy in
@@ -28,11 +30,7 @@ struct ContentDetailView: View {
VStack(spacing: 0) {
HStack(spacing: 0) {
Button {
if presentationMode.wrappedValue.isPresented {
presentationMode.wrappedValue.dismiss()
} else {
AppState.shared.back()
}
goBack()
} label: {
Image("ic_back")
.resizable()
@@ -217,9 +215,26 @@ struct ContentDetailView: View {
.navigationTitle("")
.navigationBarBackButtonHidden()
.onAppear {
isViewVisible = true
didTriggerAutoBackOnLoadFailure = false
viewModel.contentId = contentId
AppState.shared.pushAudioContentId = 0
}
.onDisappear {
isViewVisible = false
}
.onChange(of: viewModel.isShowPopup) { isShowing in
guard isShowing else { return }
guard viewModel.audioContent == nil else { return }
guard !didTriggerAutoBackOnLoadFailure else { return }
didTriggerAutoBackOnLoadFailure = true
DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
guard isViewVisible else { return }
goBack()
}
}
if let audioContent = viewModel.audioContent, isShowOrderView {
VStack(spacing: 0) {
@@ -423,7 +438,7 @@ struct ContentDetailView: View {
.padding(.vertical, 13.3)
.frame(width: screenSize().width - 66.7, alignment: .center)
.appFont(size: 12, weight: .medium)
.background(Color(hex: "9970ff"))
.background(Color(hex: "3bb9f1"))
.foregroundColor(Color.white)
.multilineTextAlignment(.center)
.cornerRadius(20)
@@ -434,4 +449,12 @@ struct ContentDetailView: View {
}
}
}
private func goBack() {
if presentationMode.wrappedValue.isPresented {
presentationMode.wrappedValue.dismiss()
} else {
AppState.shared.back()
}
}
}

50
SodaLive/Sources/Content/Series/Detail/SeriesDetailView.swift
View File

@@ -17,6 +17,8 @@ struct SeriesDetailView: View {
@State private var isShowFollowNotifyDialog: Bool = false
@State private var creatorId: Int = 0
@State private var didTriggerAutoBackOnLoadFailure: Bool = false
@State private var isViewVisible: Bool = false
var body: some View {
BaseView(isLoading: $viewModel.isLoading) {
@@ -38,11 +40,7 @@ struct SeriesDetailView: View {
.resizable()
.frame(width: 20, height: 20)
.onTapGesture {
if presentationMode.wrappedValue.isPresented {
presentationMode.wrappedValue.dismiss()
} else {
AppState.shared.back()
}
goBack()
}
Spacer()
@@ -243,9 +241,51 @@ struct SeriesDetailView: View {
.navigationBarBackButtonHidden()
}
.onAppear {
isViewVisible = true
didTriggerAutoBackOnLoadFailure = false
viewModel.seriesId = seriesId
viewModel.getSeriesDetail()
}
.onDisappear {
isViewVisible = false
}
.onChange(of: viewModel.isShowPopup) { isShowing in
guard isShowing else { return }
guard viewModel.seriesDetail == nil else { return }
guard !didTriggerAutoBackOnLoadFailure else { return }
didTriggerAutoBackOnLoadFailure = true
DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
guard isViewVisible else { return }
goBack()
}
}
.popup(isPresented: $viewModel.isShowPopup, type: .toast, position: .top, autohideIn: 2) {
GeometryReader { geo in
HStack {
Spacer()
Text(viewModel.errorMessage)
.padding(.vertical, 13.3)
.frame(width: screenSize().width - 66.7, alignment: .center)
.appFont(size: 12, weight: .medium)
.background(Color(hex: "3bb9f1"))
.foregroundColor(Color.white)
.multilineTextAlignment(.center)
.cornerRadius(20)
.padding(.top, 66.7)
Spacer()
}
}
}
}
private func goBack() {
if presentationMode.wrappedValue.isPresented {
presentationMode.wrappedValue.dismiss()
} else {
AppState.shared.back()
}
}
}