From 2eec4fe7ca0623e0090ab3bc0c0effdc4238b385 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Nicolas <6371790+pynicolas@users.noreply.github.com> Date: Mon, 25 Aug 2025 11:24:30 +0200 Subject: [PATCH] Rename root package to org.fairscan.app --- app/build.gradle.kts | 2 +- app/proguard-rules.pro | 2 +- .../app}/DocumentDetectionTest.kt | 11 +++++------ .../app}/CameraPermission.kt | 2 +- .../app}/DocumentDetection.kt | 2 +- .../myscan => fairscan/app}/Geometry.kt | 2 +- .../myscan => fairscan/app}/ImageRepository.kt | 2 +- .../app}/ImageSegmentation.kt | 2 +- .../app}/LiveAnalysisState.kt | 2 +- .../myscan => fairscan/app}/MainActivity.kt | 14 +++++++------- .../myscan => fairscan/app}/MainViewModel.kt | 10 +++++----- .../myscan => fairscan/app}/Navigation.kt | 2 +- .../myscan => fairscan/app}/PdfFileManager.kt | 2 +- .../myscan => fairscan/app}/PdfGeneration.kt | 2 +- .../myscan => fairscan/app}/PostProcessing.kt | 2 +- .../app}/data/RecentDocuments.kt | 4 ++-- .../myscan => fairscan/app}/ui/UiState.kt | 4 ++-- .../myscan => fairscan/app}/ui/theme/Color.kt | 2 +- .../myscan => fairscan/app}/ui/theme/Theme.kt | 2 +- .../myscan => fairscan/app}/ui/theme/Type.kt | 2 +- .../app}/view/AboutScreen.kt | 8 ++++---- .../myscan => fairscan/app}/view/Buttons.kt | 4 ++-- .../app}/view/CameraPreview.kt | 10 +++++----- .../app}/view/CameraScreen.kt | 18 +++++++++--------- .../app}/view/DocumentScreen.kt | 12 ++++++------ .../app}/view/DocumentUiModel.kt | 2 +- .../myscan => fairscan/app}/view/HomeScreen.kt | 14 +++++++------- .../app}/view/LibrariesScreen.kt | 4 ++-- .../myscan => fairscan/app}/view/PageList.kt | 2 +- .../app}/view/PdfGenerationBottomSheet.kt | 12 ++++++------ .../app}/view/PreviewUtils.kt | 4 ++-- .../myscan => fairscan/app}/view/Scaffold.kt | 2 +- .../myscan => fairscan/app}/view/Strings.kt | 4 ++-- app/src/main/proto/recent_documents.proto | 2 +- .../myscan => fairscan/app}/GeometryTest.kt | 2 +- .../app}/ImageRepositoryTest.kt | 2 +- .../myscan => fairscan/app}/NavigationTest.kt | 12 ++++++------ .../app}/PdfFileManagerTest.kt | 2 +- 38 files changed, 94 insertions(+), 95 deletions(-) rename app/src/androidTest/java/org/{mydomain/myscan => fairscan/app}/DocumentDetectionTest.kt (94%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/CameraPermission.kt (98%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/DocumentDetection.kt (99%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/Geometry.kt (99%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/ImageRepository.kt (98%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/ImageSegmentation.kt (99%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/LiveAnalysisState.kt (97%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/MainActivity.kt (96%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/MainViewModel.kt (98%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/Navigation.kt (98%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/PdfFileManager.kt (98%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/PdfGeneration.kt (98%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/PostProcessing.kt (99%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/data/RecentDocuments.kt (95%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/ui/UiState.kt (94%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/ui/theme/Color.kt (98%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/ui/theme/Theme.kt (98%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/ui/theme/Type.kt (97%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/view/AboutScreen.kt (97%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/view/Buttons.kt (98%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/view/CameraPreview.kt (97%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/view/CameraScreen.kt (97%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/view/DocumentScreen.kt (97%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/view/DocumentUiModel.kt (97%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/view/HomeScreen.kt (96%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/view/LibrariesScreen.kt (97%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/view/PageList.kt (99%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/view/PdfGenerationBottomSheet.kt (97%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/view/PreviewUtils.kt (93%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/view/Scaffold.kt (99%) rename app/src/main/java/org/{mydomain/myscan => fairscan/app}/view/Strings.kt (95%) rename app/src/test/java/org/{mydomain/myscan => fairscan/app}/GeometryTest.kt (98%) rename app/src/test/java/org/{mydomain/myscan => fairscan/app}/ImageRepositoryTest.kt (99%) rename app/src/test/java/org/{mydomain/myscan => fairscan/app}/NavigationTest.kt (90%) rename app/src/test/java/org/{mydomain/myscan => fairscan/app}/PdfFileManagerTest.kt (99%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a1519f7..54dc638 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } android { - namespace = "org.mydomain.myscan" + namespace = "org.fairscan.app" compileSdk = 35 sourceSets["main"].assets.srcDir(layout.buildDirectory.dir("generated/assets")) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 5b2294a..964612e 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -23,5 +23,5 @@ -dontwarn com.gemalto.jp2.JP2Decoder -dontwarn com.gemalto.jp2.JP2Encoder --keep class org.mydomain.myscan.RecentDocument* { *; } +-keep class org.fairscan.app.RecentDocument* { *; } -keepclassmembers class * extends com.google.protobuf.GeneratedMessageLite { *; } diff --git a/app/src/androidTest/java/org/mydomain/myscan/DocumentDetectionTest.kt b/app/src/androidTest/java/org/fairscan/app/DocumentDetectionTest.kt similarity index 94% rename from app/src/androidTest/java/org/mydomain/myscan/DocumentDetectionTest.kt rename to app/src/androidTest/java/org/fairscan/app/DocumentDetectionTest.kt index 3a5792b..6060474 100644 --- a/app/src/androidTest/java/org/mydomain/myscan/DocumentDetectionTest.kt +++ b/app/src/androidTest/java/org/fairscan/app/DocumentDetectionTest.kt @@ -12,21 +12,20 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -package org.mydomain.myscan +package org.fairscan.app import android.content.Context import android.graphics.Bitmap import android.graphics.BitmapFactory import android.util.Log import androidx.test.core.app.ApplicationProvider -import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry import kotlinx.coroutines.runBlocking - +import org.junit.Assert.assertEquals +import org.junit.Assert.fail import org.junit.Test import org.junit.runner.RunWith - -import org.junit.Assert.* import org.opencv.android.OpenCVLoader import java.io.File import java.io.FileOutputStream @@ -36,7 +35,7 @@ class DocumentDetectionTest { @Test fun extractDocumentFromImage() { val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("org.mydomain.myscan", appContext.packageName) + assertEquals("org.fairscan.app", appContext.packageName) val context = ApplicationProvider.getApplicationContext() val segmentationService = ImageSegmentationService(context) diff --git a/app/src/main/java/org/mydomain/myscan/CameraPermission.kt b/app/src/main/java/org/fairscan/app/CameraPermission.kt similarity index 98% rename from app/src/main/java/org/mydomain/myscan/CameraPermission.kt rename to app/src/main/java/org/fairscan/app/CameraPermission.kt index 4248a09..a1f41c9 100644 --- a/app/src/main/java/org/mydomain/myscan/CameraPermission.kt +++ b/app/src/main/java/org/fairscan/app/CameraPermission.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.mydomain.myscan +package org.fairscan.app import android.Manifest import android.content.Context diff --git a/app/src/main/java/org/mydomain/myscan/DocumentDetection.kt b/app/src/main/java/org/fairscan/app/DocumentDetection.kt similarity index 99% rename from app/src/main/java/org/mydomain/myscan/DocumentDetection.kt rename to app/src/main/java/org/fairscan/app/DocumentDetection.kt index fb9cdca..c16a506 100644 --- a/app/src/main/java/org/mydomain/myscan/DocumentDetection.kt +++ b/app/src/main/java/org/fairscan/app/DocumentDetection.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.mydomain.myscan +package org.fairscan.app import android.graphics.Bitmap import androidx.core.graphics.createBitmap diff --git a/app/src/main/java/org/mydomain/myscan/Geometry.kt b/app/src/main/java/org/fairscan/app/Geometry.kt similarity index 99% rename from app/src/main/java/org/mydomain/myscan/Geometry.kt rename to app/src/main/java/org/fairscan/app/Geometry.kt index e8767ee..ca9ba35 100644 --- a/app/src/main/java/org/mydomain/myscan/Geometry.kt +++ b/app/src/main/java/org/fairscan/app/Geometry.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.mydomain.myscan +package org.fairscan.app import kotlin.math.atan2 import kotlin.math.sqrt diff --git a/app/src/main/java/org/mydomain/myscan/ImageRepository.kt b/app/src/main/java/org/fairscan/app/ImageRepository.kt similarity index 98% rename from app/src/main/java/org/mydomain/myscan/ImageRepository.kt rename to app/src/main/java/org/fairscan/app/ImageRepository.kt index f2bfaf2..a871d4f 100644 --- a/app/src/main/java/org/mydomain/myscan/ImageRepository.kt +++ b/app/src/main/java/org/fairscan/app/ImageRepository.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.mydomain.myscan +package org.fairscan.app import java.io.File diff --git a/app/src/main/java/org/mydomain/myscan/ImageSegmentation.kt b/app/src/main/java/org/fairscan/app/ImageSegmentation.kt similarity index 99% rename from app/src/main/java/org/mydomain/myscan/ImageSegmentation.kt rename to app/src/main/java/org/fairscan/app/ImageSegmentation.kt index db4d361..38f5206 100644 --- a/app/src/main/java/org/mydomain/myscan/ImageSegmentation.kt +++ b/app/src/main/java/org/fairscan/app/ImageSegmentation.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.mydomain.myscan +package org.fairscan.app import android.content.Context import android.graphics.Bitmap diff --git a/app/src/main/java/org/mydomain/myscan/LiveAnalysisState.kt b/app/src/main/java/org/fairscan/app/LiveAnalysisState.kt similarity index 97% rename from app/src/main/java/org/mydomain/myscan/LiveAnalysisState.kt rename to app/src/main/java/org/fairscan/app/LiveAnalysisState.kt index 6f67a26..50b5686 100644 --- a/app/src/main/java/org/mydomain/myscan/LiveAnalysisState.kt +++ b/app/src/main/java/org/fairscan/app/LiveAnalysisState.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.mydomain.myscan +package org.fairscan.app import android.graphics.Bitmap import androidx.compose.runtime.Immutable diff --git a/app/src/main/java/org/mydomain/myscan/MainActivity.kt b/app/src/main/java/org/fairscan/app/MainActivity.kt similarity index 96% rename from app/src/main/java/org/mydomain/myscan/MainActivity.kt rename to app/src/main/java/org/fairscan/app/MainActivity.kt index eda5e69..38a3926 100644 --- a/app/src/main/java/org/mydomain/myscan/MainActivity.kt +++ b/app/src/main/java/org/fairscan/app/MainActivity.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.mydomain.myscan +package org.fairscan.app import android.content.ActivityNotFoundException import android.content.Intent @@ -37,12 +37,12 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.suspendCancellableCoroutine import kotlinx.coroutines.withContext -import org.mydomain.myscan.ui.theme.MyScanTheme -import org.mydomain.myscan.view.AboutScreen -import org.mydomain.myscan.view.CameraScreen -import org.mydomain.myscan.view.DocumentScreen -import org.mydomain.myscan.view.HomeScreen -import org.mydomain.myscan.view.LibrariesScreen +import org.fairscan.app.ui.theme.MyScanTheme +import org.fairscan.app.view.AboutScreen +import org.fairscan.app.view.CameraScreen +import org.fairscan.app.view.DocumentScreen +import org.fairscan.app.view.HomeScreen +import org.fairscan.app.view.LibrariesScreen import org.opencv.android.OpenCVLoader private const val PDF_MIME_TYPE = "application/pdf" diff --git a/app/src/main/java/org/mydomain/myscan/MainViewModel.kt b/app/src/main/java/org/fairscan/app/MainViewModel.kt similarity index 98% rename from app/src/main/java/org/mydomain/myscan/MainViewModel.kt rename to app/src/main/java/org/fairscan/app/MainViewModel.kt index 9768696..3666521 100644 --- a/app/src/main/java/org/mydomain/myscan/MainViewModel.kt +++ b/app/src/main/java/org/fairscan/app/MainViewModel.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.mydomain.myscan +package org.fairscan.app import android.content.Context import android.graphics.Bitmap @@ -38,10 +38,10 @@ import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import org.mydomain.myscan.data.recentDocumentsDataStore -import org.mydomain.myscan.ui.PdfGenerationUiState -import org.mydomain.myscan.ui.RecentDocumentUiState -import org.mydomain.myscan.view.DocumentUiModel +import org.fairscan.app.data.recentDocumentsDataStore +import org.fairscan.app.ui.PdfGenerationUiState +import org.fairscan.app.ui.RecentDocumentUiState +import org.fairscan.app.view.DocumentUiModel import java.io.ByteArrayOutputStream import java.io.File diff --git a/app/src/main/java/org/mydomain/myscan/Navigation.kt b/app/src/main/java/org/fairscan/app/Navigation.kt similarity index 98% rename from app/src/main/java/org/mydomain/myscan/Navigation.kt rename to app/src/main/java/org/fairscan/app/Navigation.kt index c5da89a..7ba5b13 100644 --- a/app/src/main/java/org/mydomain/myscan/Navigation.kt +++ b/app/src/main/java/org/fairscan/app/Navigation.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.mydomain.myscan +package org.fairscan.app sealed class Screen { sealed class Main : Screen() { diff --git a/app/src/main/java/org/mydomain/myscan/PdfFileManager.kt b/app/src/main/java/org/fairscan/app/PdfFileManager.kt similarity index 98% rename from app/src/main/java/org/mydomain/myscan/PdfFileManager.kt rename to app/src/main/java/org/fairscan/app/PdfFileManager.kt index 5793637..c167a24 100644 --- a/app/src/main/java/org/mydomain/myscan/PdfFileManager.kt +++ b/app/src/main/java/org/fairscan/app/PdfFileManager.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.mydomain.myscan +package org.fairscan.app import java.io.File import java.io.FileOutputStream diff --git a/app/src/main/java/org/mydomain/myscan/PdfGeneration.kt b/app/src/main/java/org/fairscan/app/PdfGeneration.kt similarity index 98% rename from app/src/main/java/org/mydomain/myscan/PdfGeneration.kt rename to app/src/main/java/org/fairscan/app/PdfGeneration.kt index a379eb4..683a1ed 100644 --- a/app/src/main/java/org/mydomain/myscan/PdfGeneration.kt +++ b/app/src/main/java/org/fairscan/app/PdfGeneration.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.mydomain.myscan +package org.fairscan.app import com.tom_roush.pdfbox.pdmodel.PDDocument import com.tom_roush.pdfbox.pdmodel.PDPage diff --git a/app/src/main/java/org/mydomain/myscan/PostProcessing.kt b/app/src/main/java/org/fairscan/app/PostProcessing.kt similarity index 99% rename from app/src/main/java/org/mydomain/myscan/PostProcessing.kt rename to app/src/main/java/org/fairscan/app/PostProcessing.kt index 13c85eb..e92cff3 100644 --- a/app/src/main/java/org/mydomain/myscan/PostProcessing.kt +++ b/app/src/main/java/org/fairscan/app/PostProcessing.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.mydomain.myscan +package org.fairscan.app import android.util.Log import org.opencv.core.Core diff --git a/app/src/main/java/org/mydomain/myscan/data/RecentDocuments.kt b/app/src/main/java/org/fairscan/app/data/RecentDocuments.kt similarity index 95% rename from app/src/main/java/org/mydomain/myscan/data/RecentDocuments.kt rename to app/src/main/java/org/fairscan/app/data/RecentDocuments.kt index 374e2fa..648c314 100644 --- a/app/src/main/java/org/mydomain/myscan/data/RecentDocuments.kt +++ b/app/src/main/java/org/fairscan/app/data/RecentDocuments.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.mydomain.myscan.data +package org.fairscan.app.data import android.content.Context import androidx.datastore.core.CorruptionException @@ -20,7 +20,7 @@ import androidx.datastore.core.DataStore import androidx.datastore.core.Serializer import androidx.datastore.dataStore import com.google.protobuf.InvalidProtocolBufferException -import org.mydomain.myscan.RecentDocuments +import org.fairscan.app.RecentDocuments import java.io.InputStream import java.io.OutputStream diff --git a/app/src/main/java/org/mydomain/myscan/ui/UiState.kt b/app/src/main/java/org/fairscan/app/ui/UiState.kt similarity index 94% rename from app/src/main/java/org/mydomain/myscan/ui/UiState.kt rename to app/src/main/java/org/fairscan/app/ui/UiState.kt index 2b24d14..520832a 100644 --- a/app/src/main/java/org/mydomain/myscan/ui/UiState.kt +++ b/app/src/main/java/org/fairscan/app/ui/UiState.kt @@ -12,10 +12,10 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -package org.mydomain.myscan.ui +package org.fairscan.app.ui import android.net.Uri -import org.mydomain.myscan.GeneratedPdf +import org.fairscan.app.GeneratedPdf import java.io.File data class PdfGenerationUiState( diff --git a/app/src/main/java/org/mydomain/myscan/ui/theme/Color.kt b/app/src/main/java/org/fairscan/app/ui/theme/Color.kt similarity index 98% rename from app/src/main/java/org/mydomain/myscan/ui/theme/Color.kt rename to app/src/main/java/org/fairscan/app/ui/theme/Color.kt index bdc0de7..2ff51f9 100644 --- a/app/src/main/java/org/mydomain/myscan/ui/theme/Color.kt +++ b/app/src/main/java/org/fairscan/app/ui/theme/Color.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.mydomain.myscan.ui.theme +package org.fairscan.app.ui.theme import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/org/mydomain/myscan/ui/theme/Theme.kt b/app/src/main/java/org/fairscan/app/ui/theme/Theme.kt similarity index 98% rename from app/src/main/java/org/mydomain/myscan/ui/theme/Theme.kt rename to app/src/main/java/org/fairscan/app/ui/theme/Theme.kt index ff83002..7dc162e 100644 --- a/app/src/main/java/org/mydomain/myscan/ui/theme/Theme.kt +++ b/app/src/main/java/org/fairscan/app/ui/theme/Theme.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.mydomain.myscan.ui.theme +package org.fairscan.app.ui.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme diff --git a/app/src/main/java/org/mydomain/myscan/ui/theme/Type.kt b/app/src/main/java/org/fairscan/app/ui/theme/Type.kt similarity index 97% rename from app/src/main/java/org/mydomain/myscan/ui/theme/Type.kt rename to app/src/main/java/org/fairscan/app/ui/theme/Type.kt index 8a6e023..6869381 100644 --- a/app/src/main/java/org/mydomain/myscan/ui/theme/Type.kt +++ b/app/src/main/java/org/fairscan/app/ui/theme/Type.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.mydomain.myscan.ui.theme +package org.fairscan.app.ui.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle diff --git a/app/src/main/java/org/mydomain/myscan/view/AboutScreen.kt b/app/src/main/java/org/fairscan/app/view/AboutScreen.kt similarity index 97% rename from app/src/main/java/org/mydomain/myscan/view/AboutScreen.kt rename to app/src/main/java/org/fairscan/app/view/AboutScreen.kt index df78fa2..c45fea2 100644 --- a/app/src/main/java/org/mydomain/myscan/view/AboutScreen.kt +++ b/app/src/main/java/org/fairscan/app/view/AboutScreen.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.mydomain.myscan.view +package org.fairscan.app.view import androidx.activity.compose.BackHandler import androidx.compose.foundation.clickable @@ -52,9 +52,9 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.mydomain.myscan.BuildConfig -import org.mydomain.myscan.R -import org.mydomain.myscan.ui.theme.MyScanTheme +import org.fairscan.app.BuildConfig +import org.fairscan.app.R +import org.fairscan.app.ui.theme.MyScanTheme @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/org/mydomain/myscan/view/Buttons.kt b/app/src/main/java/org/fairscan/app/view/Buttons.kt similarity index 98% rename from app/src/main/java/org/mydomain/myscan/view/Buttons.kt rename to app/src/main/java/org/fairscan/app/view/Buttons.kt index c077489..8ceec7b 100644 --- a/app/src/main/java/org/mydomain/myscan/view/Buttons.kt +++ b/app/src/main/java/org/fairscan/app/view/Buttons.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.mydomain.myscan.view +package org.fairscan.app.view import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.size @@ -32,7 +32,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import org.mydomain.myscan.R +import org.fairscan.app.R @Composable fun MainActionButton( diff --git a/app/src/main/java/org/mydomain/myscan/view/CameraPreview.kt b/app/src/main/java/org/fairscan/app/view/CameraPreview.kt similarity index 97% rename from app/src/main/java/org/mydomain/myscan/view/CameraPreview.kt rename to app/src/main/java/org/fairscan/app/view/CameraPreview.kt index fc93fef..96b6e3f 100644 --- a/app/src/main/java/org/mydomain/myscan/view/CameraPreview.kt +++ b/app/src/main/java/org/fairscan/app/view/CameraPreview.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.mydomain.myscan.view +package org.fairscan.app.view import android.graphics.Bitmap import android.util.Log @@ -52,10 +52,10 @@ import androidx.core.graphics.scale import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.compose.LocalLifecycleOwner import com.google.common.util.concurrent.ListenableFuture -import org.mydomain.myscan.CameraPermissionState -import org.mydomain.myscan.LiveAnalysisState -import org.mydomain.myscan.Point -import org.mydomain.myscan.scaledTo +import org.fairscan.app.CameraPermissionState +import org.fairscan.app.LiveAnalysisState +import org.fairscan.app.Point +import org.fairscan.app.scaledTo import java.util.concurrent.ExecutorService import java.util.concurrent.Executors diff --git a/app/src/main/java/org/mydomain/myscan/view/CameraScreen.kt b/app/src/main/java/org/fairscan/app/view/CameraScreen.kt similarity index 97% rename from app/src/main/java/org/mydomain/myscan/view/CameraScreen.kt rename to app/src/main/java/org/fairscan/app/view/CameraScreen.kt index 4e3c60a..a2fddc7 100644 --- a/app/src/main/java/org/mydomain/myscan/view/CameraScreen.kt +++ b/app/src/main/java/org/fairscan/app/view/CameraScreen.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.mydomain.myscan.view +package org.fairscan.app.view import android.content.res.Configuration import android.graphics.Bitmap @@ -75,14 +75,14 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.lifecycle.compose.collectAsStateWithLifecycle import kotlinx.coroutines.delay -import org.mydomain.myscan.CameraPermissionState -import org.mydomain.myscan.LiveAnalysisState -import org.mydomain.myscan.MainViewModel -import org.mydomain.myscan.MainViewModel.CaptureState -import org.mydomain.myscan.Navigation -import org.mydomain.myscan.R -import org.mydomain.myscan.Screen -import org.mydomain.myscan.ui.theme.MyScanTheme +import org.fairscan.app.CameraPermissionState +import org.fairscan.app.LiveAnalysisState +import org.fairscan.app.MainViewModel +import org.fairscan.app.MainViewModel.CaptureState +import org.fairscan.app.Navigation +import org.fairscan.app.R +import org.fairscan.app.Screen +import org.fairscan.app.ui.theme.MyScanTheme data class CameraUiState( val pageCount: Int, diff --git a/app/src/main/java/org/mydomain/myscan/view/DocumentScreen.kt b/app/src/main/java/org/fairscan/app/view/DocumentScreen.kt similarity index 97% rename from app/src/main/java/org/mydomain/myscan/view/DocumentScreen.kt rename to app/src/main/java/org/fairscan/app/view/DocumentScreen.kt index 20ae803..a169ccc 100644 --- a/app/src/main/java/org/mydomain/myscan/view/DocumentScreen.kt +++ b/app/src/main/java/org/fairscan/app/view/DocumentScreen.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.mydomain.myscan.view +package org.fairscan.app.view import androidx.activity.compose.BackHandler import androidx.compose.foundation.Image @@ -57,11 +57,11 @@ import androidx.compose.ui.unit.dp import kotlinx.coroutines.flow.MutableStateFlow import net.engawapg.lib.zoomable.rememberZoomState import net.engawapg.lib.zoomable.zoomable -import org.mydomain.myscan.Navigation -import org.mydomain.myscan.PdfGenerationActions -import org.mydomain.myscan.R -import org.mydomain.myscan.ui.PdfGenerationUiState -import org.mydomain.myscan.ui.theme.MyScanTheme +import org.fairscan.app.Navigation +import org.fairscan.app.PdfGenerationActions +import org.fairscan.app.R +import org.fairscan.app.ui.PdfGenerationUiState +import org.fairscan.app.ui.theme.MyScanTheme @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/org/mydomain/myscan/view/DocumentUiModel.kt b/app/src/main/java/org/fairscan/app/view/DocumentUiModel.kt similarity index 97% rename from app/src/main/java/org/mydomain/myscan/view/DocumentUiModel.kt rename to app/src/main/java/org/fairscan/app/view/DocumentUiModel.kt index 42a241f..357008e 100644 --- a/app/src/main/java/org/mydomain/myscan/view/DocumentUiModel.kt +++ b/app/src/main/java/org/fairscan/app/view/DocumentUiModel.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.mydomain.myscan.view +package org.fairscan.app.view import android.graphics.Bitmap diff --git a/app/src/main/java/org/mydomain/myscan/view/HomeScreen.kt b/app/src/main/java/org/fairscan/app/view/HomeScreen.kt similarity index 96% rename from app/src/main/java/org/mydomain/myscan/view/HomeScreen.kt rename to app/src/main/java/org/fairscan/app/view/HomeScreen.kt index c7a7aa6..1191432 100644 --- a/app/src/main/java/org/mydomain/myscan/view/HomeScreen.kt +++ b/app/src/main/java/org/fairscan/app/view/HomeScreen.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.mydomain.myscan.view +package org.fairscan.app.view import androidx.compose.foundation.Image import androidx.compose.foundation.clickable @@ -50,12 +50,12 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import org.mydomain.myscan.CameraPermissionState -import org.mydomain.myscan.Navigation -import org.mydomain.myscan.R -import org.mydomain.myscan.rememberCameraPermissionState -import org.mydomain.myscan.ui.RecentDocumentUiState -import org.mydomain.myscan.ui.theme.MyScanTheme +import org.fairscan.app.CameraPermissionState +import org.fairscan.app.Navigation +import org.fairscan.app.R +import org.fairscan.app.rememberCameraPermissionState +import org.fairscan.app.ui.RecentDocumentUiState +import org.fairscan.app.ui.theme.MyScanTheme import java.io.File import kotlin.math.min diff --git a/app/src/main/java/org/mydomain/myscan/view/LibrariesScreen.kt b/app/src/main/java/org/fairscan/app/view/LibrariesScreen.kt similarity index 97% rename from app/src/main/java/org/mydomain/myscan/view/LibrariesScreen.kt rename to app/src/main/java/org/fairscan/app/view/LibrariesScreen.kt index 699e6fc..a40f8d2 100644 --- a/app/src/main/java/org/mydomain/myscan/view/LibrariesScreen.kt +++ b/app/src/main/java/org/fairscan/app/view/LibrariesScreen.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.mydomain.myscan.view +package org.fairscan.app.view import androidx.activity.compose.BackHandler import androidx.compose.foundation.layout.fillMaxSize @@ -30,7 +30,7 @@ import androidx.compose.ui.res.stringResource import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults import com.mikepenz.aboutlibraries.ui.compose.android.rememberLibraries import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer -import org.mydomain.myscan.R +import org.fairscan.app.R @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/app/src/main/java/org/mydomain/myscan/view/PageList.kt b/app/src/main/java/org/fairscan/app/view/PageList.kt similarity index 99% rename from app/src/main/java/org/mydomain/myscan/view/PageList.kt rename to app/src/main/java/org/fairscan/app/view/PageList.kt index 0220266..4aa73f9 100644 --- a/app/src/main/java/org/mydomain/myscan/view/PageList.kt +++ b/app/src/main/java/org/fairscan/app/view/PageList.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.mydomain.myscan.view +package org.fairscan.app.view import android.content.res.Configuration import android.graphics.Bitmap diff --git a/app/src/main/java/org/mydomain/myscan/view/PdfGenerationBottomSheet.kt b/app/src/main/java/org/fairscan/app/view/PdfGenerationBottomSheet.kt similarity index 97% rename from app/src/main/java/org/mydomain/myscan/view/PdfGenerationBottomSheet.kt rename to app/src/main/java/org/fairscan/app/view/PdfGenerationBottomSheet.kt index 8af42bf..b0a4d3d 100644 --- a/app/src/main/java/org/mydomain/myscan/view/PdfGenerationBottomSheet.kt +++ b/app/src/main/java/org/fairscan/app/view/PdfGenerationBottomSheet.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.mydomain.myscan.view +package org.fairscan.app.view import android.content.Context import android.text.format.Formatter @@ -56,11 +56,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.core.net.toUri -import org.mydomain.myscan.GeneratedPdf -import org.mydomain.myscan.PdfGenerationActions -import org.mydomain.myscan.R -import org.mydomain.myscan.ui.PdfGenerationUiState -import org.mydomain.myscan.ui.theme.MyScanTheme +import org.fairscan.app.GeneratedPdf +import org.fairscan.app.PdfGenerationActions +import org.fairscan.app.R +import org.fairscan.app.ui.PdfGenerationUiState +import org.fairscan.app.ui.theme.MyScanTheme import java.io.File import java.text.SimpleDateFormat import java.util.Date diff --git a/app/src/main/java/org/mydomain/myscan/view/PreviewUtils.kt b/app/src/main/java/org/fairscan/app/view/PreviewUtils.kt similarity index 93% rename from app/src/main/java/org/mydomain/myscan/view/PreviewUtils.kt rename to app/src/main/java/org/fairscan/app/view/PreviewUtils.kt index 3f34b26..6ccfa1b 100644 --- a/app/src/main/java/org/mydomain/myscan/view/PreviewUtils.kt +++ b/app/src/main/java/org/fairscan/app/view/PreviewUtils.kt @@ -12,11 +12,11 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -package org.mydomain.myscan.view +package org.fairscan.app.view import android.content.Context import android.graphics.BitmapFactory -import org.mydomain.myscan.Navigation +import org.fairscan.app.Navigation fun dummyNavigation(): Navigation { return Navigation({}, {}, {}, {}, {}, {}) diff --git a/app/src/main/java/org/mydomain/myscan/view/Scaffold.kt b/app/src/main/java/org/fairscan/app/view/Scaffold.kt similarity index 99% rename from app/src/main/java/org/mydomain/myscan/view/Scaffold.kt rename to app/src/main/java/org/fairscan/app/view/Scaffold.kt index 48e0e69..6d3f9fa 100644 --- a/app/src/main/java/org/mydomain/myscan/view/Scaffold.kt +++ b/app/src/main/java/org/fairscan/app/view/Scaffold.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.mydomain.myscan.view +package org.fairscan.app.view import android.content.res.Configuration import androidx.compose.foundation.background diff --git a/app/src/main/java/org/mydomain/myscan/view/Strings.kt b/app/src/main/java/org/fairscan/app/view/Strings.kt similarity index 95% rename from app/src/main/java/org/mydomain/myscan/view/Strings.kt rename to app/src/main/java/org/fairscan/app/view/Strings.kt index 2a2f288..e39a17f 100644 --- a/app/src/main/java/org/mydomain/myscan/view/Strings.kt +++ b/app/src/main/java/org/fairscan/app/view/Strings.kt @@ -12,13 +12,13 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -package org.mydomain.myscan.view +package org.fairscan.app.view import android.content.Context import android.text.format.DateFormat import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext -import org.mydomain.myscan.R +import org.fairscan.app.R import java.util.Date @Composable diff --git a/app/src/main/proto/recent_documents.proto b/app/src/main/proto/recent_documents.proto index 51a20d6..8d4fcdb 100644 --- a/app/src/main/proto/recent_documents.proto +++ b/app/src/main/proto/recent_documents.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option java_package = "org.mydomain.myscan"; +option java_package = "org.fairscan.app"; option java_multiple_files = true; message RecentDocument { diff --git a/app/src/test/java/org/mydomain/myscan/GeometryTest.kt b/app/src/test/java/org/fairscan/app/GeometryTest.kt similarity index 98% rename from app/src/test/java/org/mydomain/myscan/GeometryTest.kt rename to app/src/test/java/org/fairscan/app/GeometryTest.kt index 08bc791..1242e42 100644 --- a/app/src/test/java/org/mydomain/myscan/GeometryTest.kt +++ b/app/src/test/java/org/fairscan/app/GeometryTest.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.mydomain.myscan +package org.fairscan.app import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThatThrownBy diff --git a/app/src/test/java/org/mydomain/myscan/ImageRepositoryTest.kt b/app/src/test/java/org/fairscan/app/ImageRepositoryTest.kt similarity index 99% rename from app/src/test/java/org/mydomain/myscan/ImageRepositoryTest.kt rename to app/src/test/java/org/fairscan/app/ImageRepositoryTest.kt index 0540d52..4ad1bc7 100644 --- a/app/src/test/java/org/mydomain/myscan/ImageRepositoryTest.kt +++ b/app/src/test/java/org/fairscan/app/ImageRepositoryTest.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.mydomain.myscan +package org.fairscan.app import org.assertj.core.api.Assertions.assertThat import org.junit.Rule diff --git a/app/src/test/java/org/mydomain/myscan/NavigationTest.kt b/app/src/test/java/org/fairscan/app/NavigationTest.kt similarity index 90% rename from app/src/test/java/org/mydomain/myscan/NavigationTest.kt rename to app/src/test/java/org/fairscan/app/NavigationTest.kt index 6b13453..8c546fc 100644 --- a/app/src/test/java/org/mydomain/myscan/NavigationTest.kt +++ b/app/src/test/java/org/fairscan/app/NavigationTest.kt @@ -12,15 +12,15 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -package org.mydomain.myscan +package org.fairscan.app import org.assertj.core.api.Assertions.assertThat +import org.fairscan.app.Screen.Main.Camera +import org.fairscan.app.Screen.Main.Document +import org.fairscan.app.Screen.Main.Home +import org.fairscan.app.Screen.Overlay.About +import org.fairscan.app.Screen.Overlay.Libraries import org.junit.Test -import org.mydomain.myscan.Screen.Main.Camera -import org.mydomain.myscan.Screen.Main.Document -import org.mydomain.myscan.Screen.Main.Home -import org.mydomain.myscan.Screen.Overlay.About -import org.mydomain.myscan.Screen.Overlay.Libraries class NavigationTest { diff --git a/app/src/test/java/org/mydomain/myscan/PdfFileManagerTest.kt b/app/src/test/java/org/fairscan/app/PdfFileManagerTest.kt similarity index 99% rename from app/src/test/java/org/mydomain/myscan/PdfFileManagerTest.kt rename to app/src/test/java/org/fairscan/app/PdfFileManagerTest.kt index 882d851..6e978f9 100644 --- a/app/src/test/java/org/mydomain/myscan/PdfFileManagerTest.kt +++ b/app/src/test/java/org/fairscan/app/PdfFileManagerTest.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.mydomain.myscan +package org.fairscan.app import org.assertj.core.api.Assertions.assertThat import org.junit.Test