chore: Reorganize code a bit

packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/HybridImage.kt

@@ -12,6 +12,13 @@ import com.facebook.proguard.annotations.DoNotStrip
 import com.madebyevan.thumbhash.ThumbHash
 import com.margelo.nitro.core.ArrayBuffer
 import com.margelo.nitro.core.Promise
+import com.margelo.nitro.image.extensions.compressInMemory
+import com.margelo.nitro.image.extensions.isGPU
+import com.margelo.nitro.image.extensions.pixelFormat
+import com.margelo.nitro.image.extensions.saveToFile
+import com.margelo.nitro.image.extensions.toByteBuffer
+import com.margelo.nitro.image.extensions.toCpuAccessible
+import com.margelo.nitro.image.extensions.toMutable
 import java.io.File
 import java.nio.ByteBuffer
 

packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/HybridImageFactory.kt

@@ -11,6 +11,8 @@ import com.madebyevan.thumbhash.ThumbHash
 import com.margelo.nitro.NitroModules
 import com.margelo.nitro.core.ArrayBuffer
 import com.margelo.nitro.core.Promise
+import com.margelo.nitro.image.extensions.bitmapFromRawPixelData
+import com.margelo.nitro.image.extensions.toBitmapColor
 import java.nio.ByteBuffer
 
 @DoNotStrip

packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/HybridImageView.kt

@@ -5,8 +5,8 @@ import android.util.Log
 import android.view.View
 import android.widget.ImageView
 import androidx.annotation.Keep
-import androidx.core.view.isVisible
 import com.facebook.common.internal.DoNotStrip
+import com.margelo.nitro.image.utils.CustomImageView
 import com.margelo.nitro.views.RecyclableView
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers

packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/Bitmap+compressInMemory.kt → packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/extensions/Bitmap+compressInMemory.kt

@@ -1,6 +1,8 @@
-package com.margelo.nitro.image
+package com.margelo.nitro.image.extensions
 
 import android.graphics.Bitmap
+import com.margelo.nitro.image.ImageFormat
+import com.margelo.nitro.image.utils.FastByteArrayOutputStream
 import java.nio.ByteBuffer
 
 fun Bitmap.compressInMemory(format: ImageFormat, quality: Int): ByteBuffer {

packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/Bitmap+fromRawPixelData.kt → packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/extensions/Bitmap+fromRawPixelData.kt

@@ -1,11 +1,11 @@
-package com.margelo.nitro.image
+package com.margelo.nitro.image.extensions
 
 import android.graphics.Bitmap
 import android.graphics.ColorSpace
 import android.os.Build
 import androidx.core.graphics.createBitmap
-import java.io.File
-import java.io.FileOutputStream
+import com.margelo.nitro.image.PixelFormat
+import com.margelo.nitro.image.RawPixelData
 import java.nio.IntBuffer
 
 private data class Swizzle(val r: Int, val g: Int, val b: Int, val a: Int, val bpp: Int)
@@ -108,4 +108,4 @@ fun bitmapFromRawPixelData(data: RawPixelData, allowGpu: Boolean): Bitmap {
     bitmap.isPremultiplied = true
     bitmap.copyPixelsFromBuffer(IntBuffer.wrap(out))
     return bitmap
-}
+}

packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/Bitmap+isGPU.kt → packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/extensions/Bitmap+isGPU.kt

@@ -1,4 +1,4 @@
-package com.margelo.nitro.image
+package com.margelo.nitro.image.extensions
 
 import android.graphics.Bitmap
 import android.os.Build

packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/Bitmap+pixelFormat.kt → packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/extensions/Bitmap+pixelFormat.kt

@@ -1,8 +1,9 @@
-package com.margelo.nitro.image
+package com.margelo.nitro.image.extensions
 
 import android.graphics.Bitmap
 import android.hardware.HardwareBuffer
 import android.os.Build
+import com.margelo.nitro.image.PixelFormat
 import java.nio.ByteOrder
 
 val Bitmap.pixelFormat: PixelFormat

packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/Bitmap+saveToFile.kt → packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/extensions/Bitmap+saveToFile.kt

@@ -1,6 +1,7 @@
-package com.margelo.nitro.image
+package com.margelo.nitro.image.extensions
 
 import android.graphics.Bitmap
+import com.margelo.nitro.image.ImageFormat
 import java.io.File
 import java.io.FileOutputStream
 

packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/Bitmap+toByteBuffer.kt → packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/extensions/Bitmap+toByteBuffer.kt

@@ -1,4 +1,4 @@
-package com.margelo.nitro.image
+package com.margelo.nitro.image.extensions
 
 import android.graphics.Bitmap
 import java.nio.ByteBuffer

packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/Bitmap+toCpuAccessible.kt → packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/extensions/Bitmap+toCpuAccessible.kt

@@ -1,4 +1,4 @@
-package com.margelo.nitro.image
+package com.margelo.nitro.image.extensions
 
 import android.graphics.Bitmap
 

packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/Bitmap+toMutable.kt → packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/extensions/Bitmap+toMutable.kt

@@ -1,4 +1,4 @@
-package com.margelo.nitro.image
+package com.margelo.nitro.image.extensions
 
 import android.graphics.Bitmap
 

packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/Color+toBitmapColor.kt → packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/extensions/Color+toBitmapColor.kt

@@ -1,4 +1,6 @@
-package com.margelo.nitro.image
+package com.margelo.nitro.image.extensions
+
+import com.margelo.nitro.image.Color
 
 fun Color.toBitmapColor(): Int {
     if (a != null) {

packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/CustomImageView.kt → packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/utils/CustomImageView.kt

@@ -1,4 +1,4 @@
-package com.margelo.nitro.image
+package com.margelo.nitro.image.utils
 
 import android.content.Context
 import androidx.appcompat.widget.AppCompatImageView

packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/FastByteArrayOutputStream.kt → packages/react-native-nitro-image/android/src/main/java/com/margelo/nitro/image/utils/FastByteArrayOutputStream.kt

@@ -1,4 +1,4 @@
-package com.margelo.nitro.image
+package com.margelo.nitro.image.utils
 
 import java.io.OutputStream
 import java.nio.ByteBuffer
@@ -31,4 +31,4 @@ class FastByteArrayOutputStream(initialSize: Int = 64 * 1024) : OutputStream() {
     }
 
     fun toByteBuffer(): ByteBuffer = ByteBuffer.wrap(bytes, 0, count)
-}
+}

packages/react-native-nitro-web-image/android/src/main/java/com/margelo/nitro/web/image/HybridWebImageFactory.kt

@@ -9,6 +9,7 @@ import com.margelo.nitro.NitroModules
 import com.margelo.nitro.core.Promise
 import com.margelo.nitro.image.HybridImageLoaderSpec
 import com.margelo.nitro.image.HybridImageSpec
+import com.margelo.nitro.web.image.extensions.loadImageAsync
 
 @DoNotStrip
 @Keep

packages/react-native-nitro-web-image/android/src/main/java/com/margelo/nitro/web/image/HybridWebImageLoader.kt

@@ -8,6 +8,8 @@ import com.margelo.nitro.core.Promise
 import com.margelo.nitro.image.HybridImageSpec
 import com.margelo.nitro.image.HybridImageLoaderSpec
 import com.margelo.nitro.image.HybridNitroImageViewSpec
+import com.margelo.nitro.web.image.extensions.applyOptions
+import com.margelo.nitro.web.image.extensions.loadImageAsync
 
 class HybridWebImageLoader(private val imageLoader: ImageLoader,
                            private val url: String,

packages/react-native-nitro-web-image/android/src/main/java/com/margelo/nitro/web/image/AsyncImagePriority+toCoroutineContext.kt → packages/react-native-nitro-web-image/android/src/main/java/com/margelo/nitro/web/image/extensions/AsyncImagePriority+toCoroutineContext.kt

@@ -1,10 +1,9 @@
-package com.margelo.nitro.web.image
+package com.margelo.nitro.web.image.extensions
 
+import com.margelo.nitro.web.image.AsyncImagePriority
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.currentCoroutineContext
 import kotlin.coroutines.CoroutineContext
 
-
 fun AsyncImagePriority.toCoroutineContext(): CoroutineContext? {
     // TODO: Does this look about right?
     return when (this) {

packages/react-native-nitro-web-image/android/src/main/java/com/margelo/nitro/web/image/ImageLoader+loadImageAsync.kt → packages/react-native-nitro-web-image/android/src/main/java/com/margelo/nitro/web/image/extensions/ImageLoader+loadImageAsync.kt

@@ -1,4 +1,4 @@
-package com.margelo.nitro.web.image
+package com.margelo.nitro.web.image.extensions
 
 import android.content.Context
 import coil3.BitmapImage
@@ -8,6 +8,7 @@ import coil3.request.ImageRequest
 import com.margelo.nitro.core.Promise
 import com.margelo.nitro.image.HybridImage
 import com.margelo.nitro.image.HybridImageSpec
+import com.margelo.nitro.web.image.AsyncImageLoadOptions
 
 suspend fun ImageLoader.loadCoilImageAsync(url: String,
                                            options: AsyncImageLoadOptions?,

packages/react-native-nitro-web-image/android/src/main/java/com/margelo/nitro/web/image/ImageRequestBuilder+applyOptions.kt → packages/react-native-nitro-web-image/android/src/main/java/com/margelo/nitro/web/image/extensions/ImageRequestBuilder+applyOptions.kt

@@ -1,11 +1,12 @@
-package com.margelo.nitro.web.image
+package com.margelo.nitro.web.image.extensions
 
 import coil3.annotation.ExperimentalCoilApi
 import coil3.decode.BlackholeDecoder
 import coil3.request.CachePolicy
 import coil3.request.ImageRequest
 import coil3.request.allowHardware
 import coil3.size.Precision
+import com.margelo.nitro.web.image.AsyncImageLoadOptions
 
 @OptIn(ExperimentalCoilApi::class)
 fun ImageRequest.Builder.applyOptions(options: AsyncImageLoadOptions?): ImageRequest.Builder {