fix: fix #179 same watermark image is behaving differently on android and ios when use given position enum (#187)

JimmyDaddy · web-flow · commit 1c622500ef64 · 2023-12-28T18:17:27.000+08:00
* chore: update gradle-wrapper.properties use gradle 8.3 * fix: #179 Same watermark image is behaving differently on ANDROID and IOS when use given position enum fix #179 Same watermark image is behaving differently on ANDROID and IOS when use given position enum * chore: release 1.2.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 
 
-# [1.2.0](https://github.com/JimmyDaddy/react-native-image-marker/compare/v1.1.8...v1.2.0) (2023-12-21)
+## [1.2.1](https://github.com/JimmyDaddy/react-native-image-marker/compare/v1.2.0...v1.2.1) (2023-12-28)
+
+### Bug Fixes
+
+* [#179](https://github.com/JimmyDaddy/react-native-image-marker/issues/179) Same watermark image is behaving differently on ANDROID and IOS when use given position enum ([39107f0](https://github.com/JimmyDaddy/react-native-image-marker/commit/39107f0977a400faf4dc7ed8f94e3877287d9d78))
+* parse hex color string crash on iOS ([#186](https://github.com/JimmyDaddy/react-native-image-marker/issues/186)) ([53ac1f1](https://github.com/JimmyDaddy/react-native-image-marker/commit/53ac1f14461e3007a2e028d0c401a1eed3ddd962))
+
+## [1.2.0](https://github.com/JimmyDaddy/react-native-image-marker/compare/v1.1.8...v1.2.0) (2023-12-21)
 
 
 ### Bug Fixes
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ios/RCTImageMarker/ImageMarker.swift b/ios/RCTImageMarker/ImageMarker.swift
@@ -273,7 +273,7 @@ public final class ImageMarker: NSObject, RCTBridgeModule {
     
     func markImage(with image: UIImage, waterImages: [UIImage], options: MarkImageOptions) -> UIImage? {
 
-        var bg = image;
+        let bg = image;
         let w = bg.size.width
         let h = bg.size.height
         UIGraphicsBeginImageContextWithOptions(bg.size, false, options.backgroundImage.scale)
@@ -323,39 +323,43 @@ public final class ImageMarker: NSObject, RCTBridgeModule {
                     case .topLeft:
                         rect = CGRect(origin: CGPoint(x: 20, y: 20), size: size)
                     case .topCenter:
-                        rect = CGRect(origin: CGPoint(x: (w - size.width) / 2, y: 20), size: size)
+                        rect = CGRect(origin: CGPoint(x: (w - ww) / 2, y: 20), size: size)
                     case .topRight:
-                        rect = CGRect(origin: CGPoint(x: w - size.width - 20, y: 20), size: size)
+                        rect = CGRect(origin: CGPoint(x: w - ww - 20, y: 20), size: size)
                     case .bottomLeft:
-                        rect = CGRect(origin: CGPoint(x: 20, y: h - size.height - 20), size: size)
+                        rect = CGRect(origin: CGPoint(x: 20, y: h - wh - 20), size: size)
                     case .bottomCenter:
-                        rect = CGRect(origin: CGPoint(x: (w - size.width) / 2, y: h - size.height - 20), size: size)
+                        rect = CGRect(origin: CGPoint(x: (w - ww) / 2, y: h - wh - 20), size: size)
                     case .bottomRight:
-                        rect = CGRect(origin: CGPoint(x: w - size.width - 20, y: h - size.height - 20), size: size)
+                        rect = CGRect(origin: CGPoint(x: w - ww - 20, y: h - wh - 20), size: size)
                     case .center:
-                        rect = CGRect(origin: CGPoint(x: (w - size.width) / 2, y: (h - size.height) / 2), size: size)
+                        rect = CGRect(origin: CGPoint(x: (w - ww) / 2, y: (h - wh) / 2), size: size)
                     default:
                         rect = CGRect(origin: CGPoint(x: 20, y: 20), size: size)
                     }
             } else {
-                rect = CGRect(x: Utils.parseSpreadValue(v: watermarkOptions.X, relativeTo: w) ?? 20, y: Utils.parseSpreadValue(v: watermarkOptions.Y, relativeTo: h) ?? 20, width: CGFloat(ww), height: CGFloat(wh))
+                rect = CGRect(x: Utils.parseSpreadValue(v: watermarkOptions.X, relativeTo: w) ?? 20, y: Utils.parseSpreadValue(v: watermarkOptions.Y, relativeTo: h) ?? 20, width: diagonal, height: diagonal)
             }
             
             UIGraphicsBeginImageContextWithOptions(CGSize(width: diagonal, height: diagonal), false, 1)
             let markerContext = UIGraphicsGetCurrentContext()
+            markerContext?.setFillColor(UIColor.red.cgColor)
+            markerContext?.fill(rect)
             markerContext?.saveGState()
-
+            
             if watermarkOptions.imageOption.alpha != 1.0 {
                 markerContext?.beginTransparencyLayer(auxiliaryInfo: nil)
                 markerContext?.setAlpha(watermarkOptions.imageOption.alpha)
                 markerContext?.setBlendMode(.multiply)
                 let markerImage = markerImg.rotatedImageWithTransform(watermarkOptions.imageOption.rotate)
-                markerContext?.draw(markerImage.cgImage!, in: CGRect(origin: .zero, size: CGSize(width: diagonal, height: diagonal)))
+                let originPoint = CGPoint(x: 0, y: rect.height - markerImage.size.height)
+                markerContext?.draw(markerImage.cgImage!, in: CGRect(origin: originPoint, size: CGSize(width: markerImage.size.width, height: markerImage.size.height)))
                 markerContext?.endTransparencyLayer()
 
             } else {
                 let markerImage = markerImg.rotatedImageWithTransform(watermarkOptions.imageOption.rotate)
-                markerContext?.draw(markerImage.cgImage!, in: CGRect(origin: .zero, size: CGSize(width: diagonal, height: diagonal)))
+                let originPoint = CGPoint(x: 0, y: rect.height - markerImage.size.height)
+                markerContext?.draw(markerImage.cgImage!, in: CGRect(origin: originPoint, size: CGSize(width: markerImage.size.width, height: markerImage.size.height)))
             }
             markerContext?.restoreGState()
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-image-marker",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Add text or icon watermark to your images",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "react-native-image-marker",`
`3`		`- "version": "1.2.0",`
	`3`	`+ "version": "1.2.1",`
`4`	`4`	`"description": "Add text or icon watermark to your images",`
`5`	`5`	`"main": "lib/commonjs/index",`
`6`	`6`	`"module": "lib/module/index",`