Skip to content

Small style changes #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aaronabentheuer wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Small style changes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 1 addition & 73 deletions Chowder/Chowder/Assets.xcassets/AppIcon.appiconset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" : {
Expand Down
Binary file added Chowder/Chowder/Assets.xcassets/AppIcon.appiconset/chowder.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed Chowder/Chowder/Assets.xcassets/AppIcon.appiconset/content.png
View file
Open in desktop
Binary file not shown.
12 changes: 0 additions & 12 deletions Chowder/Chowder/Assets.xcassets/larry.imageset/Contents.json
View file
Open in desktop

This file was deleted.

Binary file removed Chowder/Chowder/Assets.xcassets/larry.imageset/larry.png
View file
Open in desktop
Binary file not shown.
16 changes: 16 additions & 0 deletions Chowder/Chowder/Assets.xcassets/tick.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"images" : [
{
"filename" : "tick.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true,
"template-rendering-intent" : "template"
}
}
3 changes: 3 additions & 0 deletions Chowder/Chowder/Assets.xcassets/tick.imageset/tick.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 25 additions & 17 deletions Chowder/ChowderActivityWidget/ChowderLiveActivity.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -205,7 +209,7 @@ struct ChowderLiveActivity: Widget {
.transition(.blurReplace)
}
}
.frame(height: 70)
.frame(height: 80)
.padding(.bottom, 8)
.frame(maxHeight: .infinity)
.zIndex(10)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down