PAINTROID-762 Update to Android 14

Catrobat · Feb 1, 2025 · b775c69 · b775c69
1 parent 07b8aee
commit b775c69
Show file tree

Hide file tree

Showing 12 changed files with 103 additions and 57 deletions.
diff --git a/...droidTest/java/org/catrobat/paintroid/test/espresso/FileFromOtherSourceIntegrationTest.kt b/...droidTest/java/org/catrobat/paintroid/test/espresso/FileFromOtherSourceIntegrationTest.kt
@@ -131,8 +131,9 @@ class FileFromOtherSourceIntegrationTest {
             val fos = requireNonNull.let {
                 it?.let { it1 -> resolver?.openOutputStream(it1) }
             }
-            Assert.assertTrue(bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos))
             assert(fos != null)
+            fos?.let { bitmap.compress(Bitmap.CompressFormat.JPEG, 100, it) }
+                ?.let { Assert.assertTrue(it) }
             fos!!.close()
         } catch (e: IOException) {
             throw AssertionError("Picture file could not be created.", e)

diff --git a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/LayerIntegrationTest.kt b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/LayerIntegrationTest.kt
@@ -864,7 +864,8 @@ class LayerIntegrationTest {
         )
         val imageUri = Uri.fromFile(imageFile)
         launchActivityRule.activity.myContentResolver.openOutputStream(imageUri).use { fos ->
-            Assert.assertTrue(bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos))
+            fos?.let { bitmap.compress(Bitmap.CompressFormat.JPEG, 100, it) }
+                ?.let { Assert.assertTrue(it) }
         }
         deletionFileList.add(imageFile)
         return imageUri

diff --git a/...troid/src/androidTest/java/org/catrobat/paintroid/test/espresso/MainActivityIntentTest.kt b/...troid/src/androidTest/java/org/catrobat/paintroid/test/espresso/MainActivityIntentTest.kt
@@ -91,7 +91,8 @@ class MainActivityIntentTest {
         try {
             val fos = Objects.requireNonNull(imageUri)
                 ?.let { contentResolver?.openOutputStream(it) }
-            Assert.assertTrue(bitmap.compress(Bitmap.CompressFormat.PNG, 100, fos))
+            fos?.let { bitmap.compress(Bitmap.CompressFormat.PNG, 100, it) }
+                ?.let { Assert.assertTrue(it) }
             assert(fos != null)
             fos?.close()
         } catch (e: IOException) {

diff --git a/.../androidTest/java/org/catrobat/paintroid/test/espresso/MenuFileActivityIntegrationTest.kt b/.../androidTest/java/org/catrobat/paintroid/test/espresso/MenuFileActivityIntegrationTest.kt
@@ -499,7 +499,8 @@ class MenuFileActivityIntegrationTest {
         val imageUri = resolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
         try {
             val fos = imageUri?.let { resolver.openOutputStream(it) }
-            assertTrue(bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos))
+            fos?.let { bitmap.compress(Bitmap.CompressFormat.JPEG, 100, it) }
+                ?.let { assertTrue(it) }
             assert(fos != null)
             fos?.close()
         } catch (e: IOException) {

diff --git a/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/OraFileIntentTest.kt b/Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/OraFileIntentTest.kt
@@ -119,7 +119,8 @@ class OraFileIntentTest {
         val imageUri = resolver!!.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
         try {
             val fos = Objects.requireNonNull(imageUri)?.let { resolver!!.openOutputStream(it) }
-            Assert.assertTrue(bitmap.compress(Bitmap.CompressFormat.PNG, 100, fos))
+            fos?.let { bitmap.compress(Bitmap.CompressFormat.PNG, 100, it) }
+                ?.let { Assert.assertTrue(it) }
             assert(fos != null)
             fos!!.close()
         } catch (e: IOException) {

diff --git a/...est/java/org/catrobat/paintroid/test/espresso/catroid/OpenedFromPocketCodeNewImageTest.kt b/...est/java/org/catrobat/paintroid/test/espresso/catroid/OpenedFromPocketCodeNewImageTest.kt
@@ -175,7 +175,8 @@ class OpenedFromPocketCodeNewImageTest {
         val imageUri = Uri.fromFile(imageFile)
         try {
             val fos = activity?.contentResolver?.openOutputStream(Objects.requireNonNull(imageUri))
-            Assert.assertTrue(bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fos))
+            fos?.let { bitmap.compress(Bitmap.CompressFormat.JPEG, 100, it) }
+                ?.let { Assert.assertTrue(it) }
             assert(fos != null)
             fos?.close()
         } catch (e: IOException) {

diff --git a/...st/java/org/catrobat/paintroid/test/espresso/catroid/OpenedFromPocketCodeWithImageTest.kt b/...st/java/org/catrobat/paintroid/test/espresso/catroid/OpenedFromPocketCodeWithImageTest.kt
@@ -205,7 +205,7 @@ class OpenedFromPocketCodeWithImageTest {
             val fos = activity!!.contentResolver.openOutputStream(
                 Objects.requireNonNull(uncompressedImageUri)
             )
-            assertTrue(bitmap.compress(Bitmap.CompressFormat.PNG, 100, fos))
+            assertTrue(fos?.let { bitmap.compress(Bitmap.CompressFormat.PNG, 100, it) } == true)
             assert(fos != null)
             fos!!.close()
         } catch (e: IOException) {

diff --git a/...rc/androidTest/java/org/catrobat/paintroid/test/espresso/tools/TextToolIntegrationTest.kt b/...rc/androidTest/java/org/catrobat/paintroid/test/espresso/tools/TextToolIntegrationTest.kt
@@ -395,10 +395,12 @@ class TextToolIntegrationTest {
             testSurfacseBitmapAndPixelAmountAfter()
 
             if (surfaceBitmapHeight != null && canvasPoint != null) {
-                layerModel?.currentLayer?.bitmap?.getPixels(
-                    pixelsDrawingSurface, 0, 1,
-                    canvasPoint.x.toInt(), 0, 1, surfaceBitmapHeight
-                )
+                if (pixelsDrawingSurface != null) {
+                    layerModel?.currentLayer?.bitmap?.getPixels(
+                        pixelsDrawingSurface, 0, 1,
+                        canvasPoint.x.toInt(), 0, 1, surfaceBitmapHeight
+                    )
+                }
             }
 
             testPixelAmountBeforeAndPixelDrawingSurface()
@@ -413,10 +415,12 @@ class TextToolIntegrationTest {
 
     private fun testSurfacseBitmapAndPixelAmountAfter() {
         if (surfaceBitmapHeight != null && canvasPoint != null) {
-            layerModel?.currentLayer?.bitmap?.getPixels(
-                pixelsDrawingSurface, 0, 1,
-                canvasPoint.x.toInt(), 0, 1, surfaceBitmapHeight
-            )
+            if (pixelsDrawingSurface != null) {
+                layerModel?.currentLayer?.bitmap?.getPixels(
+                    pixelsDrawingSurface, 0, 1,
+                    canvasPoint.x.toInt(), 0, 1, surfaceBitmapHeight
+                )
+            }
         }
         var pixelAmountAfter = pixelsDrawingSurface?.let { countPixelsWithColor(it, Color.BLACK) }
         if (pixelAmountAfter != null) {
@@ -453,19 +457,23 @@ class TextToolIntegrationTest {
         layerModel?.currentLayer?.bitmap?.eraseColor(Color.TRANSPARENT)
         onTopBarView().performClickCheckmark()
         if (surfaceBitmapHeight != null && canvasPoint != null) {
-            layerModel?.currentLayer?.bitmap?.getPixels(
-                pixelsDrawingSurface, 0, 1,
-                canvasPoint.x.toInt(), 0, 1, surfaceBitmapHeight
-            )
+            if (pixelsDrawingSurface != null) {
+                layerModel?.currentLayer?.bitmap?.getPixels(
+                    pixelsDrawingSurface, 0, 1,
+                    canvasPoint.x.toInt(), 0, 1, surfaceBitmapHeight
+                )
+            }
         }
     }
 
     private fun testVariablesInIfStatementsWithSurfacseBitmap() {
         if (surfaceBitmapHeight != null && canvasPoint != null) {
-            layerModel?.currentLayer?.bitmap?.getPixels(
-                pixelsDrawingSurface, 0, 1,
-                canvasPoint.x.toInt(), 0, 1, surfaceBitmapHeight
-            )
+            if (pixelsDrawingSurface != null) {
+                layerModel?.currentLayer?.bitmap?.getPixels(
+                    pixelsDrawingSurface, 0, 1,
+                    canvasPoint.x.toInt(), 0, 1, surfaceBitmapHeight
+                )
+            }
         }
 
         if (pixelAmountBefore != null) {
@@ -544,10 +552,12 @@ class TextToolIntegrationTest {
         val pixelsDrawingSurface = surfaceBitmapWidth?.let { IntArray(it) }
 
         if (surfaceBitmapWidth != null && canvasPoint != null) {
-            layerModel?.currentLayer?.bitmap?.getPixels(
-                pixelsDrawingSurface, 0, surfaceBitmapWidth, 0,
-                canvasPoint.y.toInt(), surfaceBitmapWidth, 1
-            )
+            if (pixelsDrawingSurface != null) {
+                layerModel?.currentLayer?.bitmap?.getPixels(
+                    pixelsDrawingSurface, 0, surfaceBitmapWidth, 0,
+                    canvasPoint.y.toInt(), surfaceBitmapWidth, 1
+                )
+            }
         }
 
         var pixelAmount = pixelsDrawingSurface?.let { countPixelsWithColor(it, Color.BLACK) }
@@ -556,10 +566,12 @@ class TextToolIntegrationTest {
         }
         onTopBarView().performUndo()
         if (surfaceBitmapWidth != null && canvasPoint != null) {
-            layerModel?.currentLayer?.bitmap?.getPixels(
-                pixelsDrawingSurface, 0, surfaceBitmapWidth, 0,
-                canvasPoint.y.toInt(), surfaceBitmapWidth, 1
-            )
+            if (pixelsDrawingSurface != null) {
+                layerModel?.currentLayer?.bitmap?.getPixels(
+                    pixelsDrawingSurface, 0, surfaceBitmapWidth, 0,
+                    canvasPoint.y.toInt(), surfaceBitmapWidth, 1
+                )
+            }
         }
 
         Assert.assertEquals(
@@ -569,10 +581,12 @@ class TextToolIntegrationTest {
         onTopBarView().performRedo()
 
         if (surfaceBitmapWidth != null && canvasPoint != null) {
-            layerModel?.currentLayer?.bitmap?.getPixels(
-                pixelsDrawingSurface, 0, surfaceBitmapWidth, 0,
-                canvasPoint.y.toInt(), surfaceBitmapWidth, 1
-            )
+            if (pixelsDrawingSurface != null) {
+                layerModel?.currentLayer?.bitmap?.getPixels(
+                    pixelsDrawingSurface, 0, surfaceBitmapWidth, 0,
+                    canvasPoint.y.toInt(), surfaceBitmapWidth, 1
+                )
+            }
         }
 
         pixelAmount = pixelsDrawingSurface?.let { countPixelsWithColor(it, Color.BLACK) }
@@ -600,10 +614,12 @@ class TextToolIntegrationTest {
         val pixelsDrawingSurface = surfaceBitmapWidth?.let { IntArray(it) }
 
         if (surfaceBitmapWidth != null && canvasPoint != null) {
-            layerModel?.currentLayer?.bitmap?.getPixels(
-                pixelsDrawingSurface, 0, surfaceBitmapWidth, 0,
-                canvasPoint.y.toInt(), surfaceBitmapWidth, 1
-            )
+            if (pixelsDrawingSurface != null) {
+                layerModel?.currentLayer?.bitmap?.getPixels(
+                    pixelsDrawingSurface, 0, surfaceBitmapWidth, 0,
+                    canvasPoint.y.toInt(), surfaceBitmapWidth, 1
+                )
+            }
         }
 
         var pixelAmount = pixelsDrawingSurface?.let { countPixelsWithColor(it, Color.WHITE) }
@@ -618,10 +634,12 @@ class TextToolIntegrationTest {
         Assert.assertEquals(Color.BLACK.toLong(), selectedColor?.toLong())
         onTopBarView().performClickCheckmark()
         if (surfaceBitmapWidth != null && canvasPoint != null) {
-            layerModel?.currentLayer?.bitmap?.getPixels(
-                pixelsDrawingSurface, 0, surfaceBitmapWidth, 0,
-                canvasPoint.y.toInt(), surfaceBitmapWidth, 1
-            )
+            if (pixelsDrawingSurface != null) {
+                layerModel?.currentLayer?.bitmap?.getPixels(
+                    pixelsDrawingSurface, 0, surfaceBitmapWidth, 0,
+                    canvasPoint.y.toInt(), surfaceBitmapWidth, 1
+                )
+            }
         }
 
         pixelAmount = pixelsDrawingSurface?.let { countPixelsWithColor(it, Color.BLACK) }
@@ -665,10 +683,12 @@ class TextToolIntegrationTest {
 
         if (surfaceBitmapWidth != null) {
             textTool?.toolPosition?.y?.let {
-                layerModel?.currentLayer?.bitmap?.getPixels(
-                    pixelsDrawingSurface, 0, surfaceBitmapWidth, 0,
-                    it.toInt(), surfaceBitmapWidth, 1
-                )
+                if (pixelsDrawingSurface != null) {
+                    layerModel?.currentLayer?.bitmap?.getPixels(
+                        pixelsDrawingSurface, 0, surfaceBitmapWidth, 0,
+                        it.toInt(), surfaceBitmapWidth, 1
+                    )
+                }
             }
         }
 
@@ -688,10 +708,12 @@ class TextToolIntegrationTest {
 
         if (surfaceBitmapWidth != null) {
             textTool?.toolPosition?.y?.let {
-                layerModel?.currentLayer?.bitmap?.getPixels(
-                    pixelsDrawingSurface, 0, surfaceBitmapWidth, 0,
-                    it.toInt(), surfaceBitmapWidth, 1
-                )
+                if (pixelsDrawingSurface != null) {
+                    layerModel?.currentLayer?.bitmap?.getPixels(
+                        pixelsDrawingSurface, 0, surfaceBitmapWidth, 0,
+                        it.toInt(), surfaceBitmapWidth, 1
+                    )
+                }
             }
         }
 

diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/FileIO.kt b/Paintroid/src/main/java/org/catrobat/paintroid/FileIO.kt
@@ -121,7 +121,7 @@ object FileIO {
             canvas.drawBitmap(currentBitmap, 0f, 0f, null)
             currentBitmap = newBitmap
         }
-        if (currentBitmap != null && !currentBitmap.compress(
+        if (currentBitmap != null && outputStream != null && !currentBitmap.compress(
                 compressFormat,
                 compressQuality,
                 outputStream

diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/tools/implementation/ClippingTool.kt b/Paintroid/src/main/java/org/catrobat/paintroid/tools/implementation/ClippingTool.kt
@@ -96,7 +96,10 @@ class ClippingTool(
 
     fun copyBitmapOfCurrentLayer() {
         if (workspace.bitmapOfCurrentLayer != null) {
-            newBitmap = workspace.bitmapOfCurrentLayer?.copy(workspace.bitmapOfCurrentLayer?.config, true)
+            newBitmap = workspace.bitmapOfCurrentLayer?.config?.let {
+                workspace.bitmapOfCurrentLayer?.copy(
+                    it, true)
+            }
         }
     }
 

diff --git a/build.gradle b/build.gradle
@@ -41,9 +41,9 @@ plugins {
 }
 
 ext {
-    androidCompileSdkVersion = 33
+    androidCompileSdkVersion = 34
     androidMinSdkVersion = 21
-    androidTargetSdkVersion = 33
+    androidTargetSdkVersion = 34
 
     androidSupportLibraryVersion = '28.0.0'
 

diff --git a/colorpicker/src/main/java/org/catrobat/paintroid/colorpicker/ZoomableImageView.kt b/colorpicker/src/main/java/org/catrobat/paintroid/colorpicker/ZoomableImageView.kt
@@ -361,7 +361,22 @@ class ZoomableImageView :
     override fun onDown(motionEvent: MotionEvent) = false
     override fun onShowPress(motionEvent: MotionEvent) = Unit
     override fun onSingleTapUp(motionEvent: MotionEvent) = true
-    override fun onScroll(mE: MotionEvent, mE1: MotionEvent, v: Float, v1: Float) = false
+    override fun onScroll(
+        e1: MotionEvent?,
+        e2: MotionEvent,
+        distanceX: Float,
+        distanceY: Float
+    ): Boolean {
+        TODO("Not yet implemented")
+    }
+
     override fun onLongPress(motionEvent: MotionEvent) = Unit
-    override fun onFling(mE: MotionEvent, mE1: MotionEvent, v: Float, v1: Float) = false
+    override fun onFling(
+        e1: MotionEvent?,
+        e2: MotionEvent,
+        velocityX: Float,
+        velocityY: Float
+    ): Boolean {
+        TODO("Not yet implemented")
+    }
 }