Skip to content

Commit 2da63da

Browse files
VasuNIPLVasuNIPL
committed
change color
1 parent 05774e9 commit 2da63da

10 files changed

+50
-5
lines changed

‎.DS_Store

0 Bytes
Binary file not shown.

‎BubbleTabBar.xcodeproj/project.pbxproj

+32
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
177B5B6E22BA1BC6005B59EB /* Montserrat-Light_0.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 177B5B6A22BA1BC6005B59EB /* Montserrat-Light_0.ttf */; };
11+
177B5B6F22BA1BC6005B59EB /* Montserrat-Light_0.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 177B5B6A22BA1BC6005B59EB /* Montserrat-Light_0.ttf */; };
12+
177B5B7022BA1BC6005B59EB /* Montserrat-Medium_0.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 177B5B6B22BA1BC6005B59EB /* Montserrat-Medium_0.ttf */; };
13+
177B5B7122BA1BC6005B59EB /* Montserrat-Medium_0.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 177B5B6B22BA1BC6005B59EB /* Montserrat-Medium_0.ttf */; };
14+
177B5B7222BA1BC6005B59EB /* Montserrat-Regular_0.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 177B5B6C22BA1BC6005B59EB /* Montserrat-Regular_0.ttf */; };
15+
177B5B7322BA1BC6005B59EB /* Montserrat-Regular_0.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 177B5B6C22BA1BC6005B59EB /* Montserrat-Regular_0.ttf */; };
16+
177B5B7422BA1BC6005B59EB /* Montserrat-SemiBold_0.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 177B5B6D22BA1BC6005B59EB /* Montserrat-SemiBold_0.ttf */; };
17+
177B5B7522BA1BC6005B59EB /* Montserrat-SemiBold_0.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 177B5B6D22BA1BC6005B59EB /* Montserrat-SemiBold_0.ttf */; };
1018
CEA25522220D8BB500420609 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CEA25520220D8BB500420609 /* LaunchScreen.storyboard */; };
1119
CECEA1D821B6767100F15B7A /* BubbleTabBar.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CECEA1D121B6767100F15B7A /* BubbleTabBar.framework */; };
1220
CECEA1D921B6767100F15B7A /* BubbleTabBar.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CECEA1D121B6767100F15B7A /* BubbleTabBar.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -46,6 +54,10 @@
4654
/* End PBXCopyFilesBuildPhase section */
4755

4856
/* Begin PBXFileReference section */
57+
177B5B6A22BA1BC6005B59EB /* Montserrat-Light_0.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Montserrat-Light_0.ttf"; sourceTree = "<group>"; };
58+
177B5B6B22BA1BC6005B59EB /* Montserrat-Medium_0.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Montserrat-Medium_0.ttf"; sourceTree = "<group>"; };
59+
177B5B6C22BA1BC6005B59EB /* Montserrat-Regular_0.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Montserrat-Regular_0.ttf"; sourceTree = "<group>"; };
60+
177B5B6D22BA1BC6005B59EB /* Montserrat-SemiBold_0.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Montserrat-SemiBold_0.ttf"; sourceTree = "<group>"; };
4961
CEA25521220D8BB500420609 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
5062
CECEA1A621B6758200F15B7A /* ExampleApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ExampleApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
5163
CECEA1D121B6767100F15B7A /* BubbleTabBar.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BubbleTabBar.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -86,6 +98,17 @@
8698
/* End PBXFrameworksBuildPhase section */
8799

88100
/* Begin PBXGroup section */
101+
177B5B6922BA1BC6005B59EB /* Font */ = {
102+
isa = PBXGroup;
103+
children = (
104+
177B5B6A22BA1BC6005B59EB /* Montserrat-Light_0.ttf */,
105+
177B5B6B22BA1BC6005B59EB /* Montserrat-Medium_0.ttf */,
106+
177B5B6C22BA1BC6005B59EB /* Montserrat-Regular_0.ttf */,
107+
177B5B6D22BA1BC6005B59EB /* Montserrat-SemiBold_0.ttf */,
108+
);
109+
path = Font;
110+
sourceTree = "<group>";
111+
};
89112
CECEA19D21B6758200F15B7A = {
90113
isa = PBXGroup;
91114
children = (
@@ -125,6 +148,7 @@
125148
CECEA1E421B676D000F15B7A /* Images.xcassets */,
126149
CECEA1E521B676D000F15B7A /* AppDelegate.swift */,
127150
CECEA1E621B676D000F15B7A /* CBSampleViewController.swift */,
151+
177B5B6922BA1BC6005B59EB /* Font */,
128152
CECEA1E721B676D000F15B7A /* Info.plist */,
129153
);
130154
path = Example;
@@ -253,7 +277,11 @@
253277
buildActionMask = 2147483647;
254278
files = (
255279
CEA25522220D8BB500420609 /* LaunchScreen.storyboard in Resources */,
280+
177B5B7222BA1BC6005B59EB /* Montserrat-Regular_0.ttf in Resources */,
281+
177B5B6E22BA1BC6005B59EB /* Montserrat-Light_0.ttf in Resources */,
256282
CECEA1EB21B676D000F15B7A /* Images.xcassets in Resources */,
283+
177B5B7422BA1BC6005B59EB /* Montserrat-SemiBold_0.ttf in Resources */,
284+
177B5B7022BA1BC6005B59EB /* Montserrat-Medium_0.ttf in Resources */,
257285
CECEA1EA21B676D000F15B7A /* Main.storyboard in Resources */,
258286
);
259287
runOnlyForDeploymentPostprocessing = 0;
@@ -262,6 +290,10 @@
262290
isa = PBXResourcesBuildPhase;
263291
buildActionMask = 2147483647;
264292
files = (
293+
177B5B6F22BA1BC6005B59EB /* Montserrat-Light_0.ttf in Resources */,
294+
177B5B7322BA1BC6005B59EB /* Montserrat-Regular_0.ttf in Resources */,
295+
177B5B7122BA1BC6005B59EB /* Montserrat-Medium_0.ttf in Resources */,
296+
177B5B7522BA1BC6005B59EB /* Montserrat-SemiBold_0.ttf in Resources */,
265297
);
266298
runOnlyForDeploymentPostprocessing = 0;
267299
};

‎BubbleTabBar/Classes/CBTabBarButton.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public class CBTabBarButton: UIControl {
7575
private var tabLabel = UILabel()
7676
private var tabBg = UIView()
7777

78-
private let bgHeight: CGFloat = 42.0
78+
private let bgHeight: CGFloat = 35.0
7979
private var csFoldedBgTrailing: NSLayoutConstraint!
8080
private var csUnfoldedBgTrailing: NSLayoutConstraint!
8181
private var csFoldedLblLeading: NSLayoutConstraint!
@@ -94,7 +94,7 @@ public class CBTabBarButton: UIControl {
9494
tabImage.contentMode = .center
9595
tabImage.translatesAutoresizingMaskIntoConstraints = false
9696
tabLabel.translatesAutoresizingMaskIntoConstraints = false
97-
tabLabel.font = UIFont.systemFont(ofSize: 14)
97+
tabLabel.font = UIFont(name: "Montserrat-Regular", size: 14)
9898
tabLabel.adjustsFontSizeToFitWidth = true
9999
tabBg.translatesAutoresizingMaskIntoConstraints = false
100100
tabBg.isUserInteractionEnabled = false
@@ -156,7 +156,7 @@ public class CBTabBarButton: UIControl {
156156
foldedConstraints.forEach{ $0.isActive = false }
157157
unfoldedConstraints.forEach{ $0.isActive = true }
158158
UIView.animate(withDuration: duration) {
159-
self.tabBg.alpha = 3.0
159+
self.tabBg.alpha = 0.5
160160
}
161161
UIView.animate(withDuration: duration * 0.5, delay: duration * 0.5, options: [], animations: {
162162
self.tabLabel.alpha = 1.0

‎BubbleTabBar/Info.plist

+7
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,12 @@
1818
<string>0.8.3</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
21+
<key>UIAppFonts</key>
22+
<array>
23+
<string>Montserrat-Light_0.ttf</string>
24+
<string>Montserrat-Medium_0.ttf</string>
25+
<string>Montserrat-Regular_0.ttf</string>
26+
<string>Montserrat-SemiBold_0.ttf</string>
27+
</array>
2128
</dict>
2229
</plist>

‎Example/Base.lproj/Main.storyboard

+1-2
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
<tabBarItem key="tabBarItem" title="Home" image="dashboard" id="iCE-iW-6kd" customClass="CBTabBarItem" customModule="BubbleTabBar">
193193
<userDefinedRuntimeAttributes>
194194
<userDefinedRuntimeAttribute type="color" keyPath="tintColor">
195-
<color key="value" red="0.95686274509803915" green="0.6705882352941176" blue="0.16078431372549018" alpha="1" colorSpace="calibratedRGB"/>
195+
<color key="value" red="0.94509803920000002" green="0.56862745100000001" blue="0.074509803920000006" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
196196
</userDefinedRuntimeAttribute>
197197
</userDefinedRuntimeAttributes>
198198
</tabBarItem>
@@ -214,7 +214,6 @@
214214
<segue destination="xc7-l3-AKN" kind="relationship" relationship="viewControllers" id="a7o-gd-ucI"/>
215215
<segue destination="4jQ-3N-hYV" kind="relationship" relationship="viewControllers" id="jAf-pI-wHl"/>
216216
<segue destination="XNe-Rz-peb" kind="relationship" relationship="viewControllers" id="lVU-sr-ZdK"/>
217-
<segue destination="eli-5Z-mNT" kind="relationship" relationship="viewControllers" id="iOr-iT-WNz"/>
218217
</connections>
219218
</tabBarController>
220219
<placeholder placeholderIdentifier="IBFirstResponder" id="hyL-w9-sPX" userLabel="First Responder" sceneMemberID="firstResponder"/>

‎Example/Font/Montserrat-Light_0.ttf

188 KB
Binary file not shown.

‎Example/Font/Montserrat-Medium_0.ttf

188 KB
Binary file not shown.

‎Example/Font/Montserrat-Regular_0.ttf

186 KB
Binary file not shown.

‎Example/Font/Montserrat-SemiBold_0.ttf

188 KB
Binary file not shown.

‎Example/Info.plist

+7
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,12 @@
3737
<string>UIInterfaceOrientationPortrait</string>
3838
<string>UIInterfaceOrientationLandscapeLeft</string>
3939
</array>
40+
<key>UIAppFonts</key>
41+
<array>
42+
<string>Montserrat-Light_0.ttf</string>
43+
<string>Montserrat-Medium_0.ttf</string>
44+
<string>Montserrat-Regular_0.ttf</string>
45+
<string>Montserrat-SemiBold_0.ttf</string>
46+
</array>
4047
</dict>
4148
</plist>

0 commit comments

Comments
 (0)