Skip to content

Commit

Permalink
170827 - Merge , popup코드 변경점 드랍함
Browse files Browse the repository at this point in the history
  • Loading branch information
@JuneBuug
JuneBuug committed Aug 27, 2017
2 parents b7f8c34 + 4339910 commit 5251294
Show file tree
Hide file tree
Showing 44 changed files with 518 additions and 1,233 deletions.
16 changes: 8 additions & 8 deletions iOSProject/pyunrihae/pyunrihae.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,12 @@
9865E54A1F3C436000014795 /* ProductReviewTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9865E5491F3C436000014795 /* ProductReviewTableViewCell.swift */; };
9865E54E1F3C576D00014795 /* Image.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9865E54D1F3C576D00014795 /* Image.swift */; };
9865E55A1F3D837200014795 /* SelectedProduct.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9865E5591F3D837200014795 /* SelectedProduct.swift */; };
9865E55C1F417E2000014795 /* SelectedAllergy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9865E55B1F417E2000014795 /* SelectedAllergy.swift */; };
9865E56C1F42E55E00014795 /* BigImageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9865E56B1F42E55E00014795 /* BigImageViewController.swift */; };
98768AA01F39A5D600654C19 /* DataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98C5AAD71F342C3900610115 /* DataManager.swift */; };
989FA79A1F511E40001D1E42 /* ReviewPopupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 989FA7991F511E40001D1E42 /* ReviewPopupView.swift */; };
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 */; };
98B394861F4D59190071BB8B /* ProductAllergyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98B394851F4D59190071BB8B /* ProductAllergyViewController.swift */; };
98B394881F4E5EDA0071BB8B /* MainProduct.xib in Resources */ = {isa = PBXBuildFile; fileRef = 98B394871F4E5EDA0071BB8B /* MainProduct.xib */; };
98B3948A1F4E63230071BB8B /* MainProduct.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98B394891F4E63230071BB8B /* MainProduct.swift */; };
Expand All @@ -58,7 +59,6 @@
98CBA0C01F466919003D0370 /* ic_review_write.png in Resources */ = {isa = PBXBuildFile; fileRef = 98CBA0BF1F466919003D0370 /* ic_review_write.png */; };
98CBA0C21F467E7D003D0370 /* ic_add.png in Resources */ = {isa = PBXBuildFile; fileRef = 98CBA0C11F467E7D003D0370 /* ic_add.png */; };
98CBA0C41F467EE5003D0370 /* ic_dropdown.png in Resources */ = {isa = PBXBuildFile; fileRef = 98CBA0C31F467EE5003D0370 /* ic_dropdown.png */; };
98CBA0C61F467FE0003D0370 /* ic_check.png in Resources */ = {isa = PBXBuildFile; fileRef = 98CBA0C51F467FE0003D0370 /* ic_check.png */; };
98CBA0C91F468196003D0370 /* ic_star_filled.png in Resources */ = {isa = PBXBuildFile; fileRef = 98CBA0C71F468196003D0370 /* ic_star_filled.png */; };
98CBA0CA1F468196003D0370 /* ic_star.png in Resources */ = {isa = PBXBuildFile; fileRef = 98CBA0C81F468196003D0370 /* ic_star.png */; };
98CBA0CD1F468536003D0370 /* ic_like_filled.png in Resources */ = {isa = PBXBuildFile; fileRef = 98CBA0CB1F468536003D0370 /* ic_like_filled.png */; };
Expand Down Expand Up @@ -183,10 +183,11 @@
9865E5491F3C436000014795 /* ProductReviewTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProductReviewTableViewCell.swift; sourceTree = "<group>"; };
9865E54D1F3C576D00014795 /* Image.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Image.swift; sourceTree = "<group>"; };
9865E5591F3D837200014795 /* SelectedProduct.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectedProduct.swift; sourceTree = "<group>"; };
9865E55B1F417E2000014795 /* SelectedAllergy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectedAllergy.swift; sourceTree = "<group>"; };
9865E56B1F42E55E00014795 /* BigImageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BigImageViewController.swift; sourceTree = "<group>"; };
989FA7991F511E40001D1E42 /* ReviewPopupView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReviewPopupView.swift; sourceTree = "<group>"; };
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>"; };
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>"; };
98B394891F4E63230071BB8B /* MainProduct.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MainProduct.swift; sourceTree = "<group>"; };
Expand All @@ -205,7 +206,6 @@
98CBA0BF1F466919003D0370 /* ic_review_write.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_review_write.png; sourceTree = "<group>"; };
98CBA0C11F467E7D003D0370 /* ic_add.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_add.png; sourceTree = "<group>"; };
98CBA0C31F467EE5003D0370 /* ic_dropdown.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_dropdown.png; sourceTree = "<group>"; };
98CBA0C51F467FE0003D0370 /* ic_check.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_check.png; sourceTree = "<group>"; };
98CBA0C71F468196003D0370 /* ic_star_filled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_star_filled.png; sourceTree = "<group>"; };
98CBA0C81F468196003D0370 /* ic_star.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_star.png; sourceTree = "<group>"; };
98CBA0CB1F468536003D0370 /* ic_like_filled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_like_filled.png; sourceTree = "<group>"; };
Expand Down Expand Up @@ -384,11 +384,11 @@
98F8658E1F4407A700C2F333 /* ic_home_selected.png */,
98F8658F1F4407A700C2F333 /* ic_home.png */,
98F865901F4407A700C2F333 /* ic_my_selected.png */,
989FA7A31F52E2BA001D1E42 /* ic_check.png */,
98F865911F4407A700C2F333 /* ic_my.png */,
98F865921F4407A700C2F333 /* ic_ranking_selected.png */,
98F865931F4407A700C2F333 /* ic_ranking.png */,
98F865941F4407A700C2F333 /* ic_review_selected.png */,
98CBA0C51F467FE0003D0370 /* ic_check.png */,
98F865951F4407A700C2F333 /* ic_review.png */,
98F865801F43FB1A00C2F333 /* star3.png */,
98F865811F43FB1A00C2F333 /* star4.png */,
Expand All @@ -406,10 +406,10 @@
9865E54D1F3C576D00014795 /* Image.swift */,
9865E5071F3943BD00014795 /* Button.swift */,
9865E5231F3AE04C00014795 /* Label.swift */,
989FA79F1F52BEC8001D1E42 /* Popup.swift */,
98B73F851F39394500E55420 /* Review.swift */,
98B73F871F394CAB00E55420 /* Product.swift */,
9865E5591F3D837200014795 /* SelectedProduct.swift */,
9865E55B1F417E2000014795 /* SelectedAllergy.swift */,
98B82EDB1F45352A001C63A4 /* Validator.swift */,
98B82EDD1F45748D001C63A4 /* User.swift */,
98C5AAD71F342C3900610115 /* DataManager.swift */,
Expand Down Expand Up @@ -692,8 +692,8 @@
98F8658B1F44021000C2F333 /* logo_cu.png in Resources */,
98F865991F4407A700C2F333 /* ic_my.png in Resources */,
98D8390A1F452E6200CDF699 /* ic_pyunrihae.png in Resources */,
989FA7A41F52E2BA001D1E42 /* ic_check.png in Resources */,
98F8658C1F44021000C2F333 /* logo_7eleven.png in Resources */,
98CBA0C61F467FE0003D0370 /* ic_check.png in Resources */,
98CBA0C41F467EE5003D0370 /* ic_dropdown.png in Resources */,
98F8659A1F4407A700C2F333 /* ic_ranking_selected.png in Resources */,
98F865851F43FB1A00C2F333 /* star3.png in Resources */,
Expand Down Expand Up @@ -951,7 +951,6 @@
98D569241F4D119B002693E9 /* RankingTableViewCell.swift in Sources */,
98D9F2EC1F418DF3009D0E10 /* YNSearchTextField.swift in Sources */,
98D9F2E71F418DF3009D0E10 /* YNSearchHistoryButton.swift in Sources */,
9865E55C1F417E2000014795 /* SelectedAllergy.swift in Sources */,
981E932A1F38666E004BE63B /* RankingViewController.swift in Sources */,
989FA79A1F511E40001D1E42 /* ReviewPopupView.swift in Sources */,
98D9F2EE1F418DF3009D0E10 /* YNSearchViewController.swift in Sources */,
Expand All @@ -975,6 +974,7 @@
98B73F861F39394500E55420 /* Review.swift in Sources */,
98CBA0D41F4ACA73003D0370 /* UpdateNicknameViewController.swift in Sources */,
9865E5301F3AFA0300014795 /* ProductDetailViewController.swift in Sources */,
989FA7A01F52BEC8001D1E42 /* Popup.swift in Sources */,
9865E5461F3C434200014795 /* ProductInfoTableViewCell.swift in Sources */,
981E932C1F386677004BE63B /* ReviewViewController.swift in Sources */,
98F172EA1F32EDB70044FD0D /* AppDelegate.swift in Sources */,
Expand Down
2 changes: 0 additions & 2 deletions iOSProject/pyunrihae/pyunrihae/AllergyTableViewCell.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
// Created by woowabrothers on 2017. 8. 10..
// Copyright © 2017년 busride. All rights reserved.
//

import UIKit

class AllergyTableViewCell: UITableViewCell {
@IBOutlet weak var checkImage: UIImageView!
@IBOutlet weak var allergyListLabel: UILabel!
Expand Down
9 changes: 1 addition & 8 deletions iOSProject/pyunrihae/pyunrihae/AllergyViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,19 @@
// Created by woowabrothers on 2017. 8. 10..
// Copyright © 2017년 busride. All rights reserved.
//

import UIKit

class AllergyViewController: UIViewController {

@IBOutlet weak var tableView: UITableView!
var selectedAllergy = [String]()
let allergyList = ["메밀","달걀","우유","콩","밀","게","새우","고등어","돼지고기","소고기","닭고기","복숭아","땅콩","토마토","오징어","호두","조개"] // 임의로 알레르기 리스트를 넣었음

let allergyList = ["메밀","달걀","우유","콩","밀","게","새우","고등어","돼지고기","소고기","닭고기","복숭아","땅콩","토마토","오징어","호두","조개"]
override func viewDidLoad() {
super.viewDidLoad()
selectedAllergy = SelectedAllergy.allergyList
tableView.delegate = self
tableView.dataSource = self
tableView.allowsMultipleSelection = true
// Do any additional setup after loading the view.
}
override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
// Dispose of any resources that can be recreated.
}
@IBAction func tabBackBtn(_ sender: UIButton) {
let writingReviewViewController = self.navigationController?.viewControllers[1] as! WritingReviewViewController
Expand Down
5 changes: 5 additions & 0 deletions iOSProject/pyunrihae/pyunrihae/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate,GIDSignInDelegate{
var window: UIWindow?
var user: User?
var productList : [Product] = []
let category = ["전체","도시락","김밥","베이커리","라면","식품","스낵","아이스크림","음료"]
let priceLevelList = ["비싸다","비싼편","적당","싼편","싸다"]
let flavorLevelList = ["노맛","별로","적당","괜춘","존맛"]
let quantityLevelList = ["창렬","적음","적당","많음","혜자"]
let mainColor = UIColor(red: CGFloat(255.0 / 255.0), green: CGFloat(120.0 / 255.0), blue: CGFloat(0.0 / 255.0), alpha: CGFloat(1.0))
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
FirebaseApp.configure()

Expand Down
Loading

0 comments on commit 5251294

Please sign in to comment.