diff --git a/art/HappyCodingPet.px.js b/art/HappyCodingPet.px.js deleted file mode 100644 index cf0df989..00000000 --- a/art/HappyCodingPet.px.js +++ /dev/null @@ -1,97 +0,0 @@ -// HappyCoding pet sprite set. Local pxl source; outputs are copied into the -// widget asset catalog. Palette follows the app icon: mint cat, purple ink, -// gold star crown. -pal({ - k: "#2b2140", - m: "#8fe6c8", - M: "#d6fff1", - d: "#4fae93", - p: "#6b4bd6", - y: "#ffd15c", - w: "#ffffff", - e: "#2b2140", - r: "#ff8fb1", - o: "#ff9f43", - b: "#8ecbff", -}) - -sprite("cat_base", { w: 32, h: 32, outline: "k" }, - // tail - ellipse(27, 24, 3, 6, "m"), - // body - ellipse(16, 24, 8, 7, "m"), - ellipse(16, 25, 5, 5, "M"), - // head - ellipse(16, 13, 10, 9, "m"), - // ears - poly([6, 9, 8, 1, 13, 7], "m"), - poly([26, 9, 24, 1, 19, 7], "m"), - poly([8, 8, 9, 4, 11, 7], "r"), - poly([24, 8, 23, 4, 21, 7], "r"), - // face - rect(11, 12, 2, 3, "e"), - rect(19, 12, 2, 3, "e"), - px(11, 12, "w"), - px(19, 12, "w"), - px(16, 16, "r"), - px(15, 17, "r"), - px(17, 17, "r"), - // paws - ellipse(10, 29, 3, 2, "M"), - ellipse(22, 29, 3, 2, "M"), - // crown star - poly([16, 1, 17, 3, 19, 3, 18, 5, 18, 7, 16, 6, 14, 7, 14, 5, 13, 3, 15, 3], "y") -) - -sprite("cat_happy", { base: "cat_base", w: 32, h: 32 }, - // connected waving arm - poly([23, 21, 25, 17, 28, 17, 28, 20, 25, 22], "m"), - ellipse(27, 17, 2, 2, "M"), - // blush - px(10, 17, "r"), - px(22, 17, "r") -) - -sprite("cat_working", { base: "cat_base", w: 32, h: 32 }, - // little laptop - rect(9, 27, 14, 3, "d"), - rect(10, 24, 12, 3, "b"), - rect(11, 25, 10, 1, "M"), - // focused brows - hline(11, 11, 2, "e"), - hline(19, 11, 2, "e") -) - -sprite("cat_attention", { base: "cat_base", w: 32, h: 32 }, - // alert badge above the right ear - circ(28, 5, 3, "o"), - rect(27, 3, 2, 2, "w"), - px(27, 6, "w"), - // raised brows - hline(10, 11, 3, "e"), - hline(19, 11, 3, "e") -) - -sprite("cat_completed", { base: "cat_base", w: 32, h: 32 }, - // raised arms and confetti - poly([9, 22, 5, 18, 8, 16, 11, 21], "m"), - ellipse(5, 18, 2, 2, "M"), - poly([23, 22, 27, 18, 24, 16, 21, 21], "m"), - ellipse(27, 18, 2, 2, "M"), - px(3, 8, "y"), px(7, 5, "r"), px(25, 6, "b"), px(29, 11, "y"), - px(4, 27, "p"), px(28, 28, "o") -) - -sprite("cat_sleeping", { base: "cat_base", w: 32, h: 32 }, - // clear the open eyes, then draw closed lids - rect(10, 11, 4, 4, "m"), - rect(18, 11, 4, 4, "m"), - hline(11, 13, 2, "e"), - hline(19, 13, 2, "e"), - px(16, 16, "r"), - // z marks - line(24, 8, 27, 8, "b"), line(27, 8, 24, 11, "b"), line(24, 11, 27, 11, "b"), - line(28, 3, 30, 3, "b"), line(30, 3, 28, 5, "b"), line(28, 5, 30, 5, "b") -) - -sheet("cats", ["cat_happy", "cat_working", "cat_attention", "cat_completed", "cat_sleeping"], { cols: 5, pad: 2 }) diff --git a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetAttention.imageset/Contents.json b/ios/HapiWidgets/Assets.xcassets/HappyCodingPetAttention.imageset/Contents.json deleted file mode 100644 index a624586a..00000000 --- a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetAttention.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images": [ - { - "idiom": "universal", - "filename": "happycodingpetattention.png", - "scale": "1x" - }, - { - "idiom": "universal", - "filename": "happycodingpetattention@2x.png", - "scale": "2x" - }, - { - "idiom": "universal", - "filename": "happycodingpetattention@3x.png", - "scale": "3x" - } - ], - "info": { - "author": "xcode", - "version": 1 - } -} diff --git a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetAttention.imageset/happycodingpetattention.png b/ios/HapiWidgets/Assets.xcassets/HappyCodingPetAttention.imageset/happycodingpetattention.png deleted file mode 100644 index cc1239c3..00000000 Binary files a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetAttention.imageset/happycodingpetattention.png and /dev/null differ diff --git a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetAttention.imageset/happycodingpetattention@2x.png b/ios/HapiWidgets/Assets.xcassets/HappyCodingPetAttention.imageset/happycodingpetattention@2x.png deleted file mode 100644 index 706c9ff0..00000000 Binary files a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetAttention.imageset/happycodingpetattention@2x.png and /dev/null differ diff --git a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetAttention.imageset/happycodingpetattention@3x.png b/ios/HapiWidgets/Assets.xcassets/HappyCodingPetAttention.imageset/happycodingpetattention@3x.png deleted file mode 100644 index 546d1a9a..00000000 Binary files a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetAttention.imageset/happycodingpetattention@3x.png and /dev/null differ diff --git a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetCompleted.imageset/Contents.json b/ios/HapiWidgets/Assets.xcassets/HappyCodingPetCompleted.imageset/Contents.json deleted file mode 100644 index 466897b1..00000000 --- a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetCompleted.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images": [ - { - "idiom": "universal", - "filename": "happycodingpetcompleted.png", - "scale": "1x" - }, - { - "idiom": "universal", - "filename": "happycodingpetcompleted@2x.png", - "scale": "2x" - }, - { - "idiom": "universal", - "filename": "happycodingpetcompleted@3x.png", - "scale": "3x" - } - ], - "info": { - "author": "xcode", - "version": 1 - } -} diff --git a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetCompleted.imageset/happycodingpetcompleted.png b/ios/HapiWidgets/Assets.xcassets/HappyCodingPetCompleted.imageset/happycodingpetcompleted.png deleted file mode 100644 index b642bfa6..00000000 Binary files a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetCompleted.imageset/happycodingpetcompleted.png and /dev/null differ diff --git a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetCompleted.imageset/happycodingpetcompleted@2x.png b/ios/HapiWidgets/Assets.xcassets/HappyCodingPetCompleted.imageset/happycodingpetcompleted@2x.png deleted file mode 100644 index 9a2caec5..00000000 Binary files a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetCompleted.imageset/happycodingpetcompleted@2x.png and /dev/null differ diff --git a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetCompleted.imageset/happycodingpetcompleted@3x.png b/ios/HapiWidgets/Assets.xcassets/HappyCodingPetCompleted.imageset/happycodingpetcompleted@3x.png deleted file mode 100644 index ffd2602c..00000000 Binary files a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetCompleted.imageset/happycodingpetcompleted@3x.png and /dev/null differ diff --git a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetIdle.imageset/Contents.json b/ios/HapiWidgets/Assets.xcassets/HappyCodingPetIdle.imageset/Contents.json deleted file mode 100644 index 377eb253..00000000 --- a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetIdle.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images": [ - { - "idiom": "universal", - "filename": "happycodingpetidle.png", - "scale": "1x" - }, - { - "idiom": "universal", - "filename": "happycodingpetidle@2x.png", - "scale": "2x" - }, - { - "idiom": "universal", - "filename": "happycodingpetidle@3x.png", - "scale": "3x" - } - ], - "info": { - "author": "xcode", - "version": 1 - } -} diff --git a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetIdle.imageset/happycodingpetidle.png b/ios/HapiWidgets/Assets.xcassets/HappyCodingPetIdle.imageset/happycodingpetidle.png deleted file mode 100644 index ee1e4f7c..00000000 Binary files a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetIdle.imageset/happycodingpetidle.png and /dev/null differ diff --git a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetIdle.imageset/happycodingpetidle@2x.png b/ios/HapiWidgets/Assets.xcassets/HappyCodingPetIdle.imageset/happycodingpetidle@2x.png deleted file mode 100644 index 36e2726a..00000000 Binary files a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetIdle.imageset/happycodingpetidle@2x.png and /dev/null differ diff --git a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetIdle.imageset/happycodingpetidle@3x.png b/ios/HapiWidgets/Assets.xcassets/HappyCodingPetIdle.imageset/happycodingpetidle@3x.png deleted file mode 100644 index 92c95bfe..00000000 Binary files a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetIdle.imageset/happycodingpetidle@3x.png and /dev/null differ diff --git a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetOnline.imageset/Contents.json b/ios/HapiWidgets/Assets.xcassets/HappyCodingPetOnline.imageset/Contents.json deleted file mode 100644 index 0a29d1b2..00000000 --- a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetOnline.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images": [ - { - "idiom": "universal", - "filename": "happycodingpetonline.png", - "scale": "1x" - }, - { - "idiom": "universal", - "filename": "happycodingpetonline@2x.png", - "scale": "2x" - }, - { - "idiom": "universal", - "filename": "happycodingpetonline@3x.png", - "scale": "3x" - } - ], - "info": { - "author": "xcode", - "version": 1 - } -} diff --git a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetOnline.imageset/happycodingpetonline.png b/ios/HapiWidgets/Assets.xcassets/HappyCodingPetOnline.imageset/happycodingpetonline.png deleted file mode 100644 index 455a8f2a..00000000 Binary files a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetOnline.imageset/happycodingpetonline.png and /dev/null differ diff --git a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetOnline.imageset/happycodingpetonline@2x.png b/ios/HapiWidgets/Assets.xcassets/HappyCodingPetOnline.imageset/happycodingpetonline@2x.png deleted file mode 100644 index 0aa0b16f..00000000 Binary files a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetOnline.imageset/happycodingpetonline@2x.png and /dev/null differ diff --git a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetOnline.imageset/happycodingpetonline@3x.png b/ios/HapiWidgets/Assets.xcassets/HappyCodingPetOnline.imageset/happycodingpetonline@3x.png deleted file mode 100644 index be03bb06..00000000 Binary files a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetOnline.imageset/happycodingpetonline@3x.png and /dev/null differ diff --git a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetWorking.imageset/Contents.json b/ios/HapiWidgets/Assets.xcassets/HappyCodingPetWorking.imageset/Contents.json deleted file mode 100644 index 703f5a76..00000000 --- a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetWorking.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images": [ - { - "idiom": "universal", - "filename": "happycodingpetworking.png", - "scale": "1x" - }, - { - "idiom": "universal", - "filename": "happycodingpetworking@2x.png", - "scale": "2x" - }, - { - "idiom": "universal", - "filename": "happycodingpetworking@3x.png", - "scale": "3x" - } - ], - "info": { - "author": "xcode", - "version": 1 - } -} diff --git a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetWorking.imageset/happycodingpetworking.png b/ios/HapiWidgets/Assets.xcassets/HappyCodingPetWorking.imageset/happycodingpetworking.png deleted file mode 100644 index 7dd3ad54..00000000 Binary files a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetWorking.imageset/happycodingpetworking.png and /dev/null differ diff --git a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetWorking.imageset/happycodingpetworking@2x.png b/ios/HapiWidgets/Assets.xcassets/HappyCodingPetWorking.imageset/happycodingpetworking@2x.png deleted file mode 100644 index 4fca3433..00000000 Binary files a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetWorking.imageset/happycodingpetworking@2x.png and /dev/null differ diff --git a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetWorking.imageset/happycodingpetworking@3x.png b/ios/HapiWidgets/Assets.xcassets/HappyCodingPetWorking.imageset/happycodingpetworking@3x.png deleted file mode 100644 index 8db07e7b..00000000 Binary files a/ios/HapiWidgets/Assets.xcassets/HappyCodingPetWorking.imageset/happycodingpetworking@3x.png and /dev/null differ diff --git a/ios/HapiWidgets/SessionLiveActivityWidget.swift b/ios/HapiWidgets/SessionLiveActivityWidget.swift index 0e6900c1..b8f8d8ac 100644 --- a/ios/HapiWidgets/SessionLiveActivityWidget.swift +++ b/ios/HapiWidgets/SessionLiveActivityWidget.swift @@ -27,7 +27,6 @@ struct SessionLiveActivityWidget: Widget { } dynamicIsland: { context in let state = Self.decrypt(context.state, sessionId: context.attributes.sessionId) let color = state?.status.tint ?? .gray - let petName = Self.petName(for: state?.status) let detailText = Self.detailText( for: context.attributes.sessionId, status: state?.status @@ -35,10 +34,11 @@ struct SessionLiveActivityWidget: Widget { return DynamicIsland { DynamicIslandExpandedRegion(.leading) { HStack(alignment: .center, spacing: 7) { - Image(petName) + Image("HappyCodingIcon") .resizable() .scaledToFit() .frame(width: 22, height: 22) + .clipShape(RoundedRectangle(cornerRadius: 5, style: .continuous)) VStack(alignment: .leading, spacing: 1) { Text(verbatim: state?.title ?? "HappyCoding") .font(.subheadline.weight(.semibold)) @@ -85,10 +85,11 @@ struct SessionLiveActivityWidget: Widget { } } compactLeading: { ZStack(alignment: .bottomTrailing) { - Image(petName) + Image("HappyCodingIcon") .resizable() .scaledToFit() .frame(width: 18, height: 18) + .clipShape(RoundedRectangle(cornerRadius: 4, style: .continuous)) Circle() .fill(color) .frame(width: 6, height: 6) @@ -110,25 +111,15 @@ struct SessionLiveActivityWidget: Widget { .font(.caption2) } } minimal: { - Image(petName) + Image("HappyCodingIcon") .resizable() .scaledToFit() .frame(width: 16, height: 16) + .clipShape(Circle()) } } } - static func petName(for status: LiveActivityContentState.Status?) -> String { - switch status { - case .working: return "HappyCodingPetWorking" - case .needsApproval, .needsInput, .needsAttention, .error: - return "HappyCodingPetAttention" - case .done: return "HappyCodingPetCompleted" - case .idle: return "HappyCodingPetIdle" - case .none: return "HappyCodingPetOnline" - } - } - private static func detailText( for sessionId: String, status: LiveActivityContentState.Status? @@ -175,10 +166,6 @@ private struct SessionActivityLockScreen: View { return trimmed.isEmpty ? nil : trimmed } - private var petName: String { - SessionLiveActivityWidget.petName(for: state?.status) - } - private var dateLabel: String? { guard let state else { return nil } return Date(timeIntervalSince1970: Double(state.updatedAt) / 1000) @@ -189,10 +176,11 @@ private struct SessionActivityLockScreen: View { Group { if let state { HStack(alignment: .center, spacing: 12) { - Image(petName) + Image("HappyCodingIcon") .resizable() .scaledToFit() .frame(width: 58, height: 58) + .clipShape(RoundedRectangle(cornerRadius: 13, style: .continuous)) VStack(alignment: .leading, spacing: 4) { Text(state.title) @@ -237,10 +225,11 @@ private struct SessionActivityLockScreen: View { .frame(maxWidth: .infinity, alignment: .leading) } else { HStack(spacing: 8) { - Image("HappyCodingPetOnline") + Image("HappyCodingIcon") .resizable() .scaledToFit() .frame(width: 28, height: 28) + .clipShape(RoundedRectangle(cornerRadius: 6, style: .continuous)) VStack(alignment: .leading, spacing: 1) { Text(verbatim: "HappyCoding") .font(.subheadline.weight(.semibold))