Skip to content

Added property alignment #82

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

Open
helimarrabago wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added property alignment #82

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
8 changes: 5 additions & 3 deletions Classes/ExpandableLabel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ import UIKit
self.ellipsis = ellipsis?.copyWithAddedFontAttribute(font)
}
}

@objc open var alignment: NSTextAlignment = .left

/// Set a view to animate changes of the label collapsed state with. If this value is nil, no animation occurs.
/// Usually you assign the superview of this label or a UIScrollView in which this label sits.
Expand Down Expand Up @@ -141,7 +143,7 @@ import UIKit
open private(set) var expandedText: NSAttributedString?
open override var attributedText: NSAttributedString? {
set(attributedText) {
if let attributedText = attributedText?.copyWithAddedFontAttribute(font).copyWithParagraphAttribute(font),
if let attributedText = attributedText?.copyWithAddedFontAttribute(font).copyWithParagraphAttribute(font, alignment: alignment),
attributedText.length > 0 {
self.collapsedText = getCollapsedText(for: attributedText, link: (linkHighlighted) ? collapsedAttributedLink.copyWithHighlightedColor() : self.collapsedAttributedLink)
self.expandedText = getExpandedText(for: attributedText, link: (linkHighlighted) ? expandedAttributedLink?.copyWithHighlightedColor() : self.expandedAttributedLink)
Expand Down Expand Up @@ -395,10 +397,10 @@ private extension NSAttributedString {
return font != nil
}

func copyWithParagraphAttribute(_ font: UIFont) -> NSAttributedString {
func copyWithParagraphAttribute(_ font: UIFont, alignment: NSTextAlignment) -> NSAttributedString {
let paragraphStyle = NSMutableParagraphStyle()
paragraphStyle.lineHeightMultiple = 1.05
paragraphStyle.alignment = .left
paragraphStyle.alignment = alignment
paragraphStyle.lineSpacing = 0.0
paragraphStyle.minimumLineHeight = font.lineHeight
paragraphStyle.maximumLineHeight = font.lineHeight
Expand Down