Skip to content

Commit 3a597b1

Browse files
msapsmsaps
committed
Clean up Example
1 parent 823fac9 commit 3a597b1

File tree

4 files changed

+15
-18
lines changed

4 files changed

+15
-18
lines changed

‎Sources/Examples.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88

99
/* Begin PBXBuildFile section */
1010
46B487622529C556007CCFF2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46B487612529C556007CCFF2 /* AppDelegate.swift */; };
11-
46B487662529C556007CCFF2 /* TabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46B487652529C556007CCFF2 /* TabViewController.swift */; };
11+
46B487662529C556007CCFF2 /* ButtonBarExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46B487652529C556007CCFF2 /* ButtonBarExampleViewController.swift */; };
1212
46B4876B2529C557007CCFF2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 46B4876A2529C557007CCFF2 /* Assets.xcassets */; };
1313
46B4876E2529C557007CCFF2 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 46B4876C2529C557007CCFF2 /* LaunchScreen.storyboard */; };
1414
46B487762529C590007CCFF2 /* Tabman.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 46B487752529C590007CCFF2 /* Tabman.framework */; };
1515
46B487772529C590007CCFF2 /* Tabman.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 46B487752529C590007CCFF2 /* Tabman.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1616
46B4877B2529C6FE007CCFF2 /* ChildViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46B4877A2529C6FE007CCFF2 /* ChildViewController.swift */; };
1717
46B4877F2529C9DB007CCFF2 /* GradientBackgroundViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46B4877E2529C9DB007CCFF2 /* GradientBackgroundViewController.swift */; };
1818
46B487832529CBE6007CCFF2 /* UIColor+Tabman.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46B487822529CBE6007CCFF2 /* UIColor+Tabman.swift */; };
19-
840F58D126867B09008FE109 /* BarButtonViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840F58D026867B09008FE109 /* BarButtonViewController.swift */; };
19+
840F58D126867B09008FE109 /* TabItemBarExampleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 840F58D026867B09008FE109 /* TabItemBarExampleViewController.swift */; };
2020
/* End PBXBuildFile section */
2121

2222
/* Begin PBXCopyFilesBuildPhase section */
@@ -37,15 +37,15 @@
3737
46B4874A2529C49C007CCFF2 /* Tabman.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Tabman.xcconfig; path = ../Tabman.xcconfig; sourceTree = "<group>"; };
3838
46B4875F2529C556007CCFF2 /* Example iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Example iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
3939
46B487612529C556007CCFF2 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
40-
46B487652529C556007CCFF2 /* TabViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabViewController.swift; sourceTree = "<group>"; };
40+
46B487652529C556007CCFF2 /* ButtonBarExampleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonBarExampleViewController.swift; sourceTree = "<group>"; };
4141
46B4876A2529C557007CCFF2 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4242
46B4876D2529C557007CCFF2 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4343
46B4876F2529C557007CCFF2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
4444
46B487752529C590007CCFF2 /* Tabman.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Tabman.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4545
46B4877A2529C6FE007CCFF2 /* ChildViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChildViewController.swift; sourceTree = "<group>"; };
4646
46B4877E2529C9DB007CCFF2 /* GradientBackgroundViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GradientBackgroundViewController.swift; sourceTree = "<group>"; };
4747
46B487822529CBE6007CCFF2 /* UIColor+Tabman.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Tabman.swift"; sourceTree = "<group>"; };
48-
840F58D026867B09008FE109 /* BarButtonViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BarButtonViewController.swift; sourceTree = "<group>"; };
48+
840F58D026867B09008FE109 /* TabItemBarExampleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabItemBarExampleViewController.swift; sourceTree = "<group>"; };
4949
/* End PBXFileReference section */
5050

5151
/* Begin PBXFrameworksBuildPhase section */
@@ -90,8 +90,8 @@
9090
isa = PBXGroup;
9191
children = (
9292
46B487612529C556007CCFF2 /* AppDelegate.swift */,
93-
46B487652529C556007CCFF2 /* TabViewController.swift */,
94-
840F58D026867B09008FE109 /* BarButtonViewController.swift */,
93+
46B487652529C556007CCFF2 /* ButtonBarExampleViewController.swift */,
94+
840F58D026867B09008FE109 /* TabItemBarExampleViewController.swift */,
9595
46B4877A2529C6FE007CCFF2 /* ChildViewController.swift */,
9696
46B4877D2529C9CD007CCFF2 /* Extras */,
9797
46B487792529C5C1007CCFF2 /* Resources */,
@@ -197,10 +197,10 @@
197197
buildActionMask = 2147483647;
198198
files = (
199199
46B4877F2529C9DB007CCFF2 /* GradientBackgroundViewController.swift in Sources */,
200-
46B487662529C556007CCFF2 /* TabViewController.swift in Sources */,
200+
46B487662529C556007CCFF2 /* ButtonBarExampleViewController.swift in Sources */,
201201
46B487832529CBE6007CCFF2 /* UIColor+Tabman.swift in Sources */,
202202
46B487622529C556007CCFF2 /* AppDelegate.swift in Sources */,
203-
840F58D126867B09008FE109 /* BarButtonViewController.swift in Sources */,
203+
840F58D126867B09008FE109 /* TabItemBarExampleViewController.swift in Sources */,
204204
46B4877B2529C6FE007CCFF2 /* ChildViewController.swift in Sources */,
205205
);
206206
runOnlyForDeploymentPostprocessing = 0;

‎Sources/iOS/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1717
let gradientColors: [UIColor] = [.tabmanPrimary, .tabmanSecondary]
1818

1919
window = UIWindow(frame: UIScreen.main.bounds)
20-
window?.rootViewController = GradientBackgroundViewController(embedding: BarButtonViewController(), colors: gradientColors)
20+
window?.rootViewController = GradientBackgroundViewController(embedding: ButtonBarExampleViewController(), colors: gradientColors)
2121
window?.makeKeyAndVisible()
2222

2323
return true

Sources/iOS/TabViewController.swift renamed to Sources/iOS/ButtonBarExampleViewController.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// TabViewController.swift
2+
// ButtonBarExampleViewController.swift
33
// Example
44
//
55
// Created by Merrick Sapsford on 04/10/2020.
@@ -9,7 +9,7 @@ import UIKit
99
import Tabman
1010
import Pageboy
1111

12-
class TabViewController: TabmanViewController, PageboyViewControllerDataSource, TMBarDataSource {
12+
class ButtonBarExampleViewController: TabmanViewController, PageboyViewControllerDataSource, TMBarDataSource {
1313

1414
// MARK: Properties
1515

Sources/iOS/BarButtonViewController.swift renamed to Sources/iOS/TabItemBarExampleViewController.swift

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// BarButtonViewController.swift
2+
// TabItemBarExampleViewController.swift
33
// Example iOS
44
//
55
// Created by Divyesh Makwana on 6/25/21.
@@ -9,7 +9,7 @@ import UIKit
99
import Tabman
1010
import Pageboy
1111

12-
class BarButtonViewController: TabmanViewController, PageboyViewControllerDataSource, TMBarDataSource {
12+
class TabItemBarExampleViewController: TabmanViewController, PageboyViewControllerDataSource, TMBarDataSource {
1313

1414
// MARK: Properties
1515

@@ -31,13 +31,10 @@ class BarButtonViewController: TabmanViewController, PageboyViewControllerDataSo
3131
dataSource = self
3232

3333
// Create a bar
34-
let bar = TMBarView<TMConstrainedHorizontalBarLayout, TMTabItemBarButton, TMLineBarIndicator>()
34+
let bar = TMBarView<TMConstrainedHorizontalBarLayout, TMTabItemBarButton, TMBarIndicator.None>()
3535

3636
// Customize bar properties including layout and other styling.
37-
bar.layout.contentInset = UIEdgeInsets(top: 0.0, left: 16.0, bottom: 4.0, right: 16.0)
38-
bar.indicator.weight = .light
39-
bar.indicator.cornerStyle = .eliptical
40-
bar.fadesContentEdges = true
37+
bar.layout.contentInset = UIEdgeInsets(top: 0.0, left: 8.0, bottom: 4.0, right: 8.0)
4138
bar.spacing = 16.0
4239

4340
// Set tint colors for the bar buttons and indicator.

0 commit comments

Comments
 (0)