diff --git a/AutoCat2.xcodeproj/xcuserdata/selim.xcuserdatad/xcschemes/xcschememanagement.plist b/AutoCat2.xcodeproj/xcuserdata/selim.xcuserdatad/xcschemes/xcschememanagement.plist
index 9a3baf7..27a99e0 100644
--- a/AutoCat2.xcodeproj/xcuserdata/selim.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/AutoCat2.xcodeproj/xcuserdata/selim.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -12,7 +12,7 @@
AutoCat2.xcscheme_^#shared#^_
orderHint
- 1
+ 0
AutoCat2Mac.xcscheme_^#shared#^_
@@ -22,7 +22,7 @@
AutoCat2SUI.xcscheme_^#shared#^_
orderHint
- 0
+ 1
AutoCat2UITests.testExample.xcscheme
diff --git a/AutoCat2/Controllers/MainTabController.swift b/AutoCat2/Controllers/MainTabController.swift
index 148dd69..1616be1 100644
--- a/AutoCat2/Controllers/MainTabController.swift
+++ b/AutoCat2/Controllers/MainTabController.swift
@@ -42,7 +42,7 @@ class MainTabController: UITabBarController, UITabBarControllerDelegate {
func showCheckPuller() {
var attributes = EKAttributes.bottomToast
attributes.displayDuration = .infinity
- attributes.entryBackground = .visualEffect(style: .extra) //.color(color: .standardBackground)
+ attributes.entryBackground = .color(color: .init(.secondarySystemBackground)) //.visualEffect(style: .extra) //.color(color: .standardBackground)
attributes.screenBackground = .color(color: EKColor(UIColor(white: 0, alpha: 0.7)))
attributes.roundCorners = .top(radius: 24)
attributes.screenInteraction = .dismiss
diff --git a/AutoCat2SUI/Fonts/RoadNumbers.otf b/AutoCat2SUI/Fonts/RoadNumbers.otf
new file mode 100644
index 0000000..7f40a38
Binary files /dev/null and b/AutoCat2SUI/Fonts/RoadNumbers.otf differ
diff --git a/AutoCat2SUI/Fonts/RoadNumbers2.0.otf b/AutoCat2SUI/Fonts/RoadNumbers2.0.otf
new file mode 100644
index 0000000..390c01e
Binary files /dev/null and b/AutoCat2SUI/Fonts/RoadNumbers2.0.otf differ
diff --git a/AutoCat2SUI/Info.plist b/AutoCat2SUI/Info.plist
new file mode 100644
index 0000000..68147cf
--- /dev/null
+++ b/AutoCat2SUI/Info.plist
@@ -0,0 +1,13 @@
+
+
+
+
+ ATSApplicationFontsPath
+ .
+ UIAppFonts
+
+ RoadNumbers.otf
+ RoadNumbers2.0.otf
+
+
+
diff --git a/AutoCat2SUI/Screens/Main/MainView.swift b/AutoCat2SUI/Screens/Main/MainView.swift
index a7e4ae8..c27864a 100644
--- a/AutoCat2SUI/Screens/Main/MainView.swift
+++ b/AutoCat2SUI/Screens/Main/MainView.swift
@@ -26,6 +26,7 @@ struct MainView: View {
@State private var selectedFilterId: UUID?
@State var selectedVehicle: CDVehicle?
@State private var checkSheetPresented = false
+ @State private var searchText = ""
@State var columnVisibility = NavigationSplitViewVisibility.all
@@ -96,10 +97,12 @@ struct MainView: View {
.toolbar {
ToolbarItem {
Button(action: {}) {
- Image(systemName: "trash")
+ Image(systemName: "line.3.horizontal.decrease.circle")
}
}
}
+ .navigationTitle(filter.name)
+ .navigationSubtitle("\(filtered.count) vehicles")
}
} else {
EmptyView()
@@ -107,6 +110,16 @@ struct MainView: View {
} detail: {
if let vehicle = selectedVehicle {
VehicleDetailView(vehicle: vehicle)
+ .toolbar {
+ ToolbarItem(placement: .automatic) {
+ Button(action: {}) {
+ Image(systemName: "square.and.arrow.up")
+ }
+ }
+ }
+ .navigationTitle(vehicle.brand?.name?.original ?? "")
+ .navigationSubtitle("\(vehicle.year)")
+ .searchable(text: $searchText, placement: .toolbar)
} else {
EmptyView()
}
diff --git a/AutoCat2SUI/Screens/VehicleDetail/VehicleDetailView.swift b/AutoCat2SUI/Screens/VehicleDetail/VehicleDetailView.swift
index 61c67e5..4a15417 100644
--- a/AutoCat2SUI/Screens/VehicleDetail/VehicleDetailView.swift
+++ b/AutoCat2SUI/Screens/VehicleDetail/VehicleDetailView.swift
@@ -43,6 +43,13 @@ struct VehicleDetailView: View {
ReportTextItem(name: "STS", value: vehicle.sts)
ReportTextItem(name: "PTS", value: vehicle.pts)
}
+ Section(header: Text("Engine")) {
+ ReportTextItem(name: "Number", value: vehicle.engine?.number)
+ ReportTextItem(name: "Fuel type", value: vehicle.engine?.fuelType)
+ ReportTextItem(name: "Volume (cm2)", value: String(vehicle.engine?.volume ?? 0))
+ ReportTextItem(name: "Power (HP)", value: String(vehicle.engine?.powerHp ?? 0))
+ ReportTextItem(name: "Power (kw)", value: String(vehicle.engine?.powerKw ?? 0))
+ }
}
.formStyle(.grouped)
}
diff --git a/AutoCat2SUI/Views/PlateView/PlateViewItem.swift b/AutoCat2SUI/Views/PlateView/PlateViewItem.swift
index ae491f6..41c581f 100644
--- a/AutoCat2SUI/Views/PlateView/PlateViewItem.swift
+++ b/AutoCat2SUI/Views/PlateView/PlateViewItem.swift
@@ -16,10 +16,17 @@ struct PlateViewItem: View {
VStack(alignment: .leading, spacing: 4) {
Text(vehicle.brand?.name?.original ?? "")
- PlateNumberView(number: PlateNumber(vehicle.number ?? ""),
- unrecognized: vehicle.unrecognized,
- outdated: vehicle.outdated,
- fontSize: 30)
+ HStack {
+ PlateNumberView(number: PlateNumber(vehicle.number ?? ""),
+ unrecognized: vehicle.unrecognized,
+ outdated: vehicle.outdated,
+ fontSize: 30)
+ VStack {
+ if let upDate = vehicle.updatedDate {
+
+ }
+ }
+ }
}
.padding(.vertical, 2)
}