Skip to content

Commit

Permalink
Bug fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
TBXark committed Feb 1, 2017
1 parent 3a34e31 commit 9de7ea8
Show file tree
Hide file tree
Showing 5 changed files with 155 additions and 99 deletions.
74 changes: 56 additions & 18 deletions TKRubberIndicator.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,43 @@
objects = {

/* Begin PBXBuildFile section */
6A3D16FA1BE9B0CA0018C0C4 /* TKRubberPageControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A3D16F91BE9B0CA0018C0C4 /* TKRubberPageControl.swift */; };
6A42F80D1BE06B5100251FFA /* rubberindicator.gif in Resources */ = {isa = PBXBuildFile; fileRef = 6A42F80C1BE06B5100251FFA /* rubberindicator.gif */; };
6A555ECA1BDE277B00FC36E6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A555EC91BDE277B00FC36E6 /* AppDelegate.swift */; };
6A555ECC1BDE277B00FC36E6 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A555ECB1BDE277B00FC36E6 /* ViewController.swift */; };
6A555ECF1BDE277B00FC36E6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6A555ECD1BDE277B00FC36E6 /* Main.storyboard */; };
6A555ED11BDE277B00FC36E6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6A555ED01BDE277B00FC36E6 /* Assets.xcassets */; };
6A555ED41BDE277B00FC36E6 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6A555ED21BDE277B00FC36E6 /* LaunchScreen.storyboard */; };
6A9103F91D539B380009451B /* TKRubberPageControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 6A9103F81D539B380009451B /* TKRubberPageControl.h */; settings = {ATTRIBUTES = (Public, ); }; };
6A9103FE1D539B470009451B /* TKRubberPageControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A3D16F91BE9B0CA0018C0C4 /* TKRubberPageControl.swift */; };
6AFF4D631E41DD5500CD6B9E /* TKRubberPageControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6AFF4D621E41DD5500CD6B9E /* TKRubberPageControl.swift */; };
6AFF4D641E41DD5D00CD6B9E /* TKRubberPageControl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6A9103F61D539B370009451B /* TKRubberPageControl.framework */; };
6AFF4D651E41DD5D00CD6B9E /* TKRubberPageControl.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 6A9103F61D539B370009451B /* TKRubberPageControl.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
6AFF4D661E41DD5D00CD6B9E /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 6A555EBE1BDE277B00FC36E6 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 6A9103F51D539B370009451B;
remoteInfo = TKRubberPageControl;
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
6AFF4D681E41DD5D00CD6B9E /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
6AFF4D651E41DD5D00CD6B9E /* TKRubberPageControl.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
6A3D16F91BE9B0CA0018C0C4 /* TKRubberPageControl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TKRubberPageControl.swift; sourceTree = "<group>"; };
6A42F80C1BE06B5100251FFA /* rubberindicator.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = rubberindicator.gif; sourceTree = "<group>"; };
6A555EC61BDE277B00FC36E6 /* TKRubberIndicator.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TKRubberIndicator.app; sourceTree = BUILT_PRODUCTS_DIR; };
6A555EC91BDE277B00FC36E6 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -31,13 +55,15 @@
6A9103F61D539B370009451B /* TKRubberPageControl.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TKRubberPageControl.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6A9103F81D539B380009451B /* TKRubberPageControl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TKRubberPageControl.h; sourceTree = "<group>"; };
6A9103FA1D539B380009451B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
6AFF4D621E41DD5500CD6B9E /* TKRubberPageControl.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TKRubberPageControl.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
6A555EC31BDE277B00FC36E6 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
6AFF4D641E41DD5D00CD6B9E /* TKRubberPageControl.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -51,18 +77,9 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
6A3D16F81BE9B0CA0018C0C4 /* Classes */ = {
isa = PBXGroup;
children = (
6A3D16F91BE9B0CA0018C0C4 /* TKRubberPageControl.swift */,
);
path = Classes;
sourceTree = "<group>";
};
6A555EBD1BDE277B00FC36E6 = {
isa = PBXGroup;
children = (
6A3D16F81BE9B0CA0018C0C4 /* Classes */,
6A555EC81BDE277B00FC36E6 /* TKRubberIndicator */,
6A9103F71D539B380009451B /* TKRubberPageControl */,
6A555EC71BDE277B00FC36E6 /* Products */,
Expand Down Expand Up @@ -95,6 +112,7 @@
6A9103F71D539B380009451B /* TKRubberPageControl */ = {
isa = PBXGroup;
children = (
6AFF4D621E41DD5500CD6B9E /* TKRubberPageControl.swift */,
6A9103F81D539B380009451B /* TKRubberPageControl.h */,
6A9103FA1D539B380009451B /* Info.plist */,
);
Expand Down Expand Up @@ -122,10 +140,12 @@
6A555EC21BDE277B00FC36E6 /* Sources */,
6A555EC31BDE277B00FC36E6 /* Frameworks */,
6A555EC41BDE277B00FC36E6 /* Resources */,
6AFF4D681E41DD5D00CD6B9E /* Embed Frameworks */,
);
buildRules = (
);
dependencies = (
6AFF4D671E41DD5D00CD6B9E /* PBXTargetDependency */,
);
name = TKRubberIndicator;
productName = TKRubberIndicator;
Expand Down Expand Up @@ -168,6 +188,8 @@
};
6A9103F51D539B370009451B = {
CreatedOnToolsVersion = 7.3.1;
DevelopmentTeam = 858CBVXSWP;
LastSwiftMigration = 0820;
};
};
};
Expand Down Expand Up @@ -217,7 +239,6 @@
buildActionMask = 2147483647;
files = (
6A555ECC1BDE277B00FC36E6 /* ViewController.swift in Sources */,
6A3D16FA1BE9B0CA0018C0C4 /* TKRubberPageControl.swift in Sources */,
6A555ECA1BDE277B00FC36E6 /* AppDelegate.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -226,12 +247,20 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
6A9103FE1D539B470009451B /* TKRubberPageControl.swift in Sources */,
6AFF4D631E41DD5500CD6B9E /* TKRubberPageControl.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
6AFF4D671E41DD5D00CD6B9E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 6A9103F51D539B370009451B /* TKRubberPageControl */;
targetProxy = 6AFF4D661E41DD5D00CD6B9E /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
6A555ECD1BDE277B00FC36E6 /* Main.storyboard */ = {
isa = PBXVariantGroup;
Expand Down Expand Up @@ -336,6 +365,7 @@
6A555ED91BDE277B00FC36E6 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = 858CBVXSWP;
INFOPLIST_FILE = TKRubberIndicator/Info.plist;
Expand All @@ -349,6 +379,7 @@
6A555EDA1BDE277B00FC36E6 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = 858CBVXSWP;
INFOPLIST_FILE = TKRubberIndicator/Info.plist;
Expand All @@ -363,18 +394,22 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 858CBVXSWP;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = TKRubberPageControl/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = TBXark.TKRubberPageControl;
PRODUCT_BUNDLE_IDENTIFIER = com.TBXark.TKRubberPageControl;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand All @@ -385,18 +420,21 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 858CBVXSWP;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = TKRubberPageControl/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = TBXark.TKRubberPageControl;
PRODUCT_BUNDLE_IDENTIFIER = com.TBXark.TKRubberPageControl;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand Down
Binary file modified ...codeproj/project.xcworkspace/xcuserdata/Tbxark.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
18 changes: 11 additions & 7 deletions TKRubberIndicator/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
Expand All @@ -15,25 +19,25 @@
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="Oor-7f-g0b">
<rect key="frame" x="20" y="552" width="560" height="29"/>
<rect key="frame" x="16" y="619" width="343" height="29"/>
<segments>
<segment title="3"/>
<segment title="4"/>
<segment title="5"/>
<segment title="6"/>
<segment title="7"/>
</segments>
<color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="tintColor" white="0.5" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<connections>
<action selector="pageCountChange:" destination="BYZ-38-t0r" eventType="valueChanged" id="qTH-c3-GRc"/>
</connections>
</segmentedControl>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="Oor-7f-g0b" secondAttribute="bottom" constant="20" symbolic="YES" id="D7F-mj-Ree"/>
<constraint firstItem="Oor-7f-g0b" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" id="SaC-Qf-2op"/>
Expand Down
7 changes: 4 additions & 3 deletions TKRubberIndicator/ViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//

import UIKit
import TKRubberPageControl

class ViewController: UIViewController {

Expand All @@ -16,13 +17,13 @@ class ViewController: UIViewController {
super.viewDidLoad()


self.view.backgroundColor = UIColor(red:0.553, green:0.376, blue:0.549, alpha:1)
page.center = self.view.center
view.backgroundColor = UIColor.white
page.center = view.center
page.valueChange = {(num) -> Void in
print("Closure : Page is \(num)")
}
page.addTarget(self, action: #selector(ViewController.targetActionValueChange(_:)), for: UIControlEvents.valueChanged)
self.view.addSubview(page)
view.addSubview(page)


page.numberOfpage = 3
Expand Down
Loading

0 comments on commit 9de7ea8

Please sign in to comment.