Merge pull request #10 from contagt/main

Fix: Android changed canvas to non-optional

Author: dimaportenko

android/build.gradle

@@ -26,6 +26,11 @@ def getExtOrIntegerDefault(name) {
 }
 
 android {
+  def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+  if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
+      namespace "com.reactnativeshadowview"
+  }
+
   compileSdkVersion getExtOrIntegerDefault('compileSdkVersion')
   buildToolsVersion getExtOrDefault('buildToolsVersion')
   defaultConfig {
@@ -122,10 +127,11 @@ repositories {
 }
 
 def kotlin_version = getExtOrDefault('kotlinVersion')
+def ktx_version = getExtOrDefault('ktxVersion')
 
 dependencies {
   // noinspection GradleDynamicVersion
   api 'com.facebook.react:react-native:+'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "androidx.core:core-ktx:$kotlin_version"
+  implementation "androidx.core:core-ktx:$ktx_version"
 }

android/gradle.properties

@@ -1,4 +1,5 @@
 ShadowView_kotlinVersion=1.5.0
+ShadowView_ktxVersion=1.7.0
 ShadowView_compileSdkVersion=29
 ShadowView_buildToolsVersion=29.0.2
 ShadowView_targetSdkVersion=29

android/src/main/AndroidManifest.xml

@@ -1,4 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.reactnativeshadowview">
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>

android/src/main/java/com/reactnativeshadowview/ShadowLayout.kt

@@ -260,7 +260,7 @@ open class ShadowLayout @JvmOverloads constructor(
             shadow_y_shift / shadow_downscale / cssRatio
         )
 
-    override fun draw(canvas: Canvas?) {
+    override fun draw(canvas: Canvas) {
         canvas ?: return
         if (isInEditMode) {
             super.draw(canvas)
@@ -272,7 +272,7 @@ open class ShadowLayout @JvmOverloads constructor(
                 if (shadow_cast_only_background) {
                     background.bounds = viewBounds
                     background?.draw(blurCanvas!!)
-                } else super.draw(blurCanvas)
+                } else super.draw(blurCanvas!!)
             }
             if (realRadius > 0f) { // Do not blur if no radius
                 val (script) = getScript()
@@ -289,3 +289,4 @@ open class ShadowLayout @JvmOverloads constructor(
     }
 
 }
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dimaportenko/react-native-shadow-view",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "React Native library with Android native view which supports same shadows styles as iOS ",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -37,7 +37,7 @@
     "android"
   ],
   "repository": "https://github.com/dimaportenko/react-native-shadow-view",
-  "author": "Dima Portenko <[email protected]> (https://github.com/dimaportenko)",
+  "author": "Dima Portenko (https://github.com/dimaportenko)",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/dimaportenko/react-native-shadow-view/issues"