feat(appearance): use a light expanded dashboard #79
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| import SwiftUI | ||
|
|
||
| enum AppAppearance: String, CaseIterable, Hashable { | ||
| case system | ||
| case light | ||
| case dark | ||
|
|
||
| var label: String { | ||
| switch self { | ||
| case .system: "System" | ||
| case .light: "Light" | ||
| case .dark: "Dark" | ||
| } | ||
| } | ||
|
|
||
| var colorScheme: ColorScheme? { | ||
| switch self { | ||
| case .system: nil | ||
| case .light: .light | ||
| case .dark: .dark | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @MainActor | ||
| final class AppearanceStore: ObservableObject { | ||
| static let shared = AppearanceStore() | ||
| static let key = "MacIsland.appearance" | ||
|
|
||
| @Published var appearance: AppAppearance { | ||
| didSet { | ||
| UserDefaults.standard.set(appearance.rawValue, forKey: Self.key) | ||
| } | ||
| } | ||
|
|
||
| private init() { | ||
| let raw = UserDefaults.standard.string(forKey: Self.key) ?? "" | ||
| appearance = AppAppearance(rawValue: raw) ?? .dark | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,6 +13,9 @@ enum UrgencyColor { | |
| let usedPercent = mode == .used ? percent : 100 - percent | ||
| if usedPercent >= 90 { return red } | ||
| if usedPercent >= 70 { return amber } | ||
| // Normal readings follow the active surface. Fixed white disappears | ||
| // on the expanded light panel; Color.primary resolves to black there | ||
| // and white in the dark expanded panel. | ||
| return Color.primary | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,7 +11,7 @@ struct BarChart: View { | |
| ChartHead(value: value, label: label) | ||
| GeometryReader { geo in | ||
| ZStack(alignment: .leading) { | ||
| Capsule().fill(Color.primary.opacity(0.06)).frame(height: 4) | ||
| Capsule() | ||
| .fill(color) | ||
| .frame(width: geo.size.width * CGFloat(value / 100), height: 4) | ||
|
|
@@ -20,7 +20,7 @@ struct BarChart: View { | |
| // hint at scale without competing with the fill. | ||
| ForEach([0.25, 0.5, 0.75], id: \.self) { p in | ||
| Rectangle() | ||
| .fill(Color.primary.opacity(0.12)) | ||
| .frame(width: 1, height: 8) | ||
| .offset(x: geo.size.width * p) | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,7 @@ struct ChartHead: View { | |
| HStack(alignment: .firstTextBaseline) { | ||
| Text(label) | ||
| .font(Typography.label) | ||
| .foregroundStyle(Color.primary.opacity(0.78)) | ||
| .textCase(.lowercase) | ||
| Spacer() | ||
| HStack(alignment: .firstTextBaseline, spacing: 1) { | ||
|
|
@@ -21,7 +21,7 @@ struct ChartHead: View { | |
| .animation(.strongEaseOut, value: value) | ||
| Text("%") | ||
| .font(Typography.label) | ||
| .foregroundStyle(Color.primary.opacity(0.62)) | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -33,7 +33,7 @@ struct ChartFoot: View { | |
| var body: some View { | ||
| Text(caption) | ||
| .font(Typography.caption) | ||
| .foregroundStyle(Color.primary.opacity(0.64)) | ||
| .lineLimit(1) | ||
| .truncationMode(.tail) | ||
| .frame(maxWidth: .infinity, alignment: .leading) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,17 +21,17 @@ struct NoReadingChart: View { | |
| HStack(alignment: .firstTextBaseline) { | ||
| Text(label) | ||
| .font(Typography.label) | ||
| .foregroundStyle(Color.primary.opacity(0.55)) | ||
| .textCase(.lowercase) | ||
| Spacer() | ||
| Text(verbatim: "—") | ||
| .font(Typography.chartValue) | ||
| .foregroundStyle(Color.primary.opacity(0.3)) | ||
| } | ||
| // Empty track, no fill: the scale is still there, we just have | ||
| // nothing to put on it. | ||
| Capsule() | ||
| .fill(Color.primary.opacity(0.06)) | ||
| .frame(height: 4) | ||
| .frame(height: 8) | ||
| ChartFoot(caption: sub) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,12 +11,12 @@ struct NumericChart: View { | |
| HStack(alignment: .firstTextBaseline) { | ||
| Text(label) | ||
| .font(Typography.label) | ||
| .foregroundStyle(Color.primary.opacity(0.78)) | ||
| .textCase(.lowercase) | ||
| Spacer() | ||
| Text(sub) | ||
| .font(Typography.caption) | ||
| .foregroundStyle(Color.primary.opacity(0.68)) | ||
| } | ||
| HStack(alignment: .firstTextBaseline, spacing: 2) { | ||
| Text("\(Int(value))") | ||
|
|
@@ -26,14 +26,14 @@ struct NumericChart: View { | |
| .animation(.strongEaseOut, value: value) | ||
| Text("%") | ||
| .font(Typography.unit) | ||
| .foregroundStyle(Color.primary.opacity(0.58)) | ||
| } | ||
| .frame(maxWidth: .infinity, alignment: .leading) | ||
| // Thin 3pt meter underneath echoes the value at a glance and | ||
| // glows in the brand color so the big number doesn't sit alone. | ||
| GeometryReader { geo in | ||
| ZStack(alignment: .leading) { | ||
| Capsule().fill(Color.primary.opacity(0.05)).frame(height: 3) | ||
| Capsule() | ||
| .fill(color) | ||
| .frame(width: geo.size.width * CGFloat(value / 100), height: 3) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,7 @@ struct RingChart: View { | |
| VStack(alignment: .leading, spacing: 8) { | ||
| HStack(spacing: 14) { | ||
| ZStack { | ||
| Circle().stroke(Color.primary.opacity(0.07), lineWidth: 3) | ||
| Circle() | ||
| .trim(from: 0, to: max(0.001, value / 100)) | ||
| .stroke(color, style: StrokeStyle(lineWidth: 3, lineCap: .round)) | ||
|
|
@@ -26,7 +26,7 @@ struct RingChart: View { | |
| VStack(alignment: .leading, spacing: 4) { | ||
| Text(label) | ||
| .font(Typography.label) | ||
| .foregroundStyle(Color.primary.opacity(0.55)) | ||
| .textCase(.lowercase) | ||
| HStack(alignment: .firstTextBaseline, spacing: 1) { | ||
| Text("\(Int(value))") | ||
|
|
@@ -36,14 +36,14 @@ struct RingChart: View { | |
| .animation(.strongEaseOut, value: value) | ||
| Text("%") | ||
| .font(Typography.label) | ||
| .foregroundStyle(Color.primary.opacity(0.5)) | ||
| } | ||
| } | ||
| Spacer() | ||
| } | ||
| Text(sub) | ||
| .font(Typography.caption) | ||
| .foregroundStyle(Color.primary.opacity(0.60)) | ||
| .lineLimit(1) | ||
| .truncationMode(.tail) | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -93,7 +93,7 @@ private struct SparkSVG: View { | |
| path.move(to: CGPoint(x: 0, y: h * p)) | ||
| path.addLine(to: CGPoint(x: w, y: h * p)) | ||
| } | ||
| .stroke(Color.primary.opacity(0.04), lineWidth: 1) | ||
| } | ||
| // Dotted threshold at the current value — the line reading | ||
| // "this is now" against the synthesized history. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,7 +14,7 @@ struct SteppedChart: View { | |
| let filled = (value / 100) * Double(segments) | ||
| ForEach(0..<segments, id: \.self) { i in | ||
| RoundedRectangle(cornerRadius: 1.5) | ||
| .fill(Double(i) < floor(filled) ? color : Color.primary.opacity(0.10)) | ||
| .frame(maxWidth: .infinity) | ||
| .frame(height: 16) | ||
| // ~7ms stagger across 30 cells = ~210ms sweep when | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ import SwiftUI | |
| struct CodexResetStatus: View { | ||
| @ObservedObject private var usageStore = UsageStore.shared | ||
| @ObservedObject private var visibility = ProviderVisibilityStore.shared | ||
| @Environment(\.colorScheme) private var colorScheme | ||
|
|
||
| @State private var showPopover = false | ||
| @State private var badgeHovered = false | ||
|
|
@@ -39,13 +40,13 @@ struct CodexResetStatus: View { | |
| .foregroundStyle(IslandColor.codex.opacity(badgeHovered || showPopover ? 1 : 0.8)) | ||
| Text(resetAvailabilityText) | ||
| .font(Typography.caption) | ||
| .foregroundStyle(Color.primary.opacity(badgeHovered || showPopover ? 0.85 : 0.55)) | ||
| } | ||
| .padding(.horizontal, 6) | ||
| .padding(.vertical, 3) | ||
| .background( | ||
| RoundedRectangle(cornerRadius: 5) | ||
| .fill(Color.primary.opacity(badgeHovered || showPopover ? 0.05 : 0)) | ||
| ) | ||
| .contentShape(RoundedRectangle(cornerRadius: 5)) | ||
| .onHover { hovered in | ||
|
|
@@ -82,14 +83,14 @@ struct CodexResetStatus: View { | |
| .frame(width: 210, alignment: .leading) | ||
| .background( | ||
| RoundedRectangle(cornerRadius: 10) | ||
| .fill(colorScheme == .light ? IslandColor.expandedLightBackground : .black) | ||
| .overlay( | ||
| RoundedRectangle(cornerRadius: 10) | ||
| .fill(Color.primary.opacity(0.04)) | ||
| ) | ||
| .overlay( | ||
| RoundedRectangle(cornerRadius: 10) | ||
| .strokeBorder(Color.primary.opacity(0.10), lineWidth: 0.5) | ||
|
coderabbitai[bot] marked this conversation as resolved.
|
||
| ) | ||
| ) | ||
| .shadow(color: .black.opacity(0.5), radius: 16, y: 8) | ||
|
|
@@ -108,20 +109,20 @@ struct CodexResetStatus: View { | |
| Text(L10n.tr("EXPIRES")) | ||
| .font(Typography.sectionLabel) | ||
| .tracking(0.8) | ||
| .foregroundStyle(Color.primary.opacity(0.40)) | ||
| Spacer(minLength: 8) | ||
|
|
||
| Text(absolute(credit.expiresAt)) | ||
| .font(Typography.bodyNumber) | ||
| .foregroundStyle(Color.primary.opacity(0.95)) | ||
|
There was a problem hiding this comment.
When Light appearance—or System on a light macOS—is active and reset credits are available, this Useful? React with 👍 / 👎. |
||
| .lineLimit(1) | ||
| } | ||
| .frame(maxWidth: .infinity, alignment: .leading) | ||
| .padding(.horizontal, 8) | ||
| .padding(.vertical, 6) | ||
| .background( | ||
| RoundedRectangle(cornerRadius: 6) | ||
| .fill(Color.primary.opacity(0.05)) | ||
| ) | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win
Clarify the appearance option list.
light/dark/system appearanceis an ambiguous slash compound modifier. Uselight, dark, or system appearanceso the three options read clearly.Proposed wording
📝 Committable suggestion
🧰 Tools
🪛 LanguageTool
[uncategorized] ~187-~187: If this is a compound adjective that modifies the following noun, use a hyphen.
Context: ...k/system appearance, Always show usage, Low Power Mode, configurable limit alerts, and ...
(EN_COMPOUND_ADJECTIVE_INTERNAL)
🤖 Prompt for AI Agents
Source: Linters/SAST tools