diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6b3bc63e..127ea317 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,8 +8,8 @@ executors:
shell: /bin/bash --login -eo pipefail
environment:
SIMULATOR_OS: 13.0
- DESTINATION: platform=iOS Simulator,OS=13.0,name=iPhone Xs Max
- SIMULATOR: iPhone Xs Max (13.0) [
+ DESTINATION: platform=iOS Simulator,OS=13.0,name=iPhone 11 Pro Max
+ SIMULATOR: iPhone 11 Pro Max (13.0) [
ios12-iphone-xs-max:
macos:
@@ -165,7 +165,6 @@ jobs:
- start-simulator
- setup-cocoapods
- run-tests
- - update-codecov
- store-reports
build-and-test-ios12-iphonexsmax:
diff --git a/.jazzy.yaml b/.jazzy.yaml
index 695a0eae..bcaa41ac 100644
--- a/.jazzy.yaml
+++ b/.jazzy.yaml
@@ -4,3 +4,4 @@ theme: fullwidth
author: Jochen Pfeiffer
author_url: https://github.com/jjochen/
root_url: https://jjochen.github.io/JJFloatingActionButton/
+clean: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 769acb71..5a1f02eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
# Change Log
+## [2.1.0](https://github.com/jjochen/JJFloatingActionButton/tree/2.1.0) (2019-09-09)
+[Full Changelog](https://github.com/jjochen/JJFloatingActionButton/compare/2.0.0...2.1.0)
+
+**Implemented enhancements:**
+
+- Add image size property to action items [\#203](https://github.com/jjochen/JJFloatingActionButton/issues/203)
+
+**Merged pull requests:**
+
+- Support dark mode in example project [\#217](https://github.com/jjochen/JJFloatingActionButton/pull/217)
+- Update configuration example in README and example project [\#215](https://github.com/jjochen/JJFloatingActionButton/pull/215)
+- Make image sizes configurable [\#213](https://github.com/jjochen/JJFloatingActionButton/pull/213) [[added](https://github.com/jjochen/JJFloatingActionButton/labels/added)]
+- Fix an issue where special action item configuration would not work [\#212](https://github.com/jjochen/JJFloatingActionButton/pull/212) [[fixed](https://github.com/jjochen/JJFloatingActionButton/labels/fixed)]
+- Update dependencies [\#210](https://github.com/jjochen/JJFloatingActionButton/pull/210)
+- Get ready for Xcode 11/iOS 13 [\#209](https://github.com/jjochen/JJFloatingActionButton/pull/209)
+
## [2.0.0](https://github.com/jjochen/JJFloatingActionButton/tree/2.0.0) (2019-04-09)
[Full Changelog](https://github.com/jjochen/JJFloatingActionButton/compare/1.2.0...2.0.0)
diff --git a/Example/JJFloatingActionButton/Info.plist b/Example/JJFloatingActionButton/Info.plist
index feff096b..87eab841 100644
--- a/Example/JJFloatingActionButton/Info.plist
+++ b/Example/JJFloatingActionButton/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 2.0.0
+ 2.1.0
CFBundleVersion
1
LSRequiresIPhoneOS
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
index 5d1b54d9..f4dd156d 100644
--- a/Example/Podfile.lock
+++ b/Example/Podfile.lock
@@ -4,7 +4,7 @@ PODS:
- iOSSnapshotTestCase/Core (5.0.2)
- iOSSnapshotTestCase/SwiftSupport (5.0.2):
- iOSSnapshotTestCase/Core
- - JJFloatingActionButton (2.0.0)
+ - JJFloatingActionButton (2.1.0)
- Nimble (7.3.4)
- Nimble-Snapshots (6.9.1):
- Nimble-Snapshots/Core (= 6.9.1)
@@ -32,7 +32,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
iOSSnapshotTestCase: 2d51aa06775e95cecb0a1fb9c5c159ccd1dd4596
- JJFloatingActionButton: 5fc3df9cac6c0e8d8248997ad3fad25a678f9e76
+ JJFloatingActionButton: 26805f87c7e9f68c6a91bd9f3f09c2e6b904a84f
Nimble: 051e3d8912d40138fa5591c78594f95fb172af37
Nimble-Snapshots: bbd1ab264bacc24a9ce24a8363bc05aac783aeb0
Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d
diff --git a/JJFloatingActionButton.podspec b/JJFloatingActionButton.podspec
index dc151500..6a3e787a 100644
--- a/JJFloatingActionButton.podspec
+++ b/JJFloatingActionButton.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'JJFloatingActionButton'
- spec.version = '2.0.0'
+ spec.version = '2.1.0'
spec.swift_version = '5.0'
spec.author = { 'Jochen Pfeiffer' => 'pod@jochen-pfeiffer.com' }
spec.license = { :type => 'MIT', :file => 'LICENSE' }
diff --git a/docs/Classes.html b/docs/Classes.html
index 2b5e59bd..9033371c 100644
--- a/docs/Classes.html
+++ b/docs/Classes.html
@@ -435,8 +435,8 @@
Declaration
-
-
-
-
-
-
-
-
- JJFloatingActionButton Reference
-
- ButtonOpeningStyle Enumeration Reference
-
-
-
-
-
-
-
-
-
-
-
ButtonOpeningStyle
-
-
-
enum ButtonOpeningStyle
-
-
-
-
Opening style of the button itself.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
When opening, the button is rotated.
-
-
-
-
Declaration
-
-
Swift
-
case rotate ( angle : CGFloat )
-
-
-
-
-
Parameters
-
-
-
-
-
- angle
-
-
-
-
-
The angle in radian the button will rotate when opening.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
When opening, the image view transitions to given image.
-
-
-
-
Declaration
-
-
Swift
-
case transition ( image : UIImage )
-
-
-
-
-
Parameters
-
-
-
-
-
- image
-
-
-
-
-
The image the button will show when opening.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/docs/Classes/JJActionItem.html b/docs/Classes/JJActionItem.html
index 5606c224..2a660fab 100644
--- a/docs/Classes/JJActionItem.html
+++ b/docs/Classes/JJActionItem.html
@@ -495,7 +495,7 @@
Declaration
The position of the title label. Default is -1
.
-When titleSpacing is negative default spacing is used:
+When titleSpacing
is negative default spacing is used:
Default horizontal spacing is 12
.
Default vertical spaicng is 4
.
@@ -512,6 +512,37 @@
Declaration
+
+
+
+
+
+
+
+
The size of the image view. Default is (0, 0)
.
+When imageSize is .zero
the image is shrunken until it fits
+compleately into the circle view. If it already does the actual
+size of the image is used.
+
+
+
+
Declaration
+
+
Swift
+
@objc
+public dynamic var imageSize : CGSize { get set }
+
+
+
+
+
+
@@ -673,8 +704,8 @@ Declaration
diff --git a/docs/Classes/JJAnimationSettings.html b/docs/Classes/JJAnimationSettings.html
index 569dfa7a..d87832a1 100644
--- a/docs/Classes/JJAnimationSettings.html
+++ b/docs/Classes/JJAnimationSettings.html
@@ -353,8 +353,8 @@ Return Value
diff --git a/docs/Classes/JJButtonAnimationConfiguration.html b/docs/Classes/JJButtonAnimationConfiguration.html
index 927d1f4a..ee05b267 100644
--- a/docs/Classes/JJButtonAnimationConfiguration.html
+++ b/docs/Classes/JJButtonAnimationConfiguration.html
@@ -495,8 +495,8 @@ Return Value
diff --git a/docs/Classes/JJButtonAnimationConfiguration/JJButtonAnimationStyle.html b/docs/Classes/JJButtonAnimationConfiguration/JJButtonAnimationStyle.html
index 6856b462..6a03f71a 100644
--- a/docs/Classes/JJButtonAnimationConfiguration/JJButtonAnimationStyle.html
+++ b/docs/Classes/JJButtonAnimationConfiguration/JJButtonAnimationStyle.html
@@ -186,8 +186,8 @@ Declaration
diff --git a/docs/Classes/JJCircleView.html b/docs/Classes/JJCircleView.html
index 50715024..d47ecca4 100644
--- a/docs/Classes/JJCircleView.html
+++ b/docs/Classes/JJCircleView.html
@@ -298,8 +298,8 @@ Declaration
diff --git a/docs/Classes/JJFloatingActionButton.html b/docs/Classes/JJFloatingActionButton.html
index dc2f4f7c..c8c34503 100644
--- a/docs/Classes/JJFloatingActionButton.html
+++ b/docs/Classes/JJFloatingActionButton.html
@@ -307,6 +307,41 @@ Declaration
+
+
+
+
+
+
+
+
The size of the image view.
+Default is CGSize.zero
.
+If set to .zero
the actual size of the image is used.
+
+
+
+
+
Declaration
+
+
Swift
+
@objc
+public dynamic var buttonImageSize : CGSize { get set }
+
+
+
+
+
+
@@ -546,9 +581,7 @@ Declaration
@@ -1483,6 +1516,33 @@ Declaration
+
+
+
+
+
+
+
+
Updates constraints for the view.
+
+
+
+
Declaration
+
+
Swift
+
open override func updateConstraints ()
+
+
+
+
+
+
@@ -1615,8 +1675,8 @@
Declaration
diff --git a/docs/Classes/JJFloatingActionButton/ButtonOpeningStyle.html b/docs/Classes/JJFloatingActionButton/ButtonOpeningStyle.html
deleted file mode 100644
index 475b562e..00000000
--- a/docs/Classes/JJFloatingActionButton/ButtonOpeningStyle.html
+++ /dev/null
@@ -1,220 +0,0 @@
-
-
-
-
ButtonOpeningStyle Enumeration Reference
-
-
-
-
-
-
-
-
-
-
-
-
-