40155de709
feat(AI): 优化AIRuntime任务取消机制并增强安全保护 - 在AI推理流中添加Task.checkCancellation()检查，使消费者取消时能快速退出 - 为异步流添加onTermination回调以取消内部Task，与LLMSession一致 - 实现SwiftData store的completeUnlessOpen文件保护，提升数据安全性 - 在store备份过程中同样应用加密保护 feat(home): 优化主页交互体验并统一详情查看功能 - 在主页"最近记录"中点击任意条目可打开只读详情sheet - 将时间线详情解析逻辑统一收敛到TimelineDetail.resolve方法 - 修复血压条目的精确反查逻辑，避免时间窗匹配错误 feat(archive): 新增提醒任务汇总卡并完善档案库功能 - 在档案库页面新增提醒任务汇总卡，显示总数和启用状态 - 添加按更新时间倒序合并的提醒标题预览功能 - 实现RemindersListView导航路由，统一管理提醒任务 - 优化导出列表显示，优先使用中文标签展示 feat(me): 优化个人中心界面并改进语言设置体验 - 将个人中心标题改为内容文字渲染，解决导航栏背景问题 - 为语言选择器添加个性化图标，使用本族语代表字区分 - 修复语言设置视图的图标显示逻辑 feat(timeline): 新增记录详情页删除功能并优化图表显示 - 在时间线详情页添加永久删除按钮和确认弹窗 - 实现完整的删除逻辑，包括SwiftData硬删和Vault原图unlink - 修复系列图表的数值范围计算，处理同值数据的对称留白 - 优化血压图表合并逻辑，只保留有数据点的线条 refactor(calendar): 修复DST切换导致的月份天数计算错误 - 使用calendar.range(of:.day,in:.month)替代日期间隔计算 - 避免在夏令时切换月份出现天数偏差问题 fix(ui): 修复多个UI组件的交互响应区域问题 - 为纯描边按钮和胶囊添加contentShape以扩大点击区域 - 修复提醒行展开按钮尺寸，保证不同提醒类型的垂直对齐 ```
339 lines
12 KiB
Swift
339 lines
12 KiB
Swift
import SwiftUI
|
||
import SwiftData
|
||
|
||
struct RemindersListView: View {
|
||
@Environment(\.modelContext) private var ctx
|
||
@Environment(\.dismiss) private var dismiss
|
||
@Query(sort: \CustomReminder.updatedAt, order: .reverse)
|
||
private var customReminders: [CustomReminder]
|
||
@Query(sort: \MetricReminder.updatedAt, order: .reverse)
|
||
private var reminders: [MetricReminder]
|
||
|
||
/// 以 sheet 形态呈现(从「新建」入口进入)时补一个「完成」按钮关闭;
|
||
/// push 形态有系统返回,默认 false。
|
||
var presentedAsSheet = false
|
||
|
||
@State private var editingId: String?
|
||
@State private var creatingNew = false
|
||
@State private var editingCustom: CustomReminder?
|
||
|
||
private var isEmpty: Bool { customReminders.isEmpty && reminders.isEmpty }
|
||
|
||
var body: some View {
|
||
ScrollView {
|
||
VStack(alignment: .leading, spacing: 12) {
|
||
header
|
||
createButton
|
||
|
||
if isEmpty {
|
||
emptyState
|
||
} else {
|
||
ForEach(customReminders) { r in
|
||
CustomReminderRow(
|
||
reminder: r,
|
||
onTapEdit: { editingCustom = r },
|
||
onToggle: { Task { await syncCustom(r) } }
|
||
)
|
||
}
|
||
|
||
if !reminders.isEmpty {
|
||
sectionLabel(String(appLoc: "指标记录提醒"))
|
||
ForEach(reminders) { r in
|
||
ReminderRow(
|
||
reminder: r,
|
||
isEditing: editingId == r.metricId,
|
||
onTapEdit: { toggleEdit(r.metricId) },
|
||
onChange: { Task { await sync(r) } },
|
||
onDelete: { delete(r) }
|
||
)
|
||
}
|
||
}
|
||
}
|
||
}
|
||
.padding(.horizontal, 16)
|
||
.padding(.top, 12)
|
||
.padding(.bottom, 32)
|
||
}
|
||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||
.navigationTitle("提醒")
|
||
.navigationBarTitleDisplayMode(.inline)
|
||
.toolbar {
|
||
if presentedAsSheet {
|
||
ToolbarItem(placement: .topBarTrailing) {
|
||
Button(String(appLoc: "完成")) { dismiss() }
|
||
}
|
||
}
|
||
}
|
||
.sheet(isPresented: $creatingNew) {
|
||
CustomReminderEditSheet()
|
||
}
|
||
.sheet(item: $editingCustom) { r in
|
||
CustomReminderEditSheet(reminder: r)
|
||
}
|
||
}
|
||
|
||
private var header: some View {
|
||
Text("新建提醒,或在记录指标时开启")
|
||
.font(.system(size: 12))
|
||
.foregroundStyle(Tj.Palette.text3)
|
||
.frame(maxWidth: .infinity, alignment: .leading)
|
||
}
|
||
|
||
private var createButton: some View {
|
||
Button { creatingNew = true } label: {
|
||
Label(String(appLoc: "新建提醒"), systemImage: "plus")
|
||
.frame(maxWidth: .infinity)
|
||
}
|
||
.buttonStyle(TjPrimaryButton(height: 46, fontSize: 14))
|
||
}
|
||
|
||
private func sectionLabel(_ text: String) -> some View {
|
||
Text(text)
|
||
.font(.system(size: 12, weight: .semibold))
|
||
.foregroundStyle(Tj.Palette.text3)
|
||
.frame(maxWidth: .infinity, alignment: .leading)
|
||
.padding(.top, 8)
|
||
}
|
||
|
||
private var emptyState: some View {
|
||
VStack(spacing: 12) {
|
||
Spacer(minLength: 40)
|
||
TjPlaceholder(label: String(appLoc: "还没有提醒,点上方新建"))
|
||
.frame(width: 240, height: 140)
|
||
Spacer()
|
||
}
|
||
.frame(maxWidth: .infinity)
|
||
}
|
||
|
||
// MARK: - 自由提醒
|
||
|
||
private func syncCustom(_ r: CustomReminder) async {
|
||
r.updatedAt = .now
|
||
try? ctx.save()
|
||
await ReminderService.sync(r)
|
||
}
|
||
|
||
// MARK: - 指标提醒(沿用原逻辑)
|
||
|
||
private func toggleEdit(_ id: String) {
|
||
editingId = (editingId == id) ? nil : id
|
||
}
|
||
|
||
private func sync(_ r: MetricReminder) async {
|
||
r.updatedAt = .now
|
||
try? ctx.save()
|
||
await ReminderService.sync(r)
|
||
}
|
||
|
||
private func delete(_ r: MetricReminder) {
|
||
ReminderService.cancel(metricId: r.metricId)
|
||
ctx.delete(r)
|
||
try? ctx.save()
|
||
}
|
||
}
|
||
|
||
/// 自由提醒行:点空白区进编辑 sheet;行上 Toggle 控开关。
|
||
private struct CustomReminderRow: View {
|
||
@Bindable var reminder: CustomReminder
|
||
let onTapEdit: () -> Void
|
||
let onToggle: () -> Void
|
||
|
||
var body: some View {
|
||
HStack(spacing: 12) {
|
||
Button(action: onTapEdit) {
|
||
HStack(spacing: 12) {
|
||
ZStack {
|
||
Circle()
|
||
.fill(reminder.enabled ? Tj.Palette.amber.opacity(0.25) : Tj.Palette.sand2)
|
||
Image(systemName: "bell.fill")
|
||
.font(.system(size: 16))
|
||
.foregroundStyle(reminder.enabled ? Tj.Palette.ink : Tj.Palette.text3)
|
||
}
|
||
.frame(width: 36, height: 36)
|
||
|
||
VStack(alignment: .leading, spacing: 2) {
|
||
Text(reminder.title)
|
||
.font(.system(size: 15, weight: .semibold))
|
||
.foregroundStyle(Tj.Palette.text)
|
||
.lineLimit(1)
|
||
Text("\(reminder.timeLabel) · \(reminder.frequencyLabel)")
|
||
.font(.system(size: 12))
|
||
.foregroundStyle(Tj.Palette.text3)
|
||
}
|
||
Spacer(minLength: 0)
|
||
}
|
||
.contentShape(Rectangle())
|
||
}
|
||
.buttonStyle(.plain)
|
||
|
||
Toggle("", isOn: $reminder.enabled)
|
||
.labelsHidden()
|
||
.tint(Tj.Palette.ink)
|
||
.onChange(of: reminder.enabled) { _, _ in onToggle() }
|
||
|
||
// 与指标提醒行的 28×28 展开按钮等宽,保证两类行的 Toggle 纵向对齐。
|
||
Image(systemName: "chevron.right")
|
||
.font(.system(size: 12, weight: .semibold))
|
||
.foregroundStyle(Tj.Palette.text3)
|
||
.frame(width: 28, height: 28)
|
||
}
|
||
.padding(14)
|
||
.background(
|
||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||
.fill(Tj.Palette.paper)
|
||
)
|
||
.overlay(
|
||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||
.strokeBorder(Tj.Palette.lineSoft, lineWidth: 1)
|
||
)
|
||
}
|
||
}
|
||
|
||
private struct ReminderRow: View {
|
||
@Bindable var reminder: MetricReminder
|
||
let isEditing: Bool
|
||
let onTapEdit: () -> Void
|
||
let onChange: () -> Void
|
||
let onDelete: () -> Void
|
||
|
||
@State private var pickedTime: Date = .now
|
||
@State private var hydrated = false
|
||
|
||
var body: some View {
|
||
VStack(spacing: 12) {
|
||
headerRow
|
||
if isEditing {
|
||
editingPanel
|
||
}
|
||
}
|
||
.padding(14)
|
||
.background(
|
||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||
.fill(Tj.Palette.paper)
|
||
)
|
||
.overlay(
|
||
RoundedRectangle(cornerRadius: Tj.Radius.md, style: .continuous)
|
||
.strokeBorder(Tj.Palette.lineSoft, lineWidth: 1)
|
||
)
|
||
}
|
||
|
||
private var headerRow: some View {
|
||
HStack(spacing: 12) {
|
||
ZStack {
|
||
Circle()
|
||
.fill(reminder.enabled ? Tj.Palette.amber.opacity(0.25) : Tj.Palette.sand2)
|
||
Image(systemName: "bell.fill")
|
||
.font(.system(size: 16))
|
||
.foregroundStyle(reminder.enabled ? Tj.Palette.ink : Tj.Palette.text3)
|
||
}
|
||
.frame(width: 36, height: 36)
|
||
|
||
VStack(alignment: .leading, spacing: 2) {
|
||
Text(reminder.displayName)
|
||
.font(.system(size: 15, weight: .semibold))
|
||
.foregroundStyle(Tj.Palette.text)
|
||
Text("\(reminder.timeLabel) · \(reminder.frequencyLabel)")
|
||
.font(.system(size: 12))
|
||
.foregroundStyle(Tj.Palette.text3)
|
||
}
|
||
|
||
Spacer()
|
||
|
||
Toggle("", isOn: $reminder.enabled)
|
||
.labelsHidden()
|
||
.tint(Tj.Palette.ink)
|
||
.onChange(of: reminder.enabled) { _, _ in onChange() }
|
||
|
||
Button {
|
||
onTapEdit()
|
||
} label: {
|
||
Image(systemName: isEditing ? "chevron.up" : "chevron.down")
|
||
.font(.system(size: 12, weight: .semibold))
|
||
.foregroundStyle(Tj.Palette.text3)
|
||
.frame(width: 28, height: 28)
|
||
}
|
||
.buttonStyle(.plain)
|
||
}
|
||
}
|
||
|
||
private var editingPanel: some View {
|
||
VStack(alignment: .leading, spacing: 12) {
|
||
HStack {
|
||
Text("时间").font(.system(size: 13)).foregroundStyle(Tj.Palette.text2)
|
||
Spacer()
|
||
DatePicker("", selection: $pickedTime, displayedComponents: .hourAndMinute)
|
||
.datePickerStyle(.compact)
|
||
.labelsHidden()
|
||
.onChange(of: pickedTime) { _, new in
|
||
let cal = Calendar.current
|
||
reminder.hour = cal.component(.hour, from: new)
|
||
reminder.minute = cal.component(.minute, from: new)
|
||
onChange()
|
||
}
|
||
}
|
||
weekdayRow
|
||
HStack {
|
||
Spacer()
|
||
Button(role: .destructive) {
|
||
onDelete()
|
||
} label: {
|
||
Label("删除提醒", systemImage: "trash")
|
||
.font(.system(size: 12, weight: .semibold))
|
||
.foregroundStyle(Tj.Palette.brick)
|
||
}
|
||
.buttonStyle(.plain)
|
||
}
|
||
}
|
||
.onAppear {
|
||
if !hydrated {
|
||
pickedTime = Calendar.current.date(
|
||
bySettingHour: reminder.hour, minute: reminder.minute, second: 0, of: .now
|
||
) ?? .now
|
||
hydrated = true
|
||
}
|
||
}
|
||
}
|
||
|
||
private var weekdayRow: some View {
|
||
let names = [
|
||
String(appLoc: "一"), String(appLoc: "二"), String(appLoc: "三"),
|
||
String(appLoc: "四"), String(appLoc: "五"), String(appLoc: "六"),
|
||
String(appLoc: "日"),
|
||
]
|
||
let weekdayValues = [2, 3, 4, 5, 6, 7, 1]
|
||
return HStack(spacing: 6) {
|
||
ForEach(Array(weekdayValues.enumerated()), id: \.offset) { idx, w in
|
||
Button {
|
||
var s = Set(reminder.weekdays)
|
||
if s.contains(w) { s.remove(w) } else { s.insert(w) }
|
||
reminder.weekdays = s.sorted()
|
||
onChange()
|
||
} label: {
|
||
Text(names[idx])
|
||
.font(.system(size: 13,
|
||
weight: reminder.weekdays.contains(w) ? .semibold : .regular))
|
||
.foregroundStyle(reminder.weekdays.contains(w) ? Tj.Palette.paper : Tj.Palette.text)
|
||
.frame(maxWidth: .infinity, minHeight: 30)
|
||
.background(
|
||
RoundedRectangle(cornerRadius: 8, style: .continuous)
|
||
.fill(reminder.weekdays.contains(w) ? Tj.Palette.ink : Tj.Palette.paper)
|
||
)
|
||
.overlay(
|
||
RoundedRectangle(cornerRadius: 8, style: .continuous)
|
||
.strokeBorder(Tj.Palette.line,
|
||
lineWidth: reminder.weekdays.contains(w) ? 0 : 1)
|
||
)
|
||
}
|
||
.buttonStyle(.plain)
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
#Preview {
|
||
NavigationStack {
|
||
RemindersListView()
|
||
}
|
||
.modelContainer(for: [MetricReminder.self, CustomReminder.self], inMemory: true)
|
||
}
|