diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate index 31b14f8..47c1e16 100644 Binary files a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate and b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 23f6fdc..1a55742 100644 --- a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -186,7 +186,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/CategoriesTableViewController.swift" - timestampString = "501881724.556734" + timestampString = "502086315.550032" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "570" @@ -201,7 +201,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/CategoriesTableViewController.swift" - timestampString = "501881724.556878" + timestampString = "502086315.550156" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "572" @@ -744,7 +744,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/SettingsViewController.swift" - timestampString = "501881724.576913" + timestampString = "502086315.568123" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "194" @@ -759,7 +759,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/SettingsViewController.swift" - timestampString = "501881724.577081" + timestampString = "502086315.568237" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "197" @@ -792,11 +792,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ItemImagePickerViewController.swift" - timestampString = "501879828.267358" + timestampString = "502086264.84733" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "536" - endingLineNumber = "536" + startingLineNumber = "519" + endingLineNumber = "519" landmarkName = "cancelNewListing(_:)" landmarkType = "5"> @@ -808,11 +808,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ItemImagePickerViewController.swift" - timestampString = "501824216.856573" + timestampString = "502083189.88936" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "92" - endingLineNumber = "92" + startingLineNumber = "96" + endingLineNumber = "96" landmarkName = "toggleEditingMode(_:)" landmarkType = "5"> @@ -824,11 +824,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ItemImagePickerViewController.swift" - timestampString = "501824224.47075" + timestampString = "502083189.88936" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "93" - endingLineNumber = "93" + startingLineNumber = "97" + endingLineNumber = "97" landmarkName = "toggleEditingMode(_:)" landmarkType = "5"> @@ -840,11 +840,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ItemImagePickerViewController.swift" - timestampString = "501879828.267358" + timestampString = "502086264.84733" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "537" - endingLineNumber = "537" + startingLineNumber = "520" + endingLineNumber = "520" landmarkName = "cancelNewListing(_:)" landmarkType = "5"> @@ -888,7 +888,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/HomeViewController.swift" - timestampString = "501881724.580763" + timestampString = "502086315.571188" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "16" @@ -903,7 +903,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/HomeViewController.swift" - timestampString = "501881724.580877" + timestampString = "502086315.571287" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "16" @@ -918,7 +918,7 @@ moduleName = "Vendoo" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/HomeViewController.swift" - timestampString = "501881724.580974" + timestampString = "502086315.571382" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "16" @@ -967,14 +967,126 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Vendoo/ItemImagePickerViewController.swift" - timestampString = "501880171.766869" + timestampString = "502083189.88936" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "138" - endingLineNumber = "138" + startingLineNumber = "142" + endingLineNumber = "142" landmarkName = "prepareForSegue(_:sender:)" landmarkType = "5"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Vendoo/.DS_Store b/Vendoo/.DS_Store index a2bbda5..d9f4a62 100644 Binary files a/Vendoo/.DS_Store and b/Vendoo/.DS_Store differ diff --git a/Vendoo/ItemImagePickerViewController.swift b/Vendoo/ItemImagePickerViewController.swift index 4f2678e..4e920ee 100644 --- a/Vendoo/ItemImagePickerViewController.swift +++ b/Vendoo/ItemImagePickerViewController.swift @@ -34,13 +34,16 @@ class ItemImagePickerViewController: UIViewController { @IBOutlet weak var priceLabel: UILabel! @IBOutlet weak var containerScrollView: UIScrollView! + @IBOutlet weak var plus_label0: UILabel! + @IBOutlet weak var plus_label1: UILabel! + @IBOutlet weak var plus_label2: UILabel! + @IBOutlet weak var plus_label3: UILabel! + @IBOutlet weak var plus_label4: UILabel! //class variables - var pickerData: [String] = [String]() var itemImagesSelections = [false,false,false,false,false] private var picker = UIImagePickerController() private var currImageSelected: UIImageView! - private var currUILabel: UILabel! private var imageIndex: Int! private var isEditing: Bool = false private var currentInformation: Dictionary! @@ -62,7 +65,6 @@ class ItemImagePickerViewController: UIViewController { self.picker.delegate = self addEditableItemsToScrollView() // Input data into the Array: - pickerData = ["Category 1", "Category 2", "Category 3", "Category 4", "Category 5", "Category 6"] let tapGestureMain = UITapGestureRecognizer(target: self, action: #selector(ItemImagePickerViewController.takePicture)) self.view.addGestureRecognizer(tapGestureMain) @@ -201,12 +203,30 @@ extension ItemImagePickerViewController: UIImagePickerControllerDelegate, UINavi func imagePickerController(picker: UIImagePickerController, didFinishPickingImage image: UIImage, editingInfo: [String : AnyObject]?) { - if (self.possibleItemImageMain.image != nil && self.currUILabel != nil ){ - self.currUILabel.hidden = true + switch(self.imageIndex){ + case 0: + self.plus_label0.hidden = true + break + case 1: + self.plus_label1.hidden = true + break + case 2: + self.plus_label2.hidden = true + break + case 3: + self.plus_label3.hidden = true + break + case 4: + self.plus_label4.hidden = true + break + default: + break } + self.currImageSelected.image = image self.itemImagesSelections[self.imageIndex] = true - dismissViewControllerAnimated(true, completion: nil) + self.dismissViewControllerAnimated(true, completion: nil) + } @@ -219,16 +239,12 @@ extension ItemImagePickerViewController: UIImagePickerControllerDelegate, UINavi let location: CGPoint = sender.locationInView(self.view) if(sender.state == UIGestureRecognizerState.Ended) { - var viewsWereSaved = [false, false] for view in self.view.subviews { if (view.isKindOfClass(UIImageView) && CGRectContainsPoint(view.frame, location)) { self.currImageSelected = view as! UIImageView switch (view.tag) { case 1: if(self.itemImagesSelections[0]) { - //self.itemImagesSelections[1] = true - viewsWereSaved[0] = true - self.imageIndex = 1 accessCam() } else { @@ -242,8 +258,6 @@ extension ItemImagePickerViewController: UIImagePickerControllerDelegate, UINavi case 2: if(self.itemImagesSelections[0] && self.itemImagesSelections[1]) { - viewsWereSaved[0] = true - self.imageIndex = 2 accessCam() } else { @@ -257,8 +271,6 @@ extension ItemImagePickerViewController: UIImagePickerControllerDelegate, UINavi case 3: if(self.itemImagesSelections[0] && self.itemImagesSelections[1] && self.itemImagesSelections[2]) { - viewsWereSaved[0] = true - self.imageIndex = 3 accessCam() } else { @@ -272,8 +284,6 @@ extension ItemImagePickerViewController: UIImagePickerControllerDelegate, UINavi case 4: if(self.itemImagesSelections[0] && self.itemImagesSelections[1] && self.itemImagesSelections[2] && self.itemImagesSelections[3]) { - viewsWereSaved[0] = true - self.imageIndex = 4 accessCam() } else { @@ -285,18 +295,13 @@ extension ItemImagePickerViewController: UIImagePickerControllerDelegate, UINavi } break default: - //self.itemImagesSelections[0] = true - self.imageIndex = 0 accessCam() break } } - if (view.isKindOfClass(UILabel) && CGRectContainsPoint(view.frame, location)) { - self.currUILabel = view as! UILabel - viewsWereSaved[1] = true - } + } } @@ -337,39 +342,6 @@ extension ItemImagePickerViewController: UIImagePickerControllerDelegate, UINavi -//MARK: - UIPickerViewDelegate -extension ItemImagePickerViewController: UIPickerViewDelegate { - - // Catpure the picker view selection - func pickerView(pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) { - // This method is triggered whenever the user makes a change to the picker selection. - // The parameter named row and component represents what was selected. - } - -} - -//MARK: - UIPickerViewDatasource -extension ItemImagePickerViewController: UIPickerViewDataSource { - - // The number of columns of data - func numberOfComponentsInPickerView(pickerView: UIPickerView) -> Int { - return 1 - } - - // The number of rows of data - func pickerView(pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int { - return pickerData.count - } - - // The data to return for the row and component (column) that's being passed in - func pickerView(pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? { - return pickerData[row] - } - - - -} - extension ItemImagePickerViewController: UITextViewDelegate { func textViewDidBeginEditing(textView: UITextView) { @@ -541,12 +513,24 @@ extension ItemImagePickerViewController { self.itemName.text = "" self.itemPrice.text = "" self.itemQuantity.text = "" - self.itemDescription.text = "" + self.itemDescription.text = "Description" + self.imageIndex = nil + self.currentInformation = nil self.possibleItemImageMain.image = nil self.possibleItemImage2.image = nil self.possibleItemImage3.image = nil self.possibleItemImage4.image = nil self.possibleItemImage5.image = nil + self.itemImagesSelections[0] = false + self.itemImagesSelections[1] = false + self.itemImagesSelections[2] = false + self.itemImagesSelections[3] = false + self.itemImagesSelections[4] = false + self.plus_label0.hidden = false + self.plus_label1.hidden = false + self.plus_label2.hidden = false + self.plus_label3.hidden = false + self.plus_label4.hidden = false }else{ self.presentingViewController?.dismissViewControllerAnimated(true, completion: nil) diff --git a/Vendoo/Main.storyboard b/Vendoo/Main.storyboard index b85d112..7b38667 100755 --- a/Vendoo/Main.storyboard +++ b/Vendoo/Main.storyboard @@ -414,6 +414,13 @@ + @@ -433,6 +440,11 @@ + + + + + @@ -1549,7 +1561,7 @@ - + @@ -1625,7 +1637,7 @@ - + @@ -1642,7 +1654,7 @@ - +