Skip to content

Commit d974979

Browse files
authored
Merge pull request #196 from Orderella/development
Switched to DynamicBlurView
2 parents e40044f + 91d634b commit d974979

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1717
-1426
lines changed

.travis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ language: objective-c
22
osx_image: xcode9.1
33
env:
44
global:
5-
- WORKSPACE=Example/PopupDialog.xcworkspace
6-
- IOS_FRAMEWORK_SCHEME="PopupDialog-Example"
7-
- IOS_SDK=iphonesimulator11.1
8-
- EXAMPLE_SCHEME="PopupDialog-Example"
5+
- WORKSPACE=Example/PopupDialog.xcworkspace
6+
- IOS_FRAMEWORK_SCHEME="PopupDialog-Example"
7+
- IOS_SDK=iphonesimulator11.1
8+
- EXAMPLE_SCHEME="PopupDialog-Example"
99
matrix:
1010
- DESTINATION="OS=11.1,name=iPhone 7 Plus" SIMNAME="com.apple.CoreSimulator.SimDeviceType.iPhone-7-Plus, 11.1" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES"
1111
- DESTINATION="OS=10.2,name=iPhone 6" SIMNAME="com.apple.CoreSimulator.SimDeviceType.iPhone-6, 10.2" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="NO"

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Changelog
22

3+
* **0.7.0** Removed FXBlurView while switching to DynamicBlurView
34
* **0.6.2** Added preferredWidth option for iPads
45
* **0.6.1** Added shake animation<br>Introduced hideStatusBar option
56
* **0.6.0** Swift 4 support<br>Dropped iOS8 compatibility

Example/Podfile.lock

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
PODS:
2+
- DynamicBlurView (2.0.0)
23
- FBSnapshotTestCase (2.1.4):
34
- FBSnapshotTestCase/SwiftSupport (= 2.1.4)
45
- FBSnapshotTestCase/Core (2.1.4)
56
- FBSnapshotTestCase/SwiftSupport (2.1.4):
67
- FBSnapshotTestCase/Core
78
- Nimble (7.0.2)
8-
- PopupDialog (0.6.2)
9+
- PopupDialog (0.7.0):
10+
- DynamicBlurView (~> 2.0)
911
- SwiftLint (0.24.0)
1012

1113
DEPENDENCIES:
@@ -27,9 +29,10 @@ CHECKOUT OPTIONS:
2729
:git: https://github.com/facebook/ios-snapshot-test-case.git
2830

2931
SPEC CHECKSUMS:
32+
DynamicBlurView: 7b1bfbc1e7a0606b8a1855ff809ccaccfbda6b30
3033
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
3134
Nimble: bfe1f814edabba69ff145cb1283e04ed636a67f2
32-
PopupDialog: 4249a2fa2c2552b99cc74b245544701714162ae4
35+
PopupDialog: b59d5a92b015dde35a1af6aacf19e960f432aef8
3336
SwiftLint: a014c92b4664e8b13f380f8640a51bb1733778ba
3437

3538
PODFILE CHECKSUM: 7a27ac877c3a93aa83583a4625417841e72145e5

Example/Pods/DynamicBlurView/DynamicBlurView/BlurLayer.swift

+131
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/DynamicBlurView/DynamicBlurView/CGContext+CGImage.swift

+31
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/DynamicBlurView/DynamicBlurView/CGImage+Accelerate.swift

+65
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/DynamicBlurView/DynamicBlurView/CaptureQuality.swift

+32
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Pods/DynamicBlurView/DynamicBlurView/DynamicBlurView.h

+19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)