Skip to content

Remove public CanConfigureViews #57

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
merged 3 commits into from
Jun 11, 2018
Merged

Remove public CanConfigureViews #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95285e7
Remove public CanConfigureViews
jimvanzummeren Jun 6, 2018
2825659
Merge branch 'master' into remove_public_can_configure_views
jimvanzummeren Jun 11, 2018
2f085f9
Upped podspec to 7.2.1
jimvanzummeren Jun 11, 2018
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
2 changes: 1 addition & 1 deletion markymark.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "markymark"
s.version = "7.2"
s.version = "7.2.1"
s.summary = "Markdown parser for iOS"
s.description = <<-DESC
Marky Mark is a parser written in Swift that converts markdown into native views. The way it looks is highly customizable and the supported markdown syntax and tags are easy to extend.
Expand Down
4 changes: 2 additions & 2 deletions markymark/Classes/Default implementations/Attributed label/MarkdownAttributedLabel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ open class MarkdownAttributedLabel: AttributedInteractiveLabel {
public init(font: UIFont? = nil) {
super.init()
self.font = font
configureViews()
configureViewProperties()
}

override public init(frame: CGRect) {
Expand All @@ -53,7 +53,7 @@ open class MarkdownAttributedLabel: AttributedInteractiveLabel {

required public init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
configureViews()
configureViewProperties()

styling.paragraphStyling.baseFont = font
styling.paragraphStyling.textColor = textColor
Expand Down
4 changes: 2 additions & 2 deletions markymark/Classes/Default implementations/CanConfigureViews.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import Foundation

public protocol CanConfigureViews {
protocol CanConfigureViews {

func configureViews()
func configureViewProperties()
Expand All @@ -16,7 +16,7 @@ public protocol CanConfigureViews {
func configureViewLayout()
}

public extension CanConfigureViews {
extension CanConfigureViews {

func configureViews() {
configureViewProperties()
Expand Down
8 changes: 4 additions & 4 deletions markymark/Classes/Layout Builders/UIView/Views/AttributedInteractiveLabel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@ open class AttributedInteractiveLabel: UILabel {

public init(){
super.init(frame: CGRect())
configureViews()
configureViewProperties()
}

override public init(frame: CGRect) {
super.init(frame: CGRect())
configureViews()
configureViewProperties()
}

required public init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
configureViews()
configureViewProperties()
}

@objc func didTap(_ tapGesture:UITapGestureRecognizer) {
Expand Down Expand Up @@ -125,7 +125,7 @@ open class AttributedInteractiveLabel: UILabel {
}
}

extension AttributedInteractiveLabel: CanConfigureViews {
extension AttributedInteractiveLabel {

public func configureViewProperties() {
isUserInteractionEnabled = true;
Expand Down