From 4a58a1b4e39ceb6f11b6e35bddcc1035d6a8a61c Mon Sep 17 00:00:00 2001 From: Pierre-Yves Nicolas <6371790+pynicolas@users.noreply.github.com> Date: Tue, 18 Nov 2025 20:22:06 +0100 Subject: [PATCH] Reorg: move ImageTransformations and OpenCvImageTransformations --- app/src/main/java/org/fairscan/app/MainViewModel.kt | 1 + app/src/main/java/org/fairscan/app/data/ImageRepository.kt | 1 - .../java/org/fairscan/app/{ => data}/ImageTransformations.kt | 2 +- .../fairscan/app/{ => platform}/OpenCvImageTransformations.kt | 3 ++- app/src/test/java/org/fairscan/app/data/ImageRepositoryTest.kt | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) rename app/src/main/java/org/fairscan/app/{ => data}/ImageTransformations.kt (96%) rename app/src/main/java/org/fairscan/app/{ => platform}/OpenCvImageTransformations.kt (96%) diff --git a/app/src/main/java/org/fairscan/app/MainViewModel.kt b/app/src/main/java/org/fairscan/app/MainViewModel.kt index 76a635f..288734e 100644 --- a/app/src/main/java/org/fairscan/app/MainViewModel.kt +++ b/app/src/main/java/org/fairscan/app/MainViewModel.kt @@ -48,6 +48,7 @@ import org.fairscan.app.domain.detectDocumentQuad import org.fairscan.app.domain.extractDocument import org.fairscan.app.domain.scaledTo import org.fairscan.app.platform.AndroidPdfWriter +import org.fairscan.app.platform.OpenCvTransformations import org.fairscan.app.ui.NavigationState import org.fairscan.app.ui.state.PdfGenerationUiState import org.fairscan.app.ui.state.RecentDocumentUiState diff --git a/app/src/main/java/org/fairscan/app/data/ImageRepository.kt b/app/src/main/java/org/fairscan/app/data/ImageRepository.kt index 45be75e..4d28b17 100644 --- a/app/src/main/java/org/fairscan/app/data/ImageRepository.kt +++ b/app/src/main/java/org/fairscan/app/data/ImageRepository.kt @@ -17,7 +17,6 @@ package org.fairscan.app.data import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.toImmutableList import kotlinx.serialization.json.Json -import org.fairscan.app.ImageTransformations import java.io.File const val SCAN_DIR_NAME = "scanned_pages" diff --git a/app/src/main/java/org/fairscan/app/ImageTransformations.kt b/app/src/main/java/org/fairscan/app/data/ImageTransformations.kt similarity index 96% rename from app/src/main/java/org/fairscan/app/ImageTransformations.kt rename to app/src/main/java/org/fairscan/app/data/ImageTransformations.kt index 71e6b58..b7140fc 100644 --- a/app/src/main/java/org/fairscan/app/ImageTransformations.kt +++ b/app/src/main/java/org/fairscan/app/data/ImageTransformations.kt @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -package org.fairscan.app +package org.fairscan.app.data import java.io.File diff --git a/app/src/main/java/org/fairscan/app/OpenCvImageTransformations.kt b/app/src/main/java/org/fairscan/app/platform/OpenCvImageTransformations.kt similarity index 96% rename from app/src/main/java/org/fairscan/app/OpenCvImageTransformations.kt rename to app/src/main/java/org/fairscan/app/platform/OpenCvImageTransformations.kt index bc6a106..ae0b1b6 100644 --- a/app/src/main/java/org/fairscan/app/OpenCvImageTransformations.kt +++ b/app/src/main/java/org/fairscan/app/platform/OpenCvImageTransformations.kt @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -package org.fairscan.app +package org.fairscan.app.platform import android.graphics.Bitmap import android.graphics.BitmapFactory @@ -22,6 +22,7 @@ import org.opencv.imgcodecs.Imgcodecs import java.io.File import kotlin.math.min import androidx.core.graphics.scale +import org.fairscan.app.data.ImageTransformations class OpenCvTransformations : ImageTransformations { override fun rotate(inputFile: File, outputFile: File, clockwise: Boolean) { diff --git a/app/src/test/java/org/fairscan/app/data/ImageRepositoryTest.kt b/app/src/test/java/org/fairscan/app/data/ImageRepositoryTest.kt index 3989c25..fe1ad45 100644 --- a/app/src/test/java/org/fairscan/app/data/ImageRepositoryTest.kt +++ b/app/src/test/java/org/fairscan/app/data/ImageRepositoryTest.kt @@ -15,7 +15,7 @@ package org.fairscan.app.data import org.assertj.core.api.Assertions.assertThat -import org.fairscan.app.ImageTransformations +import org.fairscan.app.data.ImageTransformations import org.junit.Rule import org.junit.Test import org.junit.rules.TemporaryFolder