rhodes 5.5.2 → 5.5.15

data/res/generators/templates/api/platform/iphone/generated/javascript/montana_js_wrap.mm

@@ -2,7 +2,7 @@
 # NB: each rb_"+$cur_module.name+"_"+module_method.native_name+"_Obj call
 # creates CMethodResult inside and releases it after call
 # in case if call is sheduled result should be retained
-# so makeParams retains it and releases after a call 
+# so makeParams retains it and releases after a call
 %>
 #import "I<%= $cur_module.name %>.h"
 //#import "api_generator/common/ruby_helpers.h"
@@ -246,7 +246,7 @@ static <%= $cur_module.name %>_<%= module_method.native_name %>_caller* our_<%=
             }
             // TODO: Handle CMethodResultError
             if (params[i] == nil) {
-                NSLog(<%= '@"' + $cur_module.name + '::' + module_method.native_name + ' parameter %d is nil!"' %>, i);
+                //NSLog(<%= '@"' + $cur_module.name + '::' + module_method.native_name + ' parameter %d is nil!"' %>, i);
                 rho::String resValue = rho::String("\"result\":null,\"error\":\"Method parameter is nil!\"");
                 return resValue;
             }
@@ -382,5 +382,3 @@ rho::String js_s_<%= $cur_module.name %>_setDefaultID(const rho::String& strObjI
     return "\"result\":null,\"error\":\"Method parameter should be defined as string!\"";
 }
 <% end %>
-
-

data/res/generators/templates/application/AndroidManifest.erb

@@ -25,7 +25,7 @@
   <supports-screens android:normalScreens='true' android:largeScreens='true' android:xlargeScreens='true'/>
   <application android:name='com.rhomobile.rhodes.RhodesApplication'
                android:label='@string/app_name'
-               android:icon='@drawable/icon'
+               android:icon='@mipmap/icon'
                android:debuggable='<%= @debuggable %>'>
 
     <!-- Uses libraries -->

data/res/generators/templates/application/app/Settings/home.erb

@@ -14,7 +14,7 @@
         </div>
         <div class="col-xs-2 col-sm-2 col-md-2 col-lg-2">
           <%% if SyncEngine::logged_in > 0 %>
-          <a href="<%%= url_for :controller => :Settings, :action => :logout %" class="btn btn-default btn-sm pull-right">
+          <a href="<%%= url_for :controller => :Settings, :action => :logout %>" class="btn btn-default btn-sm pull-right">
             Logout
           </a>
           <%% else %>

data/res/generators/templates/application/build.yml

@@ -1,28 +1,74 @@
+## Note: sdk is full path to Rhodes root. If not defined - automatically find latest installed Rhodes gem
 #sdk: "<%=@sdk_path%>"
 sdkversion: <%=Rhodes::VERSION%>
 name: <%=@app_name%>
 version: 1.0
 vendor: rhomobile
+## Note: rho_app_id send to RhoConnect server for identify application (used in multi-push configuration only)
+## we recommend make it same with BundleIdentifier
+rho_app_id: com.rhomobile.<%=@app_name_cleared%>
 build: debug
 applog: rholog.txt
+
+## Note: enable specific device capabilities for aplication
+#capabilities:
+  ## allows use of audio hardware (record audio, modify audio settings)
+  #- audio
+  ## allows use of hardware camera
+  #- camera
+  ## allows use of geo location service
+  #- gps
+  ## allows read device network state (connected/disconnected)
+  #- network_state
+  ## allow make calls/read phone state
+  #- phone
+  ## allow read/modify personal information and contacts
+  #- pim
+  ## allows use of PUSH on device
+  #- push
+  ## allows use of hardware vibration mechanism
+  #- vibrate
+  ## allows use of bluetooth hardware
+  #- bluetooth
+  ## allows access to default device calendar
+  #- calendar
+  ## allows writing to the SD card on Android devices
+  #- sdcard
+
 iphone:
   configuration: Release
-  sdk: iphonesimulator10.0
+  ## Note: sdk can be 3 predefined value : latest, latest_simulator, latest_device
+  ## simulator or device detect by rake command for "rake run:iphone" is simulator, for "rake device:iphone:production" is device
+  ## sdk also can be defined exactly like:  iphonesimulator10.2 or iphoneos10.2
+  sdk: latest
+  ## Note: provisionprofile can be defined as name or UUID - if you defined provisionprofile then codesignidentity defined automatically if you not defined it in this build.yml
   #provisionprofile:
   #codesignidentity:
   #entitlements:
   BundleIdentifier: com.rhomobile.<%=@app_name_cleared%>
   BundleURLScheme: <%=@app_name_cleared%>
-  production:
-    ipa_itunesartwork_image: "./production/iTunesArtwork.png"
-  # Note: Specifies the URL schemes the app is able to call using Rho.System.runApplication
-  #ApplicationQueriesSchemes: ["scheme1", "scheme2"]
+  ## Note: Specifies the URL schemes the app is able to call using Rho.System.runApplication
+  #ApplicationQueriesSchemes: ['scheme1', 'scheme2']
+  ## Note: Specifies list of HTTP domains for connect from application
+  #http_connection_domains: ['domain1.com', 'domain2.org']
+  ## Note: Specify remove of Info.plist keys - use this if you need to remove some keys from Info.plist
+  ## This example remove two keys with unsupported screen orientation
+  #info_plist_data_remove:
+  #- UISupportedInterfaceOrientations: ['UIInterfaceOrientationLandscapeLeft', 'UIInterfaceOrientationLandscapeRight']
+  ## Note: Specifies set/modify of Info.plist keys with content(hash) - all of this items will be apply to final Info.plist of application. You can specify any Ino.plist data in this parameter.
+  ## This example allow all HTTP connections in application:
+  #info_plist_data:
+  #  NSAppTransportSecurity:
+  #    NSAllowsArbitraryLoads: true
+
+
 wp8:
   productid: '<%=@productid%>'
+
 android:
   #manifest_template: 'AndroidManifest.erb'
   version: 4.1.0
-  # Note: in order to simplify debugging only app messages and system channels with priority informative and higher, and any errors are enabled by default
+  ## Note: in order to simplify debugging only app messages and system channels with priority informative and higher, and any errors are enabled by default
   logcatFilter: APP:I StrictMode:I DEBUG:I *:E
 
 wm:

data/res/generators/templates/application/rhoconfig.txt

@@ -128,7 +128,8 @@ jqtouch_mode=1
 # disables barcode on page navigation on android, default value is 1, means barcode will be disabled on page navigation
 #disable_scanner_during_navigation = 1
 
-splash_screen='zoom'
+#dealy in seconds for splash screen image
+splash_screen='zoom;delay=3'
 
 use_bb_full_browser=6
 

data/res/generators/templates/iphone_project/Bremen7.xcodeproj/project.pbxproj

@@ -71,6 +71,17 @@
 		FAC70A8119D10F0A0036337B /* Default-Portrait@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FAC70A7919D10F0A0036337B /* Default-Portrait@2x.png */; };
 		FAC70A8219D10F0A0036337B /* Default-PortraitUpsideDown@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FAC70A7A19D10F0A0036337B /* Default-PortraitUpsideDown@2x.png */; };
 		FAC70A8319D10F0A0036337B /* icon180.png in Resources */ = {isa = PBXBuildFile; fileRef = FAC70A7B19D10F0A0036337B /* icon180.png */; };
+		FAD18F231E3AF8100064808C /* back_btn@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FAD18F181E3AF8100064808C /* back_btn@2x.png */; };
+		FAD18F241E3AF8100064808C /* back_btn@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = FAD18F191E3AF8100064808C /* back_btn@3x.png */; };
+		FAD18F251E3AF8100064808C /* forward_btn@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FAD18F1A1E3AF8100064808C /* forward_btn@2x.png */; };
+		FAD18F261E3AF8100064808C /* forward_btn@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = FAD18F1B1E3AF8100064808C /* forward_btn@3x.png */; };
+		FAD18F271E3AF8100064808C /* gears@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FAD18F1C1E3AF8100064808C /* gears@2x.png */; };
+		FAD18F281E3AF8100064808C /* gears@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = FAD18F1D1E3AF8100064808C /* gears@3x.png */; };
+		FAD18F291E3AF8100064808C /* home_btn@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FAD18F1E1E3AF8100064808C /* home_btn@2x.png */; };
+		FAD18F2A1E3AF8100064808C /* home_btn@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = FAD18F1F1E3AF8100064808C /* home_btn@3x.png */; };
+		FAD18F2B1E3AF8100064808C /* sync_btn.png in Resources */ = {isa = PBXBuildFile; fileRef = FAD18F201E3AF8100064808C /* sync_btn.png */; };
+		FAD18F2C1E3AF8100064808C /* sync_btn@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FAD18F211E3AF8100064808C /* sync_btn@2x.png */; };
+		FAD18F2D1E3AF8100064808C /* sync_btn@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = FAD18F221E3AF8100064808C /* sync_btn@3x.png */; };
 		FAED78CE183C3CF400BC7028 /* libRhodes.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAED7893183C3A8200BC7028 /* libRhodes.a */; };
 		FAEE464419D111E500E7E2CE /* iTunesArtwork@2x in Resources */ = {isa = PBXBuildFile; fileRef = FAEE464319D111E500E7E2CE /* iTunesArtwork@2x */; };
 		FAF3BF3218E26D3B00860FCA /* app_build_configs.c in Sources */ = {isa = PBXBuildFile; fileRef = FAF3BF3018E26D3B00860FCA /* app_build_configs.c */; };
@@ -164,6 +175,17 @@
 		FAC70A7919D10F0A0036337B /* Default-Portrait@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Portrait@2x.png"; sourceTree = "<group>"; };
 		FAC70A7A19D10F0A0036337B /* Default-PortraitUpsideDown@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-PortraitUpsideDown@2x.png"; sourceTree = "<group>"; };
 		FAC70A7B19D10F0A0036337B /* icon180.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon180.png; sourceTree = "<group>"; };
+		FAD18F181E3AF8100064808C /* back_btn@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "back_btn@2x.png"; path = "Resources/back_btn@2x.png"; sourceTree = "<group>"; };
+		FAD18F191E3AF8100064808C /* back_btn@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "back_btn@3x.png"; path = "Resources/back_btn@3x.png"; sourceTree = "<group>"; };
+		FAD18F1A1E3AF8100064808C /* forward_btn@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "forward_btn@2x.png"; path = "Resources/forward_btn@2x.png"; sourceTree = "<group>"; };
+		FAD18F1B1E3AF8100064808C /* forward_btn@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "forward_btn@3x.png"; path = "Resources/forward_btn@3x.png"; sourceTree = "<group>"; };
+		FAD18F1C1E3AF8100064808C /* gears@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "gears@2x.png"; path = "Resources/gears@2x.png"; sourceTree = "<group>"; };
+		FAD18F1D1E3AF8100064808C /* gears@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "gears@3x.png"; path = "Resources/gears@3x.png"; sourceTree = "<group>"; };
+		FAD18F1E1E3AF8100064808C /* home_btn@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "home_btn@2x.png"; path = "Resources/home_btn@2x.png"; sourceTree = "<group>"; };
+		FAD18F1F1E3AF8100064808C /* home_btn@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "home_btn@3x.png"; path = "Resources/home_btn@3x.png"; sourceTree = "<group>"; };
+		FAD18F201E3AF8100064808C /* sync_btn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = sync_btn.png; path = Resources/sync_btn.png; sourceTree = "<group>"; };
+		FAD18F211E3AF8100064808C /* sync_btn@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "sync_btn@2x.png"; path = "Resources/sync_btn@2x.png"; sourceTree = "<group>"; };
+		FAD18F221E3AF8100064808C /* sync_btn@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "sync_btn@3x.png"; path = "Resources/sync_btn@3x.png"; sourceTree = "<group>"; };
 		FAED788D183C3A8100BC7028 /* Rhodes.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Rhodes.xcodeproj; path = Rhodes/Rhodes.xcodeproj; sourceTree = "<group>"; };
 		FAEE464319D111E500E7E2CE /* iTunesArtwork@2x */ = {isa = PBXFileReference; lastKnownFileType = file; path = "iTunesArtwork@2x"; sourceTree = "<group>"; };
 		FAF3BF3018E26D3B00860FCA /* app_build_configs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = app_build_configs.c; path = Rhodes/app_build_configs.c; sourceTree = "<group>"; };
@@ -312,9 +334,20 @@
 				FA20C1AF182AFD870036D304 /* esri.png */,
 				FA20C1B0182AFD870036D304 /* esri@2x.png */,
 				FA20C1A5182AFD760036D304 /* back_btn.png */,
+				FAD18F181E3AF8100064808C /* back_btn@2x.png */,
+				FAD18F191E3AF8100064808C /* back_btn@3x.png */,
 				FA20C1A6182AFD760036D304 /* forward_btn.png */,
+				FAD18F1A1E3AF8100064808C /* forward_btn@2x.png */,
+				FAD18F1B1E3AF8100064808C /* forward_btn@3x.png */,
 				FA20C1A7182AFD760036D304 /* gears.png */,
+				FAD18F1C1E3AF8100064808C /* gears@2x.png */,
+				FAD18F1D1E3AF8100064808C /* gears@3x.png */,
 				FA20C1A8182AFD760036D304 /* home_btn.png */,
+				FAD18F1E1E3AF8100064808C /* home_btn@2x.png */,
+				FAD18F1F1E3AF8100064808C /* home_btn@3x.png */,
+				FAD18F201E3AF8100064808C /* sync_btn.png */,
+				FAD18F211E3AF8100064808C /* sync_btn@2x.png */,
+				FAD18F221E3AF8100064808C /* sync_btn@3x.png */,
 				FA6DFCDE18232A2C00A3B595 /* icon144.png */,
 				FA6DFCDF18232A2C00A3B595 /* icon72.png */,
 				FA6DFCE018232A2C00A3B595 /* icon114.png */,
@@ -427,11 +460,14 @@
 			buildActionMask = 2147483647;
 			files = (
 				FAEE464419D111E500E7E2CE /* iTunesArtwork@2x in Resources */,
+				FAD18F2B1E3AF8100064808C /* sync_btn.png in Resources */,
 				FA20C1F7182B01DF0036D304 /* Default-LandscapeRight.png in Resources */,
 				FAC70A7E19D10F0A0036337B /* Default-Landscape@2x.png in Resources */,
+				FAD18F241E3AF8100064808C /* back_btn@3x.png in Resources */,
 				FA20C1A9182AFD760036D304 /* back_btn.png in Resources */,
 				FA20C1AC182AFD760036D304 /* home_btn.png in Resources */,
 				FA20C1B1182AFD870036D304 /* BluePushpin.png in Resources */,
+				FAD18F251E3AF8100064808C /* forward_btn@2x.png in Resources */,
 				FAC70A7C19D10F0A0036337B /* Default-667h@2x.png in Resources */,
 				BDFBD99610B1B99A00BAAFAB /* Entitlements.plist in Resources */,
 				FA20C1AA182AFD760036D304 /* forward_btn.png in Resources */,
@@ -448,21 +484,29 @@
 				FA20C1B4182AFD870036D304 /* esri@2x.png in Resources */,
 				FA20C1AB182AFD760036D304 /* gears.png in Resources */,
 				FA6DFCEA18232A2C00A3B595 /* icon120.png in Resources */,
+				FAD18F261E3AF8100064808C /* forward_btn@3x.png in Resources */,
 				FA20C1FD182B01DF0036D304 /* Default.png in Resources */,
 				FA20C1F2182B01DF0036D304 /* Default-568h@2x.png in Resources */,
+				FAD18F231E3AF8100064808C /* back_btn@2x.png in Resources */,
+				FAD18F2D1E3AF8100064808C /* sync_btn@3x.png in Resources */,
 				FAC70A7F19D10F0A0036337B /* Default-LandscapeLeft@2x.png in Resources */,
+				FAD18F271E3AF8100064808C /* gears@2x.png in Resources */,
 				FA20C1F3182B01DF0036D304 /* Default-Landscape.png in Resources */,
 				FA6DFCEB18232A2C00A3B595 /* icon60.png in Resources */,
 				FA6DFCE718232A2C00A3B595 /* icon72.png in Resources */,
 				FA6DFCEC18232A2C00A3B595 /* icon76.png in Resources */,
+				FAD18F2A1E3AF8100064808C /* home_btn@3x.png in Resources */,
 				FA20C1B2182AFD870036D304 /* BluePushpin@2x.png in Resources */,
 				FAC70A8119D10F0A0036337B /* Default-Portrait@2x.png in Resources */,
+				FAD18F291E3AF8100064808C /* home_btn@2x.png in Resources */,
 				FA6747E71D3DD1D000F0A09D /* rhorunner_production.entitlements in Resources */,
 				FA6747E81D3DD1D300F0A09D /* rhorunner_development.entitlements in Resources */,
 				FA6DFCE818232A2C00A3B595 /* icon114.png in Resources */,
 				FA20C1B3182AFD870036D304 /* esri.png in Resources */,
 				FAC70A8019D10F0A0036337B /* Default-LandscapeRight@2x.png in Resources */,
 				FAC70A7D19D10F0A0036337B /* Default-736h@3x.png in Resources */,
+				FAD18F281E3AF8100064808C /* gears@3x.png in Resources */,
+				FAD18F2C1E3AF8100064808C /* sync_btn@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

data/res/generators/templates/iphone_project/buildRhoBundle

@@ -1,26 +1,42 @@
 #!/bin/sh
 
+echo "START buildRhoBundle script"
 
-if [ "$RHO_BUNDLE_ALREADY_BUILDED" = "YES" ]; then
+if [ "$RHO_BUNDLE_ALREADY_BUILDED" = "YES" ]
+then
 
 RHO_BUNDLE_ALREADY_BUILDED="NO"
+echo "RhoBundle already builded !" 
 
-echo "RhoBundle already builded !"
+else
 
-elif [ "$ACTION" = "build" -o "$ACTION" = "" ]; then
+echo "RhoBundle should BUILD !"
 
-source ~/.profile
+RHO_BUNDLE_ALREADY_BUILDED="NO"
+
+. ~/.profile
 cd ../..
 
-RHO_BUNDLE_ALREADY_BUILDED="NO"
+echo "START Prepare build bundle - switch app"
+
+ruby --version 
+
 rake switch_app
+
+echo "FINISH Prepare build bundle - switch app"
+
 TARGET_RHODESLIBS_DIR=${SRCROOT}
+
 cd <%= rhodes_root_path %>
+
+echo "START build bundle ..."
+
 rake build:iphone:rhobundle
 
+echo "FINISH build bundle ..."
+
 RHO_BUNDLE_ALREADY_BUILDED="NO"
 
 fi
 
-
-
+echo "FINISH buildRhoBundle script"

data/res/generators/templates/iphone_project/root/Info.plist

@@ -147,13 +147,6 @@
 		<string>application wants to use Photo Library</string>
 	<key>NSRemindersUsageDescription</key>
 		<string>application wants to use Reminders</string>
-	<key>NSAppTransportSecurity</key>
-     <dict>
-          <key>NSAllowsArbitraryLoads</key>
-		  <true/>
-		  <key>NSAllowsArbitraryLoadsInWebContent</key>
-    	  <true/>
-     </dict>
      <key>UIRequiresFullScreen</key>
      <true/>
      <key>UIRequiredDeviceCapabilities</key>