Prevent images to change button/item size (#193)

Images are now subviews of the circle background view. Like that we can set the define hugging and content compression resistance priorities. Fixes #191
jjochen · Feb 8, 2019 · 7477205 · 7477205
1 parent e3c23a9
commit 7477205
Show file tree

Hide file tree

Showing 49 changed files with 13 additions and 3 deletions.
diff --git a/...onButton__when_using_circular_pop_up_style__it_looks_correct_with_1_item@2x.png b/...onButton__when_using_circular_pop_up_style__it_looks_correct_with_1_item@2x.png
diff --git a/...onButton__when_using_circular_pop_up_style__it_looks_correct_with_1_item@3x.png b/...onButton__when_using_circular_pop_up_style__it_looks_correct_with_1_item@3x.png
diff --git a/...nButton__when_using_circular_pop_up_style__it_looks_correct_with_2_items@2x.png b/...nButton__when_using_circular_pop_up_style__it_looks_correct_with_2_items@2x.png
diff --git a/...nButton__when_using_circular_pop_up_style__it_looks_correct_with_2_items@3x.png b/...nButton__when_using_circular_pop_up_style__it_looks_correct_with_2_items@3x.png
diff --git a/...nButton__when_using_circular_pop_up_style__it_looks_correct_with_3_items@2x.png b/...nButton__when_using_circular_pop_up_style__it_looks_correct_with_3_items@2x.png
diff --git a/...nButton__when_using_circular_pop_up_style__it_looks_correct_with_3_items@3x.png b/...nButton__when_using_circular_pop_up_style__it_looks_correct_with_3_items@3x.png
diff --git a/...ing_circular_pop_up_style__looks_correct_when_item_have_background_color@2x.png b/...ing_circular_pop_up_style__looks_correct_when_item_have_background_color@2x.png
diff --git a/...ing_circular_pop_up_style__looks_correct_when_item_have_background_color@3x.png b/...ing_circular_pop_up_style__looks_correct_when_item_have_background_color@3x.png
diff --git a/...tem_animation_configuration__it_looks_correct_with_circular_offset_items@2x.png b/...tem_animation_configuration__it_looks_correct_with_circular_offset_items@2x.png
diff --git a/...tem_animation_configuration__it_looks_correct_with_circular_offset_items@3x.png b/...tem_animation_configuration__it_looks_correct_with_circular_offset_items@3x.png
diff --git a/...om_item_animation_configuration__it_looks_correct_with_horizontal_offset@2x.png b/...om_item_animation_configuration__it_looks_correct_with_horizontal_offset@2x.png
diff --git a/...om_item_animation_configuration__it_looks_correct_with_horizontal_offset@3x.png b/...om_item_animation_configuration__it_looks_correct_with_horizontal_offset@3x.png
diff --git a/...ustom_item_animation_configuration__it_looks_correct_with_items_offseted@2x.png b/...ustom_item_animation_configuration__it_looks_correct_with_items_offseted@2x.png
diff --git a/...ustom_item_animation_configuration__it_looks_correct_with_items_offseted@3x.png b/...ustom_item_animation_configuration__it_looks_correct_with_items_offseted@3x.png
diff --git a/..._custom_item_animation_configuration__it_looks_correct_with_items_scaled@2x.png b/..._custom_item_animation_configuration__it_looks_correct_with_items_scaled@2x.png
diff --git a/..._custom_item_animation_configuration__it_looks_correct_with_items_scaled@3x.png b/..._custom_item_animation_configuration__it_looks_correct_with_items_scaled@3x.png
diff --git a/...the_left__when_using_circular_pop_up_style__it_looks_correct_with_1_item@2x.png b/...the_left__when_using_circular_pop_up_style__it_looks_correct_with_1_item@2x.png
diff --git a/...the_left__when_using_circular_pop_up_style__it_looks_correct_with_1_item@3x.png b/...the_left__when_using_circular_pop_up_style__it_looks_correct_with_1_item@3x.png
diff --git a/...he_left__when_using_circular_pop_up_style__it_looks_correct_with_2_items@2x.png b/...he_left__when_using_circular_pop_up_style__it_looks_correct_with_2_items@2x.png
diff --git a/...he_left__when_using_circular_pop_up_style__it_looks_correct_with_2_items@3x.png b/...he_left__when_using_circular_pop_up_style__it_looks_correct_with_2_items@3x.png
diff --git a/...he_left__when_using_circular_pop_up_style__it_looks_correct_with_3_items@2x.png b/...he_left__when_using_circular_pop_up_style__it_looks_correct_with_3_items@2x.png
diff --git a/...he_left__when_using_circular_pop_up_style__it_looks_correct_with_3_items@3x.png b/...he_left__when_using_circular_pop_up_style__it_looks_correct_with_3_items@3x.png
diff --git a/...tem_animation_configuration__it_looks_correct_with_circular_offset_items@2x.png b/...tem_animation_configuration__it_looks_correct_with_circular_offset_items@2x.png
diff --git a/...tem_animation_configuration__it_looks_correct_with_circular_offset_items@3x.png b/...tem_animation_configuration__it_looks_correct_with_circular_offset_items@3x.png
diff --git a/...om_item_animation_configuration__it_looks_correct_with_horizontal_offset@2x.png b/...om_item_animation_configuration__it_looks_correct_with_horizontal_offset@2x.png
diff --git a/...om_item_animation_configuration__it_looks_correct_with_horizontal_offset@3x.png b/...om_item_animation_configuration__it_looks_correct_with_horizontal_offset@3x.png
diff --git a/...ustom_item_animation_configuration__it_looks_correct_with_items_offseted@2x.png b/...ustom_item_animation_configuration__it_looks_correct_with_items_offseted@2x.png
diff --git a/...ustom_item_animation_configuration__it_looks_correct_with_items_offseted@3x.png b/...ustom_item_animation_configuration__it_looks_correct_with_items_offseted@3x.png
diff --git a/...pec/JJFloatingActionButton_on_the_left__with_rtl_language__looks_correct@2x.png b/...pec/JJFloatingActionButton_on_the_left__with_rtl_language__looks_correct@2x.png
diff --git a/...pec/JJFloatingActionButton_on_the_left__with_rtl_language__looks_correct@3x.png b/...pec/JJFloatingActionButton_on_the_left__with_rtl_language__looks_correct@3x.png
diff --git a/.../JJFloatingActionButton__looks_correct_configured_after_adding_the_items@2x.png b/.../JJFloatingActionButton__looks_correct_configured_after_adding_the_items@2x.png
diff --git a/.../JJFloatingActionButton__looks_correct_configured_after_adding_the_items@3x.png b/.../JJFloatingActionButton__looks_correct_configured_after_adding_the_items@3x.png
diff --git a/...c/JJFloatingActionButton__looks_correct_when_only_image_color_is_changed@2x.png b/...c/JJFloatingActionButton__looks_correct_when_only_image_color_is_changed@2x.png
diff --git a/...c/JJFloatingActionButton__looks_correct_when_only_image_color_is_changed@3x.png b/...c/JJFloatingActionButton__looks_correct_when_only_image_color_is_changed@3x.png
diff --git a/...JJFloatingActionButton__looks_correct_with_items_configured_with_closure@2x.png b/...JJFloatingActionButton__looks_correct_with_items_configured_with_closure@2x.png
diff --git a/...JJFloatingActionButton__looks_correct_with_items_configured_with_closure@3x.png b/...JJFloatingActionButton__looks_correct_with_items_configured_with_closure@3x.png
diff --git a/...and_is_opened_with_handle_single_action_direclty_disabled__looks_correct@2x.png b/...and_is_opened_with_handle_single_action_direclty_disabled__looks_correct@2x.png
diff --git a/...and_is_opened_with_handle_single_action_direclty_disabled__looks_correct@3x.png b/...and_is_opened_with_handle_single_action_direclty_disabled__looks_correct@3x.png
diff --git a/...Button__when_multiple_items_are_added__and_is_opened__items_look_correct@2x.png b/...Button__when_multiple_items_are_added__and_is_opened__items_look_correct@2x.png
diff --git a/...Button__when_multiple_items_are_added__and_is_opened__items_look_correct@3x.png b/...Button__when_multiple_items_are_added__and_is_opened__items_look_correct@3x.png
diff --git a/..._multiple_items_are_added__and_is_opened__items_look_correct_highlighted@2x.png b/..._multiple_items_are_added__and_is_opened__items_look_correct_highlighted@2x.png
diff --git a/..._multiple_items_are_added__and_is_opened__items_look_correct_highlighted@3x.png b/..._multiple_items_are_added__and_is_opened__items_look_correct_highlighted@3x.png
diff --git a/...d_is_opened__items_look_correct_highlighted_with_custom_highligted_color@2x.png b/...d_is_opened__items_look_correct_highlighted_with_custom_highligted_color@2x.png
diff --git a/...d_is_opened__items_look_correct_highlighted_with_custom_highligted_color@3x.png b/...d_is_opened__items_look_correct_highlighted_with_custom_highligted_color@3x.png
diff --git a/...ultiple_items_are_added__plus_one_hidden_item__looks_correct_when_opened@2x.png b/...ultiple_items_are_added__plus_one_hidden_item__looks_correct_when_opened@2x.png
diff --git a/...ultiple_items_are_added__plus_one_hidden_item__looks_correct_when_opened@3x.png b/...ultiple_items_are_added__plus_one_hidden_item__looks_correct_when_opened@3x.png
diff --git a/Sources/JJActionItem.swift b/Sources/JJActionItem.swift
@@ -218,7 +218,7 @@ fileprivate extension JJActionItem {
 
         addSubview(titleLabel)
         addSubview(circleView)
-        addSubview(imageView)
+        circleView.addSubview(imageView)
 
         titleLabel.translatesAutoresizingMaskIntoConstraints = false
         circleView.translatesAutoresizingMaskIntoConstraints = false
@@ -279,6 +279,11 @@ fileprivate extension JJActionItem {
         constraints.append(titleLabel.bottomAnchor.constraint(lessThanOrEqualTo: bottomAnchor))
 
         NSLayoutConstraint.activate(constraints)
+
+        imageView.setContentCompressionResistancePriority(.fittingSizeLevel, for: .horizontal)
+        imageView.setContentCompressionResistancePriority(.fittingSizeLevel, for: .vertical)
+        circleView.setContentHuggingPriority(.fittingSizeLevel, for: .horizontal)
+        circleView.setContentHuggingPriority(.fittingSizeLevel, for: .vertical)
     }
 
     func createDynamicConstraints() {

diff --git a/Sources/JJFloatingActionButton+Animation.swift b/Sources/JJFloatingActionButton+Animation.swift
@@ -213,7 +213,7 @@ fileprivate extension JJFloatingActionButton {
                       group: DispatchGroup,
                       animated: Bool) {
         let animation: () -> Void = {
-            self.imageView.transform = CGAffineTransform(rotationAngle: angle)
+            self.circleView.transform = CGAffineTransform(rotationAngle: angle)
         }
 
         UIView.animate(duration: settings.duration,

diff --git a/Sources/JJFloatingActionButton.swift b/Sources/JJFloatingActionButton.swift
@@ -385,7 +385,7 @@ fileprivate extension JJFloatingActionButton {
         layer.shadowRadius = 2
 
         addSubview(circleView)
-        addSubview(imageView)
+        circleView.addSubview(imageView)
 
         circleView.translatesAutoresizingMaskIntoConstraints = false
         circleView.centerXAnchor.constraint(equalTo: centerXAnchor).isActive = true
@@ -407,6 +407,11 @@ fileprivate extension JJFloatingActionButton {
         imageView.widthAnchor.constraint(lessThanOrEqualTo: circleView.widthAnchor, multiplier: imageSizeMuliplier).isActive = true
         imageView.heightAnchor.constraint(lessThanOrEqualTo: circleView.heightAnchor, multiplier: imageSizeMuliplier).isActive = true
 
+        imageView.setContentCompressionResistancePriority(.fittingSizeLevel, for: .horizontal)
+        imageView.setContentCompressionResistancePriority(.fittingSizeLevel, for: .vertical)
+        circleView.setContentHuggingPriority(.fittingSizeLevel, for: .horizontal)
+        circleView.setContentHuggingPriority(.fittingSizeLevel, for: .vertical)
+
         configureButtonImage()
     }