Skip to content

Commit fb8b19b

Browse files
committed
Added toolbar with footer text. Updated version.
1 parent 4352213 commit fb8b19b

File tree

7 files changed

+61
-9
lines changed

7 files changed

+61
-9
lines changed

NativeUIKit.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

33
s.name = 'NativeUIKit'
4-
s.version = '1.0.4'
4+
s.version = '1.0.5'
55
s.summary = 'Mimicrated views and controls to native Apple appearance.'
66
s.homepage = 'https://github.com/ivanvorobei/NativeUIKit'
77
s.source = { :git => 'https://github.com/ivanvorobei/NativeUIKit.git', :tag => s.version }
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
// The MIT License (MIT)
2+
// Copyright © 2021 Ivan Vorobei ([email protected])
3+
//
4+
// Permission is hereby granted, free of charge, to any person obtaining a copy
5+
// of this software and associated documentation files (the "Software"), to deal
6+
// in the Software without restriction, including without limitation the rights
7+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
// copies of the Software, and to permit persons to whom the Software is
9+
// furnished to do so, subject to the following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included in all
12+
// copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20+
// SOFTWARE.
21+
22+
#if canImport(UIKit) && (os(iOS))
23+
import UIKit
24+
import SparrowKit
25+
26+
open class NativeLargeActionFooterToolBarView: NativeLargeActionToolBarView {
27+
28+
// MARK: - Views
29+
30+
public let footerLabel = SPLabel().do {
31+
$0.font = .preferredFont(forTextStyle: .footnote)
32+
if #available(iOS 13.0, *) {
33+
$0.textColor = .secondaryLabel
34+
} else {
35+
$0.textColor = .black.alpha(0.5)
36+
}
37+
}
38+
39+
// MARK: - Init
40+
41+
open override func commonInit() {
42+
super.commonInit()
43+
addSubview(footerLabel)
44+
}
45+
46+
// MARK: - Layout
47+
48+
open override func layoutSubviews() {
49+
super.layoutSubviews()
50+
let inset: CGFloat = 16
51+
footerLabel.layoutDynamicHeight(x: layoutMargins.left + inset, y: actionButton.frame.maxY + 12, width: layoutWidth - inset)
52+
}
53+
54+
open override func sizeThatFits(_ size: CGSize) -> CGSize {
55+
layoutSubviews()
56+
return .init(width: size.width, height: footerLabel.frame.maxY + layoutMargins.bottom)
57+
}
58+
}
59+
#endif

Sources/NativeUIKit/Bars/Tool/NativeSkipableLargeActionToolBarView.swift renamed to Sources/NativeUIKit/Bars/ToolBar/NativeSkipableLargeActionToolBarView.swift

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,10 @@
2323
import UIKit
2424
import SparrowKit
2525

26-
open class NativeSkipableLargeActionToolBarView: NativeMimicrateToolBarView {
26+
open class NativeSkipableLargeActionToolBarView: NativeLargeActionToolBarView {
2727

2828
// MARK: - Views
2929

30-
public let actionButton = NativeLargeActionButton().do {
31-
$0.applyDefaultAppearance(with: .init(content: .white, background: .tint))
32-
}
33-
3430
public let skipButton = SPDimmedButton().do {
3531
if #available(iOS 13.0, *) {
3632
$0.applyDefaultAppearance(with: .init(content: .tertiaryLabel, background: .clear))
@@ -42,16 +38,13 @@ open class NativeSkipableLargeActionToolBarView: NativeMimicrateToolBarView {
4238

4339
open override func commonInit() {
4440
super.commonInit()
45-
addSubview(actionButton)
4641
addSubview(skipButton)
4742
}
4843

4944
// MARK: - Layout
5045

5146
open override func layoutSubviews() {
5247
super.layoutSubviews()
53-
actionButton.layout(y: layoutMargins.top)
54-
5548
skipButton.setWidthAndFit(width: layoutWidth)
5649
skipButton.frame.origin.y = actionButton.frame.maxY + 12
5750
skipButton.setXCenter()

0 commit comments

Comments
 (0)