Skip to content

Commit 3d679d6

Browse files
authored
Merge pull request #2 from badoo/add_hl_prefix_for_hyperlabel
Adding a HL prefix for HyperLabel class
2 parents af3cf21 + 5e3cb29 commit 3d679d6

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

HyperLabel.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/* Begin PBXBuildFile section */
1010
2636291B226697BD0060FDA1 /* HyperLabelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2636291A226697BD0060FDA1 /* HyperLabelProtocol.swift */; };
1111
267498852260F8570000AA3D /* TextContainerData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2674987F2260F8570000AA3D /* TextContainerData.swift */; };
12-
267498862260F8570000AA3D /* HyperLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 267498802260F8570000AA3D /* HyperLabel.swift */; };
12+
267498862260F8570000AA3D /* HLHyperLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 267498802260F8570000AA3D /* HLHyperLabel.swift */; };
1313
267498872260F8570000AA3D /* HyperLabelPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 267498812260F8570000AA3D /* HyperLabelPresenter.swift */; };
1414
267498882260F8570000AA3D /* HyperLabelTextStyler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 267498822260F8570000AA3D /* HyperLabelTextStyler.swift */; };
1515
267498892260F8570000AA3D /* RangeMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 267498832260F8570000AA3D /* RangeMap.swift */; };
@@ -33,7 +33,7 @@
3333
/* Begin PBXFileReference section */
3434
2636291A226697BD0060FDA1 /* HyperLabelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HyperLabelProtocol.swift; sourceTree = "<group>"; };
3535
2674987F2260F8570000AA3D /* TextContainerData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextContainerData.swift; sourceTree = "<group>"; };
36-
267498802260F8570000AA3D /* HyperLabel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HyperLabel.swift; sourceTree = "<group>"; };
36+
267498802260F8570000AA3D /* HLHyperLabel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HLHyperLabel.swift; sourceTree = "<group>"; };
3737
267498812260F8570000AA3D /* HyperLabelPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HyperLabelPresenter.swift; sourceTree = "<group>"; };
3838
267498822260F8570000AA3D /* HyperLabelTextStyler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HyperLabelTextStyler.swift; sourceTree = "<group>"; };
3939
267498832260F8570000AA3D /* RangeMap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RangeMap.swift; sourceTree = "<group>"; };
@@ -89,7 +89,7 @@
8989
children = (
9090
267498842260F8570000AA3D /* TextLayoutInfoProvider.swift */,
9191
26F88A362265595A00549C30 /* LinkAccessibilityElement.swift */,
92-
267498802260F8570000AA3D /* HyperLabel.swift */,
92+
267498802260F8570000AA3D /* HLHyperLabel.swift */,
9393
2636291A226697BD0060FDA1 /* HyperLabelProtocol.swift */,
9494
267498812260F8570000AA3D /* HyperLabelPresenter.swift */,
9595
267498822260F8570000AA3D /* HyperLabelTextStyler.swift */,
@@ -227,7 +227,7 @@
227227
267498852260F8570000AA3D /* TextContainerData.swift in Sources */,
228228
2636291B226697BD0060FDA1 /* HyperLabelProtocol.swift in Sources */,
229229
2674988A2260F8570000AA3D /* TextLayoutInfoProvider.swift in Sources */,
230-
267498862260F8570000AA3D /* HyperLabel.swift in Sources */,
230+
267498862260F8570000AA3D /* HLHyperLabel.swift in Sources */,
231231
);
232232
runOnlyForDeploymentPostprocessing = 0;
233233
};

HyperLabel/HyperLabel.swift HyperLabel/HLHyperLabel.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import UIKit
2525

26-
public final class HyperLabel: UILabel, HyperLabelProtocol {
26+
public final class HLHyperLabel: UILabel, HyperLabelProtocol {
2727

2828
public override init(frame: CGRect) {
2929
super.init(frame: frame)

HyperLabelDemo/HyperLabelDemo/LabelExample.swift

+5-5
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,20 @@ extension Array where Element == LabelExample {
3838
static func makeExamples() -> [LabelExample] {
3939
return [
4040
LabelExample(title: "Exact touchable area") {
41-
HyperLabel.makeDemoLabel(extendLinkTouchArea: false)
41+
HLHyperLabel.makeDemoLabel(extendLinkTouchArea: false)
4242
},
4343
LabelExample(title: "Extended touchable area") {
44-
HyperLabel.makeDemoLabel(extendLinkTouchArea: true)
44+
HLHyperLabel.makeDemoLabel(extendLinkTouchArea: true)
4545
},
4646
]
4747
}
4848
}
4949

5050
// MARK: - HyperLabel example
5151

52-
private extension HyperLabel {
53-
static func makeDemoLabel(extendLinkTouchArea: Bool) -> HyperLabel {
54-
let label = HyperLabel()
52+
private extension HLHyperLabel {
53+
static func makeDemoLabel(extendLinkTouchArea: Bool) -> HLHyperLabel {
54+
let label = HLHyperLabel()
5555
label.numberOfLines = 0
5656
label.extendsLinkTouchArea = extendLinkTouchArea
5757
label.additionalLinkAttributes = [

HyperLabelTests/HyperLabelTests.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ class HyperLabelTests: XCTestCase {
3434
// Given
3535
// '’' is UTF16?
3636
let exampleText = "You’ll be happy one day."
37-
let sut: HyperLabel = {
38-
let hyperLabel = HyperLabel()
37+
let sut: HLHyperLabel = {
38+
let hyperLabel = HLHyperLabel()
3939
hyperLabel.numberOfLines = 0
4040
hyperLabel.text = exampleText
4141
hyperLabel.additionalLinkAttributes = [.underlineStyle: NSUnderlineStyle.single.rawValue]
@@ -52,8 +52,8 @@ class HyperLabelTests: XCTestCase {
5252
func test_GivenSimpleText_WhenAddLink_ThenRangesAreCorrect() {
5353
// Given
5454
let exampleText = "Look's good with no special characters."
55-
let sut: HyperLabel = {
56-
let hyperLabel = HyperLabel()
55+
let sut: HLHyperLabel = {
56+
let hyperLabel = HLHyperLabel()
5757
hyperLabel.numberOfLines = 0
5858
hyperLabel.text = exampleText
5959
hyperLabel.additionalLinkAttributes = [.underlineStyle: NSUnderlineStyle.single.rawValue]

0 commit comments

Comments
 (0)