motion-prime 0.7.2 → 0.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDk3ZTI2ODAzMjJjMmRlMTRlMDUyZjY5YTZkNjM0MWY0N2ExM2E3MQ==
+    OGVhYzU1YWVlZDBhZTZlMzhkY2VjYjA0Y2ZiMGM4YjAyZTQyZDIyZA==
   data.tar.gz: !binary |-
-    NGRmNjY2MGU2ODE4MThhNTVhYzc4NTQ0YzA0NjI2NDNlMTdiN2E0Mw==
+    NmFkNjhlMzIyYWRlNzdkYzUxM2VlZGE4ZWZjNDYzYmIwYThhOTZmZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTA5NmMwMDhkN2U0OGZhZjgxYzJlOTQ4MTY1ZTYyZTNmNzM1NTM5MTVlZjY4
-    NjJmMjgxYjg4NTk0ZDRiNjEwODg5YjJmNzliZGZhNDIyMWQyZjNhYjY1ZTFj
-    NzQ5ZmRmNmQyMDZiY2NiZDA2ODMxNWYxNDVjOGZlNWQxMjBlNDY=
+    MTJhOGI3ZTNkMzNlY2E4ZTI5Yzk1ZDNlZTYyNTRiNTM4ZjU4NGY2ZDlhOWRk
+    ZGNlNjlhM2FlMDcxNmQ3YWI2Zjk4ZmE5MzY2OTY0ZjRiOTQ5YTU2ODY3YTY4
+    OGYxZmJlN2E4M2MyMjA4MjllODRmNDYyNTFiMGY2NGIyZTYwNTA=
   data.tar.gz: !binary |-
-    YmJmNWQxNDFjM2RhZTQwZTMyNWRiYzJjYTFkNDIyNjg4Nzg3ZTVhOTQxZDYy
-    ZTg5MDYwMDA4YzViZGIwOTJmNDMyYjA5MDNlZTJmMzg3MTg1MDcxZDUwZDkw
-    MDFjYWIxOWEzNWNlMmZlZjgwMTk2MmZiMmY3ZTFiZjdjZmNhYWY=
+    MzczYzhkMjM0ZmJjYmExZTcxZTE0ZTExNzFkNDliNDg4NGFjYWFlNTdiOGVk
+    ODE4MzI1OGMxNmI1MDE1NGU0NjEyODY2YWNjMDQ3Zjg0Mjc3ZmVmNTQ4OWE3
+    YzQ0YmU5YjFiNjg3ODIyYTE0ODI4MTBkMDM2MjQ0NjhjY2Q3MDU=

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+=== 0.8.0
+* Simpler syntax for using fonts. See prime_bootstrap.
+* All style things moved from default prime template to bootstrap template.
+* Removed root :title option support for submit field.
+* Use field name as label text by default.
+* Bug fixes.
+
 === 0.7.2
 * Added simpler syntax for rendering sections in screen. E.g. section :my_profile.
 * Bug fixes.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.7.2)
+    motion-prime (0.8.0)
       afmotion (~> 2.0.0)
       bubble-wrap (~> 1.4.0)
       cocoapods

data/README.md

@@ -1,6 +1,6 @@
 # MotionPrime [![Build Status](https://travis-ci.org/droidlabs/motion-prime.png)](https://travis-ci.org/droidlabs/motion-prime) [![Code Climate](https://codeclimate.com/github/droidlabs/motion-prime.png)](https://codeclimate.com/github/droidlabs/motion-prime) [![Roadchange](https://roadchange.com/droidlabs/motion-prime/badge.png)](https://roadchange.com/droidlabs/motion-prime) 
 
-![Prime](https://s3-us-west-2.amazonaws.com/webmate/assets/prime.jpg)
+![Prime](https://s3.amazonaws.com/motionprime/logo-1.png)
 
 MotionPrime is yet another framework written on RubyMotion for creating really fast iOS applications.
 
@@ -15,14 +15,13 @@ MotionPrime is yet another framework written on RubyMotion for creating really f
 
     $ gem install motion-prime
 
-### 2. Create MotionPrime project:
+### 2. Create empty MotionPrime project:
 
     $ prime new myapp
 
-### 3. Setup application
+### 3. Or create bootstrap MotionPrime project:
   
-    $ bundle install
-    $ rake pod:install
+    $ prime bootstrap myapp
 
 ### 4. Run application
 
@@ -64,13 +63,13 @@ MotionPrime is yet another framework written on RubyMotion for creating really f
 
 ## Extensions
 
-* [ECSlidingViewController 2 integration](https://github.com/droidlabs/prime_sliding_menu) (Sidebar)
-* [RESideMenu integration](https://github.com/droidlabs/prime_reside_menu) (Sidebar)
-* [Sliding actions support](https://github.com/droidlabs/prime_sliding_action)
+* [ECSlidingViewController 2 integration](https://github.com/motionprime/prime_sliding_menu) (Sidebar)
+* [RESideMenu integration](https://github.com/motionprime/prime_reside_menu) (Sidebar)
+* [Sliding actions support](https://github.com/motionprime/prime_sliding_action)
 
 ## Samples
 
-* [Simple to-do app](https://github.com/droidlabs/prime_sample_todo)
+* [Simple to-do app](https://github.com/motionprime/prime_sample_todo)
 
 ## Documentation
 

data/ROADMAP.md

@@ -1,15 +1,13 @@
-=== 0.8.0
-* add cell preload for reverse scrolling table.
-* deprecate root level :title option for submit field
+=== 0.8.1
 * rename submit element in submit field to button element
 * rename date_picker element in date_picker field to input element
-* add more and better default options for fields
 * Rename model to data in sections.
 
 === 0.9.0
 * bug: if mp label do not have text and was set as hidden, it should unhide after setting text
 * bug: size_to_fit works incorrect with relative width.
-* add cleanup for section events
+* bug: bind_keyboard_close breaks bind_guesture
+* add clone to models to prevent problems when bag_key is overrided
 * add dsl for push notifications
 * add some extensions/middleware system, at least for networking.
 * create "display_network_error" extension.
@@ -20,6 +18,7 @@
 * add sections/screens/models generator
 
 === 1.1.0
+* add cell preload for reverse scrolling table.
 * add computed_options.get(), this will allow to make sure that options is computed.
 * add testing framework
 * add DSL for ViewStyles#setValue conditions

data/bin/prime

@@ -11,7 +11,8 @@ class App
   
   main do |command, opt|
     case command.to_sym
-    when :new then create(opt)
+    when :new then create_base(opt)
+    when :bootstrap then create_bootstrap(opt)
     else help
     end
     0
@@ -24,14 +25,22 @@ class App
     info "    Creates a new MotionPrime app from a template."
   end
 
-  def self.create(name)
+  def self.create_base(name)
+    create(name, "motion-prime", "git://github.com/droidlabs/motion-prime.git")
+  end
+
+  def self.create_bootstrap(name)
+    create(name, "prime_bootstrap", "git://github.com/motionprime/prime_bootstrap.git")
+  end
+
+  def self.create(name, template_name, repo)
     return puts "Usage: prime new <appname>" unless name.to_s.length > 0
     info "Creating new MotionPrime iOS app: #{name}"
     if false
-      sh "motion create #{name} --template=git://github.com/droidlabs/motion-prime.git"
+      sh "motion create #{name} --template=#{repo}"
     else
-      clone_template
-      sh "motion create #{name} --template=motion-prime"
+      clone_template(template_name, repo)
+      sh "motion create #{name} --template=#{template_name}"
     end
     info "Command: bundle instal"
     sh "cd ./#{name}; bundle install"
@@ -45,20 +54,16 @@ class App
     ENV['HOME'].split('/')[0..2].join('/')
   end
 
-  def self.repo_url
-    "git://github.com/droidlabs/motion-prime.git"
-  end
-
-  def self.clone_template
-    path = File.expand_path(File.join(home_path, 'Library/RubyMotion/template', 'motion-prime'))
-    git_clone(path)
+  def self.clone_template(name, repo)
+    path = File.expand_path(File.join(home_path, 'Library/RubyMotion/template', name))
+    git_clone(path, repo)
   end
 
-  def self.git_clone(path)
+  def self.git_clone(path, repo)
     if File.exist?(path)
       system("git --work-tree=#{path} --git-dir=#{path}/.git pull origin master")
     else
-      system("git clone #{repo_url} #{path}")
+      system("git clone #{repo} #{path}")
     end
   end
 

data/files/Rakefile

@@ -14,5 +14,4 @@ Motion::Project::App.setup do |app|
 
   app.version = '0.0.1'
   app.icons = %w{Icon.png}
-  app.fonts = ['fonts/ubuntu.ttf']
 end

data/files/app/app_delegate.rb

@@ -1,17 +1,5 @@
 class AppDelegate < Prime::BaseAppDelegate
   def on_load(app, options)
-    setup_navigation_styles
     open_screen :home, sidebar: true
   end
-
-  def setup_navigation_styles
-    bar_appearance = UINavigationBar.appearance
-    bar_appearance.barTintColor = :app_dark.uicolor
-
-    settings = {
-      UITextAttributeFont =>  Prime::Config.font.name.uifont(17),
-      UITextAttributeTextColor =>  :white.uicolor
-    }
-    bar_appearance.setTitleTextAttributes(settings)
-  end
 end

data/files/app/config/base.rb

@@ -1,14 +1,3 @@
 Prime::Config.configure do |config|
-  config.colors do |colors|
-    colors.base = 0x3aa9b6
-    colors.dark = 0x41929c
-  end
-
-  config.font.name = "Ubuntu"
-
-  config.api_client do |api|
-    api.base = "http://example.com"
-    api.client_id = ""
-    api.client_secret = ""
-  end
+  
 end

data/files/app/screens/application.rb

@@ -1,7 +1,3 @@
 class ApplicationScreen < Prime::Screen
-  before_render :setup_navigation
-
-  def setup_navigation
-    set_navigation_left_button 'menu', image: 'images/menu_button.png', action: :toggle_sidebar
-  end
+  
 end

data/motion-prime/api_client.rb

@@ -59,7 +59,8 @@ class ApiClient
     use_callback = block_given?
 
     client_method = files.present? ? :"multipart_#{method}" : method
-    AFMotion::Client.shared.send client_method, "#{config.api_namespace}#{path}", data do |response, form_data, progress|
+    path = "#{config.api_namespace}#{path}" unless path.starts_with?('http')
+    AFMotion::Client.shared.send client_method, path, data do |response, form_data, progress|
       if form_data && files.present?
         files.each do |file_data|
           form_data.appendPartWithFileData(file_data[:data], name: file_data[:name], fileName:"avatar.png", mimeType: "image/jpeg")

data/motion-prime/config/base.rb

@@ -5,9 +5,14 @@ MotionPrime::Config.configure do |config|
   else
     config.model.store_type = :file
   end
-  config.font.name = "Ubuntu"
+  
+  config.fonts do |fonts|
+    fonts.base = :system
+  end
+
   config.colors do |colors|
-    colors.base = 0x424242
+    colors.base = 0x1b75bc
+    colors.dark = 0x333333
     colors.error = 0xef471f
   end
   config.api_client do |api|
@@ -22,5 +27,5 @@ MotionPrime::Config.configure do |config|
   end
   config.prime.cell_section.mixins = [Prime::CellSectionMixin]
   config.logger.level = :info
-  config.logger.dealloc_items = ['screen', 'tab_bar']
+  config.logger.dealloc_items = ['screen']
 end

data/motion-prime/config/config.rb

@@ -53,6 +53,7 @@ module MotionPrime
         end
         setup_models
         setup_colors
+        setup_fonts
         setup_logger
       end
 
@@ -74,6 +75,23 @@ module MotionPrime
         Symbol.css_colors.merge!(colors)
       end
 
+      def setup_fonts
+        return unless @base_config
+        colors = @base_config.fonts.to_hash.inject({}) do |res, (font, value)|
+          if [:system, :bold, :italic, :monospace].include?(value)
+            value = Symbol.uifont[value]
+          end
+          unless font == :prefix
+            unless @base_config.fonts.prefix.nil?
+              res[:"#{@base_config.fonts.prefix}_#{font}"] = value
+            end
+            res[:"app_#{font}"] = value
+          end
+          res
+        end
+        Symbol.uifont.merge!(colors)
+      end
+
       def setup_logger
         Prime::Logger.level = @base_config.logger.level
         Prime::Logger.dealloc_items =  @base_config.logger.dealloc_items

data/motion-prime/elements/_text_mixin.rb

@@ -22,10 +22,6 @@ module MotionPrime
         NSDocumentTypeDocumentAttribute => NSHTMLTextDocumentType,
         NSCharacterEncodingDocumentAttribute => NSNumber.numberWithInt(NSUTF8StringEncoding)
       }
-      # DTCoreTextFontDescriptor.setOverrideFontName(Prime::Config.font.light, forFontFamily: 'Calibri', bold: false, italic: false)
-      # DTCoreTextFontDescriptor.setOverrideFontName(Prime::Config.font.bold, forFontFamily: 'Calibri', bold: true, italic: false)
-      # DTCoreTextFontDescriptor.setOverrideFontName(Prime::Config.font.light_italic, forFontFamily: 'Calibri', bold: false, italic: true)
-      # DTCoreTextFontDescriptor.setOverrideFontName(Prime::Config.font.bold_italic, forFontFamily: 'Calibri', bold: true, italic: true)
 
       text = "#{options[:text]}<style>* { #{styles.join} }</style>"
       NSAttributedString.alloc.initWithData(text.dataUsingEncoding(NSUTF8StringEncoding), options: html_options, documentAttributes: nil, error: nil)

data/motion-prime/elements/base_element.rb

@@ -29,10 +29,10 @@ module MotionPrime
       @view_name = self.class_name_without_kvo.demodulize.underscore.gsub(/(_draw)?_element/, '')
     end
 
-    # def dealloc
-    #   pp 'Deallocating elemenet', self.name, self.to_s, computed_options[:text]
-    #   super
-    # end
+    def dealloc
+      Prime.logger.dealloc_message :element, self, self.name
+      super
+    end
 
     def add_target(target = nil, action = 'on_click:', event = :touch)
       return false unless self.view
@@ -111,53 +111,7 @@ module MotionPrime
 
         @styles = []
         if is_cell_section
-          base_styles = {common: [], specific: []}
-          suffixes = {common: [], specific: []}
-
-          # following example in Prime::TableSection#cell_styles
-          # form element/cell: <base|user>_form_field, <base|user>_form_string_field, user_form_field_email
-          # table element/cell: <base|categories>_table_cell, categories_table_title
-          if section.section_styles
-            section.section_styles.each { |type, values| base_styles[type] += values }
-          end
-          if %w[base table_view_cell].exclude?(@view_name)
-            # form element: _input
-            # table element: _image
-            suffixes[:common] << @view_name.to_sym
-            suffixes[:common] << :"#{@view_name}_with_errors" if has_errors
-          end
-          if name && name.to_s != @view_name
-            # form element: _input
-            # table element: _icon
-            suffixes[:specific] << name.to_sym
-            suffixes[:specific] << :"#{name}_with_errors" if has_errors
-          end
-          # form cell: base_form_field, base_form_string_field
-          # form element: base_form_field_string_field, base_form_string_field_text_field
-          # table cell: base_table_cell
-          # table element: base_table_cell_image
-          common_styles = if suffixes[:common].any?
-            build_styles_chain(base_styles[:common], suffixes[:common])
-          elsif suffixes[:specific].any?
-            build_styles_chain(base_styles[:common], suffixes[:specific])
-          elsif @view_name == 'table_view_cell'
-            base_styles[:common]
-          end
-          @styles += Array.wrap(common_styles)
-
-          # form cell: user_form_field, user_form_string_field, user_form_field_email
-          # form element: user_form_field_text_field, user_form_string_field_text_field, user_form_field_email_text_field
-          # table cell: categories_table_cell, categories_table_title
-          # table element: categories_table_cell_image, categories_table_title_image
-          specific_base_common_suffix_styles = if suffixes[:common].any?
-            build_styles_chain(base_styles[:specific], suffixes[:common])
-          elsif suffixes[:specific].empty? && @view_name == 'table_view_cell'
-            base_styles[:specific]
-          end
-          @styles += Array.wrap(specific_base_common_suffix_styles)
-          # form element: user_form_field_input, user_form_string_field_input, user_form_field_email_input
-          # table element: categories_table_cell_icon, categories_table_title_icon
-          @styles += build_styles_chain(base_styles[:specific], suffixes[:specific])
+          @styles += compute_cell_style_options(style_sources, has_errors)
         end
         # don't use present? here, it's slower, while this method should be very fast
         if section && section.name && section.name != '' && name && name != ''
@@ -168,11 +122,70 @@ module MotionPrime
         custom_styles = style_sources.map do |source|
           normalize_object(source.delete(:styles), section)
         end.flatten
+
+        # styles got from mixins option
+        mixin_styles = style_sources.map do |source|
+          normalize_object(source.delete(:mixins), section)
+        end.flatten.map{ |m| :"_mixin_#{m}" }
+
         @styles += custom_styles
+        @styles += mixin_styles
         # puts @view_class.to_s + @styles.inspect, ''
         @styles
       end
 
+      def compute_cell_style_options(style_sources, has_errors)
+        base_styles = {common: [], specific: []}
+        suffixes = {common: [], specific: []}
+        all_styles = []
+
+        # following example in Prime::TableSection#cell_styles
+        # form element/cell: <base|user>_form_field, <base|user>_form_string_field, user_form_field_email
+        # table element/cell: <base|categories>_table_cell, categories_table_title
+        if section.section_styles
+          section.section_styles.each { |type, values| base_styles[type] += values }
+        end
+        if @view_name != 'base' && @view_name != 'table_view_cell'
+          # form element: _input
+          # table element: _image
+          suffixes[:common] << @view_name.to_sym
+          suffixes[:common] << :"#{@view_name}_with_errors" if has_errors
+        end
+        if name && name.to_s != @view_name
+          # form element: _input
+          # table element: _icon
+          suffixes[:specific] << name.to_sym
+          suffixes[:specific] << :"#{name}_with_errors" if has_errors
+        end
+        # form cell: base_form_field, base_form_string_field
+        # form element: base_form_field_string_field, base_form_string_field_text_field
+        # table cell: base_table_cell
+        # table element: base_table_cell_image
+        common_styles = if suffixes[:common].any?
+          build_styles_chain(base_styles[:common], suffixes[:common])
+        elsif suffixes[:specific].any?
+          build_styles_chain(base_styles[:common], suffixes[:specific])
+        elsif @view_name == 'table_view_cell'
+          base_styles[:common]
+        end
+        all_styles += Array.wrap(common_styles)
+
+        # form cell: user_form_field, user_form_string_field, user_form_field_email
+        # form element: user_form_field_text_field, user_form_string_field_text_field, user_form_field_email_text_field
+        # table cell: categories_table_cell, categories_table_title
+        # table element: categories_table_cell_image, categories_table_title_image
+        specific_base_common_suffix_styles = if suffixes[:common].any?
+          build_styles_chain(base_styles[:specific], suffixes[:common])
+        elsif suffixes[:specific].empty? && @view_name == 'table_view_cell'
+          base_styles[:specific]
+        end
+        all_styles += Array.wrap(specific_base_common_suffix_styles)
+        # form element: user_form_field_input, user_form_string_field_input, user_form_field_email_input
+        # table element: categories_table_cell_icon, categories_table_title_icon
+        all_styles += build_styles_chain(base_styles[:specific], suffixes[:specific])
+        all_styles
+      end
+
     class << self
       def factory(type, options = {})
         element_class = class_factory("#{type}_element", true) || self