Skip to content

Commit 7e33b38

Browse files
author
Daniel Dahan
committed
master: updated for release 1.8.0
2 parents c316eea + f6894a4 commit 7e33b38

File tree

13 files changed

+117
-135
lines changed

13 files changed

+117
-135
lines changed

‎MK.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'MK'
3-
s.version = '1.7.0'
3+
s.version = '1.8.0'
44
s.license = { :type => "AGPLv3+", :file => "LICENSE" }
55
s.summary = 'A Material Design Framework In Swift'
66
s.homepage = 'http://materialkit.io'

‎MaterialKit.xcodeproj/project.pbxproj‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
657CD02A1B8EE0D3008C0029 /* MaterialCard.swift in Headers */ = {isa = PBXBuildFile; fileRef = 9A94D1081B8A3F5100F586A5 /* MaterialCard.swift */; settings = {ATTRIBUTES = (Public, ); }; };
10+
657CD02A1B8EE0D3008C0029 /* MaterialCardView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 9A94D1081B8A3F5100F586A5 /* MaterialCardView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
1111
657CD02C1B8EE0D3008C0029 /* SideNavController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 65B965861B8BEEC60055B139 /* SideNavController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
1212
657CD02D1B8EE0D3008C0029 /* MaterialButton.swift in Headers */ = {isa = PBXBuildFile; fileRef = 65B9657D1B8A7C330055B139 /* MaterialButton.swift */; settings = {ATTRIBUTES = (Public, ); }; };
13-
657CD02F1B8EE0D3008C0029 /* ImageCard.swift in Headers */ = {isa = PBXBuildFile; fileRef = 9A94D10A1B8A485C00F586A5 /* ImageCard.swift */; settings = {ATTRIBUTES = (Public, ); }; };
13+
657CD02F1B8EE0D3008C0029 /* ImageCardView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 9A94D10A1B8A485C00F586A5 /* ImageCardView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
1414
65B9657E1B8A7C330055B139 /* MaterialButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65B9657D1B8A7C330055B139 /* MaterialButton.swift */; };
1515
65B965871B8BEEC60055B139 /* SideNavController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65B965861B8BEEC60055B139 /* SideNavController.swift */; };
1616
963832421B88DFD80015F710 /* MaterialKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 963832361B88DFD80015F710 /* MaterialKit.framework */; };
@@ -20,11 +20,11 @@
2020
9638326B1B88E5BF0015F710 /* FabButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 963832601B88E5BF0015F710 /* FabButton.swift */; };
2121
9638326C1B88E5BF0015F710 /* FlatButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 963832611B88E5BF0015F710 /* FlatButton.swift */; };
2222
963832701B88E5BF0015F710 /* RaisedButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 963832651B88E5BF0015F710 /* RaisedButton.swift */; };
23-
963832711B88E5BF0015F710 /* Text.swift in Sources */ = {isa = PBXBuildFile; fileRef = 963832661B88E5BF0015F710 /* Text.swift */; };
24-
963832721B88E5BF0015F710 /* TextStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 963832671B88E5BF0015F710 /* TextStorage.swift */; };
23+
963832711B88E5BF0015F710 /* MaterialText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 963832661B88E5BF0015F710 /* MaterialText.swift */; };
24+
963832721B88E5BF0015F710 /* MaterialTextStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 963832671B88E5BF0015F710 /* MaterialTextStorage.swift */; };
2525
963832731B88E5BF0015F710 /* TextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 963832681B88E5BF0015F710 /* TextView.swift */; };
26-
9638327E1B89070E0015F710 /* Text.swift in Headers */ = {isa = PBXBuildFile; fileRef = 963832661B88E5BF0015F710 /* Text.swift */; settings = {ATTRIBUTES = (Public, ); }; };
27-
9638327F1B89070E0015F710 /* TextStorage.swift in Headers */ = {isa = PBXBuildFile; fileRef = 963832671B88E5BF0015F710 /* TextStorage.swift */; settings = {ATTRIBUTES = (Public, ); }; };
26+
9638327E1B89070E0015F710 /* MaterialText.swift in Headers */ = {isa = PBXBuildFile; fileRef = 963832661B88E5BF0015F710 /* MaterialText.swift */; settings = {ATTRIBUTES = (Public, ); }; };
27+
9638327F1B89070E0015F710 /* MaterialTextStorage.swift in Headers */ = {isa = PBXBuildFile; fileRef = 963832671B88E5BF0015F710 /* MaterialTextStorage.swift */; settings = {ATTRIBUTES = (Public, ); }; };
2828
963832801B89070E0015F710 /* TextView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 963832681B88E5BF0015F710 /* TextView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
2929
963832811B89070E0015F710 /* FabButton.swift in Headers */ = {isa = PBXBuildFile; fileRef = 963832601B88E5BF0015F710 /* FabButton.swift */; settings = {ATTRIBUTES = (Public, ); }; };
3030
963832821B89070E0015F710 /* FlatButton.swift in Headers */ = {isa = PBXBuildFile; fileRef = 963832611B88E5BF0015F710 /* FlatButton.swift */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -40,11 +40,11 @@
4040
9A94D0FB1B895EA500F586A5 /* Roboto-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9AAC38591B8956E300FE6B2D /* Roboto-Regular.ttf */; };
4141
9A94D0FC1B895EA500F586A5 /* Roboto-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9AAC38571B8956CF00FE6B2D /* Roboto-Medium.ttf */; };
4242
9A94D0FD1B895EA500F586A5 /* Roboto-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9AAC38551B8956C500FE6B2D /* Roboto-Light.ttf */; };
43-
9A94D1091B8A3F5100F586A5 /* MaterialCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A94D1081B8A3F5100F586A5 /* MaterialCard.swift */; };
44-
9A94D10B1B8A485C00F586A5 /* ImageCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A94D10A1B8A485C00F586A5 /* ImageCard.swift */; };
45-
9AAC384D1B89528900FE6B2D /* BasicCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AAC384C1B89528900FE6B2D /* BasicCard.swift */; };
43+
9A94D1091B8A3F5100F586A5 /* MaterialCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A94D1081B8A3F5100F586A5 /* MaterialCardView.swift */; };
44+
9A94D10B1B8A485C00F586A5 /* ImageCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A94D10A1B8A485C00F586A5 /* ImageCardView.swift */; };
45+
9AAC384D1B89528900FE6B2D /* BasicCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AAC384C1B89528900FE6B2D /* BasicCardView.swift */; };
4646
9AAC38541B89559900FE6B2D /* Roboto.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AAC38531B89559900FE6B2D /* Roboto.swift */; };
47-
9AAC385F1B8957A200FE6B2D /* BasicCard.swift in Headers */ = {isa = PBXBuildFile; fileRef = 9AAC384C1B89528900FE6B2D /* BasicCard.swift */; settings = {ATTRIBUTES = (Public, ); }; };
47+
9AAC385F1B8957A200FE6B2D /* BasicCardView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 9AAC384C1B89528900FE6B2D /* BasicCardView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
4848
/* End PBXBuildFile section */
4949

5050
/* Begin PBXContainerItemProxy section */
@@ -71,14 +71,14 @@
7171
963832611B88E5BF0015F710 /* FlatButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FlatButton.swift; sourceTree = "<group>"; };
7272
963832631B88E5BF0015F710 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
7373
963832651B88E5BF0015F710 /* RaisedButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RaisedButton.swift; sourceTree = "<group>"; };
74-
963832661B88E5BF0015F710 /* Text.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Text.swift; sourceTree = "<group>"; };
75-
963832671B88E5BF0015F710 /* TextStorage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextStorage.swift; sourceTree = "<group>"; };
74+
963832661B88E5BF0015F710 /* MaterialText.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialText.swift; sourceTree = "<group>"; };
75+
963832671B88E5BF0015F710 /* MaterialTextStorage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialTextStorage.swift; sourceTree = "<group>"; };
7676
963832681B88E5BF0015F710 /* TextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextView.swift; sourceTree = "<group>"; };
7777
963832871B8908180015F710 /* Layout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Layout.swift; sourceTree = "<group>"; };
7878
96B57D4D1B90AF7D00DE7BBB /* MaterialTheme.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialTheme.swift; sourceTree = "<group>"; };
79-
9A94D1081B8A3F5100F586A5 /* MaterialCard.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialCard.swift; sourceTree = "<group>"; };
80-
9A94D10A1B8A485C00F586A5 /* ImageCard.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageCard.swift; sourceTree = "<group>"; };
81-
9AAC384C1B89528900FE6B2D /* BasicCard.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicCard.swift; sourceTree = "<group>"; };
79+
9A94D1081B8A3F5100F586A5 /* MaterialCardView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialCardView.swift; sourceTree = "<group>"; };
80+
9A94D10A1B8A485C00F586A5 /* ImageCardView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageCardView.swift; sourceTree = "<group>"; };
81+
9AAC384C1B89528900FE6B2D /* BasicCardView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicCardView.swift; sourceTree = "<group>"; };
8282
9AAC38531B89559900FE6B2D /* Roboto.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Roboto.swift; sourceTree = "<group>"; };
8383
9AAC38551B8956C500FE6B2D /* Roboto-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Light.ttf"; sourceTree = "<group>"; };
8484
9AAC38571B8956CF00FE6B2D /* Roboto-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Medium.ttf"; sourceTree = "<group>"; };
@@ -203,8 +203,8 @@
203203
963832761B88E8990015F710 /* Text */ = {
204204
isa = PBXGroup;
205205
children = (
206-
963832661B88E5BF0015F710 /* Text.swift */,
207-
963832671B88E5BF0015F710 /* TextStorage.swift */,
206+
963832661B88E5BF0015F710 /* MaterialText.swift */,
207+
963832671B88E5BF0015F710 /* MaterialTextStorage.swift */,
208208
963832681B88E5BF0015F710 /* TextView.swift */,
209209
);
210210
name = Text;
@@ -229,9 +229,9 @@
229229
9AAC384B1B89524E00FE6B2D /* Card */ = {
230230
isa = PBXGroup;
231231
children = (
232-
9A94D1081B8A3F5100F586A5 /* MaterialCard.swift */,
233-
9AAC384C1B89528900FE6B2D /* BasicCard.swift */,
234-
9A94D10A1B8A485C00F586A5 /* ImageCard.swift */,
232+
9A94D1081B8A3F5100F586A5 /* MaterialCardView.swift */,
233+
9AAC384C1B89528900FE6B2D /* BasicCardView.swift */,
234+
9A94D10A1B8A485C00F586A5 /* ImageCardView.swift */,
235235
);
236236
name = Card;
237237
sourceTree = "<group>";
@@ -254,9 +254,9 @@
254254
isa = PBXHeadersBuildPhase;
255255
buildActionMask = 2147483647;
256256
files = (
257-
9AAC385F1B8957A200FE6B2D /* BasicCard.swift in Headers */,
258-
9638327E1B89070E0015F710 /* Text.swift in Headers */,
259-
9638327F1B89070E0015F710 /* TextStorage.swift in Headers */,
257+
9AAC385F1B8957A200FE6B2D /* BasicCardView.swift in Headers */,
258+
9638327E1B89070E0015F710 /* MaterialText.swift in Headers */,
259+
9638327F1B89070E0015F710 /* MaterialTextStorage.swift in Headers */,
260260
963832801B89070E0015F710 /* TextView.swift in Headers */,
261261
963832811B89070E0015F710 /* FabButton.swift in Headers */,
262262
963832821B89070E0015F710 /* FlatButton.swift in Headers */,
@@ -265,11 +265,11 @@
265265
9A94D0F91B895C8C00F586A5 /* Roboto.swift in Headers */,
266266
963832851B89070E0015F710 /* CapturePreview.swift in Headers */,
267267
963832891B89097D0015F710 /* Layout.swift in Headers */,
268-
657CD02A1B8EE0D3008C0029 /* MaterialCard.swift in Headers */,
268+
657CD02A1B8EE0D3008C0029 /* MaterialCardView.swift in Headers */,
269269
657CD02C1B8EE0D3008C0029 /* SideNavController.swift in Headers */,
270270
657CD02D1B8EE0D3008C0029 /* MaterialButton.swift in Headers */,
271271
96C910ED1B95804B00E7CE5C /* MaterialTheme.swift in Headers */,
272-
657CD02F1B8EE0D3008C0029 /* ImageCard.swift in Headers */,
272+
657CD02F1B8EE0D3008C0029 /* ImageCardView.swift in Headers */,
273273
);
274274
runOnlyForDeploymentPostprocessing = 0;
275275
};
@@ -374,20 +374,20 @@
374374
buildActionMask = 2147483647;
375375
files = (
376376
963832691B88E5BF0015F710 /* Capture.swift in Sources */,
377-
9A94D10B1B8A485C00F586A5 /* ImageCard.swift in Sources */,
377+
9A94D10B1B8A485C00F586A5 /* ImageCardView.swift in Sources */,
378378
96B57D4E1B90AF7D00DE7BBB /* MaterialTheme.swift in Sources */,
379379
9638326B1B88E5BF0015F710 /* FabButton.swift in Sources */,
380-
9A94D1091B8A3F5100F586A5 /* MaterialCard.swift in Sources */,
380+
9A94D1091B8A3F5100F586A5 /* MaterialCardView.swift in Sources */,
381381
65B965871B8BEEC60055B139 /* SideNavController.swift in Sources */,
382382
9638326C1B88E5BF0015F710 /* FlatButton.swift in Sources */,
383-
963832711B88E5BF0015F710 /* Text.swift in Sources */,
383+
963832711B88E5BF0015F710 /* MaterialText.swift in Sources */,
384384
9638326A1B88E5BF0015F710 /* CapturePreview.swift in Sources */,
385385
9AAC38541B89559900FE6B2D /* Roboto.swift in Sources */,
386386
65B9657E1B8A7C330055B139 /* MaterialButton.swift in Sources */,
387387
963832881B8908180015F710 /* Layout.swift in Sources */,
388-
9AAC384D1B89528900FE6B2D /* BasicCard.swift in Sources */,
388+
9AAC384D1B89528900FE6B2D /* BasicCardView.swift in Sources */,
389389
963832731B88E5BF0015F710 /* TextView.swift in Sources */,
390-
963832721B88E5BF0015F710 /* TextStorage.swift in Sources */,
390+
963832721B88E5BF0015F710 /* MaterialTextStorage.swift in Sources */,
391391
963832701B88E5BF0015F710 /* RaisedButton.swift in Sources */,
392392
);
393393
runOnlyForDeploymentPostprocessing = 0;

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Easily make cards with fully customizable components.
6868

6969

7070
```swift
71-
var card: BasicCard = BasicCard()
71+
var card: BasicCardView = BasicCardView()
7272

7373
// title
7474
card.titleLabel = UILabel()
@@ -109,7 +109,7 @@ Add photos with an Image Card.
109109

110110

111111
```swift
112-
var card: ImageCard = ImageCard()
112+
var card: ImageCardView = ImageCardView()
113113
card.imageView = UIImageView(image: UIImage(named: "photo.jpg"))
114114

115115
// layout
@@ -127,7 +127,7 @@ Allow the Image Card to really shine by adding a title, some details, and button
127127

128128

129129
```swift
130-
var card: ImageCard = ImageCard()
130+
var card: ImageCardView = ImageCardView()
131131
card.imageView = UIImageView(image: UIImage(named: "photo.jpg"))
132132

133133
// title

Source/BasicCard.swift renamed to Source/BasicCardView.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import UIKit
2020

21-
public class BasicCard : MaterialCard, Comparable, Equatable {
21+
public class BasicCardView : MaterialCardView, Comparable, Equatable {
2222
//
2323
// :name: layoutConstraints
2424
//
@@ -277,22 +277,22 @@ public class BasicCard : MaterialCard, Comparable, Equatable {
277277
}
278278
}
279279

280-
public func ==(lhs: BasicCard, rhs: BasicCard) -> Bool {
280+
public func ==(lhs: BasicCardView, rhs: BasicCardView) -> Bool {
281281
return lhs.tag == rhs.tag
282282
}
283283

284-
public func <=(lhs: BasicCard, rhs: BasicCard) -> Bool {
284+
public func <=(lhs: BasicCardView, rhs: BasicCardView) -> Bool {
285285
return lhs.tag <= rhs.tag
286286
}
287287

288-
public func >=(lhs: BasicCard, rhs: BasicCard) -> Bool {
288+
public func >=(lhs: BasicCardView, rhs: BasicCardView) -> Bool {
289289
return lhs.tag >= rhs.tag
290290
}
291291

292-
public func >(lhs: BasicCard, rhs: BasicCard) -> Bool {
292+
public func >(lhs: BasicCardView, rhs: BasicCardView) -> Bool {
293293
return lhs.tag > rhs.tag
294294
}
295295

296-
public func <(lhs: BasicCard, rhs: BasicCard) -> Bool {
296+
public func <(lhs: BasicCardView, rhs: BasicCardView) -> Bool {
297297
return lhs.tag < rhs.tag
298298
}

‎Source/FabButton.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public class FabButton : MaterialButton {
2626
super.prepareView()
2727
setTitleColor(MaterialTheme.white.color, forState: .Normal)
2828
backgroundColor = MaterialTheme.red.darken1
29+
pulseColor = MaterialTheme.white.color
2930
contentEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 0)
3031
}
3132

‎Source/FlatButton.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ public class FlatButton : MaterialButton {
2424
//
2525
internal override func prepareView() {
2626
super.prepareView()
27-
setTitleColor(MaterialTheme.indigo.darken1, forState: .Normal)
28-
pulseColor = MaterialTheme.indigo.darken1
27+
setTitleColor(MaterialTheme.blue.accent2, forState: .Normal)
2928
backgroundColor = MaterialTheme.clear.color
3029
contentEdgeInsets = UIEdgeInsetsMake(4, 16, 4, 16)
3130
}

Source/ImageCard.swift renamed to Source/ImageCardView.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import UIKit
2020

21-
public class ImageCard : MaterialCard, Comparable, Equatable {
21+
public class ImageCardView : MaterialCardView, Comparable, Equatable {
2222
//
2323
// :name: layoutConstraints
2424
//
@@ -351,22 +351,22 @@ public class ImageCard : MaterialCard, Comparable, Equatable {
351351
}
352352
}
353353

354-
public func ==(lhs: ImageCard, rhs: ImageCard) -> Bool {
354+
public func ==(lhs: ImageCardView, rhs: ImageCardView) -> Bool {
355355
return lhs.tag == rhs.tag
356356
}
357357

358-
public func <=(lhs: ImageCard, rhs: ImageCard) -> Bool {
358+
public func <=(lhs: ImageCardView, rhs: ImageCardView) -> Bool {
359359
return lhs.tag <= rhs.tag
360360
}
361361

362-
public func >=(lhs: ImageCard, rhs: ImageCard) -> Bool {
362+
public func >=(lhs: ImageCardView, rhs: ImageCardView) -> Bool {
363363
return lhs.tag >= rhs.tag
364364
}
365365

366-
public func >(lhs: ImageCard, rhs: ImageCard) -> Bool {
366+
public func >(lhs: ImageCardView, rhs: ImageCardView) -> Bool {
367367
return lhs.tag > rhs.tag
368368
}
369369

370-
public func <(lhs: ImageCard, rhs: ImageCard) -> Bool {
370+
public func <(lhs: ImageCardView, rhs: ImageCardView) -> Bool {
371371
return lhs.tag < rhs.tag
372372
}

‎Source/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.7.0</string>
18+
<string>1.8.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

Source/MaterialCard.swift renamed to Source/MaterialCardView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import UIKit
2020

21-
public class MaterialCard : UIView {
21+
public class MaterialCardView : UIView {
2222
//
2323
// :name: backgroundColorView
2424
//

Source/Text.swift renamed to Source/MaterialText.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818

1919
import UIKit
2020

21-
@objc(TextDelegate)
21+
@objc(MaterialTextDelegate)
2222
public protocol TextDelegate {
23-
optional func textStorageWillProcessEdit(text: Text, textStorage: TextStorage, string: String, range: NSRange)
24-
optional func textStorageDidProcessEdit(text: Text, textStorage: TextStorage, string: String, result: NSTextCheckingResult, flags: NSMatchingFlags, stop: UnsafeMutablePointer<ObjCBool>)
23+
optional func textStorageWillProcessEdit(text: MaterialText, textStorage: MaterialTextStorage, string: String, range: NSRange)
24+
optional func textStorageDidProcessEdit(text: MaterialText, textStorage: MaterialTextStorage, string: String, result: NSTextCheckingResult, flags: NSMatchingFlags, stop: UnsafeMutablePointer<ObjCBool>)
2525
}
2626

27-
@objc(Text)
28-
public class Text: NSObject {
27+
@objc(MaterialText)
28+
public class MaterialText: NSObject {
2929
/**
3030
:name: searchPattern
3131
:description: A string representation of the regular expression that matches text within
@@ -42,7 +42,7 @@ public class Text: NSObject {
4242
:name: textStorage
4343
:description: Reference to wrapped NSTextStorage
4444
*/
45-
public let textStorage: TextStorage
45+
public let textStorage: MaterialTextStorage
4646

4747
/**
4848
:name: delegate
@@ -53,14 +53,14 @@ public class Text: NSObject {
5353
/**
5454
:name: init
5555
*/
56-
override public init() {
57-
textStorage = TextStorage()
56+
public override init() {
57+
textStorage = MaterialTextStorage()
5858
super.init()
5959
textStorage.searchExpression = NSRegularExpression(pattern: searchPattern, options: nil, error: nil)
60-
textStorage.textStorageWillProcessEdit = { (textStorage: TextStorage, string: String, range: NSRange) -> Void in
60+
textStorage.textStorageWillProcessEdit = { (textStorage: MaterialTextStorage, string: String, range: NSRange) -> Void in
6161
self.delegate?.textStorageWillProcessEdit?(self, textStorage: textStorage, string: string, range: range)
6262
}
63-
textStorage.textStorageDidProcessEdit = { (textStorage: TextStorage, result: NSTextCheckingResult, flags: NSMatchingFlags, stop: UnsafeMutablePointer<ObjCBool>) -> Void in
63+
textStorage.textStorageDidProcessEdit = { (textStorage: MaterialTextStorage, result: NSTextCheckingResult, flags: NSMatchingFlags, stop: UnsafeMutablePointer<ObjCBool>) -> Void in
6464
self.delegate?.textStorageDidProcessEdit?(self, textStorage: textStorage, string: textStorage.string, result: result, flags: flags, stop: stop)
6565
}
6666
}

0 commit comments

Comments
 (0)