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
143 lines
5.1 KiB
Swift
143 lines
5.1 KiB
Swift
//
|
|
// Settings.swift
|
|
// Haru_Danim
|
|
//
|
|
// 앱 설정 키, 무료 제한 (CLAUDE.md §6.6, §7)
|
|
//
|
|
|
|
import Foundation
|
|
|
|
enum SettingsKeys {
|
|
/// "light" | "dark"
|
|
static let theme = "settings.theme"
|
|
/// "ko" | "en" | "ja"
|
|
static let language = "settings.language"
|
|
/// Calendar.weekday 값 (1=일요일 ... 7=토요일). 기본값 2(월요일)
|
|
static let weekStartWeekday = "settings.weekStartWeekday"
|
|
/// 자정 기준 분 단위 오프셋. 기본값 0 (00:00)
|
|
static let dayStartMinutes = "settings.dayStartMinutes"
|
|
/// "latest"(가장 나중에 시작) | "earliest"(가장 먼저 시작). 기본값 latest
|
|
static let liveActivityMode = "settings.liveActivityMode"
|
|
// 프리미엄 여부는 Shared/Premium.swift의 PremiumGate.cacheKey (App Group defaults) 사용
|
|
/// 메인 탭 그리드 한 줄에 표시할 행동 버튼 개수. 기본값 3
|
|
static let gridColumns = "settings.gridColumns"
|
|
/// 이 시간(초)보다 짧게 측정된 세션은 기록하지 않음. 0 = 사용 안 함
|
|
static let minSessionSeconds = "settings.minSessionSeconds"
|
|
/// 탭바에 직접 노출할 탭(더보기 제외 1~3개). AppTab rawValue를 쉼표로 연결한 문자열
|
|
static let visibleTabs = "settings.visibleTabs"
|
|
/// 모음 탭 목표 카드 표시 방식. GoalCardStyle rawValue ("perQuest" | "combined")
|
|
static let goalCardStyle = "settings.goalCardStyle"
|
|
/// iPhone 내비게이션 방식. NavStyle rawValue ("tabBar" | "radial"). 기기 로컬(비동기화)
|
|
static let navStyle = "settings.navStyle"
|
|
/// 플로팅 캡슐 메뉴에 펼칠 탭 순서. AppTab rawValue를 쉼표로 연결. 기기 로컬(비동기화)
|
|
static let radialTabOrder = "settings.radialTabOrder"
|
|
}
|
|
|
|
/// iPhone 전용 내비게이션 방식 (iPad·Mac 사이드바에는 적용되지 않음, 기기 로컬 설정)
|
|
enum NavStyle: String, CaseIterable, Identifiable {
|
|
/// 기본 하단 탭 바 (노출 탭 + 더보기)
|
|
case tabBar
|
|
/// 플로팅 글래스 캡슐(Floating Glass Capsules) 메뉴 — rawValue는 저장 호환을 위해 radial 유지
|
|
case radial
|
|
|
|
var id: String { rawValue }
|
|
|
|
var label: String {
|
|
switch self {
|
|
case .tabBar: return String(localized: "기본 하단 탭 바")
|
|
case .radial: return String(localized: "플로팅 글래스 캡슐")
|
|
}
|
|
}
|
|
}
|
|
|
|
/// 모음 탭 목표 진행 현황 카드의 표시 방식 (선택된 모든 목표 카드에 일괄 적용)
|
|
enum GoalCardStyle: String, CaseIterable, Identifiable {
|
|
/// 다짐(최대 3개)별로 하루/주간/월간 진행률을 각각 표시
|
|
case perQuest
|
|
/// 소속 다짐 전체의 하루/주간/월간 진행률을 합산(평균)해 한 번에 표시
|
|
case combined
|
|
|
|
var id: String { rawValue }
|
|
|
|
var label: String {
|
|
switch self {
|
|
case .perQuest: return String(localized: "다짐별로 각각")
|
|
case .combined: return String(localized: "전체 다짐 합산")
|
|
}
|
|
}
|
|
}
|
|
|
|
enum TabBarConfig {
|
|
/// 기본 노출 탭: 메인 · 행동 · 기록 (+더보기)
|
|
static let defaultVisibleTabs = "main,action,history"
|
|
static let maxVisible = 3
|
|
static let minVisible = 1
|
|
}
|
|
|
|
/// 짧은 기록 무시 옵션 선택지 (초)
|
|
enum MinSessionOption {
|
|
static let choices: [(seconds: Int, label: String)] = [
|
|
(0, String(localized: "사용 안 함")),
|
|
(3, String(localized: "3초")),
|
|
(5, String(localized: "5초")),
|
|
(10, String(localized: "10초")),
|
|
(30, String(localized: "30초")),
|
|
(60, String(localized: "1분")),
|
|
]
|
|
}
|
|
|
|
enum LiveActivityMode: String, CaseIterable, Identifiable {
|
|
case latest
|
|
case earliest
|
|
|
|
var id: String { rawValue }
|
|
|
|
var label: String {
|
|
switch self {
|
|
case .latest: return String(localized: "가장 나중에 시작한 행동")
|
|
case .earliest: return String(localized: "가장 먼저 시작한 행동")
|
|
}
|
|
}
|
|
}
|
|
|
|
enum AppLanguage: String, CaseIterable, Identifiable {
|
|
case ko, en, ja
|
|
|
|
var id: String { rawValue }
|
|
|
|
var label: String {
|
|
switch self {
|
|
case .ko: return "한국어"
|
|
case .en: return "English"
|
|
case .ja: return "日本語"
|
|
}
|
|
}
|
|
}
|
|
|
|
// 무료 사용 한도(FreeLimits)는 Shared/Premium.swift로 이동 (위젯·인텐트에서도 사용)
|
|
|
|
/// 집계에 필요한 설정 스냅숏
|
|
struct TrackingSettings {
|
|
var weekStartWeekday: Int
|
|
var dayStartMinutes: Int
|
|
|
|
static func current() -> TrackingSettings {
|
|
// App Group 우선(위젯·인텐트와 공유), 이관 전 값은 standard에서 폴백
|
|
let group = AppGroup.defaults
|
|
let standard = UserDefaults.standard
|
|
func intValue(_ key: String, default defaultValue: Int) -> Int {
|
|
(group.object(forKey: key) ?? standard.object(forKey: key)) as? Int ?? defaultValue
|
|
}
|
|
return TrackingSettings(
|
|
weekStartWeekday: intValue(SettingsKeys.weekStartWeekday, default: 2),
|
|
dayStartMinutes: intValue(SettingsKeys.dayStartMinutes, default: 0)
|
|
)
|
|
}
|
|
|
|
var calendar: Calendar {
|
|
var cal = Calendar.current
|
|
cal.firstWeekday = weekStartWeekday
|
|
return cal
|
|
}
|
|
}
|