Skip to content
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.

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

임의 데이터 추가함. 관계 설정 안 된 상태. #30

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open
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
65 changes: 57 additions & 8 deletions Nav.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,19 @@
26A1500D29083A1300BC7355 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26A1500C29083A1300BC7355 /* ContentView.swift */; };
26A1500F29083A1400BC7355 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 26A1500E29083A1400BC7355 /* Assets.xcassets */; };
26A1501929083B7B00BC7355 /* MapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26A1501829083B7B00BC7355 /* MapView.swift */; };
CE03E6792A1F77FA002AC26B /* Model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = CE03E6772A1F77FA002AC26B /* Model.xcdatamodeld */; };
CE2D8D3829C59D5F00E5C104 /* ImagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE2D8D3729C59D5F00E5C104 /* ImagePicker.swift */; };
CE2D8D3A29C59DF100E5C104 /* CategoryPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE2D8D3929C59DF100E5C104 /* CategoryPicker.swift */; };
CE34045D2A4FF7B80082D5EF /* PinInfo+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3404552A4FF7B80082D5EF /* PinInfo+CoreDataClass.swift */; };
CE34045E2A4FF7B80082D5EF /* PinInfo+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3404562A4FF7B80082D5EF /* PinInfo+CoreDataProperties.swift */; };
CE34045F2A4FF7B80082D5EF /* Theme+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3404572A4FF7B80082D5EF /* Theme+CoreDataClass.swift */; };
CE3404602A4FF7B80082D5EF /* Theme+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3404582A4FF7B80082D5EF /* Theme+CoreDataProperties.swift */; };
CE3404612A4FF7B80082D5EF /* Address+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3404592A4FF7B80082D5EF /* Address+CoreDataClass.swift */; };
CE3404622A4FF7B80082D5EF /* Address+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE34045A2A4FF7B80082D5EF /* Address+CoreDataProperties.swift */; };
CE3404632A4FF7B80082D5EF /* Pictures+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE34045B2A4FF7B80082D5EF /* Pictures+CoreDataClass.swift */; };
CE3404642A4FF7B80082D5EF /* Pictures+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE34045C2A4FF7B80082D5EF /* Pictures+CoreDataProperties.swift */; };
CE34046F2A5013E40082D5EF /* TestMapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE34046E2A5013E40082D5EF /* TestMapView.swift */; };
CE3404712A501E9F0082D5EF /* LocationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3404702A501E9F0082D5EF /* LocationManager.swift */; };
DCE7EBCF2A172C1E00644745 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCE7EBCE2A172C1E00644745 /* Extensions.swift */; };
DCE7EBD12A172C9000644745 /* SearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCE7EBD02A172C9000644745 /* SearchBar.swift */; };
FD33891A2917B81E00C4AB98 /* ListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD3389192917B81E00C4AB98 /* ListView.swift */; };
Expand All @@ -37,8 +48,19 @@
26A1500C29083A1300BC7355 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
26A1500E29083A1400BC7355 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
26A1501829083B7B00BC7355 /* MapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapView.swift; sourceTree = "<group>"; };
CE03E6782A1F77FA002AC26B /* Model.xcdatamodel */ = {isa = PBXFileReference; explicitFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = "<group>"; };
CE2D8D3729C59D5F00E5C104 /* ImagePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePicker.swift; sourceTree = "<group>"; };
CE2D8D3929C59DF100E5C104 /* CategoryPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CategoryPicker.swift; sourceTree = "<group>"; };
CE3404552A4FF7B80082D5EF /* PinInfo+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PinInfo+CoreDataClass.swift"; sourceTree = "<group>"; };
CE3404562A4FF7B80082D5EF /* PinInfo+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PinInfo+CoreDataProperties.swift"; sourceTree = "<group>"; };
CE3404572A4FF7B80082D5EF /* Theme+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Theme+CoreDataClass.swift"; sourceTree = "<group>"; };
CE3404582A4FF7B80082D5EF /* Theme+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Theme+CoreDataProperties.swift"; sourceTree = "<group>"; };
CE3404592A4FF7B80082D5EF /* Address+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Address+CoreDataClass.swift"; sourceTree = "<group>"; };
CE34045A2A4FF7B80082D5EF /* Address+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Address+CoreDataProperties.swift"; sourceTree = "<group>"; };
CE34045B2A4FF7B80082D5EF /* Pictures+CoreDataClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Pictures+CoreDataClass.swift"; sourceTree = "<group>"; };
CE34045C2A4FF7B80082D5EF /* Pictures+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Pictures+CoreDataProperties.swift"; sourceTree = "<group>"; };
CE34046E2A5013E40082D5EF /* TestMapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestMapView.swift; sourceTree = "<group>"; };
CE3404702A501E9F0082D5EF /* LocationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationManager.swift; sourceTree = "<group>"; };
DCE7EBCE2A172C1E00644745 /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
DCE7EBD02A172C9000644745 /* SearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchBar.swift; sourceTree = "<group>"; };
FD3389192917B81E00C4AB98 /* ListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -92,6 +114,8 @@
26A1501029083A1400BC7355 /* Preview Content */,
CE2D8D3729C59D5F00E5C104 /* ImagePicker.swift */,
CE2D8D3929C59DF100E5C104 /* CategoryPicker.swift */,
CE3404702A501E9F0082D5EF /* LocationManager.swift */,
CE03E6772A1F77FA002AC26B /* Model.xcdatamodeld */,
);
path = Nav;
sourceTree = "<group>";
Expand All @@ -106,6 +130,14 @@
26FE54E62949B90100B4E0E9 /* Data */ = {
isa = PBXGroup;
children = (
CE3404552A4FF7B80082D5EF /* PinInfo+CoreDataClass.swift */,
CE3404562A4FF7B80082D5EF /* PinInfo+CoreDataProperties.swift */,
CE3404572A4FF7B80082D5EF /* Theme+CoreDataClass.swift */,
CE3404582A4FF7B80082D5EF /* Theme+CoreDataProperties.swift */,
CE3404592A4FF7B80082D5EF /* Address+CoreDataClass.swift */,
CE34045A2A4FF7B80082D5EF /* Address+CoreDataProperties.swift */,
CE34045B2A4FF7B80082D5EF /* Pictures+CoreDataClass.swift */,
CE34045C2A4FF7B80082D5EF /* Pictures+CoreDataProperties.swift */,
FDFD7A642928993A001BE945 /* MockData.json */,
);
path = Data;
Expand All @@ -126,6 +158,7 @@
262C17BD290CDF6900450E54 /* PinCreationView.swift */,
FD3389192917B81E00C4AB98 /* ListView.swift */,
DCE7EBD02A172C9000644745 /* SearchBar.swift */,
CE34046E2A5013E40082D5EF /* TestMapView.swift */,
);
path = View;
sourceTree = "<group>";
Expand All @@ -146,14 +179,6 @@
path = Extension;
sourceTree = "<group>";
};
26FE54E62949B90100B4E0E9 /* Data */ = {
isa = PBXGroup;
children = (
FDFD7A642928993A001BE945 /* MockData.json */,
);
path = Data;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -226,19 +251,30 @@
files = (
CE2D8D3829C59D5F00E5C104 /* ImagePicker.swift in Sources */,
26A1500D29083A1300BC7355 /* ContentView.swift in Sources */,
CE3404642A4FF7B80082D5EF /* Pictures+CoreDataProperties.swift in Sources */,
262C17C2290D090C00450E54 /* Font+.swift in Sources */,
262C17C6290E385E00450E54 /* Text+.swift in Sources */,
CE34046F2A5013E40082D5EF /* TestMapView.swift in Sources */,
262C17C0290D06F700450E54 /* Color+.swift in Sources */,
CE34045D2A4FF7B80082D5EF /* PinInfo+CoreDataClass.swift in Sources */,
FDFD7A6129289926001BE945 /* Bundle+Ext.swift in Sources */,
CE3404622A4FF7B80082D5EF /* Address+CoreDataProperties.swift in Sources */,
262C17CE290E9D4500450E54 /* Image+.swift in Sources */,
26A1501929083B7B00BC7355 /* MapView.swift in Sources */,
CE3404712A501E9F0082D5EF /* LocationManager.swift in Sources */,
CE03E6792A1F77FA002AC26B /* Model.xcdatamodeld in Sources */,
DCE7EBD12A172C9000644745 /* SearchBar.swift in Sources */,
CE34045F2A4FF7B80082D5EF /* Theme+CoreDataClass.swift in Sources */,
FDFD7A6329289933001BE945 /* MockDatum.swift in Sources */,
CE34045E2A4FF7B80082D5EF /* PinInfo+CoreDataProperties.swift in Sources */,
DCE7EBCF2A172C1E00644745 /* Extensions.swift in Sources */,
FD33891A2917B81E00C4AB98 /* ListView.swift in Sources */,
CE3404612A4FF7B80082D5EF /* Address+CoreDataClass.swift in Sources */,
CE3404632A4FF7B80082D5EF /* Pictures+CoreDataClass.swift in Sources */,
CE2D8D3A29C59DF100E5C104 /* CategoryPicker.swift in Sources */,
26A1500B29083A1300BC7355 /* NavApp.swift in Sources */,
262C17BE290CDF6900450E54 /* PinCreationView.swift in Sources */,
CE3404602A4FF7B80082D5EF /* Theme+CoreDataProperties.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -439,6 +475,19 @@
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */

/* Begin XCVersionGroup section */
CE03E6772A1F77FA002AC26B /* Model.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
CE03E6782A1F77FA002AC26B /* Model.xcdatamodel */,
);
currentVersion = CE03E6782A1F77FA002AC26B /* Model.xcdatamodel */;
path = Model.xcdatamodeld;
sourceTree = "<group>";
versionGroupType = wrapper.xcdatamodel;
};
/* End XCVersionGroup section */
};
rootObject = 26A14FFF29083A1300BC7355 /* Project object */;
}
8 changes: 7 additions & 1 deletion Nav/ContentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@
import SwiftUI

struct ContentView: View {
@StateObject var locationManager = LocationManager()

var body: some View {
TabView {
MapView()
.environmentObject(locationManager)
.tabItem {
Image(systemName: "map")
}
Expand All @@ -21,6 +24,7 @@ struct ContentView: View {
}

PinCreationView()
.environmentObject(locationManager)
.tabItem {
Image(systemName: "plus")
}
Expand All @@ -30,6 +34,8 @@ struct ContentView: View {

struct ContentView_Previews: PreviewProvider {
static var previews: some View {
ContentView()

ContentView().environmentObject(LocationManager())
// ContentView()
}
}
15 changes: 15 additions & 0 deletions Nav/Data/Address+CoreDataClass.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// Address+CoreDataClass.swift
// Nav
//
// Created by 박재경 on 2023/07/01.
//
//

import Foundation
import CoreData

@objc(Address)
public class Address: PinInfo {

}
29 changes: 29 additions & 0 deletions Nav/Data/Address+CoreDataProperties.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
//
// Address+CoreDataProperties.swift
// Nav
//
// Created by 박재경 on 2023/07/01.
//
//

import Foundation
import CoreData


extension Address {

@nonobjc public class func fetchRequest() -> NSFetchRequest<Address> {
return NSFetchRequest<Address>(entityName: "Address")
}

@NSManaged public var city: String?
@NSManaged public var country: String?
@NSManaged public var detailAddress: String?
@NSManaged public var district: String?
@NSManaged public var postalCode: Int16
@NSManaged public var streetAddress: String?
@NSManaged public var longitude: Double
@NSManaged public var latitude: Double
@NSManaged public var relationship: PinInfo?

}
15 changes: 15 additions & 0 deletions Nav/Data/Pictures+CoreDataClass.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// Pictures+CoreDataClass.swift
// Nav
//
// Created by 박재경 on 2023/07/01.
//
//

import Foundation
import CoreData

@objc(Pictures)
public class Pictures: PinInfo {

}
22 changes: 22 additions & 0 deletions Nav/Data/Pictures+CoreDataProperties.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
//
// Pictures+CoreDataProperties.swift
// Nav
//
// Created by 박재경 on 2023/07/01.
//
//

import Foundation
import CoreData


extension Pictures {

@nonobjc public class func fetchRequest() -> NSFetchRequest<Pictures> {
return NSFetchRequest<Pictures>(entityName: "Pictures")
}

@NSManaged public var img: Data?
@NSManaged public var relationship: PinInfo?

}
15 changes: 15 additions & 0 deletions Nav/Data/PinInfo+CoreDataClass.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// PinInfo+CoreDataClass.swift
// Nav
//
// Created by 박재경 on 2023/07/01.
//
//

import Foundation
import CoreData

@objc(PinInfo)
public class PinInfo: Theme {

}
46 changes: 46 additions & 0 deletions Nav/Data/PinInfo+CoreDataProperties.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
//
// PinInfo+CoreDataProperties.swift
// Nav
//
// Created by 박재경 on 2023/07/01.
//
//

import Foundation
import CoreData


extension PinInfo {

@nonobjc public class func fetchRequest() -> NSFetchRequest<PinInfo> {
return NSFetchRequest<PinInfo>(entityName: "PinInfo")
}

@NSManaged public var content: String?
@NSManaged public var createDate: Date?
@NSManaged public var id: UUID?
@NSManaged public var rating: NSNumber?
@NSManaged public var title: String?
@NSManaged public var updateDate: Date?
@NSManaged public var address: Address?
@NSManaged public var pictures: NSSet?
@NSManaged public var theme: Theme?

}

// MARK: Generated accessors for pictures
extension PinInfo {

@objc(addPicturesObject:)
@NSManaged public func addToPictures(_ value: Pictures)

@objc(removePicturesObject:)
@NSManaged public func removeFromPictures(_ value: Pictures)

@objc(addPictures:)
@NSManaged public func addToPictures(_ values: NSSet)

@objc(removePictures:)
@NSManaged public func removeFromPictures(_ values: NSSet)

}
15 changes: 15 additions & 0 deletions Nav/Data/Theme+CoreDataClass.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// Theme+CoreDataClass.swift
// Nav
//
// Created by 박재경 on 2023/07/01.
//
//

import Foundation
import CoreData

@objc(Theme)
public class Theme: NSManagedObject {

}
43 changes: 43 additions & 0 deletions Nav/Data/Theme+CoreDataProperties.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
//
// Theme+CoreDataProperties.swift
// Nav
//
// Created by 박재경 on 2023/07/01.
//
//

import Foundation
import CoreData


extension Theme {

@nonobjc public class func fetchRequest() -> NSFetchRequest<Theme> {
return NSFetchRequest<Theme>(entityName: "Theme")
}

@NSManaged public var name: String?
@NSManaged public var pin: NSSet?

}

// MARK: Generated accessors for pin
extension Theme {

@objc(addPinObject:)
@NSManaged public func addToPin(_ value: PinInfo)

@objc(removePinObject:)
@NSManaged public func removeFromPin(_ value: PinInfo)

@objc(addPin:)
@NSManaged public func addToPin(_ values: NSSet)

@objc(removePin:)
@NSManaged public func removeFromPin(_ values: NSSet)

}

extension Theme : Identifiable {

}
7 changes: 7 additions & 0 deletions Nav/LocationManager.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import SwiftUI
import Combine

class LocationManager: ObservableObject {
@Published var latitude: Double = 0.0
@Published var longitude: Double = 0.0
}
6 changes: 6 additions & 0 deletions Nav/MapModel.xcdatamodeld/MapModel.xcdatamodel/contents
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="21513" systemVersion="21G419" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
<entity name="Entity" representedClassName="Entity" syncable="YES" codeGenerationType="class">
<attribute name="attribute" optional="YES"/>
</entity>
</model>
Loading