Merge pull request #1 from HaiPe1973/dev

Dev
HaiPe1973 · Jun 17, 2024 · df973ef · df973ef
2 parents 24cd4b9 + a8c69b8
commit df973ef
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -45,9 +45,12 @@ android {
   lintOptions {
     disable 'GradleCompatible'
   }
+  kotlinOptions {
+      jvmTarget = "17"
+  }
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+      sourceCompatibility JavaVersion.VERSION_17
+      targetCompatibility JavaVersion.VERSION_17
   }
 }
 
@@ -129,10 +132,10 @@ dependencies {
   api 'com.facebook.react:react-native:+'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-  implementation 'com.burhanrashid52:photoeditor:1.5.0'
+  implementation 'com.burhanrashid52:photoeditor:1.5.1'
   implementation 'androidx.appcompat:appcompat:1.3.1'
   implementation 'com.google.android.material:material:1.3.0'
   implementation 'com.github.bumptech.glide:glide:4.12.0'
-  implementation 'com.github.yalantis:ucrop:2.2.6-native'
+  compileOnly 'com.github.yalantis:ucrop:2.2.6-native'
   annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
 }
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -1,4 +1,4 @@
-PhotoEditor_kotlinVersion=1.3.50
+PhotoEditor_kotlinVersion=1.5.31
 PhotoEditor_compileSdkVersion=29
 PhotoEditor_buildToolsVersion=29.0.2
 PhotoEditor_targetSdkVersion=29
diff --git a/android/src/main/java/com/reactnativephotoeditor/activity/PhotoEditorActivity.kt b/android/src/main/java/com/reactnativephotoeditor/activity/PhotoEditorActivity.kt
@@ -18,6 +18,7 @@ import android.view.View
 import android.view.Window
 import android.view.WindowManager
 import android.view.animation.AnticipateOvershootInterpolator
+import android.view.MotionEvent
 import android.widget.*
 import androidx.annotation.NonNull
 import androidx.annotation.RequiresApi
@@ -171,6 +172,8 @@ open class PhotoEditorActivity : AppCompatActivity(), OnPhotoEditorListener, Vie
       .commitAllowingStateLoss()
   }
 
+  override fun onTouchSourceImage(event: MotionEvent?) {}
+
   private fun showLoading(message: String) {
     mProgressDialog = ProgressDialog(this)
     mProgressDialog!!.setMessage(message)