Skip to content

Commit

Permalink
Bump to version 3.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
andreamazz committed Apr 20, 2018
1 parent 343ee92 commit 05e7125
Show file tree
Hide file tree
Showing 28 changed files with 804 additions and 595 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0
4.0
3 changes: 2 additions & 1 deletion BubbleTransition.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'BubbleTransition'
s.version = '2.0.2'
s.version = '3.0.0'
s.license = 'MIT'
s.summary = 'A custom modal transition that presents and dismiss a controller with a bubble effect'
s.description = <<-DESC
Expand All @@ -13,6 +13,7 @@ Pod::Spec.new do |s|
s.source = { :git => 'https://github.com/andreamazz/BubbleTransition.git', :tag => s.version }

s.ios.deployment_target = '8.0'
s.swift_version = '4.0'

s.source_files = 'Source/*.swift'

Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@
All notable changes to this project will be documented in this file.
`BubbleTransition` adheres to [Semantic Versioning](http://semver.org/).

- `3.0.x` Releases - [3.0.0](#300)
- `2.0.x` Releases - [2.0.0](#200) | [2.0.1](#201) | [2.0.2](#202)
- `1.0.x` Releases - [1.0.0](#100) | [1.0.1](#101) | [1.0.2](#102) | [1.0.3](#103)
- `0.2.x` Releases - [0.2](#02)

---

## [3.0.0](https://github.com/andreamazz/BubbleTransition/releases/tag/3.0.0)

- Swift version 4

## [2.0.2](https://github.com/andreamazz/BubbleTransition/releases/tag/2.0.2)

- Merged #36
Expand Down
67 changes: 15 additions & 52 deletions Demo/Demo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@
659891441B032E3B00BF6CD9 /* Frameworks */,
659891451B032E3B00BF6CD9 /* Resources */,
079A5B5CEE74AECAE0CEE9B9 /* [CP] Embed Pods Frameworks */,
20A4B72369E93833BBF9485A /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -186,8 +185,6 @@
659891581B032E3B00BF6CD9 /* Sources */,
659891591B032E3B00BF6CD9 /* Frameworks */,
6598915A1B032E3B00BF6CD9 /* Resources */,
9BAA9D8C813EB1D31863D6A9 /* [CP] Embed Pods Frameworks */,
D8CCB61E2F8773FA6EA780FC /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -268,58 +265,34 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-Demo/Pods-Demo-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/BubbleTransition/BubbleTransition.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BubbleTransition.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Demo/Pods-Demo-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
20A4B72369E93833BBF9485A /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Demo/Pods-Demo-resources.sh\"\n";
showEnvVarsInLog = 0;
};
75D0565A8F3388D487941891 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-Demo-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
9BAA9D8C813EB1D31863D6A9 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-DemoTests/Pods-DemoTests-frameworks.sh\"\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
A722F743BEDCF10D812B911A /* [CP] Check Pods Manifest.lock */ = {
Expand All @@ -328,28 +301,16 @@
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-DemoTests-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
D8CCB61E2F8773FA6EA780FC /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-DemoTests/Pods-DemoTests-resources.sh\"\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -447,6 +408,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand Down Expand Up @@ -486,6 +448,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.0;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand All @@ -503,7 +466,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "01dc3e20-08cf-47c5-b70a-8d645fc53db0";
PROVISIONING_PROFILE_SPECIFIER = Development;
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
};
name = Debug;
};
Expand All @@ -520,7 +483,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "01dc3e20-08cf-47c5-b70a-8d645fc53db0";
PROVISIONING_PROFILE_SPECIFIER = Development;
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 4.0;
};
name = Release;
};
Expand Down
8 changes: 8 additions & 0 deletions Demo/Demo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
2 changes: 1 addition & 1 deletion Demo/Demo/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ import UIKit

@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?
var window: UIWindow?
}

35 changes: 17 additions & 18 deletions Demo/Demo/ModalViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,21 @@
import UIKit

class ModalViewController: UIViewController {

@IBOutlet weak var closeButton: UIButton!

override func viewDidLoad() {
closeButton.transform = CGAffineTransform(rotationAngle: CGFloat(M_PI_4))
}

@IBAction func closeAction(_ sender: AnyObject) {
self.dismiss(animated: true, completion: nil)
}

override func viewWillAppear(_ animated: Bool) {
UIApplication.shared.setStatusBarStyle(.lightContent, animated: true)
}

override func viewWillDisappear(_ animated: Bool) {
UIApplication.shared.setStatusBarStyle(.default, animated: true)
}
@IBOutlet weak var closeButton: UIButton!

override func viewDidLoad() {
closeButton.transform = CGAffineTransform(rotationAngle: CGFloat.pi / 4)
}

@IBAction func closeAction(_ sender: AnyObject) {
self.dismiss(animated: true, completion: nil)
}

override func viewWillAppear(_ animated: Bool) {
UIApplication.shared.setStatusBarStyle(.lightContent, animated: true)
}

override func viewWillDisappear(_ animated: Bool) {
UIApplication.shared.setStatusBarStyle(.default, animated: true)
}
}
53 changes: 26 additions & 27 deletions Demo/Demo/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,31 @@ import UIKit
import BubbleTransition

class ViewController: UIViewController, UIViewControllerTransitioningDelegate {

@IBOutlet weak var transitionButton: UIButton!

let transition = BubbleTransition()

override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
let controller = segue.destination
controller.transitioningDelegate = self
controller.modalPresentationStyle = .custom
}

// MARK: UIViewControllerTransitioningDelegate

func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
transition.transitionMode = .present
transition.startingPoint = transitionButton.center
transition.bubbleColor = transitionButton.backgroundColor!
return transition
}

func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
transition.transitionMode = .dismiss
transition.startingPoint = transitionButton.center
transition.bubbleColor = transitionButton.backgroundColor!
return transition
}

@IBOutlet weak var transitionButton: UIButton!

let transition = BubbleTransition()

override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
let controller = segue.destination
controller.transitioningDelegate = self
controller.modalPresentationStyle = .custom
}

// MARK: UIViewControllerTransitioningDelegate

func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
transition.transitionMode = .present
transition.startingPoint = transitionButton.center
transition.bubbleColor = transitionButton.backgroundColor!
return transition
}

func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
transition.transitionMode = .dismiss
transition.startingPoint = transitionButton.center
transition.bubbleColor = transitionButton.backgroundColor!
return transition
}

}

6 changes: 3 additions & 3 deletions Demo/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- BubbleTransition (2.0.0)
- BubbleTransition (3.0.0)

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

SPEC CHECKSUMS:
BubbleTransition: bdb9d71993b8d3513008e2dda6bada1ddad25d4f
BubbleTransition: 61f0b5dfbd13c27d734bbd80b680e7d8c29657ba

PODFILE CHECKSUM: 509266e47632f639195bfac1deb46ad87c1fc5f6

COCOAPODS: 1.1.0.rc.2
COCOAPODS: 1.5.0
5 changes: 3 additions & 2 deletions Demo/Pods/Local Podspecs/BubbleTransition.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 Demo/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 05e7125

Please sign in to comment.