motion-prime 0.3.1 → 0.3.2

data/motion-prime/models/model.rb

@@ -74,7 +74,7 @@ module MotionPrime
     #   User.new(name: "Bob", age: 10)
     #
     # @return MotionPrime::BaseModel unsaved model
-    def new(data = {})
+    def new(data = {}, options = {})
       data.keys.each { |k|
         unless self.attributes.member? k.to_sym
           raise StoreError, "'#{k}' is not a defined attribute for this model"

data/motion-prime/models/sync.rb

@@ -116,6 +116,7 @@ module MotionPrime
           self.send(:"#{key}=", value)
         end
       end
+      self
     end
 
     def fetch_associations(sync_options = {}, &block)
@@ -153,8 +154,8 @@ module MotionPrime
 
       use_callback = block_given?
       puts "SYNC: started sync for #{key} in #{self.class_name_without_kvo}"
-      api_client.get normalize_sync_url(options[:sync_url]) do |data, status_code|
-        data = data[options[:sync_key]] if options[:sync_key]
+      api_client.get normalize_sync_url(options[:sync_url]) do |response, status_code|
+        data = options.has_key?(:sync_key) ? response[options[:sync_key]] : response
         if data
           # Update/Create existing records
           data.each do |attributes|
@@ -174,10 +175,10 @@ module MotionPrime
           end
           save if sync_options[:save]
           puts "SYNC: finished sync for #{key} in #{self.class_name_without_kvo}"
-          block.call(data, status_code) if use_callback
+          block.call(data, status_code, response) if use_callback
         else
           puts "SYNC ERROR: failed sync for #{key} in #{self.class_name_without_kvo}"
-          block.call(data, status_code) if use_callback
+          block.call(data, status_code, response) if use_callback
         end
       end
     end
@@ -185,8 +186,8 @@ module MotionPrime
     def fetch_has_one(key, options = {}, &block)
       use_callback = block_given?
       puts "SYNC: started sync for #{key} in #{self.class_name_without_kvo}"
-      api_client.get normalize_sync_url(options[:sync_url]) do |data, status_code|
-        data = data[options[:sync_key]] if options[:sync_key]
+      api_client.get normalize_sync_url(options[:sync_url]) do |response, status_code|
+        data = options.has_key?(:sync_key) ? response[options[:sync_key]] : response
         if data.present?
           model = self.send(key)
           unless model
@@ -195,10 +196,10 @@ module MotionPrime
           end
           model.fetch_with_attributes(data)
           model.save if sync_options[:save]
-          block.call(data, status_code) if use_callback
+          block.call(data, status_code, response) if use_callback
         else
           puts "SYNC ERROR: failed sync for #{key} in #{self.class_name_without_kvo}"
-          block.call(data, status_code) if use_callback
+          block.call(data, status_code, response) if use_callback
         end
       end
     end
@@ -240,6 +241,14 @@ module MotionPrime
   end
 
   module ModelSyncClassMethods
+    def new(data = {}, options = {})
+      model = super
+      if fetch_attributes = options[:fetch_attributes]
+        model.fetch_with_attributes(fetch_attributes)
+      end
+      model
+    end
+
     def sync_url(url = nil, &block)
       if url || block_given?
         self._sync_url = url || block

data/motion-prime/screens/_aliases_mixin.rb

@@ -28,5 +28,7 @@ module MotionPrime
     end
 
     def on_rotate; end;
+
+    def on_load; end
   end
 end

data/motion-prime/screens/_base_mixin.rb

@@ -1,7 +1,6 @@
 motion_require "./_aliases_mixin"
 motion_require "./_orientations_mixin"
 motion_require "./_navigation_mixin"
-motion_require "./_navigation_bar_mixin"
 module MotionPrime
   module ScreenBaseMixin
     extend ::MotionSupport::Concern
@@ -10,16 +9,25 @@ module MotionPrime
     include MotionPrime::ScreenAliasesMixin
     include MotionPrime::ScreenOrientationsMixin
     include MotionPrime::ScreenNavigationMixin
-    include MotionPrime::ScreenNavigationBarMixin
 
-    attr_accessor :parent_screen, :modal, :params, :main_section
+    attr_accessor :parent_screen, :modal, :params, :main_section, :options
     class_attribute :current_screen
 
     included do
       define_callbacks :load
     end
 
-    def on_load; end
+    def app_delegate
+      UIApplication.sharedApplication.delegate
+    end
+
+    def show_sidebar
+      app_delegate.show_sidebar
+    end
+
+    def hide_sidebar
+      app_delegate.hide_sidebar
+    end
 
     def on_screen_load
       run_callbacks :load do
@@ -27,42 +35,28 @@ module MotionPrime
       end
     end
 
-    def on_create(args = {})
+    # Setup the screen, will be called when you run DMViewController.new
+    # @param options [hash] Options passed to setup
+    # @return [MotionPrime::BaseScreen] Ready to use screen
+    def on_create(options = {})
       unless self.is_a?(UIViewController)
         raise StandardError.new("ERROR: Screens must extend UIViewController.")
       end
 
-      self.params = args[:params] || {}
-      args.each do |k, v|
+      self.options = options
+      self.params = options[:params] || {}
+      options.each do |k, v|
         self.send("#{k}=", v) if self.respond_to?("#{k}=")
       end
 
-      @wrap_in_navigation = args[:navigation]
-
       self.on_init if respond_to?(:on_init)
       self
     end
 
-    def wrap_in_navigation?
-      @wrap_in_navigation
-    end
-
     def modal?
       !!self.modal
     end
 
-    def has_navigation?
-      !navigation_controller.nil?
-    end
-
-    def navigation_controller
-      @navigation_controller ||= self.navigationController
-    end
-
-    def navigation_controller=(val)
-      @navigation_controller = val
-    end
-
     def title
       title = self.class.title
       title = self.instance_eval(&title) if title.is_a?(Proc)
@@ -71,39 +65,12 @@ module MotionPrime
 
     def title=(new_title)
       self.class.title(new_title)
-      super
     end
 
     def main_controller
       has_navigation? ? navigation_controller : self
     end
 
-    # ACTIVITY INDICATOR
-    # ---------------------
-
-    def show_activity_indicator
-      if @activity_indicator_view.nil?
-        @activity_indicator_view = UIActivityIndicatorView.gray
-        @activity_indicator_view.center = CGPointMake(view.center.x, view.center.y - 50)
-        view.addSubview @activity_indicator_view
-      end
-      @activity_indicator_view.startAnimating
-    end
-
-    def hide_activity_indicator
-      return unless @activity_indicator_view
-      @activity_indicator_view.stopAnimating
-    end
-
-    def show_notice(message, time = 1.0, type = :notice)
-      hud_type = case type.to_s
-      when 'alert' then MBAlertViewHUDTypeExclamationMark
-      else MBAlertViewHUDTypeCheckmark
-      end
-      MBHUDView.hudWithBody message,
-        type: hud_type, hidesAfter: time, show: true
-    end
-
     def refresh
       main_section.try(:reload_data)
     end

data/motion-prime/screens/_navigation_mixin.rb

@@ -1,17 +1,14 @@
 module MotionPrime
   module ScreenNavigationMixin
-    def app_delegate
-      UIApplication.sharedApplication.delegate
-    end
-
-    def show_sidebar
-      app_delegate.show_sidebar
-    end
-
-    def hide_sidebar
-      app_delegate.hide_sidebar
-    end
-
+    # Open screen as child for current screen if current screen have navigation or new screen is modal.
+    # Otherwise will create screen using app_delegate.open_screen.
+    # Available options:
+    #   animated: open screen with animation.
+    #   modal: open screen as model
+
+    # @param screen [MotionPrime::BaseScreen] Screen to be opened
+    # @param args [Hash] Options for opening screen
+    # @return [MotionPrime::BaseScreen]
     def open_screen(screen, args = {})
       if args[:modal] || has_navigation?
         screen = setup_screen_for_open(screen, args)
@@ -25,8 +22,10 @@ module MotionPrime
       else
         app_delegate.open_screen(screen.main_controller)
       end
+      screen
     end
 
+    
     def close_screen(args = {})
       args[:animated] = args.has_key?(:animated) ? args[:animated] : true
       # Pop current view, maybe with arguments, if in navigation controller
@@ -47,13 +46,28 @@ module MotionPrime
       end
     end
 
-    def ensure_wrapper_controller_in_place(args = {})
-      # Wrap in a NavigationController?
-      if wrap_in_navigation? && !args[:modal]
-        add_navigation_controller
+    def wrap_in_navigation?
+      options[:navigation]
+    end
+
+    def wrap_in_navigation
+      if wrap_in_navigation?
+        wrap_in_navigation!
       end
     end
 
+    def has_navigation?
+      !navigation_controller.nil?
+    end
+
+    def navigation_controller
+      @navigation_controller ||= self.navigationController
+    end
+
+    def navigation_controller=(val)
+      @navigation_controller = val
+    end
+
     private
       def setup_screen_for_open(screen, args = {})
         # Instantiate screen if given a class
@@ -92,19 +106,7 @@ module MotionPrime
         send_on_return(args)
       end
 
-      def has_navigation?
-        !navigation_controller.nil?
-      end
-
-      def navigation_controller
-        @navigation_controller ||= self.navigationController
-      end
-
-      def navigation_controller=(val)
-        @navigation_controller = val
-      end
-
-      def add_navigation_controller
+      def wrap_in_navigation!
         self.navigation_controller = NavigationController.alloc.initWithRootViewController(self)
       end
   end

data/motion-prime/screens/base_screen.rb

@@ -1,12 +1,20 @@
 motion_require '../support/dm_view_controller.rb'
 motion_require '../views/layout.rb'
 motion_require '../screens/_base_mixin.rb'
+motion_require './extensions/_indicators_mixin'
+motion_require './extensions/_navigation_bar_mixin'
 motion_require '../helpers/has_authorization'
 motion_require '../helpers/has_search_bar'
 module MotionPrime
   class BaseScreen < DMViewController
     include Layout
     include ScreenBaseMixin
+
+    # extensions
+    include ScreenIndicatorsMixin
+    include ScreenNavigationBarMixin
+
+    # helpers
     include HasAuthorization
     include HasSearchBar
 

data/motion-prime/screens/extensions/_indicators_mixin.rb

@@ -0,0 +1,26 @@
+module MotionPrime
+  module ScreenIndicatorsMixin
+    def show_activity_indicator
+      if @activity_indicator_view.nil?
+        @activity_indicator_view = UIActivityIndicatorView.gray
+        @activity_indicator_view.center = CGPointMake(view.center.x, view.center.y - 50)
+        view.addSubview @activity_indicator_view
+      end
+      @activity_indicator_view.startAnimating
+    end
+
+    def hide_activity_indicator
+      return unless @activity_indicator_view
+      @activity_indicator_view.stopAnimating
+    end
+
+    def show_notice(message, time = 1.0, type = :notice)
+      hud_type = case type.to_s
+      when 'alert' then MBAlertViewHUDTypeExclamationMark
+      else MBAlertViewHUDTypeCheckmark
+      end
+      MBHUDView.hudWithBody message,
+        type: hud_type, hidesAfter: time, show: true
+    end
+  end
+end

data/motion-prime/screens/sidebar_container_screen.rb

@@ -60,7 +60,7 @@ module MotionPrime
       def prepare_controller(controller)
         controller = setup_screen_for_open(controller, {})
         if content_controller.nil?
-          controller.ensure_wrapper_controller_in_place
+          controller.wrap_in_navigation if controller.respond_to?(:wrap_in_navigation)
           controller.send(:on_screen_load) if controller.respond_to?(:on_screen_load)
           controller = controller.main_controller if controller.respond_to?(:main_controller)
         else

data/motion-prime/sections/base.rb

@@ -83,7 +83,7 @@ module MotionPrime
       index = opts.delete(:at)
       options = build_options_for_element(opts)
       options[:name] ||= key
-      options[:type] ||= options[:text] ? :label : :view
+      options[:type] ||= (options[:text] || options[:attributed_text_options]) ? :label : :view
       element = MotionPrime::BaseElement.factory(options.delete(:type), options)
       if index
         self.elements = Hash[self.elements.to_a.insert index, [key, element]]

data/motion-prime/sections/form.rb

@@ -147,7 +147,7 @@ module MotionPrime
     end
 
     def keyboard_will_show
-      return if table_view.contentSize.height + table_view.top <= UIScreen.mainScreen.bounds.size.height
+      return if table_view.contentSize.height + table_view.top <= UIScreen.mainScreen.bounds.size.height - KEYBOARD_HEIGHT_PORTRAIT
       current_inset = table_view.contentInset
       current_inset.bottom = KEYBOARD_HEIGHT_PORTRAIT + (self.table_element.computed_options[:bottom_content_offset] || 0)
       table_view.contentInset = current_inset
@@ -164,13 +164,16 @@ module MotionPrime
     def on_input_edit(text_field); end
     def on_input_return(text_field)
       text_field.resignFirstResponder
-    end;
+    end
     def textFieldShouldReturn(text_field)
       on_input_return(text_field)
     end
     def textFieldDidBeginEditing(text_field)
       on_input_edit(text_field)
     end
+    def textViewDidBeginEditing(text_view)
+      on_input_edit(text_view)
+    end
 
     def textView(text_view, shouldChangeTextInRange:range, replacementText:string)
       limit = (self.class.text_view_limits || {}).find do |field_name, limit|

data/motion-prime/sections/form/base_field_section.rb

@@ -56,8 +56,8 @@ module MotionPrime
       # focus on text field
       return unless begin_editing
       elements.values.each do |element|
-        if element.view.is_a?(UITextField)
-          element.view.becomeFirstResponder && return
+        if element.view.is_a?(UITextField) || element.view.is_a?(UITextView)
+          element.view.becomeFirstResponder and return
         end
       end
       self

data/motion-prime/support/_key_value_store.rb

@@ -1,5 +1,5 @@
 module MotionPrime
-  module KeyValueStore
+  module SupportKeyValueStore
     extend ::MotionSupport::Concern
 
     # Key-Value accessors

data/motion-prime/support/_padding_attribute.rb

@@ -0,0 +1,60 @@
+module MotionPrime
+  module SupportPaddingAttribute
+    extend ::MotionSupport::Concern
+
+    included do
+      attr_accessor :paddingLeft, :paddingRight, :paddingTop, :paddingBottom, :padding
+    end
+
+    module ClassMethods
+      def default_padding_top
+        0
+      end
+
+      def default_padding_left
+        0
+      end
+
+      def default_padding_right
+        0
+      end
+
+      def default_padding_bottom
+        0
+      end
+    end
+
+    def padding_left
+      self.paddingLeft || self.padding || self.class.default_padding_left
+    end
+
+    def padding_right
+      self.paddingRight || self.padding || self.class.default_padding_right
+    end
+
+    def padding_top
+      self.paddingTop || self.padding || self.class.default_padding_top
+    end
+
+    def padding_bottom
+      self.paddingBottom || self.padding || self.class.default_padding_bottom
+    end
+
+    def padding_insets
+      UIEdgeInsetsMake(padding_top, padding_left, padding_bottom, padding_right)
+    end
+
+    def apply_padding(rect)
+      return unless apply_padding?
+      apply_padding!(rect)
+    end
+
+    def apply_padding!(rect)
+      raise "requires implementation"
+    end
+
+    def apply_padding?
+      ![padding_top, padding_left, padding_right, padding_bottom].all?(&:zero?)
+    end
+  end
+end