dynamics 0.1.2 → 0.1.3

data/base/Rakefile

@@ -10,7 +10,7 @@ require 'dynamics'
 Motion::Project::App.setup do |app|
   app.name = ''  
   app.delegate_class = ''  
-  app.icons = %w{icon.png}
+  app.icons = %w{icon@57.png icon@74.png icon@114.png icon@144.png}
     
   Dynamics::setup_framework(app, File.dirname(__FILE__))
 end

data/base/app/application.rb

@@ -2,8 +2,10 @@
 class Application < Dynamics::Application
 
   def initialize
-    #super('Navigation')
-    #super('Tab Bar')    
-    super('Tab Nav')        
+    super  
+        
+    # self.layout = 'Navigation'
+    # self.layout = 'Tab Bar'       
+    self.layout = 'Tab Nav' 
   end
 end

data/base/app/controllers/home_controller.rb

@@ -0,0 +1,4 @@
+
+class HomeController < Dynamics::Controller
+    
+end

data/base/app/views/home_view.rb

@@ -0,0 +1,4 @@
+
+class HomeView < Dynamics::Window
+
+end

data/base/templates/dynamics.rb

@@ -2,39 +2,57 @@
 module Dynamics
     
   class Application
-    
+    attr_accessor :layout
+  
   private
-
-    def initialize(layout)
-      @layout = layout
-    end
         
     def application(application, didFinishLaunchingWithOptions:launchOptions)
-      @window =  MainView.alloc.initWithFrame(UIScreen.mainScreen.bounds)  
+      @window =  HomeView.alloc.initWithFrame(UIScreen.mainScreen.bounds)  
       @window.makeKeyAndVisible   
-      if @layout == 'Navigation'
+      case @layout
+      when 'Navigation'
         # @@Navigation@@
         # @@End@@       
-      elsif @layout == 'Tab Bar'           
+      when 'Tab Bar'           
         # @@Tab Bar@@
         # @@End@@     
-      elsif @layout == 'Tab Nav'           
+      when 'Tab Nav'           
         # @@Tab Nav@@
         # @@End@@                    
       else     
-        @window.rootViewController = MainController.alloc.initWithNibName(nil, bundle: nil)           
+        @window.rootViewController = HomeController.alloc.initWithNibName(nil, bundle: nil)           
       end  
       true
     end    
   end
   
   class Controller < UIViewController   
-    attr_accessor :next_controller, :next_view
-    
-    def name
-      self.class.name.underscore.split('_')[0].capitalize 
-    end
+    attr_accessor :name, :next_controller, :next_view
        
+    def initWithNibName(name, bundle: bundle)
+        super
+        
+        @@index = 0
+        @name = self.class.name.underscore.split('_')[0].capitalize 
+        case App.delegate.layout
+        when 'Navigation'
+          if @name == 'Home'
+            self.navigationItem.title = App.name   
+          end   
+        when 'Tab Bar'   
+          self.tabBarItem = UITabBarItem.alloc.initWithTitle(@name, image: UIImage.imageNamed(@name.downcase + '.png'), tag: @@index)                                               
+        when 'Tab Nav'      
+          if @name == 'Home'
+            self.navigationItem.title = App.name         
+          else
+            self.navigationItem.title = @name                 
+          end                                            
+          self.tabBarItem = UITabBarItem.alloc.initWithTitle(@name, image: UIImage.imageNamed(@name.downcase + '.png'), tag: @@index)                  
+        end        
+        @@index += 1
+        self
+    end       
+    
   private
           
     def loadView
@@ -47,17 +65,24 @@ module Dynamics
     
     def viewDidLoad
       super
-      if name == 'Main'
-        self.title = App.name 
-        self.view.backgroundColor = UIColor.whiteColor                 
+               
+      case App.delegate.layout
+      when 'Navigation'
+        if !next_controller.nil?
+          navigationItem.rightBarButtonItem = UIBarButtonItem.alloc.initWithTitle(next_controller.name, style: UIBarButtonItemStyleBordered, target: self, action: 'nextScreen')          
+        end
+      end
+                  
+      case @name
+      when 'Home'                                      
+        self.view.backgroundColor = UIColor.whiteColor                             
       else
-        self.title = name
         self.view.backgroundColor = UIColor.grayColor             
-      end     
+      end       
     end    
         
     def nextScreen
-      self.navigationController.pushViewController(@next_controller, animated: true)      
+      navigationController.pushViewController(@next_controller, animated: true)      
     end
   end
   

data/lib/dynamics.rb

@@ -41,8 +41,8 @@ module Dynamics
       controllers_dir = File.join(app_dir, 'controllers')    
       Dir.mkdir(controllers_dir)    
 
-      f = File.new(File.join(controllers_dir, 'main_controller.rb'), 'w+')   
-      f.write(render_code(File.join(base_dir, 'app', 'controllers', 'main_controller.rb'))) 
+      f = File.new(File.join(controllers_dir, 'home_controller.rb'), 'w+')   
+      f.write(render_code(File.join(base_dir, 'app', 'controllers', 'home_controller.rb'))) 
       f.close    
 
       f = File.new(File.join(controllers_dir, 'sub1_controller.rb'), 'w+')   
@@ -58,8 +58,8 @@ module Dynamics
       views_dir = File.join(app_dir, 'views')  
       Dir.mkdir(views_dir)
 
-      f = File.new(File.join(views_dir, 'main_view.rb'), 'w+')   
-      f.write(render_code(File.join(base_dir, 'app', 'views', 'main_view.rb'))) 
+      f = File.new(File.join(views_dir, 'home_view.rb'), 'w+')   
+      f.write(render_code(File.join(base_dir, 'app', 'views', 'home_view.rb'))) 
       f.close
 
       f = File.new(File.join(views_dir, 'sub1_view.rb'), 'w+')   
@@ -72,9 +72,33 @@ module Dynamics
       
       # Resources
 
-      f = File.new(File.join(resources_dir, 'icon.png'), 'w+')   
-      f.write(render_code(File.join(base_dir, 'resources', 'icon.png'))) 
+      f = File.new(File.join(resources_dir, 'icon-57.png'), 'w+')   
+      f.write(render_code(File.join(base_dir, 'resources', 'icon@57.png'))) 
       f.close      
+      
+      f = File.new(File.join(resources_dir, 'icon-74.png'), 'w+')   
+      f.write(render_code(File.join(base_dir, 'resources', 'icon@74.png'))) 
+      f.close
+         
+      f = File.new(File.join(resources_dir, 'icon-114.png'), 'w+')   
+      f.write(render_code(File.join(base_dir, 'resources', 'icon@114.png'))) 
+      f.close
+             
+      f = File.new(File.join(resources_dir, 'icon-144.png'), 'w+')   
+      f.write(render_code(File.join(base_dir, 'resources', 'icon@144.png'))) 
+      f.close
+                      
+      f = File.new(File.join(resources_dir, 'home.png'), 'w+')   
+      f.write(render_code(File.join(base_dir, 'resources', 'home.png'))) 
+      f.close
+      
+      f = File.new(File.join(resources_dir, 'sub1.png'), 'w+')   
+      f.write(render_code(File.join(base_dir, 'resources', 'sub1.png'))) 
+      f.close
+      
+      f = File.new(File.join(resources_dir, 'sub2.png'), 'w+')   
+      f.write(render_code(File.join(base_dir, 'resources', 'sub2.png'))) 
+      f.close                  
     end
   end
     
@@ -115,8 +139,8 @@ private
     controllers = []
     for controller in Dir.glob(File.join(path, 'app', 'controllers', '*.rb'))
       filename = File.basename(controller)
-      if filename != 'main_controller.rb'
-        controllers << {:filename => filename, :class_name => camelize(filename.split('.')[0]), :name => filename.split('_')[0].capitalize}
+      if filename != 'home_controller.rb'
+        controllers << {:filename => filename, :name => filename.split('_')[0].capitalize}
       end
     end    
     controllers
@@ -124,24 +148,18 @@ private
   
   def self.navigation_code(path)
     code = "# @@Navigation@@\n"
-    code += "        main_controller = MainController.alloc.initWithNibName(nil, bundle: nil)\n"  
+    code += "        home_controller = HomeController.alloc.initWithNibName(nil, bundle: nil)\n"  
     controllers = find_controllers(path)    
-    if controllers.size > 0    
-      code += "        main_controller.navigationItem.rightBarButtonItem = UIBarButtonItem.alloc.initWithTitle('#{controllers.first[:name]}', style: UIBarButtonItemStyleBordered, target:main_controller, action:'nextScreen')\n"          
-    end
     i = 1
-    prev_controller = 'main_controller'
+    prev_controller = 'home_controller'
     for controller in controllers         
-      code += "        sub#{i}_controller = #{controller[:class_name]}.alloc.initWithNibName(nil, bundle: nil)\n"     
+      code += "        sub#{i}_controller = #{controller[:name]}Controller.alloc.initWithNibName(nil, bundle: nil)\n"     
       code += "        sub#{i}_controller.next_view = #{controller[:name]}View.alloc.initWithFrame(UIScreen.mainScreen.bounds)\n"                        
       code += "        #{prev_controller}.next_controller = sub#{i}_controller\n"        
-      if controller != controllers.last
-        code += "        sub#{i}_controller.navigationItem.rightBarButtonItem = UIBarButtonItem.alloc.initWithTitle('#{controllers[i][:name]}', style: UIBarButtonItemStyleBordered, target:sub#{i}_controller, action:'nextScreen')\n"              
-        prev_controller = "sub#{i}_controller"     
-        i += 1        
-      end
+      prev_controller = "sub#{i}_controller"     
+      i += 1        
     end
-    code += "        @window.rootViewController = UINavigationController.alloc.initWithRootViewController(main_controller)\n"       
+    code += "        @window.rootViewController = UINavigationController.alloc.initWithRootViewController(home_controller)\n"       
     code += "        # @@End@@" 
   end
   
@@ -154,15 +172,13 @@ private
   
   def self.tab_bar_code(path)
     code = "# @@Tab Bar@@\n"
-    controllers_list = 'main_controller'    
-    code += "        main_controller = MainController.alloc.initWithNibName(nil, bundle: nil)\n"  
-    code += "        main_controller.title = main_controller.name\n"   
+    controllers_list = 'home_controller'    
+    code += "        home_controller = HomeController.alloc.initWithNibName(nil, bundle: nil)\n"  
     i = 1       
     controllers = find_controllers(path)    
     for controller in controllers         
       controllers_list += ", sub#{i}_controller"         
-      code += "        sub#{i}_controller = #{controller[:class_name]}.alloc.initWithNibName(nil, bundle: nil)\n"
-      code += "        sub#{i}_controller.title = sub#{i}_controller.name\n"   
+      code += "        sub#{i}_controller = #{controller[:name]}Controller.alloc.initWithNibName(nil, bundle: nil)\n"
       i += 1        
     end        
     code += "        tab_controller = UITabBarController.alloc.initWithNibName(nil, bundle: nil)\n"    
@@ -173,16 +189,14 @@ private
   
   def self.tab_nav_code(path)
     code = "# @@Tab Nav@@\n"
-    controllers_list = 'main_nav_controller'    
-    code += "        main_controller = MainController.alloc.initWithNibName(nil, bundle: nil)\n"  
-    code += "        main_controller.title = main_controller.name\n"   
-    code += "        main_nav_controller = UINavigationController.alloc.initWithRootViewController(main_controller)\n"    
+    controllers_list = 'home_nav_controller'    
+    code += "        home_controller = HomeController.alloc.initWithNibName(nil, bundle: nil)\n"  
+    code += "        home_nav_controller = UINavigationController.alloc.initWithRootViewController(home_controller)\n"    
     i = 1       
     controllers = find_controllers(path)    
     for controller in controllers         
       controllers_list += ", sub#{i}_nav_controller"         
-      code += "        sub#{i}_controller = #{controller[:class_name]}.alloc.initWithNibName(nil, bundle: nil)\n"
-      code += "        sub#{i}_controller.title = sub#{i}_controller.name\n"   
+      code += "        sub#{i}_controller = #{controller[:name]}Controller.alloc.initWithNibName(nil, bundle: nil)\n"
       code += "        sub#{i}_nav_controller = UINavigationController.alloc.initWithRootViewController(sub#{i}_controller)\n"        
       i += 1        
     end        

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dynamics
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Ng Say Joe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-18 00:00:00 Z
+date: 2012-08-19 00:00:00 Z
 dependencies: []
 
 description: A framework for developing RubyMotion applications quickly.
@@ -30,13 +30,19 @@ files:
 - lib/dynamics.rb
 - base/Rakefile
 - base/app/application.rb
-- base/app/controllers/main_controller.rb
+- base/app/controllers/home_controller.rb
 - base/app/controllers/sub1_controller.rb
 - base/app/controllers/sub2_controller.rb
-- base/app/views/main_view.rb
+- base/app/views/home_view.rb
 - base/app/views/sub1_view.rb
 - base/app/views/sub2_view.rb
-- base/resources/icon.png
+- base/resources/home.png
+- base/resources/icon@114.png
+- base/resources/icon@144.png
+- base/resources/icon@57.png
+- base/resources/icon@74.png
+- base/resources/sub1.png
+- base/resources/sub2.png
 - base/templates/dynamics.rb
 - bin/dynamics
 homepage: http://www.dynamics.io/

data/base/app/controllers/main_controller.rb

@@ -1,4 +0,0 @@
-
-class MainController < Dynamics::Controller
-    
-end

data/base/app/views/main_view.rb

@@ -1,4 +0,0 @@
-
-class MainView < Dynamics::Window
-
-end