motion-prime 0.2.1 → 0.3.0

data/motion-prime/mp.rb

@@ -0,0 +1,4 @@
+module MotionPrime
+end
+::MP = MotionPrime unless defined?(::MP)
+::Prime = MotionPrime unless defined?(::Prime)

data/motion-prime/screens/_base_mixin.rb

@@ -37,14 +37,16 @@ module MotionPrime
         self.send("#{k}=", v) if self.respond_to?("#{k}=")
       end
 
-      if @wrap_in_navigation = args[:navigation]
-        self.add_navigation_controller
-      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
@@ -61,10 +63,6 @@ module MotionPrime
       @navigation_controller = val
     end
 
-    def add_navigation_controller
-      self.navigation_controller = NavigationController.alloc.initWithRootViewController(self)
-    end
-
     def title
       title = self.class.title
       title = self.instance_eval(&title) if title.is_a?(Proc)
@@ -97,19 +95,27 @@ module MotionPrime
       @activity_indicator_view.stopAnimating
     end
 
-    def show_notice(message, time = 1.0)
+    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: MBAlertViewHUDTypeCheckmark, hidesAfter: time, show: true
+        type: hud_type, hidesAfter: time, show: true
     end
 
     def refresh
-      main_section.reload_data
+      main_section.try(:reload_data)
     end
 
     # Class methods
     module ClassMethods
-      def title(t = nil)
-        t ? @title = t : @title ||= self.to_s
+      def title(t = nil, &block)
+        if block_given?
+          @title = block
+        else
+          t ? @title = t : @title ||= self.to_s
+        end
       end
       def before_load(method_name)
         set_callback :load, :before, method_name

data/motion-prime/screens/_navigation_bar_mixin.rb

@@ -8,6 +8,10 @@ module MotionPrime
       navigationItem.leftBarButtonItem
     end
 
+    def remove_navigation_right_button(args = {})
+      navigationItem.setRightBarButtonItem(nil, animated: args[:animated])
+    end
+
     def set_navigation_right_button(title, args = {})
       navigationItem.rightBarButtonItem = create_navigation_button(title, args)
     end
@@ -20,11 +24,18 @@ module MotionPrime
       navigationItem.leftBarButtonItem = create_navigation_button(title, {action: :back}.merge(args))
     end
 
+    def set_navigation_back_or_menu(back_title = 'Back')
+      if parent_screen.is_a?(MotionPrime::SidebarContainerScreen)
+        set_navigation_left_button 'Menu', image: 'images/navigation/menu_button.png', action: :show_sidebar
+      else
+        set_navigation_back_button back_title, icon: 'images/navigation/back_icon.png'
+      end
+    end
+
     def create_navigation_button(title, args = {})
       args[:style]  ||= UIBarButtonItemStylePlain
       args[:target] ||= self
       args[:action] ||= nil
-
       # TODO: Find better place for this code, may be just create custom control
       if args[:image]
         image = args[:image].uiimage
@@ -34,8 +45,7 @@ module MotionPrime
         face.on :touch do
           args[:action].to_proc.call(self)
         end
-        button = UIBarButtonItem.alloc.initWithCustomView(face)
-        button
+        UIBarButtonItem.alloc.initWithCustomView(face)
       elsif args[:icon]
         image = args[:icon].uiimage
         face = UIButton.buttonWithType UIButtonTypeCustom
@@ -46,11 +56,10 @@ module MotionPrime
         face.on :touch do
           args[:action].to_proc.call(self)
         end
-        button = UIBarButtonItem.alloc.initWithCustomView(face)
-        button
+        UIBarButtonItem.alloc.initWithCustomView(face)
       else
         UIBarButtonItem.alloc.initWithTitle(title,
-            style: args[:style], target: args[:target], action: args[:action])
+          style: args[:style], target: args[:target], action: args[:action])
       end
     end
   end

data/motion-prime/screens/_navigation_mixin.rb

@@ -6,13 +6,14 @@ module MotionPrime
 
     def open_screen(screen, args = {})
       # Apply properties to instance
-      screen = setup_screen_for_open(screen, args)
-      ensure_wrapper_controller_in_place(screen, args)
-      screen.send(:on_screen_load) if screen.respond_to?(:on_screen_load)
-      if args[:modal]
-        present_modal_view_controller screen, (args.has_key?(:animated) ? args[:animated] : true)
-      elsif has_navigation?
-        push_view_controller screen, args
+      if args[:modal] || has_navigation?
+        screen = setup_screen_for_open(screen, args)
+        screen.send(:on_screen_load) if screen.respond_to?(:on_screen_load)
+        if args[:modal] || !has_navigation?
+          present_modal_view_controller screen, (args.has_key?(:animated) ? args[:animated] : true)
+        else
+          push_view_controller screen, args
+        end
       else
         app_delegate.open_screen(screen.main_controller)
       end
@@ -56,6 +57,13 @@ module MotionPrime
       navigation_controller.pushViewController(vc, animated: (args.has_key?(:animated) ? args[:animated] : true))
     end
 
+    def ensure_wrapper_controller_in_place(args = {})
+      # Wrap in a NavigationController?
+      if wrap_in_navigation? && !args[:modal]
+        add_navigation_controller
+      end
+    end
+
     protected
 
     def setup_screen_for_open(screen, args = {})
@@ -67,19 +75,10 @@ module MotionPrime
       screen.title = args[:title] if args[:title] && screen.respond_to?("title=")
       screen.modal = args[:modal] if args[:modal] && screen.respond_to?("modal=")
 
-      # Wrap in a NavigationController?
-      screen.add_navigation if args[:navigation] && screen.respond_to?(:add_navigation)
-
       # Return modified screen instance
       screen
     end
 
-    def ensure_wrapper_controller_in_place(screen, args={})
-      if !args[:modal] && screen.respond_to?(:navigation_controller=)
-        screen.navigation_controller ||= navigation_controller
-      end
-    end
-
     def present_modal_view_controller(screen, animated)
       self.presentModalViewController(screen.main_controller, animated: animated)
     end

data/motion-prime/screens/base_screen.rb

@@ -13,8 +13,12 @@ module MotionPrime
     def render
     end
 
+    def default_styles
+      [:base_screen, self.class_name_without_kvo.underscore.to_sym]
+    end
+
     def on_load
-      setup view, styles: [:base_screen, self.class.name.underscore.to_sym] do
+      setup view, styles: default_styles do
         render
       end
     end

data/motion-prime/screens/sidebar_container_screen.rb

@@ -1,58 +1,73 @@
 module MotionPrime
-  class SidebarContainerScreen < PKRevealController
-
+  class SidebarContainerScreen < RESideMenu
     include ::MotionPrime::ScreenBaseMixin
 
     def self.new(menu, content, options={})
-      screen = self.revealControllerWithFrontViewController(nil, leftViewController: nil, options: nil)
+      screen = self.alloc.initWithContentViewController(nil, menuViewController: nil)
+      screen.backgroundImage = "images/sidebar/background.png".uiimage
+
+      full_width = UIScreen.mainScreen.bounds.size.width
+
+      if scale = options[:content_scale_value]
+        screen.contentViewScaleValue = scale
+      end
+      x_offset = options[:x_offset] || 45
+      screen.contentViewInPortraitOffsetCenterX = full_width*(1 + screen.contentViewScaleValue/2) - x_offset
+
+      if y_offset = options[:y_offset]
+        screen.contentViewInPortraitOffsetCenterY = UIScreen.mainScreen.bounds.size.height/2 + y_offset
+      end
+
       screen.on_create(options) if screen.respond_to?(:on_create)
       screen.menu_controller = menu unless menu.nil?
       screen.content_controller = content unless content.nil?
+
       screen
     end
 
     def show_sidebar
-      show_controller menu_controller
+      self.presentMenuViewController
     end
 
     def hide_sidebar
-      show_controller content_controller
+      self.hideMenuViewController
     end
 
     def menu_controller=(c)
-      setLeftViewController prepare_controller(c),
-        focusAfterChange: true, completion: default_completion_block
+      self.setMenuViewController prepare_controller(c)
     end
 
     def content_controller=(c)
-      setFrontViewController prepare_controller(c),
-        focusAfterChange: true, completion: default_completion_block
+      controller = prepare_controller(c)
+      if content_controller.nil?
+        self.setContentViewController controller
+      else
+        content_controller.viewControllers = [controller]
+      end
+      hide_sidebar
     end
 
     def menu_controller
-      self.leftViewController
+      self.menuViewController
     end
 
     def content_controller
-      self.frontViewController
+      self.contentViewController
     end
 
     private
 
-      def show_controller(controller)
-        showViewController controller, animated: true, completion: default_completion_block
-      end
-
       def prepare_controller(controller)
-        controller.on_screen_load if controller.respond_to?(:on_screen_load)
         controller = setup_screen_for_open(controller, {})
-        ensure_wrapper_controller_in_place(controller, {})
-        controller = controller.main_controller if controller.respond_to?(:main_controller)
+        if content_controller.nil?
+          controller.ensure_wrapper_controller_in_place
+          controller.send(:on_screen_load) if controller.respond_to?(:on_screen_load)
+          controller = controller.main_controller if controller.respond_to?(:main_controller)
+        else
+          controller.navigation_controller = content_controller
+          controller.send(:on_screen_load) if controller.respond_to?(:on_screen_load)
+        end
         controller
       end
-
-      def default_completion_block
-        -> (completed) { true }
-      end
   end
 end

data/motion-prime/sections/base.rb

@@ -19,31 +19,73 @@ module MotionPrime
     include MotionPrime::HasNormalizer
 
     attr_accessor :screen, :model, :name, :options, :elements
-    class_attribute :elements_options, :container_options
+    class_attribute :elements_options, :container_options, :keyboard_close_bindings
     define_callbacks :render
 
     def initialize(options = {})
       @options = options
       @model = options[:model]
       @name = options[:name] ||= default_name
-      create_elements
-      self.hide if container_options[:hidden]
+      @options_block = options[:block]
+      load_section
+    end
+
+    def container_options
+      @normalized_container_options or begin
+        # priority: class; from styles; passed directly
+        raw_container_options = self.class.container_options.try(:clone) || {}
+        passed_container_options = options.delete(:container) || {}
+        raw_container_options.merge!(passed_container_options)
+        @normalized_container_options = normalize_options(raw_container_options)
+
+        style_container_options = style_options.delete(:container) || {}
+        @normalized_container_options.merge!(style_container_options.except(*passed_container_options.keys))
+      end
+    end
+
+    def style_options
+      {}
     end
 
     def default_name
-      self.class.name.demodulize.underscore.gsub(/\_section$/, '')
+      self.class_name_without_kvo.demodulize.underscore.gsub(/\_section$/, '')
     end
 
     def elements_options
       self.class.elements_options || {}
     end
 
+    def load_section
+      create_elements
+      self.instance_eval(&@options_block) if @options_block.is_a?(Proc)
+    end
+
+    def reload_section
+      self.elements.values.map(&:view).flatten.compact.each { |view| view.removeFromSuperview }
+      load_section
+      run_callbacks :render do
+        render!
+      end
+    end
+
     def create_elements
       self.elements = {}
       elements_options.each do |key, opts|
-        next unless render_element?(key)
-        options = build_options_for_element(opts)
-        self.elements[key] = MotionPrime::BaseElement.factory(options.delete(:type), options)
+        add_element(key, opts)
+      end
+    end
+
+    def add_element(key, opts)
+      return unless render_element?(key)
+      index = opts.delete(:at)
+      options = build_options_for_element(opts)
+      options[:name] ||= key
+      options[:type] ||= :label
+      element = MotionPrime::BaseElement.factory(options.delete(:type), options)
+      if index
+        self.elements = Hash[self.elements.to_a.insert index, [key, element]]
+      else
+        self.elements[key] = element
       end
     end
 
@@ -60,7 +102,7 @@ module MotionPrime
 
     def cell
       first_element = elements.values.first
-      first_element.view.superview
+      first_element.view.superview.superview
     end
 
     def render(container_options = {})
@@ -97,12 +139,6 @@ module MotionPrime
       end
     end
 
-    def container_options
-      @container_options ||= normalize_options(
-        self.class.container_options.try(:clone) || {}
-      )
-    end
-
     def container_height
       container_options[:height] || DEFAULT_CONTENT_HEIGHT
     end
@@ -116,6 +152,12 @@ module MotionPrime
     def keyboard_will_show; end
     def keyboard_will_hide; end
 
+    def dealloc
+      NSNotificationCenter.defaultCenter.removeObserver self
+      self.delegate = nil if self.respond_to?(:delegate)
+      super
+    end
+
     def bind_keyboard_events
       NSNotificationCenter.defaultCenter.addObserver self,
                                          selector: :on_keyboard_show,
@@ -135,10 +177,31 @@ module MotionPrime
                                            object: nil
     end
 
+    def bind_keyboard_close
+      return unless self.class.keyboard_close_bindings.present?
+      Array.wrap(self.instance_eval(&self.class.keyboard_close_bindings[:tap_on])).each do |view|
+        gesture_recognizer = UITapGestureRecognizer.alloc.initWithTarget(self, action: :hide_keyboard)
+        view.addGestureRecognizer(gesture_recognizer)
+        gesture_recognizer.cancelsTouchesInView = false
+      end
+    end
+
+    def keyboard_close_bindings_options
+      @keyboard_close_bindings_options ||= normalize_options(self.class.keyboard_close_bindings.clone, self)
+    end
+
+    def hide_keyboard
+      elements = Array.wrap(keyboard_close_bindings_options[:elements])
+      views = Array.wrap(keyboard_close_bindings_options[:views])
+
+      elements.each { |el| views << el.view if %w[text_field text_view].include?(el.view_name) && el.view }
+      (views + Array.wrap(keyboard_close_bindings_options[:views])).compact.each(&:resignFirstResponder)
+    end
+
     class << self
       def element(name, options = {}, &block)
+        options[:name] ||= name
         options[:type] ||= :label
-        options[:name] = name
         options[:block] = block
         self.elements_options ||= {}
         self.elements_options[name] = options
@@ -153,8 +216,11 @@ module MotionPrime
       def after_render(method_name)
         set_callback :render, :after, method_name
       end
+      def bind_keyboard_close(options)
+        self.keyboard_close_bindings = options
+      end
     end
     after_render :bind_keyboard_events
-
+    after_render :bind_keyboard_close
   end
 end