motion-prime 0.9.1 → 0.9.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTkxOTc5ZjRkMTM3NGZiM2U5ZDkxZjNiMTkxZTlmYjM1M2NjMDZmNg==
+    NmQ3ZGM2Yzk1NGVmZDhiMDVkZWMxMTkyNmU0MjJlODE0ODBkMTJmNg==
   data.tar.gz: !binary |-
-    ZjMyMTY2ODZhNDY4MzJmZWI4MGZhMjc3NDViN2EyNTFkMmNmZTYzNg==
+    YWJhYTVhYmE5OWEzYmQ3M2ExZDA3NjhlMTNjN2RiYzcyYTRjMmNiNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjdlZDY1ZWExM2EzMDg1ZmIyNDI2YjlhMjQzMjllNDBmZDFjZDQ4NzlhY2Jl
-    Y2Q1OTk4NDlhM2ZiOTU5MDg2MjEzYzAwZTQwM2I3ZjczMWZlYTUwNWQwMjJk
-    OWM3MDk5YTQxYjNmMjVkZmE0YWUxZWZhMTZmMjI1YjAzMDdjNjE=
+    OGRlNTdiYWIxNTU3MzZkNmE0ODRiZjJmNTY2MGVjZGI0NDUxYzRjNDIwNThk
+    ZGE5YjE4NTIzYzJkMDI2OTcxMjJkOWU2MmYwOGU1NDZmZjk3YWZjMGYwZTI3
+    YzkyMjM0MGI5YzhiMDZjNDMzMDQ0ODAwOWQwYjdmZmE0OTFmNjg=
   data.tar.gz: !binary |-
-    MGI3ZmIxZDFkNzc5YWQ2ZDc1Mjg3YWEwMzY0NDQ1M2I5NTFjMDgyNWNlY2Fk
-    OTc5Mjg4YjJkNjk1MzJkMjQ4Mjk4NmYwYjRhZDg4MGY4NTNhMDI3MDMwNWZl
-    MjM4ZGVkNTk4NjhlYWMyY2E2NDE0NDNmZDYwOTRjMzlmN2ZkNTM=
+    YzEwMTg1MDk2OTc0MjIyNDVmOWJjZTU2MGE2NWM2OTc2OGFlNzc2YjhmOWEw
+    ZDcyMWYxZDhmMTA0NDNhYTBkZGRjNmM5NDQ0ZTUwNDY5Mzk0ZGU1NjRkZGJk
+    ODA5NjU1MDhkMzYyMWM4NWU4NGEzY2QxYTNlMWRiNDk5NTk0MWY=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+=== 0.9.2
+* Updated scaffold and added deleting items.
+* Ability to reload base section.
+
 === 0.9.1
 * Set correct navigation button title color by default.
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.9.1)
+    motion-prime (0.9.2)
       activesupport
       afmotion (~> 2.0.0)
       bubble-wrap (~> 1.5.0)

data/files/Gemfile

@@ -1,10 +1,10 @@
 source 'http://rubygems.org'
 
 gem 'motion-cocoapods', '~> 1.4.0'
-gem 'motion-prime', '0.9.1'
+gem 'motion-prime', '0.9.2'
 
 # add reside menu for sidebar support
-gem 'prime_reside_menu', '~> 0.1.4'
+# gem 'prime_reside_menu', '~> 0.1.4'
 
 # or add sliding menu for sidebar support
 # gem 'prime_sliding_menu', '~> 0.1.5'

data/files/app/app_delegate.rb

@@ -1,5 +1,5 @@
 class AppDelegate < Prime::BaseAppDelegate
   def on_load(app, options)
-    # open_screen :home, sidebar: true
+    # open_screen :home
   end
 end

data/generators/templates/scaffold/cell.rb

@@ -1,4 +1,4 @@
-class <%= @p_class_name %>CellSection < Prime::Section
+class <%= @p_class_name %>IndexCellSection < Prime::Section
   container height: 40
   element :title, text: proc { model.title }
 end

data/generators/templates/scaffold/form.rb

@@ -6,13 +6,26 @@ class <%= @p_class_name %>FormSection < Prime::FormSection
       placeholder: "Enter title here"
     }
 
+  field :delete, type: :submit,
+    button: { 
+      title: "Delete", 
+      background_color: :red 
+    },
+    action: :on_delete,
+    if: proc { model.persisted? }
+
   field :submit, type: :submit,
     button: { title: "Save" },
     action: :on_submit
 
+  def on_delete
+    model.delete
+    screen.close_screen(to_root: true)
+  end
+
   def on_submit
     model.assign_attributes(field_values)
     model.save
-    screen.back
+    screen.close_screen
   end
 end

data/generators/templates/scaffold/screen.rb

@@ -7,7 +7,7 @@ class <%= @p_class_name %>Screen < ApplicationScreen
     set_navigation_right_button 'New' do
       open_screen "<%= @p_name %>#new"
     end
-    set_section :<%= @p_name %>_table
+    set_section :<%= @p_name %>_index_table
   end
 
   # open_screen "<%= @p_name %>#show"
@@ -38,8 +38,8 @@ class <%= @p_class_name %>Screen < ApplicationScreen
   end
 
   def on_return
-    if action?(:index)
-      main_section.reload_data
+    if action?(:index) || action?(:show)
+      refresh
     end
   end
 end

data/generators/templates/scaffold/styles.rb

@@ -1,6 +1,6 @@
 Prime::Styles.define :<%= @p_name %> do
-  style :cell do
-    style :title,
+  style :index do
+    style :cell_title,
       text_color: :app_base,
       left: 20,
       top: 10,

data/generators/templates/scaffold/table.rb

@@ -1,7 +1,7 @@
-class <%= @p_class_name %>TableSection < Prime::TableSection
+class <%= @p_class_name %>IndexTableSection < Prime::TableSection
   def table_data
     <%= @s_class_name %>.all.map do |model|
-      <%= @p_class_name %>CellSection.new(model: model)
+      <%= @p_class_name %>IndexCellSection.new(model: model)
     end
   end
 

data/motion-prime/screens/_base_mixin.rb

@@ -64,7 +64,7 @@ module MotionPrime
     end
 
     def refresh
-      main_section.try(:reload_data)
+      main_section.try(:reload)
     end
 
     # Class methods

data/motion-prime/screens/_navigation_mixin.rb

@@ -36,9 +36,9 @@ module MotionPrime
       close_screen
     end
 
-    def send_on_return
-      if parent_screen && parent_screen.respond_to?(:on_return)
-        parent_screen.send(:on_return)
+    def send_on_return(screen)
+      if screen && screen.respond_to?(:on_return)
+        screen.send(:on_return)
       end
     end
 
@@ -91,7 +91,7 @@ module MotionPrime
       # @return screen [Prime::Screen] screen appearing after close
       def close_screen_modal(args = {})
         parent_screen.dismissViewControllerAnimated(args[:animated], completion: lambda {
-          send_on_return
+          send_on_return(parent_screen)
         })
         parent_screen
       end
@@ -113,7 +113,7 @@ module MotionPrime
             result = self.navigation_controller.childViewControllers.last
           end
         end
-        send_on_return
+        send_on_return(result)
         result
       end
 

data/motion-prime/sections/base_section.rb

@@ -139,7 +139,11 @@ module MotionPrime
 
     # Force reload section, will also re-render elements.
     # For table view cells will also reload it's table data.
+    #
+    # @return [Boolean] true
     def reload_section
+      # reload Base Elements
+      # TODO: probably should use update_with_options for Base elements too?
       self.elements_to_render.values.map(&:view).flatten.each do |view|
         view.removeFromSuperview if view
       end
@@ -147,11 +151,23 @@ module MotionPrime
       run_callbacks :render do
         render!
       end
+      # reload Draw Elements
+      elements_to_draw.each do |key, element|
+        element.update_with_options
+      end
 
       if @table && !self.is_a?(BaseFieldSection)
         cell.setNeedsDisplay
         @table.reload_table_data
       end
+      true
+    end
+
+    # Alias for reload_section
+    #
+    # @return [Boolean] true
+    def reload
+      reload_section
     end
 
     def add_element(key, options = {})

data/motion-prime/sections/table.rb

@@ -53,6 +53,13 @@ module MotionPrime
       reload_table_data
     end
 
+    # Alias for reload_data
+    #
+    # @return [Boolean] true
+    def reload
+      reload_data
+    end
+
     # Reload table view
     #
     # @return [Boolean] true

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake