diff --git a/Chowder/Chowder/Assets.xcassets/AppIcon.appiconset/Contents.json b/Chowder/Chowder/Assets.xcassets/AppIcon.appiconset/Contents.json index 9edb44a..ac8fe45 100644 --- a/Chowder/Chowder/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Chowder/Chowder/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,82 +1,10 @@ { "images" : [ { - "filename" : "content.png", + "filename" : "chowder.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "tinted" - } - ], - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "16x16" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "16x16" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "32x32" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "32x32" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "128x128" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "128x128" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "256x256" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "256x256" - }, - { - "idiom" : "mac", - "scale" : "1x", - "size" : "512x512" - }, - { - "idiom" : "mac", - "scale" : "2x", - "size" : "512x512" } ], "info" : { diff --git a/Chowder/Chowder/Assets.xcassets/AppIcon.appiconset/chowder.png b/Chowder/Chowder/Assets.xcassets/AppIcon.appiconset/chowder.png new file mode 100644 index 0000000..862cc09 Binary files /dev/null and b/Chowder/Chowder/Assets.xcassets/AppIcon.appiconset/chowder.png differ diff --git a/Chowder/Chowder/Assets.xcassets/AppIcon.appiconset/content.png b/Chowder/Chowder/Assets.xcassets/AppIcon.appiconset/content.png deleted file mode 100644 index d1af774..0000000 Binary files a/Chowder/Chowder/Assets.xcassets/AppIcon.appiconset/content.png and /dev/null differ diff --git a/Chowder/Chowder/Assets.xcassets/larry.imageset/Contents.json b/Chowder/Chowder/Assets.xcassets/larry.imageset/Contents.json deleted file mode 100644 index 5ca714a..0000000 --- a/Chowder/Chowder/Assets.xcassets/larry.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "filename" : "larry.png", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/Chowder/Chowder/Assets.xcassets/larry.imageset/larry.png b/Chowder/Chowder/Assets.xcassets/larry.imageset/larry.png deleted file mode 100644 index d77c523..0000000 Binary files a/Chowder/Chowder/Assets.xcassets/larry.imageset/larry.png and /dev/null differ diff --git a/Chowder/Chowder/Assets.xcassets/tick.imageset/Contents.json b/Chowder/Chowder/Assets.xcassets/tick.imageset/Contents.json new file mode 100644 index 0000000..0eb0c8a --- /dev/null +++ b/Chowder/Chowder/Assets.xcassets/tick.imageset/Contents.json @@ -0,0 +1,16 @@ +{ + "images" : [ + { + "filename" : "tick.svg", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "preserves-vector-representation" : true, + "template-rendering-intent" : "template" + } +} diff --git a/Chowder/Chowder/Assets.xcassets/tick.imageset/tick.svg b/Chowder/Chowder/Assets.xcassets/tick.imageset/tick.svg new file mode 100644 index 0000000..b6aea16 --- /dev/null +++ b/Chowder/Chowder/Assets.xcassets/tick.imageset/tick.svg @@ -0,0 +1,3 @@ + + + diff --git a/Chowder/ChowderActivityWidget/ChowderLiveActivity.swift b/Chowder/ChowderActivityWidget/ChowderLiveActivity.swift index a07c5a0..ce26906 100644 --- a/Chowder/ChowderActivityWidget/ChowderLiveActivity.swift +++ b/Chowder/ChowderActivityWidget/ChowderLiveActivity.swift @@ -34,8 +34,7 @@ struct ChowderLiveActivity: Widget { DynamicIslandExpandedRegion(.bottom) { if let prev = context.state.previousIntent, !context.state.isFinished { HStack(spacing: 6) { - Image(systemName: "checkmark") - .font(.system(size: 8, weight: .bold)) + Image("tick") .foregroundStyle(.green) Text(prev) .font(.caption2) @@ -153,18 +152,23 @@ struct ChowderLiveActivity: Widget { // Stacked cards for previous intents - keyed by the intent text itself ZStack { - if let endDate = state.intentEndDate { - VStack(alignment: .center) { - Image(systemName: "checkmark.circle.fill") + if state.intentEndDate != nil { + VStack(alignment: .center, spacing: 8) { + Image("tick") .resizable() .scaledToFit() - .foregroundStyle(Color.green) - .frame(width: 24) - .background(Color.white, in: .circle) + .foregroundStyle(Color.white) + .frame(width: 28) + .background(Color.green, in: .circle) .compositingGroup() - Text(state.subject ?? "Task complete") - .font(.subheadline.bold()) - .foregroundStyle(primaryForeground) + VStack (spacing: 2) { + Text(state.subject ?? "Task complete") + .font(.subheadline.bold()) + .foregroundStyle(primaryForeground) + Text("See more details…") + .font(.footnote) + .foregroundStyle(.secondary) + } } .frame(maxWidth: .infinity) .padding(.bottom, 12) @@ -205,7 +209,7 @@ struct ChowderLiveActivity: Widget { .transition(.blurReplace) } } - .frame(height: 70) + .frame(height: 80) .padding(.bottom, 8) .frame(maxHeight: .infinity) .zIndex(10) @@ -255,7 +259,7 @@ struct ChowderLiveActivity: Widget { .padding(.leading, 4) .padding(.trailing, 12) .font(.footnote.bold()) - .opacity(isWaiting || state.isFinished ? 0.24 : 1) + .opacity(isWaiting || state.isFinished ? 0.36 : 1) } .padding(.horizontal, 8) .padding(.vertical, 10) @@ -283,13 +287,17 @@ struct IntentCard: View { let isBehind: Bool var body: some View { - HStack(spacing: 10) { - Image(systemName: "checkmark.circle.fill") + HStack(spacing: 8) { + Image("tick") .resizable() .scaledToFit() .symbolRenderingMode(.hierarchical) - .foregroundStyle(.green) - .frame(width: 15) + .foregroundStyle(.black.opacity(0.5)) + .frame(width: 21) + .background( + Circle() + .foregroundStyle(.black.opacity(0.12)) + ) Text(text) .font(.callout)