ProMotion 0.1.0 → 0.1.1

data/Gemfile

@@ -1,6 +1,5 @@
 source :rubygems
 
 # Specify your gem's dependencies in ProMotion.gemspec
-gem "motion-table", :path => "~/Code/motion-table"
 gemspec
 

data/README.md

@@ -41,7 +41,7 @@ class HomeScreen < ProMotion::Screen
     # Set up the elements in your view with add_element:
     @label = add_element UILabel.alloc.initWithFrame(CGRectMake(5, 5, 20, 20)), {
       text: "This is awesome!",
-      font: UIFont.UIFont.systemFontOfSize(18)
+      font: UIFont.systemFontOfSize(18)
     }
   end
   
@@ -93,6 +93,12 @@ def settings_button_tapped
 end
 ```
 
+Open a new screen as a modal:
+
+```ruby
+open_screen SettingsScreen, modal: true
+```
+
 You can pass in arguments to other screens if they have accessors:
 
 ```ruby
@@ -147,7 +153,19 @@ def on_load
 end
 ```
 
-The helper add_element takes a
+The helper add_element takes any view object and adds it to the current view. You can also use
+the helper ProMotion::ViewHelper.set_attributes(view, attributes) to do the same thing without adding
+it to the current view. Screens include this helper by default.
+
+```ruby
+@element = add_element UIView.alloc.initWithFrame(CGRectMake(0, 0, 20, 20)), {
+  backgroundColor: UIColor.whiteColor
+}
+
+@element = set_attributes(UIView.alloc.initWithFrame(CGRectMake(0, 0, 20, 20)), {
+  backgroundColor: UIColor.whiteColor
+}
+```
 
 You can create sectioned table screens easily. TableScreen, SectionedTableScreen, GroupedTableScreen
 

data/lib/ProMotion/_modules/ScreenElements.rb

@@ -0,0 +1,31 @@
+module ProMotion
+  module ScreenElements
+    include ProMotion::ViewHelper
+    
+    def add_element(view, attrs = {})
+      if attrs.length > 0
+        set_attributes(view, attrs)
+      end
+      self.view_controller.view.addSubview(view)
+      view
+    end
+
+    def remove_element(view)
+      view.removeFromSuperview
+      view = nil
+      nil
+    end
+
+    def bounds
+      return self.view_controller.view.bounds
+    end
+    
+    def frame
+      return self.view_controller.view.frame
+    end
+
+    def view
+      return self.view_controller.view
+    end
+  end
+end

data/lib/ProMotion/_modules/ScreenNavigation.rb

@@ -0,0 +1,92 @@
+module ProMotion
+  module ScreenNavigation
+    def open_screen(screen, args = {})
+      # Instantiate screen if given a class instead
+      screen = screen.new if screen.respond_to? :new
+      screen.add_nav_bar if args[:nav_bar]
+      screen.parent_screen = self
+
+      screen.main_controller.hidesBottomBarWhenPushed = true if args[:hide_tab_bar]
+      
+      if args[:close_all]
+        fresh_start(screen)
+      elsif args[:modal]
+        screen.modal = true
+        self.view_controller.presentModalViewController(screen.main_controller, animated:true)
+      elsif self.navigation_controller
+        screen.navigation_controller = self.navigation_controller
+        push_view_controller screen.view_controller
+      else
+        open_view_controller screen.main_controller
+      end
+      
+      screen.send(:on_opened) if screen.respond_to?(:on_opened)
+    end
+
+    def fresh_start(screen)
+      app_delegate.fresh_start(screen)
+    end
+
+    def app_delegate
+      UIApplication.sharedApplication.delegate
+    end
+
+    def close_screen(args = {})
+      # Pop current view, maybe with arguments, if in navigation controller
+      if self.is_modal?
+        self.parent_screen.view_controller.dismissModalViewControllerAnimated(true)
+      elsif self.navigation_controller
+        self.navigation_controller.popViewControllerAnimated(true)
+      else
+        # What do we do now? Nothing to "pop". For now, don't do anything.
+      end
+    end
+
+    def tab_bar_controller(*screens)
+      tab_bar_controller = UITabBarController.alloc.init
+
+      view_controllers = []
+      screens.each do |s|
+        if s.is_a? Screen
+          s = s.new if s.respond_to? :new
+          view_controllers << s.main_controller
+        else
+          Console.log("Non-Screen passed into tab_bar_controller: #{s.to_s}", withColor: Console::RED_COLOR)
+        end
+      end
+
+      tab_bar_controller.viewControllers = view_controllers
+      tab_bar_controller
+    end
+    
+    def open_tab_bar(*screens)
+      tab_bar = tab_bar_controller(*screens)
+      open_view_controller tab_bar
+      screens.each do |s|
+        s.on_opened if s.respond_to? :on_opened
+        s.parent_screen = self if s.respond_to? "parent_screen="
+      end
+      tab_bar
+    end
+
+    def push_tab_bar(*screens)
+      tab_bar = tab_bar_controller(*screens)
+      push_view_controller tab_bar
+      screens.each do |s|
+        s.on_opened if s.respond_to? :on_opened
+        s.parent_screen = self if s.respond_to? "parent_screen="
+      end
+      tab_bar
+    end
+
+    def open_view_controller(vc)
+      UIApplication.sharedApplication.delegate.load_root_view vc
+    end
+
+    def push_view_controller(vc)
+      # vc.hidesBottomBarWhenPushed = true if args[:hide_tab_bar]
+      Console.log(" You need a nav_bar if you are going to push #{vc.to_s} onto it.", withColor: Console::RED_COLOR) unless self.navigation_controller
+      self.navigation_controller.pushViewController(vc, animated: true)
+    end
+  end
+end

data/lib/ProMotion/classes/Screen.rb

@@ -1,137 +1,10 @@
-module ProMotion
-  module ScreenElements
-    def add_element(view, attrs = {})
-      if attrs.length > 0
-        set_attributes(view, attrs)
-      end
-      self.view_controller.view.addSubview(view)
-      view
-    end
-
-    def remove_element(view)
-      view.removeFromSuperview
-      view = nil
-      nil
-    end
-
-    def bounds
-      return self.view_controller.view.bounds
-    end
-    
-    def frame
-      return self.view_controller.view.frame
-    end
-
-    def view
-      return self.view_controller.view
-    end
-
-    def set_attributes(element, args = {})
-      args.each do |k, v|
-        element.send("#{k}=", v) if element.respond_to? "#{k}="
-      end
-      element
-    end
-  end
-
-  module ScreenNavigation
-    def open_screen(screen, args = {})
-      # Instantiate screen if given a class instead
-      screen = screen.new if screen.respond_to? :new
-      screen.add_nav_bar if args[:nav_bar]
-      screen.parent_screen = self
-
-      screen.main_controller.hidesBottomBarWhenPushed = true if args[:hide_tab_bar]
-      
-      if args[:close_all]
-        fresh_start(screen)
-      elsif self.navigation_controller
-        screen.navigation_controller = self.navigation_controller
-        push_view_controller screen.view_controller
-      else
-        open_view_controller screen.main_controller
-      end
-      
-      screen.on_opened if screen.respond_to? :on_opened
-    end
-
-    def fresh_start(screen)
-      app_delegate.fresh_start(screen)
-    end
-
-    def app_delegate
-      UIApplication.sharedApplication.delegate
-    end
-
-    def close_screen(args = {})
-      # Pop current view, maybe with arguments, if in navigation controller
-      if self.navigation_controller
-        self.navigation_controller.popViewControllerAnimated(true)
-      else
-        # What do we do now? Nothing to "pop"
-      end
-    end
-
-    def tab_bar_controller(*screens)
-      tab_bar_controller = UITabBarController.alloc.init
-
-      view_controllers = []
-      screens.each do |s|
-        if s.is_a? Screen
-          s = s.new if s.respond_to? :new
-          view_controllers << s.main_controller
-        else
-          Console.log("Non-Screen passed into tab_bar_controller: #{s.to_s}", withColor: Console::RED_COLOR)
-        end
-      end
-
-      tab_bar_controller.viewControllers = view_controllers
-      tab_bar_controller
-    end
-    
-    def open_tab_bar(*screens)
-      tab_bar = tab_bar_controller(*screens)
-      open_view_controller tab_bar
-      screens.each do |s|
-        s.on_opened if s.respond_to? :on_opened
-        s.parent_screen = self if s.respond_to? "parent_screen="
-      end
-      tab_bar
-    end
-
-    def push_tab_bar(*screens)
-      tab_bar = tab_bar_controller(*screens)
-      push_view_controller tab_bar
-      screens.each do |s|
-        s.on_opened if s.respond_to? :on_opened
-        s.parent_screen = self if s.respond_to? "parent_screen="
-      end
-      tab_bar
-    end
-
-    def open_view_controller(vc)
-      UIApplication.sharedApplication.delegate.load_root_view vc
-    end
-
-    def push_view_controller(vc)
-      # vc.hidesBottomBarWhenPushed = true if args[:hide_tab_bar]
-      Console.log(" You need a nav_bar if you are going to push #{vc.to_s} onto it.", withColor: Console::RED_COLOR) unless self.navigation_controller
-      self.navigation_controller.pushViewController(vc, animated: true)
-    end
-  end
-end
-
 module ProMotion
   # Instance methods
   class Screen
     include ProMotion::ScreenNavigation
     include ProMotion::ScreenElements
     
-    attr_accessor :view_controller
-    attr_accessor :navigation_controller
-    attr_accessor :parent_screen
-    attr_accessor :first_screen
-    attr_accessor :tab_bar_item
+    attr_accessor :view_controller, :navigation_controller, :parent_screen, :first_screen, :tab_bar_item, :modal
 
     def initialize(attrs = {})
       attrs.each do |k, v|
@@ -149,6 +22,10 @@ module ProMotion
       self
     end
 
+    def is_modal?
+      self.modal
+    end
+
     def load_view_controller
       self.view_controller ||= ViewController
     end
@@ -200,6 +77,7 @@ module ProMotion
     end
 
     def view_will_appear(animated)
+      self.will_appear if self.respond_to? :will_appear
     end
 
     def view_did_appear(animated)

data/lib/ProMotion/helpers/ViewHelper.rb

@@ -0,0 +1,16 @@
+module ProMotion
+  module ViewHelper
+    def set_attributes(element, args = {})
+      args.each do |k, v|
+        element.send("#{k}=", v) if element.respond_to? "#{k}="
+      end
+      element
+    end
+
+    def frame_from_array(array)
+      return CGRectMake(array[0], array[1], array[2], array[3]) if array.length == 4
+      Console.log(" - frame_from_array expects an array with four elements.", withColor: Console::RED_COLOR)
+      CGRectZero
+    end
+  end
+end

data/lib/ProMotion/helpers/motion-table/{first → 1st}/sectioned_table.rb

@@ -44,18 +44,26 @@ module ProMotion::MotionTable
       tableCell = tableView.dequeueReusableCellWithIdentifier(cellIdentifier)
       unless tableCell
         tableCell = UITableViewCell.alloc.initWithStyle(dataCell[:cellStyle], reuseIdentifier:cellIdentifier)
-        tableCell.accessoryView = dataCell[:accessoryView] if dataCell[:accessoryView]
-        
-        if dataCell[:accessory] && dataCell[:accessory] == :switch
-          switchView = UISwitch.alloc.initWithFrame(CGRectZero)
-          switchView.addTarget(self, action: "accessoryToggledSwitch:", forControlEvents:UIControlEventValueChanged);
-          switchView.on = true if dataCell[:accessoryDefault]
-          tableCell.accessoryView = switchView
-        end
+      end
 
-        if dataCell[:subtitle]
-          tableCell.detailTextLabel.text = dataCell[:subtitle]
-        end
+      tableCell.accessoryView = dataCell[:accessoryView] if dataCell[:accessoryView]
+  
+      if dataCell[:accessory] && dataCell[:accessory] == :switch
+        switchView = UISwitch.alloc.initWithFrame(CGRectZero)
+        switchView.addTarget(self, action: "accessoryToggledSwitch:", forControlEvents:UIControlEventValueChanged);
+        switchView.on = true if dataCell[:accessoryDefault]
+        tableCell.accessoryView = switchView
+      end
+
+      if dataCell[:subtitle]
+        tableCell.detailTextLabel.text = dataCell[:subtitle]
+      end
+
+
+      if dataCell[:image]
+        tableCell.imageView.layer.masksToBounds = true
+        tableCell.imageView.image = dataCell[:image][:image]
+        tableCell.imageView.layer.cornerRadius = dataCell[:image][:radius] if dataCell[:image][:radius]
       end
 
       tableCell.text = dataCell[:title]

data/lib/ProMotion/version.rb

@@ -1,3 +1,3 @@
 module ProMotion
-  VERSION = "0.1.0" unless defined?(ProMotion::VERSION)
+  VERSION = "0.1.1" unless defined?(ProMotion::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2012-09-11 00:00:00.000000000 Z
 dependencies: []
 description: ProMotion is a new way to organize RubyMotion apps.
 email:
@@ -30,22 +30,27 @@ files:
 - app/screens/home_screen.rb
 - app/screens/test_screen.rb
 - lib/ProMotion.rb
+- lib/ProMotion/.DS_Store
 - lib/ProMotion/AppDelegate.rb
 - lib/ProMotion/Console.rb
 - lib/ProMotion/ProMotion.rb
+- lib/ProMotion/_ext/NavigationController.rb
+- lib/ProMotion/_ext/TableViewController.rb
+- lib/ProMotion/_ext/ViewController.rb
+- lib/ProMotion/_modules/ScreenElements.rb
+- lib/ProMotion/_modules/ScreenNavigation.rb
+- lib/ProMotion/classes/.DS_Store
 - lib/ProMotion/classes/Element.rb
 - lib/ProMotion/classes/Screen.rb
 - lib/ProMotion/classes/TableScreen.rb
-- lib/ProMotion/ext/NavigationController.rb
-- lib/ProMotion/ext/TableViewController.rb
-- lib/ProMotion/ext/ViewController.rb
 - lib/ProMotion/helpers/MeasureHelper.rb
 - lib/ProMotion/helpers/TabBar.rb
+- lib/ProMotion/helpers/ViewHelper.rb
+- lib/ProMotion/helpers/motion-table/1st/searchable_table.rb
+- lib/ProMotion/helpers/motion-table/1st/sectioned_table.rb
+- lib/ProMotion/helpers/motion-table/2nd/grouped_table.rb
+- lib/ProMotion/helpers/motion-table/2nd/plain_table.rb
 - lib/ProMotion/helpers/motion-table/console.rb
-- lib/ProMotion/helpers/motion-table/first/searchable_table.rb
-- lib/ProMotion/helpers/motion-table/first/sectioned_table.rb
-- lib/ProMotion/helpers/motion-table/grouped_table.rb
-- lib/ProMotion/helpers/motion-table/plain_table.rb
 - lib/ProMotion/version.rb
 homepage: https://github.com/clearsightstudio/ProMotion
 licenses: []