From 3cad552ce44ae89d9e7b2b7bf612fe9eb783210d Mon Sep 17 00:00:00 2001 From: Song Lee Date: Tue, 20 Apr 2021 16:28:23 +0900 Subject: [PATCH 1/6] =?UTF-8?q?feat:=20SideDish=20Entity=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - SideDish 및 Detail 구현 - 구조에 대한 논의 필요 --- .../sidedish.xcodeproj/project.pbxproj | 12 +++++ ios/sidedish/sidedish/Entity/SideDish.swift | 47 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 ios/sidedish/sidedish/Entity/SideDish.swift diff --git a/ios/sidedish/sidedish.xcodeproj/project.pbxproj b/ios/sidedish/sidedish.xcodeproj/project.pbxproj index 55854ada9..6fba072c5 100644 --- a/ios/sidedish/sidedish.xcodeproj/project.pbxproj +++ b/ios/sidedish/sidedish.xcodeproj/project.pbxproj @@ -16,6 +16,7 @@ 82FDB9CE262DCFD8009E3EB7 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 82FDB9CC262DCFD8009E3EB7 /* Main.storyboard */; }; 82FDB9D0262DCFD8009E3EB7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 82FDB9CF262DCFD8009E3EB7 /* Assets.xcassets */; }; 82FDB9D3262DCFD8009E3EB7 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 82FDB9D1262DCFD8009E3EB7 /* LaunchScreen.storyboard */; }; + E41EC951262E6E9A0043CC44 /* SideDish.swift in Sources */ = {isa = PBXBuildFile; fileRef = E41EC950262E6E9A0043CC44 /* SideDish.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -30,6 +31,7 @@ 82FDB9CF262DCFD8009E3EB7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 82FDB9D2262DCFD8009E3EB7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 82FDB9D4262DCFD8009E3EB7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + E41EC950262E6E9A0043CC44 /* SideDish.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideDish.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -69,6 +71,7 @@ 8214B710262DE4B4004467C2 /* MainTableViewDelegate.swift */, 8214B70A262DE07A004467C2 /* MenuCell.swift */, 82FDB9CC262DCFD8009E3EB7 /* Main.storyboard */, + E41EC94F262E6DF40043CC44 /* Entity */, 82FDB9CF262DCFD8009E3EB7 /* Assets.xcassets */, 82FDB9D1262DCFD8009E3EB7 /* LaunchScreen.storyboard */, 82FDB9D4262DCFD8009E3EB7 /* Info.plist */, @@ -76,6 +79,14 @@ path = sidedish; sourceTree = ""; }; + E41EC94F262E6DF40043CC44 /* Entity */ = { + isa = PBXGroup; + children = ( + E41EC950262E6E9A0043CC44 /* SideDish.swift */, + ); + path = Entity; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -146,6 +157,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + E41EC951262E6E9A0043CC44 /* SideDish.swift in Sources */, 82FDB9CB262DCFD8009E3EB7 /* MainViewController.swift in Sources */, 82FDB9C7262DCFD8009E3EB7 /* AppDelegate.swift in Sources */, 8214B70B262DE07A004467C2 /* MenuCell.swift in Sources */, diff --git a/ios/sidedish/sidedish/Entity/SideDish.swift b/ios/sidedish/sidedish/Entity/SideDish.swift new file mode 100644 index 000000000..fbabfcc25 --- /dev/null +++ b/ios/sidedish/sidedish/Entity/SideDish.swift @@ -0,0 +1,47 @@ +// +// SideDish.swift +// sidedish +// +// Created by Song on 2021/04/20. +// + +import Foundation + +class SideDish: Codable { + + var id: String //detail_hash? Int?(id?) + var image: String //library/cache의 파일명 + var alt: String //"[소중한식사] 골뱅이무침 195g" + var title: String //"[소중한식사] 골뱅이무침 195g" + var description: String //"매콤새콤달콤, 반찬으로도 안주로도 좋은" + var deliveryTypes: [String] //["새벽배송","전국택배"] + var price: Int //7,000 + var salePrice: Int //6,300 + var badges: [String] //["이벤트특가"] + + var detail: Detail? + + func updateDetail(_ detail: Detail) { + self.detail = detail + } +} + +class Detail: Codable { + var thumbImages: [String] //library/cache의 파일명들 + var point: String //"63원" + var deliveryInfo: String //"서울 경기 새벽배송 / 전국택배 (제주 및 도서산간 불가) [화 수 목 금 토] 수령 가능한 상품입니다" + var deliveryFee: String //"2,500원 (40,000원 이상 구매 시 무료)" + var detailImages: [String] +} + +//struct Detail: Codable { +// var hash = "HF778" //겹침 +// var topImage = "" //겹침? +// var thumbImages = ["","",""] +// var productDescription = "매콤새콤달콤, 반찬으로도 안주로도 좋은" //겹침 +// var point = "63원" +// var deliveryInfo = "서울 경기 새벽배송 / 전국택배 (제주 및 도서산간 불가) [화 수 목 금 토] 수령 가능한 상품입니다" +// var deliveryFee = "2,500원 (40,000원 이상 구매 시 무료)" +// var prices = ["7,000원", "6,300원"] //겹침 +// var detailSection = ["","","",""] +//} From 03ebaf875a3b0a9269053f9e5b32c678208c9780 Mon Sep 17 00:00:00 2001 From: Song Lee Date: Tue, 20 Apr 2021 16:32:35 +0900 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20SideDishes=20Entity=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - SideDish 단일 리스트를 관리하는 모델 생성 - 추후 의존성 약화 위해 프로토콜로 인터페이스 분리 필요 --- .../sidedish.xcodeproj/project.pbxproj | 4 +++ ios/sidedish/sidedish/Entity/SideDishes.swift | 30 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 ios/sidedish/sidedish/Entity/SideDishes.swift diff --git a/ios/sidedish/sidedish.xcodeproj/project.pbxproj b/ios/sidedish/sidedish.xcodeproj/project.pbxproj index 6fba072c5..5f0d0ea35 100644 --- a/ios/sidedish/sidedish.xcodeproj/project.pbxproj +++ b/ios/sidedish/sidedish.xcodeproj/project.pbxproj @@ -17,6 +17,7 @@ 82FDB9D0262DCFD8009E3EB7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 82FDB9CF262DCFD8009E3EB7 /* Assets.xcassets */; }; 82FDB9D3262DCFD8009E3EB7 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 82FDB9D1262DCFD8009E3EB7 /* LaunchScreen.storyboard */; }; E41EC951262E6E9A0043CC44 /* SideDish.swift in Sources */ = {isa = PBXBuildFile; fileRef = E41EC950262E6E9A0043CC44 /* SideDish.swift */; }; + E41EC954262EBA2E0043CC44 /* SideDishes.swift in Sources */ = {isa = PBXBuildFile; fileRef = E41EC953262EBA2E0043CC44 /* SideDishes.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -32,6 +33,7 @@ 82FDB9D2262DCFD8009E3EB7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 82FDB9D4262DCFD8009E3EB7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; E41EC950262E6E9A0043CC44 /* SideDish.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideDish.swift; sourceTree = ""; }; + E41EC953262EBA2E0043CC44 /* SideDishes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideDishes.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -82,6 +84,7 @@ E41EC94F262E6DF40043CC44 /* Entity */ = { isa = PBXGroup; children = ( + E41EC953262EBA2E0043CC44 /* SideDishes.swift */, E41EC950262E6E9A0043CC44 /* SideDish.swift */, ); path = Entity; @@ -157,6 +160,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + E41EC954262EBA2E0043CC44 /* SideDishes.swift in Sources */, E41EC951262E6E9A0043CC44 /* SideDish.swift in Sources */, 82FDB9CB262DCFD8009E3EB7 /* MainViewController.swift in Sources */, 82FDB9C7262DCFD8009E3EB7 /* AppDelegate.swift in Sources */, diff --git a/ios/sidedish/sidedish/Entity/SideDishes.swift b/ios/sidedish/sidedish/Entity/SideDishes.swift new file mode 100644 index 000000000..8e514d4a4 --- /dev/null +++ b/ios/sidedish/sidedish/Entity/SideDishes.swift @@ -0,0 +1,30 @@ +// +// SideDishes.swift +// sidedish +// +// Created by Song on 2021/04/20. +// + +import Foundation + +class SideDishes: Codable { + + private(set) var category: String + private var list: [SideDish] + + init(category: String, list: [SideDish]) { + self.category = category + self.list = list + } + + //프로토콜로 분리 + func count() -> Int { + return list.count + } + + func sideDish(at index: Int) -> SideDish? { + guard count() > index else { return nil } + return list[index] + } + +} From 527950ec6aba27008b2c5914efc05a35cb60c1c7 Mon Sep 17 00:00:00 2001 From: Song Lee Date: Tue, 20 Apr 2021 23:11:39 +0900 Subject: [PATCH 3/6] =?UTF-8?q?feat:=20SideDishesCollection=20Entity=20?= =?UTF-8?q?=E1=84=89=E1=85=A2=E1=86=BC=E1=84=89=E1=85=A5=E1=86=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - SideDishes들의 리스트를 관리하는 모델 생성 - recentUpdate를 통해 데이터 버전이 관리하도록 구성 --- .../sidedish.xcodeproj/project.pbxproj | 4 ++++ .../Entity/SideDishesCollection.swift | 24 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 ios/sidedish/sidedish/Entity/SideDishesCollection.swift diff --git a/ios/sidedish/sidedish.xcodeproj/project.pbxproj b/ios/sidedish/sidedish.xcodeproj/project.pbxproj index 5f0d0ea35..030a4b6d0 100644 --- a/ios/sidedish/sidedish.xcodeproj/project.pbxproj +++ b/ios/sidedish/sidedish.xcodeproj/project.pbxproj @@ -18,6 +18,7 @@ 82FDB9D3262DCFD8009E3EB7 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 82FDB9D1262DCFD8009E3EB7 /* LaunchScreen.storyboard */; }; E41EC951262E6E9A0043CC44 /* SideDish.swift in Sources */ = {isa = PBXBuildFile; fileRef = E41EC950262E6E9A0043CC44 /* SideDish.swift */; }; E41EC954262EBA2E0043CC44 /* SideDishes.swift in Sources */ = {isa = PBXBuildFile; fileRef = E41EC953262EBA2E0043CC44 /* SideDishes.swift */; }; + E41EC957262ECE950043CC44 /* SideDishesCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = E41EC956262ECE950043CC44 /* SideDishesCollection.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -34,6 +35,7 @@ 82FDB9D4262DCFD8009E3EB7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; E41EC950262E6E9A0043CC44 /* SideDish.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideDish.swift; sourceTree = ""; }; E41EC953262EBA2E0043CC44 /* SideDishes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideDishes.swift; sourceTree = ""; }; + E41EC956262ECE950043CC44 /* SideDishesCollection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideDishesCollection.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -84,6 +86,7 @@ E41EC94F262E6DF40043CC44 /* Entity */ = { isa = PBXGroup; children = ( + E41EC956262ECE950043CC44 /* SideDishesCollection.swift */, E41EC953262EBA2E0043CC44 /* SideDishes.swift */, E41EC950262E6E9A0043CC44 /* SideDish.swift */, ); @@ -165,6 +168,7 @@ 82FDB9CB262DCFD8009E3EB7 /* MainViewController.swift in Sources */, 82FDB9C7262DCFD8009E3EB7 /* AppDelegate.swift in Sources */, 8214B70B262DE07A004467C2 /* MenuCell.swift in Sources */, + E41EC957262ECE950043CC44 /* SideDishesCollection.swift in Sources */, 8214B70E262DE253004467C2 /* MainTableViewDataSource.swift in Sources */, 82FDB9C9262DCFD8009E3EB7 /* SceneDelegate.swift in Sources */, 8214B711262DE4B4004467C2 /* MainTableViewDelegate.swift in Sources */, diff --git a/ios/sidedish/sidedish/Entity/SideDishesCollection.swift b/ios/sidedish/sidedish/Entity/SideDishesCollection.swift new file mode 100644 index 000000000..4cfe36d15 --- /dev/null +++ b/ios/sidedish/sidedish/Entity/SideDishesCollection.swift @@ -0,0 +1,24 @@ +// +// SideDishesCollection.swift +// sidedish +// +// Created by Song on 2021/04/20. +// + +import Foundation + +class SideDishesCollection: Codable { + + private var recentUpdate: Date? + private var list: [SideDishes] + + init(recentUpdate: Date, list: [SideDishes]) { + self.recentUpdate = recentUpdate + self.list = list + } + + func update(list: [SideDishes]) { + self.list = list + recentUpdate = Date() + } +} From 8e0f2c61b826b6091d5c746fdceca8b6d1437b38 Mon Sep 17 00:00:00 2001 From: Song Lee Date: Tue, 20 Apr 2021 23:17:35 +0900 Subject: [PATCH 4/6] =?UTF-8?q?feat:=20SideDishes=20Entity=20=E1=84=89?= =?UTF-8?q?=E1=85=A1=E1=84=8B=E1=85=AD=E1=86=BC=E1=84=89=E1=85=A5=E1=86=BC?= =?UTF-8?q?=20=E1=84=80=E1=85=A2=E1=84=89=E1=85=A5=E1=86=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Category enum 생성하여 카테고리 설정 안정화 - SideDishFindable 인터페이스 설정하여 의존성 개선 --- ios/sidedish/sidedish.xcodeproj/project.pbxproj | 4 ++++ .../sidedish/Entity/SideDishFindable.swift | 16 ++++++++++++++++ ios/sidedish/sidedish/Entity/SideDishes.swift | 16 +++++++++++++--- 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 ios/sidedish/sidedish/Entity/SideDishFindable.swift diff --git a/ios/sidedish/sidedish.xcodeproj/project.pbxproj b/ios/sidedish/sidedish.xcodeproj/project.pbxproj index 030a4b6d0..8eab47466 100644 --- a/ios/sidedish/sidedish.xcodeproj/project.pbxproj +++ b/ios/sidedish/sidedish.xcodeproj/project.pbxproj @@ -19,6 +19,7 @@ E41EC951262E6E9A0043CC44 /* SideDish.swift in Sources */ = {isa = PBXBuildFile; fileRef = E41EC950262E6E9A0043CC44 /* SideDish.swift */; }; E41EC954262EBA2E0043CC44 /* SideDishes.swift in Sources */ = {isa = PBXBuildFile; fileRef = E41EC953262EBA2E0043CC44 /* SideDishes.swift */; }; E41EC957262ECE950043CC44 /* SideDishesCollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = E41EC956262ECE950043CC44 /* SideDishesCollection.swift */; }; + E41EC95B262F18E00043CC44 /* SideDishFindable.swift in Sources */ = {isa = PBXBuildFile; fileRef = E41EC95A262F18E00043CC44 /* SideDishFindable.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -36,6 +37,7 @@ E41EC950262E6E9A0043CC44 /* SideDish.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideDish.swift; sourceTree = ""; }; E41EC953262EBA2E0043CC44 /* SideDishes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideDishes.swift; sourceTree = ""; }; E41EC956262ECE950043CC44 /* SideDishesCollection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideDishesCollection.swift; sourceTree = ""; }; + E41EC95A262F18E00043CC44 /* SideDishFindable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideDishFindable.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -87,6 +89,7 @@ isa = PBXGroup; children = ( E41EC956262ECE950043CC44 /* SideDishesCollection.swift */, + E41EC95A262F18E00043CC44 /* SideDishFindable.swift */, E41EC953262EBA2E0043CC44 /* SideDishes.swift */, E41EC950262E6E9A0043CC44 /* SideDish.swift */, ); @@ -170,6 +173,7 @@ 8214B70B262DE07A004467C2 /* MenuCell.swift in Sources */, E41EC957262ECE950043CC44 /* SideDishesCollection.swift in Sources */, 8214B70E262DE253004467C2 /* MainTableViewDataSource.swift in Sources */, + E41EC95B262F18E00043CC44 /* SideDishFindable.swift in Sources */, 82FDB9C9262DCFD8009E3EB7 /* SceneDelegate.swift in Sources */, 8214B711262DE4B4004467C2 /* MainTableViewDelegate.swift in Sources */, ); diff --git a/ios/sidedish/sidedish/Entity/SideDishFindable.swift b/ios/sidedish/sidedish/Entity/SideDishFindable.swift new file mode 100644 index 000000000..d8e395cff --- /dev/null +++ b/ios/sidedish/sidedish/Entity/SideDishFindable.swift @@ -0,0 +1,16 @@ +// +// SideDishFindable.swift +// sidedish +// +// Created by Song on 2021/04/20. +// + +import Foundation + +protocol SideDishFindable { + + func count() -> Int + + func sideDish(at index: Int) -> SideDish? + +} diff --git a/ios/sidedish/sidedish/Entity/SideDishes.swift b/ios/sidedish/sidedish/Entity/SideDishes.swift index 8e514d4a4..216867a3f 100644 --- a/ios/sidedish/sidedish/Entity/SideDishes.swift +++ b/ios/sidedish/sidedish/Entity/SideDishes.swift @@ -9,15 +9,25 @@ import Foundation class SideDishes: Codable { - private(set) var category: String + private(set) var category: Category + + enum Category: String, Codable { + case main = "한그릇 뚝딱 메인 요리" + case soup = "김이 모락모락 국.찌개" + case side = "언제 먹어도 든든한 밑반찬" + } + private var list: [SideDish] - init(category: String, list: [SideDish]) { + init(category: Category, list: [SideDish]) { self.category = category self.list = list } - //프로토콜로 분리 +} + +extension SideDishes: SideDishFindable { + func count() -> Int { return list.count } From 0a3d7c86535f08c16e7433e547fd9c7b3cd2aecd Mon Sep 17 00:00:00 2001 From: jhpark-steve Date: Wed, 21 Apr 2021 15:34:06 +0900 Subject: [PATCH 5/6] =?UTF-8?q?chore:=20MVVM=EC=97=90=20=EA=B8=B0=EC=B4=88?= =?UTF-8?q?=ED=95=98=EC=97=AC=20=ED=8F=B4=EB=8D=94=20=EA=B5=AC=EC=84=B1=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sidedish.xcodeproj/project.pbxproj | 114 ++++++++++++++++-- .../{ => Application}/AppDelegate.swift | 0 .../{ => Application}/SceneDelegate.swift | 0 .../{ => Domain}/Entity/SideDish.swift | 0 .../{ => Domain}/Entity/SideDishes.swift | 0 .../View}/Base.lproj/Main.storyboard | 18 +-- .../MainMenuList/View}/MenuCell.swift | 0 .../MainTableViewDataSource.swift | 0 .../MainTableViewDelegate.swift | 0 .../ViewController}/MainViewController.swift | 0 .../AccentColor.colorset/Contents.json | 0 .../AppIcon.appiconset/Contents.json | 0 .../Assets.xcassets/Contents.json | 0 .../Base.lproj/LaunchScreen.storyboard | 17 ++- .../sidedish/{ => Resources}/Info.plist | 0 15 files changed, 117 insertions(+), 32 deletions(-) rename ios/sidedish/sidedish/{ => Application}/AppDelegate.swift (100%) rename ios/sidedish/sidedish/{ => Application}/SceneDelegate.swift (100%) rename ios/sidedish/sidedish/{ => Domain}/Entity/SideDish.swift (100%) rename ios/sidedish/sidedish/{ => Domain}/Entity/SideDishes.swift (100%) rename ios/sidedish/sidedish/{ => Presentation/MainMenuList/View}/Base.lproj/Main.storyboard (98%) rename ios/sidedish/sidedish/{ => Presentation/MainMenuList/View}/MenuCell.swift (100%) rename ios/sidedish/sidedish/{ => Presentation/ViewController}/MainTableViewDataSource.swift (100%) rename ios/sidedish/sidedish/{ => Presentation/ViewController}/MainTableViewDelegate.swift (100%) rename ios/sidedish/sidedish/{ => Presentation/ViewController}/MainViewController.swift (100%) rename ios/sidedish/sidedish/{ => Resources}/Assets.xcassets/AccentColor.colorset/Contents.json (100%) rename ios/sidedish/sidedish/{ => Resources}/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename ios/sidedish/sidedish/{ => Resources}/Assets.xcassets/Contents.json (100%) rename ios/sidedish/sidedish/{ => Resources}/Base.lproj/LaunchScreen.storyboard (59%) rename ios/sidedish/sidedish/{ => Resources}/Info.plist (100%) diff --git a/ios/sidedish/sidedish.xcodeproj/project.pbxproj b/ios/sidedish/sidedish.xcodeproj/project.pbxproj index 5f0d0ea35..4e0524cb2 100644 --- a/ios/sidedish/sidedish.xcodeproj/project.pbxproj +++ b/ios/sidedish/sidedish.xcodeproj/project.pbxproj @@ -47,6 +47,101 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 82A3F139262F1FE200FD86BE /* Application */ = { + isa = PBXGroup; + children = ( + 82FDB9C6262DCFD8009E3EB7 /* AppDelegate.swift */, + 82FDB9C8262DCFD8009E3EB7 /* SceneDelegate.swift */, + ); + path = Application; + sourceTree = ""; + }; + 82A3F13C262F202A00FD86BE /* Domain */ = { + isa = PBXGroup; + children = ( + E41EC94F262E6DF40043CC44 /* Entity */, + ); + path = Domain; + sourceTree = ""; + }; + 82A3F13E262F243300FD86BE /* Presentation */ = { + isa = PBXGroup; + children = ( + 82A3F140262F256C00FD86BE /* MainMenuList */, + 82A3F149262F337000FD86BE /* SubMenuList */, + 82A3F13F262F248300FD86BE /* ViewController */, + ); + path = Presentation; + sourceTree = ""; + }; + 82A3F13F262F248300FD86BE /* ViewController */ = { + isa = PBXGroup; + children = ( + 8214B70D262DE253004467C2 /* MainTableViewDataSource.swift */, + 8214B710262DE4B4004467C2 /* MainTableViewDelegate.swift */, + 82FDB9CA262DCFD8009E3EB7 /* MainViewController.swift */, + ); + path = ViewController; + sourceTree = ""; + }; + 82A3F140262F256C00FD86BE /* MainMenuList */ = { + isa = PBXGroup; + children = ( + 82A3F142262F259600FD86BE /* ViewModel */, + 82A3F141262F259200FD86BE /* View */, + ); + path = MainMenuList; + sourceTree = ""; + }; + 82A3F141262F259200FD86BE /* View */ = { + isa = PBXGroup; + children = ( + 82FDB9CC262DCFD8009E3EB7 /* Main.storyboard */, + 8214B70A262DE07A004467C2 /* MenuCell.swift */, + ); + path = View; + sourceTree = ""; + }; + 82A3F142262F259600FD86BE /* ViewModel */ = { + isa = PBXGroup; + children = ( + ); + path = ViewModel; + sourceTree = ""; + }; + 82A3F144262F2EB900FD86BE /* Resources */ = { + isa = PBXGroup; + children = ( + 82FDB9CF262DCFD8009E3EB7 /* Assets.xcassets */, + 82FDB9D1262DCFD8009E3EB7 /* LaunchScreen.storyboard */, + 82FDB9D4262DCFD8009E3EB7 /* Info.plist */, + ); + path = Resources; + sourceTree = ""; + }; + 82A3F149262F337000FD86BE /* SubMenuList */ = { + isa = PBXGroup; + children = ( + 82A3F14B262F338700FD86BE /* ViewModel */, + 82A3F14A262F337800FD86BE /* View */, + ); + path = SubMenuList; + sourceTree = ""; + }; + 82A3F14A262F337800FD86BE /* View */ = { + isa = PBXGroup; + children = ( + ); + path = View; + sourceTree = ""; + }; + 82A3F14B262F338700FD86BE /* ViewModel */ = { + isa = PBXGroup; + children = ( + ); + path = ViewModel; + sourceTree = ""; + }; 82FDB9BA262DCFD8009E3EB7 = { isa = PBXGroup; children = ( @@ -66,17 +161,10 @@ 82FDB9C5262DCFD8009E3EB7 /* sidedish */ = { isa = PBXGroup; children = ( - 82FDB9C6262DCFD8009E3EB7 /* AppDelegate.swift */, - 82FDB9C8262DCFD8009E3EB7 /* SceneDelegate.swift */, - 82FDB9CA262DCFD8009E3EB7 /* MainViewController.swift */, - 8214B70D262DE253004467C2 /* MainTableViewDataSource.swift */, - 8214B710262DE4B4004467C2 /* MainTableViewDelegate.swift */, - 8214B70A262DE07A004467C2 /* MenuCell.swift */, - 82FDB9CC262DCFD8009E3EB7 /* Main.storyboard */, - E41EC94F262E6DF40043CC44 /* Entity */, - 82FDB9CF262DCFD8009E3EB7 /* Assets.xcassets */, - 82FDB9D1262DCFD8009E3EB7 /* LaunchScreen.storyboard */, - 82FDB9D4262DCFD8009E3EB7 /* Info.plist */, + 82A3F13E262F243300FD86BE /* Presentation */, + 82A3F13C262F202A00FD86BE /* Domain */, + 82A3F139262F1FE200FD86BE /* Application */, + 82A3F144262F2EB900FD86BE /* Resources */, ); path = sidedish; sourceTree = ""; @@ -316,7 +404,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = B3PWYBKFUK; - INFOPLIST_FILE = sidedish/Info.plist; + INFOPLIST_FILE = sidedish/Resources/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -335,7 +423,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = B3PWYBKFUK; - INFOPLIST_FILE = sidedish/Info.plist; + INFOPLIST_FILE = sidedish/Resources/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/ios/sidedish/sidedish/AppDelegate.swift b/ios/sidedish/sidedish/Application/AppDelegate.swift similarity index 100% rename from ios/sidedish/sidedish/AppDelegate.swift rename to ios/sidedish/sidedish/Application/AppDelegate.swift diff --git a/ios/sidedish/sidedish/SceneDelegate.swift b/ios/sidedish/sidedish/Application/SceneDelegate.swift similarity index 100% rename from ios/sidedish/sidedish/SceneDelegate.swift rename to ios/sidedish/sidedish/Application/SceneDelegate.swift diff --git a/ios/sidedish/sidedish/Entity/SideDish.swift b/ios/sidedish/sidedish/Domain/Entity/SideDish.swift similarity index 100% rename from ios/sidedish/sidedish/Entity/SideDish.swift rename to ios/sidedish/sidedish/Domain/Entity/SideDish.swift diff --git a/ios/sidedish/sidedish/Entity/SideDishes.swift b/ios/sidedish/sidedish/Domain/Entity/SideDishes.swift similarity index 100% rename from ios/sidedish/sidedish/Entity/SideDishes.swift rename to ios/sidedish/sidedish/Domain/Entity/SideDishes.swift diff --git a/ios/sidedish/sidedish/Base.lproj/Main.storyboard b/ios/sidedish/sidedish/Presentation/MainMenuList/View/Base.lproj/Main.storyboard similarity index 98% rename from ios/sidedish/sidedish/Base.lproj/Main.storyboard rename to ios/sidedish/sidedish/Presentation/MainMenuList/View/Base.lproj/Main.storyboard index f91f7e827..b3ca26143 100644 --- a/ios/sidedish/sidedish/Base.lproj/Main.storyboard +++ b/ios/sidedish/sidedish/Presentation/MainMenuList/View/Base.lproj/Main.storyboard @@ -113,7 +113,7 @@ - + @@ -167,7 +167,7 @@ - + @@ -335,11 +335,6 @@ - - - - -