Skip to content

Commit 7717b77

Browse files
author
Daniel Dahan
committed
Merge branch 'development'
2 parents 7e33b38 + b061cb7 commit 7717b77

14 files changed

+278
-96
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.8.0'
3+
s.version = '1.9.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: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@
88

99
/* Begin PBXBuildFile section */
1010
657CD02A1B8EE0D3008C0029 /* MaterialCardView.swift in Headers */ = {isa = PBXBuildFile; fileRef = 9A94D1081B8A3F5100F586A5 /* MaterialCardView.swift */; settings = {ATTRIBUTES = (Public, ); }; };
11-
657CD02C1B8EE0D3008C0029 /* SideNavController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 65B965861B8BEEC60055B139 /* SideNavController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
11+
657CD02C1B8EE0D3008C0029 /* SideNavigationViewController.swift in Headers */ = {isa = PBXBuildFile; fileRef = 65B965861B8BEEC60055B139 /* SideNavigationViewController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
1212
657CD02D1B8EE0D3008C0029 /* MaterialButton.swift in Headers */ = {isa = PBXBuildFile; fileRef = 65B9657D1B8A7C330055B139 /* MaterialButton.swift */; settings = {ATTRIBUTES = (Public, ); }; };
1313
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 */; };
15-
65B965871B8BEEC60055B139 /* SideNavController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65B965861B8BEEC60055B139 /* SideNavController.swift */; };
15+
65B965871B8BEEC60055B139 /* SideNavigationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65B965861B8BEEC60055B139 /* SideNavigationViewController.swift */; };
16+
65DBE4201B9A9244000C804F /* Roboto-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 65DBE41E1B9A9244000C804F /* Roboto-Bold.ttf */; };
17+
65DBE4211B9A9244000C804F /* Roboto-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 65DBE41F1B9A9244000C804F /* Roboto-Thin.ttf */; };
1618
963832421B88DFD80015F710 /* MaterialKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 963832361B88DFD80015F710 /* MaterialKit.framework */; };
1719
9638325A1B88E31A0015F710 /* MaterialKitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 963832581B88E31A0015F710 /* MaterialKitTests.swift */; };
1820
963832691B88E5BF0015F710 /* Capture.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9638325E1B88E5BF0015F710 /* Capture.swift */; };
@@ -59,7 +61,9 @@
5961

6062
/* Begin PBXFileReference section */
6163
65B9657D1B8A7C330055B139 /* MaterialButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MaterialButton.swift; sourceTree = "<group>"; };
62-
65B965861B8BEEC60055B139 /* SideNavController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SideNavController.swift; sourceTree = "<group>"; };
64+
65B965861B8BEEC60055B139 /* SideNavigationViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SideNavigationViewController.swift; sourceTree = "<group>"; };
65+
65DBE41E1B9A9244000C804F /* Roboto-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Bold.ttf"; sourceTree = "<group>"; };
66+
65DBE41F1B9A9244000C804F /* Roboto-Thin.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Thin.ttf"; sourceTree = "<group>"; };
6367
963832361B88DFD80015F710 /* MaterialKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MaterialKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6468
963832411B88DFD80015F710 /* MaterialKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MaterialKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
6569
963832541B88E30F0015F710 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -111,12 +115,12 @@
111115
name = View;
112116
sourceTree = "<group>";
113117
};
114-
65B965851B8BEEB00055B139 /* Nav */ = {
118+
65B965851B8BEEB00055B139 /* Navigation */ = {
115119
isa = PBXGroup;
116120
children = (
117-
65B965861B8BEEC60055B139 /* SideNavController.swift */,
121+
65B965861B8BEEC60055B139 /* SideNavigationViewController.swift */,
118122
);
119-
name = Nav;
123+
name = Navigation;
120124
sourceTree = "<group>";
121125
};
122126
9638322C1B88DFD80015F710 = {
@@ -146,7 +150,7 @@
146150
9AAC38521B89553800FE6B2D /* Font */,
147151
963832861B8907FE0015F710 /* Layout */,
148152
65B965731B8A58E60055B139 /* View */,
149-
65B965851B8BEEB00055B139 /* Nav */,
153+
65B965851B8BEEB00055B139 /* Navigation */,
150154
963832761B88E8990015F710 /* Text */,
151155
963832751B88E87B0015F710 /* Button */,
152156
9AAC384B1B89524E00FE6B2D /* Card */,
@@ -239,6 +243,8 @@
239243
9AAC38521B89553800FE6B2D /* Font */ = {
240244
isa = PBXGroup;
241245
children = (
246+
65DBE41E1B9A9244000C804F /* Roboto-Bold.ttf */,
247+
65DBE41F1B9A9244000C804F /* Roboto-Thin.ttf */,
242248
9AAC38591B8956E300FE6B2D /* Roboto-Regular.ttf */,
243249
9AAC38571B8956CF00FE6B2D /* Roboto-Medium.ttf */,
244250
9AAC38551B8956C500FE6B2D /* Roboto-Light.ttf */,
@@ -266,7 +272,7 @@
266272
963832851B89070E0015F710 /* CapturePreview.swift in Headers */,
267273
963832891B89097D0015F710 /* Layout.swift in Headers */,
268274
657CD02A1B8EE0D3008C0029 /* MaterialCardView.swift in Headers */,
269-
657CD02C1B8EE0D3008C0029 /* SideNavController.swift in Headers */,
275+
657CD02C1B8EE0D3008C0029 /* SideNavigationViewController.swift in Headers */,
270276
657CD02D1B8EE0D3008C0029 /* MaterialButton.swift in Headers */,
271277
96C910ED1B95804B00E7CE5C /* MaterialTheme.swift in Headers */,
272278
657CD02F1B8EE0D3008C0029 /* ImageCardView.swift in Headers */,
@@ -354,6 +360,8 @@
354360
files = (
355361
9A94D0FA1B895EA500F586A5 /* LICENSE in Resources */,
356362
9A94D0FB1B895EA500F586A5 /* Roboto-Regular.ttf in Resources */,
363+
65DBE4211B9A9244000C804F /* Roboto-Thin.ttf in Resources */,
364+
65DBE4201B9A9244000C804F /* Roboto-Bold.ttf in Resources */,
357365
9A94D0FC1B895EA500F586A5 /* Roboto-Medium.ttf in Resources */,
358366
9A94D0FD1B895EA500F586A5 /* Roboto-Light.ttf in Resources */,
359367
);
@@ -378,7 +386,7 @@
378386
96B57D4E1B90AF7D00DE7BBB /* MaterialTheme.swift in Sources */,
379387
9638326B1B88E5BF0015F710 /* FabButton.swift in Sources */,
380388
9A94D1091B8A3F5100F586A5 /* MaterialCardView.swift in Sources */,
381-
65B965871B8BEEC60055B139 /* SideNavController.swift in Sources */,
389+
65B965871B8BEEC60055B139 /* SideNavigationViewController.swift in Sources */,
382390
9638326C1B88E5BF0015F710 /* FlatButton.swift in Sources */,
383391
963832711B88E5BF0015F710 /* MaterialText.swift in Sources */,
384392
9638326A1B88E5BF0015F710 /* CapturePreview.swift in Sources */,

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Add a sleek Side Navigation to give your users a wonderful experience.
170170

171171
```swift
172172
func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
173-
sideNav = SideNavController(mainViewController: MainViewController(), leftViewController: LeftViewController(), rightViewController: RightViewController())
173+
sideNav = SideNavigationViewController(mainViewController: MainViewController(), leftViewController: LeftViewController(), rightViewController: RightViewController())
174174
sideNav!.delegate = self
175175
window = UIWindow(frame: UIScreen.mainScreen().bounds)
176176
window!.rootViewController = sideNav

Source/BasicCardView.swift

Lines changed: 48 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
3232
/**
3333
:name: verticalSpace
3434
*/
35-
public var verticalSpace: CGFloat = 8
35+
public var verticalSpace: CGFloat = MaterialTheme.verticalSpace
3636

3737
/**
3838
:name: horizontalSpace
3939
*/
40-
public var horizontalSpace: CGFloat = 8
40+
public var horizontalSpace: CGFloat = MaterialTheme.horizontalSpace
4141

4242
/**
4343
:name: titleLabelContainer
@@ -72,8 +72,9 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
7272
t.setTranslatesAutoresizingMaskIntoConstraints(false)
7373
t.textColor = MaterialTheme.white.color
7474
t.backgroundColor = MaterialTheme.clear.color
75-
t.font = Roboto.mediumWithSize(18)
75+
t.font = Roboto.medium
7676
t.numberOfLines = 1
77+
t.lineBreakMode = .ByTruncatingTail
7778
prepareCard()
7879
} else {
7980
titleLabelContainer?.removeFromSuperview()
@@ -110,9 +111,9 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
110111
l.setTranslatesAutoresizingMaskIntoConstraints(false)
111112
l.textColor = MaterialTheme.white.color
112113
l.backgroundColor = MaterialTheme.clear.color
113-
l.font = Roboto.lightWithSize(16)
114+
l.font = Roboto.light
114115
l.numberOfLines = 0
115-
l.lineBreakMode = .ByWordWrapping
116+
l.lineBreakMode = .ByTruncatingTail
116117
prepareCard()
117118
} else {
118119
detailLabelContainer?.removeFromSuperview()
@@ -161,7 +162,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
161162
}
162163

163164
/**
164-
:name: rightButtons
165+
:name: rightButtons
165166
*/
166167
public var rightButtons: Array<MaterialButton>? {
167168
didSet {
@@ -179,6 +180,39 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
179180
}
180181
}
181182

183+
/**
184+
:name: init
185+
*/
186+
public required init(coder aDecoder: NSCoder) {
187+
super.init(coder: aDecoder)
188+
}
189+
190+
/**
191+
:name: init
192+
*/
193+
public convenience init?(titleLabel: UILabel? = nil, detailLabel: UILabel? = nil, divider: UIView? = nil, leftButtons: Array<MaterialButton>? = nil, rightButtons: Array<MaterialButton>? = nil) {
194+
self.init(frame: CGRectZero)
195+
prepareProperties(titleLabel, detailLabel: detailLabel, divider: divider, leftButtons: leftButtons, rightButtons: rightButtons)
196+
}
197+
198+
/**
199+
:name: init
200+
*/
201+
public required init(frame: CGRect) {
202+
super.init(frame: CGRectZero)
203+
}
204+
205+
//
206+
// :name: prepareProperties
207+
//
208+
internal func prepareProperties(titleLabel: UILabel?, detailLabel: UILabel?, divider: UIView?, leftButtons: Array<MaterialButton>?, rightButtons: Array<MaterialButton>?) {
209+
self.titleLabel = titleLabel
210+
self.detailLabel = detailLabel
211+
self.divider = divider
212+
self.leftButtons = leftButtons
213+
self.rightButtons = rightButtons
214+
}
215+
182216
//
183217
// :name: prepareView
184218
//
@@ -208,9 +242,10 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
208242
verticalFormat += "[titleLabelContainer]"
209243
views["titleLabelContainer"] = titleLabelContainer!
210244

211-
// text
212-
titleLabelContainer!.addConstraints(Layout.constraint("H:|-(horizontalSpace)-[titleLabel]-(horizontalSpace)-|", options: nil, metrics: ["horizontalSpace": horizontalSpace], views: ["titleLabel": titleLabel!]))
213-
titleLabelContainer!.addConstraints(Layout.constraint("V:|-(verticalSpace)-[titleLabel(height)]-(verticalSpace)-|", options: nil, metrics: ["verticalSpace": verticalSpace, "height": titleLabel!.font.pointSize + verticalSpace], views: ["titleLabel": titleLabel!]))
245+
// common text
246+
Layout.height(titleLabelContainer!, child: titleLabel!, height: 1.5 * titleLabel!.font.pointSize)
247+
Layout.expandToParentVerticallyWithPad(titleLabelContainer!, child: titleLabel!, top: verticalSpace, bottom: verticalSpace)
248+
Layout.expandToParentHorizontallyWithPad(titleLabelContainer!, child: titleLabel!, left: horizontalSpace, right: horizontalSpace)
214249
}
215250

216251
// detail
@@ -221,10 +256,11 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
221256
views["detailLabelContainer"] = detailLabelContainer!
222257

223258
// text
224-
detailLabelContainer!.addConstraints(Layout.constraint("H:|-(horizontalSpace)-[detailLabel]-(horizontalSpace)-|", options: nil, metrics: ["horizontalSpace": horizontalSpace], views: ["detailLabel": detailLabel!]))
259+
Layout.expandToParentHorizontallyWithPad(detailLabelContainer!, child: detailLabel!, left: horizontalSpace, right: horizontalSpace)
225260
detailLabelContainer!.addConstraints(Layout.constraint("V:|-(verticalSpace)-[detailLabel(<=maximumDetailLabelHeight)]-(verticalSpace)-|", options: nil, metrics: ["verticalSpace": verticalSpace, "maximumDetailLabelHeight": maximumDetailLabelHeight], views: ["detailLabel": detailLabel!]))
226261
}
227262

263+
// buttons
228264
if nil != buttonsContainer && (nil != leftButtons || nil != rightButtons) {
229265
// divider
230266
if nil != divider {
@@ -247,7 +283,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
247283
buttonsContainer!.addSubview(button)
248284
buttonViews["button\(i)"] = button
249285
horizontalFormat += "-(horizontalSpace)-[button\(i)]"
250-
Layout.expandToParentVerticallyWithPad(buttonsContainer!, child: button, top: horizontalSpace, bottom: verticalSpace)
286+
Layout.expandToParentVerticallyWithPad(buttonsContainer!, child: button, top: verticalSpace, bottom: verticalSpace)
251287
}
252288
buttonsContainer!.addConstraints(Layout.constraint(horizontalFormat, options: nil, metrics: ["horizontalSpace": horizontalSpace], views: buttonViews))
253289
}
@@ -261,7 +297,7 @@ public class BasicCardView : MaterialCardView, Comparable, Equatable {
261297
buttonsContainer!.addSubview(button)
262298
buttonViews["button\(i)"] = button
263299
horizontalFormat += "[button\(i)]-(horizontalSpace)-"
264-
Layout.expandToParentVerticallyWithPad(buttonsContainer!, child: button, top: horizontalSpace, bottom: verticalSpace)
300+
Layout.expandToParentVerticallyWithPad(buttonsContainer!, child: button, top: verticalSpace, bottom: verticalSpace)
265301
}
266302
buttonsContainer!.addConstraints(Layout.constraint(horizontalFormat + "|", options: nil, metrics: ["horizontalSpace": horizontalSpace], views: buttonViews))
267303
}

Source/ImageCardView.swift

Lines changed: 46 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
3232
/**
3333
:name: verticalSpace
3434
*/
35-
public var verticalSpace: CGFloat = 8
35+
public var verticalSpace: CGFloat = MaterialTheme.verticalSpace
3636

3737
/**
3838
:name: horizontalSpace
3939
*/
40-
public var horizontalSpace: CGFloat = 8
40+
public var horizontalSpace: CGFloat = MaterialTheme.horizontalSpace
4141

4242
/**
4343
:name: shadow
@@ -113,8 +113,9 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
113113
titleLabelContainer!.addSubview(t)
114114
t.setTranslatesAutoresizingMaskIntoConstraints(false)
115115
t.backgroundColor = MaterialTheme.clear.color
116-
t.font = Roboto.mediumWithSize(18)
116+
t.font = Roboto.medium
117117
t.numberOfLines = 1
118+
t.lineBreakMode = .ByTruncatingTail
118119
if nil == imageView {
119120
titleLabelContainer!.backgroundColor = MaterialTheme.white.color
120121
t.textColor = MaterialTheme.black.color
@@ -160,9 +161,9 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
160161
l.setTranslatesAutoresizingMaskIntoConstraints(false)
161162
l.textColor = MaterialTheme.black.color
162163
l.backgroundColor = MaterialTheme.clear.color
163-
l.font = Roboto.lightWithSize(16)
164+
l.font = Roboto.light
164165
l.numberOfLines = 0
165-
l.lineBreakMode = .ByWordWrapping
166+
l.lineBreakMode = .ByTruncatingTail
166167
prepareCard()
167168
} else {
168169
detailLabelContainer?.removeFromSuperview()
@@ -192,7 +193,7 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
192193
public private(set) var buttonsContainer: UIView?
193194

194195
/**
195-
:name: leftButtons
196+
:name: leftButtons
196197
*/
197198
public var leftButtons: Array<MaterialButton>? {
198199
didSet {
@@ -229,6 +230,40 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
229230
}
230231
}
231232

233+
/**
234+
:name: init
235+
*/
236+
public required init(coder aDecoder: NSCoder) {
237+
super.init(coder: aDecoder)
238+
}
239+
240+
/**
241+
:name: init
242+
*/
243+
public convenience init?(imageView: UIImageView? = nil, titleLabel: UILabel? = nil, detailLabel: UILabel? = nil, divider: UIView? = nil, leftButtons: Array<MaterialButton>? = nil, rightButtons: Array<MaterialButton>? = nil) {
244+
self.init(frame: CGRectZero)
245+
prepareProperties(imageView, titleLabel: titleLabel, detailLabel: detailLabel, divider: divider, leftButtons: leftButtons, rightButtons: rightButtons)
246+
}
247+
248+
/**
249+
:name: init
250+
*/
251+
public required init(frame: CGRect) {
252+
super.init(frame: CGRectZero)
253+
}
254+
255+
//
256+
// :name: prepareProperties
257+
//
258+
internal func prepareProperties(imageView: UIImageView?, titleLabel: UILabel?, detailLabel: UILabel?, divider: UIView?, leftButtons: Array<MaterialButton>?, rightButtons: Array<MaterialButton>?) {
259+
self.imageView = imageView
260+
self.titleLabel = titleLabel
261+
self.detailLabel = detailLabel
262+
self.divider = divider
263+
self.leftButtons = leftButtons
264+
self.rightButtons = rightButtons
265+
}
266+
232267
//
233268
// :name: prepareView
234269
//
@@ -270,21 +305,16 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
270305
layoutConstraints += Layout.constraint("H:|[titleLabelContainer]|", options: nil, metrics: nil, views: ["titleLabelContainer": titleLabelContainer!])
271306
verticalFormat += "[titleLabelContainer]"
272307
views["titleLabelContainer"] = titleLabelContainer!
273-
274-
// text
275-
titleLabelContainer!.addConstraints(Layout.constraint("V:|-(verticalSpace)-[titleLabel(height)]-(verticalSpace)-|", options: nil, metrics: ["verticalSpace": verticalSpace, "height": titleLabel!.font.pointSize + verticalSpace], views: ["titleLabel": titleLabel!]))
276308
} else {
277309
//container
278310
Layout.alignFromBottomLeft(imageViewContainer!, child: titleLabelContainer!)
279311
Layout.expandToParentHorizontally(imageViewContainer!, child: titleLabelContainer!)
280-
Layout.height(titleLabelContainer!, child: titleLabel!, height: titleLabel!.font.pointSize + verticalSpace)
281-
282-
// text
283-
titleLabelContainer!.addConstraints(Layout.constraint("V:|-(verticalSpace)-[titleLabel(height)]-(verticalSpace)-|", options: nil, metrics: ["verticalSpace": verticalSpace, "height": titleLabel!.font.pointSize + verticalSpace], views: ["titleLabel": titleLabel!]))
284312
}
285313

286314
// common text
287-
titleLabelContainer!.addConstraints(Layout.constraint("H:|-(horizontalSpace)-[titleLabel]-(horizontalSpace)-|", options: nil, metrics: ["horizontalSpace": horizontalSpace], views: ["titleLabel": titleLabel!]))
315+
Layout.height(titleLabelContainer!, child: titleLabel!, height: 1.5 * titleLabel!.font.pointSize)
316+
Layout.expandToParentVerticallyWithPad(titleLabelContainer!, child: titleLabel!, top: verticalSpace, bottom: verticalSpace)
317+
Layout.expandToParentHorizontallyWithPad(titleLabelContainer!, child: titleLabel!, left: horizontalSpace, right: horizontalSpace)
288318
}
289319

290320
// detail
@@ -295,10 +325,11 @@ public class ImageCardView : MaterialCardView, Comparable, Equatable {
295325
views["detailLabelContainer"] = detailLabelContainer!
296326

297327
// text
298-
detailLabelContainer!.addConstraints(Layout.constraint("H:|-(horizontalSpace)-[detailLabel]-(horizontalSpace)-|", options: nil, metrics: ["horizontalSpace": horizontalSpace], views: ["detailLabel": detailLabel!]))
328+
Layout.expandToParentHorizontallyWithPad(detailLabelContainer!, child: detailLabel!, left: horizontalSpace, right: horizontalSpace)
299329
detailLabelContainer!.addConstraints(Layout.constraint("V:|-(verticalSpace)-[detailLabel(<=maximumDetailLabelHeight)]-(verticalSpace)-|", options: nil, metrics: ["verticalSpace": verticalSpace, "maximumDetailLabelHeight": maximumDetailLabelHeight], views: ["detailLabel": detailLabel!]))
300330
}
301331

332+
// buttons
302333
if nil != buttonsContainer && (nil != leftButtons || nil != rightButtons) {
303334
// divider
304335
if nil != divider {

Source/Info.plist

Lines changed: 5 additions & 3 deletions
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.8.0</string>
18+
<string>1.9.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
@@ -24,9 +24,11 @@
2424
<string></string>
2525
<key>UIAppFonts</key>
2626
<array>
27-
<string>Roboto-Medium.ttf</string>
28-
<string>Roboto-Regular.ttf</string>
27+
<string>Roboto-Thin</string>
2928
<string>Roboto-Light.ttf</string>
29+
<string>Roboto-Regular.ttf</string>
30+
<string>Roboto-Medium.ttf</string>
31+
<string>Roboto-Bold</string>
3032
</array>
3133
</dict>
3234
</plist>

0 commit comments

Comments
 (0)