motion-prime 0.7.2 → 0.8.0

data/motion-prime/sections/table/table_delegate.rb

@@ -1,20 +1,12 @@
 module MotionPrime
   class TableDelegate
+    include DelegateMixin
     attr_accessor :table_section
     def initialize(options)
       self.table_section = options[:section].try(:weak_ref)
       @section_instance = table_section.to_s
     end
 
-    def delegated_by(view)
-      @delegated_views ||= []
-      @delegated_views << view
-    end
-
-    def clear_delegated
-      Array.wrap(@delegated_views).each { |view| view.setDelegate(nil) }
-    end
-
     # def dealloc
     #   pp 'Deallocating table_delegate for ', @section_instance
     #   super

data/motion-prime/styles/base.rb

@@ -60,6 +60,6 @@ MotionPrime::Styles.define :base do
 
   style :spinner_message, mixins: [:multiline],
     top: proc { screen.view.center.y + 38 }, left: 50, width: 220, text_alignment: :center,
-    font: proc { MotionPrime::Config.font.name.uifont(18) },
+    font: proc { :app_base.uifont(18) },
     line_spacing: 6
 end

data/motion-prime/styles/form.rb

@@ -31,7 +31,7 @@ MotionPrime::Styles.define :base_form do
     height: 16,
     left: 0,
     right: 0,
-    font: proc { MotionPrime::Config.font.name.uifont(12) },
+    font: proc { :app_base.uifont(12) },
     size_to_fit: true
 
   style :field_error_message,
@@ -43,7 +43,7 @@ MotionPrime::Styles.define :base_form do
     number_of_lines: 0,
     size_to_fit: true,
     text_color: :app_error,
-    font: proc { MotionPrime::Config.font.name.uifont(12) }
+    font: proc { :app_base.uifont(12) }
 
   # available options for input:
   # @layer: @border_width: FLOAT
@@ -55,8 +55,8 @@ MotionPrime::Styles.define :base_form do
       border_width: 1,
       border_color: :gray
     },
-    font: proc { MotionPrime::Config.font.name.uifont(16) },
-    placeholder_font: proc { MotionPrime::Config.font.name.uifont(16) },
+    font: proc { :app_base.uifont(16) },
+    placeholder_font: proc { :app_base.uifont(16) },
     background_color: :white,
     left: 0,
     right: 0,
@@ -77,7 +77,7 @@ MotionPrime::Styles.define :base_form do
     },
     title_color: :gray,
     title_label: {
-      font: proc { MotionPrime::Config.font.name.uifont(16) }
+      font: proc {:app_base.uifont(16) }
     }
 
   style :select_field_image,
@@ -121,9 +121,9 @@ MotionPrime::Styles.define :base_form do
 
   style :switch_field_label,
     top: 10,
-    font: proc { MotionPrime::Config.font.name.uifont(16) }
+    font: proc { :app_base.uifont(16) }
 
   style :switch_field_hint,
     top: 40,
-    font: proc { MotionPrime::Config.font.name.uifont(12) }
+    font: proc { :app_base.uifont(12) }
 end

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 end

data/motion-prime/views/layout.rb

@@ -13,11 +13,13 @@ module MotionPrime
       builder = ViewBuilder.new(klass, options)
       options = builder.options.merge(calculate_frame: true, bounds: bounds)
       view = builder.view
+      insert_index = options.delete(:at_index)
+
       if render_target = options.delete(:render_target)
         options[:bounds] = render_target.bounds
-        render_target.addSubview(view)
+        insert_index ? render_target.insertSubview(view, atIndex: insert_index) : render_target.addSubview(view)
       elsif view_stack.any?
-        view_stack.last.addSubview(view)
+        insert_index ? view_stack.last.insertSubview(view, atIndex: insert_index) : view_stack.last.addSubview(view)
       end
 
       setup(view, options, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -234,21 +234,12 @@ files:
 - files/app/environment.rb
 - files/app/models/.gitkeep
 - files/app/screens/application.rb
-- files/app/screens/help.rb
-- files/app/screens/home.rb
-- files/app/screens/sidebar.rb
-- files/app/sections/home/section.rb
-- files/app/sections/sidebar/action.rb
-- files/app/sections/sidebar/table.rb
-- files/app/styles/home.rb
+- files/app/sections/.gitkeep
+- files/app/styles/.gitkeep
 - files/resources/Default-568h@2x.png
 - files/resources/Default.png
 - files/resources/Default@2x.png
 - files/resources/Icon.png
-- files/resources/fonts/ubuntu.ttf
-- files/resources/images/arrow.png
-- files/resources/images/menu_button.png
-- files/resources/images/menu_button@2x.png
 - lib/motion-prime.rb
 - motion-prime.gemspec
 - motion-prime/api_client.rb
@@ -309,7 +300,9 @@ files:
 - motion-prime/screens/extensions/_indicators_mixin.rb
 - motion-prime/screens/extensions/_navigation_bar_mixin.rb
 - motion-prime/screens/screen.rb
+- motion-prime/sections/__section_with_container_mixin.rb
 - motion-prime/sections/_cell_section_mixin.rb
+- motion-prime/sections/_delegate_mixin.rb
 - motion-prime/sections/_draw_section_mixin.rb
 - motion-prime/sections/base_section.rb
 - motion-prime/sections/form.rb
@@ -332,7 +325,6 @@ files:
 - motion-prime/styles/_mixins.rb
 - motion-prime/styles/base.rb
 - motion-prime/styles/form.rb
-- motion-prime/styles/sidebar.rb
 - motion-prime/support/_key_value_store.rb
 - motion-prime/support/_padding_attribute.rb
 - motion-prime/support/mp_button.rb

data/files/app/screens/help.rb

@@ -1,6 +0,0 @@
-class HelpScreen < ApplicationScreen
-  title 'Help'
-  
-  def render
-  end
-end

data/files/app/screens/home.rb

@@ -1,8 +0,0 @@
-class HomeScreen < ApplicationScreen
-  title 'Home'
-
-  def render
-    @main_section = HomeSection.new(screen: self)
-    @main_section.render
-  end
-end

data/files/app/screens/sidebar.rb

@@ -1,14 +0,0 @@
-class SidebarScreen < Prime::Screen
-  def render
-    @main_section = SidebarTableSection.new(screen: self)
-    @main_section.render
-  end
-
-  def open_home
-    app_delegate.open_screen HomeScreen.new
-  end
-
-  def open_help
-    app_delegate.open_screen HelpScreen.new
-  end
-end

data/files/app/sections/home/section.rb

@@ -1,3 +0,0 @@
-class HomeSection < Prime::Section
-  element :date, text: proc { Time.now.strftime("%A, %B %d") }
-end

data/files/app/sections/sidebar/action.rb

@@ -1,5 +0,0 @@
-class SidebarActionSection < Prime::Section
-  container height: 43
-  element :title, text: proc { model[:title] }
-  element :arrow, type: :image
-end

data/files/app/sections/sidebar/table.rb

@@ -1,20 +0,0 @@
-class SidebarTableSection < Prime::TableSection
-  def sidebar_items
-    [
-      {title: 'Home Screen', action: :open_home},
-      {title: 'Help Screen', action: :open_help}
-    ]
-  end
-
-  def table_data
-    sidebar_items.map do |model|
-      SidebarActionSection.new(model: model)
-    end
-  end
-
-  def on_click(table, index)
-    section = data[index.row]
-    return false if !section || !section.model[:action]
-    screen.send section.model[:action].to_sym
-  end
-end

data/files/app/styles/home.rb

@@ -1,9 +0,0 @@
-Prime::Styles.define :home do
-  style :date,
-    text_color: :black,
-    top: 100,
-    width: 320,
-    font: proc { :system.uifont(20) },
-    size_to_fit: true,
-    left: 20,
-end

data/motion-prime/styles/sidebar.rb

@@ -1,23 +0,0 @@
-Prime::Styles.define :sidebar do
-  style :screen,
-    background_color: :app_dark
-
-  style :table,
-    top: 150,
-    left: 0,
-    width: 320,
-    bottom: 0,
-    background_color: :app_dark,
-    separator_color: :clear
-
-  style :table_cell,
-    selection_style: :none
-
-  style :action_title,
-    text_color: :white,
-    left: 20,
-    top: 10,
-    width: 320,
-    font: proc { :system.uifont(20) },
-    size_to_fit: true
-end