Skip to content

Commit 5787c22

Browse files
Merge pull request #4 from IgorChernyshov/feature/add-icon-color
Minor improvements
2 parents 5b262ef + f471ffc commit 5787c22

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

Sources/KRTabBar/KRTabBarController.swift

+7-13
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,17 @@ class KRTabBarController: UITabBarController, UITabBarControllerDelegate {
1818

1919
private let customTabBarView: UIView = {
2020
let view = UIView(frame: .zero)
21-
view.backgroundColor = .white
22-
view.layer.cornerRadius = 20
21+
view.backgroundColor = .systemBackground
2322
view.clipsToBounds = true
2423
view.translatesAutoresizingMaskIntoConstraints = false
2524
return view
2625
}()
2726

2827
private let indexView: UIView = {
2928
let view = UIView(frame: .zero)
30-
view.backgroundColor = .orange
31-
view.layer.shadowColor = UIColor.orange.cgColor
3229
view.layer.shadowOpacity = 1
3330
view.layer.shadowOffset = CGSize(width: 2, height: 2)
3431
view.layer.shadowRadius = 10
35-
view.layer.cornerRadius = 20
3632
view.translatesAutoresizingMaskIntoConstraints = false
3733
return view
3834
}()
@@ -55,8 +51,7 @@ class KRTabBarController: UITabBarController, UITabBarControllerDelegate {
5551
override func viewDidLoad() {
5652
super.viewDidLoad()
5753
tabBar.isHidden = true
58-
addcoustmeTabBarView()
59-
tabBar.tintColor = .black
54+
addCustomTabBarView()
6055
createButtonsStack(viewControllers!)
6156
autolayout()
6257
}
@@ -75,7 +70,8 @@ class KRTabBarController: UITabBarController, UITabBarControllerDelegate {
7570
buttons.removeAll()
7671
buttonsColors.removeAll()
7772

78-
stackView.subviews.forEach {
73+
stackView.arrangedSubviews.forEach {
74+
stackView.removeArrangedSubview($0)
7975
$0.removeFromSuperview()
8076
}
8177

@@ -84,13 +80,13 @@ class KRTabBarController: UITabBarController, UITabBarControllerDelegate {
8480
assertionFailure("TabBarItems class must be KRTabBarItem")
8581
return
8682
}
87-
buttonsColors.append(tabBarItem.color)
83+
buttonsColors.append(tabBarItem.backgroundColor)
8884

8985
let button = UIButton()
9086
button.tag = index
9187
button.addTarget(self, action: #selector(didSelectIndex(sender:)), for: .touchUpInside)
9288
let image = viewController.tabBarItem.image?.withRenderingMode(.alwaysTemplate)
93-
button.imageView?.tintColor = .black
89+
button.imageView?.tintColor = tabBarItem.iconColor
9490
button.setImage(image, for: .normal)
9591
button.translatesAutoresizingMaskIntoConstraints = false
9692
stackView.addArrangedSubview(button)
@@ -117,7 +113,7 @@ class KRTabBarController: UITabBarController, UITabBarControllerDelegate {
117113
])
118114
}
119115

120-
private func addcoustmeTabBarView() {
116+
private func addCustomTabBarView() {
121117
customTabBarView.frame = tabBar.frame
122118
indexView.frame = tabBar.frame
123119
view.addSubview(customTabBarView)
@@ -126,10 +122,8 @@ class KRTabBarController: UITabBarController, UITabBarControllerDelegate {
126122

127123
customTabBarView.addSubview(indexView)
128124
customTabBarView.addSubview(stackView)
129-
130125
}
131126

132-
133127
@objc private func didSelectIndex(sender: UIButton) {
134128
let index = sender.tag
135129
self.selectedIndex = index

Sources/KRTabBar/KRTabBarItem.swift

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,8 @@ import UIKit
1010

1111
class KRTabBarItem: UITabBarItem {
1212
@IBInspectable
13-
var color: UIColor = UIColor.systemBlue
13+
var backgroundColor: UIColor = UIColor.systemBlue
14+
15+
@IBInspectable
16+
var iconColor: UIColor = .darkText
1417
}

0 commit comments

Comments
 (0)