Make metadata realization independent

core/data/src/main/java/ru/tech/imageresizershrinker/core/data/di/ImageModule.kt

@@ -18,7 +18,6 @@
 package ru.tech.imageresizershrinker.core.data.di
 
 import android.graphics.Bitmap
-import androidx.exifinterface.media.ExifInterface
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn

core/data/src/main/java/ru/tech/imageresizershrinker/core/data/image/AndroidImageCompressor.kt

@@ -22,7 +22,6 @@ package ru.tech.imageresizershrinker.core.data.image
 import android.content.Context
 import android.graphics.Bitmap
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import com.t8rin.trickle.Trickle
 import dagger.Lazy
 import dagger.hilt.android.qualifiers.ApplicationContext

core/data/src/main/java/ru/tech/imageresizershrinker/core/data/image/AndroidImageGetter.kt

@@ -22,7 +22,6 @@ import android.content.Context
 import android.graphics.Bitmap
 import android.webkit.MimeTypeMap
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import coil3.ImageLoader
 import coil3.gif.repeatCount
 import coil3.request.ImageRequest
@@ -85,10 +84,7 @@ internal class AndroidImageGetter @Inject constructor(
             onFailure = onFailure
         )?.let { bitmap ->
             val newUri = uri.toUri().tryRequireOriginal(context)
-
+            context.contentResolver.openFileDescriptor(newUri, "r").use {
-            val fd = context.contentResolver.openFileDescriptor(newUri, "r")
-            val exif = fd?.fileDescriptor?.let { ExifInterface(it) }
-            fd?.close()
                 ImageData(
                     image = bitmap,
                     imageInfo = ImageInfo(
@@ -98,10 +94,11 @@ internal class AndroidImageGetter @Inject constructor(
                         originalUri = uri,
                         resizeType = settingsState.defaultResizeType
                     ),
-                metadata = exif?.toMetadata()
+                    metadata = it?.fileDescriptor?.toMetadata()
                 )
             }
         }
+    }
 
     override suspend fun getImage(
         data: Any,
@@ -145,9 +142,7 @@ internal class AndroidImageGetter @Inject constructor(
             addSizeToRequest = originalSize
         )?.let { bitmap ->
             val newUri = uri.toUri().tryRequireOriginal(context)
-            val fd = context.contentResolver.openFileDescriptor(newUri, "r")
+            context.contentResolver.openFileDescriptor(newUri, "r").use {
-            val exif = fd?.fileDescriptor?.let { ExifInterface(it) }
-            fd?.close()
                 ImageData(
                     image = bitmap,
                     imageInfo = ImageInfo(
@@ -157,10 +152,11 @@ internal class AndroidImageGetter @Inject constructor(
                         originalUri = uri,
                         resizeType = settingsState.defaultResizeType
                     ),
-                metadata = exif?.toMetadata()
+                    metadata = it?.fileDescriptor?.toMetadata()
                 )
             }
         }
+    }
 
     override suspend fun getImageWithTransformations(
         data: Any,

core/data/src/main/java/ru/tech/imageresizershrinker/core/data/image/AndroidImagePreviewCreator.kt

@@ -19,7 +19,6 @@ package ru.tech.imageresizershrinker.core.data.image
 
 import android.graphics.Bitmap
 import android.os.Build
-import androidx.exifinterface.media.ExifInterface
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach

core/data/src/main/java/ru/tech/imageresizershrinker/core/data/image/AndroidMetadata.kt

@@ -19,27 +19,30 @@ package ru.tech.imageresizershrinker.core.data.image
 
 import androidx.exifinterface.media.ExifInterface
 import ru.tech.imageresizershrinker.core.domain.image.Metadata
+import ru.tech.imageresizershrinker.core.domain.image.model.MetadataTag
+import java.io.FileDescriptor
 
-private data class AndroidMetadata(
+private data class ExifInterfaceMetadata(
     private val exifInterface: ExifInterface
 ) : Metadata {
 
     override fun saveAttributes() = exifInterface.saveAttributes()
 
-    override fun getAttribute(tag: String): String? = exifInterface.getAttribute(tag)
+    override fun getAttribute(tag: MetadataTag): String? = exifInterface.getAttribute(tag.key)
 
     override fun setAttribute(
-        tag: String,
+        tag: MetadataTag,
         value: String?
-    ) = exifInterface.setAttribute(tag, value)
+    ) = exifInterface.setAttribute(tag.key, value)
 
-    override fun removeAttribute(
+    override fun clearAttribute(
-        tag: String
+        tag: MetadataTag
     ) = setAttribute(
         tag = tag,
         value = null
     )
-
 }
 
-internal fun ExifInterface.toMetadata(): Metadata = AndroidMetadata(this)
+internal fun ExifInterface.toMetadata(): Metadata = ExifInterfaceMetadata(this)
+
+internal fun FileDescriptor.toMetadata(): Metadata = ExifInterface(this).toMetadata()

core/data/src/main/java/ru/tech/imageresizershrinker/core/data/utils/ContextUtils.kt

@@ -24,11 +24,11 @@ import android.net.Uri
 import android.os.Build
 import androidx.compose.ui.unit.Density
 import androidx.core.content.ContextCompat
-import androidx.exifinterface.media.ExifInterface
 import kotlinx.coroutines.coroutineScope
 import ru.tech.imageresizershrinker.core.data.image.toMetadata
 import ru.tech.imageresizershrinker.core.domain.image.Metadata
-import ru.tech.imageresizershrinker.core.domain.image.model.MetadataTag
+import ru.tech.imageresizershrinker.core.domain.image.clearAllAttributes
+import ru.tech.imageresizershrinker.core.domain.image.copyTo
 import ru.tech.imageresizershrinker.core.domain.utils.readableByteCount
 import ru.tech.imageresizershrinker.core.domain.utils.runSuspendCatching
 import java.io.OutputStream
@@ -49,39 +49,25 @@ suspend fun Context.copyMetadata(
 ) = runSuspendCatching {
     if (initialExif != null) {
         getFileDescriptorFor(fileUri)?.use {
-            val ex = ExifInterface(it.fileDescriptor)
+            initialExif.copyTo(it.fileDescriptor.toMetadata())
-            initialExif.copyTo(ex.toMetadata())
-            ex.saveAttributes()
         }
     } else if (keepOriginalMetadata) {
         val newUri = originalUri.tryRequireOriginal(this)
         val exif = contentResolver
             .openFileDescriptor(newUri, "r")
-            ?.use { ExifInterface(it.fileDescriptor) }
+            ?.use { it.fileDescriptor.toMetadata() }
 
         getFileDescriptorFor(fileUri)?.use {
-            val ex = ExifInterface(it.fileDescriptor).toMetadata()
+            exif?.copyTo(it.fileDescriptor.toMetadata())
-            exif?.toMetadata()?.copyTo(ex)
-            ex.saveAttributes()
         }
     } else {
         getFileDescriptorFor(fileUri)?.use {
-            val ex = ExifInterface(it.fileDescriptor)
+            it.fileDescriptor.toMetadata().apply {
-            MetadataTag.entries.forEach { tag ->
+                clearAllAttributes()
-                ex.setAttribute(tag.key, null)
+                saveAttributes()
-            }
-            ex.saveAttributes()
             }
         }
     }
-
-suspend infix fun Metadata.copyTo(
-    newExif: Metadata
-) = coroutineScope {
-    MetadataTag.entries.forEach { attr ->
-        getAttribute(attr.key).let { newExif.setAttribute(attr.key, it) }
-    }
-    newExif.saveAttributes()
 }
 
 fun Context.openWriteableStream(

core/domain/src/main/kotlin/ru/tech/imageresizershrinker/core/domain/image/Metadata.kt

@@ -17,15 +17,40 @@
 
 package ru.tech.imageresizershrinker.core.domain.image
 
+import ru.tech.imageresizershrinker.core.domain.image.model.MetadataTag
+
 interface Metadata {
     fun saveAttributes()
 
-    fun getAttribute(tag: String): String?
+    fun getAttribute(tag: MetadataTag): String?
 
     fun setAttribute(
-        tag: String,
+        tag: MetadataTag,
         value: String?
     )
 
-    fun removeAttribute(tag: String)
+    fun clearAttribute(tag: MetadataTag)
+}
+
+fun Metadata.clearAttributes(
+    attributes: List<MetadataTag>
+): Metadata = apply {
+    attributes.forEach(::clearAttribute)
+}
+
+fun Metadata.clearAllAttributes() = clearAttributes(attributes = MetadataTag.entries)
+
+fun Metadata.toMap(): Map<MetadataTag, String> = mutableMapOf<MetadataTag, String>().apply {
+    MetadataTag.entries.forEach { tag ->
+        getAttribute(tag)?.let { put(tag, it) }
+    }
+}
+
+fun Metadata.copyTo(metadata: Metadata): Metadata {
+    MetadataTag.entries.forEach { attr ->
+        getAttribute(attr).let { metadata.setAttribute(attr, it) }
+    }
+    metadata.saveAttributes()
+
+    return metadata
 }

core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/helper/ImageUtils.kt

@@ -31,9 +31,8 @@ import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.platform.LocalContext
 import androidx.core.graphics.BitmapCompat
 import androidx.core.graphics.drawable.toBitmap
+import androidx.core.graphics.scale
 import androidx.core.text.isDigitsOnly
-import androidx.exifinterface.media.ExifInterface
-import ru.tech.imageresizershrinker.core.domain.image.Metadata
 import ru.tech.imageresizershrinker.core.domain.image.model.ImageInfo
 import ru.tech.imageresizershrinker.core.domain.image.model.MetadataTag
 import ru.tech.imageresizershrinker.core.resources.R
@@ -45,14 +44,6 @@ object ImageUtils {
 
     fun Drawable.toBitmap(): Bitmap = toBitmap(config = getSuitableConfig())
 
-    fun Metadata.toMap(): Map<MetadataTag, String> {
-        val hashMap = HashMap<MetadataTag, String>()
-        MetadataTag.entries.forEach { tag ->
-            getAttribute(tag.key)?.let { hashMap[tag] = it }
-        }
-        return hashMap
-    }
-
     fun MetadataTag.localizedName(
         context: Context,
         locale: Locale? = null
@@ -283,9 +274,7 @@ object ImageUtils {
                 true
             )
         } else {
-            Bitmap.createScaledBitmap(
+            this.scale(width, height)
-                this, width, height, true
-            )
         }
     }
 

core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/sheets/EditExifSheet.kt

@@ -58,13 +58,12 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.exifinterface.media.ExifInterface
 import ru.tech.imageresizershrinker.core.domain.image.Metadata
 import ru.tech.imageresizershrinker.core.domain.image.model.MetadataTag
+import ru.tech.imageresizershrinker.core.domain.image.toMap
 import ru.tech.imageresizershrinker.core.resources.R
 import ru.tech.imageresizershrinker.core.resources.icons.Exif
 import ru.tech.imageresizershrinker.core.ui.utils.helper.ImageUtils.localizedName
-import ru.tech.imageresizershrinker.core.ui.utils.helper.ImageUtils.toMap
 import ru.tech.imageresizershrinker.core.ui.widget.enhanced.EnhancedAlertDialog
 import ru.tech.imageresizershrinker.core.ui.widget.enhanced.EnhancedBottomSheetDefaults
 import ru.tech.imageresizershrinker.core.ui.widget.enhanced.EnhancedButton

feature/apng-tools/src/main/java/ru/tech/imageresizershrinker/feature/apng_tools/presentation/screenLogic/ApngToolsComponent.kt

@@ -26,7 +26,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

feature/audio-cover-extractor/src/main/java/ru/tech/imageresizershrinker/feature/audio_cover_extractor/ui/screenLogic/AudioCoverExtractorComponent.kt

@@ -24,7 +24,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

feature/base64-tools/src/main/java/ru/tech/imageresizershrinker/feature/base64_tools/presentation/screenLogic/Base64ToolsComponent.kt

@@ -23,7 +23,6 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

feature/collage-maker/src/main/java/ru/tech/imageresizershrinker/collage_maker/presentation/screenLogic/CollageMakerComponent.kt

@@ -25,7 +25,6 @@ import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.graphics.Color
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import com.t8rin.collages.CollageType
 import dagger.assisted.Assisted

feature/compare/src/main/java/ru/tech/imageresizershrinker/feature/compare/presentation/screenLogic/CompareComponent.kt

@@ -25,7 +25,6 @@ import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.graphics.toArgb
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import coil3.transform.Transformation
 import com.arkivanov.decompose.ComponentContext
 import com.t8rin.opencv_tools.image_comparison.ImageDiffTool

feature/crop/src/main/java/ru/tech/imageresizershrinker/feature/crop/presentation/screenLogic/CropComponent.kt

@@ -23,7 +23,6 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import com.smarttoolfactory.cropper.model.AspectRatio
 import com.smarttoolfactory.cropper.model.OutlineType

feature/delete-exif/src/main/java/ru/tech/imageresizershrinker/feature/delete_exif/presentation/screenLogic/DeleteExifComponent.kt

@@ -34,6 +34,7 @@ import ru.tech.imageresizershrinker.core.domain.dispatchers.DispatchersHolder
 import ru.tech.imageresizershrinker.core.domain.image.ImageGetter
 import ru.tech.imageresizershrinker.core.domain.image.ImageScaler
 import ru.tech.imageresizershrinker.core.domain.image.ShareProvider
+import ru.tech.imageresizershrinker.core.domain.image.clearAttributes
 import ru.tech.imageresizershrinker.core.domain.image.model.MetadataTag
 import ru.tech.imageresizershrinker.core.domain.saving.FileController
 import ru.tech.imageresizershrinker.core.domain.saving.FilenameCreator
@@ -156,11 +157,7 @@ class DeleteExifComponent @AssistedInject internal constructor(
                     imageGetter.getImage(uri.toString())
                 }.getOrNull()?.let {
                     val metadata = if (selectedTags.isNotEmpty()) {
-                        it.metadata?.apply {
+                        it.metadata?.clearAttributes(selectedTags)
-                            selectedTags.forEach { tag ->
-                                setAttribute(tag.key, null)
-                            }
-                        }
                     } else null
 
                     results.add(
@@ -254,11 +251,7 @@ class DeleteExifComponent @AssistedInject internal constructor(
                     uri.toString()
                 )?.let {
                     val metadata = if (selectedTags.isNotEmpty()) {
-                        it.metadata?.apply {
+                        it.metadata?.clearAttributes(selectedTags)
-                            selectedTags.forEach { tag ->
-                                setAttribute(tag.key, null)
-                            }
-                        }
                     } else null
 
                     shareProvider.cacheData(

feature/document-scanner/src/main/java/ru/tech/imageresizershrinker/feature/document_scanner/presentation/screenLogic/DocumentScannerComponent.kt

@@ -24,7 +24,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

feature/draw/src/main/java/ru/tech/imageresizershrinker/feature/draw/data/AndroidImageDrawApplier.kt

@@ -46,7 +46,7 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.applyCanvas
-import androidx.exifinterface.media.ExifInterface
+import androidx.core.graphics.createBitmap
 import dagger.hilt.android.qualifiers.ApplicationContext
 import ru.tech.imageresizershrinker.core.data.utils.density
 import ru.tech.imageresizershrinker.core.data.utils.safeConfig
@@ -92,11 +92,7 @@ internal class AndroidImageDrawApplier @Inject constructor(
             }
 
             is DrawBehavior.Background -> {
-                Bitmap.createBitmap(
+                createBitmap(drawBehavior.width, drawBehavior.height).apply {
-                    drawBehavior.width,
-                    drawBehavior.height,
-                    Bitmap.Config.ARGB_8888
-                ).apply {
                     val canvas = Canvas(this)
                     val paint = NativePaint().apply {
                         color = drawBehavior.color
@@ -192,10 +188,9 @@ internal class AndroidImageDrawApplier @Inject constructor(
                         val filter = filterProvider.filterToTransformation(
                             createFilter<Triple<ImageModel, Float, Int>, Filter.SpotHeal>(
                                 Triple(
-                                    first = Bitmap.createBitmap(
+                                    first = createBitmap(
                                         canvasSize.width,
-                                        canvasSize.height,
+                                        canvasSize.height
-                                        Bitmap.Config.ARGB_8888
                                     ).applyCanvas {
                                         drawColor(Color.Black.toArgb())
                                         drawPath(
@@ -531,7 +526,7 @@ internal class AndroidImageDrawApplier @Inject constructor(
     private fun Bitmap.overlay(overlay: Bitmap): Bitmap {
         val image = this
         val config = safeConfig.toSoftware()
-        val finalBitmap = Bitmap.createBitmap(image.width, image.height, config)
+        val finalBitmap = createBitmap(image.width, image.height, config)
         val canvas = Canvas(finalBitmap)
         canvas.drawBitmap(image, Matrix(), null)
         canvas.drawBitmap(overlay.toSoftware(), 0f, 0f, null)

feature/draw/src/main/java/ru/tech/imageresizershrinker/feature/draw/presentation/screenLogic/DrawComponent.kt

@@ -27,7 +27,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Path
 import androidx.compose.ui.graphics.toArgb
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import com.arkivanov.decompose.childContext
 import dagger.assisted.Assisted

feature/edit-exif/src/main/java/ru/tech/imageresizershrinker/feature/edit_exif/presentation/screenLogic/EditExifComponent.kt

@@ -32,6 +32,7 @@ import ru.tech.imageresizershrinker.core.domain.dispatchers.DispatchersHolder
 import ru.tech.imageresizershrinker.core.domain.image.ImageGetter
 import ru.tech.imageresizershrinker.core.domain.image.Metadata
 import ru.tech.imageresizershrinker.core.domain.image.ShareProvider
+import ru.tech.imageresizershrinker.core.domain.image.clearAllAttributes
 import ru.tech.imageresizershrinker.core.domain.image.model.ImageFormat
 import ru.tech.imageresizershrinker.core.domain.image.model.MetadataTag
 import ru.tech.imageresizershrinker.core.domain.saving.FileController
@@ -160,13 +161,8 @@ class EditExifComponent @AssistedInject internal constructor(
     }
 
     fun clearExif() {
-        val tempExif = _exif.value
+        val tempExif = _exif.value?.clearAllAttributes()
-        MetadataTag.entries.forEach {
+        _exif.update { tempExif }
-            tempExif?.setAttribute(it.key, null)
-        }
-        _exif.update {
-            tempExif
-        }
         registerChanges()
     }
 
@@ -177,7 +173,7 @@ class EditExifComponent @AssistedInject internal constructor(
 
     fun removeExifTag(tag: MetadataTag) {
         val exifInterface = _exif.value
-        exifInterface?.setAttribute(tag.key, null)
+        exifInterface?.clearAttribute(tag)
         updateExif(exifInterface)
     }
 
@@ -186,7 +182,7 @@ class EditExifComponent @AssistedInject internal constructor(
         value: String,
     ) {
         val exifInterface = _exif.value
-        exifInterface?.setAttribute(tag.key, value)
+        exifInterface?.setAttribute(tag, value)
         updateExif(exifInterface)
     }
 

feature/erase-background/src/main/java/ru/tech/imageresizershrinker/feature/erase_background/presentation/screenLogic/EraseBackgroundComponent.kt

@@ -25,7 +25,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Path
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/data/model/LUT512x512Filter.kt

@@ -18,7 +18,6 @@
 package ru.tech.imageresizershrinker.feature.filters.data.model
 
 import android.graphics.Bitmap
-import androidx.exifinterface.media.ExifInterface
 import com.t8rin.trickle.Trickle
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/data/model/PaletteTransferFilter.kt

@@ -18,7 +18,6 @@
 package ru.tech.imageresizershrinker.feature.filters.data.model
 
 import android.graphics.Bitmap
-import androidx.exifinterface.media.ExifInterface
 import com.t8rin.trickle.Trickle
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/data/model/PaletteTransferVariantFilter.kt

@@ -18,7 +18,6 @@
 package ru.tech.imageresizershrinker.feature.filters.data.model
 
 import android.graphics.Bitmap
-import androidx.exifinterface.media.ExifInterface
 import com.awxkee.aire.Aire
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/data/model/SpotHealFilter.kt

@@ -18,7 +18,6 @@
 package ru.tech.imageresizershrinker.feature.filters.data.model
 
 import android.graphics.Bitmap
-import androidx.exifinterface.media.ExifInterface
 import com.t8rin.opencv_tools.spot_heal.SpotHealer
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/screenLogic/FiltersComponent.kt

@@ -26,7 +26,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Path
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import coil3.transform.Transformation
 import com.arkivanov.decompose.ComponentContext
 import com.arkivanov.decompose.childContext

feature/format-conversion/src/main/java/ru/tech/imageresizershrinker/feature/format_conversion/presentation/screenLogic/FormatConversionComponent.kt

@@ -24,7 +24,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

feature/generate-palette/src/main/java/ru/tech/imageresizershrinker/feature/generate_palette/presentation/screenLogic/GeneratePaletteComponent.kt

@@ -22,7 +22,6 @@ import android.net.Uri
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

feature/gif-tools/src/main/java/ru/tech/imageresizershrinker/feature/gif_tools/presentation/screenLogic/GifToolsComponent.kt

@@ -25,7 +25,6 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

feature/gradient-maker/src/main/java/ru/tech/imageresizershrinker/feature/gradient_maker/presentation/screenLogic/GradientMakerComponent.kt

@@ -30,7 +30,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ShaderBrush
 import androidx.compose.ui.graphics.TileMode
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import coil3.transform.Transformation
 import com.arkivanov.decompose.ComponentContext
 import dagger.assisted.Assisted

feature/image-cutting/src/main/java/ru/tech/imageresizershrinker/image_cutting/data/AndroidImageCutter.kt

@@ -19,7 +19,7 @@ package ru.tech.imageresizershrinker.image_cutting.data
 
 import android.graphics.Bitmap
 import androidx.core.graphics.applyCanvas
-import androidx.exifinterface.media.ExifInterface
+import androidx.core.graphics.createBitmap
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.withContext
 import ru.tech.imageresizershrinker.core.data.utils.safeConfig
@@ -53,7 +53,7 @@ internal class AndroidImageCutter @Inject constructor(
     override suspend fun cutAndMerge(
         image: Bitmap,
         params: CutParams
-    ): Bitmap? = withContext(defaultDispatcher) {
+    ): Bitmap = withContext(defaultDispatcher) {
         runSuspendCatching {
             val verticalStart = params.vertical.takeIf { it != PivotPair(0f, 1f) }
                 ?.let { (it.start * image.width).roundToInt() }
@@ -180,7 +180,7 @@ internal class AndroidImageCutter @Inject constructor(
         val mergedWidth = parts.maxOf { it.width }
         val mergedHeight = parts.sumOf { it.height }
 
-        Bitmap.createBitmap(mergedWidth, mergedHeight, source.safeConfig)
+        createBitmap(mergedWidth, mergedHeight, source.safeConfig)
             .applyCanvas {
                 var offsetY = 0f
                 for (part in parts) {
@@ -257,7 +257,7 @@ internal class AndroidImageCutter @Inject constructor(
         val mergedWidth = parts.sumOf { it.width }
         val mergedHeight = parts.maxOf { it.height }
 
-        Bitmap.createBitmap(mergedWidth, mergedHeight, source.safeConfig)
+        createBitmap(mergedWidth, mergedHeight, source.safeConfig)
             .applyCanvas {
                 var offsetX = 0f
                 for (part in parts) {

feature/image-cutting/src/main/java/ru/tech/imageresizershrinker/image_cutting/presentation/screenLogic/ImageCutterComponent.kt

@@ -24,7 +24,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import coil3.transform.Transformation
 import com.arkivanov.decompose.ComponentContext
 import dagger.assisted.Assisted
@@ -324,11 +323,11 @@ class ImageCutterComponent @AssistedInject internal constructor(
         else null
 
     fun getCutTransformation(): List<Transformation> = listOf(
-        GenericTransformation<Bitmap> {
+        GenericTransformation { image: Bitmap ->
             val bitmap = imageCutter.cutAndMerge(
-                image = it,
+                image = image,
                 params = params
-            ) ?: it
+            ) ?: image
 
             imagePreviewCreator.createPreview(
                 image = bitmap,
@@ -340,7 +339,7 @@ class ImageCutterComponent @AssistedInject internal constructor(
                 ),
                 transformations = emptyList(),
                 onGetByteCount = {}
-            ) ?: it
+            ) ?: image
         }.toCoil()
     )
 

feature/image-preview/src/main/java/ru/tech/imageresizershrinker/feature/image_preview/presentation/screenLogic/ImagePreviewComponent.kt

@@ -23,7 +23,6 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

feature/image-splitting/src/main/java/ru/tech/imageresizershrinker/image_splitting/data/AndroidImageSplitter.kt

@@ -18,7 +18,6 @@
 package ru.tech.imageresizershrinker.image_splitting.data
 
 import android.graphics.Bitmap
-import androidx.exifinterface.media.ExifInterface
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.async
 import kotlinx.coroutines.withContext

feature/image-stacking/src/main/java/ru/tech/imageresizershrinker/feature/image_stacking/data/AndroidImageStacker.kt

@@ -21,7 +21,7 @@ import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.PorterDuffXfermode
-import androidx.exifinterface.media.ExifInterface
+import androidx.core.graphics.createBitmap
 import kotlinx.coroutines.withContext
 import ru.tech.imageresizershrinker.core.data.image.utils.drawBitmap
 import ru.tech.imageresizershrinker.core.data.image.utils.toPorterDuffMode
@@ -67,10 +67,10 @@ internal class AndroidImageStacker @Inject constructor(
             return@withContext null
         }
 
-        val outputBitmap = Bitmap.createBitmap(
+        val outputBitmap = createBitmap(
-            resultSize.width,
+            width = resultSize.width,
-            resultSize.height,
+            height = resultSize.height,
-            getSuitableConfig()
+            config = getSuitableConfig()
         )
 
         val canvas = Canvas(outputBitmap)

feature/image-stitch/src/main/java/ru/tech/imageresizershrinker/feature/image_stitch/data/AndroidImageCombiner.kt

@@ -22,7 +22,7 @@ import android.graphics.Canvas
 import android.graphics.PorterDuff
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
-import androidx.exifinterface.media.ExifInterface
+import androidx.core.graphics.createBitmap
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -106,7 +106,7 @@ internal class AndroidImageCombiner @Inject constructor(
                 } else image
             }
 
-            val bitmap = Bitmap.createBitmap(size.width, size.height, getSuitableConfig())
+            val bitmap = createBitmap(size.width, size.height, getSuitableConfig())
             val canvas = Canvas(bitmap).apply {
                 drawColor(Color.Transparent.toArgb(), PorterDuff.Mode.CLEAR)
                 drawColor(combiningParams.backgroundColor)

feature/jxl-tools/src/main/java/ru/tech/imageresizershrinker/feature/jxl_tools/data/AndroidJxlConverter.kt

@@ -22,7 +22,6 @@ import android.graphics.Bitmap
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import com.awxkee.jxlcoder.JxlAnimatedEncoder
 import com.awxkee.jxlcoder.JxlAnimatedImage
 import com.awxkee.jxlcoder.JxlChannelsConfiguration

feature/jxl-tools/src/main/java/ru/tech/imageresizershrinker/feature/jxl_tools/presentation/screenLogic/JxlToolsComponent.kt

@@ -25,7 +25,6 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

feature/limits-resize/src/main/java/ru/tech/imageresizershrinker/feature/limits_resize/presentation/screenLogic/LimitsResizeComponent.kt

@@ -25,7 +25,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

feature/load-net-image/src/main/java/ru/tech/imageresizershrinker/feature/load_net_image/presentation/screenLogic/LoadNetImageComponent.kt

@@ -25,7 +25,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

feature/markup-layers/src/main/java/ru/tech/imageresizershrinker/feature/markup_layers/presentation/screenLogic/MarkupLayersComponent.kt

@@ -29,8 +29,8 @@ import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.asAndroidBitmap
 import androidx.compose.ui.graphics.toArgb
 import androidx.core.graphics.applyCanvas
+import androidx.core.graphics.createBitmap
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
@@ -277,8 +277,7 @@ class MarkupLayersComponent @AssistedInject internal constructor(
     private suspend fun Bitmap.overlay(overlay: Bitmap): Bitmap {
         val image = this
         val config = image.safeConfig.toSoftware()
-        val finalBitmap =
+        val finalBitmap = createBitmap(image.width, image.height, config)
-            Bitmap.createBitmap(image.width, image.height, config)
         val canvas = Canvas(finalBitmap)
         canvas.drawBitmap(image, Matrix(), null)
         canvas.drawBitmap(

feature/mesh-gradients/src/main/java/ru/tech/imageresizershrinker/feature/mesh_gradients/presentation/screenLogic/MeshGradientsComponent.kt

@@ -23,7 +23,6 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

feature/pick-color/src/main/java/ru/tech/imageresizershrinker/feature/pick_color/presentation/screenLogic/PickColorFromImageComponent.kt

@@ -23,7 +23,6 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.graphics.Color
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

feature/recognize-text/src/main/java/ru/tech/imageresizershrinker/feature/recognize/text/data/AndroidImageTextReader.kt

@@ -20,7 +20,6 @@ package ru.tech.imageresizershrinker.feature.recognize.text.data
 import android.content.Context
 import android.graphics.Bitmap
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import com.googlecode.tesseract.android.TessBaseAPI
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.isActive

feature/recognize-text/src/main/java/ru/tech/imageresizershrinker/feature/recognize/text/presentation/screenLogic/RecognizeTextComponent.kt

@@ -26,7 +26,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableFloatStateOf
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import com.smarttoolfactory.cropper.model.AspectRatio
 import com.smarttoolfactory.cropper.model.OutlineType
@@ -385,7 +384,7 @@ class RecognizeTextComponent @AssistedInject internal constructor(
                                             sequenceNumber = null,
                                             metadata = it.metadata?.apply {
                                                 setAttribute(
-                                                    MetadataTag.UserComment.key,
+                                                    MetadataTag.UserComment,
                                                     txtString.takeIf { it.isNotEmpty() }
                                                 )
                                             },
@@ -771,7 +770,7 @@ class RecognizeTextComponent @AssistedInject internal constructor(
 
                                 val exif = it.metadata?.apply {
                                     setAttribute(
-                                        MetadataTag.UserComment.key,
+                                        MetadataTag.UserComment,
                                         txtString.takeIf { it.isNotEmpty() }
                                     )
                                 }

feature/resize-convert/src/main/java/ru/tech/imageresizershrinker/feature/resize_convert/presentation/screenLogic/ResizeAndConvertComponent.kt

@@ -38,6 +38,7 @@ import ru.tech.imageresizershrinker.core.domain.image.ImageScaler
 import ru.tech.imageresizershrinker.core.domain.image.ImageTransformer
 import ru.tech.imageresizershrinker.core.domain.image.Metadata
 import ru.tech.imageresizershrinker.core.domain.image.ShareProvider
+import ru.tech.imageresizershrinker.core.domain.image.clearAllAttributes
 import ru.tech.imageresizershrinker.core.domain.image.model.ImageData
 import ru.tech.imageresizershrinker.core.domain.image.model.ImageFormat
 import ru.tech.imageresizershrinker.core.domain.image.model.ImageInfo
@@ -519,10 +520,7 @@ class ResizeAndConvertComponent @AssistedInject internal constructor(
     fun canShow(): Boolean = bitmap?.let { imagePreviewCreator.canShow(it) } == true
 
     fun clearExif() {
-        val tempExif = _exif.value
+        val tempExif = _exif.value?.clearAllAttributes()
-        MetadataTag.entries.forEach {
-            tempExif?.setAttribute(it.key, null)
-        }
         _exif.update { tempExif }
     }
 
@@ -533,7 +531,7 @@ class ResizeAndConvertComponent @AssistedInject internal constructor(
 
     fun removeExifTag(tag: MetadataTag) {
         val exifInterface = _exif.value
-        exifInterface?.setAttribute(tag.key, null)
+        exifInterface?.clearAttribute(tag)
         updateExif(exifInterface)
     }
 
@@ -542,7 +540,7 @@ class ResizeAndConvertComponent @AssistedInject internal constructor(
         value: String
     ) {
         val exifInterface = _exif.value
-        exifInterface?.setAttribute(tag.key, value)
+        exifInterface?.setAttribute(tag, value)
         updateExif(exifInterface)
     }
 

feature/scan-qr-code/src/main/java/ru/tech/imageresizershrinker/feature/scan_qr_code/presentation/screenLogic/ScanQrCodeComponent.kt

@@ -24,7 +24,6 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

feature/settings/src/main/java/ru/tech/imageresizershrinker/feature/settings/presentation/screenLogic/SettingsComponent.kt

@@ -24,7 +24,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import com.arkivanov.decompose.value.Value
 import com.t8rin.dynamic.theme.ColorTuple

feature/single-edit/src/main/java/ru/tech/imageresizershrinker/feature/single_edit/presentation/screenLogic/SingleEditComponent.kt

@@ -45,6 +45,7 @@ import ru.tech.imageresizershrinker.core.domain.image.ImageScaler
 import ru.tech.imageresizershrinker.core.domain.image.ImageTransformer
 import ru.tech.imageresizershrinker.core.domain.image.Metadata
 import ru.tech.imageresizershrinker.core.domain.image.ShareProvider
+import ru.tech.imageresizershrinker.core.domain.image.clearAllAttributes
 import ru.tech.imageresizershrinker.core.domain.image.model.ImageData
 import ru.tech.imageresizershrinker.core.domain.image.model.ImageFormat
 import ru.tech.imageresizershrinker.core.domain.image.model.ImageInfo
@@ -563,13 +564,8 @@ class SingleEditComponent @AssistedInject internal constructor(
     }
 
     fun clearExif() {
-        val tempExif = _exif.value
+        val tempExif = _exif.value?.clearAllAttributes()
-        MetadataTag.entries.forEach {
+        _exif.update { tempExif }
-            tempExif?.setAttribute(it.key, null)
-        }
-        _exif.update {
-            tempExif
-        }
         registerChanges()
     }
 
@@ -580,7 +576,7 @@ class SingleEditComponent @AssistedInject internal constructor(
 
     fun removeExifTag(tag: MetadataTag) {
         val exifInterface = _exif.value
-        exifInterface?.setAttribute(tag.key, null)
+        exifInterface?.clearAttribute(tag)
         updateExif(exifInterface)
     }
 
@@ -589,7 +585,7 @@ class SingleEditComponent @AssistedInject internal constructor(
         value: String,
     ) {
         val exifInterface = _exif.value
-        exifInterface?.setAttribute(tag.key, value)
+        exifInterface?.setAttribute(tag, value)
         updateExif(exifInterface)
     }
 

feature/svg-maker/src/main/java/ru/tech/imageresizershrinker/feature/svg_maker/data/AndroidSvgManager.kt

@@ -21,7 +21,6 @@ package ru.tech.imageresizershrinker.feature.svg_maker.data
 
 import android.content.Context
 import android.graphics.Bitmap
-import androidx.exifinterface.media.ExifInterface
 import com.t8rin.image.toolbox.svg.ImageTracerAndroid
 import com.t8rin.image.toolbox.svg.ImageTracerAndroid.SvgListener
 import dagger.hilt.android.qualifiers.ApplicationContext

feature/svg-maker/src/main/java/ru/tech/imageresizershrinker/feature/svg_maker/presentation/screenLogic/SvgMakerComponent.kt

@@ -25,7 +25,6 @@ import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

feature/watermarking/src/main/java/ru/tech/imageresizershrinker/feature/watermarking/data/AndroidWatermarkApplier.kt

@@ -27,7 +27,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.applyCanvas
-import androidx.exifinterface.media.ExifInterface
 import coil3.transform.RoundedCornersTransformation
 import com.watermark.androidwm.WatermarkBuilder
 import com.watermark.androidwm.bean.WatermarkImage

feature/watermarking/src/main/java/ru/tech/imageresizershrinker/feature/watermarking/presentation/screenLogic/WatermarkingComponent.kt

@@ -24,7 +24,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import coil3.transform.Transformation
 import com.arkivanov.decompose.ComponentContext
 import dagger.assisted.Assisted

feature/webp-tools/src/main/java/ru/tech/imageresizershrinker/feature/webp_tools/data/AndroidWebpConverter.kt

@@ -22,7 +22,6 @@ import android.graphics.Bitmap
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import com.t8rin.awebp.decoder.AnimatedWebpDecoder
 import com.t8rin.awebp.encoder.AnimatedWebpEncoder
 import dagger.hilt.android.qualifiers.ApplicationContext

feature/webp-tools/src/main/java/ru/tech/imageresizershrinker/feature/webp_tools/presentation/screenLogic/WebpToolsComponent.kt

@@ -24,7 +24,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory

feature/weight-resize/src/main/java/ru/tech/imageresizershrinker/feature/weight_resize/presentation/screenLogic/WeightResizeComponent.kt

@@ -25,7 +25,6 @@ import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableLongStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.core.net.toUri
-import androidx.exifinterface.media.ExifInterface
 import com.arkivanov.decompose.ComponentContext
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory