motion-prime 0.4.3 → 0.4.4

data/files/app/styles/sidebar.rb

@@ -1,16 +1,16 @@
 Prime::Styles.define :sidebar do
   style :screen,
-    background_color: :clear
+    background_color: proc { Prime::Config.color.dark }
   style :table,
     top: 150,
     left: 0,
     width: 320,
     bottom: 0,
-    background_color: :clear,
+    background_color: proc { Prime::Config.color.dark },
     separator_color: :clear
 
   style :table_cell,
-    selection_style: UITableViewCellSelectionStyleNone
+    selection_style: :none
 
   style :action_title,
     text_color: :white,
@@ -20,11 +20,4 @@ Prime::Styles.define :sidebar do
     size_to_fit: true,
     left: 20,
     text_color: :white
-
-  style :action_arrow,
-    width: 9,
-    height: 14,
-    right: 150,
-    top: 17,
-    image: "images/sidebar/arrow.png"
 end

data/motion-prime/app_delegate.rb

@@ -32,6 +32,7 @@ module MotionPrime
 
     # TODO: move to private methods
     def open_root_screen(screen)
+      close_current_screens
       screen.send(:on_screen_load) if screen.respond_to?(:on_screen_load)
       screen.wrap_in_navigation if screen.respond_to?(:wrap_in_navigation)
 
@@ -46,6 +47,7 @@ module MotionPrime
     # TODO: move to private methods
     def open_content_screen(screen)
       if sidebar?
+        close_current_screens
         sidebar_container.content_controller = screen
       else
         open_root_screen(screen)
@@ -83,7 +85,24 @@ module MotionPrime
       NSNotificationCenter.defaultCenter.postNotificationName(:on_current_user_reset, object: user_was)
     end
 
+    def close_screens(screens)
+      Array.wrap(screens).each { |screen| screen.on_destroy if screen.respond_to?(:on_destroy) }
+    end
+
     private
+      def close_current_screens
+        return unless self.window
+
+        screens = if sidebar? && sidebar_container.content_controller.is_a?(UINavigationController)
+          sidebar_container.content_controller.childViewControllers
+        elsif sidebar?
+          sidebar_container.content_controller
+        else
+          window.rootViewController
+        end
+        close_screens(screens)
+      end
+
       def create_tab_bar(screens)
         MotionPrime::TabBarController.new(screens)
       end

data/motion-prime/core_ext/kernel.rb

@@ -6,4 +6,8 @@ class Kernel
   def class_name_without_kvo
     self.class.name.gsub(/^NSKVONotifying_/, '')
   end
+
+  def weak_ref
+    WeakRef.new(self)
+  end
 end

data/motion-prime/elements/_content_text_mixin.rb

@@ -1,5 +1,8 @@
+motion_require './_text_mixin.rb'
 module MotionPrime
   module ElementContentTextMixin
+    include ElementTextMixin
+
     def content_text
       is_a?(ButtonElement) ? button_content_text : input_content_text
     end
@@ -8,6 +11,21 @@ module MotionPrime
       (is_a?(ButtonElement) ? button_content_font : input_content_font) || :system.uifont
     end
 
+    def content_attributed_text
+      if view.try(:is_a?, UITextView) && view.text.present?
+        text = view.attributedText
+        text += ' ' if text.to_s.end_with?("\n") # does not respect \n at the end by default
+        return text
+      end
+
+      options = {
+        text: content_text,
+        font: content_font,
+        line_spacing: computed_options[:line_spacing]
+      }
+      computed_options[:html].present? ? html_string(options) : attributed_string(options)
+    end
+
     def content_width
       min, max = computed_options[:min_width].to_f, computed_options[:max_width]
       return min if content_text.blank?
@@ -23,7 +41,7 @@ module MotionPrime
     def content_height
       min, max = computed_options[:min_height].to_f, computed_options[:max_height]
       return min if content_text.blank?
-      rect = get_content_rect(computed_options[:width])
+      rect = get_content_rect(computed_options[:width] - content_padding_width)
       @content_height = [[rect.size.height.ceil, max].compact.min, min].max.ceil
     end
 
@@ -34,15 +52,9 @@ module MotionPrime
     private
       def get_content_rect(width)
         raise "Please set element width for content size calculation" unless width
-        attributes = {NSFontAttributeName => content_font }
-        if computed_options[:line_spacing]
-          paragrahStyle = NSMutableParagraphStyle.alloc.init
-          paragrahStyle.setLineSpacing(computed_options[:line_spacing])
-          attributes[NSParagraphStyleAttributeName] = paragrahStyle
-        end
-        attributed_text = NSAttributedString.alloc.initWithString(content_text, attributes: attributes)
-        attributed_text.boundingRectWithSize(
-          [width, Float::MAX], options:NSStringDrawingUsesLineFragmentOrigin, context:nil
+
+        content_attributed_text.boundingRectWithSize(
+          [width, Float::MAX], options: NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading | NSStringDrawingTruncatesLastVisibleLine, context:nil
         )
       end
 
@@ -63,7 +75,7 @@ module MotionPrime
       end
 
       def input_value_text
-        view && !is_a?(DrawElement) ? view.text : computed_options[:text]
+        view && !is_a?(DrawElement) ? view.text : (computed_options[:html] || computed_options[:text])
       end
 
       def input_placeholder_text

data/motion-prime/elements/_text_mixin.rb

@@ -0,0 +1,54 @@
+module MotionPrime
+  module ElementTextMixin
+    # Options
+    # text
+    # text_color
+    # font
+    # line_spacing
+    # text_alignment
+    # text_alignment_name
+    # line_break_mode
+    # underline (range)
+
+    def html_string(options)
+      styles = []
+      styles << "color: #{options[:text_color].hex};" if options[:text_color]
+      styles << "line-height: #{options[:line_spacing].to_f + options[:font].pointSize}px;"
+      styles << "font-family: '#{options[:font].familyName}';"
+      styles << "font-size: #{options[:font].pointSize}px;"
+      styles << "text-align: #{options[:text_alignment_name]};" if options[:text_alignment_name]
+
+      html_options = {
+        NSDocumentTypeDocumentAttribute => NSHTMLTextDocumentType,
+        NSCharacterEncodingDocumentAttribute => NSNumber.numberWithInt(NSUTF8StringEncoding)
+      }
+      # DTCoreTextFontDescriptor.setOverrideFontName(Prime::Config.font.light, forFontFamily: 'Calibri', bold: false, italic: false)
+      # DTCoreTextFontDescriptor.setOverrideFontName(Prime::Config.font.bold, forFontFamily: 'Calibri', bold: true, italic: false)
+      # DTCoreTextFontDescriptor.setOverrideFontName(Prime::Config.font.light_italic, forFontFamily: 'Calibri', bold: false, italic: true)
+      # DTCoreTextFontDescriptor.setOverrideFontName(Prime::Config.font.bold_italic, forFontFamily: 'Calibri', bold: true, italic: true)
+
+      text = "#{options[:text]}<style>* { #{styles.join} }</style>"
+      NSAttributedString.alloc.initWithData(text.dataUsingEncoding(NSString.defaultCStringEncoding), options: html_options, documentAttributes: nil, error: nil)
+    end
+
+    def attributed_string(options)
+      paragrahStyle = NSMutableParagraphStyle.alloc.init
+
+      paragrahStyle.setLineSpacing(options[:line_spacing]) if options[:line_spacing]
+      paragrahStyle.setAlignment(options[:text_alignment]) if options[:text_alignment]
+      paragrahStyle.setLineBreakMode(options[:line_break_mode]) if options[:line_break_mode]
+      attributes = {}
+      attributes[NSParagraphStyleAttributeName] = paragrahStyle
+      attributes[NSForegroundColorAttributeName] = options[:text_color]
+      attributes[NSFontAttributeName] = options[:font]
+
+      prepared_text = NSMutableAttributedString.alloc.initWithString(options[:text], attributes: attributes)
+      if underline_range = options[:underline]
+        # FIXME
+        # prepared_text = NSMutableAttributedString.alloc.initWithAttributedString(prepared_text)
+        # prepared_text.addAttributes({NSUnderlineStyleAttributeName => NSUnderlineStyleSingle}, range: underline_range)
+      end
+      prepared_text
+    end
+  end
+end

data/motion-prime/elements/base_element.rb

@@ -21,12 +21,17 @@ module MotionPrime
       @options = options
       @screen = options[:screen]
       @section = options[:section]
+      @view_class = options[:view_class] || 'UIView'
       @name = options[:name]
       @block = options[:block]
-      @view_class = options[:view_class] || 'UIView'
       @view_name = self.class_name_without_kvo.demodulize.underscore.gsub(/(_draw)?_element/, '')
     end
 
+    def dealloc
+      pp 'deallocating elemenet', self.name
+      super
+    end
+
     def render(options = {}, &block)
       run_callbacks :render do
         render!(&block)
@@ -46,6 +51,15 @@ module MotionPrime
       @computed_options
     end
 
+    def compute_options!
+      block_options = compute_block_options || {}
+      raw_options = self.options.except(:screen, :name, :block, :view_class).merge(block_options)
+      compute_style_options(raw_options)
+      raw_options = Styles.for(styles).merge(raw_options)
+      @computed_options = raw_options
+      normalize_options(@computed_options, section, %w[text placeholder font title_label padding padding_left padding_right min_width min_outer_width max_width max_outer_width width left right])
+    end
+
     def update_with_options(new_options = {})
       options.merge!(new_options)
       compute_options!
@@ -70,15 +84,6 @@ module MotionPrime
     end
 
     protected
-      def compute_options!
-        block_options = compute_block_options || {}
-        raw_options = self.options.except(:screen, :name, :block, :view_class).merge(block_options)
-        compute_style_options(raw_options)
-        raw_options = Styles.for(styles).merge(raw_options)
-
-        @computed_options = raw_options
-        normalize_options(@computed_options, section, %w[text placeholder font title_label padding padding_left padding_right min_width min_outer_width max_width max_outer_width width left right])
-      end
 
       # Compute options sent inside block, e.g.
       # element :button do
@@ -142,23 +147,23 @@ module MotionPrime
           # table element: categories_table_cell_icon, categories_table_title_icon
           @styles += build_styles_chain(base_styles[:specific], suffixes[:specific])
         end
-        if section
+        if section && section.name.present? && name.present?
           # using for base sections
-          @styles << [section.name, name].compact.join('_').to_sym
+          @styles << [section.name, name].join('_').to_sym
         end
         # custom style (from options or block options), using for TableViews as well
         custom_styles = style_sources.map do |source|
           normalize_object(source.delete(:styles), section)
         end.flatten
         @styles += custom_styles
-        #puts @view_class.to_s + @styles.inspect, ''
+        # puts @view_class.to_s + @styles.inspect, ''
       end
 
     class << self
       def factory(type, options = {})
         element_class = class_factory("#{type}_element", true) || self
         view_class_name = camelize_factory("ui_#{type}")
-        
+
         options.merge!(view_class: view_class_name)
         element_class.new(options)
       end

data/motion-prime/elements/draw.rb

@@ -7,6 +7,19 @@ module MotionPrime
     include FrameCalculatorMixin
     include ElementContentPaddingMixin
 
+    def draw_options
+      options = computed_options
+      background_color = options[:background_color].try(:uicolor)
+      {
+        rect: CGRectMake(computed_left, computed_top, computed_outer_width, computed_outer_height),
+        background_color: background_color,
+        masks_to_bounds: options[:layer].try(:[], :masks_to_bounds) || options[:clips_to_bounds],
+        corner_radius: options[:layer].try(:[], :corner_radius).to_f,
+        border_width: options[:layer].try(:[], :border_width).to_f,
+        border_color: options[:layer].try(:[], :border_color).try(:uicolor) || background_color
+      }
+    end
+
     def render!; end
 
     def view
@@ -14,7 +27,7 @@ module MotionPrime
     end
 
     def computed_frame
-      @computed_frame ||= calculate_frome_for(view.bounds, computed_options)
+      @computed_frame ||= calculate_frome_for(view.try(:bounds) || section.container_bounds, computed_options)
     end
 
     def default_padding_for(side)
@@ -61,8 +74,16 @@ module MotionPrime
       view.setNeedsDisplay
     end
 
+    def update_with_options(new_options = {})
+      options.merge!(new_options)
+      compute_options!
+      view.setNeedsDisplay
+    end
+
     private
       def reset_computed_values
+        @content_height = nil
+        @content_width = nil
         @computed_frame = nil
       end
 

data/motion-prime/elements/draw/_draw_background_mixin.rb

@@ -1,35 +1,35 @@
 module MotionPrime
   module DrawBackgroundMixin
-    def draw_background_in(draw_rect, options)
-      bg_color = options[:background_color]
-      border_radius = options[:layer].try(:[], :corner_radius)
-      border_width = options[:layer].try(:[], :border_width).to_f
-      border_color = options[:layer].try(:[], :border_color) || bg_color || :black
+    def draw_background_in_context(context = nil)
+      context ||= UIGraphicsGetCurrentContext()
+      options = draw_options
+      rect, background_color, border_width, border_color, corner_radius = options.slice(:rect, :background_color, :border_width, :border_color, :corner_radius).values
 
-      if bg_color || border_width > 0
-        inset = border_width > 0 ? (border_width - 1 )*0.5 : 0
-        rect = CGRectInset(draw_rect, -inset, -inset)
-        if border_radius
-          bezierPath = UIBezierPath.bezierPathWithRoundedRect rect, cornerRadius: border_radius
-          if border_width > 0
-            bezierPath.lineWidth = border_width
-            border_color.uicolor.setStroke
-            bezierPath.stroke
-          end
-          if bg_color
-            bg_color.uicolor.setFill
-            bezierPath.fill
-          end
-        else
-          context = UIGraphicsGetCurrentContext()
-          if border_width > 0 && border_color
-            CGContextSetLineWidth(context, border_width)
-            CGContextSetStrokeColorWithColor(context, border_color.uicolor.cgcolor)
-            CGContextStrokeRect(context, rect)
-          end
-          CGContextSetFillColorWithColor(context, bg_color.uicolor.cgcolor) if bg_color
-          CGContextFillRect(context, rect) if bg_color
+      return unless background_color || border_width > 0
+
+      inset = border_width > 0 ? (border_width - 1 )*0.5 : 0
+      rect = CGRectInset(rect, -inset, -inset)
+      if corner_radius > 0
+        bezierPath = UIBezierPath.bezierPathWithRoundedRect rect, cornerRadius: corner_radius
+        UIGraphicsPushContext(context)
+        if border_width > 0
+          bezierPath.lineWidth = border_width
+          border_color.setStroke
+          bezierPath.stroke
+        end
+        if background_color
+          background_color.setFill
+          bezierPath.fill
+        end
+        UIGraphicsPopContext()
+      else
+        if border_width > 0 && border_color
+          CGContextSetLineWidth(context, border_width)
+          CGContextSetStrokeColorWithColor(context, border_color.uicolor.cgcolor)
+          CGContextStrokeRect(context, rect)
         end
+        CGContextSetFillColorWithColor(context, background_color.uicolor.cgcolor) if background_color
+        CGContextFillRect(context, rect) if background_color
       end
     end
   end

data/motion-prime/elements/draw/image.rb

@@ -4,67 +4,86 @@ module MotionPrime
     include DrawBackgroundMixin
     attr_accessor :image_data
 
+    def draw_options
+      image = image_data || computed_options[:image]
+      image ||= computed_options[:default] if computed_options[:url]
+
+      # already initialized image or image from resources or default image
+      super.merge({image: image.try(:uiimage)})
+    end
+
     def draw_in(rect)
       return if computed_options[:hidden]
-      options = computed_options
-      image_rect = CGRectMake(
-        computed_left,
-        computed_top,
-        computed_width,
-        computed_height
-      )
 
-      image_rect = CGRectInset(image_rect, -0.5, -0.5)
-      border_width = options[:layer].try(:[], :border_width).to_f
+      draw_background_in_context(UIGraphicsGetCurrentContext())
+      computed_options[:draw_in_rect] ? draw_in_context(UIGraphicsGetCurrentContext()) : draw_with_layer
+      load_image
+    end
 
-      draw_background_in(image_rect, options)
+    def draw_in_context(context)
+      return if computed_options[:hidden]
 
-      # draw already initialized image
-      if image_data
-        draw_with_layer(image_data, image_rect)
-      # draw image from resources
-      elsif computed_options[:image]
-        self.image_data = computed_options[:image].uiimage
-        draw_with_layer(image_data, image_rect)
-      # show default image and download image from url
-      elsif computed_options[:url]
-        if computed_options[:default]
-          self.image_data = computed_options[:default].uiimage
-          draw_with_layer(image_data, image_rect)
-        end
-        manager = SDWebImageManager.sharedManager
-        manager.downloadWithURL(computed_options[:url],
-          options: 0,
-          progress: lambda{ |r_size, e_size|  },
-          completed: lambda{ |image, error, type, finished|
-            if image
-              self.image_data = image
-              if type == SDImageCacheTypeNone || type == SDImageCacheTypeDisk
-                # if it's first call, we should redraw view, because it's async
-                section.container_view.setNeedsDisplay
-              else
-                # if it's second call, we should just draw image
-                draw_with_layer(image_data, image_rect)
-              end
-            end
-          } )
+      draw_background_in_context(context)
+      options = draw_options
+      return unless image = options[:image]
+
+      border_width = options[:border_width]
+      inset = border_width > 0 ? (border_width - 1 ).abs*0.5 : 0
+      rect = CGRectInset(options[:rect], inset, inset)
+      radius = options[:corner_radius].to_f if options[:corner_radius] && options[:masks_to_bounds]
+
+      UIGraphicsPushContext(context)
+      if radius
+        CGContextBeginPath(context)
+        CGContextAddArc(context, rect.origin.x + rect.size.width/2, rect.origin.y + rect.size.height/2, radius, 0, 2*Math::PI, 0) # FIXME
+        CGContextClosePath(context)
+        CGContextSaveGState(context)
+        CGContextClip(context)
+        image.drawInRect(rect)
+        CGContextRestoreGState(context)
+      else
+        image.drawInRect(rect)
       end
+      UIGraphicsPopContext()
     end
 
-    def draw_with_layer(image, rect)
+    def draw_with_layer
+      options = draw_options
+      return unless image = options[:image]
+      rect = options[:rect]
+      radius = options[:corner_radius].to_f if options[:corner_radius] && options[:masks_to_bounds]
+
       layer = CALayer.layer
       layer.contents = image.CGImage
       layer.frame = rect
       layer.bounds = rect
-      if computed_options[:layer]
-        layer.masksToBounds = computed_options[:layer][:masks_to_bounds] || computed_options[:clips_to_bounds]
-        if radius = computed_options[:layer][:corner_radius]
-          k = image.size.width / rect.size.width
-          radius = radius * k
-          layer.cornerRadius = radius
-        end
+
+      layer.masksToBounds = options[:masks_to_bounds]
+      layer.cornerRadius = radius if radius
+
+      view.layer.addSublayer(layer)
+    end
+
+    def load_image
+      return if image_data || !computed_options[:url]
+      BW::Reactor.schedule do
+        manager = SDWebImageManager.sharedManager
+        manager.downloadWithURL(computed_options[:url],
+          options: 0,
+          progress: lambda{ |r_size, e_size|  },
+          completed: lambda{ |image, error, type, finished|
+            break unless image && section
+            self.image_data = image
+
+            section.cached_draw_image = nil
+            if section.respond_to?(:cell_name)
+              section.pending_display!
+            else
+              self.view.performSelectorOnMainThread :setNeedsDisplay, withObject: nil, waitUntilDone: false
+            end
+          }
+        )
       end
-      view.layer.addSublayer layer
     end
   end
 end