rhodes 3.3.0 → 3.3.1

data/doc/build.txt

@@ -141,8 +141,8 @@ The resulting application package (*.app) is located in your Rhodes source code
 
 From the XCode 4.2 Apple was removed default support of armv6 architecture. In this case there are two issues:
 
-* Distributution build should include code for armv6 and armv7 both. Our projects already fixed for this require for Distribution build.
-* If you want build/run/debug your application on devices before iPhone/iPad (for example on iPhone 3G), you should manually path all rhodes xcode projects and all xcode projects in native extensions used in your application for Architecture settings:
+* Distributution build should include code for armv6 and armv7 both. Our projects already fixed for this.
+* If you want build/run/debug your application on devices before iPhone/iPad (for example on iPhone 3G), you should manually path all your (our already fixed) native extension xcode projects used in your application for Architecture settings:
 	in each project modify [Build Settings]-[Architectures]-[Debug]/[Release]:
 		remove $(ARCHS_STANDARD_32_BIT)
 		add two architectures manually: "armv7" and "armv6"	
@@ -199,6 +199,14 @@ The default build.yml settings generated for iphone are:
 	  emulatortarget: iphone
 	  BundleIdentifier: com.yourcompany.yourapp
 	  BundleURLScheme: yourapp
+	  entitlements_file: "./production/Entitlements.plist"
+	  production:
+	    app_plist_title: "myapp"
+	    app_plist_subtitle: "myapp"
+	    app_plist_icon_url: "www.yourcompany.com/icon.png"
+	    app_plist_ipa_url: "www.yourcompany.com/myapp.ipa"
+	    ipa_itunesartwork_image: "./production/image.jpg"  
+
 
 * name: name of your application. Will show on screen (iPhone application bundle display name)
 * version: version of your application. iPhone application bundle version
@@ -211,6 +219,14 @@ The default build.yml settings generated for iphone are:
 * emulatortarget: device family for simulator (iphone/ipad)
 * BundleIdentifier: bundle identifier - used in provisioning profile 
 * BundleURLScheme: bundle URL scheme of your app (used for opening your application from another application by using custom URL scheme)
+* entitlements_file: path of your custom Entitlements.plist (if you want use own instead of default) - you also can just put Entitlements.plist file into root folder of your application and it will be automaticallly used during build
+* production: section used only for Ad Hoc distribution, contain some specific options for prepare .plist and *.ipa files etc.
+* app_plist_title: title in plist file (application name by default)
+* app_plist_subtitle: subtitle in plist file (application name by default)
+* app_plist_icon_url: icon url writed in plist file
+* app_plist_ipa_url: IPA file url writed in plist file
+* ipa_itunesartwork_image: path to iTunesArtwork image included into IPA file (must be 512x512 JPG image) 
+
 
 ** NOTE: BundleIdentifier and BundleURLScheme can contain only next symbols : "a"-"z", "A"-"Z", "0"-"9", "-", "." !
 

data/platform/android/Rhodes/jni/src/rhodesapp.cpp

@@ -180,6 +180,13 @@ RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_doRequest
     rho_net_request(url.c_str());
 }
 
+RHO_GLOBAL void JNICALL Java_com_rhomobile_rhodes_RhodesService_doRequestAsync
+  (JNIEnv *env, jobject, jstring strUrl)
+{
+    std::string const &url = rho_cast<std::string>(strUrl);
+    RHODESAPP().runCallbackInThread(url.c_str(), "");
+}
+
 RHO_GLOBAL jstring JNICALL Java_com_rhomobile_rhodes_RhodesService_normalizeUrl
   (JNIEnv *env, jobject, jstring strUrl)
 {

data/platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java

@@ -241,6 +241,7 @@ public class RhodesService extends Service {
 	public native String normalizeUrl(String url);
 	
 	public native void doRequest(String url);
+	public native void doRequestAsync(String url);
 	
 	public static native void loadUrl(String url);
 	

data/platform/iphone/Classes/Signature/SignatureDelegate.h

@@ -34,6 +34,9 @@
 	UIView* parentView;
 	UIView* prevView;
 	NSString* imageFormat;
+    unsigned int penColor;
+    float penWidth;
+    unsigned int bgColor;
 }
 
 
@@ -42,6 +45,12 @@
 -(void)setSignatureViewControllerValue:(SignatureViewController *)svc;
 -(void)setParentView:(UIView*)parent_view;
 -(void)setPrevView:(UIView*)prev_view;
+
 -(void)setImageFormat:(NSString*)format;
+-(void)setPenColor:(unsigned int)value;
+-(void)setPenWidth:(float)value;
+-(void)setBgColor:(unsigned int)value;
+
+
 
 @end

data/platform/iphone/Classes/Signature/SignatureDelegate.m

@@ -33,9 +33,27 @@
 
 @implementation SignatureDelegate
 
+-(id) init
+{
+    if (self = [super init])
+    {
+        signatureViewController = nil;
+        parentView = nil;
+        prevView = nil;
+        imageFormat = nil;
+        penColor = 0;
+        penWidth = 0;
+        bgColor = 0;
+
+    }
+    return self;
+}
 
 -(void)setSignatureViewControllerValue:(SignatureViewController *)svc {
 	signatureViewController = svc;
+    [signatureViewController setPenColor:penColor];
+    [signatureViewController setPenWidth:penWidth];
+    [signatureViewController setBgColor:bgColor];
 }
 
 -(void)setParentView:(UIView*)parent_view {
@@ -50,6 +68,21 @@
 	imageFormat = format;
 }
 
+-(void)setPenColor:(unsigned int)value
+{
+    penColor = value;
+}
+
+-(void)setPenWidth:(float)value
+{
+    penWidth = value;
+}
+
+-(void)setBgColor:(unsigned int)value
+{
+    bgColor = value;
+}
+
 
 - (void)useImage:(UIImage*)theImage { 
     NSString *folder = [[AppManager getApplicationsRootPath] stringByAppendingPathComponent:@"/../db/db-files"];
@@ -89,8 +122,10 @@
     [self useImage:image]; 
     [signatureViewController.view removeFromSuperview];
     [signatureViewController release];
+    signatureViewController = nil;
 	[parentView addSubview:prevView];
 	[prevView release];
+    prevView = nil;
 	[image release];
 }
 
@@ -98,8 +133,10 @@
     rho_rhodesapp_callSignatureCallback([postUrl UTF8String], "", "", 1);
     [signatureViewController.view removeFromSuperview];
     [signatureViewController release];
+    signatureViewController = nil;
 	[parentView addSubview:prevView];
 	[prevView release];
+    prevView = nil;
 }
 
 
@@ -109,19 +146,47 @@
 void rho_signature_take(char* callback_url, rho_param* p) {
     NSString *url = [NSString stringWithUTF8String:callback_url];
     char* image_format = 0;
+    char* penColor = 0;
+    char* penWidth = 0;
+    char* bgColor = 0;
+        
     if (p)
     {
         rho_param* pFF = rho_param_hash_get(p, "imageFormat");
         if ( pFF )
             image_format = pFF->v.string;
+        pFF = rho_param_hash_get(p, "penColor");
+        if ( pFF )
+            penColor = pFF->v.string;
+        pFF = rho_param_hash_get(p, "penWidth");
+        if ( pFF )
+            penWidth = pFF->v.string;
+        pFF = rho_param_hash_get(p, "bgColor");
+        if ( pFF )
+            bgColor = pFF->v.string;
     }
     if (!image_format)
-        image_format = "";
+        image_format = "png";
+    if (!penColor)
+        penColor = "0xFF66009A";
+    if (!penWidth)
+        penWidth = "3";
+    if (!bgColor)
+        bgColor = "0xFFFFFFFF";
+    
+    
+    
+    NSString* ns_penColor = [NSString stringWithUTF8String:penColor];
+    NSString* ns_penWidth = [NSString stringWithUTF8String:penWidth];
+    NSString* ns_bgColor = [NSString stringWithUTF8String:bgColor];
     
     NSString *iformat = [NSString stringWithUTF8String:image_format];
 	Rhodes* rho = [Rhodes sharedInstance];
 	SignatureDelegate* deleg = rho.signatureDelegate; 
 	[deleg setImageFormat:iformat];
+    [deleg setPenColor:(unsigned int)[ns_penColor longLongValue]];
+    [deleg setPenWidth:[ns_penWidth floatValue]];
+    [deleg setBgColor:(unsigned int)[ns_bgColor longLongValue]];
     [[Rhodes sharedInstance] performSelectorOnMainThread:@selector(takeSignature:)
                                               withObject:url waitUntilDone:NO];
 }

data/platform/iphone/Classes/Signature/SignatureView.h

@@ -34,6 +34,9 @@
 
 	CGMutablePathRef mPath;
 	CGPoint mLastPoint;
+    unsigned int penColor;
+    float penWidth;
+    unsigned int bgColor;
 	
 }
 
@@ -46,4 +49,9 @@
 - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event;
 - (void)touchesCancelled:(NSSet *)touches withEvent:(UIEvent *)event;
 
+-(void)setPenColor:(unsigned int)value;
+-(void)setPenWidth:(float)value;
+-(void)setBgColor:(unsigned int)value;
+
+
 @end

data/platform/iphone/Classes/Signature/SignatureView.m

@@ -88,6 +88,23 @@
 }
 
 
+-(void)setPenColor:(unsigned int)value
+{
+    penColor = value;
+    [self setNeedsDisplay];
+}
+
+-(void)setPenWidth:(float)value
+{
+    penWidth = value;
+    [self setNeedsDisplay];
+}
+
+-(void)setBgColor:(unsigned int)value
+{
+    bgColor = value;
+    [self setNeedsDisplay];
+}
 
 - (id)initWithFrame:(CGRect)frame {
     if ((self = [super initWithFrame:frame])) {
@@ -96,6 +113,9 @@
 		self.backgroundColor = [UIColor whiteColor];
 		self.opaque = YES;
 		self.multipleTouchEnabled = NO;
+        penColor = 0xFF66009A;
+        penWidth = 3.0;
+        bgColor = 0xFFFFFFFF;
     }
 	mPath = nil;
 	[self doClear];
@@ -110,12 +130,21 @@
 	CGContextRef context = UIGraphicsGetCurrentContext();
 	
 	// draw backgound
-	CGContextSetRGBFillColor(context,1,1,1,1);
-	CGContextSetRGBStrokeColor(context, 0.4, 0, 0.6, 1);
+    
+	CGContextSetRGBFillColor(context,   ((float)((bgColor & 0xFF0000) >> 16))/255.0, 
+                                        ((float)((bgColor & 0xFF00) >> 8))/255.0,
+                                        ((float)((bgColor & 0xFF)))/255.0,
+                                        1);
+	
+    
+    CGContextSetRGBStrokeColor(context, ((float)((penColor & 0xFF0000) >> 16))/255.0,
+                                        ((float)((penColor & 0xFF00) >> 8))/255.0,
+                                        ((float)((penColor & 0xFF)))/255.0,
+                                        1);
 	CGContextFillRect(context, rect);
 	
 	// draw signature
-	CGContextSetLineWidth(context, 3);
+	CGContextSetLineWidth(context, penWidth);
 	CGContextBeginPath(context);
 	CGContextClipToRect(context, rect);
 	//CGContextClip(context);
@@ -142,13 +171,21 @@
 	rect.origin.y = 0;
 	
 	// draw backgound
-	CGContextSetRGBFillColor(context,1,1,1,1);
-	CGContextSetRGBStrokeColor(context, 0.4, 0, 0.6, 1);
+	CGContextSetRGBFillColor(context,   ((float)((bgColor & 0xFF0000) >> 16))/255.0, 
+                             ((float)((bgColor & 0xFF00) >> 8))/255.0,
+                             ((float)((bgColor & 0xFF)))/255.0,
+                             1);
+	
+    
+    CGContextSetRGBStrokeColor(context, ((float)((penColor & 0xFF0000) >> 16))/255.0,
+                               ((float)((penColor & 0xFF00) >> 8))/255.0,
+                               ((float)((penColor & 0xFF)))/255.0,
+                               1);
 	CGContextFillRect(context, rect);
 	
 	// draw signature
 	if (!CGPathIsEmpty(mPath)) {
-		CGContextSetLineWidth(context, 3);
+        CGContextSetLineWidth(context, penWidth);
 		CGContextTranslateCTM (context, 0, rect.size.height);
 		CGContextScaleCTM(context, 1, -1);
 		CGContextBeginPath(context);

data/platform/iphone/Classes/Signature/SignatureViewController.h

@@ -29,15 +29,21 @@
 #import "RhoViewController.h"
 
 @class SignatureDelegate;
+@class SignatureView;
 
 @interface SignatureViewController : RhoViewController {
-	UIView *signatureView; 
+	SignatureView *signatureView; 
 	UIToolbar *toolbar;
 	SignatureDelegate* signatureDelegate;
+    
 }
 
 - (id)initWithRect:(CGRect)rect delegate:(SignatureDelegate*)delegate;
 
 - (void)loadView;
 
+-(void)setPenColor:(unsigned int)value;
+-(void)setPenWidth:(float)value;
+-(void)setBgColor:(unsigned int)value;
+
 @end

data/platform/iphone/Classes/Signature/SignatureViewController.m

@@ -42,7 +42,7 @@
 
 
 - (id)initWithRect:(CGRect)rect  delegate:(SignatureDelegate*)delegate {
-	[self init];
+	self = [super init];
 	
 	signatureDelegate = delegate;
 	self.view.frame = rect;
@@ -105,6 +105,21 @@
 
 }
 
+-(void)setPenColor:(unsigned int)value
+{
+    [signatureView setPenColor:value];
+}
+
+-(void)setPenWidth:(float)value
+{
+    [signatureView setPenWidth:value];
+}
+
+-(void)setBgColor:(unsigned int)value
+{
+    [signatureView setBgColor:value];
+}
+
 
 // Implement loadView to create a view hierarchy programmatically, without using a nib.
 - (void)loadView {

data/version

@@ -1 +1 @@
-3.3.0
+3.3.1

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 3
   - 3
-  - 0
-  version: 3.3.0
+  - 1
+  version: 3.3.1
 platform: ruby
 authors: 
 - Rhomobile