enchanted_quill 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5730b8d566d7ed7b273cddb1747f52854e5268da
-  data.tar.gz: 3393cc15dfcdab0aa9f6db26f507c0fa71601058
+  metadata.gz: 1c61fbd123463496f0e1221ea675c6e2e1f7e86e
+  data.tar.gz: 70c0a1fee81c53ee6301d4ccdebf5ec788c68422
 SHA512:
-  metadata.gz: cdcb55744c301335f38893f1fa0d69b397c2f4e5c0039c442ff7e3c209103c57d96e2ae824f5959e4f94e397e91bd3c965dd39d4bd94c32989f00126c44551ce
-  data.tar.gz: 014b262a9ac5814addab76c5101f967c551a2efe5ef8933edbdedbcc9045c52dcc79c3e36050de720f3a1063210d4618ff0f69088b10ff33a7cce95feafb5b48
+  metadata.gz: 393fc448959a64b60a25a5efe3b63770949e31df6a683d158ebd8193ef2eedbba2fbc30bc5b2cbafd1930700594f07b66f758f243ab65647fa1313c07818139c
+  data.tar.gz: bf7013c7100229c1b7837fbe9cbbe837c4e05967687f04d0bfad69aa762cc194c4a94c459ee9918b829d62a50d87f2e64d04b647e1d01d3b4aa9f5d905730a05

data/README.md

@@ -37,6 +37,12 @@ label.category_selected_color = UIColor.brownColor.colorWithAlphaComponent(0.5)
 label.url_color               = UIColor.colorWithRed(85.0/255, green: 238.0/255, blue: 151.0/255, alpha: 1)
 label.url_selected_color      = UIColor.colorWithRed(85.0/255, green: 238.0/255, blue: 151.0/255, alpha: 1).colorWithAlphaComponent(0.5)
 
+# Handle Paragraph Styling
+label.line_spacing            = 5
+label.line_height_multiple    = 1.5
+label.minimum_line_height     = 20
+label.maximum_line_height     = 30
+
 label.handle_mention_tap do |mention|
   p "Mention #{mention}"
 end
@@ -53,7 +59,7 @@ label.handle_hashtag_tap do |hashtag|
   p "Hashtag #{hashtag}"
 end
 ```
-## Better Performance 
+## Better Performance
 For better performance use the `customize` block, this basically groups all customizations on the label
 and refreshes the textContainer once instead of refreshing each time an attribute is set.
 ```ruby
@@ -102,4 +108,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/paddin
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/lib/enchanted_quill/label.rb

@@ -4,7 +4,8 @@ module EnchantedQuill
                 :category_tap_handler, :mention_color, :mention_selected_color,
                 :hashtag_color, :hashtag_selected_color, :category_color,
                 :category_selected_color, :url_color, :url_selected_color,
-                :line_spacing
+                :line_spacing, :line_height_multiple, :minimum_line_height,
+                :maximum_line_height
 
     def init
       super.tap do |label|
@@ -175,6 +176,21 @@ module EnchantedQuill
       update_text_storage(false)
     end
 
+    def line_height_multiple=(multiple)
+      @line_height_multiple = multiple
+      update_text_storage(false)
+    end
+
+    def maximum_line_height=(height)
+      @maximum_line_height = height
+      update_text_storage(false)
+    end
+
+    def minimum_line_height=(height)
+      @minimum_line_height = height
+      update_text_storage(false)
+    end
+
     def touchesBegan(touches, withEvent: event)
       touches = touches && touches.allObjects
       touch   = touches.first
@@ -199,28 +215,32 @@ module EnchantedQuill
       super
     end
 
-    # def intrinsicContentSize
-    #   label_height = sizeThatFits(CGSizeMake(CGRectGetWidth(self.frame),  Float::MAX)).height
-    #   return CGSizeMake(self.frame.size.width, label_height + self.layoutMargins.top + self.layoutMargins.bottom)
-    # end
+    def intrinsicContentSize
+      label_height = sizeThatFits(CGSizeMake(CGRectGetWidth(self.frame),  Float::MAX)).height
+      return CGSizeMake(self.frame.size.width, label_height + self.layoutMargins.top + self.layoutMargins.bottom)
+    end
 
     def setup_label
-      @customizing = false
-      @active_elements = {}
-      self.textColor               = UIColor.blackColor
-      self.mention_color           = UIColor.blueColor
-      self.mention_selected_color  = UIColor.blueColor.colorWithAlphaComponent(0.5)
-      self.hashtag_color           = UIColor.blueColor
-      self.hashtag_selected_color  = UIColor.blueColor.colorWithAlphaComponent(0.5)
-      self.category_color          = UIColor.brownColor
-      self.category_selected_color = UIColor.brownColor.colorWithAlphaComponent(0.5)
-      self.url_color               = UIColor.blueColor
-      self.url_selected_color      = UIColor.blueColor.colorWithAlphaComponent(0.5)
-
-      text_storage.addLayoutManager(layout_manager)
-      layout_manager.addTextContainer(text_container)
-      text_container.lineFragmentPadding = 0
-      self.userInteractionEnabled = true
+      @setup_label ||= begin
+        @customizing = false
+        @active_elements = {}
+        @height_correction = 0
+        self.line_height_multiple    = 1
+        self.textColor               = UIColor.blackColor
+        self.mention_color           = UIColor.blueColor
+        self.mention_selected_color  = UIColor.blueColor.colorWithAlphaComponent(0.5)
+        self.hashtag_color           = UIColor.blueColor
+        self.hashtag_selected_color  = UIColor.blueColor.colorWithAlphaComponent(0.5)
+        self.category_color          = UIColor.brownColor
+        self.category_selected_color = UIColor.brownColor.colorWithAlphaComponent(0.5)
+        self.url_color               = UIColor.blueColor
+        self.url_selected_color      = UIColor.blueColor.colorWithAlphaComponent(0.5)
+
+        text_storage.addLayoutManager(layout_manager)
+        layout_manager.addTextContainer(text_container)
+        text_container.lineFragmentPadding = 0
+        self.userInteractionEnabled = true
+      end
     end
 
     private
@@ -329,12 +349,22 @@ module EnchantedQuill
 
       current_paragraph_style = attributes[NSParagraphStyleAttributeName] && attributes[NSParagraphStyleAttributeName].mutableCopy
       paragraph_style = current_paragraph_style || NSMutableParagraphStyle.alloc.init
-      paragraph_style.lineBreakMode = NSLineBreakByWordWrapping
-      paragraph_style.alignment     = textAlignment
-
-      if line_spacing
-        paragraph_style.lineSpacing = line_spacing
-      end
+      paragraph_style.lineBreakMode      = NSLineBreakByWordWrapping
+      paragraph_style.alignment          = textAlignment
+      paragraph_style.lineSpacing        = line_spacing if line_spacing
+      paragraph_style.lineHeightMultiple = line_height_multiple
+
+      paragraph_style.minimumLineHeight = if minimum_line_height && minimum_line_height > 0
+                                            minimum_line_height
+                                          else
+                                            font.lineHeight * line_height_multiple
+                                          end
+
+      paragraph_style.maximumLineHeight = if maximum_line_height and maximum_line_height > 0
+                                            maximum_line_height
+                                          else
+                                            font.lineHeight * line_height_multiple
+                                          end
 
       attributes[NSParagraphStyleAttributeName] = paragraph_style
       mut_attr_string.setAttributes(attributes, range: range_pointer[0])

data/lib/enchanted_quill/version.rb

@@ -1,3 +1,3 @@
 module EnchantedQuill
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enchanted_quill
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Elom Gomez