diff --git a/Carrot_Market_iOS/Carrot_Market_iOS.xcodeproj/project.pbxproj b/Carrot_Market_iOS/Carrot_Market_iOS.xcodeproj/project.pbxproj index 84ee795..e7e5ecf 100644 --- a/Carrot_Market_iOS/Carrot_Market_iOS.xcodeproj/project.pbxproj +++ b/Carrot_Market_iOS/Carrot_Market_iOS.xcodeproj/project.pbxproj @@ -7,23 +7,55 @@ objects = { /* Begin PBXBuildFile section */ + F26C6B19273812AC007994D2 /* ItemDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F26C6B18273812AC007994D2 /* ItemDataModel.swift */; }; + F26C6B2027382FA9007994D2 /* ItemDetail.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F26C6B1F27382FA9007994D2 /* ItemDetail.storyboard */; }; + F26C6B2327383EA0007994D2 /* ItemDetailVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F26C6B2227383EA0007994D2 /* ItemDetailVC.swift */; }; + F26C6B2A27385CE2007994D2 /* RecommendCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F26C6B2827385CE2007994D2 /* RecommendCollectionViewCell.swift */; }; + F26C6B2B27385CE2007994D2 /* RecommendCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F26C6B2927385CE2007994D2 /* RecommendCollectionViewCell.xib */; }; + F26C6B2D27385F57007994D2 /* RecommendItemDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F26C6B2C27385F57007994D2 /* RecommendItemDataModel.swift */; }; F26CB8712732CCA7002482DE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F26CB8702732CCA7002482DE /* AppDelegate.swift */; }; F26CB8732732CCA7002482DE /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F26CB8722732CCA7002482DE /* SceneDelegate.swift */; }; - F26CB8752732CCA7002482DE /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F26CB8742732CCA7002482DE /* ViewController.swift */; }; F26CB8782732CCA7002482DE /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F26CB8762732CCA7002482DE /* Main.storyboard */; }; F26CB87A2732CCA8002482DE /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F26CB8792732CCA8002482DE /* Assets.xcassets */; }; F26CB87D2732CCA8002482DE /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F26CB87B2732CCA8002482DE /* LaunchScreen.storyboard */; }; + F26D86CC2737C49300232770 /* HomeTBC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F26D86CB2737C49300232770 /* HomeTBC.swift */; }; + F26D86CE2737C4B500232770 /* HomeVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F26D86CD2737C4B500232770 /* HomeVC.swift */; }; + F26D86D42737C56000232770 /* ChatVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F26D86D32737C56000232770 /* ChatVC.swift */; }; + F26D86D62737C57500232770 /* ProfileVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F26D86D52737C57500232770 /* ProfileVC.swift */; }; + F26D86D82737C7A600232770 /* TownVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F26D86D72737C7A600232770 /* TownVC.swift */; }; + F26D86DA2737C7BA00232770 /* MyAroundVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = F26D86D92737C7BA00232770 /* MyAroundVC.swift */; }; + F2C858832737F22900DCA361 /* SF-Pro-Display-Semibold.otf in Resources */ = {isa = PBXBuildFile; fileRef = F2C858822737F22900DCA361 /* SF-Pro-Display-Semibold.otf */; }; + F2C858852737F23D00DCA361 /* SF-Pro-Display-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = F2C858842737F23D00DCA361 /* SF-Pro-Display-Bold.otf */; }; + F2C858872737F25200DCA361 /* SF-Pro-Display-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = F2C858862737F25200DCA361 /* SF-Pro-Display-Regular.otf */; }; + F2C8588E2737F8D700DCA361 /* ItemTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2C8588C2737F8D700DCA361 /* ItemTableViewCell.swift */; }; + F2C8588F2737F8D700DCA361 /* ItemTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F2C8588D2737F8D700DCA361 /* ItemTableViewCell.xib */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + F26C6B18273812AC007994D2 /* ItemDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemDataModel.swift; sourceTree = ""; }; + F26C6B1F27382FA9007994D2 /* ItemDetail.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = ItemDetail.storyboard; sourceTree = ""; }; + F26C6B2227383EA0007994D2 /* ItemDetailVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemDetailVC.swift; sourceTree = ""; }; + F26C6B2827385CE2007994D2 /* RecommendCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecommendCollectionViewCell.swift; sourceTree = ""; }; + F26C6B2927385CE2007994D2 /* RecommendCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RecommendCollectionViewCell.xib; sourceTree = ""; }; + F26C6B2C27385F57007994D2 /* RecommendItemDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecommendItemDataModel.swift; sourceTree = ""; }; F26CB86D2732CCA7002482DE /* Carrot_Market_iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Carrot_Market_iOS.app; sourceTree = BUILT_PRODUCTS_DIR; }; F26CB8702732CCA7002482DE /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; F26CB8722732CCA7002482DE /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; - F26CB8742732CCA7002482DE /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; F26CB8772732CCA7002482DE /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; F26CB8792732CCA8002482DE /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; F26CB87C2732CCA8002482DE /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - F26CB87E2732CCA8002482DE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + F26CB87E2732CCA8002482DE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = "Carrot_Market_iOS/Supporting Files/Info.plist"; sourceTree = SOURCE_ROOT; }; + F26D86CB2737C49300232770 /* HomeTBC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeTBC.swift; sourceTree = ""; }; + F26D86CD2737C4B500232770 /* HomeVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeVC.swift; sourceTree = ""; }; + F26D86D32737C56000232770 /* ChatVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatVC.swift; sourceTree = ""; }; + F26D86D52737C57500232770 /* ProfileVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileVC.swift; sourceTree = ""; }; + F26D86D72737C7A600232770 /* TownVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TownVC.swift; sourceTree = ""; }; + F26D86D92737C7BA00232770 /* MyAroundVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyAroundVC.swift; sourceTree = ""; }; + F2C858822737F22900DCA361 /* SF-Pro-Display-Semibold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SF-Pro-Display-Semibold.otf"; sourceTree = ""; }; + F2C858842737F23D00DCA361 /* SF-Pro-Display-Bold.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SF-Pro-Display-Bold.otf"; sourceTree = ""; }; + F2C858862737F25200DCA361 /* SF-Pro-Display-Regular.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "SF-Pro-Display-Regular.otf"; sourceTree = ""; }; + F2C8588C2737F8D700DCA361 /* ItemTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemTableViewCell.swift; sourceTree = ""; }; + F2C8588D2737F8D700DCA361 /* ItemTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ItemTableViewCell.xib; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -37,6 +69,17 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + F26C6B2127383E81007994D2 /* Item */ = { + isa = PBXGroup; + children = ( + F26C6B2227383EA0007994D2 /* ItemDetailVC.swift */, + F26C6B2927385CE2007994D2 /* RecommendCollectionViewCell.xib */, + F26C6B2827385CE2007994D2 /* RecommendCollectionViewCell.swift */, + F26C6B2C27385F57007994D2 /* RecommendItemDataModel.swift */, + ); + path = Item; + sourceTree = ""; + }; F26CB8642732CCA7002482DE = { isa = PBXGroup; children = ( @@ -54,17 +97,118 @@ sourceTree = ""; }; F26CB86F2732CCA7002482DE /* Carrot_Market_iOS */ = { + isa = PBXGroup; + children = ( + F2A1399C2737852600B31C9D /* Utils */, + F2A1399E2737854100B31C9D /* Delegate */, + F2A1399D2737853600B31C9D /* Supporting Files */, + F2A139A02737855100B31C9D /* Server */, + F2A1399F2737854900B31C9D /* Storyboards */, + F2A139A12737855700B31C9D /* View Controllers */, + ); + path = Carrot_Market_iOS; + sourceTree = ""; + }; + F2A1399C2737852600B31C9D /* Utils */ = { + isa = PBXGroup; + children = ( + ); + path = Utils; + sourceTree = ""; + }; + F2A1399D2737853600B31C9D /* Supporting Files */ = { + isa = PBXGroup; + children = ( + F26CB8792732CCA8002482DE /* Assets.xcassets */, + F26CB87E2732CCA8002482DE /* Info.plist */, + F2C858822737F22900DCA361 /* SF-Pro-Display-Semibold.otf */, + F2C858842737F23D00DCA361 /* SF-Pro-Display-Bold.otf */, + F2C858862737F25200DCA361 /* SF-Pro-Display-Regular.otf */, + ); + path = "Supporting Files"; + sourceTree = ""; + }; + F2A1399E2737854100B31C9D /* Delegate */ = { isa = PBXGroup; children = ( F26CB8702732CCA7002482DE /* AppDelegate.swift */, F26CB8722732CCA7002482DE /* SceneDelegate.swift */, - F26CB8742732CCA7002482DE /* ViewController.swift */, + ); + path = Delegate; + sourceTree = ""; + }; + F2A1399F2737854900B31C9D /* Storyboards */ = { + isa = PBXGroup; + children = ( F26CB8762732CCA7002482DE /* Main.storyboard */, F26CB87B2732CCA8002482DE /* LaunchScreen.storyboard */, - F26CB8792732CCA8002482DE /* Assets.xcassets */, - F26CB87E2732CCA8002482DE /* Info.plist */, + F26C6B1F27382FA9007994D2 /* ItemDetail.storyboard */, ); - path = Carrot_Market_iOS; + path = Storyboards; + sourceTree = ""; + }; + F2A139A02737855100B31C9D /* Server */ = { + isa = PBXGroup; + children = ( + ); + path = Server; + sourceTree = ""; + }; + F2A139A12737855700B31C9D /* View Controllers */ = { + isa = PBXGroup; + children = ( + F26C6B2127383E81007994D2 /* Item */, + F2A139A2273785B900B31C9D /* Home */, + F2C858882737F70C00DCA361 /* Town */, + F2C858892737F71D00DCA361 /* MyAround */, + F2C8588A2737F73100DCA361 /* Chat */, + F2C8588B2737F73900DCA361 /* Profile */, + ); + path = "View Controllers"; + sourceTree = ""; + }; + F2A139A2273785B900B31C9D /* Home */ = { + isa = PBXGroup; + children = ( + F26D86CB2737C49300232770 /* HomeTBC.swift */, + F26D86CD2737C4B500232770 /* HomeVC.swift */, + F2C8588D2737F8D700DCA361 /* ItemTableViewCell.xib */, + F2C8588C2737F8D700DCA361 /* ItemTableViewCell.swift */, + F26C6B18273812AC007994D2 /* ItemDataModel.swift */, + ); + path = Home; + sourceTree = ""; + }; + F2C858882737F70C00DCA361 /* Town */ = { + isa = PBXGroup; + children = ( + F26D86D72737C7A600232770 /* TownVC.swift */, + ); + path = Town; + sourceTree = ""; + }; + F2C858892737F71D00DCA361 /* MyAround */ = { + isa = PBXGroup; + children = ( + F26D86D92737C7BA00232770 /* MyAroundVC.swift */, + ); + path = MyAround; + sourceTree = ""; + }; + F2C8588A2737F73100DCA361 /* Chat */ = { + isa = PBXGroup; + children = ( + F26D86D32737C56000232770 /* ChatVC.swift */, + ); + path = Chat; + sourceTree = ""; + }; + F2C8588B2737F73900DCA361 /* Profile */ = { + isa = PBXGroup; + children = ( + F26D86D52737C57500232770 /* ProfileVC.swift */, + ); + path = Profile; sourceTree = ""; }; /* End PBXGroup section */ @@ -125,8 +269,14 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + F2C858832737F22900DCA361 /* SF-Pro-Display-Semibold.otf in Resources */, + F2C858852737F23D00DCA361 /* SF-Pro-Display-Bold.otf in Resources */, F26CB87D2732CCA8002482DE /* LaunchScreen.storyboard in Resources */, F26CB87A2732CCA8002482DE /* Assets.xcassets in Resources */, + F26C6B2B27385CE2007994D2 /* RecommendCollectionViewCell.xib in Resources */, + F2C858872737F25200DCA361 /* SF-Pro-Display-Regular.otf in Resources */, + F2C8588F2737F8D700DCA361 /* ItemTableViewCell.xib in Resources */, + F26C6B2027382FA9007994D2 /* ItemDetail.storyboard in Resources */, F26CB8782732CCA7002482DE /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -138,9 +288,19 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - F26CB8752732CCA7002482DE /* ViewController.swift in Sources */, + F26D86DA2737C7BA00232770 /* MyAroundVC.swift in Sources */, + F2C8588E2737F8D700DCA361 /* ItemTableViewCell.swift in Sources */, + F26D86D82737C7A600232770 /* TownVC.swift in Sources */, + F26D86D42737C56000232770 /* ChatVC.swift in Sources */, + F26D86CE2737C4B500232770 /* HomeVC.swift in Sources */, F26CB8712732CCA7002482DE /* AppDelegate.swift in Sources */, + F26D86CC2737C49300232770 /* HomeTBC.swift in Sources */, + F26D86D62737C57500232770 /* ProfileVC.swift in Sources */, + F26C6B19273812AC007994D2 /* ItemDataModel.swift in Sources */, + F26C6B2327383EA0007994D2 /* ItemDetailVC.swift in Sources */, F26CB8732732CCA7002482DE /* SceneDelegate.swift in Sources */, + F26C6B2A27385CE2007994D2 /* RecommendCollectionViewCell.swift in Sources */, + F26C6B2D27385F57007994D2 /* RecommendItemDataModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -291,7 +451,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 5JQQ946A44; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = Carrot_Market_iOS/Info.plist; + INFOPLIST_FILE = "Carrot_Market_iOS/Supporting Files/Info.plist"; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UIMainStoryboardFile = Main; @@ -319,7 +479,7 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 5JQQ946A44; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = Carrot_Market_iOS/Info.plist; + INFOPLIST_FILE = "Carrot_Market_iOS/Supporting Files/Info.plist"; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UIMainStoryboardFile = Main; diff --git a/Carrot_Market_iOS/Carrot_Market_iOS.xcodeproj/project.xcworkspace/xcuserdata/anhyeonju.xcuserdatad/UserInterfaceState.xcuserstate b/Carrot_Market_iOS/Carrot_Market_iOS.xcodeproj/project.xcworkspace/xcuserdata/anhyeonju.xcuserdatad/UserInterfaceState.xcuserstate index 7c2f23a..78effa7 100644 Binary files a/Carrot_Market_iOS/Carrot_Market_iOS.xcodeproj/project.xcworkspace/xcuserdata/anhyeonju.xcuserdatad/UserInterfaceState.xcuserstate and b/Carrot_Market_iOS/Carrot_Market_iOS.xcodeproj/project.xcworkspace/xcuserdata/anhyeonju.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Base.lproj/Main.storyboard b/Carrot_Market_iOS/Carrot_Market_iOS/Base.lproj/Main.storyboard deleted file mode 100644 index 25a7638..0000000 --- a/Carrot_Market_iOS/Carrot_Market_iOS/Base.lproj/Main.storyboard +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/AppDelegate.swift b/Carrot_Market_iOS/Carrot_Market_iOS/Delegate/AppDelegate.swift similarity index 100% rename from Carrot_Market_iOS/Carrot_Market_iOS/AppDelegate.swift rename to Carrot_Market_iOS/Carrot_Market_iOS/Delegate/AppDelegate.swift diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/SceneDelegate.swift b/Carrot_Market_iOS/Carrot_Market_iOS/Delegate/SceneDelegate.swift similarity index 100% rename from Carrot_Market_iOS/Carrot_Market_iOS/SceneDelegate.swift rename to Carrot_Market_iOS/Carrot_Market_iOS/Delegate/SceneDelegate.swift diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Base.lproj/LaunchScreen.storyboard b/Carrot_Market_iOS/Carrot_Market_iOS/Storyboards/Base.lproj/LaunchScreen.storyboard similarity index 59% rename from Carrot_Market_iOS/Carrot_Market_iOS/Base.lproj/LaunchScreen.storyboard rename to Carrot_Market_iOS/Carrot_Market_iOS/Storyboards/Base.lproj/LaunchScreen.storyboard index 865e932..7872ae9 100644 --- a/Carrot_Market_iOS/Carrot_Market_iOS/Base.lproj/LaunchScreen.storyboard +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Storyboards/Base.lproj/LaunchScreen.storyboard @@ -1,8 +1,10 @@ - - + + + - + + @@ -11,10 +13,10 @@ - + - + @@ -22,4 +24,9 @@ + + + + + diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Storyboards/Base.lproj/Main.storyboard b/Carrot_Market_iOS/Carrot_Market_iOS/Storyboards/Base.lproj/Main.storyboard new file mode 100644 index 0000000..2c5156c --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Storyboards/Base.lproj/Main.storyboard @@ -0,0 +1,260 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Storyboards/ItemDetail.storyboard b/Carrot_Market_iOS/Carrot_Market_iOS/Storyboards/ItemDetail.storyboard new file mode 100644 index 0000000..c4750d5 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Storyboards/ItemDetail.storyboard @@ -0,0 +1,435 @@ + + + + + + + + + + + + + + + SFProDisplay-Bold + + + SFProDisplay-Regular + + + SFProDisplay-Semibold + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Assets.xcassets/AccentColor.colorset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from Carrot_Market_iOS/Carrot_Market_iOS/Assets.xcassets/AccentColor.colorset/Contents.json rename to Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Carrot_Market_iOS/Carrot_Market_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json rename to Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Assets.xcassets/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/Contents.json similarity index 100% rename from Carrot_Market_iOS/Carrot_Market_iOS/Assets.xcassets/Contents.json rename to Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/Contents.json diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/color/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/color/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/color/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/color/carrot.colorset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/color/carrot.colorset/Contents.json new file mode 100644 index 0000000..e1d5fa2 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/color/carrot.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.282", + "green" : "0.522", + "red" : "0.933" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.282", + "green" : "0.522", + "red" : "0.933" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/color/green.colorset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/color/green.colorset/Contents.json new file mode 100644 index 0000000..791a922 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/color/green.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.302", + "green" : "0.698", + "red" : "0.220" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.302", + "green" : "0.698", + "red" : "0.220" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/color/infoLetter.colorset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/color/infoLetter.colorset/Contents.json new file mode 100644 index 0000000..a745f8e --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/color/infoLetter.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.616", + "green" : "0.588", + "red" : "0.573" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.616", + "green" : "0.588", + "red" : "0.573" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/color/likeNum.colorset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/color/likeNum.colorset/Contents.json new file mode 100644 index 0000000..0609d65 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/color/likeNum.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.376", + "green" : "0.376", + "red" : "0.376" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.376", + "green" : "0.376", + "red" : "0.376" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/alarmIcon.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/alarmIcon.imageset/Contents.json new file mode 100644 index 0000000..810030b --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/alarmIcon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "alarmIcon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "alarmIcon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "alarmIcon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/alarmIcon.imageset/alarmIcon.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/alarmIcon.imageset/alarmIcon.png new file mode 100644 index 0000000..1d24272 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/alarmIcon.imageset/alarmIcon.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/alarmIcon.imageset/alarmIcon@2x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/alarmIcon.imageset/alarmIcon@2x.png new file mode 100644 index 0000000..25f6c36 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/alarmIcon.imageset/alarmIcon@2x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/alarmIcon.imageset/alarmIcon@3x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/alarmIcon.imageset/alarmIcon@3x.png new file mode 100644 index 0000000..84ae310 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/alarmIcon.imageset/alarmIcon@3x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIcon.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIcon.imageset/Contents.json new file mode 100644 index 0000000..c0f1211 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIcon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "chatIcon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "chatIcon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "chatIcon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIcon.imageset/chatIcon.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIcon.imageset/chatIcon.png new file mode 100644 index 0000000..6229804 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIcon.imageset/chatIcon.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIcon.imageset/chatIcon@2x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIcon.imageset/chatIcon@2x.png new file mode 100644 index 0000000..d9d259e Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIcon.imageset/chatIcon@2x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIcon.imageset/chatIcon@3x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIcon.imageset/chatIcon@3x.png new file mode 100644 index 0000000..f30285b Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIcon.imageset/chatIcon@3x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIconFill.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIconFill.imageset/Contents.json new file mode 100644 index 0000000..ddb580c --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIconFill.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "chatIconFill.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "chatIconFill@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "chatIconFill@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIconFill.imageset/chatIconFill.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIconFill.imageset/chatIconFill.png new file mode 100644 index 0000000..987820f Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIconFill.imageset/chatIconFill.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIconFill.imageset/chatIconFill@2x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIconFill.imageset/chatIconFill@2x.png new file mode 100644 index 0000000..2bb654b Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIconFill.imageset/chatIconFill@2x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIconFill.imageset/chatIconFill@3x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIconFill.imageset/chatIconFill@3x.png new file mode 100644 index 0000000..30c0867 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/chatIconFill.imageset/chatIconFill@3x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIcon.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIcon.imageset/Contents.json new file mode 100644 index 0000000..96f0f67 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIcon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "homeIcon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "homeIcon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "homeIcon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIcon.imageset/homeIcon.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIcon.imageset/homeIcon.png new file mode 100644 index 0000000..ea35ae7 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIcon.imageset/homeIcon.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIcon.imageset/homeIcon@2x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIcon.imageset/homeIcon@2x.png new file mode 100644 index 0000000..3ef792a Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIcon.imageset/homeIcon@2x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIcon.imageset/homeIcon@3x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIcon.imageset/homeIcon@3x.png new file mode 100644 index 0000000..7539f83 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIcon.imageset/homeIcon@3x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIconFill.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIconFill.imageset/Contents.json new file mode 100644 index 0000000..fe4a37b --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIconFill.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "homeIconFill.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "homeIconFill@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "homeIconFill@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIconFill.imageset/homeIconFill.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIconFill.imageset/homeIconFill.png new file mode 100644 index 0000000..c717cb1 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIconFill.imageset/homeIconFill.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIconFill.imageset/homeIconFill@2x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIconFill.imageset/homeIconFill@2x.png new file mode 100644 index 0000000..8270b58 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIconFill.imageset/homeIconFill@2x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIconFill.imageset/homeIconFill@3x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIconFill.imageset/homeIconFill@3x.png new file mode 100644 index 0000000..e2e25ae Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/homeIconFill.imageset/homeIconFill@3x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/like.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/like.imageset/Contents.json new file mode 100644 index 0000000..7245ec5 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/like.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Frame 1.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Frame 1@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Frame 1@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/like.imageset/Frame 1.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/like.imageset/Frame 1.png new file mode 100644 index 0000000..451e1d1 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/like.imageset/Frame 1.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/like.imageset/Frame 1@2x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/like.imageset/Frame 1@2x.png new file mode 100644 index 0000000..e628c3c Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/like.imageset/Frame 1@2x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/like.imageset/Frame 1@3x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/like.imageset/Frame 1@3x.png new file mode 100644 index 0000000..5dc02ff Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/like.imageset/Frame 1@3x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/locationIcon.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/locationIcon.imageset/Contents.json new file mode 100644 index 0000000..56eac5d --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/locationIcon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "locationIcon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "locationIcon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "locationIcon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/locationIcon.imageset/locationIcon.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/locationIcon.imageset/locationIcon.png new file mode 100644 index 0000000..753a018 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/locationIcon.imageset/locationIcon.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/locationIcon.imageset/locationIcon@2x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/locationIcon.imageset/locationIcon@2x.png new file mode 100644 index 0000000..43fa055 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/locationIcon.imageset/locationIcon@2x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/locationIcon.imageset/locationIcon@3x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/locationIcon.imageset/locationIcon@3x.png new file mode 100644 index 0000000..fdfd508 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/locationIcon.imageset/locationIcon@3x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/menuIcon.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/menuIcon.imageset/Contents.json new file mode 100644 index 0000000..1a67b63 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/menuIcon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "menuIcon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "menuIcon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "menuIcon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/menuIcon.imageset/menuIcon.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/menuIcon.imageset/menuIcon.png new file mode 100644 index 0000000..f3cf2a8 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/menuIcon.imageset/menuIcon.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/menuIcon.imageset/menuIcon@2x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/menuIcon.imageset/menuIcon@2x.png new file mode 100644 index 0000000..b7d3b40 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/menuIcon.imageset/menuIcon@2x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/menuIcon.imageset/menuIcon@3x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/menuIcon.imageset/menuIcon@3x.png new file mode 100644 index 0000000..5ecc5bd Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/menuIcon.imageset/menuIcon@3x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIcon.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIcon.imageset/Contents.json new file mode 100644 index 0000000..f798b91 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIcon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "myAroundIcon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "myAroundIcon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "myAroundIcon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIcon.imageset/myAroundIcon.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIcon.imageset/myAroundIcon.png new file mode 100644 index 0000000..0e6b345 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIcon.imageset/myAroundIcon.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIcon.imageset/myAroundIcon@2x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIcon.imageset/myAroundIcon@2x.png new file mode 100644 index 0000000..fcf9167 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIcon.imageset/myAroundIcon@2x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIcon.imageset/myAroundIcon@3x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIcon.imageset/myAroundIcon@3x.png new file mode 100644 index 0000000..b542b5d Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIcon.imageset/myAroundIcon@3x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIconFill.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIconFill.imageset/Contents.json new file mode 100644 index 0000000..9c6ac9a --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIconFill.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "myAroundIconFill.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "myAroundIconFill@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "myAroundIconFill@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIconFill.imageset/myAroundIconFill.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIconFill.imageset/myAroundIconFill.png new file mode 100644 index 0000000..a59f075 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIconFill.imageset/myAroundIconFill.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIconFill.imageset/myAroundIconFill@2x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIconFill.imageset/myAroundIconFill@2x.png new file mode 100644 index 0000000..813a0c8 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIconFill.imageset/myAroundIconFill@2x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIconFill.imageset/myAroundIconFill@3x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIconFill.imageset/myAroundIconFill@3x.png new file mode 100644 index 0000000..1cbc1f3 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myAroundIconFill.imageset/myAroundIconFill@3x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIcon.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIcon.imageset/Contents.json new file mode 100644 index 0000000..f8e8fbc --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIcon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "myCarrotIcon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "myCarrotIcon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "myCarrotIcon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIcon.imageset/myCarrotIcon.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIcon.imageset/myCarrotIcon.png new file mode 100644 index 0000000..c110fd8 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIcon.imageset/myCarrotIcon.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIcon.imageset/myCarrotIcon@2x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIcon.imageset/myCarrotIcon@2x.png new file mode 100644 index 0000000..f4c2edd Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIcon.imageset/myCarrotIcon@2x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIcon.imageset/myCarrotIcon@3x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIcon.imageset/myCarrotIcon@3x.png new file mode 100644 index 0000000..494d48e Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIcon.imageset/myCarrotIcon@3x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIconFill.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIconFill.imageset/Contents.json new file mode 100644 index 0000000..35416f9 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIconFill.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "myCarrotIconFill.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "myCarrotIconFill@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "myCarrotIconFill@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIconFill.imageset/myCarrotIconFill.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIconFill.imageset/myCarrotIconFill.png new file mode 100644 index 0000000..cf94b5a Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIconFill.imageset/myCarrotIconFill.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIconFill.imageset/myCarrotIconFill@2x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIconFill.imageset/myCarrotIconFill@2x.png new file mode 100644 index 0000000..1f9d720 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIconFill.imageset/myCarrotIconFill@2x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIconFill.imageset/myCarrotIconFill@3x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIconFill.imageset/myCarrotIconFill@3x.png new file mode 100644 index 0000000..7fa7d74 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/myCarrotIconFill.imageset/myCarrotIconFill@3x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/plusButton.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/plusButton.imageset/Contents.json new file mode 100644 index 0000000..066fc4c --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/plusButton.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "plusButton.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "plusButton@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "plusButton@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/plusButton.imageset/plusButton.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/plusButton.imageset/plusButton.png new file mode 100644 index 0000000..406ecb5 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/plusButton.imageset/plusButton.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/plusButton.imageset/plusButton@2x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/plusButton.imageset/plusButton@2x.png new file mode 100644 index 0000000..ed287d9 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/plusButton.imageset/plusButton@2x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/plusButton.imageset/plusButton@3x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/plusButton.imageset/plusButton@3x.png new file mode 100644 index 0000000..1891e82 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/plusButton.imageset/plusButton@3x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/profile.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/profile.imageset/Contents.json new file mode 100644 index 0000000..a550aff --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/profile.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "profile.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "profile@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "profile@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/profile.imageset/profile.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/profile.imageset/profile.png new file mode 100644 index 0000000..41a2bfe Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/profile.imageset/profile.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/profile.imageset/profile@2x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/profile.imageset/profile@2x.png new file mode 100644 index 0000000..e992ae4 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/profile.imageset/profile@2x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/profile.imageset/profile@3x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/profile.imageset/profile@3x.png new file mode 100644 index 0000000..21697da Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/profile.imageset/profile@3x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/profileImage.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/profileImage.imageset/Contents.json new file mode 100644 index 0000000..a0f19f0 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/profileImage.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "profileImage-Default-1.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/profileImage.imageset/profileImage-Default-1.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/profileImage.imageset/profileImage-Default-1.png new file mode 100644 index 0000000..1f63a7b Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/profileImage.imageset/profileImage-Default-1.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/searchIcon.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/searchIcon.imageset/Contents.json new file mode 100644 index 0000000..ea92cab --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/searchIcon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "_searchIcon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "_searchIcon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "_searchIcon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/searchIcon.imageset/_searchIcon.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/searchIcon.imageset/_searchIcon.png new file mode 100644 index 0000000..e8abc97 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/searchIcon.imageset/_searchIcon.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/searchIcon.imageset/_searchIcon@2x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/searchIcon.imageset/_searchIcon@2x.png new file mode 100644 index 0000000..5fcd263 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/searchIcon.imageset/_searchIcon@2x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/searchIcon.imageset/_searchIcon@3x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/searchIcon.imageset/_searchIcon@3x.png new file mode 100644 index 0000000..f12ac1b Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/searchIcon.imageset/_searchIcon@3x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/smileIcon.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/smileIcon.imageset/Contents.json new file mode 100644 index 0000000..1030fa5 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/smileIcon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "smileIcon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "smileIcon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "smileIcon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/smileIcon.imageset/smileIcon.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/smileIcon.imageset/smileIcon.png new file mode 100644 index 0000000..7937d97 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/smileIcon.imageset/smileIcon.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/smileIcon.imageset/smileIcon@2x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/smileIcon.imageset/smileIcon@2x.png new file mode 100644 index 0000000..597eaf7 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/smileIcon.imageset/smileIcon@2x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/smileIcon.imageset/smileIcon@3x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/smileIcon.imageset/smileIcon@3x.png new file mode 100644 index 0000000..1d9abe2 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/smileIcon.imageset/smileIcon@3x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIcon.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIcon.imageset/Contents.json new file mode 100644 index 0000000..0facefc --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIcon.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "townIcon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "townIcon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "townIcon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIcon.imageset/townIcon.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIcon.imageset/townIcon.png new file mode 100644 index 0000000..dcb0bbc Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIcon.imageset/townIcon.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIcon.imageset/townIcon@2x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIcon.imageset/townIcon@2x.png new file mode 100644 index 0000000..ea14e9c Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIcon.imageset/townIcon@2x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIcon.imageset/townIcon@3x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIcon.imageset/townIcon@3x.png new file mode 100644 index 0000000..344d4cc Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIcon.imageset/townIcon@3x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIconFill.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIconFill.imageset/Contents.json new file mode 100644 index 0000000..a7955bc --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIconFill.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "townIconFill.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "townIconFill@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "townIconFill@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIconFill.imageset/townIconFill.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIconFill.imageset/townIconFill.png new file mode 100644 index 0000000..1e969df Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIconFill.imageset/townIconFill.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIconFill.imageset/townIconFill@2x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIconFill.imageset/townIconFill@2x.png new file mode 100644 index 0000000..0251e34 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIconFill.imageset/townIconFill@2x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIconFill.imageset/townIconFill@3x.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIconFill.imageset/townIconFill@3x.png new file mode 100644 index 0000000..0284329 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/icon/townIconFill.imageset/townIconFill@3x.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/camera.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/camera.imageset/Contents.json new file mode 100644 index 0000000..1f9b6a7 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/camera.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "camera-g96d535a7c_1280.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/camera.imageset/camera-g96d535a7c_1280.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/camera.imageset/camera-g96d535a7c_1280.png new file mode 100644 index 0000000..bc32027 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/camera.imageset/camera-g96d535a7c_1280.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/eunjuchoi.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/eunjuchoi.imageset/Contents.json new file mode 100644 index 0000000..9957c1a --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/eunjuchoi.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "eunjuchoi.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/eunjuchoi.imageset/eunjuchoi.png b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/eunjuchoi.imageset/eunjuchoi.png new file mode 100644 index 0000000..45ecc60 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/eunjuchoi.imageset/eunjuchoi.png differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/macbook.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/macbook.imageset/Contents.json new file mode 100644 index 0000000..5cf082d --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/macbook.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "coffee-gf73d7a9ee_1920.jpg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/macbook.imageset/coffee-gf73d7a9ee_1920.jpg b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/macbook.imageset/coffee-gf73d7a9ee_1920.jpg new file mode 100644 index 0000000..831abec Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/macbook.imageset/coffee-gf73d7a9ee_1920.jpg differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/mask.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/mask.imageset/Contents.json new file mode 100644 index 0000000..e7bd41f --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/mask.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "face-mask-g1b9873186_1920.jpg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/mask.imageset/face-mask-g1b9873186_1920.jpg b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/mask.imageset/face-mask-g1b9873186_1920.jpg new file mode 100644 index 0000000..dfaa8c7 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/mask.imageset/face-mask-g1b9873186_1920.jpg differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/shoes.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/shoes.imageset/Contents.json new file mode 100644 index 0000000..dee2958 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/shoes.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "shoes-g207b01894_1920.jpg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/shoes.imageset/shoes-g207b01894_1920.jpg b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/shoes.imageset/shoes-g207b01894_1920.jpg new file mode 100644 index 0000000..cac02c2 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/shoes.imageset/shoes-g207b01894_1920.jpg differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/starbucks.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/starbucks.imageset/Contents.json new file mode 100644 index 0000000..6c9ccf8 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/starbucks.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "starbucks-gcf2654e08_1920.jpg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/starbucks.imageset/starbucks-gcf2654e08_1920.jpg b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/starbucks.imageset/starbucks-gcf2654e08_1920.jpg new file mode 100644 index 0000000..64194f4 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/starbucks.imageset/starbucks-gcf2654e08_1920.jpg differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/sweetpotato.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/sweetpotato.imageset/Contents.json new file mode 100644 index 0000000..86ba049 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/sweetpotato.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "sweet-potato-g57191a2e8_1920.jpg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/sweetpotato.imageset/sweet-potato-g57191a2e8_1920.jpg b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/sweetpotato.imageset/sweet-potato-g57191a2e8_1920.jpg new file mode 100644 index 0000000..820d57d Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/sweetpotato.imageset/sweet-potato-g57191a2e8_1920.jpg differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/teddybear.imageset/Contents.json b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/teddybear.imageset/Contents.json new file mode 100644 index 0000000..a883364 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/teddybear.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "teddy-bear-g5bc002384_1920.jpg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/teddybear.imageset/teddy-bear-g5bc002384_1920.jpg b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/teddybear.imageset/teddy-bear-g5bc002384_1920.jpg new file mode 100644 index 0000000..549486f Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Assets.xcassets/item/teddybear.imageset/teddy-bear-g5bc002384_1920.jpg differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Info.plist b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Info.plist similarity index 100% rename from Carrot_Market_iOS/Carrot_Market_iOS/Info.plist rename to Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/Info.plist diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/SF-Pro-Display-Bold.otf b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/SF-Pro-Display-Bold.otf new file mode 100755 index 0000000..57bcd6e Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/SF-Pro-Display-Bold.otf differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/SF-Pro-Display-Regular.otf b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/SF-Pro-Display-Regular.otf new file mode 100755 index 0000000..3fb9210 Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/SF-Pro-Display-Regular.otf differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/SF-Pro-Display-Semibold.otf b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/SF-Pro-Display-Semibold.otf new file mode 100755 index 0000000..1c2415b Binary files /dev/null and b/Carrot_Market_iOS/Carrot_Market_iOS/Supporting Files/SF-Pro-Display-Semibold.otf differ diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Chat/ChatVC.swift b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Chat/ChatVC.swift new file mode 100644 index 0000000..1dafc85 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Chat/ChatVC.swift @@ -0,0 +1,18 @@ +// +// chatVC.swift +// Carrot_Market_iOS +// +// Created by 안현주 on 2021/11/07. +// + +import UIKit + +class ChatVC: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + } + + +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Home/HomeTBC.swift b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Home/HomeTBC.swift new file mode 100644 index 0000000..c8e1027 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Home/HomeTBC.swift @@ -0,0 +1,38 @@ +// +// HomeTBC.swift +// Carrot_Market_iOS +// +// Created by 안현주 on 2021/11/07. +// + +import UIKit + +class HomeTBC: UITabBarController { + + // MARK: - Life Cycle + override func viewDidLoad() { + super.viewDidLoad() + + setTabBar() + } + + // MARK: - Custom Method + func setTabBar() { + guard let homeVC = self.storyboard?.instantiateViewController(identifier: "HomeVC"), + let townVC = self.storyboard?.instantiateViewController(identifier: "TownVC"), + let myaroundVC = self.storyboard?.instantiateViewController(identifier: "MyAroundVC"), + let chatVC = self.storyboard?.instantiateViewController(identifier: "ChatVC"), + let profileVC = self.storyboard?.instantiateViewController(identifier: "ProfileVC") + else { return } + + homeVC.tabBarItem = UITabBarItem(title: "홈", image: UIImage(named: "homeIcon"), selectedImage: UIImage(named: "homeIconFill")) + townVC.tabBarItem = UITabBarItem(title: "동네생활", image: UIImage(named: "townIcon"), selectedImage: UIImage(named: "townIconFill")) + myaroundVC.tabBarItem = UITabBarItem(title: "내 근처", image: UIImage(named: "myAroundIcon"), selectedImage: UIImage(named: "myAroundIconFill")) + chatVC.tabBarItem = UITabBarItem(title: "채팅", image: UIImage(named: "chatIcon"), selectedImage: UIImage(named: "chatIconFill")) + profileVC.tabBarItem = UITabBarItem(title: "나의 당근", image: UIImage(named: "myCarrotIcon"), selectedImage: UIImage(named: "myCarrotIconFill")) + + setViewControllers([homeVC, townVC, myaroundVC, chatVC, profileVC], animated: true) + + } + +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Home/HomeVC.swift b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Home/HomeVC.swift new file mode 100644 index 0000000..ab02f1b --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Home/HomeVC.swift @@ -0,0 +1,97 @@ +// +// HomeVC.swift +// Carrot_Market_iOS +// +// Created by 안현주 on 2021/11/07. +// + +import UIKit + +class HomeVC: UIViewController { + + // MARK: - Properties + @IBOutlet weak var locationBtn: UIButton! + @IBOutlet weak var searchBtn: UIButton! + @IBOutlet weak var categoryBtn: UIButton! + @IBOutlet weak var noticeBtn: UIButton! + @IBOutlet weak var itemTableView: UITableView! + + var itemDataList: [ItemData] = [] + + + // MARK: - Life Cycle + override func viewDidLoad() { + super.viewDidLoad() + initItemList() + makeDelegate() + registerXib() + } + + // MARK: - Custom Method + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + + navigationController?.setNavigationBarHidden(true, animated: animated) + } + + override func viewWillDisappear(_ animated: Bool) { + super.viewWillDisappear(animated) + navigationController?.setNavigationBarHidden(false, animated: animated) + } + + func initItemList() { + itemDataList.append(contentsOf: [ + ItemData(itemIconName: "sweetpotato", itemName: "고구마호박 아닌 호박고구마", info: "명일동 ・ 끌올 53초 전", price: "3,000원", like: 2), + ItemData(itemIconName: "eunjuchoi", itemName: "최.은.주", info: "명일동 ・ 끌올 53초 전", price: "999,999+원", like: 9), + ItemData(itemIconName: "camera", itemName: "렌즈고장난 카메라", info: "명일동 ・ 끌올 54초 전", price: "300,000원", like: 3), + ItemData(itemIconName: "mask", itemName: "KF94 마스크", info: "명일동 ・ 끌올 1분 전", price: "1,000원", like: 2), + ItemData(itemIconName: "shoes", itemName: "나이키 신발", info: "명일동 ・ 끌올 3분 전", price: "60,000원", like: 5), + ItemData(itemIconName: "starbucks", itemName: "4만원짜리 텀블러", info: "명일동 ・ 끌올 4분 전", price: "30,000", like: 1), + ItemData(itemIconName: "teddybear", itemName: "전남친이 준 곰돌이", info: "명일동 ・ 끌올 10분 전", price: "무료나눔", like: 3) + ]) + } + + func makeDelegate() { + itemTableView.dataSource = self + itemTableView.delegate = self + } + + func registerXib() { + let xibName = UINib(nibName: ItemTableViewCell.identifier, bundle: nil) + itemTableView.register(xibName, forCellReuseIdentifier: ItemTableViewCell.identifier) + } + +} + + +// MARK: - Extension +extension HomeVC: UITableViewDelegate { + func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { + return 144 + } + + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + let selectProduct = itemDataList[indexPath.row] + let storyboard = UIStoryboard(name:"ItemDetail", bundle: nil) + + if let ivc = storyboard.instantiateViewController(identifier: "ItemDetailVC") as? ItemDetailVC { + ivc.itemDataList = selectProduct + self.navigationController?.pushViewController(ivc, animated: true) + } + } + +} + +extension HomeVC: UITableViewDataSource { + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + return itemDataList.count + } + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + guard let cell = tableView.dequeueReusableCell(withIdentifier: ItemTableViewCell.identifier) as? ItemTableViewCell else {return UITableViewCell()} + + cell.setData(like: indexPath.row, appData: itemDataList[indexPath.row]) + cell.selectionStyle = .none // 셀 선택시 회색 없애기 + return cell + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Home/ItemDataModel.swift b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Home/ItemDataModel.swift new file mode 100644 index 0000000..5ad0738 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Home/ItemDataModel.swift @@ -0,0 +1,21 @@ +// +// ItemContentDataModel.swift +// Carrot_Market_iOS +// +// Created by 안현주 on 2021/11/07. +// + +import UIKit + +struct ItemData { + let itemIconName: String //item 사진 + let itemName: String //itme 이름 + let info: String //작성자위치, 작성시간 + let price: String //가격 + let like: Int //좋아요 수 + + func makeImage() -> UIImage? { + return UIImage(named: itemIconName) + } + +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Home/ItemTableViewCell.swift b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Home/ItemTableViewCell.swift new file mode 100644 index 0000000..082b9b2 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Home/ItemTableViewCell.swift @@ -0,0 +1,48 @@ +// +// ItemTableViewCell.swift +// Carrot_Market_iOS +// +// Created by 안현주 on 2021/11/07. +// + +import UIKit + +class ItemTableViewCell: UITableViewCell { + + // MARK: - Properties + static let identifier = "ItemTableViewCell" + + @IBOutlet weak var itemImageView: UIImageView! + @IBOutlet weak var itemLabel: UILabel! + @IBOutlet weak var infoLabel: UILabel! + @IBOutlet weak var priceLabel: UILabel! + @IBOutlet weak var likeImageView: UIImageView! + @IBOutlet weak var countLikeLabel: UILabel! + + + // MARK: - Life Cycle + override func awakeFromNib() { + super.awakeFromNib() + setUI() + } + + override func setSelected(_ selected: Bool, animated: Bool) { + super.setSelected(selected, animated: animated) + } + + + // MARK: - Custom Method + func setData(like: Int, appData: ItemData) { + itemImageView.image = appData.makeImage() + itemLabel.text = appData.itemName + infoLabel.text = appData.info + priceLabel.text = appData.price + countLikeLabel.text = "\(like)" + } + + func setUI() { + itemImageView.layer.cornerRadius = 5 + } +} + + diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Home/ItemTableViewCell.xib b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Home/ItemTableViewCell.xib new file mode 100644 index 0000000..51af0dc --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Home/ItemTableViewCell.xib @@ -0,0 +1,103 @@ + + + + + + + + + + + + SFProDisplay-Regular + + + SFProDisplay-Semibold + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Item/ItemDetailVC.swift b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Item/ItemDetailVC.swift new file mode 100644 index 0000000..2248b4f --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Item/ItemDetailVC.swift @@ -0,0 +1,102 @@ +// +// ItemDetailVC.swift +// Carrot_Market_iOS +// +// Created by 안현주 on 2021/11/08. +// + +import UIKit + +class ItemDetailVC: UIViewController { + + @IBOutlet weak var itemScrollView: UIScrollView! + + //item image + @IBOutlet weak var itemImageView: UIImageView! + + //user info view + @IBOutlet weak var userProfileImageView: UIImageView! + @IBOutlet weak var userNameLabel: UILabel! + @IBOutlet weak var userLocationLabel: UILabel! + + //item info view + @IBOutlet weak var itemNameLabel: UILabel! + + //collection view + @IBOutlet weak var recommendCollectionView: UICollectionView! + var recommendItemList: [RecommendItemData] = [] // collectionviewcell에 넣을 데이터 배열 선언 + + //item Data 정보를 받을 변수 + var itemDataList: ItemData? + + + + override func viewDidLoad() { + super.viewDidLoad() + initRecommendItemList() + makeDelegate() + registerXib() + } + + + func initRecommendItemList() { + recommendItemList.append(contentsOf: [ + RecommendItemData(recommenditemIconName: "eunjuchoi", recommenditemName: "은주초이", recommenditemPrice: "999,999+원"), + RecommendItemData(recommenditemIconName: "eunjuchoi", recommenditemName: "은주초이", recommenditemPrice: "999,999+원"), + RecommendItemData(recommenditemIconName: "eunjuchoi", recommenditemName: "은주초이", recommenditemPrice: "999,999+원"), + RecommendItemData(recommenditemIconName: "eunjuchoi", recommenditemName: "은주초이", recommenditemPrice: "999,999+원"), + RecommendItemData(recommenditemIconName: "eunjuchoi", recommenditemName: "은주초이", recommenditemPrice: "999,999+원"), + RecommendItemData(recommenditemIconName: "eunjuchoi", recommenditemName: "은주초이", recommenditemPrice: "999,999+원"), + RecommendItemData(recommenditemIconName: "eunjuchoi", recommenditemName: "은주초이", recommenditemPrice: "999,999+원"), + RecommendItemData(recommenditemIconName: "eunjuchoi", recommenditemName: "은주초이", recommenditemPrice: "999,999+원"), + RecommendItemData(recommenditemIconName: "eunjuchoi", recommenditemName: "은주초이", recommenditemPrice: "999,999+원"), + RecommendItemData(recommenditemIconName: "eunjuchoi", recommenditemName: "은주초이", recommenditemPrice: "999,999+원") + ]) + + } + + func makeDelegate() { + recommendCollectionView.dataSource = self + recommendCollectionView.delegate = self + } + + func registerXib() { + let xibName = UINib(nibName: RecommendCollectionViewCell.identifier, bundle: nil) + recommendCollectionView.register(xibName, forCellWithReuseIdentifier: RecommendCollectionViewCell.identifier) + } + +} + + +extension ItemDetailVC: UICollectionViewDataSource { + func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int { + recommendItemList.count + } + + func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell { + guard let cell = collectionView.dequeueReusableCell(withReuseIdentifier: RecommendCollectionViewCell.identifier, for: indexPath) as? RecommendCollectionViewCell else {return UICollectionViewCell()} + + cell.setData(appData: recommendItemList[indexPath.row]) + + return cell + } +} + +extension ItemDetailVC: UICollectionViewDelegateFlowLayout { + func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize { + + return CGSize(width: 182, height: 170) + } + + func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets { + return UIEdgeInsets.zero + } + + func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumLineSpacingForSectionAt section: Int) -> CGFloat { + return 5 + } + + func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumInteritemSpacingForSectionAt section: Int) -> CGFloat { + return 5 + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Item/RecommendCollectionViewCell.swift b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Item/RecommendCollectionViewCell.swift new file mode 100644 index 0000000..7858363 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Item/RecommendCollectionViewCell.swift @@ -0,0 +1,31 @@ +// +// RecommendCollectionViewCell.swift +// Carrot_Market_iOS +// +// Created by 안현주 on 2021/11/08. +// + +import UIKit + +class RecommendCollectionViewCell: UICollectionViewCell { + + static let identifier = "RecommendCollectionViewCell" + + @IBOutlet weak var recommendImageView: UIImageView! + @IBOutlet weak var recommendItemLabel: UILabel! + @IBOutlet weak var recommendPriceLabel: UILabel! + + + override func awakeFromNib() { + super.awakeFromNib() + // Initialization code + } + + + func setData(appData:RecommendItemData) { + recommendImageView.image = appData.makeImage() + recommendItemLabel.text = appData.recommenditemName + recommendPriceLabel.text = appData.recommenditemPrice + } + +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Item/RecommendCollectionViewCell.xib b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Item/RecommendCollectionViewCell.xib new file mode 100644 index 0000000..5887348 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Item/RecommendCollectionViewCell.xib @@ -0,0 +1,70 @@ + + + + + + + + + + + SFProDisplay-Regular + + + SFProDisplay-Semibold + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Item/RecommendItemDataModel.swift b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Item/RecommendItemDataModel.swift new file mode 100644 index 0000000..f2a961c --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Item/RecommendItemDataModel.swift @@ -0,0 +1,18 @@ +// +// RecommendItemDataModel.swift +// Carrot_Market_iOS +// +// Created by 안현주 on 2021/11/08. +// + +import UIKit + +struct RecommendItemData { + let recommenditemIconName: String + let recommenditemName: String + let recommenditemPrice: String + + func makeImage() -> UIImage? { + return UIImage(named: recommenditemIconName) + } +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/MyAround/MyAroundVC.swift b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/MyAround/MyAroundVC.swift new file mode 100644 index 0000000..4a19422 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/MyAround/MyAroundVC.swift @@ -0,0 +1,18 @@ +// +// MyAroundVC.swift +// Carrot_Market_iOS +// +// Created by 안현주 on 2021/11/07. +// + +import UIKit + +class MyAroundVC: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + } + + +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Profile/ProfileVC.swift b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Profile/ProfileVC.swift new file mode 100644 index 0000000..742f7aa --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Profile/ProfileVC.swift @@ -0,0 +1,18 @@ +// +// ProfileVC.swift +// Carrot_Market_iOS +// +// Created by 안현주 on 2021/11/07. +// + +import UIKit + +class ProfileVC: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + } + + +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Town/TownVC.swift b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Town/TownVC.swift new file mode 100644 index 0000000..acc0a25 --- /dev/null +++ b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/Town/TownVC.swift @@ -0,0 +1,17 @@ +// +// TownVC.swift +// Carrot_Market_iOS +// +// Created by 안현주 on 2021/11/07. +// + +import UIKit + +class TownVC: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + } + +} diff --git a/Carrot_Market_iOS/Carrot_Market_iOS/ViewController.swift b/Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/ViewController.swift similarity index 100% rename from Carrot_Market_iOS/Carrot_Market_iOS/ViewController.swift rename to Carrot_Market_iOS/Carrot_Market_iOS/View Controllers/ViewController.swift