优化相册管理与指定上传弹层展示逻辑。
相册详情网格仅对已购买素材显示角标;指定上传 Sheet 改用 NavigationStack 与系统 navigationTitle。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@ -25,7 +25,7 @@ Android 对照:`zhiflyfollow/.../TravelAlbumDetailScreen.kt`
|
||||
```
|
||||
TravelAlbumDetailInfoCard # 信息卡片:手机号 + 创建时间 + 拨号
|
||||
TravelAlbumDetailPhotoManageCard # 白卡片:Tab / 排序 / 批量选择 + 网格
|
||||
TravelAlbumDetailMaterialGridItem# 缩略图 + 已上传角标 + 文件名 + 大小
|
||||
TravelAlbumDetailMaterialGridItem# 缩略图 + 已购买角标(条件显示)+ 文件名 + 大小
|
||||
BottomBar # 上传照片 + 条件删除选中
|
||||
```
|
||||
|
||||
|
||||
@ -57,15 +57,17 @@ struct TravelAlbumDetailMaterialGridItem: View {
|
||||
}
|
||||
.clipShape(RoundedRectangle(cornerRadius: TravelAlbumDetailDesign.thumbnailCornerRadius))
|
||||
.overlay(alignment: .topLeading) {
|
||||
Text("已上传")
|
||||
if material.isPurchased {
|
||||
Text("已购买")
|
||||
.font(.system(size: 10))
|
||||
.foregroundStyle(.white)
|
||||
.padding(.horizontal, 4)
|
||||
.padding(.vertical, 2)
|
||||
.background(TravelAlbumDetailDesign.uploadedGreen)
|
||||
.background(AppDesign.primary)
|
||||
.clipShape(RoundedRectangle(cornerRadius: TravelAlbumDetailDesign.uploadedBadgeCornerRadius))
|
||||
.padding(4)
|
||||
}
|
||||
}
|
||||
.overlay(alignment: .topTrailing) {
|
||||
if isSelectionMode {
|
||||
Image(systemName: isSelected ? "checkmark.circle.fill" : "circle")
|
||||
|
||||
@ -141,7 +141,7 @@ struct WiredCameraTransferView: View {
|
||||
)
|
||||
}
|
||||
}
|
||||
.presentationDetents([.height(340)])
|
||||
.presentationDetents([.height(360)])
|
||||
.presentationDragIndicator(.hidden)
|
||||
}
|
||||
.sheet(isPresented: $viewModel.showHelpDoc) {
|
||||
|
||||
@ -18,25 +18,15 @@ struct SpecifyUploadBottomSheet: View {
|
||||
]
|
||||
|
||||
var body: some View {
|
||||
NavigationStack {
|
||||
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) {
|
||||
ForEach(options, id: \.self) { option in
|
||||
optionRow(option)
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 16)
|
||||
.padding(.top, 12)
|
||||
|
||||
Spacer(minLength: 20)
|
||||
|
||||
@ -66,6 +56,9 @@ struct SpecifyUploadBottomSheet: View {
|
||||
.padding(.vertical, 12)
|
||||
}
|
||||
.background(WiredTransferDesign.pageBackground)
|
||||
.navigationTitle("指定上传")
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
}
|
||||
.onAppear {
|
||||
selectedOption = options.first ?? WiredCameraTransferViewModel.specifyUploadAllPending
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user