oonyeje/vendoo_v1.0
1
0
Fork 0
mirror of https://bitbucket.org/vendoo/vendoo_v1.0.git synced 2025-12-25 03:37:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged branch BUG-Clear-Picture-Cache-During-Cancelled-Posting-Process into master

Browse Source
This commit is contained in:
Okechi Onyeje 2016-11-28 23:30:17 -05:00
commit cba3030b4f
5 changed files with 213 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

186
Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View File

@ -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,13 +792,13 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/ItemImagePickerViewController.swift"
timestampString = "501879828.267358"
timestampString = "502086264.84733"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "536"
endingLineNumber = "536"
landmarkName = "ItemImagePickerViewController"
landmarkType = "3">
startingLineNumber = "519"
endingLineNumber = "519"
landmarkName = "cancelNewListing(_:)"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
@ -808,27 +808,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/ItemImagePickerViewController.swift"
timestampString = "501824216.856573"
timestampString = "502083189.88936"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "92"
endingLineNumber = "92"
landmarkName = "ItemImagePickerViewController"
landmarkType = "3">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/ItemImagePickerViewController.swift"
timestampString = "501824224.47075"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "93"
endingLineNumber = "93"
startingLineNumber = "96"
endingLineNumber = "96"
landmarkName = "toggleEditingMode(_:)"
landmarkType = "5">
</BreakpointContent>
@ -840,11 +824,27 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/ItemImagePickerViewController.swift"
timestampString = "501879828.267358"
timestampString = "502083189.88936"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "537"
endingLineNumber = "537"
startingLineNumber = "97"
endingLineNumber = "97"
landmarkName = "toggleEditingMode(_:)"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/ItemImagePickerViewController.swift"
timestampString = "502086264.84733"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "520"
endingLineNumber = "520"
landmarkName = "cancelNewListing(_:)"
landmarkType = "5">
</BreakpointContent>
@ -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">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/ItemImagePickerViewController.swift"
timestampString = "502086264.84733"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "315"
endingLineNumber = "315"
landmarkName = "takePicture(_:)"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/ItemImagePickerViewController.swift"
timestampString = "502086084.815164"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "231"
endingLineNumber = "231"
landmarkName = "imagePickerController(_:didFinishPickingImage:editingInfo:)"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/ItemImagePickerViewController.swift"
timestampString = "502086084.815164"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "241"
endingLineNumber = "241"
landmarkName = "takePicture(_:)"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/ItemImagePickerViewController.swift"
timestampString = "502086264.84733"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "323"
endingLineNumber = "323"
landmarkName = "accessCam()"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/ItemImagePickerViewController.swift"
timestampString = "502086084.815164"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "247"
endingLineNumber = "247"
landmarkName = "takePicture(_:)"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/ItemImagePickerViewController.swift"
timestampString = "502086084.815164"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "226"
endingLineNumber = "226"
landmarkName = "imagePickerController(_:didFinishPickingImage:editingInfo:)"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Vendoo/ItemImagePickerViewController.swift"
timestampString = "502085507.67983"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "209"
endingLineNumber = "209"
landmarkName = "imagePickerController(_:didFinishPickingImage:editingInfo:)"
landmarkType = "5">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>

BIN
Vendoo/.DS_Store vendored
View File

Binary file not shown.

105
Vendoo/ItemImagePickerViewController.swift
View File

@ -31,17 +31,19 @@ class ItemImagePickerViewController: UIViewController {
@IBOutlet weak var itemDescription: UITextView!
@IBOutlet weak var itemPrice: UITextField!
@IBOutlet weak var textEditScrollView: UIScrollView!
//@IBOutlet weak var categoryPicker: UIPickerView!
@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<String, AnyObject>!
@ -63,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)
@ -202,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)
}
@ -220,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 {
@ -243,8 +258,6 @@ extension ItemImagePickerViewController: UIImagePickerControllerDelegate, UINavi
case 2:
if(self.itemImagesSelections[0] && self.itemImagesSelections[1]) {
viewsWereSaved[0] = true
self.imageIndex = 2
accessCam()
} else {
@ -258,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 {
@ -273,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 {
@ -286,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
}
}
}
@ -338,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) {
@ -539,7 +510,29 @@ extension ItemImagePickerViewController {
if(!self.isEditing) {
self.tabBarController?.selectedIndex = 0
self.itemName.text = ""
self.itemPrice.text = ""
self.itemQuantity.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)
}
}

18
Vendoo/Main.storyboard
View File

@ -414,6 +414,13 @@
<segue destination="dll-3G-IQL" kind="modal" identifier="CategoriesSegue" id="IJp-Zc-nNh"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="+" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="0RA-Fh-J1L">
<rect key="frame" x="147" y="135" width="81" height="51"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="50"/>
<color key="textColor" red="0.2784313725" green="0.80392156859999997" blue="0.68235294120000001" alpha="1" colorSpace="calibratedRGB"/>
<color key="highlightedColor" red="1" green="0.674443664" blue="0.43274429120000002" alpha="1" colorSpace="calibratedRGB"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
@ -433,6 +440,11 @@
<outlet property="itemName" destination="QIK-Tn-AHX" id="YsY-i0-9oR"/>
<outlet property="itemPrice" destination="PQC-e5-VHo" id="2Xi-s1-i8r"/>
<outlet property="itemQuantity" destination="otX-Vg-NmH" id="NAV-nK-usy"/>
<outlet property="plus_label0" destination="0RA-Fh-J1L" id="eKK-9e-knt"/>
<outlet property="plus_label1" destination="85d-iR-Lgx" id="yAL-d7-5Nm"/>
<outlet property="plus_label2" destination="4zU-13-6Dw" id="NsN-Fw-GzC"/>
<outlet property="plus_label3" destination="cDy-4Q-c7H" id="xkR-pu-vgY"/>
<outlet property="plus_label4" destination="JrY-LB-hod" id="YtM-Km-N7a"/>
<outlet property="possibleItemImage2" destination="smo-O2-fSf" id="3sX-Jr-S82"/>
<outlet property="possibleItemImage3" destination="ZfH-0j-qER" id="VGg-RB-whX"/>
<outlet property="possibleItemImage4" destination="Krl-yM-1dX" id="21h-RC-hKj"/>
@ -1549,7 +1561,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="notification_cell" rowHeight="69" id="9G8-XI-ptI" customClass="NotificationTableViewCell" customModule="Vendoo" customModuleProvider="target">
<rect key="frame" x="0.0" y="72" width="375" height="69"/>
<rect key="frame" x="0.0" y="28" width="375" height="69"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9G8-XI-ptI" id="r3f-6Q-p1g">
<rect key="frame" x="0.0" y="0.0" width="375" height="68.5"/>
@ -1625,7 +1637,7 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Change_Pass_Cell" id="ceq-sl-ClT">
<rect key="frame" x="0.0" y="72" width="375" height="44"/>
<rect key="frame" x="0.0" y="28" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ceq-sl-ClT" id="Waq-fu-UxD">
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
@ -1642,7 +1654,7 @@
</tableViewCellContentView>
</tableViewCell>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Delete_Account_Cell" id="Lha-cf-Sfc">
<rect key="frame" x="0.0" y="116" width="375" height="44"/>
<rect key="frame" x="0.0" y="72" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Lha-cf-Sfc" id="kmF-Sb-d0c">
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>