79fc03b52a
- 移除DataMigrationManager类，简化数据迁移逻辑。 - 在FeedListView和MeView中新增图片预览功能，提升用户体验。 - 更新OptimizedDynamicCardView以支持图片点击回调，增强交互性。 - 新增PreviewItem结构体以管理图片预览状态，提升代码可读性与维护性。 - 清理AppDelegate中的冗余代码，优化启动流程。
148 lines
7.2 KiB
Swift
148 lines
7.2 KiB
Swift
import SwiftUI
|
||
import ComposableArchitecture
|
||
|
||
struct FeedListView: View {
|
||
let store: StoreOf<FeedListFeature>
|
||
// 新增：图片预览状态
|
||
@State private var previewItem: PreviewItem? = nil
|
||
|
||
var body: some View {
|
||
WithViewStore(self.store, observe: { $0 }) { viewStore in
|
||
WithPerceptionTracking {
|
||
GeometryReader { geometry in
|
||
ZStack {
|
||
// 背景图片
|
||
Image("bg")
|
||
.resizable()
|
||
.aspectRatio(contentMode: .fill)
|
||
.frame(maxWidth: .infinity, maxHeight: .infinity)
|
||
.clipped()
|
||
.ignoresSafeArea(.all)
|
||
VStack(alignment: .center, spacing: 0) {
|
||
// 顶部栏
|
||
ZStack {
|
||
HStack {
|
||
Spacer(minLength: 0)
|
||
Text(NSLocalizedString("feedList.title", comment: "Enjoy your Life Time"))
|
||
.font(.system(size: 22, weight: .semibold))
|
||
.foregroundColor(.white)
|
||
.frame(maxWidth: .infinity, alignment: .center)
|
||
Spacer(minLength: 0)
|
||
}
|
||
HStack {
|
||
Spacer(minLength: 0)
|
||
Button(action: {
|
||
viewStore.send(.editFeedButtonTapped)
|
||
}) {
|
||
Image("add icon")
|
||
.resizable()
|
||
.frame(width: 40, height: 40)
|
||
}
|
||
}
|
||
}
|
||
|
||
.padding(.horizontal, 20)
|
||
// 其他内容
|
||
Image("Volume")
|
||
.frame(width: 56, height: 41)
|
||
.padding(.top, 16)
|
||
Text(NSLocalizedString("feedList.slogan", comment: "The disease is like a cruel ruler,\nand time is our most precious treasure.\nEvery moment we live is a victory\nagainst the inevitable."))
|
||
.font(.system(size: 16))
|
||
.multilineTextAlignment(.leading)
|
||
.foregroundColor(.white.opacity(0.9))
|
||
.padding(.horizontal, 30)
|
||
.padding(.bottom, 30)
|
||
// 新增：动态内容列表
|
||
if viewStore.isLoading {
|
||
ProgressView()
|
||
.progressViewStyle(CircularProgressViewStyle(tint: .white))
|
||
.padding(.top, 20)
|
||
} else if let error = viewStore.error {
|
||
Text(error)
|
||
.font(.system(size: 14))
|
||
.foregroundColor(.red)
|
||
.multilineTextAlignment(.center)
|
||
.padding(.horizontal, 20)
|
||
.padding(.top, 20)
|
||
} else if viewStore.moments.isEmpty {
|
||
Text(NSLocalizedString("feedList.empty", comment: "暂无动态"))
|
||
.font(.system(size: 16))
|
||
.foregroundColor(.white.opacity(0.7))
|
||
.padding(.top, 20)
|
||
} else {
|
||
ScrollView {
|
||
WithPerceptionTracking {
|
||
LazyVStack(spacing: 16) {
|
||
ForEach(Array(viewStore.moments.enumerated()), id: \ .element.dynamicId) { index, moment in
|
||
OptimizedDynamicCardView(
|
||
moment: moment,
|
||
allMoments: viewStore.moments,
|
||
currentIndex: index,
|
||
onImageTap: { images, tappedIndex in
|
||
previewItem = PreviewItem(images: images, index: tappedIndex)
|
||
}
|
||
)
|
||
// 上拉加载更多触发点
|
||
if index == viewStore.moments.count - 1, viewStore.hasMore, !viewStore.isLoadingMore {
|
||
Color.clear
|
||
.frame(height: 1)
|
||
.onAppear {
|
||
viewStore.send(.loadMore)
|
||
}
|
||
}
|
||
}
|
||
// 加载更多指示器
|
||
if viewStore.isLoadingMore {
|
||
ProgressView()
|
||
.progressViewStyle(CircularProgressViewStyle(tint: .white))
|
||
.padding(.vertical, 8)
|
||
}
|
||
// 新增底部间距
|
||
Color.clear.frame(height: 120)
|
||
}
|
||
.padding(.horizontal, 16)
|
||
.padding(.top, 10)
|
||
.padding(.bottom, 20)
|
||
}
|
||
}
|
||
.refreshable {
|
||
viewStore.send(.reload)
|
||
}
|
||
}
|
||
Spacer()
|
||
}
|
||
.frame(maxWidth: .infinity, alignment: .top)
|
||
}
|
||
}
|
||
.onAppear {
|
||
viewStore.send(.onAppear)
|
||
}
|
||
.onReceive(NotificationCenter.default.publisher(for: Notification.Name("reloadFeedList"))) { _ in
|
||
viewStore.send(.reload)
|
||
}
|
||
.sheet(isPresented: viewStore.binding(
|
||
get: \.isEditFeedPresented,
|
||
send: { $0 ? .editFeedButtonTapped : .editFeedDismissed }
|
||
)) {
|
||
EditFeedView(
|
||
onDismiss: {
|
||
viewStore.send(.editFeedDismissed)
|
||
},
|
||
store: Store(
|
||
initialState: EditFeedFeature.State()
|
||
) {
|
||
EditFeedFeature()
|
||
}
|
||
)
|
||
}
|
||
// 新增：图片预览弹窗
|
||
.fullScreenCover(item: $previewItem) { item in
|
||
ImagePreviewPager(images: item.images, currentIndex: .constant(item.index)) {
|
||
previewItem = nil
|
||
}
|
||
}
|
||
}
|
||
}
|
||
}
|
||
}
|