```
feat: 添加自定义提醒功能并优化项目配置 - 添加 CustomReminder 模型支持自由文案周期性提醒功能 - 实现自定义提醒的 UI 界面,包括新建、编辑和列表展示 - 集成本地通知服务支持自定义提醒的时间触发 - 更新项目配置文件添加应用显示名称和加密声明 - 修正 iOS 部署目标版本从 26.0 到 17.0 - 修复 FileDownloader 中的线程安全问题 - 优化 ModelManifest 和 Localization 的并发安全性 - 扩展本地化字符串支持多语言提醒相关文本 - 调整项目支持平台范围仅保留 iphoneos 和 iphonesimulator ```
This commit is contained in:
186
康康/Features/Me/CustomReminderEditSheet.swift
Normal file
186
康康/Features/Me/CustomReminderEditSheet.swift
Normal file
@@ -0,0 +1,186 @@
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
|
||||
/// 自由周期提醒的创建 / 编辑表单。
|
||||
/// `reminder == nil` 为新建;否则为编辑(多一个删除按钮)。
|
||||
/// 本地 @State 暂存,保存时才写 SwiftData + 调度通知;取消即丢弃。
|
||||
struct CustomReminderEditSheet: View {
|
||||
@Environment(\.modelContext) private var ctx
|
||||
@Environment(\.dismiss) private var dismiss
|
||||
|
||||
/// nil = 新建模式。
|
||||
let reminder: CustomReminder?
|
||||
|
||||
@State private var title = ""
|
||||
@State private var note = ""
|
||||
@State private var pickedTime: Date = .now
|
||||
@State private var weekdays: Set<Int> = Set(1...7)
|
||||
@State private var hydrated = false
|
||||
@State private var showAuthDeniedAlert = false
|
||||
|
||||
init(reminder: CustomReminder? = nil) {
|
||||
self.reminder = reminder
|
||||
}
|
||||
|
||||
private var isEditing: Bool { reminder != nil }
|
||||
private var trimmedTitle: String {
|
||||
title.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
}
|
||||
private var canSave: Bool { !trimmedTitle.isEmpty && !weekdays.isEmpty }
|
||||
|
||||
var body: some View {
|
||||
NavigationStack {
|
||||
Form {
|
||||
Section {
|
||||
TextField(String(appLoc: "做点什么?例:跑步5公里 / 吃2片护肝片"),
|
||||
text: $title, axis: .vertical)
|
||||
.lineLimit(1...3)
|
||||
TextField(String(appLoc: "备注(可选)"), text: $note, axis: .vertical)
|
||||
.lineLimit(1...3)
|
||||
.foregroundStyle(Tj.Palette.text2)
|
||||
}
|
||||
|
||||
Section {
|
||||
DatePicker(String(appLoc: "时间"), selection: $pickedTime,
|
||||
displayedComponents: .hourAndMinute)
|
||||
}
|
||||
|
||||
Section {
|
||||
weekdayRow
|
||||
} header: {
|
||||
Text("重复")
|
||||
}
|
||||
|
||||
if isEditing {
|
||||
Section {
|
||||
Button(role: .destructive) { deleteReminder() } label: {
|
||||
Label(String(appLoc: "删除提醒"), systemImage: "trash")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.scrollContentBackground(.hidden)
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
.navigationTitle(isEditing ? String(appLoc: "编辑提醒") : String(appLoc: "新建提醒"))
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
.toolbar {
|
||||
ToolbarItem(placement: .topBarLeading) {
|
||||
Button(String(appLoc: "取消")) { dismiss() }
|
||||
}
|
||||
ToolbarItem(placement: .topBarTrailing) {
|
||||
Button(String(appLoc: "保存")) { save() }
|
||||
.fontWeight(.semibold)
|
||||
.disabled(!canSave)
|
||||
}
|
||||
}
|
||||
.onAppear(perform: hydrate)
|
||||
.alert(String(appLoc: "通知未开启"), isPresented: $showAuthDeniedAlert) {
|
||||
Button(String(appLoc: "好")) { dismiss() }
|
||||
} message: {
|
||||
Text("提醒已保存,但系统通知权限未开启,到点不会弹出。请在「设置 · 通知 · 康康」中允许。")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - 周几选择(与 RemindersListView 同款)
|
||||
|
||||
private var weekdayRow: some View {
|
||||
let names = [
|
||||
String(appLoc: "一"), String(appLoc: "二"), String(appLoc: "三"),
|
||||
String(appLoc: "四"), String(appLoc: "五"), String(appLoc: "六"),
|
||||
String(appLoc: "日"),
|
||||
]
|
||||
let values = [2, 3, 4, 5, 6, 7, 1]
|
||||
return HStack(spacing: 6) {
|
||||
ForEach(Array(values.enumerated()), id: \.offset) { idx, w in
|
||||
let on = weekdays.contains(w)
|
||||
Button {
|
||||
if on { weekdays.remove(w) } else { weekdays.insert(w) }
|
||||
} label: {
|
||||
Text(names[idx])
|
||||
.font(.system(size: 13, weight: on ? .semibold : .regular))
|
||||
.foregroundStyle(on ? Tj.Palette.paper : Tj.Palette.text)
|
||||
.frame(maxWidth: .infinity, minHeight: 30)
|
||||
.background(
|
||||
RoundedRectangle(cornerRadius: 8, style: .continuous)
|
||||
.fill(on ? Tj.Palette.ink : Tj.Palette.paper)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: 8, style: .continuous)
|
||||
.strokeBorder(Tj.Palette.line, lineWidth: on ? 0 : 1)
|
||||
)
|
||||
}
|
||||
.buttonStyle(.plain)
|
||||
}
|
||||
}
|
||||
.listRowBackground(Color.clear)
|
||||
}
|
||||
|
||||
// MARK: - 数据
|
||||
|
||||
private func hydrate() {
|
||||
guard !hydrated else { return }
|
||||
hydrated = true
|
||||
if let r = reminder {
|
||||
title = r.title
|
||||
note = r.note
|
||||
weekdays = Set(r.weekdays)
|
||||
pickedTime = Calendar.current.date(
|
||||
bySettingHour: r.hour, minute: r.minute, second: 0, of: .now
|
||||
) ?? .now
|
||||
}
|
||||
}
|
||||
|
||||
private func save() {
|
||||
guard canSave else { return }
|
||||
let cal = Calendar.current
|
||||
let hour = cal.component(.hour, from: pickedTime)
|
||||
let minute = cal.component(.minute, from: pickedTime)
|
||||
let sortedDays = weekdays.sorted()
|
||||
|
||||
let target: CustomReminder
|
||||
if let r = reminder {
|
||||
r.title = trimmedTitle
|
||||
r.note = note.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||
r.hour = hour
|
||||
r.minute = minute
|
||||
r.weekdays = sortedDays
|
||||
r.updatedAt = .now
|
||||
target = r
|
||||
} else {
|
||||
let new = CustomReminder(
|
||||
title: trimmedTitle,
|
||||
note: note.trimmingCharacters(in: .whitespacesAndNewlines),
|
||||
hour: hour,
|
||||
minute: minute,
|
||||
weekdays: sortedDays
|
||||
)
|
||||
ctx.insert(new)
|
||||
target = new
|
||||
}
|
||||
try? ctx.save()
|
||||
|
||||
Task { @MainActor in
|
||||
let state = await ReminderService.requestAuthorization()
|
||||
await ReminderService.sync(target)
|
||||
if state == .denied {
|
||||
showAuthDeniedAlert = true
|
||||
} else {
|
||||
dismiss()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func deleteReminder() {
|
||||
guard let r = reminder else { return }
|
||||
ReminderService.cancel(customId: r.id)
|
||||
ctx.delete(r)
|
||||
try? ctx.save()
|
||||
dismiss()
|
||||
}
|
||||
}
|
||||
|
||||
#Preview("新建") {
|
||||
CustomReminderEditSheet()
|
||||
.modelContainer(for: [CustomReminder.self], inMemory: true)
|
||||
}
|
||||
@@ -4,31 +4,50 @@ 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。
|
||||
/// 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
|
||||
if reminders.isEmpty {
|
||||
createButton
|
||||
|
||||
if isEmpty {
|
||||
emptyState
|
||||
} else {
|
||||
ForEach(reminders) { r in
|
||||
ReminderRow(
|
||||
ForEach(customReminders) { r in
|
||||
CustomReminderRow(
|
||||
reminder: r,
|
||||
isEditing: editingId == r.metricId,
|
||||
onTapEdit: { toggleEdit(r.metricId) },
|
||||
onChange: { Task { await sync(r) } },
|
||||
onDelete: { delete(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)
|
||||
@@ -36,40 +55,65 @@ struct RemindersListView: View {
|
||||
.padding(.bottom, 32)
|
||||
}
|
||||
.background(Tj.Palette.sand.ignoresSafeArea())
|
||||
.navigationTitle("记录提醒")
|
||||
.navigationTitle("提醒")
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
.toolbar {
|
||||
if presentedAsSheet {
|
||||
ToolbarItem(placement: .topBarTrailing) {
|
||||
Button("完成") { dismiss() }
|
||||
Button(String(appLoc: "完成")) { dismiss() }
|
||||
}
|
||||
}
|
||||
}
|
||||
.sheet(isPresented: $creatingNew) {
|
||||
CustomReminderEditSheet()
|
||||
}
|
||||
.sheet(item: $editingCustom) { r in
|
||||
CustomReminderEditSheet(reminder: r)
|
||||
}
|
||||
}
|
||||
|
||||
private var header: some View {
|
||||
VStack(alignment: .leading, spacing: 4) {
|
||||
Text("\(enabledCount) / \(reminders.count) 项启用")
|
||||
.font(.system(size: 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
Text("提醒在录入「指标记录 · 长期监测」时开启")
|
||||
.font(.system(size: 12))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
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)
|
||||
}
|
||||
.frame(maxWidth: .infinity, alignment: .leading)
|
||||
.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: "还没有记录提醒\n去「+ 指标记录」录入时打开"))
|
||||
TjPlaceholder(label: String(appLoc: "还没有提醒,点上方新建"))
|
||||
.frame(width: 240, height: 140)
|
||||
Spacer()
|
||||
}
|
||||
.frame(maxWidth: .infinity)
|
||||
}
|
||||
|
||||
private var enabledCount: Int { reminders.filter(\.enabled).count }
|
||||
// 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
|
||||
@@ -88,6 +132,61 @@ struct RemindersListView: View {
|
||||
}
|
||||
}
|
||||
|
||||
/// 自由提醒行:点空白区进编辑 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() }
|
||||
|
||||
Image(systemName: "chevron.right")
|
||||
.font(.system(size: 12, weight: .semibold))
|
||||
.foregroundStyle(Tj.Palette.text3)
|
||||
}
|
||||
.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
|
||||
@@ -233,5 +332,5 @@ private struct ReminderRow: View {
|
||||
NavigationStack {
|
||||
RemindersListView()
|
||||
}
|
||||
.modelContainer(for: [MetricReminder.self], inMemory: true)
|
||||
.modelContainer(for: [MetricReminder.self, CustomReminder.self], inMemory: true)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user