Merge pull request #7 from epegasus/master

Update sdk & fix issue

Author: hypersoftdev

.idea/gradle.xml

@@ -9,7 +9,7 @@ This repository hosts the `cropView` module, a customizable view for croppingima
 * Double tap focus
 * Pinch Zoom
 * Free Mode
-* Size Displayer
+* Size Displayed
 * Auto Centered
 * Animations
 * Customizable corner styles and colors

README.md

@@ -5,16 +5,14 @@ plugins {
 
 android {
     namespace = "com.hypersoft.cropview"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.hypersoft.cropview"
         minSdk = 23
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -52,5 +50,5 @@ dependencies {
 
     // CropView Library
     implementation(project(":cropView"))
-//    implementation 'com.github.hypersoftdev:CropView:1.0.2'
+    //implementation 'com.github.hypersoftdev:CropView:1.0.2'
 }

app/build.gradle.kts

@@ -138,7 +138,7 @@ class ActivityCrop : BaseActivity<ActivityCropBinding>(ActivityCropBinding::infl
     }
 
     private fun saveImage() {
-        bitmap = binding.cropView.getCroppedData()
+        bitmap = binding.cropView.getCroppedImage()
         startActivity(Intent(this, ActivityResult::class.java))
     }
 

app/src/main/java/com/hypersoft/cropview/ui/crop/ActivityCrop.kt

@@ -6,12 +6,10 @@ plugins {
 
 android {
     namespace = "com.hypersoft.crop"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 23
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -36,12 +34,6 @@ android {
 
 dependencies {
     implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.appcompat)
-    implementation(libs.material)
-
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.junit)
-    androidTestImplementation(libs.androidx.espresso.core)
 
     // Exif (for rotation)
     implementation(libs.androidx.exifinterface)
@@ -53,7 +45,7 @@ publishing {
         create<MavenPublication>("release") {
             groupId = "com.hypersoft.cropview"
             artifactId = "cropview"
-            version = "1.0.1"
+            version = "1.0.3"
 
             afterEvaluate {
                 from(components["release"])

cropView/build.gradle.kts

@@ -17,8 +17,8 @@ import android.view.MotionEvent.ACTION_UP
 import android.view.View
 import androidx.annotation.ColorInt
 import androidx.core.content.ContextCompat
+import androidx.core.graphics.createBitmap
 import com.hypersoft.crop.customs.AnimatableRectF
-import com.hypersoft.crop.dataClasses.CroppedBitmapData
 import com.hypersoft.crop.enums.AspectMode
 import com.hypersoft.crop.enums.AspectMode.ASPECT
 import com.hypersoft.crop.enums.AspectMode.FREE
@@ -414,7 +414,7 @@ class CropView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
     fun setCropRotation(angle: Float) {
         rotationDegrees = (rotationDegrees + angle) % 360
         bitmapMatrix.postRotate(angle, cropRect.centerX(), cropRect.centerY())
-        //cropRect = rotateRect(cropRect, angle)
+        cropRect = rotateRect(cropRect, angle)
         notifyCropRectChanged()
         invalidate()
     }
@@ -432,9 +432,23 @@ class CropView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
         )
         matrix.mapPoints(points)
 
-        val newRect = AnimatableRectF()
-        newRect.set(points[0], points[1], points[4], points[5])
-        return newRect
+        var minX = Float.MAX_VALUE
+        var minY = Float.MAX_VALUE
+        var maxX = Float.MIN_VALUE
+        var maxY = Float.MIN_VALUE
+
+        for (i in points.indices step 2) {
+            val x = points[i]
+            val y = points[i + 1]
+            minX = minOf(minX, x)
+            minY = minOf(minY, y)
+            maxX = maxOf(maxX, x)
+            maxY = maxOf(maxY, y)
+        }
+
+        return AnimatableRectF().apply {
+            set(minX, minY, maxX, maxY)
+        }
     }
 
     /**
@@ -581,7 +595,7 @@ class CropView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
     /**
      * Get cropped bitmap.
      */
-    fun getCroppedData(): Bitmap? {
+    fun getCroppedImage(): Bitmap? {
         val croppedBitmapRect = getCropSizeOriginal()
 
         if (bitmapRect.intersect(croppedBitmapRect).not()) {
@@ -675,7 +689,7 @@ class CropView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
      * Create mask bitmap
      */
     private fun createMaskBitmap() {
-        maskBitmap = Bitmap.createBitmap(measuredWidth, measuredHeight, Bitmap.Config.ARGB_8888)
+        maskBitmap = createBitmap(measuredWidth, measuredHeight)
         maskCanvas = Canvas(maskBitmap!!)
     }
 
@@ -1087,7 +1101,7 @@ class CropView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
     }
 
     /**
-     * Calculates minimum possibel rectangle that user can drag
+     * Calculates minimum possible rectangle that user can drag
      * cropRect
      */
     private fun calculateMinRect() {
@@ -1516,7 +1530,7 @@ class CropView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
     }
 
     /**
-     * If user miminize the croprect, we need to
+     * If user minimize the crop-rect, we need to
      * calculate target centered rectangle according to
      * current cropRect aspect ratio and size. With this
      * target rectangle, we can animate crop rect to
@@ -1543,7 +1557,7 @@ class CropView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
      * When user change cropRect size by dragging it, cropRect
      * should be animated to center without changing aspect ratio,
      * meanwhile bitmap matrix should be take selected crop rect to
-     * the center. This methods take selected crop rect to the cennter.
+     * the center. This methods take selected crop rect to the center.
      */
     private fun animateBitmapToCenterTarget() {
         val newBitmapMatrix = bitmapMatrix.clone()
@@ -1563,7 +1577,7 @@ class CropView @JvmOverloads constructor(context: Context, attrs: AttributeSet?
     }
 
     /**
-     * Animates current croprect to the center position
+     * Animates current crop-rect to the center position
      */
     private fun animateCropRectToCenterTarget() {
         cropRect.animateTo(targetRect) {

cropView/src/main/java/com/hypersoft/crop/CropView.kt

@@ -1,22 +1,18 @@
 [versions]
-agp = "8.5.2"
+agp = "8.9.3"
 kotlin = "1.9.0"
 
-coreKtx = "1.13.1"
-appcompat = "1.7.0"
+coreKtx = "1.16.0"
+appcompat = "1.7.1"
 material = "1.12.0"
-activity = "1.9.2"
-constraintlayout = "2.1.4"
-
-junit = "4.13.2"
-junitVersion = "1.2.1"
-espressoCore = "3.6.1"
+activity = "1.10.1"
+constraintlayout = "2.2.1"
 
 # Exif Interface
-exifinterface = "1.3.7"
+exifinterface = "1.4.1"
 
 # View Model Scope
-lifecycleViewmodelKtx = "2.8.6"
+lifecycleViewmodelKtx = "2.9.1"
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
@@ -30,10 +26,6 @@ material = { group = "com.google.android.material", name = "material", version.r
 androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
 
-junit = { group = "junit", name = "junit", version.ref = "junit" }
-androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
-androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
-
 # Exif Interface
 androidx-exifinterface = { group = "androidx.exifinterface", name = "exifinterface", version.ref = "exifinterface" }
 

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
-#Thu Sep 19 09:27:36 PKT 2024
+#Wed Jun 11 15:04:15 PKT 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists