From 7d2e076546106a1aba7ae4aceec35e7934797cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=80=E1=85=A9=E1=84=8C=E1=85=A5=E1=86=BC=E1=84=8B?= =?UTF-8?q?=E1=85=AA=E1=86=AB=20=28Can=29?= Date: Mon, 19 Apr 2021 14:55:40 +0900 Subject: [PATCH 01/35] Initial commit --- README.md | 10 +++++++++- backend/README.md | 3 +++ ios/README.md | 3 +++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 backend/README.md create mode 100644 ios/README.md diff --git a/README.md b/README.md index c04306379..f951a3de1 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,10 @@ # sidedish -그룹프로젝트 #2 + +그룹 9 + +## 팀원 + +- Lollo (eeeesong) +- ZG (jhpark-ZG) +- Pyro (ghojeong) +- Bat (kjk402) diff --git a/backend/README.md b/backend/README.md new file mode 100644 index 000000000..60f316223 --- /dev/null +++ b/backend/README.md @@ -0,0 +1,3 @@ +# Backend + +백엔드를 위한 디렉토리 diff --git a/ios/README.md b/ios/README.md new file mode 100644 index 000000000..6b6146928 --- /dev/null +++ b/ios/README.md @@ -0,0 +1,3 @@ +# IOS + +ios 를 위한 디렉토리 From de65da5ee2107fcfbae10982b2ad4242699ce8a8 Mon Sep 17 00:00:00 2001 From: jhpark-steve Date: Tue, 20 Apr 2021 00:58:25 +0900 Subject: [PATCH 02/35] =?UTF-8?q?style:=20=EB=A9=94=EC=9D=B8=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20UI=20=EA=B5=AC=EC=84=B1=20(#8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TableView와 기본 뼈대가 되는 Cell을 Storyboard에 추가 --- ios/.gitignore | 106 ++++++ .../sidedish.xcodeproj/project.pbxproj | 346 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + ios/sidedish/sidedish/AppDelegate.swift | 36 ++ .../AccentColor.colorset/Contents.json | 11 + .../AppIcon.appiconset/Contents.json | 98 +++++ .../sidedish/Assets.xcassets/Contents.json | 6 + .../Base.lproj/LaunchScreen.storyboard | 25 ++ .../sidedish/Base.lproj/Main.storyboard | 168 +++++++++ ios/sidedish/sidedish/Info.plist | 66 ++++ ios/sidedish/sidedish/SceneDelegate.swift | 52 +++ ios/sidedish/sidedish/ViewController.swift | 18 + 13 files changed, 947 insertions(+) create mode 100644 ios/.gitignore create mode 100644 ios/sidedish/sidedish.xcodeproj/project.pbxproj create mode 100644 ios/sidedish/sidedish.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 ios/sidedish/sidedish.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 ios/sidedish/sidedish/AppDelegate.swift create mode 100644 ios/sidedish/sidedish/Assets.xcassets/AccentColor.colorset/Contents.json create mode 100644 ios/sidedish/sidedish/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 ios/sidedish/sidedish/Assets.xcassets/Contents.json create mode 100644 ios/sidedish/sidedish/Base.lproj/LaunchScreen.storyboard create mode 100644 ios/sidedish/sidedish/Base.lproj/Main.storyboard create mode 100644 ios/sidedish/sidedish/Info.plist create mode 100644 ios/sidedish/sidedish/SceneDelegate.swift create mode 100644 ios/sidedish/sidedish/ViewController.swift diff --git a/ios/.gitignore b/ios/.gitignore new file mode 100644 index 000000000..7c26ccad3 --- /dev/null +++ b/ios/.gitignore @@ -0,0 +1,106 @@ + +# Created by https://www.toptal.com/developers/gitignore/api/swift,xcode +# Edit at https://www.toptal.com/developers/gitignore?templates=swift,xcode + +### Swift ### +# Xcode +# +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + +## User settings +xcuserdata/ + +## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9) +*.xcscmblueprint +*.xccheckout + +## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4) +build/ +DerivedData/ +*.moved-aside +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 + +## Obj-C/Swift specific +*.hmap + +## App packaging +*.ipa +*.dSYM.zip +*.dSYM + +## Playgrounds +timeline.xctimeline +playground.xcworkspace + +# Swift Package Manager +# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies. +# Packages/ +# Package.pins +# Package.resolved +# *.xcodeproj +# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata +# hence it is not needed unless you have added a package configuration file to your project +# .swiftpm + +.build/ + +# CocoaPods +# We recommend against adding the Pods directory to your .gitignore. However +# you should judge for yourself, the pros and cons are mentioned at: +# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control +# Pods/ +# Add this line if you want to avoid checking in source code from the Xcode workspace +# *.xcworkspace + +# Carthage +# Add this line if you want to avoid checking in source code from Carthage dependencies. +# Carthage/Checkouts + +Carthage/Build/ + +# Add this lines if you are using Accio dependency management (Deprecated since Xcode 12) +# Dependencies/ +# .accio/ + +# fastlane +# It is recommended to not store the screenshots in the git repo. +# Instead, use fastlane to re-generate the screenshots whenever they are needed. +# For more information about the recommended setup visit: +# https://docs.fastlane.tools/best-practices/source-control/#source-control + +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots/**/*.png +fastlane/test_output + +# Code Injection +# After new code Injection tools there's a generated folder /iOSInjectionProject +# https://github.com/johnno1962/injectionforxcode + +iOSInjectionProject/ + +### Xcode ### +# Xcode +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + + + + +## Gcc Patch +/*.gcno + +### Xcode Patch ### +*.xcodeproj/* +!*.xcodeproj/project.pbxproj +!*.xcodeproj/xcshareddata/ +!*.xcworkspace/contents.xcworkspacedata +**/xcshareddata/WorkspaceSettings.xcsettings + +# End of https://www.toptal.com/developers/gitignore/api/swift,xcode diff --git a/ios/sidedish/sidedish.xcodeproj/project.pbxproj b/ios/sidedish/sidedish.xcodeproj/project.pbxproj new file mode 100644 index 000000000..e1c861f9f --- /dev/null +++ b/ios/sidedish/sidedish.xcodeproj/project.pbxproj @@ -0,0 +1,346 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 50; + objects = { + +/* Begin PBXBuildFile section */ + 82FDB9C7262DCFD8009E3EB7 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82FDB9C6262DCFD8009E3EB7 /* AppDelegate.swift */; }; + 82FDB9C9262DCFD8009E3EB7 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82FDB9C8262DCFD8009E3EB7 /* SceneDelegate.swift */; }; + 82FDB9CB262DCFD8009E3EB7 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82FDB9CA262DCFD8009E3EB7 /* ViewController.swift */; }; + 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 */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 82FDB9C3262DCFD8009E3EB7 /* sidedish.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = sidedish.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 82FDB9C6262DCFD8009E3EB7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 82FDB9C8262DCFD8009E3EB7 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; + 82FDB9CA262DCFD8009E3EB7 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; + 82FDB9CD262DCFD8009E3EB7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 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 = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 82FDB9C0262DCFD8009E3EB7 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 82FDB9BA262DCFD8009E3EB7 = { + isa = PBXGroup; + children = ( + 82FDB9C5262DCFD8009E3EB7 /* sidedish */, + 82FDB9C4262DCFD8009E3EB7 /* Products */, + ); + sourceTree = ""; + }; + 82FDB9C4262DCFD8009E3EB7 /* Products */ = { + isa = PBXGroup; + children = ( + 82FDB9C3262DCFD8009E3EB7 /* sidedish.app */, + ); + name = Products; + sourceTree = ""; + }; + 82FDB9C5262DCFD8009E3EB7 /* sidedish */ = { + isa = PBXGroup; + children = ( + 82FDB9C6262DCFD8009E3EB7 /* AppDelegate.swift */, + 82FDB9C8262DCFD8009E3EB7 /* SceneDelegate.swift */, + 82FDB9CA262DCFD8009E3EB7 /* ViewController.swift */, + 82FDB9CC262DCFD8009E3EB7 /* Main.storyboard */, + 82FDB9CF262DCFD8009E3EB7 /* Assets.xcassets */, + 82FDB9D1262DCFD8009E3EB7 /* LaunchScreen.storyboard */, + 82FDB9D4262DCFD8009E3EB7 /* Info.plist */, + ); + path = sidedish; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 82FDB9C2262DCFD8009E3EB7 /* sidedish */ = { + isa = PBXNativeTarget; + buildConfigurationList = 82FDB9D7262DCFD8009E3EB7 /* Build configuration list for PBXNativeTarget "sidedish" */; + buildPhases = ( + 82FDB9BF262DCFD8009E3EB7 /* Sources */, + 82FDB9C0262DCFD8009E3EB7 /* Frameworks */, + 82FDB9C1262DCFD8009E3EB7 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = sidedish; + productName = sidedish; + productReference = 82FDB9C3262DCFD8009E3EB7 /* sidedish.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 82FDB9BB262DCFD8009E3EB7 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 1240; + LastUpgradeCheck = 1240; + TargetAttributes = { + 82FDB9C2262DCFD8009E3EB7 = { + CreatedOnToolsVersion = 12.4; + }; + }; + }; + buildConfigurationList = 82FDB9BE262DCFD8009E3EB7 /* Build configuration list for PBXProject "sidedish" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 82FDB9BA262DCFD8009E3EB7; + productRefGroup = 82FDB9C4262DCFD8009E3EB7 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 82FDB9C2262DCFD8009E3EB7 /* sidedish */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 82FDB9C1262DCFD8009E3EB7 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 82FDB9D3262DCFD8009E3EB7 /* LaunchScreen.storyboard in Resources */, + 82FDB9D0262DCFD8009E3EB7 /* Assets.xcassets in Resources */, + 82FDB9CE262DCFD8009E3EB7 /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 82FDB9BF262DCFD8009E3EB7 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 82FDB9CB262DCFD8009E3EB7 /* ViewController.swift in Sources */, + 82FDB9C7262DCFD8009E3EB7 /* AppDelegate.swift in Sources */, + 82FDB9C9262DCFD8009E3EB7 /* SceneDelegate.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 82FDB9CC262DCFD8009E3EB7 /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 82FDB9CD262DCFD8009E3EB7 /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 82FDB9D1262DCFD8009E3EB7 /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 82FDB9D2262DCFD8009E3EB7 /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 82FDB9D5262DCFD8009E3EB7 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 14.4; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 82FDB9D6262DCFD8009E3EB7 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 14.4; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 82FDB9D8262DCFD8009E3EB7 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = B3PWYBKFUK; + INFOPLIST_FILE = sidedish/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = jhPark.sidedish; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 82FDB9D9262DCFD8009E3EB7 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = B3PWYBKFUK; + INFOPLIST_FILE = sidedish/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = jhPark.sidedish; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 82FDB9BE262DCFD8009E3EB7 /* Build configuration list for PBXProject "sidedish" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 82FDB9D5262DCFD8009E3EB7 /* Debug */, + 82FDB9D6262DCFD8009E3EB7 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 82FDB9D7262DCFD8009E3EB7 /* Build configuration list for PBXNativeTarget "sidedish" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 82FDB9D8262DCFD8009E3EB7 /* Debug */, + 82FDB9D9262DCFD8009E3EB7 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 82FDB9BB262DCFD8009E3EB7 /* Project object */; +} diff --git a/ios/sidedish/sidedish.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/sidedish/sidedish.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..919434a62 --- /dev/null +++ b/ios/sidedish/sidedish.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/ios/sidedish/sidedish.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/sidedish/sidedish.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/ios/sidedish/sidedish.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ios/sidedish/sidedish/AppDelegate.swift b/ios/sidedish/sidedish/AppDelegate.swift new file mode 100644 index 000000000..52c274ae0 --- /dev/null +++ b/ios/sidedish/sidedish/AppDelegate.swift @@ -0,0 +1,36 @@ +// +// AppDelegate.swift +// sidedish +// +// Created by 박정하 on 2021/04/19. +// + +import UIKit + +@main +class AppDelegate: UIResponder, UIApplicationDelegate { + + + + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { + // Override point for customization after application launch. + return true + } + + // MARK: UISceneSession Lifecycle + + func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration { + // Called when a new scene session is being created. + // Use this method to select a configuration to create the new scene with. + return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role) + } + + func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set) { + // Called when the user discards a scene session. + // If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions. + // Use this method to release any resources that were specific to the discarded scenes, as they will not return. + } + + +} + diff --git a/ios/sidedish/sidedish/Assets.xcassets/AccentColor.colorset/Contents.json b/ios/sidedish/sidedish/Assets.xcassets/AccentColor.colorset/Contents.json new file mode 100644 index 000000000..eb8789700 --- /dev/null +++ b/ios/sidedish/sidedish/Assets.xcassets/AccentColor.colorset/Contents.json @@ -0,0 +1,11 @@ +{ + "colors" : [ + { + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/sidedish/sidedish/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/sidedish/sidedish/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 000000000..9221b9bb1 --- /dev/null +++ b/ios/sidedish/sidedish/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,98 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, + { + "idiom" : "ios-marketing", + "scale" : "1x", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/sidedish/sidedish/Assets.xcassets/Contents.json b/ios/sidedish/sidedish/Assets.xcassets/Contents.json new file mode 100644 index 000000000..73c00596a --- /dev/null +++ b/ios/sidedish/sidedish/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/sidedish/sidedish/Base.lproj/LaunchScreen.storyboard b/ios/sidedish/sidedish/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 000000000..865e9329f --- /dev/null +++ b/ios/sidedish/sidedish/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/sidedish/sidedish/Base.lproj/Main.storyboard b/ios/sidedish/sidedish/Base.lproj/Main.storyboard new file mode 100644 index 000000000..53688a4be --- /dev/null +++ b/ios/sidedish/sidedish/Base.lproj/Main.storyboard @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/sidedish/sidedish/Info.plist b/ios/sidedish/sidedish/Info.plist new file mode 100644 index 000000000..5b531f7b2 --- /dev/null +++ b/ios/sidedish/sidedish/Info.plist @@ -0,0 +1,66 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneConfigurationName + Default Configuration + UISceneDelegateClassName + $(PRODUCT_MODULE_NAME).SceneDelegate + UISceneStoryboardFile + Main + + + + + UIApplicationSupportsIndirectInputEvents + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/ios/sidedish/sidedish/SceneDelegate.swift b/ios/sidedish/sidedish/SceneDelegate.swift new file mode 100644 index 000000000..c98019228 --- /dev/null +++ b/ios/sidedish/sidedish/SceneDelegate.swift @@ -0,0 +1,52 @@ +// +// SceneDelegate.swift +// sidedish +// +// Created by 박정하 on 2021/04/19. +// + +import UIKit + +class SceneDelegate: UIResponder, UIWindowSceneDelegate { + + var window: UIWindow? + + + func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { + // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`. + // If using a storyboard, the `window` property will automatically be initialized and attached to the scene. + // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead). + guard let _ = (scene as? UIWindowScene) else { return } + } + + func sceneDidDisconnect(_ scene: UIScene) { + // Called as the scene is being released by the system. + // This occurs shortly after the scene enters the background, or when its session is discarded. + // Release any resources associated with this scene that can be re-created the next time the scene connects. + // The scene may re-connect later, as its session was not necessarily discarded (see `application:didDiscardSceneSessions` instead). + } + + func sceneDidBecomeActive(_ scene: UIScene) { + // Called when the scene has moved from an inactive state to an active state. + // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive. + } + + func sceneWillResignActive(_ scene: UIScene) { + // Called when the scene will move from an active state to an inactive state. + // This may occur due to temporary interruptions (ex. an incoming phone call). + } + + func sceneWillEnterForeground(_ scene: UIScene) { + // Called as the scene transitions from the background to the foreground. + // Use this method to undo the changes made on entering the background. + } + + func sceneDidEnterBackground(_ scene: UIScene) { + // Called as the scene transitions from the foreground to the background. + // Use this method to save data, release shared resources, and store enough scene-specific state information + // to restore the scene back to its current state. + } + + +} + diff --git a/ios/sidedish/sidedish/ViewController.swift b/ios/sidedish/sidedish/ViewController.swift new file mode 100644 index 000000000..aac51b5ce --- /dev/null +++ b/ios/sidedish/sidedish/ViewController.swift @@ -0,0 +1,18 @@ +// +// ViewController.swift +// sidedish +// +// Created by 박정하 on 2021/04/19. +// + +import UIKit + +class ViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + // Do any additional setup after loading the view. + } + +} + From 1ee08f0550f202f0da4dcbb5c5facaaa4fa7412b Mon Sep 17 00:00:00 2001 From: jhpark-steve Date: Tue, 20 Apr 2021 01:06:25 +0900 Subject: [PATCH 03/35] =?UTF-8?q?feat:=20tableView=EC=9D=98=20customcell?= =?UTF-8?q?=20class=20=EC=83=9D=EC=84=B1=20(#8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit label 업데이트 함수 작성. 후에 수정 필요 --- .../sidedish.xcodeproj/project.pbxproj | 4 +++ ios/sidedish/sidedish/MenuCell.swift | 30 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 ios/sidedish/sidedish/MenuCell.swift diff --git a/ios/sidedish/sidedish.xcodeproj/project.pbxproj b/ios/sidedish/sidedish.xcodeproj/project.pbxproj index e1c861f9f..8b6108d19 100644 --- a/ios/sidedish/sidedish.xcodeproj/project.pbxproj +++ b/ios/sidedish/sidedish.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 8214B70B262DE07A004467C2 /* MenuCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8214B70A262DE07A004467C2 /* MenuCell.swift */; }; 82FDB9C7262DCFD8009E3EB7 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82FDB9C6262DCFD8009E3EB7 /* AppDelegate.swift */; }; 82FDB9C9262DCFD8009E3EB7 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82FDB9C8262DCFD8009E3EB7 /* SceneDelegate.swift */; }; 82FDB9CB262DCFD8009E3EB7 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82FDB9CA262DCFD8009E3EB7 /* ViewController.swift */; }; @@ -16,6 +17,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 8214B70A262DE07A004467C2 /* MenuCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuCell.swift; sourceTree = ""; }; 82FDB9C3262DCFD8009E3EB7 /* sidedish.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = sidedish.app; sourceTree = BUILT_PRODUCTS_DIR; }; 82FDB9C6262DCFD8009E3EB7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 82FDB9C8262DCFD8009E3EB7 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; @@ -59,6 +61,7 @@ 82FDB9C6262DCFD8009E3EB7 /* AppDelegate.swift */, 82FDB9C8262DCFD8009E3EB7 /* SceneDelegate.swift */, 82FDB9CA262DCFD8009E3EB7 /* ViewController.swift */, + 8214B70A262DE07A004467C2 /* MenuCell.swift */, 82FDB9CC262DCFD8009E3EB7 /* Main.storyboard */, 82FDB9CF262DCFD8009E3EB7 /* Assets.xcassets */, 82FDB9D1262DCFD8009E3EB7 /* LaunchScreen.storyboard */, @@ -139,6 +142,7 @@ files = ( 82FDB9CB262DCFD8009E3EB7 /* ViewController.swift in Sources */, 82FDB9C7262DCFD8009E3EB7 /* AppDelegate.swift in Sources */, + 8214B70B262DE07A004467C2 /* MenuCell.swift in Sources */, 82FDB9C9262DCFD8009E3EB7 /* SceneDelegate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/ios/sidedish/sidedish/MenuCell.swift b/ios/sidedish/sidedish/MenuCell.swift new file mode 100644 index 000000000..dca07a16d --- /dev/null +++ b/ios/sidedish/sidedish/MenuCell.swift @@ -0,0 +1,30 @@ +// +// MenuCell.swift +// sidedish +// +// Created by 박정하 on 2021/04/19. +// + +import UIKit + +class MenuCell : UITableViewCell { + @IBOutlet weak var menuImage: UIImageView! + + @IBOutlet weak var menuTitle: UILabel! + @IBOutlet weak var menuSubTitle: UILabel! + @IBOutlet weak var reducedPrice: UILabel! + @IBOutlet weak var menuPrice: UILabel! + @IBOutlet weak var specialPrice: UILabel! + + func updateMenu(titleText: String, subTitle: String, reducedPrice: String, price: String, isSpecialPrice: Bool){ + self.menuTitle.text = titleText + self.menuSubTitle.text = subTitle + self.reducedPrice.text = reducedPrice + self.menuPrice.text = price + self.specialPrice.isHidden = isSpecialPrice + + if isSpecialPrice { + menuPrice.isHidden = true + } + } +} From 1fd22f1ee0dadcf3fdfef7809e0e5693a055ed33 Mon Sep 17 00:00:00 2001 From: jhpark-steve Date: Tue, 20 Apr 2021 01:17:00 +0900 Subject: [PATCH 04/35] =?UTF-8?q?feat:=20mainTableView=20DataSource=20?= =?UTF-8?q?=EC=A7=80=EC=A0=95=20(#8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 테이블 뷰와 DataSource 연결 --- .../sidedish.xcodeproj/project.pbxproj | 4 ++++ ios/sidedish/sidedish/AppDelegate.swift | 6 ------ .../sidedish/Base.lproj/Main.storyboard | 2 +- .../sidedish/MainTableViewDataSource.swift | 19 ++++++++++++++++++ ios/sidedish/sidedish/SceneDelegate.swift | 16 --------------- ios/sidedish/sidedish/ViewController.swift | 20 ++++++++++++++++++- 6 files changed, 43 insertions(+), 24 deletions(-) create mode 100644 ios/sidedish/sidedish/MainTableViewDataSource.swift diff --git a/ios/sidedish/sidedish.xcodeproj/project.pbxproj b/ios/sidedish/sidedish.xcodeproj/project.pbxproj index 8b6108d19..61614b1ad 100644 --- a/ios/sidedish/sidedish.xcodeproj/project.pbxproj +++ b/ios/sidedish/sidedish.xcodeproj/project.pbxproj @@ -8,6 +8,7 @@ /* Begin PBXBuildFile section */ 8214B70B262DE07A004467C2 /* MenuCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8214B70A262DE07A004467C2 /* MenuCell.swift */; }; + 8214B70E262DE253004467C2 /* MainTableViewDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8214B70D262DE253004467C2 /* MainTableViewDataSource.swift */; }; 82FDB9C7262DCFD8009E3EB7 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82FDB9C6262DCFD8009E3EB7 /* AppDelegate.swift */; }; 82FDB9C9262DCFD8009E3EB7 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82FDB9C8262DCFD8009E3EB7 /* SceneDelegate.swift */; }; 82FDB9CB262DCFD8009E3EB7 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82FDB9CA262DCFD8009E3EB7 /* ViewController.swift */; }; @@ -18,6 +19,7 @@ /* Begin PBXFileReference section */ 8214B70A262DE07A004467C2 /* MenuCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuCell.swift; sourceTree = ""; }; + 8214B70D262DE253004467C2 /* MainTableViewDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainTableViewDataSource.swift; sourceTree = ""; }; 82FDB9C3262DCFD8009E3EB7 /* sidedish.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = sidedish.app; sourceTree = BUILT_PRODUCTS_DIR; }; 82FDB9C6262DCFD8009E3EB7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 82FDB9C8262DCFD8009E3EB7 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; @@ -61,6 +63,7 @@ 82FDB9C6262DCFD8009E3EB7 /* AppDelegate.swift */, 82FDB9C8262DCFD8009E3EB7 /* SceneDelegate.swift */, 82FDB9CA262DCFD8009E3EB7 /* ViewController.swift */, + 8214B70D262DE253004467C2 /* MainTableViewDataSource.swift */, 8214B70A262DE07A004467C2 /* MenuCell.swift */, 82FDB9CC262DCFD8009E3EB7 /* Main.storyboard */, 82FDB9CF262DCFD8009E3EB7 /* Assets.xcassets */, @@ -143,6 +146,7 @@ 82FDB9CB262DCFD8009E3EB7 /* ViewController.swift in Sources */, 82FDB9C7262DCFD8009E3EB7 /* AppDelegate.swift in Sources */, 8214B70B262DE07A004467C2 /* MenuCell.swift in Sources */, + 8214B70E262DE253004467C2 /* MainTableViewDataSource.swift in Sources */, 82FDB9C9262DCFD8009E3EB7 /* SceneDelegate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/ios/sidedish/sidedish/AppDelegate.swift b/ios/sidedish/sidedish/AppDelegate.swift index 52c274ae0..852fbfd02 100644 --- a/ios/sidedish/sidedish/AppDelegate.swift +++ b/ios/sidedish/sidedish/AppDelegate.swift @@ -13,22 +13,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - // Override point for customization after application launch. return true } // MARK: UISceneSession Lifecycle func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration { - // Called when a new scene session is being created. - // Use this method to select a configuration to create the new scene with. return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role) } func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set) { - // Called when the user discards a scene session. - // If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions. - // Use this method to release any resources that were specific to the discarded scenes, as they will not return. } diff --git a/ios/sidedish/sidedish/Base.lproj/Main.storyboard b/ios/sidedish/sidedish/Base.lproj/Main.storyboard index 53688a4be..9e44c3f33 100644 --- a/ios/sidedish/sidedish/Base.lproj/Main.storyboard +++ b/ios/sidedish/sidedish/Base.lproj/Main.storyboard @@ -134,7 +134,7 @@ - + diff --git a/ios/sidedish/sidedish/MainTableViewDataSource.swift b/ios/sidedish/sidedish/MainTableViewDataSource.swift new file mode 100644 index 000000000..f428fa4f8 --- /dev/null +++ b/ios/sidedish/sidedish/MainTableViewDataSource.swift @@ -0,0 +1,19 @@ +// +// MainTableViewDataSource.swift +// sidedish +// +// Created by 박정하 on 2021/04/19. +// + +import UIKit + +class MainTableViewDataSource : NSObject, UITableViewDataSource { + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + return 1 + } + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + guard let cell : MenuCell = tableView.dequeueReusableCell(withIdentifier: "MenuCell", for: indexPath) as? MenuCell else { return UITableViewCell() } + return cell + } +} diff --git a/ios/sidedish/sidedish/SceneDelegate.swift b/ios/sidedish/sidedish/SceneDelegate.swift index c98019228..179d7c4dc 100644 --- a/ios/sidedish/sidedish/SceneDelegate.swift +++ b/ios/sidedish/sidedish/SceneDelegate.swift @@ -13,38 +13,22 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate { func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { - // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`. - // If using a storyboard, the `window` property will automatically be initialized and attached to the scene. - // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead). guard let _ = (scene as? UIWindowScene) else { return } } func sceneDidDisconnect(_ scene: UIScene) { - // Called as the scene is being released by the system. - // This occurs shortly after the scene enters the background, or when its session is discarded. - // Release any resources associated with this scene that can be re-created the next time the scene connects. - // The scene may re-connect later, as its session was not necessarily discarded (see `application:didDiscardSceneSessions` instead). } func sceneDidBecomeActive(_ scene: UIScene) { - // Called when the scene has moved from an inactive state to an active state. - // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive. } func sceneWillResignActive(_ scene: UIScene) { - // Called when the scene will move from an active state to an inactive state. - // This may occur due to temporary interruptions (ex. an incoming phone call). } func sceneWillEnterForeground(_ scene: UIScene) { - // Called as the scene transitions from the background to the foreground. - // Use this method to undo the changes made on entering the background. } func sceneDidEnterBackground(_ scene: UIScene) { - // Called as the scene transitions from the foreground to the background. - // Use this method to save data, release shared resources, and store enough scene-specific state information - // to restore the scene back to its current state. } diff --git a/ios/sidedish/sidedish/ViewController.swift b/ios/sidedish/sidedish/ViewController.swift index aac51b5ce..7d1b56061 100644 --- a/ios/sidedish/sidedish/ViewController.swift +++ b/ios/sidedish/sidedish/ViewController.swift @@ -7,8 +7,26 @@ import UIKit -class ViewController: UIViewController { +class MainViewController: UIViewController { + @IBOutlet weak var menuTableView: UITableView! + + private let tableViewDataSource : MainTableViewDataSource? + override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) { + self.tableViewDataSource = nil + super.init(nibName: nil, bundle: nil) + } + + required init?(coder: NSCoder) { + self.tableViewDataSource = MainTableViewDataSource() + super.init(coder: coder) + } + + override func loadView() { + super.loadView() + self.menuTableView.dataSource = tableViewDataSource + } + override func viewDidLoad() { super.viewDidLoad() // Do any additional setup after loading the view. From 3f4c79f5c95b3815cf7f226d9c45f404f30a2247 Mon Sep 17 00:00:00 2001 From: jhpark-steve Date: Tue, 20 Apr 2021 01:22:40 +0900 Subject: [PATCH 05/35] =?UTF-8?q?feat:=20mainTableView=EC=9D=98=20Delegate?= =?UTF-8?q?=20=EC=A7=80=EC=A0=95=20(#8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 테이블 뷰와 delegate 연결 커스텀 헤더 지정 --- .../sidedish.xcodeproj/project.pbxproj | 12 +++++--- .../sidedish/Base.lproj/Main.storyboard | 2 +- .../sidedish/MainTableViewDelegate.swift | 28 +++++++++++++++++++ ...troller.swift => MainViewController.swift} | 4 +++ 4 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 ios/sidedish/sidedish/MainTableViewDelegate.swift rename ios/sidedish/sidedish/{ViewController.swift => MainViewController.swift} (80%) diff --git a/ios/sidedish/sidedish.xcodeproj/project.pbxproj b/ios/sidedish/sidedish.xcodeproj/project.pbxproj index 61614b1ad..55854ada9 100644 --- a/ios/sidedish/sidedish.xcodeproj/project.pbxproj +++ b/ios/sidedish/sidedish.xcodeproj/project.pbxproj @@ -9,9 +9,10 @@ /* Begin PBXBuildFile section */ 8214B70B262DE07A004467C2 /* MenuCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8214B70A262DE07A004467C2 /* MenuCell.swift */; }; 8214B70E262DE253004467C2 /* MainTableViewDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8214B70D262DE253004467C2 /* MainTableViewDataSource.swift */; }; + 8214B711262DE4B4004467C2 /* MainTableViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8214B710262DE4B4004467C2 /* MainTableViewDelegate.swift */; }; 82FDB9C7262DCFD8009E3EB7 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82FDB9C6262DCFD8009E3EB7 /* AppDelegate.swift */; }; 82FDB9C9262DCFD8009E3EB7 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82FDB9C8262DCFD8009E3EB7 /* SceneDelegate.swift */; }; - 82FDB9CB262DCFD8009E3EB7 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82FDB9CA262DCFD8009E3EB7 /* ViewController.swift */; }; + 82FDB9CB262DCFD8009E3EB7 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82FDB9CA262DCFD8009E3EB7 /* MainViewController.swift */; }; 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 */; }; @@ -20,10 +21,11 @@ /* Begin PBXFileReference section */ 8214B70A262DE07A004467C2 /* MenuCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MenuCell.swift; sourceTree = ""; }; 8214B70D262DE253004467C2 /* MainTableViewDataSource.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainTableViewDataSource.swift; sourceTree = ""; }; + 8214B710262DE4B4004467C2 /* MainTableViewDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainTableViewDelegate.swift; sourceTree = ""; }; 82FDB9C3262DCFD8009E3EB7 /* sidedish.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = sidedish.app; sourceTree = BUILT_PRODUCTS_DIR; }; 82FDB9C6262DCFD8009E3EB7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 82FDB9C8262DCFD8009E3EB7 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; - 82FDB9CA262DCFD8009E3EB7 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; + 82FDB9CA262DCFD8009E3EB7 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = ""; }; 82FDB9CD262DCFD8009E3EB7 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 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 = ""; }; @@ -62,8 +64,9 @@ children = ( 82FDB9C6262DCFD8009E3EB7 /* AppDelegate.swift */, 82FDB9C8262DCFD8009E3EB7 /* SceneDelegate.swift */, - 82FDB9CA262DCFD8009E3EB7 /* ViewController.swift */, + 82FDB9CA262DCFD8009E3EB7 /* MainViewController.swift */, 8214B70D262DE253004467C2 /* MainTableViewDataSource.swift */, + 8214B710262DE4B4004467C2 /* MainTableViewDelegate.swift */, 8214B70A262DE07A004467C2 /* MenuCell.swift */, 82FDB9CC262DCFD8009E3EB7 /* Main.storyboard */, 82FDB9CF262DCFD8009E3EB7 /* Assets.xcassets */, @@ -143,11 +146,12 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 82FDB9CB262DCFD8009E3EB7 /* ViewController.swift in Sources */, + 82FDB9CB262DCFD8009E3EB7 /* MainViewController.swift in Sources */, 82FDB9C7262DCFD8009E3EB7 /* AppDelegate.swift in Sources */, 8214B70B262DE07A004467C2 /* MenuCell.swift in Sources */, 8214B70E262DE253004467C2 /* MainTableViewDataSource.swift in Sources */, 82FDB9C9262DCFD8009E3EB7 /* SceneDelegate.swift in Sources */, + 8214B711262DE4B4004467C2 /* MainTableViewDelegate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/sidedish/sidedish/Base.lproj/Main.storyboard b/ios/sidedish/sidedish/Base.lproj/Main.storyboard index 9e44c3f33..a6f30f98c 100644 --- a/ios/sidedish/sidedish/Base.lproj/Main.storyboard +++ b/ios/sidedish/sidedish/Base.lproj/Main.storyboard @@ -1,5 +1,5 @@ - + diff --git a/ios/sidedish/sidedish/MainTableViewDelegate.swift b/ios/sidedish/sidedish/MainTableViewDelegate.swift new file mode 100644 index 000000000..6dd4918c4 --- /dev/null +++ b/ios/sidedish/sidedish/MainTableViewDelegate.swift @@ -0,0 +1,28 @@ +// +// MainTableViewDelegate.swift +// sidedish +// +// Created by 박정하 on 2021/04/19. +// + +import UIKit + +class MainTableViewDelegate : NSObject, UITableViewDelegate { + + func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? { + let headerView = UIView.init(frame: CGRect.init(x: 0, y: 0, width: tableView.frame.width, height: 32)) + + let label = UILabel() //나중에 별도의 유즈케이스를 처리할 프로토콜 필요할 거 같아요 + label.frame = CGRect.init(x: 0, y: 0, width: headerView.frame.width, height: headerView.frame.height) + label.text = "모두가 좋아하는 든든한 메인요리" + label.font = .boldSystemFont(ofSize: 22) + + headerView.addSubview(label) + + return headerView + } + + func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { + return 56 // headerView의 height(32) + figma에서 지정해 준 헤더와 셀 간의 간격! + } +} diff --git a/ios/sidedish/sidedish/ViewController.swift b/ios/sidedish/sidedish/MainViewController.swift similarity index 80% rename from ios/sidedish/sidedish/ViewController.swift rename to ios/sidedish/sidedish/MainViewController.swift index 7d1b56061..5364ce851 100644 --- a/ios/sidedish/sidedish/ViewController.swift +++ b/ios/sidedish/sidedish/MainViewController.swift @@ -11,20 +11,24 @@ class MainViewController: UIViewController { @IBOutlet weak var menuTableView: UITableView! private let tableViewDataSource : MainTableViewDataSource? + private let tableViewDelegate : MainTableViewDelegate? override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) { self.tableViewDataSource = nil + self.tableViewDelegate = nil super.init(nibName: nil, bundle: nil) } required init?(coder: NSCoder) { self.tableViewDataSource = MainTableViewDataSource() + self.tableViewDelegate = MainTableViewDelegate() super.init(coder: coder) } override func loadView() { super.loadView() self.menuTableView.dataSource = tableViewDataSource + self.menuTableView.delegate = tableViewDelegate } override func viewDidLoad() { From cc12efd2b8e7df8471ea17e1cff2fd1098c6fcf5 Mon Sep 17 00:00:00 2001 From: jhpark-steve Date: Tue, 20 Apr 2021 16:17:28 +0900 Subject: [PATCH 06/35] =?UTF-8?q?style:=20subdetailview=20=EA=B5=AC?= =?UTF-8?q?=EC=84=B1=20(#9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 버튼 및 취소선 추가구성 필요 --- .../sidedish/Base.lproj/Main.storyboard | 317 +++++++++++++++++- 1 file changed, 315 insertions(+), 2 deletions(-) diff --git a/ios/sidedish/sidedish/Base.lproj/Main.storyboard b/ios/sidedish/sidedish/Base.lproj/Main.storyboard index a6f30f98c..f91f7e827 100644 --- a/ios/sidedish/sidedish/Base.lproj/Main.storyboard +++ b/ios/sidedish/sidedish/Base.lproj/Main.storyboard @@ -37,7 +37,7 @@ -