Skip to content

Added to Source #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FrediWeber merged 1 commit into from
Nov 5, 2017
Merged

Added to Source #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Source/JLStickerImageView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ public class JLStickerImageView: UIImageView, UIGestureRecognizerDelegate {
//MARK: -
//MARK: Functions
extension JLStickerImageView {
public func addLabel() {
public func addLabel(defaultText: String?) {
if let label: JLStickerLabelView = currentlyEditingLabel {
label.hideEditingHandlers()
}

let labelFrame = CGRect(x: self.bounds.midX - CGFloat(arc4random()).truncatingRemainder(dividingBy: 20),
y: self.bounds.midY - CGFloat(arc4random()).truncatingRemainder(dividingBy: 20),
width: 60, height: 50)
let labelView = JLStickerLabelView(frame: labelFrame)
let labelView = JLStickerLabelView(frame: labelFrame, defaultText: defaultText)
labelView.delegate = self
labelView.showsContentShadow = false
//labelView.enableMoveRestriction = false
Expand Down
20 changes: 12 additions & 8 deletions Source/JLStickerLabelView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,12 @@ public class JLStickerLabelView: UIView {

init() {
super.init(frame: CGRect.zero)
setup()
setup(defaultText: nil)
adjustsWidthToFillItsContens(self, labelView: labelTextView)

}

override init(frame: CGRect) {
init(frame: CGRect, defaultText: String?) {
super.init(frame: frame)

if frame.size.width < 25 {
Expand All @@ -139,13 +139,13 @@ public class JLStickerLabelView: UIView {
self.bounds.size.height = 25
}

self.setup()
self.setup(defaultText: defaultText)
adjustsWidthToFillItsContens(self, labelView: labelTextView)
}

required public init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
setup()
setup(defaultText: nil)
adjustsWidthToFillItsContens(self, labelView: labelTextView)

}
Expand All @@ -157,14 +157,18 @@ public class JLStickerLabelView: UIView {
}
}

func setup() {
func setup(defaultText: String?) {
self.globalInset = 19

self.backgroundColor = UIColor.clear
self.autoresizingMask = [.flexibleHeight, .flexibleWidth]
self.border?.strokeColor = UIColor(red: 33, green: 45, blue: 59, alpha: 1).cgColor

self.setupLabelTextView()
if let defaultText = defaultText {
self.setupLabelTextView(defaultText: defaultText)
} else {
self.setupLabelTextView()
}
self.setupBorder()

self.insertSubview(labelTextView!, at: 0)
Expand Down Expand Up @@ -370,7 +374,7 @@ extension JLStickerLabelView: UIGestureRecognizerDelegate, adjustFontSizeToFillR
//MARK: -
//MARK: setup
extension JLStickerLabelView {
func setupLabelTextView() {
func setupLabelTextView(defaultText: String = "Tap to edit") {
labelTextView = JLAttributedTextView(frame: self.bounds.insetBy(dx: globalInset!, dy: globalInset!))
labelTextView?.autoresizingMask = [.flexibleWidth, .flexibleHeight]
labelTextView?.clipsToBounds = true
Expand All @@ -380,7 +384,7 @@ extension JLStickerLabelView {
labelTextView?.isScrollEnabled = false
labelTextView.isSelectable = true
labelTextView.textContainerInset = UIEdgeInsetsMake(0, 0, 0, 0)
labelTextView?.text = "Tap to Edit"
labelTextView?.text = defaultText

}

Expand Down