selim/AutoCat2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add models

Browse Source
This commit is contained in:
Selim Mustafaev 2021-08-03 14:06:18 +03:00
parent 96ee51f006
commit 8ddab46918
8 changed files with 116 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
AutoCat2.xcodeproj/xcuserdata/
.DS_Store

4
AutoCat2.xcodeproj/xcuserdata/selim.xcuserdatad/xcschemes/xcschememanagement.plist
View File

@ -7,12 +7,12 @@
<key>AutoCat2 (iOS).xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
<integer>0</integer>
</dict>
<key>AutoCat2 (macOS).xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
<integer>1</integer>
</dict>
<key>AutoCatCore.xcscheme_^#shared#^_</key>
<dict>

18
Shared/AutoCat2.xcdatamodeld/Shared.xcdatamodel/contents
View File

@ -1,9 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="19178.1" systemVersion="20F71" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithCloudKit="YES" userDefinedModelVersionIdentifier="">
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="19186" systemVersion="21A5294g" minimumToolsVersion="Automatic" sourceLanguage="Swift" usedWithCloudKit="YES" userDefinedModelVersionIdentifier="">
<entity name="VBrand" representedClassName="VBrand" syncable="YES" codeGenerationType="class">
<attribute name="logo" optional="YES" attributeType="String"/>
<relationship name="name" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="VName" inverseName="brand" inverseEntity="VName"/>
<relationship name="vehicle" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Vehicle" inverseName="brand" inverseEntity="Vehicle"/>
</entity>
<entity name="Vehicle" representedClassName="Vehicle" syncable="YES" codeGenerationType="class">
<attribute name="currentNumber" optional="YES" attributeType="String"/>
<attribute name="number" optional="YES" attributeType="String"/>
<relationship name="brand" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="VBrand" inverseName="vehicle" inverseEntity="VBrand"/>
</entity>
<entity name="VName" representedClassName="VName" syncable="YES" codeGenerationType="class">
<attribute name="normalized" optional="YES" attributeType="String"/>
<attribute name="original" optional="YES" attributeType="String"/>
<relationship name="brand" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="VBrand" inverseName="name" inverseEntity="VBrand"/>
</entity>
<elements>
<element name="Vehicle" positionX="-54" positionY="-9" width="128" height="44"/>
<element name="Vehicle" positionX="-145.9427490234375" positionY="-363.4805297851562" width="128" height="88"/>
<element name="VName" positionX="-54" positionY="9" width="128" height="88"/>
<element name="VBrand" positionX="118.7528686523438" positionY="-209.1094360351562" width="128" height="88"/>
</elements>
</model>

15
Shared/Models/Vehicle.swift
View File

@ -1,7 +1,16 @@
import Foundation
import CoreData
@objc(Vehicle)
public class Vehicle: NSManagedObject {
@NSManaged public var number: String?
extension Vehicle {
public var unrecognized: Bool {
return self.brand == nil
}
public var outdated: Bool {
if let current = self.currentNumber {
return current != self.number
} else {
return false
}
}
}

8
Shared/Persistence.swift
View File

@ -13,10 +13,10 @@ struct PersistenceController {
static var preview: PersistenceController = {
let result = PersistenceController(inMemory: true)
let viewContext = result.container.viewContext
for _ in 0..<10 {
let newItem = Item(context: viewContext)
newItem.timestamp = Date()
}
// for _ in 0..<10 {
// let newItem = Item(context: viewContext)
// newItem.timestamp = Date()
// }
do {
try viewContext.save()
} catch {

24
Shared/Views/CheckView.swift
View File

@ -2,16 +2,27 @@ import SwiftUI
struct CheckView: View {
@State private var number: String = ""
@FetchRequest(entity: Vehicle.entity(), sortDescriptors: []) var vehicles: FetchedResults<Vehicle>
var body: some View {
VStack(alignment: .center, spacing: 16) {
TextField("", text: $number)
Button("Check") {
NavigationView {
VStack(alignment: .center, spacing: 16) {
TextField("A123AA777", text: $number)
Button("Check") {
}
List(vehicles) { vehicle in
Text(vehicle.number ?? "<none>")
}
}
// List(["one", "two", "three"]) { item in
// Text(item)
// }
.toolbar {
ToolbarItem(placement: .primaryAction) {
Button("New") {}
}
}
#if os(iOS)
.navigationBarTitle("Title", displayMode: .inline)
#endif
}
}
}
@ -19,5 +30,6 @@ struct CheckView: View {
struct CheckView_Previews: PreviewProvider {
static var previews: some View {
CheckView()
.preferredColorScheme(.dark)
}
}

59
Shared/Views/MainViewBig.swift
View File

@ -2,7 +2,64 @@ import SwiftUI
struct MainViewBig: View {
var body: some View {
Text("Main view big")
NavigationView {
SidebarView()
Text("Master")
Text("Detail")
}
}
}
struct SidebarView: View {
@State var selection: String?
@FetchRequest(entity: Vehicle.entity(), sortDescriptors: []) var vehicles: FetchedResults<Vehicle>
var body: some View {
List(selection: $selection) {
Section("History") {
NavigationLink(destination: VehiclesListView()) {
Label("All", systemImage: "car.2")
.badge(vehicles.count)
}
NavigationLink(destination: VehiclesListView()) {
Label("Unreconized", systemImage: "eye.slash")
.badge(vehicles.filter(\.unrecognized).count)
}
NavigationLink(destination: VehiclesListView()) {
Label("Outdated", systemImage: "wind")
.badge(vehicles.filter(\.outdated).count)
}
}
.collapsible(false)
Section("Other") {
Label("Recordings", systemImage: "waveform.path")
Label("Search", systemImage: "magnifyingglass")
}
.collapsible(false)
}
.frame(minWidth: 180)
// .toolbar {
// ToolbarItem(placement: .primaryAction) {
// Button("xxx") {
//
// }
// }
// }
}
}
struct VehiclesListView: View {
var body: some View {
Text("Vehicles list")
.toolbar {
ToolbarItem(placement: .primaryAction) {
Button("xxx") {
}
}
}
}
}

3
Shared/Views/MainViewSmall.swift
View File

@ -25,6 +25,9 @@ struct MainViewSmall: View {
Text("Settings")
}
}
#if os(iOS)
.navigationBarHidden(true)
#endif
Text("detail")
}
}