Skip to content

Commit

Permalink
Merge pull request #349 from SaurabhJamadagni/337-using-library
Browse files Browse the repository at this point in the history
Swiping between tabs using SwipeableTabBarController
  • Loading branch information
andrewtavis committed Aug 11, 2023
2 parents cd89548 + db6d9cc commit b9f70d7
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
17 changes: 17 additions & 0 deletions Scribe.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
140158A42A4F06CA00D14E52 /* CustomChildTableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 140158A32A4F06CA00D14E52 /* CustomChildTableView.swift */; };
1406B7872A2DFCDD001DF45B /* AboutTableData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1406B7862A2DFCDD001DF45B /* AboutTableData.swift */; };
1406B78C2A3209CF001DF45B /* AppExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1406B78B2A3209CF001DF45B /* AppExtensions.swift */; };
146B70BD2A853A3800710BD4 /* SwipeableTabBarController in Frameworks */ = {isa = PBXBuildFile; productRef = 146B70BC2A853A3800710BD4 /* SwipeableTabBarController */; };
147797AC2A2CD2F70044A53E /* ParentTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 147797AA2A2CD2F70044A53E /* ParentTableViewCell.swift */; };
147797AD2A2CD2F70044A53E /* ParentTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 147797AB2A2CD2F70044A53E /* ParentTableViewCell.xib */; };
147797B02A2CD3370044A53E /* InfoChildTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 147797AE2A2CD3370044A53E /* InfoChildTableViewCell.swift */; };
Expand Down Expand Up @@ -968,6 +969,7 @@
buildActionMask = 2147483647;
files = (
D16DD37029E7850600FB9022 /* SwiftyJSON in Frameworks */,
146B70BD2A853A3800710BD4 /* SwipeableTabBarController in Frameworks */,
D16DD37329E7853800FB9022 /* GRDB in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -1493,6 +1495,7 @@
packageProductDependencies = (
D16DD36F29E7850600FB9022 /* SwiftyJSON */,
D16DD37229E7853800FB9022 /* GRDB */,
146B70BC2A853A3800710BD4 /* SwipeableTabBarController */,
);
productName = EmojiKeyboard;
productReference = 38BD213022D5907E00C6795D /* Scribe.app */;
Expand Down Expand Up @@ -1779,6 +1782,7 @@
packageReferences = (
D16DD36E29E7850600FB9022 /* XCRemoteSwiftPackageReference "SwiftyJSON" */,
D16DD37129E7853800FB9022 /* XCRemoteSwiftPackageReference "GRDB.swift" */,
146B70BB2A853A3800710BD4 /* XCRemoteSwiftPackageReference "SwipeableTabBarController" */,
);
productRefGroup = 38BD213122D5907E00C6795D /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -3621,6 +3625,14 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
146B70BB2A853A3800710BD4 /* XCRemoteSwiftPackageReference "SwipeableTabBarController" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/marcosgriselli/SwipeableTabBarController.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 3.0.0;
};
};
D16DD36E29E7850600FB9022 /* XCRemoteSwiftPackageReference "SwiftyJSON" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/SwiftyJSON/SwiftyJSON";
Expand All @@ -3640,6 +3652,11 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
146B70BC2A853A3800710BD4 /* SwipeableTabBarController */ = {
isa = XCSwiftPackageProductDependency;
package = 146B70BB2A853A3800710BD4 /* XCRemoteSwiftPackageReference "SwipeableTabBarController" */;
productName = SwipeableTabBarController;
};
D16DD36F29E7850600FB9022 /* SwiftyJSON */ = {
isa = XCSwiftPackageProductDependency;
package = D16DD36E29E7850600FB9022 /* XCRemoteSwiftPackageReference "SwiftyJSON" */;
Expand Down
4 changes: 2 additions & 2 deletions Scribe/Base.lproj/AppScreen.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,10 @@
</objects>
<point key="canvasLocation" x="25" y="-100"/>
</scene>
<!--Tab Bar Controller-->
<!--Swipeable Tab Bar Controller-->
<scene sceneID="sLs-HO-3by">
<objects>
<tabBarController id="z4h-ME-igh" sceneMemberID="viewController">
<tabBarController id="z4h-ME-igh" customClass="SwipeableTabBarController" customModule="SwipeableTabBarController" sceneMemberID="viewController">
<tabBar key="tabBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" itemPositioning="fill" id="pcg-48-jfk">
<rect key="frame" x="0.0" y="0.0" width="393" height="49"/>
<autoresizingMask key="autoresizingMask"/>
Expand Down

0 comments on commit b9f70d7

Please sign in to comment.