Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions Lumen/Components/DarkEmptyStateView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ struct DarkEmptyStateView: View {
.frame(width: 58, height: 58)
Image(systemName: icon)
.font(.system(size: 24, weight: .semibold))
.foregroundStyle(Color(hex: "#C49A6C"))
.foregroundStyle(Color.lumenAccent)
}

VStack(spacing: 7) {
Expand Down Expand Up @@ -66,7 +66,7 @@ struct DarkEmptyStateView: View {
.foregroundStyle(.white)
.frame(maxWidth: .infinity)
.padding(.vertical, 13)
.background(Color(hex: "#C49A6C"), in: RoundedRectangle(cornerRadius: 16))
.background(Color.lumenAccent, in: RoundedRectangle(cornerRadius: 16))
}
.padding(.top, 2)
}
Expand All @@ -85,9 +85,9 @@ struct DarkEmptyStateView: View {
HStack(alignment: .top, spacing: 10) {
Text("\(index + 1)")
.font(.system(size: 11, weight: .bold))
.foregroundStyle(Color(hex: "#C49A6C"))
.foregroundStyle(Color.lumenAccent)
.frame(width: 22, height: 22)
.background(Color(hex: "#C49A6C").opacity(0.13), in: Circle())
.background(Color.lumenAccent.opacity(0.13), in: Circle())

Text(text)
.font(.system(size: 12))
Expand Down
2 changes: 1 addition & 1 deletion Lumen/Components/NowNextCard.swift
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ extension TimeOfDay {
}
.padding(20)
}
.background(Color(hex: "#0E0819"))
.background(Color.lumenBackground)
}

private func makeDate(hour: Int, minute: Int) -> Date {
Expand Down
2 changes: 1 addition & 1 deletion Lumen/Components/RoomCard.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ struct RoomCard: View {
.frame(width: 40, height: 40)
Image(systemName: room.type.iconName)
.font(.system(size: 17))
.foregroundStyle(Color(hex: "#C49A6C"))
.foregroundStyle(Color.lumenAccent)
}

Spacer()
Expand Down
24 changes: 12 additions & 12 deletions Lumen/Features/Devices/DeviceDetailView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ struct DeviceDetailView: View {
let state = viewModel.controlState(for: currentDevice)

ZStack {
Color(hex: "#0E0819").ignoresSafeArea()
Color.lumenBackground.ignoresSafeArea()
content(device: currentDevice, state: state)
}
.toolbar(.hidden, for: .navigationBar)
Expand Down Expand Up @@ -70,7 +70,7 @@ struct DeviceDetailView: View {
.frame(width: 46, height: 46)
Image(systemName: device.category.systemImage)
.font(.system(size: 20))
.foregroundStyle(Color(hex: "#C49A6C"))
.foregroundStyle(Color.lumenAccent)
}
}
}
Expand All @@ -83,7 +83,7 @@ struct DeviceDetailView: View {
DarkRow(label: "Status") {
HStack(spacing: 6) {
Circle()
.fill(device.reachability == .reachable ? Color(hex: "#6FDBA8") : Color.white.opacity(0.25))
.fill(device.reachability == .reachable ? Color.lumenSuccess : Color.white.opacity(0.25))
.frame(width: 7, height: 7)
Text(device.reachability == .reachable ? "Online" : "Offline")
.font(.system(size: 14))
Expand All @@ -102,7 +102,7 @@ struct DeviceDetailView: View {
DarkRow(label: "Power", isLast: true) {
Text(state.isPowered ? "On" : "Off")
.font(.system(size: 14))
.foregroundStyle(state.isPowered ? Color(hex: "#6FDBA8") : Color.white.opacity(0.4))
.foregroundStyle(state.isPowered ? Color.lumenSuccess : Color.white.opacity(0.4))
}
}
}
Expand All @@ -117,8 +117,8 @@ struct DeviceDetailView: View {
if let linked = viewModel.linkedPlannedDevice(for: device) {
DarkRow(label: "Linked to") {
HStack(spacing: 4) {
Image(systemName: "link").font(.caption).foregroundStyle(Color(hex: "#6FDBA8"))
Text(linked.displayName).font(.system(size: 14)).foregroundStyle(Color(hex: "#6FDBA8"))
Image(systemName: "link").font(.caption).foregroundStyle(Color.lumenSuccess)
Text(linked.displayName).font(.system(size: 14)).foregroundStyle(Color.lumenSuccess)
}
}
if let room = linked.room?.name {
Expand All @@ -138,7 +138,7 @@ struct DeviceDetailView: View {
Button { isShowingCommissionSheet = true } label: {
Label("Link to Planned Device", systemImage: "link")
.font(.system(size: 15, weight: .medium))
.foregroundStyle(Color(hex: "#C49A6C"))
.foregroundStyle(Color.lumenAccent)
.frame(maxWidth: .infinity, alignment: .leading)
.padding(.horizontal, 16)
.padding(.vertical, 16)
Expand All @@ -161,7 +161,7 @@ struct DeviceDetailView: View {
get: { state.isPowered },
set: { viewModel.setPower($0, deviceID: device.id) }
))
.tint(Color(hex: "#6FDBA8"))
.tint(Color.lumenSuccess)
.labelsHidden()
}
.padding(.horizontal, 16)
Expand All @@ -181,7 +181,7 @@ struct DeviceDetailView: View {
),
in: 0...1
)
.tint(Color(hex: "#C49A6C"))
.tint(Color.lumenAccent)
Image(systemName: "sun.max").foregroundStyle(Color.white.opacity(0.8))
}
Text("\(Int(state.brightness * 100))%")
Expand All @@ -206,7 +206,7 @@ struct DeviceDetailView: View {
),
in: 1800...6500
)
.tint(Color(hex: "#C49A6C"))
.tint(Color.lumenAccent)
Image(systemName: "snowflake").foregroundStyle(.blue.opacity(0.8))
}
Text("\(state.colorTemperature)K")
Expand Down Expand Up @@ -257,7 +257,7 @@ struct DeviceDetailView: View {
DarkRow(label: "Detected", isLast: true) {
Text(state.motionDetected ? "Yes" : "No")
.font(.system(size: 14))
.foregroundStyle(state.motionDetected ? Color(hex: "#C49A6C") : Color.white.opacity(0.4))
.foregroundStyle(state.motionDetected ? Color.lumenAccent : Color.white.opacity(0.4))
}
}
}
Expand All @@ -283,7 +283,7 @@ struct DeviceDetailView: View {
systemImage: state.lockState == .locked ? "lock.open.fill" : "lock.fill"
)
.font(.system(size: 15, weight: .medium))
.foregroundStyle(state.lockState == .locked ? Color(hex: "#C49A6C") : Color.white.opacity(0.6))
.foregroundStyle(state.lockState == .locked ? Color.lumenAccent : Color.white.opacity(0.6))
Spacer()
}
.padding(.horizontal, 16)
Expand Down
14 changes: 7 additions & 7 deletions Lumen/Features/Devices/DeviceListView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ struct DeviceListView: View {

var body: some View {
ZStack {
Color(hex: "#0E0819").ignoresSafeArea()
Color.lumenBackground.ignoresSafeArea()
scrollContent
}
.toolbar(.hidden, for: .navigationBar)
Expand Down Expand Up @@ -78,7 +78,7 @@ struct DeviceListView: View {
case .connecting:
DiscoveryCard(
icon: "antenna.radiowaves.left.and.right",
iconColor: Color(hex: "#C49A6C"),
iconColor: Color.lumenAccent,
title: "Looking for devices…",
message: "Scanning your HomeKit home for smart devices.",
actionLabel: nil,
Expand All @@ -90,11 +90,11 @@ struct DeviceListView: View {
case .authorizationRequired:
DiscoveryCard(
icon: "house.fill",
iconColor: Color(hex: "#C49A6C"),
iconColor: Color.lumenAccent,
title: "Connect to HomeKit",
message: "Allow Lumen to access your HomeKit home to discover devices automatically.",
actionLabel: "Open Settings",
actionColor: Color(hex: "#C49A6C"),
actionColor: Color.lumenAccent,
action: {
if let url = URL(string: UIApplication.openSettingsURLString) {
UIApplication.shared.open(url)
Expand Down Expand Up @@ -122,14 +122,14 @@ struct DeviceListView: View {
case .authorized:
if viewModel.totalCount > 0 {
HStack(spacing: 8) {
Circle().fill(Color(hex: "#6FDBA8")).frame(width: 6, height: 6)
Circle().fill(Color.lumenSuccess).frame(width: 6, height: 6)
Text("HomeKit · \(viewModel.totalCount) device\(viewModel.totalCount == 1 ? "" : "s") discovered")
.font(.system(size: 12))
.foregroundStyle(Color.white.opacity(0.45))
Spacer()
Text("\(viewModel.reachableCount) online")
.font(.system(size: 12))
.foregroundStyle(Color(hex: "#6FDBA8"))
.foregroundStyle(Color.lumenSuccess)
}
.padding(.horizontal, 16)
.padding(.vertical, 12)
Expand Down Expand Up @@ -277,7 +277,7 @@ private struct DeviceDarkRow: View {
Spacer()

Circle()
.fill(device.reachability == .reachable ? Color(hex: "#6FDBA8") : Color.white.opacity(0.2))
.fill(device.reachability == .reachable ? Color.lumenSuccess : Color.white.opacity(0.2))
.frame(width: 8, height: 8)

Image(systemName: "chevron.right")
Expand Down
18 changes: 9 additions & 9 deletions Lumen/Features/Home/DashboardSetupViews.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ struct FirstRunSetupCard: View {
HStack(alignment: .top, spacing: 12) {
ZStack {
Circle()
.fill(Color(hex: "#C49A6C").opacity(0.14))
.fill(Color.lumenAccent.opacity(0.14))
.frame(width: 44, height: 44)
Image(systemName: "door.left.hand.open")
.font(.system(size: 18, weight: .semibold))
.foregroundStyle(Color(hex: "#C49A6C"))
.foregroundStyle(Color.lumenAccent)
}

VStack(alignment: .leading, spacing: 5) {
Expand Down Expand Up @@ -45,7 +45,7 @@ struct FirstRunSetupCard: View {
.foregroundStyle(.white)
.frame(maxWidth: .infinity)
.padding(.vertical, 13)
.background(Color(hex: "#C49A6C"), in: RoundedRectangle(cornerRadius: 16))
.background(Color.lumenAccent, in: RoundedRectangle(cornerRadius: 16))
}
.accessibilityHint("Opens the room setup sheet.")
}
Expand Down Expand Up @@ -89,9 +89,9 @@ private struct DashboardSetupStepRow: View {
private var indicatorFill: Color {
switch step.state {
case .complete:
return Color(hex: "#6FDBA8").opacity(0.18)
return Color.lumenSuccess.opacity(0.18)
case .current:
return Color(hex: "#C49A6C").opacity(0.18)
return Color.lumenAccent.opacity(0.18)
case .pending:
return Color.white.opacity(0.06)
}
Expand All @@ -100,9 +100,9 @@ private struct DashboardSetupStepRow: View {
private var indicatorForeground: Color {
switch step.state {
case .complete:
return Color(hex: "#6FDBA8")
return Color.lumenSuccess
case .current:
return Color(hex: "#C49A6C")
return Color.lumenAccent
case .pending:
return Color.white.opacity(0.32)
}
Expand Down Expand Up @@ -146,10 +146,10 @@ struct LocationPermissionCard: View {
Button(action: action) {
Text(presentation.actionTitle)
.font(.system(size: 12, weight: .semibold))
.foregroundStyle(Color(hex: "#C49A6C"))
.foregroundStyle(Color.lumenAccent)
.padding(.horizontal, 12)
.padding(.vertical, 7)
.background(Color(hex: "#C49A6C").opacity(0.12), in: RoundedRectangle(cornerRadius: 14))
.background(Color.lumenAccent.opacity(0.12), in: RoundedRectangle(cornerRadius: 14))
}
.padding(.top, 4)
}
Expand Down
16 changes: 8 additions & 8 deletions Lumen/Features/Home/HomeDashboardView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ struct HomeDashboardView: View {
private var ambientBackground: some View {
ZStack {
if locationService.isAtHome {
Color(hex: "#0E0819")
Color.lumenBackground
LinearGradient(
colors: [timeOfDay.backgroundColors.first ?? .clear, .clear],
startPoint: .top,
Expand Down Expand Up @@ -207,10 +207,10 @@ struct HomeDashboardView: View {
Text(locationService.isAtHome ? "HOME MODE" : "AWAY MODE")
.font(.system(size: 10, weight: .semibold))
.tracking(2)
.foregroundStyle(locationService.isAtHome ? Color(hex: "#C49A6C") : Color.white.opacity(0.35))
.foregroundStyle(locationService.isAtHome ? Color.lumenAccent : Color.white.opacity(0.35))
Image(systemName: locationService.isAtHome ? "house.fill" : "location.fill")
.font(.system(size: 11))
.foregroundStyle(locationService.isAtHome ? Color(hex: "#C49A6C") : Color.white.opacity(0.35))
.foregroundStyle(locationService.isAtHome ? Color.lumenAccent : Color.white.opacity(0.35))
}
}
.padding(.top, 4)
Expand Down Expand Up @@ -400,10 +400,10 @@ struct HomeDashboardView: View {
.foregroundStyle(.white)
.frame(maxWidth: .infinity)
.padding(.vertical, 12)
.background(Color(hex: "#C49A6C"), in: RoundedRectangle(cornerRadius: 18))
.background(Color.lumenAccent, in: RoundedRectangle(cornerRadius: 18))
}
.padding(24)
.background(Color(hex: "#0E0819").ignoresSafeArea())
.background(Color.lumenBackground.ignoresSafeArea())
}
}

Expand Down Expand Up @@ -628,11 +628,11 @@ private struct LumenNoticedCard: View {
HStack(spacing: 8) {
Image(systemName: icon)
.font(.system(size: 12))
.foregroundStyle(Color(hex: "#C49A6C"))
.foregroundStyle(Color.lumenAccent)
Text("Lumen noticed")
.font(.system(size: 11, weight: .semibold))
.tracking(1)
.foregroundStyle(Color(hex: "#C49A6C"))
.foregroundStyle(Color.lumenAccent)
}

Text(message)
Expand Down Expand Up @@ -690,7 +690,7 @@ private struct LumenNoticedCard: View {
private var footerIcon: some View {
Image(systemName: isActionable ? "chevron.right" : "info.circle")
.font(.system(size: 12, weight: .semibold))
.foregroundStyle(isActionable ? Color(hex: "#C49A6C") : Color.white.opacity(0.35))
.foregroundStyle(isActionable ? Color.lumenAccent : Color.white.opacity(0.35))
.frame(width: 24, height: 24)
}
}
6 changes: 3 additions & 3 deletions Lumen/Features/Home/LumenActionView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct LumenActionView: View {
.padding(.horizontal, 24)
.padding(.top, 12)
.padding(.bottom, 28)
.background(Color(hex: "#0E0819").ignoresSafeArea())
.background(Color.lumenBackground.ignoresSafeArea())
.presentationDetents([.medium, .large])
.presentationDragIndicator(.hidden)
}
Expand All @@ -50,7 +50,7 @@ struct LumenActionView: View {
.frame(width: 64, height: 64)
Image(systemName: scene.iconName)
.font(.system(size: 26))
.foregroundStyle(Color(hex: "#C49A6C"))
.foregroundStyle(Color.lumenAccent)
}

VStack(spacing: 6) {
Expand Down Expand Up @@ -95,7 +95,7 @@ struct LumenActionView: View {
.foregroundStyle(.white)
.frame(maxWidth: .infinity)
.padding(.vertical, 16)
.background(Color(hex: "#C49A6C"), in: RoundedRectangle(cornerRadius: 18))
.background(Color.lumenAccent, in: RoundedRectangle(cornerRadius: 18))
}
.buttonStyle(.pressable)
.padding(.bottom, 10)
Expand Down
8 changes: 4 additions & 4 deletions Lumen/Features/Home/LumenReasoningView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ struct LumenReasoningView: View {
.padding(.horizontal, 24)
.padding(.top, 12)
.padding(.bottom, 28)
.background(Color(hex: "#0E0819").ignoresSafeArea())
.background(Color.lumenBackground.ignoresSafeArea())
.presentationDetents([.medium, .large])
.presentationDragIndicator(.hidden)
}
Expand All @@ -49,7 +49,7 @@ struct LumenReasoningView: View {
.frame(width: 64, height: 64)
Image(systemName: "sparkles")
.font(.system(size: 26))
.foregroundStyle(Color(hex: "#C49A6C"))
.foregroundStyle(Color.lumenAccent)
}
VStack(spacing: 6) {
Text("WHY LUMEN NOTICED")
Expand Down Expand Up @@ -133,7 +133,7 @@ struct LumenReasoningView: View {
.foregroundStyle(.white)
.frame(maxWidth: .infinity)
.padding(.vertical, 16)
.background(Color(hex: "#C49A6C"), in: RoundedRectangle(cornerRadius: 18))
.background(Color.lumenAccent, in: RoundedRectangle(cornerRadius: 18))
}
.padding(.bottom, 10)
}
Expand Down Expand Up @@ -169,7 +169,7 @@ enum SignalWeight: Equatable {

var tint: Color {
switch self {
case .high: return Color(hex: "#C49A6C")
case .high: return Color.lumenAccent
case .medium: return Color.white.opacity(0.55)
case .low: return Color.white.opacity(0.3)
}
Expand Down
Loading
Loading