Skip to content

Commit

Permalink
Merge pull request #10 from twof/fix/ios103
Browse files Browse the repository at this point in the history
Constraints and background fixed for 10.3
  • Loading branch information
twof authored Jan 27, 2019
2 parents f660215 + 969598c commit 57a75dd
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 4 deletions.
4 changes: 3 additions & 1 deletion SimplePagedViewFramework.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -446,9 +446,10 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = P2PP2EM79F;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
Expand Down Expand Up @@ -476,6 +477,7 @@
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = P2PP2EM79F;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,27 @@
objects = {

/* Begin PBXBuildFile section */
24E7CF0321FD0407009E6E79 /* SimplePagedViewFramework.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B2C689AF21C99CC0000031AB /* SimplePagedViewFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
B2C6899721C99938000031AB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2C6899621C99938000031AB /* AppDelegate.swift */; };
B2C6899921C99938000031AB /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2C6899821C99938000031AB /* ViewController.swift */; };
B2C6899E21C9993A000031AB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B2C6899D21C9993A000031AB /* Assets.xcassets */; };
B2C689A121C9993B000031AB /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B2C6899F21C9993B000031AB /* LaunchScreen.storyboard */; };
B2C689B021C99CC0000031AB /* SimplePagedViewFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B2C689AF21C99CC0000031AB /* SimplePagedViewFramework.framework */; };
B2C689B021C99CC0000031AB /* SimplePagedViewFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B2C689AF21C99CC0000031AB /* SimplePagedViewFramework.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
24E7CF0221FD03ED009E6E79 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
24E7CF0321FD0407009E6E79 /* SimplePagedViewFramework.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
B2C6899321C99938000031AB /* SimplePagedViewExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SimplePagedViewExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
B2C6899621C99938000031AB /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -83,6 +97,7 @@
B2C6898F21C99938000031AB /* Sources */,
B2C6899021C99938000031AB /* Frameworks */,
B2C6899121C99938000031AB /* Resources */,
24E7CF0221FD03ED009E6E79 /* CopyFiles */,
);
buildRules = (
);
Expand Down Expand Up @@ -213,7 +228,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -268,7 +283,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
Expand All @@ -283,7 +298,9 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = P2PP2EM79F;
INFOPLIST_FILE = SimplePagedViewExample/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -300,7 +317,9 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = P2PP2EM79F;
INFOPLIST_FILE = SimplePagedViewExample/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
3 changes: 3 additions & 0 deletions SimplePagedViewFramework/Source/Views/PageDotsView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ private extension PageDotsView {

if let previousDot = previousDot {
constraints.append(dot.leadingAnchor.constraint(equalTo: previousDot.trailingAnchor, constant: dotSize))
} else {
constraints.append(dot.leadingAnchor.constraint(equalTo: dotContainer.leadingAnchor))
}

previousDot = dot
Expand All @@ -174,6 +176,7 @@ private extension PageDotsView {
let frame = CGRect(x: 0, y: 0, width: dotSize, height: dotSize)
let color = index == self.currentDot ? currentDotColor : dotColor
let dot: DotView = DotView(frame: frame, mainColor: color)
dot.backgroundColor = .clear

dot.accessibilityIdentifier = "DotAt\(index)"

Expand Down

0 comments on commit 57a75dd

Please sign in to comment.