mycode/myApp/HaruDanim/Widgets/GoalWidgets.swift
songyc macbook 49dd1d0ff2 feat(widgets): complete redesign of 5 widget types with modular Intents, fixed floating menu UI/Strings
Widget system rebuilt as 5 independent widgets, each with its own
WidgetConfigurationIntent registered in the WidgetBundle:

- ① ActionRun: multi-action selection, value display option (day/week/
  month/hidden), full tag-color cells; small 1 / medium 4 (2x2) / large
  4 big cells or 8 compact cells (2x4) via largeStyle. Unfilled slots
  render as dashed blank cells.
- ② GoalProgress: multi-goal selection; medium [2 goals | goal+top
  quests], large [4 goals | 2x goal+quests | 1 goal + all quests] via
  medium/largeStyle. New QuestBarRow / GoalWithQuestsCellView.
- ③ QuestRing: multi-quest selection + span; surface-card ring (tag
  color) with centered icon, name and "오늘 N%" text; interactive run
  via RunActionIntent; small 1 / medium 2 / large 4 (2x2).
- ④ QuestStatus (display-only): goal selection + span; rings with name
  only (no %), goal icon+name top-left; small 4 (2x2) / medium 8 (4x2) /
  large [16 (4x4) | 4 goals | 2 goals] via largeStyle.
- ⑤ StatsChart: multi-action selection capped per family (2/4/6) +
  3 span modes; same design scaled by family.

Common foundation:
- Theme option revived on every intent: match app / light fixed / dark
  fixed (WidgetThemeOption AppEnum) applied through widgetAppTheme(_:)
  with proper iOS 17 containerBackground; non-fullColor rendering modes
  (tinted/clear/accented) keep the Color.clear + semantic-color defense
  so content never goes white-on-white.
- Providers are family-aware (capacity by size) and slot-pad selections
  (WidgetStore.slots); defaults fill from existing data so fresh widgets
  never look empty.
- Interactive path unchanged: RunActionIntent(actionID:) +
  IntentStore.performWrite -> reloadAllTimelines.

Floating menu polish:
- All glass capsules now share a uniform width (longest label wins,
  locale-proof) for a tidy popped-up list.
- Settings strings updated: nav style renamed to '플로팅 글래스 캡슐'
  with description matching the capsule popup, order editor retitled
  '캡슐 메뉴 순서' with bottom-to-top wording.

Verified: BUILD SUCCEEDED (iPhone 17 Pro sim); widget preview harness
extended with per-variant scroll anchors and all 15 layout variants
screenshot-checked, including forced accented mode (legible translucent
cells) and blank-slot rendering; capsule menu and settings text
screenshot-checked.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013yKDMhuF39GVYy3FMcGHh7
2026-07-13 01:17:39 +09:00

582 lines
22 KiB
Swift
Raw Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

//
// GoalWidgets.swift
// Haru_DanimWidgets
//
// + (CLAUDE.md §8.2)
//
import SwiftUI
import WidgetKit
import AppIntents
// MARK: - (Goal Progress)
// // .
// - : 1
// - : [ 2] [ 1 + 2~3]
// - : [ 4 (2×2)] / [+ 2] / [ 1 + ]
///
enum GoalMediumStyle: String, AppEnum {
/// 2
case twoGoals
/// 1 +
case goalWithQuests
static let typeDisplayRepresentation = TypeDisplayRepresentation(name: "중형 위젯 구성")
static let caseDisplayRepresentations: [GoalMediumStyle: DisplayRepresentation] = [
.twoGoals: "목표 2개",
.goalWithQuests: "목표 1개 + 다짐 진행률",
]
}
///
enum GoalLargeStyle: String, AppEnum {
/// 4 (2×2)
case fourGoals
/// [ 1 + ] 2
case twoGoalsWithQuests
/// 1 +
case oneGoalAllQuests
static let typeDisplayRepresentation = TypeDisplayRepresentation(name: "대형 위젯 구성")
static let caseDisplayRepresentations: [GoalLargeStyle: DisplayRepresentation] = [
.fourGoals: "목표 4개 (2×2)",
.twoGoalsWithQuests: "목표+다짐 2개 (위아래)",
.oneGoalAllQuests: "목표 1개 + 모든 다짐",
]
}
struct GoalProgressConfigIntent: WidgetConfigurationIntent {
static let title: LocalizedStringResource = "목표 진행률 위젯"
static let description = IntentDescription("진행률을 표시할 목표들과 위젯 구성, 테마를 선택하세요.")
@Parameter(title: "목표")
var goals: [GoalEntity]?
@Parameter(title: "중형 위젯 구성", default: .twoGoals)
var mediumStyle: GoalMediumStyle
@Parameter(title: "대형 위젯 구성", default: .fourGoals)
var largeStyle: GoalLargeStyle
@Parameter(title: "테마", default: .matchApp)
var theme: WidgetThemeOption
}
struct GoalProgressEntry: TimelineEntry {
let date: Date
let locked: Bool
let theme: WidgetThemeOption
let mediumStyle: GoalMediumStyle
let largeStyle: GoalLargeStyle
/// · (nil = )
let goals: [GoalSnapshot?]
///
var isLive: Bool { goals.contains { $0?.quests.contains { $0.isRunning } == true } }
}
struct GoalProgressProvider: AppIntentTimelineProvider {
static func capacity(_ family: WidgetFamily, configuration: GoalProgressConfigIntent) -> Int {
switch family {
case .systemMedium: return configuration.mediumStyle == .twoGoals ? 2 : 1
case .systemLarge:
switch configuration.largeStyle {
case .fourGoals: return 4
case .twoGoalsWithQuests: return 2
case .oneGoalAllQuests: return 1
}
default: return 1
}
}
@MainActor
static func makeEntry(_ configuration: GoalProgressConfigIntent, family: WidgetFamily,
now: Date = .now) -> GoalProgressEntry {
IntentStore.refresh()
guard WidgetStore.isUnlocked else {
return GoalProgressEntry(date: now, locked: true, theme: configuration.theme,
mediumStyle: configuration.mediumStyle,
largeStyle: configuration.largeStyle, goals: [])
}
let capacity = Self.capacity(family, configuration: configuration)
let goals = WidgetStore.selectedGoals(configuration.goals, defaultCount: capacity)
return GoalProgressEntry(
date: now,
locked: false,
theme: configuration.theme,
mediumStyle: configuration.mediumStyle,
largeStyle: configuration.largeStyle,
goals: WidgetStore.slots(goals.map { GoalSnapshot.make(goal: $0, now: now) }, capacity: capacity)
)
}
func placeholder(in context: Context) -> GoalProgressEntry {
GoalProgressEntry(date: .now, locked: false, theme: .matchApp,
mediumStyle: .twoGoals, largeStyle: .fourGoals, goals: [.sample])
}
@MainActor
func snapshot(for configuration: GoalProgressConfigIntent, in context: Context) async -> GoalProgressEntry {
Self.makeEntry(configuration, family: context.family)
}
@MainActor
func timeline(for configuration: GoalProgressConfigIntent, in context: Context) async -> Timeline<GoalProgressEntry> {
let first = Self.makeEntry(configuration, family: context.family)
return WidgetRefresh.timeline(first: first, live: first.isLive) { date in
Self.makeEntry(configuration, family: context.family, now: date)
}
}
}
/// 1: + + // 3
struct GoalBarsCellView: View {
let goal: GoalSnapshot
/// ()
var fullBleed = false
var body: some View {
VStack(alignment: .leading, spacing: 5) {
HStack(spacing: 5) {
Image(systemName: goal.symbolName)
.font(.system(size: 11, weight: .semibold))
.foregroundStyle(goal.color)
Text(goal.title)
.font(.caption.weight(.semibold))
.lineLimit(1)
}
SpanBarRow(label: String(localized: "하루"), ratio: goal.dayRatio, color: goal.color)
SpanBarRow(label: String(localized: "주간"), ratio: goal.weekRatio, color: goal.color)
SpanBarRow(label: String(localized: "월간"), ratio: goal.monthRatio, color: goal.color)
}
.padding(fullBleed ? 14 : 10)
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
.background(WidgetCellBackground(fullBleed: fullBleed))
}
}
/// 1 ( + + + %)
struct QuestBarRow: View {
let quest: QuestCellSnapshot
var body: some View {
HStack(spacing: 6) {
Image(systemName: quest.symbolName)
.font(.system(size: 10, weight: .semibold))
.foregroundStyle(quest.color)
.frame(width: 14)
Text(quest.targetName)
.font(.caption2)
.lineLimit(1)
.frame(width: 52, alignment: .leading)
ProgressView(value: min(max(quest.ratio, 0), 1))
.progressViewStyle(.linear)
.tint(quest.isAtMost && !quest.isAchieved ? Color.red : quest.color)
Text(Format.percent(quest.displayRatio))
.font(.system(size: 9, weight: .semibold).monospacedDigit())
.foregroundStyle(.secondary)
.frame(width: 34, alignment: .trailing)
}
}
}
/// 1 + ( 2 / 2)
struct GoalWithQuestsCellView: View {
let goal: GoalSnapshot
var questCount = 3
var body: some View {
HStack(alignment: .top, spacing: 10) {
GoalBarsCellView(goal: goal)
.frame(maxWidth: .infinity)
VStack(alignment: .leading, spacing: 7) {
Text("다짐 (하루)")
.font(.system(size: 9, weight: .semibold))
.foregroundStyle(.secondary)
if goal.quests.isEmpty {
Spacer()
Text("다짐이 없어요")
.font(.caption2)
.foregroundStyle(.secondary)
Spacer()
} else {
ForEach(goal.quests.prefix(questCount)) { quest in
QuestBarRow(quest: quest)
}
Spacer(minLength: 0)
}
}
.padding(10)
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
.background(WidgetCellBackground())
}
}
}
struct GoalProgressWidgetView: View {
@Environment(\.widgetFamily) private var envFamily
/// DEBUG
var previewFamily: WidgetFamily? = nil
private var family: WidgetFamily { previewFamily ?? envFamily }
let entry: GoalProgressEntry
var body: some View {
Group {
if entry.locked {
WidgetLockedView()
.padding(12)
} else if !entry.goals.contains(where: { $0 != nil }) {
WidgetEmptyView(symbolName: "flag.fill", message: "목표 탭에서 목표를 만들면\n진행률이 표시돼요")
} else {
switch family {
case .systemMedium:
mediumLayout
.padding(10)
case .systemLarge:
largeLayout
.padding(10)
default:
// : ()
if let goal = entry.goals.first ?? nil {
GoalBarsCellView(goal: goal, fullBleed: true)
}
}
}
}
.widgetAppTheme(entry.theme)
}
@ViewBuilder
private var mediumLayout: some View {
switch entry.mediumStyle {
case .twoGoals:
HStack(spacing: 8) {
ForEach(0..<2, id: \.self) { index in
slotCell(index)
}
}
case .goalWithQuests:
if let goal = entry.goals.first ?? nil {
GoalWithQuestsCellView(goal: goal, questCount: 3)
}
}
}
@ViewBuilder
private var largeLayout: some View {
switch entry.largeStyle {
case .fourGoals:
VStack(spacing: 8) {
HStack(spacing: 8) {
slotCell(0)
slotCell(1)
}
HStack(spacing: 8) {
slotCell(2)
slotCell(3)
}
}
case .twoGoalsWithQuests:
VStack(spacing: 8) {
ForEach(0..<2, id: \.self) { index in
if index < entry.goals.count, let goal = entry.goals[index] {
GoalWithQuestsCellView(goal: goal, questCount: 3)
} else {
WidgetBlankCellView()
}
}
}
case .oneGoalAllQuests:
if let goal = entry.goals.first ?? nil {
VStack(spacing: 8) {
GoalBarsCellView(goal: goal)
.frame(maxHeight: 130)
VStack(alignment: .leading, spacing: 7) {
Text("다짐 (하루)")
.font(.system(size: 9, weight: .semibold))
.foregroundStyle(.secondary)
if goal.quests.isEmpty {
Text("다짐이 없어요")
.font(.caption2)
.foregroundStyle(.secondary)
} else {
ForEach(goal.quests.prefix(8)) { quest in
QuestBarRow(quest: quest)
}
}
Spacer(minLength: 0)
}
.padding(10)
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
.background(WidgetCellBackground())
}
}
}
}
@ViewBuilder
private func slotCell(_ index: Int) -> some View {
if index < entry.goals.count, let goal = entry.goals[index] {
GoalBarsCellView(goal: goal)
} else {
WidgetBlankCellView()
}
}
}
struct GoalProgressWidget: Widget {
var body: some WidgetConfiguration {
AppIntentConfiguration(
kind: "HaruGoalBarsWidget",
intent: GoalProgressConfigIntent.self,
provider: GoalProgressProvider()
) { entry in
GoalProgressWidgetView(entry: entry)
}
.configurationDisplayName("목표 진행률")
.description("목표의 하루·주간·월간 진행률을 진행바로 확인해요. (프리미엄)")
.supportedFamilies([.systemSmall, .systemMedium, .systemLarge])
.contentMarginsDisabled()
}
}
// MARK: - (Quest Status, )
// . (% ),
// +.
// - : 4 (2×2)
// - : 8 (4×2)
// - : [ 16 (4×4)] / [ 4 (2×2)] / [ 2 ()]
///
enum QuestStatusLargeStyle: String, AppEnum {
/// 1 16 (4×4)
case manyQuests
/// 4 2×2 ( 4)
case fourGoals
/// 2 ( 8)
case twoGoals
static let typeDisplayRepresentation = TypeDisplayRepresentation(name: "대형 위젯 구성")
static let caseDisplayRepresentations: [QuestStatusLargeStyle: DisplayRepresentation] = [
.manyQuests: "목표 1개 · 다짐 16개",
.fourGoals: "목표 4개 (2×2)",
.twoGoals: "목표 2개 (위아래)",
]
}
struct QuestStatusConfigIntent: WidgetConfigurationIntent {
static let title: LocalizedStringResource = "다짐 현황 위젯"
static let description = IntentDescription("다짐들의 진행률 링을 보여줄 목표와 기간, 테마를 선택하세요.")
@Parameter(title: "목표")
var goals: [GoalEntity]?
@Parameter(title: "진행률 기간", default: .day)
var span: SpanOption
@Parameter(title: "대형 위젯 구성", default: .manyQuests)
var largeStyle: QuestStatusLargeStyle
@Parameter(title: "테마", default: .matchApp)
var theme: WidgetThemeOption
}
struct QuestStatusEntry: TimelineEntry {
let date: Date
let locked: Bool
let theme: WidgetThemeOption
let spanLabel: String
let largeStyle: QuestStatusLargeStyle
let goals: [GoalSnapshot?]
var isLive: Bool { goals.contains { $0?.quests.contains { $0.isRunning } == true } }
}
struct QuestStatusProvider: AppIntentTimelineProvider {
static func capacity(_ family: WidgetFamily, configuration: QuestStatusConfigIntent) -> Int {
guard family == .systemLarge else { return 1 }
switch configuration.largeStyle {
case .manyQuests: return 1
case .fourGoals: return 4
case .twoGoals: return 2
}
}
@MainActor
static func makeEntry(_ configuration: QuestStatusConfigIntent, family: WidgetFamily,
now: Date = .now) -> QuestStatusEntry {
IntentStore.refresh()
guard WidgetStore.isUnlocked else {
return QuestStatusEntry(date: now, locked: true, theme: configuration.theme,
spanLabel: "", largeStyle: configuration.largeStyle, goals: [])
}
let capacity = Self.capacity(family, configuration: configuration)
let goals = WidgetStore.selectedGoals(configuration.goals, defaultCount: capacity)
let span = configuration.span.statSpan
return QuestStatusEntry(
date: now,
locked: false,
theme: configuration.theme,
spanLabel: configuration.span.label,
largeStyle: configuration.largeStyle,
goals: WidgetStore.slots(goals.map { GoalSnapshot.make(goal: $0, span: span, now: now) },
capacity: capacity)
)
}
func placeholder(in context: Context) -> QuestStatusEntry {
QuestStatusEntry(date: .now, locked: false, theme: .matchApp, spanLabel: "오늘",
largeStyle: .manyQuests, goals: [.sample])
}
@MainActor
func snapshot(for configuration: QuestStatusConfigIntent, in context: Context) async -> QuestStatusEntry {
Self.makeEntry(configuration, family: context.family)
}
@MainActor
func timeline(for configuration: QuestStatusConfigIntent, in context: Context) async -> Timeline<QuestStatusEntry> {
let first = Self.makeEntry(configuration, family: context.family)
return WidgetRefresh.timeline(first: first, live: first.isLive) { date in
Self.makeEntry(configuration, family: context.family, now: date)
}
}
}
/// + ( % )
struct QuestRingCellView: View {
let quest: QuestCellSnapshot
var ringSize: CGFloat = 34
var body: some View {
VStack(spacing: 5) {
QuestRingView(snapshot: quest, lineWidth: 4, iconSize: ringSize * 0.36)
.frame(width: ringSize, height: ringSize)
Text(quest.targetName)
.font(.system(size: 8, weight: .medium))
.lineLimit(1)
.foregroundStyle(.secondary)
}
}
}
struct QuestStatusWidgetView: View {
@Environment(\.widgetFamily) private var envFamily
/// DEBUG
var previewFamily: WidgetFamily? = nil
private var family: WidgetFamily { previewFamily ?? envFamily }
let entry: QuestStatusEntry
var body: some View {
Group {
if entry.locked {
WidgetLockedView()
} else if !entry.goals.contains(where: { $0 != nil }) {
WidgetEmptyView(symbolName: "square.grid.2x2", message: "목표 탭에서 목표와\n다짐을 만들어 보세요")
} else {
switch family {
case .systemMedium:
// : 8 (4×2)
if let goal = entry.goals.first ?? nil {
goalSection(goal, maxCount: 8, columns: 4, ringSize: goal.quests.count > 4 ? 30 : 38)
}
case .systemLarge:
largeLayout
default:
// : 4 (2×2)
if let goal = entry.goals.first ?? nil {
goalSection(goal, maxCount: 4, columns: 2, ringSize: 32)
}
}
}
}
.padding(13)
.widgetAppTheme(entry.theme)
}
@ViewBuilder
private var largeLayout: some View {
switch entry.largeStyle {
case .manyQuests:
if let goal = entry.goals.first ?? nil {
goalSection(goal, maxCount: 16, columns: 4, ringSize: 44)
}
case .fourGoals:
VStack(spacing: 10) {
ForEach(0..<2, id: \.self) { row in
HStack(spacing: 10) {
ForEach(0..<2, id: \.self) { col in
goalSlot(row * 2 + col, maxCount: 4, columns: 2, ringSize: 30)
}
}
}
}
case .twoGoals:
VStack(spacing: 10) {
ForEach(0..<2, id: \.self) { index in
goalSlot(index, maxCount: 8, columns: 4, ringSize: 34)
}
}
}
}
@ViewBuilder
private func goalSlot(_ index: Int, maxCount: Int, columns: Int, ringSize: CGFloat) -> some View {
if index < entry.goals.count, let goal = entry.goals[index] {
goalSection(goal, maxCount: maxCount, columns: columns, ringSize: ringSize)
} else {
WidgetBlankCellView()
}
}
private func goalSection(_ goal: GoalSnapshot, maxCount: Int, columns: Int, ringSize: CGFloat) -> some View {
VStack(spacing: 10) {
HStack(spacing: 4) {
Image(systemName: goal.symbolName)
.font(.system(size: 10, weight: .semibold))
.foregroundStyle(goal.color)
Text(goal.title)
.font(.caption2.weight(.semibold))
.lineLimit(1)
Spacer()
Text(entry.spanLabel)
.font(.system(size: 8))
.foregroundStyle(.tertiary)
}
if goal.quests.isEmpty {
Spacer()
Text("다짐이 없어요")
.font(.caption2)
.foregroundStyle(.secondary)
Spacer()
} else {
let quests = Array(goal.quests.prefix(maxCount))
let grid = [GridItem](repeating: GridItem(.flexible(), spacing: 8), count: columns)
LazyVGrid(columns: grid, spacing: 12) {
ForEach(quests) { quest in
QuestRingCellView(quest: quest, ringSize: ringSize)
}
}
Spacer(minLength: 0)
}
}
}
}
struct QuestStatusWidget: Widget {
var body: some WidgetConfiguration {
AppIntentConfiguration(
kind: "HaruGoalQuestGridWidget",
intent: QuestStatusConfigIntent.self,
provider: QuestStatusProvider()
) { entry in
QuestStatusWidgetView(entry: entry)
}
.configurationDisplayName("다짐 현황")
.description("목표에 속한 다짐들의 진행률을 원형 링으로 한눈에 봐요. (프리미엄)")
.supportedFamilies([.systemSmall, .systemMedium, .systemLarge])
.contentMarginsDisabled()
}
}