Skip to content

392-odometer-liquid-glass #405

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

Merged
mikaelacaron merged 10 commits into from
Feb 12, 2026
Merged

392-odometer-liquid-glass #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0e5566a
392-odometer-liquid-glass
aprameyak Jan 28, 2026
e085e9e
Make button into an icon
mikaelacaron Feb 12, 2026
6069775
Add back icons
mikaelacaron Feb 12, 2026
20efc2e
Add back comments
mikaelacaron Feb 12, 2026
816eedd
Update EditOdometerReadingView
mikaelacaron Feb 12, 2026
dbc7a10
Fix previews
mikaelacaron Feb 12, 2026
196932f
Update OdometerRowView
mikaelacaron Feb 12, 2026
bee811b
Update OdometerView
mikaelacaron Feb 12, 2026
66f86da
Update Localizable.xcstrings
mikaelacaron Feb 12, 2026
9f3a337
Remove Glass modifiers
mikaelacaron Feb 12, 2026
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
10 changes: 5 additions & 5 deletions Basic-Car-Maintenance/Shared/Dashboard/Views/AddMaintenanceView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ struct AddMaintenanceView: View {
}

#Preview {
let sampleVehicles = [
Vehicle(name: "Lexus", make: "Lexus", model: "White"),
Vehicle(name: "Test", make: "Lexus", model: "White")
]

AddMaintenanceView(vehicles: sampleVehicles) { _ in }
}

let sampleVehicles = [
Vehicle(name: "Lexus", make: "Lexus", model: "White"),
Vehicle(name: "Test", make: "Lexus", model: "White")
]
52 changes: 24 additions & 28 deletions Basic-Car-Maintenance/Shared/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,18 @@
}
}
},
"%lld %@" : {
"comment" : "A text label followed by a value, indicating the distance traveled by a vehicle. The value is formatted as a number followed by a unit of distance (either kilometers or miles).",
"isCommentAutoGenerated" : true,
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "%1$lld %2$@"
}
}
}
},
"^[%lld contributions](inflect: true)" : {
"comment" : "the number of contributions by a contributor",
"localizations" : {
Expand Down Expand Up @@ -614,7 +626,8 @@
}
},
"Add your first odometer" : {
"comment" : "Placeholder text for empty odometer reading list",
"comment" : "Placeholder description for empty odometer reading list",
"extractionState" : "stale",
"localizations" : {
"de" : {
"stringUnit" : {
Expand Down Expand Up @@ -666,6 +679,9 @@
}
}
},
"Add your first odometer reading" : {
"comment" : "Placeholder text for empty odometer reading list"
},
"AddEvent" : {
"comment" : "Label for adding maintenance event on Dashboard view",
"localizations" : {
Expand Down Expand Up @@ -2931,6 +2947,7 @@
}
},
"Kilometers" : {
"comment" : "Label for kilometers unit",
"localizations" : {
"de" : {
"stringUnit" : {
Expand Down Expand Up @@ -3276,23 +3293,8 @@
}
}
},
"Mileage: %lld %@" : {
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "Mileage: %1$lld %2$@"
}
},
"nl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Verbruik: %1$lld %2$@"
}
}
}
},
"Miles" : {
"comment" : "Label for miles unit",
"localizations" : {
"de" : {
"stringUnit" : {
Expand Down Expand Up @@ -4285,16 +4287,6 @@
"Rate this app" : {
"comment" : "Link to rate the app."
},
"Recorded On: %@" : {
"localizations" : {
"nl" : {
"stringUnit" : {
"state" : "translated",
"value" : "Opgenomen op: %@"
}
}
}
},
"Report a Bug" : {
"comment" : "Link to report a bug",
"localizations" : {
Expand Down Expand Up @@ -4863,7 +4855,11 @@
}
}
},
"Tap the + tadd your firsst odometer reading" : {
"comment" : "Placeholder description for empty odometer reading list"
},
"Tap the + to begin" : {
"comment" : "Empty odometer list prompt",
"localizations" : {
"fa" : {
"stringUnit" : {
Expand Down Expand Up @@ -6753,5 +6749,5 @@
}
}
},
"version" : "1.0"
"version" : "1.1"
}
56 changes: 35 additions & 21 deletions Basic-Car-Maintenance/Shared/Odometer/Views/AddOdometerReadingView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,15 @@ struct AddOdometerReadingView: View {
Form {
Section {
HStack {
Image(systemName: SFSymbol.gaugeWithNeedle)
.foregroundStyle(.secondary)
TextField("Distance", value: $distance, format: .number)

Picker(selection: $isMetric) {
Text("Miles").tag(false)
Text("Kilometers").tag(true)
Text("Miles", comment: "Label for miles unit")
.tag(false)
Text("Kilometers", comment: "Label for kilometers unit")
.tag(true)
} label: {
Text("Preferred units",
comment: "Label for units selected when adding an odometer reading")
Expand All @@ -51,25 +55,35 @@ struct AddOdometerReadingView: View {
}

Section {
Picker(selection: $selectedVehicleID) {
ForEach(vehicles) { vehicle in
Text(vehicle.name)
.tag(vehicle.id)
HStack {
Image(systemName: SFSymbol.carFill)
.foregroundStyle(.secondary)

Picker(selection: $selectedVehicleID) {
ForEach(vehicles) { vehicle in
Text(vehicle.name)
.tag(vehicle.id)
}
} label: {
Text("Select a vehicle",
comment: "Picker for selecting a vehicle")
}
} label: {
Text("Select a vehicle",
comment: "Picker for selecting a vehicle")
.pickerStyle(.menu)
}
.pickerStyle(.menu)
} header: {
Text("VehicleSectionHeader",
comment: "Label for Picker for selecting a vehicle")
}

DatePicker(selection: $date, displayedComponents: .date) {
Text("Date", comment: "Date picker label")
HStack {
Image(systemName: SFSymbol.calendar)
.foregroundStyle(.secondary)

DatePicker(selection: $date, displayedComponents: .date) {
Text("Date", comment: "Date picker label")
}
.dynamicTypeSize(...DynamicTypeSize.accessibility2)
}
.dynamicTypeSize(...DynamicTypeSize.accessibility2)
}
.onAppear {
if !vehicles.isEmpty {
Expand All @@ -80,7 +94,7 @@ struct AddOdometerReadingView: View {
comment: "Title for form when adding an odometer reading"))
.toolbar {
ToolbarItem {
Button {
Button(role: .confirm) {
if let selectedVehicleID {
let reading = OdometerReading(date: date,
distance: distance,
Expand All @@ -89,8 +103,8 @@ struct AddOdometerReadingView: View {
addTapped(reading)
}
} label: {
Text("Add",
comment: "Label for submit button on form to add an entry")
Label("Add", systemImage: "checkmark")
.labelStyle(.iconOnly)
}
.disabled(distance < 0)
}
Expand All @@ -101,10 +115,10 @@ struct AddOdometerReadingView: View {
}

#Preview {
let sampleVehicles = [
Vehicle(name: "Nate Forester", make: "Subaru", model: "Forester"),
Vehicle(name: "Dani Impreza", make: "Subaru", model: "Impreza")
]

AddOdometerReadingView(vehicles: sampleVehicles) { _ in }
}

let sampleVehicle = [
Vehicle(name: "Nate Forester", make: "Subaru", model: "Forester"),
Vehicle(name: "Dani Impreza", make: "Subaru", model: "Impreza")
]
51 changes: 34 additions & 17 deletions Basic-Car-Maintenance/Shared/Odometer/Views/EditOdometerReadingView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,15 @@ struct EditOdometerReadingView: View {
Form {
Section {
HStack {
Image(systemName: SFSymbol.gaugeWithNeedle)
.foregroundStyle(.secondary)
TextField("Distance", value: $distance, format: .number)

Picker(selection: $isMetric) {
Text("Miles").tag(false)
Text("Kilometers").tag(true)
Text("Miles", comment: "Label for miles unit")
.tag(false)
Text("Kilometers", comment: "Label for kilometers unit")
.tag(true)
} label: {
Text("Preferred units",
comment: "Label for units selected when adding an odometer reading")
Expand All @@ -39,19 +43,29 @@ struct EditOdometerReadingView: View {
}

Section {
if let vehicleName = vehicles
.filter({ $0.id == selectedReading.vehicleID }).first?.name {
Text(vehicleName)
.opacity(0.3)
HStack {
Image(systemName: SFSymbol.carFill)
.foregroundStyle(.secondary)

if let vehicleName = vehicles
.filter({ $0.id == selectedReading.vehicleID }).first?.name {
Text(vehicleName)
.opacity(0.3)
}
}
} header: {
Text("Vehicle")
}

DatePicker(selection: $date, displayedComponents: .date) {
Text("Date", comment: "Date picker label")
HStack {
Image(systemName: SFSymbol.calendar)
.foregroundStyle(.secondary)

DatePicker(selection: $date, displayedComponents: .date) {
Text("Date", comment: "Date picker label")
}
.dynamicTypeSize(...DynamicTypeSize.accessibility2)
}
.dynamicTypeSize(...DynamicTypeSize.accessibility2)
}
.onAppear {
setEditReadingValues(selectedReading)
Expand All @@ -60,24 +74,22 @@ struct EditOdometerReadingView: View {
comment: "Title for form when editing an odometer reading"))
.toolbar {
ToolbarItem(placement: .topBarLeading) {
Button {
Button(role: .cancel) {
dismiss()
} label: {
Text("Cancel")
}
}

ToolbarItem {
Button {
Button(role: .confirm) {
let reading = OdometerReading(id: selectedReading.id,
date: date,
distance: distance,
isMetric: isMetric,
vehicleID: selectedReading.vehicleID)
updateTapped(reading)
} label: {
Text("Update",
comment: "Label for submit button on form to update an existing entry")
Label("Update", systemImage: "checkmark")
.labelStyle(.iconOnly)
}
.disabled(distance < 0)
}
Expand All @@ -94,10 +106,15 @@ struct EditOdometerReadingView: View {
}

#Preview {
let sampleVehicles = [
Vehicle(id: UUID().uuidString, name: "Nate Forester", make: "Subaru", model: "Forester"),
Vehicle(id: UUID().uuidString, name: "Dani Impreza", make: "Subaru", model: "Impreza")
]

EditOdometerReadingView(
selectedReading: OdometerReading(date: Date(),
distance: 0,
isMetric: false,
vehicleID: ""),
vehicles: []) { _ in }
vehicleID: sampleVehicles[0].id!),
vehicles: sampleVehicles) { _ in }
}
26 changes: 18 additions & 8 deletions Basic-Car-Maintenance/Shared/Odometer/Views/OdometerRowView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,31 @@ struct OdometerRowView: View {

var body: some View {
VStack(alignment: .leading, spacing: 8) {
Text("\(vehicleName ?? "No Name")")
.font(.title3)

HStack {
Image(systemName: SFSymbol.carFill)

Text(vehicleName ?? "No Name")
.font(.title3)
}

VStack(alignment: .leading, spacing: 4) {
Text("Mileage: \(reading.distance) \(reading.isMetric ? "km" : "mi")")
.foregroundStyle(.gray)
Label {
Text("\(reading.distance) \(reading.isMetric ? "km" : "mi")")
} icon: {
Image(systemName: SFSymbol.gaugeWithNeedle)
}

Text("Recorded On: \(reading.date.formatted(date: .abbreviated, time: .omitted))")
.foregroundStyle(.gray)
Label {
Text(reading.date.formatted(date: .abbreviated, time: .omitted))
} icon: {
Image(systemName: SFSymbol.calendar)
}
}
}
}
}

#Preview {
OdometerRowView(reading: .init(date: .now, distance: 1000, isMetric: true, vehicleID: "1234"),
vehicleName: "Sample Vehicle Name")
vehicleName: "Sample Vehicle Name")
}
14 changes: 12 additions & 2 deletions Basic-Car-Maintenance/Shared/Odometer/Views/OdometerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ struct OdometerView: View {
ForEach(filteredReadings) { reading in
let vehicleName = viewModel.vehicles.first { $0.id == reading.vehicleID }?.name
OdometerRowView(reading: reading, vehicleName: vehicleName)
.foregroundStyle(.primary)
.swipeActions(edge: .trailing, allowsFullSwipe: true) {
Button(role: .destructive) {
Task {
Expand All @@ -99,8 +100,17 @@ struct OdometerView: View {
}
.overlay {
if viewModel.readings.isEmpty {
Text("Add your first odometer",
comment: "Placeholder text for empty odometer reading list")
ContentUnavailableView {

@mikaelacaron mikaelacaron Feb 12, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good call!

Label {
Text("Add your first odometer reading",
comment: "Placeholder text for empty odometer reading list")
} icon: {
Image(systemName: SFSymbol.gaugeWithNeedle)
}
} description: {
Text("Tap the + tadd your firsst odometer reading",
comment: "Placeholder description for empty odometer reading list")
}
}
}
.navigationTitle(Text("Odometer"))
Expand Down
Loading