Skip to content

Commit

Permalink
Merge branch 'release/0.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Kofktu committed Apr 29, 2020
2 parents f77b8c7 + f2a30cc commit c97f755
Show file tree
Hide file tree
Showing 20 changed files with 432 additions and 329 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,6 @@ fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots/**/*.png
fastlane/test_output

.DS_Store

2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2
5.0
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
os: osx
osx_image: xcode10
osx_image: xcode11
sudo: false
language: objective-c

env:
- SDK="iphoneos12.0"
- SDK="iphoneos13.0"

before_install:
- set -o pipefail
Expand All @@ -13,7 +13,8 @@ script:
- xcodebuild clean build test
-workspace Example/Example.xcworkspace
-scheme Example
-destination 'platform=iOS Simulator,name=iPhone 11,OS=13.0'
-sdk $SDK
-configuration Debug
-enableCodeCoverage YES
CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty -c
CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO | xcpretty -c
23 changes: 11 additions & 12 deletions Example/Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 51;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -172,9 +172,11 @@
TargetAttributes = {
CECD618021BA657800A60C31 = {
CreatedOnToolsVersion = 10.1;
LastSwiftMigration = 1140;
};
CECD619421BA657A00A60C31 = {
CreatedOnToolsVersion = 10.1;
LastSwiftMigration = 1140;
TestTargetID = CECD618021BA657800A60C31;
};
};
Expand Down Expand Up @@ -225,16 +227,11 @@
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/PIPKit/PIPKit.framework",
"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
);
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PIPKit.framework",
"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down Expand Up @@ -371,6 +368,7 @@
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand Down Expand Up @@ -425,6 +423,7 @@
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 5.0;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand All @@ -445,7 +444,7 @@
PRODUCT_BUNDLE_IDENTIFIER = kr.homefactory.clios.v3.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -466,7 +465,7 @@
PRODUCT_BUNDLE_IDENTIFIER = kr.homefactory.clios.v3.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand All @@ -487,7 +486,7 @@
PRODUCT_BUNDLE_IDENTIFIER = kr.homefactory.clios.v3.ExampleTests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example";
};
Expand All @@ -509,7 +508,7 @@
PRODUCT_BUNDLE_IDENTIFIER = kr.homefactory.clios.v3.ExampleTests;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Example.app/Example";
};
Expand Down
20 changes: 20 additions & 0 deletions Example/Example/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,10 @@ class PIPXibViewController: UIViewController, PIPUsable {

var initialState: PIPState { return .full }
var initialPosition: PIPPosition { return .topRight }
var pipEdgeInsets: UIEdgeInsets { return UIEdgeInsets(top: 30, left: 20, bottom: 30, right: 20) }
var pipSize: CGSize = CGSize(width: 100.0, height: 100.0)
var pipShadow: PIPShadow? = nil
var pipCorner: PIPCorner? = nil

class func viewController() -> PIPXibViewController {
let storyboard = UIStoryboard(name: "Main", bundle: nil)
Expand All @@ -121,6 +124,23 @@ class PIPXibViewController: UIViewController, PIPUsable {
}
}

func didChangePosition(_ position: PIPPosition) {
switch position {
case .topLeft:
print("PIPXibViewController.topLeft")
case .middleLeft:
print("PIPXibViewController.middleLeft")
case .bottomLeft:
print("PIPXibViewController.bottomLeft")
case .topRight:
print("PIPXibViewController.topRight")
case .middleRight:
print("PIPXibViewController.middleRight")
case .bottomRight:
print("PIPXibViewController.bottomRight")
}
}

// MARK: - Action
@IBAction private func onFullAndPIP(_ sender: UIButton) {
if PIPKit.isPIP {
Expand Down
6 changes: 3 additions & 3 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- PIPKit (0.0.1)
- PIPKit (0.1.0)

DEPENDENCIES:
- PIPKit (from `../`)
Expand All @@ -9,8 +9,8 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
PIPKit: bced201c6b907bbc825d02b319f463a040ed6991
PIPKit: dadaf2e0bde84dd33fe80e60574f34c8d96ce331

PODFILE CHECKSUM: c08b7c7c692e22463a8585bf1d49708f9b5678bc

COCOAPODS: 1.6.0.beta.2
COCOAPODS: 1.7.5
11 changes: 6 additions & 5 deletions Example/Pods/Local Podspecs/PIPKit.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Example/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c97f755

Please sign in to comment.