diff --git a/JuiceMaker/JuiceMaker.xcodeproj/project.pbxproj b/JuiceMaker/JuiceMaker.xcodeproj/project.pbxproj index d22b3de1e..6ddf01d1e 100644 --- a/JuiceMaker/JuiceMaker.xcodeproj/project.pbxproj +++ b/JuiceMaker/JuiceMaker.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + C71CD66B266C7ACB0038B9CB /* FruitStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = C71CD66A266C7ACB0038B9CB /* FruitStore.swift */; }; C73DAF37255D0CDD00020D38 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C73DAF36255D0CDD00020D38 /* AppDelegate.swift */; }; C73DAF39255D0CDD00020D38 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C73DAF38255D0CDD00020D38 /* SceneDelegate.swift */; }; C73DAF3B255D0CDD00020D38 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C73DAF3A255D0CDD00020D38 /* ViewController.swift */; }; @@ -17,6 +18,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + C71CD66A266C7ACB0038B9CB /* FruitStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FruitStore.swift; sourceTree = ""; }; C73DAF33255D0CDD00020D38 /* JuiceMaker.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JuiceMaker.app; sourceTree = BUILT_PRODUCTS_DIR; }; C73DAF36255D0CDD00020D38 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; C73DAF38255D0CDD00020D38 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; @@ -39,6 +41,35 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + C71CD66D266C7B470038B9CB /* Controller */ = { + isa = PBXGroup; + children = ( + C73DAF36255D0CDD00020D38 /* AppDelegate.swift */, + C73DAF38255D0CDD00020D38 /* SceneDelegate.swift */, + C73DAF3A255D0CDD00020D38 /* ViewController.swift */, + ); + path = Controller; + sourceTree = ""; + }; + C71CD66F266C7B500038B9CB /* Model */ = { + isa = PBXGroup; + children = ( + C73DAF4B255D0D0400020D38 /* JuiceMaker.swift */, + C71CD66A266C7ACB0038B9CB /* FruitStore.swift */, + ); + path = Model; + sourceTree = ""; + }; + C71CD671266C7B570038B9CB /* View */ = { + isa = PBXGroup; + children = ( + C73DAF3C255D0CDD00020D38 /* Main.storyboard */, + C73DAF3F255D0CDE00020D38 /* Assets.xcassets */, + C73DAF41255D0CDF00020D38 /* LaunchScreen.storyboard */, + ); + path = View; + sourceTree = ""; + }; C73DAF2A255D0CDC00020D38 = { isa = PBXGroup; children = ( @@ -58,13 +89,9 @@ C73DAF35255D0CDD00020D38 /* JuiceMaker */ = { isa = PBXGroup; children = ( - C73DAF36255D0CDD00020D38 /* AppDelegate.swift */, - C73DAF38255D0CDD00020D38 /* SceneDelegate.swift */, - C73DAF3A255D0CDD00020D38 /* ViewController.swift */, - C73DAF4B255D0D0400020D38 /* JuiceMaker.swift */, - C73DAF3C255D0CDD00020D38 /* Main.storyboard */, - C73DAF3F255D0CDE00020D38 /* Assets.xcassets */, - C73DAF41255D0CDF00020D38 /* LaunchScreen.storyboard */, + C71CD66D266C7B470038B9CB /* Controller */, + C71CD66F266C7B500038B9CB /* Model */, + C71CD671266C7B570038B9CB /* View */, C73DAF44255D0CDF00020D38 /* Info.plist */, ); path = JuiceMaker; @@ -140,6 +167,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + C71CD66B266C7ACB0038B9CB /* FruitStore.swift in Sources */, C73DAF3B255D0CDD00020D38 /* ViewController.swift in Sources */, C73DAF37255D0CDD00020D38 /* AppDelegate.swift in Sources */, C73DAF39255D0CDD00020D38 /* SceneDelegate.swift in Sources */, @@ -299,7 +327,7 @@ PRODUCT_BUNDLE_IDENTIFIER = net.yagom.JuiceMaker; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; }; name = Debug; }; @@ -317,7 +345,7 @@ PRODUCT_BUNDLE_IDENTIFIER = net.yagom.JuiceMaker; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = 1; }; name = Release; }; diff --git a/JuiceMaker/JuiceMaker/Base.lproj/Main.storyboard b/JuiceMaker/JuiceMaker/Base.lproj/Main.storyboard deleted file mode 100644 index 25a763858..000000000 --- a/JuiceMaker/JuiceMaker/Base.lproj/Main.storyboard +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/JuiceMaker/JuiceMaker/AppDelegate.swift b/JuiceMaker/JuiceMaker/Controller/AppDelegate.swift similarity index 100% rename from JuiceMaker/JuiceMaker/AppDelegate.swift rename to JuiceMaker/JuiceMaker/Controller/AppDelegate.swift diff --git a/JuiceMaker/JuiceMaker/SceneDelegate.swift b/JuiceMaker/JuiceMaker/Controller/SceneDelegate.swift similarity index 100% rename from JuiceMaker/JuiceMaker/SceneDelegate.swift rename to JuiceMaker/JuiceMaker/Controller/SceneDelegate.swift diff --git a/JuiceMaker/JuiceMaker/ViewController.swift b/JuiceMaker/JuiceMaker/Controller/ViewController.swift similarity index 100% rename from JuiceMaker/JuiceMaker/ViewController.swift rename to JuiceMaker/JuiceMaker/Controller/ViewController.swift diff --git a/JuiceMaker/JuiceMaker/Info.plist b/JuiceMaker/JuiceMaker/Info.plist index 5b531f7b2..bc7fcc109 100644 --- a/JuiceMaker/JuiceMaker/Info.plist +++ b/JuiceMaker/JuiceMaker/Info.plist @@ -51,7 +51,6 @@ UISupportedInterfaceOrientations - UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight diff --git a/JuiceMaker/JuiceMaker/Model/FruitStore.swift b/JuiceMaker/JuiceMaker/Model/FruitStore.swift new file mode 100644 index 000000000..a1e925afc --- /dev/null +++ b/JuiceMaker/JuiceMaker/Model/FruitStore.swift @@ -0,0 +1,12 @@ +// +// JuiceMaker - FruitStore.swift +// Created by yagom. +// Copyright © yagom. All rights reserved. +// + +import Foundation + +// 과일 타입 +class FruitStore { + +} diff --git a/JuiceMaker/JuiceMaker/JuiceMaker.swift b/JuiceMaker/JuiceMaker/Model/JuiceMaker.swift similarity index 71% rename from JuiceMaker/JuiceMaker/JuiceMaker.swift rename to JuiceMaker/JuiceMaker/Model/JuiceMaker.swift index 930465fdb..0c8629e1d 100644 --- a/JuiceMaker/JuiceMaker/JuiceMaker.swift +++ b/JuiceMaker/JuiceMaker/Model/JuiceMaker.swift @@ -6,4 +6,7 @@ import Foundation -/// 쥬스 메이커 타입 +// 쥬스 메이커 타입 +struct JuiceMaker { + +} diff --git a/JuiceMaker/JuiceMaker/Assets.xcassets/AccentColor.colorset/Contents.json b/JuiceMaker/JuiceMaker/View/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from JuiceMaker/JuiceMaker/Assets.xcassets/AccentColor.colorset/Contents.json rename to JuiceMaker/JuiceMaker/View/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/JuiceMaker/JuiceMaker/Assets.xcassets/AppIcon.appiconset/Contents.json b/JuiceMaker/JuiceMaker/View/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from JuiceMaker/JuiceMaker/Assets.xcassets/AppIcon.appiconset/Contents.json rename to JuiceMaker/JuiceMaker/View/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/JuiceMaker/JuiceMaker/Assets.xcassets/Contents.json b/JuiceMaker/JuiceMaker/View/Assets.xcassets/Contents.json similarity index 100% rename from JuiceMaker/JuiceMaker/Assets.xcassets/Contents.json rename to JuiceMaker/JuiceMaker/View/Assets.xcassets/Contents.json diff --git a/JuiceMaker/JuiceMaker/Base.lproj/LaunchScreen.storyboard b/JuiceMaker/JuiceMaker/View/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from JuiceMaker/JuiceMaker/Base.lproj/LaunchScreen.storyboard rename to JuiceMaker/JuiceMaker/View/Base.lproj/LaunchScreen.storyboard diff --git a/JuiceMaker/JuiceMaker/View/Base.lproj/Main.storyboard b/JuiceMaker/JuiceMaker/View/Base.lproj/Main.storyboard new file mode 100644 index 000000000..7abdcc72a --- /dev/null +++ b/JuiceMaker/JuiceMaker/View/Base.lproj/Main.storyboard @@ -0,0 +1,422 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +