simple-view 0.1.3 → 0.5

data/.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 .repl_history
 build
 *.tmproj

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple-view (0.0.3)
+    simple-view (0.1.3)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -33,9 +33,9 @@ class YourViewController < UIViewController
 
   def viewDidLoad
     setup content_view do
-      label width: 200, height: 20, text: "Choose your lucky word", color: "#eee"
+      label top:0, left: 0, width: 200, height: 20, text: "Choose your lucky word", text_color: "#eee"
       image_view top: 50, left: 50, right: 50, image: "sample.jpg"
-      toolbar anchors: [:bottom]
+      toolbar left: 0, right: 0, bottom: 0
     end
   end
 end
@@ -46,8 +46,8 @@ Use block for more control over the view instance
 ````ruby
 def viewDidLoad
   setup view do
-    button tint_color: '#f00' do
-      view.setTitle "Submit" forState: UIControlStateNormal
+    button tint_color: '#f00' do |button|
+      button.setTitle "Submit" forState: UIControlStateNormal
     end
   end
 end
@@ -61,11 +61,12 @@ SimpleView provides shorthand methods for most UIKit classes
 def viewDidLoad
   setup view do
     label text: 'Hi there!' # shorthand
-    add UILabel, text: 'Hi there!' # what actually happens
+    add UILabel, text: 'Hi there!' # same as above
   end
 end
 ````
 
+- UIActionSheet via `action_sheet`
 - UIActivityIndicatorView via `activity_indicator`
 - UIButton via `button`
 - UIDatePicker via `date_picker`
@@ -151,13 +152,19 @@ class ViewController
 end
 ````
 
-### View anchoring
+### View positioning and sizing
 
 Position the view without doing a lot of calculation
 
 ````ruby
 setup view do
-  toolbar bottom: 10, left: 10, right: 10, anchors: [:bottom]
+  toolbar bottom: 10, left: 10, right: 10
+end
+````
+
+````ruby
+setup view do
+  table_view width: 100.percent, height: 100.percent
 end
 ````
 

data/Rakefile

@@ -6,13 +6,9 @@ require 'motion/project'
 
 Motion::Project::App.setup do |app|
   app.name = 'SimpleViewDemo'
+  app.deployment_target = '5.0'
 
-  app.files += Dir.glob(File.join(File.dirname(__FILE__), 'lib/simple_view/*.rb'))
-  app.files.unshift(File.join(File.dirname(__FILE__), 'lib/simple_view/layout.rb'))
-  app.files.unshift(File.join(File.dirname(__FILE__), 'lib/simple_view/styles.rb'))
-  app.files.unshift(Dir.glob(File.join(File.dirname(__FILE__), 'lib/simple_view/builders/*.rb')))
-  app.files.unshift(File.join(File.dirname(__FILE__), 'lib/simple_view/builders/ui_control_builder.rb'))
-  app.files.unshift(File.join(File.dirname(__FILE__), 'lib/simple_view/builders/ui_view_builder.rb'))
-  app.files.unshift(Dir.glob(File.join(File.dirname(__FILE__), 'lib/simple_view/builders/helpers/*.rb')))
+  app.detect_dependencies = false
+  app.files.unshift(Dir.glob(File.join(File.dirname(__FILE__), 'lib/simple_view/*.rb')))
   app.files.unshift(Dir.glob(File.join(File.dirname(__FILE__), 'lib/simple_view/extensions/*.rb')))
 end

data/app/app_delegate.rb

@@ -1,5 +1,7 @@
 class AppDelegate
   def application(application, didFinishLaunchingWithOptions:launchOptions)
+    return true if RUBYMOTION_ENV == 'test'
+
     @window = UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
     @window.rootViewController = UINavigationController.alloc.initWithRootViewController(SimpleViewController.alloc.init)
     @window.rootViewController.wantsFullScreenLayout = true

data/app/simple_view_controller.rb

@@ -1,27 +1,45 @@
 class SimpleViewController < UIViewController
   include SimpleView::Layout
 
+  DEFAULT_CELL_ID = 'DefaultCellId'
+
   def viewDidLoad
-    SimpleView::Styles.define :square,
-      width: 20,
-      height: 20
+    super
+
+    @demos = [
+      {caption: 'View Anchoring', controller: ViewAnchoringController},
+      {caption: 'User Info', controller: UserInfoController}
+    ]
 
     setup view, controller: self do
-      controller.title = "SimpleView Demo"
+      controller.title = 'Demo'
 
-      rect styles: :square, backgroundColor: "#000", anchors: [:top, :left, :bottom, :right]
+      table_view delegate: controller, dataSource: controller, width: 100.percent, height: 100.percent do
+        view.registerClass UITableViewCell, forCellReuseIdentifier: DEFAULT_CELL_ID
+      end
+    end
+  end
 
-      rect styles: :square, backgroundColor: "#990000", anchors: [:top, :left]
-      rect styles: :square, backgroundColor: "#993300", anchors: [:top]
-      rect styles: :square, backgroundColor: "#CC9900", anchors: [:top, :right]
+  # UITableView dataSource and delegate
 
-      rect styles: :square, backgroundColor: "#006600", anchors: [:left]
-      rect styles: :square, backgroundColor: "#336666", anchors: []
-      rect styles: :square, backgroundColor: "#0033FF", anchors: [:right]
+  def numberOfSectionsInTableView tableView
+    1
+  end
 
-      rect styles: :square, backgroundColor: "#000099", anchors: [:bottom, :left]
-      rect styles: :square, backgroundColor: "#660099", anchors: [:bottom]
-      rect styles: :square, backgroundColor: "#990066", anchors: [:bottom, :right]
-    end
+  def tableView tableView, numberOfRowsInSection: section
+    @demos.size
+  end
+
+  def tableView tableView, cellForRowAtIndexPath: indexPath
+    cell = tableView.dequeueReusableCellWithIdentifier DEFAULT_CELL_ID
+    cell.textLabel.text = @demos[indexPath.row][:caption]
+    cell
+  end
+
+  def tableView tableView, didSelectRowAtIndexPath: indexPath
+    tableView.deselectRowAtIndexPath indexPath, animated: true
+
+    controller = @demos[indexPath.row][:controller].alloc.init
+    navigationController.pushViewController controller, animated: true
   end
 end

data/app/user_info_controller.rb

@@ -0,0 +1,67 @@
+class UserInfoController < UIViewController
+  include SimpleView::Layout
+
+  DEFAULT_CELL_ID = 'DefaultCellId'
+
+  def viewDidLoad
+    super
+
+    @data = [
+      [{title: 'mobile', text: '123456789'}],
+      [{title: 'email', text: 'nyan.cat@meme.com'}],
+      [{title: 'Facebook', text: 'Nyan Cat'}]
+    ]
+
+    setup view, controller: self do
+      controller.title = 'User Info'
+
+      table_view style: UITableViewStyleGrouped,
+        delegate: controller, dataSource: controller,
+        width: 100.percent, height: 100.percent do |table_view|
+
+        table_view.tableHeaderView = UserInfoHeader.alloc.initWithFrame [[0, 0], [view.width, 80]]
+      end
+    end
+  end
+
+  # UITableView dataSource and delegate
+
+  def numberOfSectionsInTableView tableView
+    @data.size
+  end
+
+  def tableView tableView, numberOfRowsInSection: section
+    @data[section].size
+  end
+
+  def tableView tableView, cellForRowAtIndexPath: indexPath
+    cell = tableView.dequeueReusableCellWithIdentifier(DEFAULT_CELL_ID) || UITableViewCell.alloc.initWithStyle(UITableViewCellStyleValue2, reuseIdentifier:DEFAULT_CELL_ID)
+    cell.textLabel.text = @data[indexPath.section][indexPath.row][:title]
+    cell.detailTextLabel.text = @data[indexPath.section][indexPath.row][:text]
+    cell
+  end
+
+  def tableView tableView, didSelectRowAtIndexPath: indexPath
+    tableView.deselectRowAtIndexPath indexPath, animated: true
+  end
+end
+
+class UserInfoHeader < UIView
+  include SimpleView::Layout
+
+  def initWithFrame frame
+    if super
+      setup self do
+        image_view name: 'avatar', image: 'test.jpg',
+          width: 50, height: 50, top: 20, left: 10
+
+        label name: 'full_name', text: 'Nyan Cat', font: '16 bold', backgroundColor: 'clear',
+          height: 20, top: 20, left: 70, right: 10
+
+        label text: 'Internet Meme', font: '14', textColor: '#666', backgroundColor: 'clear',
+          height: 18, top: 45, left: 70, right: 10
+      end
+    end
+    self
+  end
+end

data/app/view_anchoring_controller.rb

@@ -0,0 +1,27 @@
+class ViewAnchoringController < UIViewController
+  include SimpleView::Layout
+
+  def viewDidLoad
+    SimpleView::Styles.define :square,
+      width: 20,
+      height: 20
+
+    setup view, controller: self do
+      controller.title = "View Anchoring"
+
+      rect name: 'fill', styles: :square, backgroundColor: "#000", top: 0, left: 0, bottom: 0, right: 0
+
+      rect name: 'tl', styles: :square, backgroundColor: "#990000", top: 0, left: 0
+      rect name: 'tc', styles: :square, backgroundColor: "#993300", top: 0
+      rect name: 'tr', styles: :square, backgroundColor: "#CC9900", top: 0, right: 0
+
+      rect name: 'ml', styles: :square, backgroundColor: "#006600", left: 0
+      rect name: 'mc', styles: :square, backgroundColor: "#336666"
+      rect name: 'mr', styles: :square, backgroundColor: "#0033FF", right: 0
+
+      rect name: 'bl', styles: :square, backgroundColor: "#000099", bottom: 0, left: 0
+      rect name: 'bc', styles: :square, backgroundColor: "#660099", bottom: 0
+      rect name: 'br', styles: :square, backgroundColor: "#990066", bottom: 0, right: 0
+    end
+  end
+end

data/lib/simple-view.rb

@@ -5,12 +5,6 @@ unless defined?(Motion::Project::Config)
 end
 
 Motion::Project::App.setup do |app|
-  app.files += Dir.glob(File.join(File.dirname(__FILE__), 'simple_view/*.rb'))
-  app.files.unshift(File.join(File.dirname(__FILE__), 'simple_view/layout.rb'))
-  app.files.unshift(File.join(File.dirname(__FILE__), 'simple_view/styles.rb'))
-  app.files.unshift(Dir.glob(File.join(File.dirname(__FILE__), 'simple_view/builders/*.rb')))
-  app.files.unshift(File.join(File.dirname(__FILE__), 'simple_view/builders/ui_control_builder.rb'))
-  app.files.unshift(File.join(File.dirname(__FILE__), 'simple_view/builders/ui_view_builder.rb'))
-  app.files.unshift(Dir.glob(File.join(File.dirname(__FILE__), 'simple_view/builders/helpers/*.rb')))
+  app.files.unshift(Dir.glob(File.join(File.dirname(__FILE__), 'simple_view/*.rb')))
   app.files.unshift(Dir.glob(File.join(File.dirname(__FILE__), 'simple_view/extensions/*.rb')))
 end

data/lib/simple_view/extensions/fixnum.rb

@@ -0,0 +1,9 @@
+module SimpleView
+  module FixnumExtensions
+    def percent
+      self / 100.0
+    end
+  end
+end
+
+Fixnum.send(:include, SimpleView::FixnumExtensions)

data/lib/simple_view/extensions/string.rb

@@ -1,13 +1,26 @@
 module SimpleView
-  module String
+  module StringExtensions
+    def underscore
+      word = self.dup
+      word.gsub!(/::/, '/')
+      word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
+      word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+      word.tr!("-", "_")
+      word.downcase!
+      word
+    end
+
     def to_color
-      html_colour = self.gsub(%r{[#;]}, '')
+      html_colour = self.dup
+      html_colour.gsub!(%r{[#;]}, '')
+
       case html_colour.size
       when 3
         colours = html_colour.scan(%r{[0-9A-Fa-f]}).map { |el| (el * 2).to_i(16) }
       when 6
         colours = html_colour.scan(%r<[0-9A-Fa-f]{2}>).map { |el| el.to_i(16) }
       else
+        return ::UIColor.clearColor if html_colour == 'transparent' || 'clear'
         raise ArgumentError
       end
 
@@ -49,4 +62,4 @@ module SimpleView
   end
 end
 
-String.send(:include, SimpleView::String)
+String.send(:include, SimpleView::StringExtensions)

data/lib/simple_view/extensions/ui_color.rb

@@ -1,9 +1,9 @@
 module SimpleView
-  module UIColor
+  module UIColorExtensions
     def to_color
       self
     end
   end
 end
 
-UIColor.send(:include, SimpleView::UIColor)
+UIColor.send(:include, SimpleView::UIColorExtensions)

data/lib/simple_view/extensions/ui_font.rb

@@ -1,9 +1,9 @@
 module SimpleView
-  module UIFont
+  module UIFontExtensions
     def to_font
       self
     end
   end
 end
 
-UIFont.send(:include, SimpleView::UIFont)
+UIFont.send(:include, SimpleView::UIFontExtensions)

data/lib/simple_view/extensions/ui_image.rb

@@ -1,9 +1,9 @@
 module SimpleView
-  module UIImage
+  module UIImageExtensions
     def to_image
       self
     end
   end
 end
 
-UIImage.send(:include, SimpleView::UIImage)
+UIImage.send(:include, SimpleView::UIImageExtensions)

data/lib/simple_view/extensions/ui_view.rb

@@ -1,101 +1,68 @@
 module SimpleView
-  module UIView
-    attr_accessor :name, :bottom, :right, :anchors
-
-    def find name
-      subviews.each do |subview|
-        return subview if subview.name == name
-      end
-      nil
-    end
-    alias_method :subview, :find
-
-    def sibling name
-      if superview
-        superview.find name
-      else
+  module UIViewExtensions
+    module Traversing
+      attr_accessor :name
+
+      def find name
+        subviews.each do |subview|
+          return subview if subview.name == name
+        end
         nil
       end
-    end
+      alias_method :subview, :find
+
+      def sibling name
+        if superview
+          superview.find name
+        else
+          nil
+        end
+      end
 
-    def closest name
-      view = sibling name
-      if view.nil? && superview
-        view = superview.closest name
+      def closest name
+        view = sibling name
+        if view.nil? && superview
+          view = superview.closest name
+        end
+        view
       end
-      view
     end
 
-    def invalidate_size
-      f = self.frame
-      max_width = superview ? superview.bounds.size.width : 0
-      max_height = superview ? superview.bounds.size.height : 0
-
-      @anchors ||= [:top, :left]
-      anchor_top = @anchors.include?(:top)
-      anchor_left = @anchors.include?(:left)
-      anchor_bottom = @anchors.include?(:bottom)
-      anchor_right = @anchors.include?(:right)
-
-      self.autoresizingMask = UIViewAutoresizingNone
-      self.autoresizingMask |= UIViewAutoresizingFlexibleTopMargin unless anchor_top
-      self.autoresizingMask |= UIViewAutoresizingFlexibleLeftMargin unless anchor_left
-      self.autoresizingMask |= UIViewAutoresizingFlexibleBottomMargin unless anchor_bottom
-      self.autoresizingMask |= UIViewAutoresizingFlexibleRightMargin unless anchor_right
-      self.autoresizingMask |= UIViewAutoresizingFlexibleWidth if anchor_left && anchor_right
-      self.autoresizingMask |= UIViewAutoresizingFlexibleHeight if anchor_top && anchor_bottom
-
-      if (anchor_left && anchor_right) || (anchor_left && !@right.nil?)
-        f.size.width = max_width - self.left - @right.to_i
-      elsif anchor_right
-        f.origin.x = max_width - self.width - @right.to_i
-      elsif !anchor_left && !anchor_right
-        f.origin.x = max_width / 2 - f.size.width / 2
+    module Dimensions
+      def left
+        self.frame.origin.x
       end
 
-      if (anchor_top && anchor_bottom) || (anchor_top && !@bottom.nil?)
-        f.size.height = max_height - self.top - @bottom.to_i
-      elsif anchor_bottom
-        f.origin.y = max_height - self.height - @bottom.to_i
-      elsif !anchor_top && !anchor_bottom
-        f.origin.y = max_height / 2 - f.size.height / 2
+      def setLeft value
+        self.frame = [[value, self.frame.origin.y], [self.frame.size.width, self.frame.size.height]]
       end
 
-      self.frame = f
-    end
-
-    def top
-      self.frame.origin.y
-    end
-
-    def setTop value
-      self.frame = [[self.frame.origin.x, value], [self.frame.size.width, self.frame.size.height]]
-    end
-
-    def left
-      self.frame.origin.x
-    end
+      def top
+        self.frame.origin.y
+      end
 
-    def setLeft value
-      self.frame = [[value, self.frame.origin.y], [self.frame.size.width, self.frame.size.height]]
-    end
+      def setTop value
+        self.frame = [[self.frame.origin.x, value], [self.frame.size.width, self.frame.size.height]]
+      end
 
-    def width
-      self.frame.size.width
-    end
+      def width
+        self.frame.size.width
+      end
 
-    def setWidth value
-      self.frame = [[self.frame.origin.x, self.frame.origin.y], [value, self.frame.size.height]]
-    end
+      def setWidth value
+        self.frame = [[self.frame.origin.x, self.frame.origin.y], [value, self.frame.size.height]]
+      end
 
-    def height
-      self.frame.size.height
-    end
+      def height
+        self.frame.size.height
+      end
 
-    def setHeight value
-      self.frame = [[self.frame.origin.x, self.frame.origin.y], [self.frame.size.width, value]]
+      def setHeight value
+        self.frame = [[self.frame.origin.x, self.frame.origin.y], [self.frame.size.width, value]]
+      end
     end
   end
 end
 
-UIView.send(:include, SimpleView::UIView)
+UIView.send(:include, SimpleView::UIViewExtensions::Traversing)
+UIView.send(:include, SimpleView::UIViewExtensions::Dimensions)