mycode/myApp/HaruDanim/Widgets/GoalWidgets.swift
songyc macbook 42b95c5d7f feat(quest): consecutive-achievement display on quests, plus wording fixes
다짐 단위 '연속 달성' 표기 추가 (QuestProgress.streak → QuestStreakInfo):
- 하루 단위 다짐: 적용일만 세는 연속 계산 — 매일이면 연속 일수,
  '매주 수요일'이면 수요일들만 이어서 센다 (4주 연속 = 연속 4일)
- 주간/월간 다짐: 주기 전체 달성 여부로 연속 N주/N달
- 특정 기간 다짐: 반복이 없어 표시하지 않음
- 진행 중인 오늘/이번 주기는 '이상 달성'이면 미달이어도 끊기지 않고
  건너뛰며, 채웠으면 포함. '이하 유지'는 한도를 넘는 순간 끊김
- 성능: 기록을 논리적 하루 키로 1회 버킷팅해 O(기록수+일수),
  소급 상한 400일

표기(기존 디자인·데이터는 그대로 두고 추가만, 0이면 숨김):
- 목표 탭 다짐 행: 이름 옆 불꽃 + "연속 N일" 배지 (노랑)
- 위젯 ③ 다짐 진행률: 퍼센트 아래 한 줄
- 위젯 ④ 다짐 현황: 이름 아래 작은 글씨
- 위젯 ② 목표+다짐 구성: 퍼센트 아래 6.5pt — 연속 표기가 있을 때만
  행 높이 14→19 (적응 채움이 자동 반영)
- 문구는 '스트릭' 대신 "연속 N일/주/달" (en은 streak, ja는 N日連続)

문구 정정: '몇째 주 요일' → '몇 번째 요일' — 구현(weekdayOrdinal)은
달력의 주차가 아니라 "그 달의 n번째 ◯요일"이므로 편집 화면 픽커와
주기 요약 문구를 실제 동작에 맞게 수정 (동작 변경 없음). en/ja 번역 포함.

검증: 시드 데이터로 목표 탭 배지 손계산 대조(독서 연속 3일 — 3일 전
기록 없음 / 영상 시청 어제 한도 초과로 연속 1일 등 전부 일치),
위젯 ②③④ 미리보기 스크린샷으로 레이아웃 넘침 없음 확인,
missing: [], Debug·Store 스킴 빌드 성공.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013yKDMhuF39GVYy3FMcGHh7
2026-07-13 23:49:45 +09:00

621 lines
24 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)
if let streak = quest.streakLabel {
VStack(alignment: .trailing, spacing: 0) {
Text(Format.percent(quest.displayRatio))
.font(.system(size: 9, weight: .semibold).monospacedDigit())
.foregroundStyle(.secondary)
Text(streak)
.font(.system(size: 6.5, weight: .semibold))
.foregroundStyle(AppTheme.yellow)
.lineLimit(1)
.minimumScaleFactor(0.8)
}
.frame(width: 34, alignment: .trailing)
} else {
Text(Format.percent(quest.displayRatio))
.font(.system(size: 9, weight: .semibold).monospacedDigit())
.foregroundStyle(.secondary)
.frame(width: 34, alignment: .trailing)
}
}
}
}
/// .
/// "+N" . (/ )
struct QuestBarsColumn: View {
let quests: [QuestCellSnapshot]
/// ( 14
/// (fitCount) )
private var rowHeight: CGFloat {
quests.contains { $0.streakLabel != nil } ? 19 : 14
}
private let rowSpacing: CGFloat = 6
private let headerHeight: CGFloat = 17
var body: some View {
GeometryReader { geo in
let fitCount = max(Int((geo.size.height - headerHeight + rowSpacing) / (rowHeight + rowSpacing)), 1)
let shown = Array(quests.prefix(fitCount))
VStack(alignment: .leading, spacing: rowSpacing) {
HStack {
Text("다짐 (하루)")
.font(.system(size: 9, weight: .semibold))
.foregroundStyle(.secondary)
Spacer()
if quests.count > shown.count {
Text(verbatim: "+\(quests.count - shown.count)")
.font(.system(size: 9, weight: .semibold).monospacedDigit())
.foregroundStyle(.tertiary)
}
}
.frame(height: headerHeight - rowSpacing, alignment: .top)
if quests.isEmpty {
Spacer()
Text("다짐이 없어요")
.font(.caption2)
.foregroundStyle(.secondary)
.frame(maxWidth: .infinity)
Spacer()
} else {
ForEach(shown) { quest in
QuestBarRow(quest: quest)
.frame(height: rowHeight)
}
Spacer(minLength: 0)
}
}
}
.padding(10)
.background(WidgetCellBackground())
}
}
/// 1 + ( 2 / 2)
struct GoalWithQuestsCellView: View {
let goal: GoalSnapshot
var body: some View {
HStack(alignment: .top, spacing: 10) {
GoalBarsCellView(goal: goal)
.frame(maxWidth: .infinity)
QuestBarsColumn(quests: goal.quests)
.frame(maxWidth: .infinity, maxHeight: .infinity)
}
}
}
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)
}
}
}
@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)
} else {
WidgetBlankCellView()
}
}
}
case .oneGoalAllQuests:
if let goal = entry.goals.first ?? nil {
VStack(spacing: 8) {
GoalBarsCellView(goal: goal)
.frame(maxHeight: 130)
QuestBarsColumn(quests: goal.quests)
.frame(maxWidth: .infinity, maxHeight: .infinity)
}
}
}
}
@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)
VStack(spacing: 1) {
Text(quest.targetName)
.font(.system(size: 8, weight: .medium))
.lineLimit(1)
.foregroundStyle(.secondary)
if let streak = quest.streakLabel {
Text(streak)
.font(.system(size: 7, weight: .semibold))
.foregroundStyle(AppTheme.yellow)
.lineLimit(1)
}
}
}
}
}
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()
}
}