Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions iOSPhotoEditor/PhotoEditor+Controls.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public enum control {
case save
case share
case clear
case continueButton
}

extension PhotoEditorViewController {
Expand Down Expand Up @@ -132,6 +133,8 @@ extension PhotoEditorViewController {
stickerButton.isHidden = true
case .text:
stickerButton.isHidden = true
case .continueButton:
continueButton.isHidden = true
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion iOSPhotoEditor/PhotoEditorViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ public final class PhotoEditorViewController: UIViewController {
@IBOutlet weak var saveButton: UIButton!
@IBOutlet weak var shareButton: UIButton!
@IBOutlet weak var clearButton: UIButton!

@IBOutlet weak var continueButton: UIButton!

public var image: UIImage?
/**
Array of Stickers -UIImage- that the user will choose from
Expand Down
9 changes: 4 additions & 5 deletions iOSPhotoEditor/PhotoEditorViewController.xib
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_5" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_5" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15509"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand All @@ -25,6 +23,7 @@
<outlet property="colorPickerView" destination="Cy8-ap-fH9" id="KJx-KY-rfM"/>
<outlet property="colorPickerViewBottomConstraint" destination="mok-x4-xHA" id="SKq-N5-bcn"/>
<outlet property="colorsCollectionView" destination="GaQ-XR-asZ" id="1rf-hU-0nn"/>
<outlet property="continueButton" destination="wNH-TU-KxG" id="njx-Hr-smd"/>
<outlet property="cropButton" destination="Ghm-bq-BmY" id="f2D-02-o1D"/>
<outlet property="deleteView" destination="yAt-sK-1nK" id="0Jn-1A-WAT"/>
<outlet property="doneButton" destination="KxU-y4-Jwh" id="19z-FV-eWC"/>
Expand Down