Merge branch 'master' of https://github.com/eaze/react-native-signatu…

…re-capture into eaze-master
RepairShopr · Jan 26, 2021 · ff37346 · ff37346
2 parents b78c515 + ad8a6ea
commit ff37346
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 4 deletions.
diff --git a/Example/src/SignatureView.js b/Example/src/SignatureView.js
@@ -44,6 +44,7 @@ class SignatureView extends Component {
             style={{flex: 1, width: '100%'}}
             onDragEvent={this._onDragEvent.bind(this)}
             onSaveEvent={this._onSaveEvent.bind(this)}
+            backgroundColor='pink'
           />
         </View>
       </Modal>

diff --git a/README.md b/README.md
@@ -122,6 +122,10 @@ class CustomComponent extends Component {
 
 + **maxStrokeWidth**  :  sets the max stroke line width (_Android only_)
 
++ **backgroundColor**: Sets the background color of the component. Defaults to white. May be 'transparent'.
+
++ **strokeColor**: Sets the color of the signature. Defaults to black.
+
 ### Methods
 
 + **saveImage()** : when called it will save the image and returns the base 64 encoded string on onSaveEvent() callback
@@ -169,6 +173,8 @@ class RNSignatureExample extends Component {
                     saveImageFileInExtStorage={false}
                     showNativeButtons={false}
                     showTitleLabel={false}
+                    backgroundColor="#ff00ff"
+                    strokeColor="#ffffff"
                     viewMode={"portrait"}/>
 
                 <View style={{ flex: 1, flexDirection: "row" }}>

diff --git a/android/src/main/java/com/rssignaturecapture/RSSignatureCaptureMainView.java b/android/src/main/java/com/rssignaturecapture/RSSignatureCaptureMainView.java
@@ -176,7 +176,7 @@ final void saveImage() {
 
 
       byte[] byteArray = byteArrayOutputStream.toByteArray();
-      String encoded = Base64.encodeToString(byteArray, Base64.DEFAULT);
+      String encoded = Base64.encodeToString(byteArray, Base64.NO_WRAP);
 
       WritableMap event = Arguments.createMap();
       event.putString("pathName", file.getAbsolutePath());

diff --git a/android/src/main/java/com/rssignaturecapture/RSSignatureCaptureView.java b/android/src/main/java/com/rssignaturecapture/RSSignatureCaptureView.java
@@ -97,7 +97,7 @@ public Bitmap getSignature() {
 
 		// set the signature bitmap
 		if (signatureBitmap == null) {
-			signatureBitmap = Bitmap.createBitmap(this.getWidth(), this.getHeight(), Bitmap.Config.RGB_565);
+			signatureBitmap = Bitmap.createBitmap(this.getWidth(), this.getHeight(), Bitmap.Config.ARGB_8888);
 		}
 
 		// important for saving signature

diff --git a/android/src/main/java/com/rssignaturecapture/RSSignatureCaptureViewManager.java b/android/src/main/java/com/rssignaturecapture/RSSignatureCaptureViewManager.java
@@ -101,9 +101,16 @@ public void setPropsStrokeColor(RSSignatureCaptureMainView view, @Nullable Strin
 
 	@ReactProp(name = PROPS_BACKGROUND_COLOR)
 	public void setPropsBackgroundColor(RSSignatureCaptureMainView view, @Nullable String color) {
+		int parsed;
+		if (color.equalsIgnoreCase("transparent")) {
+			parsed = Color.TRANSPARENT;
+		} else {
+			parsed = Color.parseColor(color);
+		}
+
 		Log.d("backgroundColor:",  ""+color);
 		if(view!=null){
-			view.getSignatureView().setBackgroundColor(Color.parseColor(color));
+			view.getSignatureView().setBackgroundColor(parsed);
 		}
 	}
 

diff --git a/ios/PPSSignatureView.m b/ios/PPSSignatureView.m
@@ -109,6 +109,8 @@ @interface PPSSignatureView () {
 	CGPoint previousMidPoint;
 	PPSSignaturePoint previousVertex;
 	PPSSignaturePoint currentVelocity;
+	UIColor* backgroundColor;
+	UIColor* strokeColor;
 }
 
 @end
@@ -125,6 +127,7 @@ - (void)commonInit {
 		time(NULL);
 
 		self.backgroundColor = [UIColor whiteColor];
+		self.strokeColor = [UIColor blackColor];
 		self.opaque = NO;
 
 		self.context = context;

diff --git a/ios/RSSignatureView.m b/ios/RSSignatureView.m
@@ -19,16 +19,20 @@ @implementation RSSignatureView {
 	BOOL _showBorder;
 	BOOL _showNativeButtons;
 	BOOL _showTitleLabel;
+	UIColor *_backgroundColor;
+	UIColor *_strokeColor;
 }
 
 @synthesize sign;
 @synthesize manager;
 
 - (instancetype)init
 {
-  _showBorder = YES;
+	_showBorder = YES;
 	_showNativeButtons = YES;
 	_showTitleLabel = YES;
+	_backgroundColor = UIColor.whiteColor;
+	_strokeColor = UIColor.blackColor;
 	if ((self = [super init])) {
 		_border = [CAShapeLayer layer];
 		_border.strokeColor = [UIColor blackColor].CGColor;
@@ -65,6 +69,8 @@ - (void)layoutSubviews
 						initWithFrame: CGRectMake(0, 0, screen.width, screen.height)
 						context: _context];
 		sign.manager = manager;
+		sign.backgroundColor = _backgroundColor;
+		sign.strokeColor = _strokeColor;
 
 		[self addSubview:sign];
 
@@ -179,6 +185,14 @@ - (void)setShowTitleLabel:(BOOL)showTitleLabel {
 	_showTitleLabel = showTitleLabel;
 }
 
+- (void)setBackgroundColor:(UIColor*)backgroundColor {
+	_backgroundColor = backgroundColor;
+}
+
+- (void)setStrokeColor:(UIColor*)strokeColor {
+	_strokeColor = strokeColor;
+}
+
 -(void) onSaveButtonPressed {
 	[self saveImage];
 }

diff --git a/ios/RSSignatureViewManager.m b/ios/RSSignatureViewManager.m
@@ -15,6 +15,8 @@ @implementation RSSignatureViewManager
 RCT_EXPORT_VIEW_PROPERTY(showBorder, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(showNativeButtons, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(showTitleLabel, BOOL)
+RCT_EXPORT_VIEW_PROPERTY(backgroundColor, UIColor)
+RCT_EXPORT_VIEW_PROPERTY(strokeColor, UIColor)
 
 
 -(dispatch_queue_t) methodQueue