ProMotion 0.3.0 → 0.4.0

data/app/app_delegate.rb

@@ -1,5 +1,5 @@
 class AppDelegate < ProMotion::AppDelegateParent
   def on_load(app, options)
-    open_screen TestScreen, nav_bar: true
+    open_tab_bar HomeScreen.new(nav_bar: true), TestScreen.new(nav_bar:true)
   end
-end
+end

data/app/screens/home_screen.rb

@@ -2,9 +2,20 @@ class HomeScreen < ProMotion::Screen
   title "Home Screen"
   
   def on_load
-    @label = add_view UILabel.alloc.initWithFrame(CGRectMake(5, 5, 20, 20)), {
-      text: "This is awesome!",
-      font: UIFont.UIFont.systemFontOfSize(18)
+    @label = add_view UILabel.alloc.initWithFrame(CGRectZero), {
+      text: "Working...",
+      font: UIFont.systemFontOfSize(18),
+      textColor: UIColor.blackColor
     }
+
+    self.view.backgroundColor = UIColor.whiteColor
+    self.set_nav_bar_right_button "Test", action: :test_it
+  end
+
+  def on_appear
+  end
+
+  def test_it
+    open TestScreen
   end
 end

data/app/screens/test_screen.rb

@@ -1,10 +1,26 @@
-class TestScreen < ProMotion::TableScreen
+class TestScreen < ProMotion::Screen
   title "Test Screen"
   
   def on_load
-    @label = add_view UILabel.alloc.initWithFrame(CGRectMake(5, 5, 20, 20)), {
+    @label = add_element UILabel.alloc.initWithFrame(CGRectMake(5, 5, 320, 30)), {
       text: "This is awesome!",
-      font: UIFont.UIFont.systemFontOfSize(18)
+      font: UIFont.systemFontOfSize(18)
     }
+    @button = add_element UIButton.alloc.initWithFrame([[5,45], [300, 40]]), {
+      title: "Button",
+      "addTarget:action:forControlEvents:" => [self, :hello, UIControlEventTouchUpInside],
+      backgroundColor: UIColor.whiteColor
+    }
+    @button.addSubview(@label)
+
+    set_nav_bar_right_button "Close", action: :close_this if self.parent_screen
+  end
+
+  def close_this
+    close
+  end
+
+  def hello
+    puts "hello"
   end
 end

data/lib/ProMotion.rb

@@ -5,13 +5,5 @@ end
 require "ProMotion/version"
 
 Motion::Project::App.setup do |app|
-
-  # Dir.glob(File.join(File.dirname(__FILE__), "ProMotion/**/*.rb")).each do |file|
-  #   app.files.unshift(file)
-  # end
   app.files = Dir.glob(File.join(File.dirname(__FILE__), 'ProMotion/**/*.rb')) | app.files
-  app.files = Dir.glob(File.join(File.dirname(__FILE__), 'ProMotion/helpers/**/*.rb')) | app.files
-  app.files = Dir.glob(File.join(File.dirname(__FILE__), 'ProMotion/modules/**/*.rb')) | app.files
-  app.files = Dir.glob(File.join(File.dirname(__FILE__), 'ProMotion/ext/**/*.rb')) | app.files
-  
 end

data/lib/ProMotion/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,20 +11,21 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies: []
-description: ProMotion is a new way to organize RubyMotion apps.
+description: ProMotion is a new way to easily build RubyMotion iOS apps.
 email:
 - jamon@clearsightstudio.com
+- silas@clearsightstudio.com
+- contact@clearsightstudio.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .c9revisions/lib/ProMotion.rb.c9save
-- .c9revisions/lib/ProMotion/AppDelegate.rb.c9save
-- .c9revisions/lib/ProMotion/classes/Screen.rb.c9save
 - .gitignore
+- .repl_history
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - ProMotion.gemspec
 - README.md
@@ -34,28 +35,28 @@ files:
 - 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/TableViewCell.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/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/system_helper.rb
+- lib/ProMotion/_cocoatouch/NavigationController.rb
+- lib/ProMotion/_cocoatouch/TableViewCell.rb
+- lib/ProMotion/_cocoatouch/TableViewController.rb
+- lib/ProMotion/_cocoatouch/ViewController.rb
+- lib/ProMotion/_helpers/console.rb
+- lib/ProMotion/_helpers/measure_helper.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/system_helper.rb
+- lib/ProMotion/_helpers/tab_bar.rb
+- lib/ProMotion/_helpers/view_helper.rb
+- lib/ProMotion/_screen_modules/screen_elements.rb
+- lib/ProMotion/_screen_modules/screen_navigation.rb
+- lib/ProMotion/_screen_modules/screen_tabs.rb
+- lib/ProMotion/app_delegate.rb
+- lib/ProMotion/pro_motion.rb
+- lib/ProMotion/screen/_screen_module.rb
+- lib/ProMotion/screen/_table_screen_module.rb
+- lib/ProMotion/screen/screen.rb
+- lib/ProMotion/screen/table_screen.rb
 - lib/ProMotion/version.rb
 homepage: https://github.com/clearsightstudio/ProMotion
 licenses: []
@@ -77,11 +78,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ProMotion is a new way to organize RubyMotion apps. Instead of dealing with
   UIViewControllers, you work with Screens. Screens are a logical way to think of
-  your app -- similar in some ways to Storyboards.
+  your app and include a ton of great utilities to make iOS development more like
+  Ruby and less like Objective-C.
 test_files: []
-has_rdoc: 

data/.c9revisions/lib/ProMotion.rb.c9save

@@ -1 +0,0 @@
-{"ts":1347898586630,"silentsave":true,"restoring":false,"patch":[[{"diffs":[[1,"unless defined?(Motion::Project::Config)\n  raise \"This file must be required within a RubyMotion project Rakefile.\"\nend\n\nrequire \"ProMotion/version\"\n\nMotion::Project::App.setup do |app|\n\n  # Dir.glob(File.join(File.dirname(__FILE__), \"ProMotion/**/*.rb\")).each do |file|\n  #   app.files.unshift(file)\n  # end\n  app.files = Dir.glob(File.join(File.dirname(__FILE__), 'ProMotion/**/*.rb')) | app.files\n  app.files = Dir.glob(File.join(File.dirname(__FILE__), 'ProMotion/helpers/**/*.rb')) | app.files\n  app.files = Dir.glob(File.join(File.dirname(__FILE__), 'ProMotion/modules/**/*.rb')) | app.files\n  app.files = Dir.glob(File.join(File.dirname(__FILE__), 'ProMotion/ext/**/*.rb')) | app.files\n  \nend"]],"start1":0,"start2":0,"length1":0,"length2":699}]],"length":699}

data/.c9revisions/lib/ProMotion/AppDelegate.rb.c9save

@@ -1,3 +0,0 @@
-{"ts":1347924907908,"silentsave":true,"restoring":false,"patch":[[{"diffs":[[1,"module ProMotion\n  class AppDelegateParent\n    attr_accessor :window\n    \n    def application(application, didFinishLaunchingWithOptions:launchOptions)\n      return true if RUBYMOTION_ENV == \"test\"\n\n      Console.log(\" Your AppDelegate (usually in app_delegate.rb) needs an on_load(options) method.\", withColor: Console::RED_COLOR) unless self.respond_to?(:on_load)\n      \n      on_load launchOptions\n\n      open_home_screen if has_home_screen\n\n      get_home_screen.on_opened if has_home_screen && get_home_screen.respond_to?(:on_opened)\n      \n      true\n    end\n\n    def app_delegate\n      UIApplication.sharedApplication.delegate\n    end\n\n    def app_window\n      self.app_delegate.window\n    end\n\n    def load_root_view(new_view)\n      self.window ||= UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)\n      self.window.rootViewController = new_view\n      self.window.makeKeyAndVisible\n    end\n\n    def open_screen(screen)\n      home(screen)\n    end\n\n    def home(screen)\n      screen = screen.new if screen.respond_to? :new\n      @home_screen = screen\n    end\n\n    def fresh_start(new_screen)\n      home(new_screen)\n      open_home_screen\n    end\n\n    def open_home_screen\n      get_home_screen.send(:on_load) if get_home_screen.respond_to?(:on_load)\n      load_root_view get_home_screen.main_controller\n    end\n    \n    def get_home_screen\n      @home_screen\n    end\n\n    def has_home_screen\n      @home_screen.nil? == false\n    end\n  end\nend"]],"start1":0,"start2":0,"length1":0,"length2":1456}]],"length":1456}
-{"contributors":[],"silentsave":false,"ts":1347925005943,"patch":[[{"diffs":[[0,"_to?"],[-1," "],[1,"("],[0,":new"],[1,")s"],[0,"\n   "]],"start1":1027,"start2":1027,"length1":13,"length2":15}]],"length":1458,"saved":false}
-{"ts":1347925017979,"patch":[[{"diffs":[[0,"o?(:new)"],[-1,"s"],[0,"\n      @"]],"start1":1029,"start2":1029,"length1":17,"length2":16}]],"length":1457,"saved":false}

data/.c9revisions/lib/ProMotion/classes/Screen.rb.c9save

@@ -1,2 +0,0 @@
-{"ts":1347898745792,"silentsave":true,"restoring":false,"patch":[[{"diffs":[[1,"module ProMotion\n  # Instance methods\n  class Screen\n    include ProMotion::ScreenNavigation\n    include ProMotion::ScreenElements\n    \n    attr_accessor :view_controller, :navigation_controller, :parent_screen, :first_screen, :tab_bar_item, :tab_bar, :modal\n\n    def initialize(args = {})\n      args.each do |k, v|\n        self.send \"#{k}=\", v if self.respond_to?(\"#{k}=\")\n      end\n      self.load_view_controller\n      self.view_controller.title = self.title\n\n      self.add_nav_bar if args[:nav_bar]\n      self.on_init if self.respond_to?(:on_init)\n      self\n    end\n\n    def is_modal?\n      self.modal == true\n    end\n\n    def has_nav_bar?\n      self.navigation_controller.nil? != true\n    end\n\n    # Note: this is overridden in TableScreen\n    def load_view_controller\n      self.view_controller ||= ViewController\n    end\n\n    def set_tab_bar_item(args = {})\n      self.tab_bar_item = args\n      refresh_tab_bar_item\n    end\n\n    def refresh_tab_bar_item\n      self.main_controller.tabBarItem = ProMotion::TabBar.tab_bar_item(self.tab_bar_item) if self.tab_bar_item\n    end\n    \n    def add_nav_bar\n      self.navigation_controller = NavigationController.alloc.initWithRootViewController(self.view_controller)\n      self.first_screen = true\n    end\n\n    def set_nav_bar_right_button(title, args={})\n      args[:style]  ||= UIBarButtonItemStyleBordered\n      args[:target] ||= self\n      args[:action] ||= nil\n\n      right_button = UIBarButtonItem.alloc.initWithTitle(title, style: args[:style], target: args[:target], action: args[:action])\n      self.view_controller.navigationItem.rightBarButtonItem = right_button\n      right_button\n    end\n\n    def set_nav_bar_left_button(title, args={})\n      args[:style]  ||= UIBarButtonItemStyleBordered\n      args[:target] ||= self\n      args[:action] ||= nil\n\n      left_button = UIBarButtonItem.alloc.initWithTitle(title, style: args[:style], target: args[:target], action: args[:action])\n      self.view_controller.navigationItem.leftBarButtonItem = left_button\n      left_button\n    end\n\n    def view_controller=(vc)\n      vc = vc.alloc.initWithNibName(nil, bundle:nil) if vc.respond_to?(:alloc)\n      if self.navigation_controller && self.first_screen?\n        @view_controller = vc\n        self.navigation_controller = NavigationController.alloc.initWithRootViewController(self.view_controller)\n      else\n        @view_controller = vc\n      end\n      @view_controller.screen = self if @view_controller.respond_to?(\"screen=\")\n\n      refresh_tab_bar_item\n    end\n\n    def first_screen?\n      self.first_screen == true\n    end\n\n    def set_view_controller(vc)\n      self.view_controller = vc\n    end\n\n    def view_will_appear(animated)\n      self.will_appear if self.respond_to?(:will_appear)\n    end\n\n    def view_did_appear(animated)\n      self.on_appear if self.respond_to?(:on_appear)\n    end\n\n    def title\n      self.class.send :get_title\n    end\n\n    def title=(new_title)\n      self.class.title = new_title\n      self.view_controller.title = new_title\n    end\n\n    def main_controller\n      return self.navigation_controller if self.navigation_controller\n      self.view_controller\n    end\n\n  end\n  \n  # Class methods\n  class Screen\n    class << self\n      def title(t)\n        @title = t\n      end\n      def title=(t)\n        @title = t\n      end\n      def get_title\n        @title ||= self.to_s\n      end\n    end\n  end\nend"]],"start1":0,"start2":0,"length1":0,"length2":3387}]],"length":3387}
-{"contributors":[],"silentsave":false,"ts":1347898870641,"patch":[[{"diffs":[[0,"lements\n"],[-1,"    "],[0,"\n    att"]],"start1":123,"start2":123,"length1":20,"length2":16},{"diffs":[[0,"    end\n"],[-1,"    "],[0,"\n    def"]],"start1":1070,"start2":1070,"length1":20,"length2":16},{"diffs":[[0,"\n\n  end\n"],[-1,"  "],[0,"\n  # Cla"]],"start1":3144,"start2":3144,"length1":18,"length2":16}]],"length":3377,"saved":false}

data/lib/ProMotion/AppDelegate.rb

@@ -1,60 +0,0 @@
-module ProMotion
-  class AppDelegateParent
-    attr_accessor :window
-    
-    def application(application, didFinishLaunchingWithOptions:launchOptions)
-      return true if RUBYMOTION_ENV == "test"
-
-      Console.log(" Your AppDelegate (usually in app_delegate.rb) needs an on_load(options) method.", withColor: Console::RED_COLOR) unless self.respond_to?(:on_load)
-
-      on_load(application, launchOptions)
-
-      open_home_screen if has_home_screen
-
-      get_home_screen.on_opened if has_home_screen && get_home_screen.respond_to?(:on_opened)
-      
-      true
-    end
-
-    def app_delegate
-      UIApplication.sharedApplication.delegate
-    end
-
-    def app_window
-      self.app_delegate.window
-    end
-
-    def load_root_view(new_view)
-      self.window ||= UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
-      self.window.rootViewController = new_view
-      self.window.makeKeyAndVisible
-    end
-
-    def open_screen(screen)
-      home(screen)
-    end
-
-    def home(screen)
-      screen = screen.new if screen.respond_to?(:new)
-      @home_screen = screen
-    end
-
-    def fresh_start(new_screen)
-      home(new_screen)
-      open_home_screen
-    end
-
-    def open_home_screen
-      get_home_screen.send(:on_load) if get_home_screen.respond_to?(:on_load)
-      load_root_view get_home_screen.main_controller
-    end
-    
-    def get_home_screen
-      @home_screen
-    end
-
-    def has_home_screen
-      @home_screen.nil? == false
-    end
-  end
-end

data/lib/ProMotion/Console.rb

@@ -1,19 +0,0 @@
-module ProMotion
-  class Console
-    NAME = "RubyMotion::Console"
-    DEFAULT_COLOR = [ '', '' ]
-    RED_COLOR = [ "\e[0;31m", "\e[0m" ] # Must be in double quotes
-    GREEN_COLOR = [ "\e[0;32m", "\e[0m" ] 
-    PURPLE_COLOR = [ "\e[0;35m", "\e[0m" ] 
-
-    class << self
-      def log(log, withColor:color)
-        puts color[0] + NAME + log + color[1]
-      end
-
-      def log(log)
-        log(log, withColor: DEFAULT_COLOR)
-      end
-    end
-  end
-end

data/lib/ProMotion/ProMotion.rb

@@ -1,3 +0,0 @@
-module Promotion
-end
-::PM = ProMotion unless defined?(::PM)

data/lib/ProMotion/_ext/NavigationController.rb

@@ -1,7 +0,0 @@
-module ProMotion
-  class NavigationController < UINavigationController
-    def dealloc
-      $stderr.puts "Deallocating #{self.to_s}" if ProMotion::Screen.debug_mode
-    end
-  end
-end

data/lib/ProMotion/_ext/TableViewCell.rb

@@ -1,16 +0,0 @@
-module ProMotion
-  class TableViewCell < UITableViewCell
-    attr_accessor :image_size
-
-    def layoutSubviews
-      super
-
-      if self.image_size && self.imageView.image && self.imageView.image.size && self.imageView.image.size.width > 0
-        f = self.imageView.frame
-        size_inset_x = (self.imageView.size.width - self.image_size) / 2
-        size_inset_y = (self.imageView.size.height - self.image_size) / 2
-        self.imageView.frame = CGRectInset(f, size_inset_x, size_inset_y)
-      end
-    end
-  end
-end

data/lib/ProMotion/_ext/TableViewController.rb

@@ -1,54 +0,0 @@
-module ProMotion
-  class TableViewController < UITableViewController
-    attr_accessor :screen
-
-    def viewDidLoad
-      super
-      self.screen.view_did_load if self.screen && self.screen.respond_to?(:view_did_load)
-    end
-
-    def viewWillAppear(animated)
-      super
-      self.screen.view_will_appear(animated) if self.screen && self.screen.respond_to?(:view_will_appear)
-    end
-
-    def viewDidAppear(animated)
-      super
-      self.screen.view_did_appear(animated) if self.screen && self.screen.respond_to?(:view_did_appear)
-    end
-    
-    def viewWillDisappear(animated)
-      if self.screen && self.screen.respond_to?(:view_will_disappear)
-        self.screen.view_will_disappear(animated)
-      end
-      super      
-    end
-    
-    def viewDidDisappear(animated)
-      if self.screen && self.screen.respond_to?(:view_did_disappear)
-        self.screen.view_did_disappear(animated)
-      end
-      super      
-    end
-
-    def shouldAutorotateToInterfaceOrientation(orientation)
-      self.screen.should_rotate(orientation)
-    end
-
-    def shouldAutorotate
-      self.screen.should_autorotate
-    end
-
-    def willRotateToInterfaceOrientation(orientation, duration:duration)
-      self.screen.will_rotate(orientation, duration)
-    end
-    
-    def didRotateFromInterfaceOrientation(orientation)
-      self.screen.on_rotate
-    end
-
-    def dealloc
-      $stderr.puts "Deallocating #{self.to_s}" if ProMotion::Screen.debug_mode
-    end    
-  end
-end

data/lib/ProMotion/_ext/ViewController.rb

@@ -1,68 +0,0 @@
-module ProMotion
-  class ViewController < UIViewController
-    attr_accessor :screen
-
-    def viewDidLoad
-      super
-      if screen_will_respond_to?(:view_did_load)
-        self.screen.view_did_load
-      end
-    end
-
-    def viewWillAppear(animated)
-      super
-      if screen_will_respond_to?(:view_will_appear)
-        self.screen.view_will_appear(animated)
-      end
-    end
-
-    def viewDidAppear(animated)
-      super
-      if screen_will_respond_to?(:view_did_appear)
-        self.screen.view_did_appear(animated)
-      end
-    end
-
-    def viewWillDisappear(animated)
-      if screen_will_respond_to?(:view_will_disappear)
-        self.screen.view_will_disappear(animated)
-      end
-      super      
-    end
-    
-    def viewDidDisappear(animated)
-      if screen_will_respond_to?(:view_did_disappear)
-        self.screen.view_did_disappear(animated)
-      end
-      super      
-    end
-
-    def screen_will_respond_to?(method)
-      self.screen && self.screen.respond_to?(method)
-    end
-
-    def shouldAutorotateToInterfaceOrientation(orientation)
-      self.screen.should_rotate(orientation)
-    end
-
-    def shouldAutorotate
-      self.screen.should_autorotate
-    end
-
-    def supportedInterfaceOrientations
-      self.screen.supported_orientations
-    end
-
-    def willRotateToInterfaceOrientation(orientation, duration:duration)
-      self.screen.will_rotate(orientation, duration)
-    end
-
-    def didRotateFromInterfaceOrientation(orientation)
-      self.screen.on_rotate
-    end
-
-    def dealloc
-      $stderr.puts "Deallocating #{self.to_s}" if ProMotion::Screen.debug_mode
-    end
-  end
-end

data/lib/ProMotion/_modules/ScreenElements.rb

@@ -1,31 +0,0 @@
-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