Daniil Klimov
44c759c190
- Add KeychainService for encrypted token storage (auth, refresh, health JWT, API key) - Remove hardcoded email/password from HealthAPIService, store in Keychain - Move all tokens from UserDefaults to Keychain - API key sent via X-API-Key header instead of URL query parameter - Replace force unwrap URL(string:)! with guard let + throws - Fix force unwrap Calendar.date() in HealthKitService - Mark HealthKitService @MainActor for thread-safe @Published - Use withTaskGroup for parallel habit log fetching in TrackerView - Check notification permission before scheduling reminders - Add input validation (title max 200 chars) - Add privacy policy and terms links in Settings - Update CLAUDE.md with security section Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
223 lines
12 KiB
Swift
223 lines
12 KiB
Swift
import SwiftUI
|
|
|
|
struct AddTaskView: View {
|
|
@Binding var isPresented: Bool
|
|
@EnvironmentObject var authManager: AuthManager
|
|
let onAdded: () async -> Void
|
|
|
|
@State private var title = ""
|
|
@State private var description = ""
|
|
@State private var priority: Int = 2
|
|
@State private var selectedIcon = "✅"
|
|
@State private var selectedColor = "#0D9488"
|
|
@State private var hasDueDate = false
|
|
@State private var dueDate = Date()
|
|
@State private var isRecurring = false
|
|
@State private var recurrenceType = "daily"
|
|
@State private var recurrenceInterval = "1"
|
|
@State private var hasRecurrenceEnd = false
|
|
@State private var recurrenceEndDate = Date().addingTimeInterval(86400 * 30)
|
|
@State private var isLoading = false
|
|
@State private var errorMessage: String?
|
|
|
|
let recurrenceTypes: [(String, String)] = [
|
|
("daily", "Ежедневно"),
|
|
("weekly", "Еженедельно"),
|
|
("monthly", "Ежемесячно"),
|
|
("custom", "Каждые N дней")
|
|
]
|
|
|
|
let priorities: [(Int, String, String)] = [
|
|
(1, "Низкий", "8888aa"),
|
|
(2, "Средний", "ffa502"),
|
|
(3, "Высокий", "ff4757")
|
|
]
|
|
|
|
let icons = ["✅","📌","🎯","💼","🏠","🛒","📞","🎓","💊","🚗",
|
|
"📅","⚡","🔧","📬","💡","🏋️","🌿","🎵","✍️","🌏"]
|
|
|
|
let colors = ["#0D9488","#7c3aed","#ff4757","#ffa502","#6366f1",
|
|
"#ec4899","#14b8a6","#f59e0b","#10b981","#3b82f6"]
|
|
|
|
var body: some View {
|
|
ZStack {
|
|
Color(hex: "06060f").ignoresSafeArea()
|
|
VStack(spacing: 0) {
|
|
RoundedRectangle(cornerRadius: 3)
|
|
.fill(Color.white.opacity(0.2)).frame(width: 40, height: 4).padding(.top, 12)
|
|
HStack {
|
|
Button("Отмена") { isPresented = false }
|
|
.font(.callout).foregroundColor(Color(hex: "8888aa"))
|
|
Spacer()
|
|
Text("Новая задача").font(.headline).foregroundColor(.white)
|
|
Spacer()
|
|
Button(action: save) {
|
|
if isLoading { ProgressView().tint(Theme.teal).scaleEffect(0.8) }
|
|
else { Text("Готово").font(.callout.bold()).foregroundColor(title.isEmpty ? Color(hex: "8888aa") : Theme.teal) }
|
|
}.disabled(title.isEmpty || isLoading)
|
|
}
|
|
.padding(.horizontal, 16).padding(.vertical, 14)
|
|
Divider().background(Color.white.opacity(0.1))
|
|
ScrollView {
|
|
VStack(spacing: 16) {
|
|
// Title
|
|
VStack(alignment: .leading, spacing: 8) {
|
|
Label("Название", systemImage: "pencil").font(.caption).foregroundColor(Color(hex: "8888aa"))
|
|
TextField("Что нужно сделать?", text: $title, axis: .vertical)
|
|
.lineLimit(1...3).foregroundColor(.white).padding(14)
|
|
.background(RoundedRectangle(cornerRadius: 12).fill(Color.white.opacity(0.07)))
|
|
.onChange(of: title) { if title.count > 200 { title = String(title.prefix(200)) } }
|
|
}
|
|
// Description
|
|
VStack(alignment: .leading, spacing: 8) {
|
|
Label("Описание", systemImage: "text.alignleft").font(.caption).foregroundColor(Color(hex: "8888aa"))
|
|
TextField("Детали...", text: $description, axis: .vertical)
|
|
.lineLimit(2...4).foregroundColor(.white).padding(14)
|
|
.background(RoundedRectangle(cornerRadius: 12).fill(Color.white.opacity(0.07)))
|
|
}
|
|
// Priority
|
|
VStack(alignment: .leading, spacing: 8) {
|
|
Label("Приоритет", systemImage: "flag.fill").font(.caption).foregroundColor(Color(hex: "8888aa"))
|
|
HStack(spacing: 8) {
|
|
ForEach(priorities, id: \.0) { p in
|
|
Button(action: { priority = p.0 }) {
|
|
Text(p.1).font(.caption.bold())
|
|
.foregroundColor(priority == p.0 ? .black : Color(hex: p.2))
|
|
.padding(.horizontal, 12).padding(.vertical, 8)
|
|
.background(RoundedRectangle(cornerRadius: 20).fill(priority == p.0 ? Color(hex: p.2) : Color(hex: p.2).opacity(0.15)))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// Due Date
|
|
VStack(alignment: .leading, spacing: 8) {
|
|
HStack {
|
|
Label("Срок выполнения", systemImage: "calendar").font(.caption).foregroundColor(Color(hex: "8888aa"))
|
|
Spacer()
|
|
Toggle("", isOn: $hasDueDate).tint(Color(hex: "0D9488")).labelsHidden()
|
|
}
|
|
if hasDueDate {
|
|
DatePicker("", selection: $dueDate, in: Date()..., displayedComponents: .date)
|
|
.datePickerStyle(.compact)
|
|
.colorInvert()
|
|
.colorMultiply(Color(hex: "0D9488"))
|
|
}
|
|
}
|
|
// Icon
|
|
VStack(alignment: .leading, spacing: 8) {
|
|
Label("Иконка", systemImage: "face.smiling").font(.caption).foregroundColor(Color(hex: "8888aa"))
|
|
LazyVGrid(columns: Array(repeating: GridItem(.flexible()), count: 5), spacing: 8) {
|
|
ForEach(icons, id: \.self) { icon in
|
|
Button(action: { selectedIcon = icon }) {
|
|
Text(icon).font(.title3)
|
|
.frame(width: 44, height: 44)
|
|
.background(Circle().fill(selectedIcon == icon ? Color(hex: "0D9488").opacity(0.25) : Color.white.opacity(0.05)))
|
|
.overlay(Circle().stroke(selectedIcon == icon ? Color(hex: "0D9488") : Color.clear, lineWidth: 2))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// Color
|
|
VStack(alignment: .leading, spacing: 8) {
|
|
Label("Цвет", systemImage: "paintpalette").font(.caption).foregroundColor(Color(hex: "8888aa"))
|
|
LazyVGrid(columns: Array(repeating: GridItem(.flexible()), count: 5), spacing: 10) {
|
|
ForEach(colors, id: \.self) { c in
|
|
Button(action: { selectedColor = c }) {
|
|
Circle().fill(Color(hex: String(c.dropFirst()))).frame(width: 32, height: 32)
|
|
.overlay(Circle().stroke(.white, lineWidth: selectedColor == c ? 2 : 0))
|
|
.scaleEffect(selectedColor == c ? 1.15 : 1.0)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// Recurrence
|
|
VStack(alignment: .leading, spacing: 10) {
|
|
HStack {
|
|
Label("Повторение", systemImage: "repeat").font(.caption).foregroundColor(Color(hex: "8888aa"))
|
|
Spacer()
|
|
Toggle("", isOn: $isRecurring).tint(Color(hex: "0D9488")).labelsHidden()
|
|
}
|
|
if isRecurring {
|
|
VStack(spacing: 8) {
|
|
ForEach(recurrenceTypes, id: \.0) { rt in
|
|
Button(action: { recurrenceType = rt.0 }) {
|
|
HStack {
|
|
Text(rt.1).foregroundColor(recurrenceType == rt.0 ? .white : Color(hex: "8888aa"))
|
|
Spacer()
|
|
if recurrenceType == rt.0 { Image(systemName: "checkmark").foregroundColor(Color(hex: "0D9488")) }
|
|
}
|
|
.padding(12)
|
|
.background(RoundedRectangle(cornerRadius: 10).fill(recurrenceType == rt.0 ? Color(hex: "0D9488").opacity(0.15) : Color.white.opacity(0.05)))
|
|
}
|
|
}
|
|
if recurrenceType == "custom" {
|
|
HStack {
|
|
Text("Каждые").foregroundColor(Color(hex: "8888aa")).font(.callout)
|
|
TextField("1", text: $recurrenceInterval).keyboardType(.numberPad)
|
|
.foregroundColor(.white).frame(width: 50).padding(8)
|
|
.background(RoundedRectangle(cornerRadius: 8).fill(Color.white.opacity(0.07)))
|
|
Text("дней").foregroundColor(Color(hex: "8888aa")).font(.callout)
|
|
}
|
|
}
|
|
HStack {
|
|
Label("Дата окончания", systemImage: "calendar.badge.minus").font(.caption).foregroundColor(Color(hex: "8888aa"))
|
|
Spacer()
|
|
Toggle("", isOn: $hasRecurrenceEnd).tint(Color(hex: "0D9488")).labelsHidden()
|
|
}
|
|
if hasRecurrenceEnd {
|
|
DatePicker("", selection: $recurrenceEndDate, in: Date()..., displayedComponents: .date)
|
|
.labelsHidden()
|
|
.colorInvert()
|
|
.colorMultiply(Color(hex: "0D9488"))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if let err = errorMessage {
|
|
Text(err)
|
|
.font(.caption).foregroundColor(Color(hex: "ff4757"))
|
|
.padding(10)
|
|
.frame(maxWidth: .infinity)
|
|
.background(RoundedRectangle(cornerRadius: 10).fill(Color(hex: "ff4757").opacity(0.1)))
|
|
}
|
|
}.padding(20)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func save() {
|
|
isLoading = true
|
|
errorMessage = nil
|
|
let df = DateFormatter(); df.dateFormat = "yyyy-MM-dd"
|
|
let dueDateStr = hasDueDate ? df.string(from: dueDate) : nil
|
|
let recEndStr = (isRecurring && hasRecurrenceEnd) ? df.string(from: recurrenceEndDate) : nil
|
|
let interval = recurrenceType == "custom" ? (Int(recurrenceInterval) ?? 1) : nil
|
|
Task {
|
|
do {
|
|
let req = CreateTaskRequest(
|
|
title: title,
|
|
description: description.isEmpty ? nil : description,
|
|
priority: priority,
|
|
dueDate: dueDateStr,
|
|
icon: selectedIcon,
|
|
color: selectedColor,
|
|
isRecurring: isRecurring ? true : nil,
|
|
recurrenceType: isRecurring ? recurrenceType : nil,
|
|
recurrenceInterval: interval,
|
|
recurrenceEndDate: recEndStr
|
|
)
|
|
try await APIService.shared.createTask(token: authManager.token, request: req)
|
|
await onAdded()
|
|
await MainActor.run { isPresented = false }
|
|
} catch {
|
|
await MainActor.run {
|
|
errorMessage = error.localizedDescription
|
|
isLoading = false
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|