Skip to content

Commit

Permalink
170828 - 이슈 머지
Browse files Browse the repository at this point in the history
  • Loading branch information
@JuneBuug
JuneBuug committed Aug 28, 2017
2 parents 9ea61d8 + b330738 commit f0073a6
Show file tree
Hide file tree
Showing 30 changed files with 2,193 additions and 1,240 deletions.
26 changes: 18 additions & 8 deletions iOSProject/pyunrihae/pyunrihae.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
989FA79C1F511E59001D1E42 /* ReviewPopupView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 989FA79B1F511E59001D1E42 /* ReviewPopupView.xib */; };
989FA7A01F52BEC8001D1E42 /* Popup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 989FA79F1F52BEC8001D1E42 /* Popup.swift */; };
989FA7A41F52E2BA001D1E42 /* ic_check.png in Resources */ = {isa = PBXBuildFile; fileRef = 989FA7A31F52E2BA001D1E42 /* ic_check.png */; };
989FA7A61F53DAA0001D1E42 /* Segue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 989FA7A51F53DAA0001D1E42 /* Segue.swift */; };
989FA7A81F53EA9A001D1E42 /* empty_star.png in Resources */ = {isa = PBXBuildFile; fileRef = 989FA7A71F53EA9A001D1E42 /* empty_star.png */; };
98B288601F53EF43007673FF /* ic_default_product.png in Resources */ = {isa = PBXBuildFile; fileRef = 98B2885F1F53EF43007673FF /* ic_default_product.png */; };
98B394861F4D59190071BB8B /* ProductAllergyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98B394851F4D59190071BB8B /* ProductAllergyViewController.swift */; };
98B394881F4E5EDA0071BB8B /* MainProduct.xib in Resources */ = {isa = PBXBuildFile; fileRef = 98B394871F4E5EDA0071BB8B /* MainProduct.xib */; };
Expand Down Expand Up @@ -103,8 +105,8 @@
98F1730A1F32EDB70044FD0D /* pyunrihaeUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98F173091F32EDB70044FD0D /* pyunrihaeUITests.swift */; };
98F865831F43FB1A00C2F333 /* star1.png in Resources */ = {isa = PBXBuildFile; fileRef = 98F8657E1F43FB1A00C2F333 /* star1.png */; };
98F865841F43FB1A00C2F333 /* star2.png in Resources */ = {isa = PBXBuildFile; fileRef = 98F8657F1F43FB1A00C2F333 /* star2.png */; };
98F865851F43FB1A00C2F333 /* star3.png in Resources */ = {isa = PBXBuildFile; fileRef = 98F865801F43FB1A00C2F333 /* star3.png */; };
98F865861F43FB1A00C2F333 /* star4.png in Resources */ = {isa = PBXBuildFile; fileRef = 98F865811F43FB1A00C2F333 /* star4.png */; };
98F865851F43FB1A00C2F333 /* star4.png in Resources */ = {isa = PBXBuildFile; fileRef = 98F865801F43FB1A00C2F333 /* star4.png */; };
98F865861F43FB1A00C2F333 /* star3.png in Resources */ = {isa = PBXBuildFile; fileRef = 98F865811F43FB1A00C2F333 /* star3.png */; };
98F865871F43FB1A00C2F333 /* star5.png in Resources */ = {isa = PBXBuildFile; fileRef = 98F865821F43FB1A00C2F333 /* star5.png */; };
98F8658B1F44021000C2F333 /* logo_cu.png in Resources */ = {isa = PBXBuildFile; fileRef = 98F865881F44021000C2F333 /* logo_cu.png */; };
98F8658C1F44021000C2F333 /* logo_7eleven.png in Resources */ = {isa = PBXBuildFile; fileRef = 98F865891F44021000C2F333 /* logo_7eleven.png */; };
Expand Down Expand Up @@ -187,6 +189,10 @@
989FA79B1F511E59001D1E42 /* ReviewPopupView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ReviewPopupView.xib; sourceTree = "<group>"; };
989FA79F1F52BEC8001D1E42 /* Popup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Popup.swift; sourceTree = "<group>"; };
989FA7A31F52E2BA001D1E42 /* ic_check.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_check.png; sourceTree = "<group>"; };

989FA7A51F53DAA0001D1E42 /* Segue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Segue.swift; sourceTree = "<group>"; };
989FA7A71F53EA9A001D1E42 /* empty_star.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = empty_star.png; sourceTree = "<group>"; };

98B2885F1F53EF43007673FF /* ic_default_product.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_default_product.png; sourceTree = "<group>"; };
98B394851F4D59190071BB8B /* ProductAllergyViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProductAllergyViewController.swift; sourceTree = "<group>"; };
98B394871F4E5EDA0071BB8B /* MainProduct.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainProduct.xib; sourceTree = "<group>"; };
Expand Down Expand Up @@ -256,8 +262,8 @@
98F1730B1F32EDB80044FD0D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
98F8657E1F43FB1A00C2F333 /* star1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = star1.png; sourceTree = "<group>"; };
98F8657F1F43FB1A00C2F333 /* star2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = star2.png; sourceTree = "<group>"; };
98F865801F43FB1A00C2F333 /* star3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = star3.png; sourceTree = "<group>"; };
98F865811F43FB1A00C2F333 /* star4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = star4.png; sourceTree = "<group>"; };
98F865801F43FB1A00C2F333 /* star4.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = star4.png; sourceTree = "<group>"; };
98F865811F43FB1A00C2F333 /* star3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = star3.png; sourceTree = "<group>"; };
98F865821F43FB1A00C2F333 /* star5.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = star5.png; sourceTree = "<group>"; };
98F865881F44021000C2F333 /* logo_cu.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo_cu.png; sourceTree = "<group>"; };
98F865891F44021000C2F333 /* logo_7eleven.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo_7eleven.png; sourceTree = "<group>"; };
Expand Down Expand Up @@ -391,8 +397,9 @@
98F865931F4407A700C2F333 /* ic_ranking.png */,
98F865941F4407A700C2F333 /* ic_review_selected.png */,
98F865951F4407A700C2F333 /* ic_review.png */,
98F865801F43FB1A00C2F333 /* star3.png */,
98F865811F43FB1A00C2F333 /* star4.png */,
989FA7A71F53EA9A001D1E42 /* empty_star.png */,
98F865801F43FB1A00C2F333 /* star4.png */,
98F865811F43FB1A00C2F333 /* star3.png */,
98F865821F43FB1A00C2F333 /* star5.png */,
9865E5171F39C2A000014795 /* stars.png */,
98F172F51F32EDB70044FD0D /* Info.plist */,
Expand All @@ -405,6 +412,7 @@
isa = PBXGroup;
children = (
9865E54D1F3C576D00014795 /* Image.swift */,
989FA7A51F53DAA0001D1E42 /* Segue.swift */,
9865E5071F3943BD00014795 /* Button.swift */,
9865E5231F3AE04C00014795 /* Label.swift */,
989FA79F1F52BEC8001D1E42 /* Popup.swift */,
Expand Down Expand Up @@ -696,7 +704,7 @@
98F8658C1F44021000C2F333 /* logo_7eleven.png in Resources */,
98CBA0C41F467EE5003D0370 /* ic_dropdown.png in Resources */,
98F8659A1F4407A700C2F333 /* ic_ranking_selected.png in Resources */,
98F865851F43FB1A00C2F333 /* star3.png in Resources */,
98F865851F43FB1A00C2F333 /* star4.png in Resources */,
98CBA0BE1F458E87003D0370 /* ic_login_enabled.png in Resources */,
98CBA0C01F466919003D0370 /* ic_review_write.png in Resources */,
98F8658D1F44021000C2F333 /* logo_gs25.png in Resources */,
Expand All @@ -707,9 +715,10 @@
98DED89C1F41732700CC4D63 /* Main.storyboard in Resources */,
0E9724EC1F52905100AAAD91 /* ic_google_sign_in.png in Resources */,
98F865A31F442A3000C2F333 /* bg_login.png in Resources */,
98F865861F43FB1A00C2F333 /* star4.png in Resources */,
98F865861F43FB1A00C2F333 /* star3.png in Resources */,
98CBA0B61F458AFC003D0370 /* ic_user.png in Resources */,
98F865B11F44340E00C2F333 /* ic_complete.png in Resources */,
989FA7A81F53EA9A001D1E42 /* empty_star.png in Resources */,
98CBA0D21F46AF3B003D0370 /* ic_nickname.png in Resources */,
98CBA0CD1F468536003D0370 /* ic_like_filled.png in Resources */,
98D9F2DF1F418DF3009D0E10 /* LICENSE in Resources */,
Expand Down Expand Up @@ -943,6 +952,7 @@
98F865A51F442B3800C2F333 /* LoginSignUpViewController.swift in Sources */,
98D9F2E31F418DF3009D0E10 /* YNSearch.swift in Sources */,
98DED89B1F41729100CC4D63 /* SearchViewController.swift in Sources */,
989FA7A61F53DAA0001D1E42 /* Segue.swift in Sources */,
9865E4F61F387C7A00014795 /* TabBarViewController.swift in Sources */,
9865E52C1F3AF3EE00014795 /* MypageTableViewCell.swift in Sources */,
98B394861F4D59190071BB8B /* ProductAllergyViewController.swift in Sources */,
Expand Down
Loading

0 comments on commit f0073a6

Please sign in to comment.