Rename root package to org.fairscan.app

pynicolas · pynicolas · commit 2eec4fe7ca06 · 2025-08-25T11:40:34.000+02:00
diff --git 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
@@ -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/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-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<Context>()
         val segmentationService = ImageSegmentationService(context)
diff --git a/app/src/main/java/org/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-package org.mydomain.myscan
+package org.fairscan.app
 
 import android.Manifest
 import android.content.Context
diff --git a/app/src/main/java/org/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-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/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-package org.mydomain.myscan
+package org.fairscan.app
 
 import kotlin.math.atan2
 import kotlin.math.sqrt
diff --git a/app/src/main/java/org/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-package org.mydomain.myscan
+package org.fairscan.app
 
 import java.io.File
 
diff --git a/app/src/main/java/org/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-package org.mydomain.myscan
+package org.fairscan.app
 
 import android.content.Context
 import android.graphics.Bitmap
diff --git a/app/src/main/java/org/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-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/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-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/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-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/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-package org.mydomain.myscan
+package org.fairscan.app
 
 sealed class Screen {
     sealed class Main : Screen() {
diff --git a/app/src/main/java/org/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-package org.mydomain.myscan
+package org.fairscan.app
 
 import java.io.File
 import java.io.FileOutputStream
diff --git a/app/src/main/java/org/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-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/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-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/fairscan/app/data/RecentDocuments.kt b/app/src/main/java/org/fairscan/app/data/RecentDocuments.kt
@@ -12,15 +12,15 @@
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <https://www.gnu.org/licenses/>.
  */
-package org.mydomain.myscan.data
+package org.fairscan.app.data
 
 import android.content.Context
 import androidx.datastore.core.CorruptionException
 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/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-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/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-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/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-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/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-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/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-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/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-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/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-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/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-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/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-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/fairscan/app/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 <https://www.gnu.org/licenses/>.
  */
-package org.mydomain.myscan.view
+package org.fairscan.app.view
 
 import android.graphics.Bitmap
 
diff --git a/app/src/main/java/org/fairscan/app/view/HomeScreen.kt b/app/src/main/java/org/fairscan/app/view/HomeScreen.kt
diff --git a/app/src/main/java/org/fairscan/app/view/LibrariesScreen.kt b/app/src/main/java/org/fairscan/app/view/LibrariesScreen.kt
diff --git a/app/src/main/java/org/fairscan/app/view/PageList.kt b/app/src/main/java/org/fairscan/app/view/PageList.kt
diff --git a/app/src/main/java/org/fairscan/app/view/PdfGenerationBottomSheet.kt b/app/src/main/java/org/fairscan/app/view/PdfGenerationBottomSheet.kt
diff --git a/app/src/main/java/org/fairscan/app/view/PreviewUtils.kt b/app/src/main/java/org/fairscan/app/view/PreviewUtils.kt
diff --git a/app/src/main/java/org/fairscan/app/view/Scaffold.kt b/app/src/main/java/org/fairscan/app/view/Scaffold.kt
diff --git a/app/src/main/java/org/fairscan/app/view/Strings.kt b/app/src/main/java/org/fairscan/app/view/Strings.kt
diff --git a/app/src/main/proto/recent_documents.proto b/app/src/main/proto/recent_documents.proto
diff --git a/app/src/test/java/org/fairscan/app/GeometryTest.kt b/app/src/test/java/org/fairscan/app/GeometryTest.kt
diff --git a/app/src/test/java/org/fairscan/app/ImageRepositoryTest.kt b/app/src/test/java/org/fairscan/app/ImageRepositoryTest.kt
diff --git a/app/src/test/java/org/fairscan/app/NavigationTest.kt b/app/src/test/java/org/fairscan/app/NavigationTest.kt
diff --git a/app/src/test/java/org/fairscan/app/PdfFileManagerTest.kt b/app/src/test/java/org/fairscan/app/PdfFileManagerTest.kt

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ plugins {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`android {`
`10`		`- namespace = "org.mydomain.myscan"`
	`10`	`+ namespace = "org.fairscan.app"`
`11`	`11`	`compileSdk = 35`
`12`	`12`	`sourceSets["main"].assets.srcDir(layout.buildDirectory.dir("generated/assets"))`
`13`	`13`