From b1fa9fdd90b4c418f10220c099f2dff144b0faff Mon Sep 17 00:00:00 2001 From: Berdikhan Date: Tue, 8 Jan 2019 16:35:07 +0800 Subject: [PATCH] v0.2.0 --- .../FPageControl/Base.lproj/Main.storyboard | 2 +- Example/Pods/Pods.xcodeproj/project.pbxproj | 2 +- .../FPageControl/Info.plist | 40 +++++++++---------- FPageControl.podspec | 2 +- FPageControl/FPageControl.m | 6 +-- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Example/FPageControl/Base.lproj/Main.storyboard b/Example/FPageControl/Base.lproj/Main.storyboard index 4f2372d..04b6a26 100644 --- a/Example/FPageControl/Base.lproj/Main.storyboard +++ b/Example/FPageControl/Base.lproj/Main.storyboard @@ -22,7 +22,7 @@ - + diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index c7fb23c..ac4c984 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -38,7 +38,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 0A02543CE96DF400899B277D2D55158F /* FPageControl.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; path = FPageControl.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 0A02543CE96DF400899B277D2D55158F /* FPageControl.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; path = FPageControl.podspec; sourceTree = ""; }; 19B54D1ED3BDFA8F0AF35846A692F10D /* Pods-FPageControl_Example-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-FPageControl_Example-umbrella.h"; sourceTree = ""; }; 1A296049CF6832FEE24F1B076D3EB70D /* Pods-FPageControl_Example-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-FPageControl_Example-acknowledgements.plist"; sourceTree = ""; }; 1C31636521E48C4A001736E0 /* FPageControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FPageControl.h; path = FPageControl/FPageControl.h; sourceTree = ""; }; diff --git a/Example/Pods/Target Support Files/FPageControl/Info.plist b/Example/Pods/Target Support Files/FPageControl/Info.plist index 161a9d3..d0e2985 100644 --- a/Example/Pods/Target Support Files/FPageControl/Info.plist +++ b/Example/Pods/Target Support Files/FPageControl/Info.plist @@ -2,25 +2,25 @@ - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - ${PRODUCT_BUNDLE_IDENTIFIER} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 0.1.0 - CFBundleSignature - ???? - CFBundleVersion - ${CURRENT_PROJECT_VERSION} - NSPrincipalClass - + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + ${PRODUCT_BUNDLE_IDENTIFIER} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + 0.2.0 + CFBundleSignature + ???? + CFBundleVersion + ${CURRENT_PROJECT_VERSION} + NSPrincipalClass + diff --git a/FPageControl.podspec b/FPageControl.podspec index eeec0b6..8be51b8 100644 --- a/FPageControl.podspec +++ b/FPageControl.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FPageControl' - s.version = '0.1.0' + s.version = '0.2.0' s.summary = 'Custom Page Control for Fave' s.description = <<-DESC diff --git a/FPageControl/FPageControl.m b/FPageControl/FPageControl.m index 393197a..06fb0cd 100644 --- a/FPageControl/FPageControl.m +++ b/FPageControl/FPageControl.m @@ -48,7 +48,7 @@ -(void)prepareForInterfaceBuilder { -(void)layoutSubviews { [super layoutSubviews]; NSInteger i = 0; - CGFloat width = self.dotSize * (CGFloat)(self.subviews.count + 1) + self.dotSpacing * (CGFloat)(self.subviews.count - 1); + CGFloat width = self.dotSize * (CGFloat)(self.subviews.count + 2) + self.dotSpacing * (CGFloat)(self.subviews.count - 1); CGFloat x = self.frame.size.width / 2 - (width / 2); CGFloat y = self.frame.size.height / 2 - self.dotSize / 2; for (UIView *view in self.subviews) { @@ -56,8 +56,8 @@ -(void)layoutSubviews { frame.origin.x = x; frame.origin.y = y; if (self.currentPage == i) { - frame.size = CGSizeMake(self.dotSize * 2, self.dotSize); - x += self.dotSize * 2 + self.dotSpacing; + frame.size = CGSizeMake(self.dotSize * 3, self.dotSize); + x += self.dotSize * 3 + self.dotSpacing; } else { frame.size = CGSizeMake(self.dotSize, self.dotSize); x += self.dotSize + self.dotSpacing;