优化相册管理与指定上传弹层展示逻辑。

相册详情网格仅对已购买素材显示角标;指定上传 Sheet 改用 NavigationStack 与系统 navigationTitle。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-06-30 14:00:46 +08:00
parent 5e620623eb
commit 28db8b3182
4 changed files with 44 additions and 49 deletions

View File

@ -25,7 +25,7 @@ Android 对照:`zhiflyfollow/.../TravelAlbumDetailScreen.kt`
``` ```
TravelAlbumDetailInfoCard # 信息卡片:手机号 + 创建时间 + 拨号 TravelAlbumDetailInfoCard # 信息卡片:手机号 + 创建时间 + 拨号
TravelAlbumDetailPhotoManageCard # 白卡片Tab / 排序 / 批量选择 + 网格 TravelAlbumDetailPhotoManageCard # 白卡片Tab / 排序 / 批量选择 + 网格
TravelAlbumDetailMaterialGridItem# 缩略图 + 已上传角标 + 文件名 + 大小 TravelAlbumDetailMaterialGridItem# 缩略图 + 已购买角标(条件显示)+ 文件名 + 大小
BottomBar # 上传照片 + 条件删除选中 BottomBar # 上传照片 + 条件删除选中
``` ```

View File

@ -57,15 +57,17 @@ struct TravelAlbumDetailMaterialGridItem: View {
} }
.clipShape(RoundedRectangle(cornerRadius: TravelAlbumDetailDesign.thumbnailCornerRadius)) .clipShape(RoundedRectangle(cornerRadius: TravelAlbumDetailDesign.thumbnailCornerRadius))
.overlay(alignment: .topLeading) { .overlay(alignment: .topLeading) {
Text("已上传") if material.isPurchased {
Text("已购买")
.font(.system(size: 10)) .font(.system(size: 10))
.foregroundStyle(.white) .foregroundStyle(.white)
.padding(.horizontal, 4) .padding(.horizontal, 4)
.padding(.vertical, 2) .padding(.vertical, 2)
.background(TravelAlbumDetailDesign.uploadedGreen) .background(AppDesign.primary)
.clipShape(RoundedRectangle(cornerRadius: TravelAlbumDetailDesign.uploadedBadgeCornerRadius)) .clipShape(RoundedRectangle(cornerRadius: TravelAlbumDetailDesign.uploadedBadgeCornerRadius))
.padding(4) .padding(4)
} }
}
.overlay(alignment: .topTrailing) { .overlay(alignment: .topTrailing) {
if isSelectionMode { if isSelectionMode {
Image(systemName: isSelected ? "checkmark.circle.fill" : "circle") Image(systemName: isSelected ? "checkmark.circle.fill" : "circle")

View File

@ -141,7 +141,7 @@ struct WiredCameraTransferView: View {
) )
} }
} }
.presentationDetents([.height(340)]) .presentationDetents([.height(360)])
.presentationDragIndicator(.hidden) .presentationDragIndicator(.hidden)
} }
.sheet(isPresented: $viewModel.showHelpDoc) { .sheet(isPresented: $viewModel.showHelpDoc) {

View File

@ -18,25 +18,15 @@ struct SpecifyUploadBottomSheet: View {
] ]
var body: some View { var body: some View {
NavigationStack {
VStack(spacing: 0) { VStack(spacing: 0) {
ZStack {
Button("取消") { isPresented = false }
.font(.system(size: 16))
.foregroundStyle(AppDesign.primary)
.frame(maxWidth: .infinity, alignment: .leading)
Text("指定上传")
.font(.system(size: 17, weight: .semibold))
.foregroundStyle(WiredTransferDesign.text333)
}
.padding(.horizontal, 16)
.frame(height: 52)
VStack(spacing: 12) { VStack(spacing: 12) {
ForEach(options, id: \.self) { option in ForEach(options, id: \.self) { option in
optionRow(option) optionRow(option)
} }
} }
.padding(.horizontal, 16) .padding(.horizontal, 16)
.padding(.top, 12)
Spacer(minLength: 20) Spacer(minLength: 20)
@ -66,6 +56,9 @@ struct SpecifyUploadBottomSheet: View {
.padding(.vertical, 12) .padding(.vertical, 12)
} }
.background(WiredTransferDesign.pageBackground) .background(WiredTransferDesign.pageBackground)
.navigationTitle("指定上传")
.navigationBarTitleDisplayMode(.inline)
}
.onAppear { .onAppear {
selectedOption = options.first ?? WiredCameraTransferViewModel.specifyUploadAllPending selectedOption = options.first ?? WiredCameraTransferViewModel.specifyUploadAllPending
} }