Chrisimx · Chrisimx · Apr 3, 2026
diff --git a/README.MD.other b/README.MD.other
@@ -0,0 +1,19 @@
+# ScanBridge
+
+### Android
+To run the application on android device/emulator:  
+ - open project in Android Studio and run imported android run configuration  
+
+To build the application bundle:  
+ - run `./gradlew :androidApp:assembleDebug`  
+ - find `.apk` file in `androidApp/build/outputs/apk/debug/androidApp-debug.apk`  
+
+### Desktop
+Run the desktop application: `./gradlew :desktopApp:run`  
+Run the desktop **hot reload** application: `./gradlew :desktopApp:hotRun --auto`  
+
+### iOS
+To run the application on iPhone device/simulator:  
+ - Open `iosApp/iosApp.xcproject` in Xcode and run standard configuration  
+ - Or use [Kotlin Multiplatform Mobile plugin](https://plugins.jetbrains.com/plugin/14936-kotlin-multiplatform-mobile) for Android Studio  
+
diff --git a/README.md b/README.md
@@ -4,15 +4,15 @@
 
 <p align="center" style="text-align: center;">
 <a href='https://f-droid.org/packages/io.github.chrisimx.scanbridge/' target="_blank">
-    <img src="assets/get-it-on-fdroid.svg"
+    <img src="androidApp/assets/get-it-on-fdroid.svg"
          align="center"         
          alt="Get it on F-Droid"
          style="height: 50px"
          height="50">
 </a>
 
 <a href='https://play.google.com/store/apps/details?id=io.github.chrisimx.scanbridge.play' target="_blank">
-  <img src='assets/GetItOnGooglePlay_Badge_Web_color_English.svg'
+  <img src='androidApp/assets/GetItOnGooglePlay_Badge_Web_color_English.svg'
        align="center"
        alt='Get it on Google Play'
        style="height: 50px"
@@ -31,9 +31,9 @@ scanners.
 It is written in Kotlin and uses Jetpack Compose.
 
 <div style="display: flex; flex-wrap: wrap; gap: 10px;">
-  <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/01-scannedPageScreen_1773391873581.png" alt="Discover scanners in your network" style="width: 30%; height: auto;" />
-  <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/02-scanSettings_1773391870896.png" alt="Scan multiple pages" style="width: 30%; height: auto;" />
-  <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/03-discoveryScreen_1773391871298.png" alt="Use your scanner to the maximum of its abilities" style="width: 30%; height: auto;" />
+  <img src="androidApp/fastlane/metadata/android/en-US/images/phoneScreenshots/01-scannedPageScreen_1773391873581.png" alt="Discover scanners in your network" style="width: 30%; height: auto;" />
+  <img src="androidApp/fastlane/metadata/android/en-US/images/phoneScreenshots/02-scanSettings_1773391870896.png" alt="Scan multiple pages" style="width: 30%; height: auto;" />
+  <img src="androidApp/fastlane/metadata/android/en-US/images/phoneScreenshots/03-discoveryScreen_1773391871298.png" alt="Use your scanner to the maximum of its abilities" style="width: 30%; height: auto;" />
 </div>
 
 ## Features
@@ -104,7 +104,7 @@ If you want to chat with me or other users, you can join the Matrix room
 ## Contributions
 
 Contributions are welcome, and it would be amazing if you want to help. Refer to
-the [Contribution Guidelines](CONTRIBUTING.md) for more information.
+the [Contribution Guidelines](androidApp/CONTRIBUTING.md) for more information.
 
 ## License
 

diff --git a/app/.gitignore → androidApp/.gitignore b/app/.gitignore → androidApp/.gitignore
diff --git a/CHANGELOG.md → androidApp/CHANGELOG.md b/CHANGELOG.md → androidApp/CHANGELOG.md
diff --git a/CONTRIBUTING.md → androidApp/CONTRIBUTING.md b/CONTRIBUTING.md → androidApp/CONTRIBUTING.md
diff --git a/COPYING → androidApp/COPYING b/COPYING → androidApp/COPYING
diff --git a/Gemfile → androidApp/Gemfile b/Gemfile → androidApp/Gemfile
diff --git a/Gemfile.lock → androidApp/Gemfile.lock b/Gemfile.lock → androidApp/Gemfile.lock
diff --git a/adb+.sh → androidApp/adb+.sh b/adb+.sh → androidApp/adb+.sh
diff --git a/...tOnGooglePlay_Badge_Web_color_English.svg → ...tOnGooglePlay_Badge_Web_color_English.svg b/...tOnGooglePlay_Badge_Web_color_English.svg → ...tOnGooglePlay_Badge_Web_color_English.svg
diff --git a/assets/get-it-on-fdroid.svg → androidApp/assets/get-it-on-fdroid.svg b/assets/get-it-on-fdroid.svg → androidApp/assets/get-it-on-fdroid.svg
diff --git a/assets/icon.svg → androidApp/assets/icon.svg b/assets/icon.svg → androidApp/assets/icon.svg
diff --git a/app/build.gradle.kts → androidApp/build.gradle.kts b/app/build.gradle.kts → androidApp/build.gradle.kts
@@ -18,26 +18,10 @@ plugins {
     id("app.cash.paraphrase") version "0.4.1"
 }
 
-fun getGitCommitHash(): String {
-    return try {
-        val command = "git rev-parse --short HEAD"
-        val process = ProcessBuilder()
-            .command(command.split(" "))
-            .directory(rootProject.projectDir)
-            .redirectError(ProcessBuilder.Redirect.INHERIT)
-            .start()
-        val wait = process.waitFor(60, TimeUnit.SECONDS)
-        if (!wait) {
-            return "unknown"
-        }
-
-        val result = process.inputStream.bufferedReader().readText()
-
-        result.trim()
-    } catch (_: Exception) {
-        "unknown" // Fallback
-    }
-}
+val gitHashProvider = providers.exec {
+    commandLine("git", "rev-parse", "--short", "HEAD")
+    isIgnoreExitValue = true
+}.standardOutput.asText.map { it.trim() }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
     compilerOptions {
@@ -76,10 +60,10 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
-            buildConfigField("String", "GIT_COMMIT_HASH", "\"${getGitCommitHash()}\"")
+            buildConfigField("String", "GIT_COMMIT_HASH", "\"${gitHashProvider.get()}\"")
         }
         debug {
-            buildConfigField("String", "GIT_COMMIT_HASH", "\"${getGitCommitHash()}\"")
+            buildConfigField("String", "GIT_COMMIT_HASH", "\"${gitHashProvider.get()}\"")
         }
     }
     flavorDimensions += "edition"

diff --git a/fastlane/Appfile → androidApp/fastlane/Appfile b/fastlane/Appfile → androidApp/fastlane/Appfile
diff --git a/fastlane/Fastfile → androidApp/fastlane/Fastfile b/fastlane/Fastfile → androidApp/fastlane/Fastfile
diff --git a/fastlane/README.md → androidApp/fastlane/README.md b/fastlane/README.md → androidApp/fastlane/README.md
diff --git a/fastlane/Screengrabfile → androidApp/fastlane/Screengrabfile b/fastlane/Screengrabfile → androidApp/fastlane/Screengrabfile
diff --git a/...data/android/de-DE/changelogs/1000000.txt → ...data/android/de-DE/changelogs/1000000.txt b/...data/android/de-DE/changelogs/1000000.txt → ...data/android/de-DE/changelogs/1000000.txt
diff --git a/...data/android/de-DE/changelogs/1000001.txt → ...data/android/de-DE/changelogs/1000001.txt b/...data/android/de-DE/changelogs/1000001.txt → ...data/android/de-DE/changelogs/1000001.txt
diff --git a/...data/android/de-DE/changelogs/1001000.txt → ...data/android/de-DE/changelogs/1001000.txt b/...data/android/de-DE/changelogs/1001000.txt → ...data/android/de-DE/changelogs/1001000.txt
diff --git a/...data/android/de-DE/changelogs/1002000.txt → ...data/android/de-DE/changelogs/1002000.txt b/...data/android/de-DE/changelogs/1002000.txt → ...data/android/de-DE/changelogs/1002000.txt
diff --git a/...data/android/de-DE/changelogs/1003000.txt → ...data/android/de-DE/changelogs/1003000.txt b/...data/android/de-DE/changelogs/1003000.txt → ...data/android/de-DE/changelogs/1003000.txt
diff --git a/...data/android/de-DE/changelogs/1004000.txt → ...data/android/de-DE/changelogs/1004000.txt b/...data/android/de-DE/changelogs/1004000.txt → ...data/android/de-DE/changelogs/1004000.txt
diff --git a/...data/android/de-DE/changelogs/1005000.txt → ...data/android/de-DE/changelogs/1005000.txt b/...data/android/de-DE/changelogs/1005000.txt → ...data/android/de-DE/changelogs/1005000.txt
diff --git a/...data/android/de-DE/changelogs/1006001.txt → ...data/android/de-DE/changelogs/1006001.txt b/...data/android/de-DE/changelogs/1006001.txt → ...data/android/de-DE/changelogs/1006001.txt
diff --git a/...data/android/de-DE/changelogs/1006002.txt → ...data/android/de-DE/changelogs/1006002.txt b/...data/android/de-DE/changelogs/1006002.txt → ...data/android/de-DE/changelogs/1006002.txt
diff --git a/...data/android/de-DE/changelogs/2000000.txt → ...data/android/de-DE/changelogs/2000000.txt b/...data/android/de-DE/changelogs/2000000.txt → ...data/android/de-DE/changelogs/2000000.txt
diff --git a/...data/android/de-DE/changelogs/2000001.txt → ...data/android/de-DE/changelogs/2000001.txt b/...data/android/de-DE/changelogs/2000001.txt → ...data/android/de-DE/changelogs/2000001.txt
diff --git a/...data/android/de-DE/changelogs/2001002.txt → ...data/android/de-DE/changelogs/2001002.txt b/...data/android/de-DE/changelogs/2001002.txt → ...data/android/de-DE/changelogs/2001002.txt
diff --git a/...data/android/de-DE/changelogs/2001003.txt → ...data/android/de-DE/changelogs/2001003.txt b/...data/android/de-DE/changelogs/2001003.txt → ...data/android/de-DE/changelogs/2001003.txt
diff --git a/...data/android/de-DE/changelogs/2001004.txt → ...data/android/de-DE/changelogs/2001004.txt b/...data/android/de-DE/changelogs/2001004.txt → ...data/android/de-DE/changelogs/2001004.txt
diff --git a/...tadata/android/de-DE/full_description.txt → ...tadata/android/de-DE/full_description.txt b/...tadata/android/de-DE/full_description.txt → ...tadata/android/de-DE/full_description.txt
diff --git a/...ts/01-scannedPageScreen_1773391883115.png → ...ts/01-scannedPageScreen_1773391883115.png b/...ts/01-scannedPageScreen_1773391883115.png → ...ts/01-scannedPageScreen_1773391883115.png
diff --git a/...enshots/02-scanSettings_1773391879801.png → ...enshots/02-scanSettings_1773391879801.png b/...enshots/02-scanSettings_1773391879801.png → ...enshots/02-scanSettings_1773391879801.png
diff --git a/...hots/03-discoveryScreen_1773391880499.png → ...hots/03-discoveryScreen_1773391880499.png b/...hots/03-discoveryScreen_1773391880499.png → ...hots/03-discoveryScreen_1773391880499.png
diff --git a/...hots/04-emptyScanScreen_1773391882198.png → ...hots/04-emptyScanScreen_1773391882198.png b/...hots/04-emptyScanScreen_1773391882198.png → ...hots/04-emptyScanScreen_1773391882198.png
diff --git a/...shots/05-settingsScreen_1773391884031.png → ...shots/05-settingsScreen_1773391884031.png b/...shots/05-settingsScreen_1773391884031.png → ...shots/05-settingsScreen_1773391884031.png
diff --git a/...ts/01-scannedPageScreen_1773392085232.png → ...ts/01-scannedPageScreen_1773392085232.png b/...ts/01-scannedPageScreen_1773392085232.png → ...ts/01-scannedPageScreen_1773392085232.png
diff --git a/...enshots/02-scanSettings_1773392081788.png → ...enshots/02-scanSettings_1773392081788.png b/...enshots/02-scanSettings_1773392081788.png → ...enshots/02-scanSettings_1773392081788.png
diff --git a/...hots/03-discoveryScreen_1773392082774.png → ...hots/03-discoveryScreen_1773392082774.png b/...hots/03-discoveryScreen_1773392082774.png → ...hots/03-discoveryScreen_1773392082774.png
diff --git a/...hots/04-emptyScanScreen_1773392084316.png → ...hots/04-emptyScanScreen_1773392084316.png b/...hots/04-emptyScanScreen_1773392084316.png → ...hots/04-emptyScanScreen_1773392084316.png
diff --git a/...shots/05-settingsScreen_1773392086217.png → ...shots/05-settingsScreen_1773392086217.png b/...shots/05-settingsScreen_1773392086217.png → ...shots/05-settingsScreen_1773392086217.png
diff --git a/...ts/01-scannedPageScreen_1772541896730.png → ...ts/01-scannedPageScreen_1772541896730.png b/...ts/01-scannedPageScreen_1772541896730.png → ...ts/01-scannedPageScreen_1772541896730.png
diff --git a/...enshots/02-scanSettings_1772541894045.png → ...enshots/02-scanSettings_1772541894045.png b/...enshots/02-scanSettings_1772541894045.png → ...enshots/02-scanSettings_1772541894045.png
diff --git a/...hots/03-discoveryScreen_1772541894498.png → ...hots/03-discoveryScreen_1772541894498.png b/...hots/03-discoveryScreen_1772541894498.png → ...hots/03-discoveryScreen_1772541894498.png
diff --git a/...hots/04-emptyScanScreen_1772541895682.png → ...hots/04-emptyScanScreen_1772541895682.png b/...hots/04-emptyScanScreen_1772541895682.png → ...hots/04-emptyScanScreen_1772541895682.png
diff --git a/...shots/05-settingsScreen_1772541897397.png → ...shots/05-settingsScreen_1772541897397.png b/...shots/05-settingsScreen_1772541897397.png → ...shots/05-settingsScreen_1772541897397.png
diff --git a/...adata/android/de-DE/short_description.txt → ...adata/android/de-DE/short_description.txt b/...adata/android/de-DE/short_description.txt → ...adata/android/de-DE/short_description.txt
diff --git a/fastlane/metadata/android/de-DE/title.txt → ...fastlane/metadata/android/de-DE/title.txt b/fastlane/metadata/android/de-DE/title.txt → ...fastlane/metadata/android/de-DE/title.txt
diff --git a/...data/android/en-US/changelogs/1000000.txt → ...data/android/en-US/changelogs/1000000.txt b/...data/android/en-US/changelogs/1000000.txt → ...data/android/en-US/changelogs/1000000.txt
diff --git a/...data/android/en-US/changelogs/1000001.txt → ...data/android/en-US/changelogs/1000001.txt b/...data/android/en-US/changelogs/1000001.txt → ...data/android/en-US/changelogs/1000001.txt
diff --git a/...data/android/en-US/changelogs/1001000.txt → ...data/android/en-US/changelogs/1001000.txt b/...data/android/en-US/changelogs/1001000.txt → ...data/android/en-US/changelogs/1001000.txt
diff --git a/...data/android/en-US/changelogs/1002000.txt → ...data/android/en-US/changelogs/1002000.txt b/...data/android/en-US/changelogs/1002000.txt → ...data/android/en-US/changelogs/1002000.txt
diff --git a/...data/android/en-US/changelogs/1003000.txt → ...data/android/en-US/changelogs/1003000.txt b/...data/android/en-US/changelogs/1003000.txt → ...data/android/en-US/changelogs/1003000.txt
diff --git a/...data/android/en-US/changelogs/1004000.txt → ...data/android/en-US/changelogs/1004000.txt b/...data/android/en-US/changelogs/1004000.txt → ...data/android/en-US/changelogs/1004000.txt
diff --git a/...data/android/en-US/changelogs/1005000.txt → ...data/android/en-US/changelogs/1005000.txt b/...data/android/en-US/changelogs/1005000.txt → ...data/android/en-US/changelogs/1005000.txt
diff --git a/...data/android/en-US/changelogs/1006001.txt → ...data/android/en-US/changelogs/1006001.txt b/...data/android/en-US/changelogs/1006001.txt → ...data/android/en-US/changelogs/1006001.txt
diff --git a/...data/android/en-US/changelogs/1006002.txt → ...data/android/en-US/changelogs/1006002.txt b/...data/android/en-US/changelogs/1006002.txt → ...data/android/en-US/changelogs/1006002.txt
diff --git a/...data/android/en-US/changelogs/2000000.txt → ...data/android/en-US/changelogs/2000000.txt b/...data/android/en-US/changelogs/2000000.txt → ...data/android/en-US/changelogs/2000000.txt
diff --git a/...data/android/en-US/changelogs/2000001.txt → ...data/android/en-US/changelogs/2000001.txt b/...data/android/en-US/changelogs/2000001.txt → ...data/android/en-US/changelogs/2000001.txt
diff --git a/...data/android/en-US/changelogs/2001002.txt → ...data/android/en-US/changelogs/2001002.txt b/...data/android/en-US/changelogs/2001002.txt → ...data/android/en-US/changelogs/2001002.txt
diff --git a/...data/android/en-US/changelogs/2001003.txt → ...data/android/en-US/changelogs/2001003.txt b/...data/android/en-US/changelogs/2001003.txt → ...data/android/en-US/changelogs/2001003.txt
diff --git a/...data/android/en-US/changelogs/2001004.txt → ...data/android/en-US/changelogs/2001004.txt b/...data/android/en-US/changelogs/2001004.txt → ...data/android/en-US/changelogs/2001004.txt
diff --git a/...tadata/android/en-US/full_description.txt → ...tadata/android/en-US/full_description.txt b/...tadata/android/en-US/full_description.txt → ...tadata/android/en-US/full_description.txt
diff --git a/...ne/metadata/android/en-US/images/icon.png → ...ne/metadata/android/en-US/images/icon.png b/...ne/metadata/android/en-US/images/icon.png → ...ne/metadata/android/en-US/images/icon.png
diff --git a/...ts/01-scannedPageScreen_1773391873581.png → ...ts/01-scannedPageScreen_1773391873581.png b/...ts/01-scannedPageScreen_1773391873581.png → ...ts/01-scannedPageScreen_1773391873581.png
diff --git a/...enshots/02-scanSettings_1773391870896.png → ...enshots/02-scanSettings_1773391870896.png b/...enshots/02-scanSettings_1773391870896.png → ...enshots/02-scanSettings_1773391870896.png
diff --git a/...hots/03-discoveryScreen_1773391871298.png → ...hots/03-discoveryScreen_1773391871298.png b/...hots/03-discoveryScreen_1773391871298.png → ...hots/03-discoveryScreen_1773391871298.png
diff --git a/...hots/04-emptyScanScreen_1773391872597.png → ...hots/04-emptyScanScreen_1773391872597.png b/...hots/04-emptyScanScreen_1773391872597.png → ...hots/04-emptyScanScreen_1773391872597.png
diff --git a/...shots/05-settingsScreen_1773391874196.png → ...shots/05-settingsScreen_1773391874196.png b/...shots/05-settingsScreen_1773391874196.png → ...shots/05-settingsScreen_1773391874196.png
diff --git a/...ts/01-scannedPageScreen_1773392074370.png → ...ts/01-scannedPageScreen_1773392074370.png b/...ts/01-scannedPageScreen_1773392074370.png → ...ts/01-scannedPageScreen_1773392074370.png
diff --git a/...enshots/02-scanSettings_1773392071595.png → ...enshots/02-scanSettings_1773392071595.png b/...enshots/02-scanSettings_1773392071595.png → ...enshots/02-scanSettings_1773392071595.png
diff --git a/...hots/03-discoveryScreen_1773392071982.png → ...hots/03-discoveryScreen_1773392071982.png b/...hots/03-discoveryScreen_1773392071982.png → ...hots/03-discoveryScreen_1773392071982.png
diff --git a/...hots/04-emptyScanScreen_1773392073386.png → ...hots/04-emptyScanScreen_1773392073386.png b/...hots/04-emptyScanScreen_1773392073386.png → ...hots/04-emptyScanScreen_1773392073386.png
diff --git a/...shots/05-settingsScreen_1773392074964.png → ...shots/05-settingsScreen_1773392074964.png b/...shots/05-settingsScreen_1773392074964.png → ...shots/05-settingsScreen_1773392074964.png
diff --git a/...ts/01-scannedPageScreen_1772541886403.png → ...ts/01-scannedPageScreen_1772541886403.png b/...ts/01-scannedPageScreen_1772541886403.png → ...ts/01-scannedPageScreen_1772541886403.png
diff --git a/...enshots/02-scanSettings_1772541881705.png → ...enshots/02-scanSettings_1772541881705.png b/...enshots/02-scanSettings_1772541881705.png → ...enshots/02-scanSettings_1772541881705.png
diff --git a/...hots/03-discoveryScreen_1772541884121.png → ...hots/03-discoveryScreen_1772541884121.png b/...hots/03-discoveryScreen_1772541884121.png → ...hots/03-discoveryScreen_1772541884121.png
diff --git a/...hots/04-emptyScanScreen_1772541885597.png → ...hots/04-emptyScanScreen_1772541885597.png b/...hots/04-emptyScanScreen_1772541885597.png → ...hots/04-emptyScanScreen_1772541885597.png
diff --git a/...shots/05-settingsScreen_1772541889078.png → ...shots/05-settingsScreen_1772541889078.png b/...shots/05-settingsScreen_1772541889078.png → ...shots/05-settingsScreen_1772541889078.png
diff --git a/...adata/android/en-US/short_description.txt → ...adata/android/en-US/short_description.txt b/...adata/android/en-US/short_description.txt → ...adata/android/en-US/short_description.txt
diff --git a/fastlane/metadata/android/en-US/title.txt → ...fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt → ...fastlane/metadata/android/en-US/title.txt
diff --git a/...data/android/it-IT/changelogs/1000000.txt → ...data/android/it-IT/changelogs/1000000.txt b/...data/android/it-IT/changelogs/1000000.txt → ...data/android/it-IT/changelogs/1000000.txt
diff --git a/...data/android/it-IT/changelogs/1000001.txt → ...data/android/it-IT/changelogs/1000001.txt b/...data/android/it-IT/changelogs/1000001.txt → ...data/android/it-IT/changelogs/1000001.txt
diff --git a/...data/android/it-IT/changelogs/1001000.txt → ...data/android/it-IT/changelogs/1001000.txt b/...data/android/it-IT/changelogs/1001000.txt → ...data/android/it-IT/changelogs/1001000.txt
diff --git a/...data/android/it-IT/changelogs/1002000.txt → ...data/android/it-IT/changelogs/1002000.txt b/...data/android/it-IT/changelogs/1002000.txt → ...data/android/it-IT/changelogs/1002000.txt
diff --git a/...data/android/it-IT/changelogs/1003000.txt → ...data/android/it-IT/changelogs/1003000.txt b/...data/android/it-IT/changelogs/1003000.txt → ...data/android/it-IT/changelogs/1003000.txt
diff --git a/...data/android/it-IT/changelogs/1004000.txt → ...data/android/it-IT/changelogs/1004000.txt b/...data/android/it-IT/changelogs/1004000.txt → ...data/android/it-IT/changelogs/1004000.txt
diff --git a/...data/android/it-IT/changelogs/1005000.txt → ...data/android/it-IT/changelogs/1005000.txt b/...data/android/it-IT/changelogs/1005000.txt → ...data/android/it-IT/changelogs/1005000.txt
diff --git a/...data/android/it-IT/changelogs/1006001.txt → ...data/android/it-IT/changelogs/1006001.txt b/...data/android/it-IT/changelogs/1006001.txt → ...data/android/it-IT/changelogs/1006001.txt
diff --git a/...data/android/it-IT/changelogs/1006002.txt → ...data/android/it-IT/changelogs/1006002.txt b/...data/android/it-IT/changelogs/1006002.txt → ...data/android/it-IT/changelogs/1006002.txt
diff --git a/...data/android/it-IT/changelogs/2000000.txt → ...data/android/it-IT/changelogs/2000000.txt b/...data/android/it-IT/changelogs/2000000.txt → ...data/android/it-IT/changelogs/2000000.txt
diff --git a/...data/android/it-IT/changelogs/2000001.txt → ...data/android/it-IT/changelogs/2000001.txt b/...data/android/it-IT/changelogs/2000001.txt → ...data/android/it-IT/changelogs/2000001.txt
diff --git a/...data/android/it-IT/changelogs/2001002.txt → ...data/android/it-IT/changelogs/2001002.txt b/...data/android/it-IT/changelogs/2001002.txt → ...data/android/it-IT/changelogs/2001002.txt
diff --git a/...data/android/it-IT/changelogs/2001003.txt → ...data/android/it-IT/changelogs/2001003.txt b/...data/android/it-IT/changelogs/2001003.txt → ...data/android/it-IT/changelogs/2001003.txt
diff --git a/...data/android/it-IT/changelogs/2001004.txt → ...data/android/it-IT/changelogs/2001004.txt b/...data/android/it-IT/changelogs/2001004.txt → ...data/android/it-IT/changelogs/2001004.txt
diff --git a/...tadata/android/it-IT/full_description.txt → ...tadata/android/it-IT/full_description.txt b/...tadata/android/it-IT/full_description.txt → ...tadata/android/it-IT/full_description.txt
diff --git a/...ts/01-scannedPageScreen_1773391892623.png → ...ts/01-scannedPageScreen_1773391892623.png b/...ts/01-scannedPageScreen_1773391892623.png → ...ts/01-scannedPageScreen_1773391892623.png
diff --git a/...enshots/02-scanSettings_1773391889434.png → ...enshots/02-scanSettings_1773391889434.png b/...enshots/02-scanSettings_1773391889434.png → ...enshots/02-scanSettings_1773391889434.png
diff --git a/...hots/03-discoveryScreen_1773391890147.png → ...hots/03-discoveryScreen_1773391890147.png b/...hots/03-discoveryScreen_1773391890147.png → ...hots/03-discoveryScreen_1773391890147.png
diff --git a/...hots/04-emptyScanScreen_1773391891679.png → ...hots/04-emptyScanScreen_1773391891679.png b/...hots/04-emptyScanScreen_1773391891679.png → ...hots/04-emptyScanScreen_1773391891679.png
diff --git a/...shots/05-settingsScreen_1773391893582.png → ...shots/05-settingsScreen_1773391893582.png b/...shots/05-settingsScreen_1773391893582.png → ...shots/05-settingsScreen_1773391893582.png
diff --git a/...ts/01-scannedPageScreen_1773392097014.png → ...ts/01-scannedPageScreen_1773392097014.png b/...ts/01-scannedPageScreen_1773392097014.png → ...ts/01-scannedPageScreen_1773392097014.png
diff --git a/...enshots/02-scanSettings_1773392093573.png → ...enshots/02-scanSettings_1773392093573.png b/...enshots/02-scanSettings_1773392093573.png → ...enshots/02-scanSettings_1773392093573.png
diff --git a/...hots/03-discoveryScreen_1773392094636.png → ...hots/03-discoveryScreen_1773392094636.png b/...hots/03-discoveryScreen_1773392094636.png → ...hots/03-discoveryScreen_1773392094636.png
diff --git a/...hots/04-emptyScanScreen_1773392096232.png → ...hots/04-emptyScanScreen_1773392096232.png b/...hots/04-emptyScanScreen_1773392096232.png → ...hots/04-emptyScanScreen_1773392096232.png
diff --git a/...shots/05-settingsScreen_1773392098119.png → ...shots/05-settingsScreen_1773392098119.png b/...shots/05-settingsScreen_1773392098119.png → ...shots/05-settingsScreen_1773392098119.png
diff --git a/...ts/01-scannedPageScreen_1772541911340.png → ...ts/01-scannedPageScreen_1772541911340.png b/...ts/01-scannedPageScreen_1772541911340.png → ...ts/01-scannedPageScreen_1772541911340.png
diff --git a/...enshots/02-scanSettings_1772541904718.png → ...enshots/02-scanSettings_1772541904718.png b/...enshots/02-scanSettings_1772541904718.png → ...enshots/02-scanSettings_1772541904718.png
diff --git a/...hots/03-discoveryScreen_1772541907169.png → ...hots/03-discoveryScreen_1772541907169.png b/...hots/03-discoveryScreen_1772541907169.png → ...hots/03-discoveryScreen_1772541907169.png
diff --git a/...hots/04-emptyScanScreen_1772541910309.png → ...hots/04-emptyScanScreen_1772541910309.png b/...hots/04-emptyScanScreen_1772541910309.png → ...hots/04-emptyScanScreen_1772541910309.png
diff --git a/...shots/05-settingsScreen_1772541914017.png → ...shots/05-settingsScreen_1772541914017.png b/...shots/05-settingsScreen_1772541914017.png → ...shots/05-settingsScreen_1772541914017.png
diff --git a/...adata/android/it-IT/short_description.txt → ...adata/android/it-IT/short_description.txt b/...adata/android/it-IT/short_description.txt → ...adata/android/it-IT/short_description.txt
diff --git a/fastlane/metadata/android/it-IT/title.txt → ...fastlane/metadata/android/it-IT/title.txt b/fastlane/metadata/android/it-IT/title.txt → ...fastlane/metadata/android/it-IT/title.txt
diff --git a/fastlane/metadata/android/screenshots.html → ...astlane/metadata/android/screenshots.html b/fastlane/metadata/android/screenshots.html → ...astlane/metadata/android/screenshots.html
diff --git a/...playMetadata/de-DE/changelogs/1006002.txt → ...playMetadata/de-DE/changelogs/1006002.txt b/...playMetadata/de-DE/changelogs/1006002.txt → ...playMetadata/de-DE/changelogs/1006002.txt
diff --git a/...playMetadata/de-DE/changelogs/2000000.txt → ...playMetadata/de-DE/changelogs/2000000.txt b/...playMetadata/de-DE/changelogs/2000000.txt → ...playMetadata/de-DE/changelogs/2000000.txt
diff --git a/...playMetadata/de-DE/changelogs/2000001.txt → ...playMetadata/de-DE/changelogs/2000001.txt b/...playMetadata/de-DE/changelogs/2000001.txt → ...playMetadata/de-DE/changelogs/2000001.txt
diff --git a/...playMetadata/de-DE/changelogs/2001002.txt → ...playMetadata/de-DE/changelogs/2001002.txt b/...playMetadata/de-DE/changelogs/2001002.txt → ...playMetadata/de-DE/changelogs/2001002.txt
diff --git a/...playMetadata/de-DE/changelogs/2001003.txt → ...playMetadata/de-DE/changelogs/2001003.txt b/...playMetadata/de-DE/changelogs/2001003.txt → ...playMetadata/de-DE/changelogs/2001003.txt
diff --git a/...playMetadata/de-DE/changelogs/2001004.txt → ...playMetadata/de-DE/changelogs/2001004.txt b/...playMetadata/de-DE/changelogs/2001004.txt → ...playMetadata/de-DE/changelogs/2001004.txt
diff --git a/...e/playMetadata/de-DE/full_description.txt → ...e/playMetadata/de-DE/full_description.txt b/...e/playMetadata/de-DE/full_description.txt → ...e/playMetadata/de-DE/full_description.txt
diff --git a/...ts/01-scannedPageScreen_1773392137705.png → ...ts/01-scannedPageScreen_1773392137705.png b/...ts/01-scannedPageScreen_1773392137705.png → ...ts/01-scannedPageScreen_1773392137705.png
diff --git a/...enshots/02-scanSettings_1773392134051.png → ...enshots/02-scanSettings_1773392134051.png b/...enshots/02-scanSettings_1773392134051.png → ...enshots/02-scanSettings_1773392134051.png
diff --git a/...hots/03-discoveryScreen_1773392134837.png → ...hots/03-discoveryScreen_1773392134837.png b/...hots/03-discoveryScreen_1773392134837.png → ...hots/03-discoveryScreen_1773392134837.png
diff --git a/...hots/04-emptyScanScreen_1773392136515.png → ...hots/04-emptyScanScreen_1773392136515.png b/...hots/04-emptyScanScreen_1773392136515.png → ...hots/04-emptyScanScreen_1773392136515.png
diff --git a/...shots/05-settingsScreen_1773392138645.png → ...shots/05-settingsScreen_1773392138645.png b/...shots/05-settingsScreen_1773392138645.png → ...shots/05-settingsScreen_1773392138645.png
diff --git a/...nshots/06-supportScreen_1773392131057.png → ...nshots/06-supportScreen_1773392131057.png b/...nshots/06-supportScreen_1773392131057.png → ...nshots/06-supportScreen_1773392131057.png
diff --git a/...yMetadata/de-DE/images/featureGraphic.png → ...yMetadata/de-DE/images/featureGraphic.png b/...yMetadata/de-DE/images/featureGraphic.png → ...yMetadata/de-DE/images/featureGraphic.png
diff --git a/...ts/01-scannedPageScreen_1773391854599.png → ...ts/01-scannedPageScreen_1773391854599.png b/...ts/01-scannedPageScreen_1773391854599.png → ...ts/01-scannedPageScreen_1773391854599.png
diff --git a/...enshots/02-scanSettings_1773391851373.png → ...enshots/02-scanSettings_1773391851373.png b/...enshots/02-scanSettings_1773391851373.png → ...enshots/02-scanSettings_1773391851373.png
diff --git a/...hots/03-discoveryScreen_1773391852033.png → ...hots/03-discoveryScreen_1773391852033.png b/...hots/03-discoveryScreen_1773391852033.png → ...hots/03-discoveryScreen_1773391852033.png
diff --git a/...hots/04-emptyScanScreen_1773391853682.png → ...hots/04-emptyScanScreen_1773391853682.png b/...hots/04-emptyScanScreen_1773391853682.png → ...hots/04-emptyScanScreen_1773391853682.png
diff --git a/...shots/05-settingsScreen_1773391855601.png → ...shots/05-settingsScreen_1773391855601.png b/...shots/05-settingsScreen_1773391855601.png → ...shots/05-settingsScreen_1773391855601.png
diff --git a/...nshots/06-supportScreen_1773391848067.png → ...nshots/06-supportScreen_1773391848067.png b/...nshots/06-supportScreen_1773391848067.png → ...nshots/06-supportScreen_1773391848067.png
diff --git a/...ts/01-scannedPageScreen_1773392051915.png → ...ts/01-scannedPageScreen_1773392051915.png b/...ts/01-scannedPageScreen_1773392051915.png → ...ts/01-scannedPageScreen_1773392051915.png
diff --git a/...enshots/02-scanSettings_1773392048636.png → ...enshots/02-scanSettings_1773392048636.png b/...enshots/02-scanSettings_1773392048636.png → ...enshots/02-scanSettings_1773392048636.png
diff --git a/...hots/03-discoveryScreen_1773392049419.png → ...hots/03-discoveryScreen_1773392049419.png b/...hots/03-discoveryScreen_1773392049419.png → ...hots/03-discoveryScreen_1773392049419.png
diff --git a/...hots/04-emptyScanScreen_1773392051098.png → ...hots/04-emptyScanScreen_1773392051098.png b/...hots/04-emptyScanScreen_1773392051098.png → ...hots/04-emptyScanScreen_1773392051098.png
diff --git a/...shots/05-settingsScreen_1773392052967.png → ...shots/05-settingsScreen_1773392052967.png b/...shots/05-settingsScreen_1773392052967.png → ...shots/05-settingsScreen_1773392052967.png
diff --git a/...nshots/06-supportScreen_1773392044965.png → ...nshots/06-supportScreen_1773392044965.png b/...nshots/06-supportScreen_1773392044965.png → ...nshots/06-supportScreen_1773392044965.png
diff --git a/...ts/01-scannedPageScreen_1772541856637.png → ...ts/01-scannedPageScreen_1772541856637.png b/...ts/01-scannedPageScreen_1772541856637.png → ...ts/01-scannedPageScreen_1772541856637.png
diff --git a/...enshots/02-scanSettings_1772541853898.png → ...enshots/02-scanSettings_1772541853898.png b/...enshots/02-scanSettings_1772541853898.png → ...enshots/02-scanSettings_1772541853898.png
diff --git a/...hots/03-discoveryScreen_1772541854300.png → ...hots/03-discoveryScreen_1772541854300.png b/...hots/03-discoveryScreen_1772541854300.png → ...hots/03-discoveryScreen_1772541854300.png
diff --git a/...hots/04-emptyScanScreen_1772541855615.png → ...hots/04-emptyScanScreen_1772541855615.png b/...hots/04-emptyScanScreen_1772541855615.png → ...hots/04-emptyScanScreen_1772541855615.png
diff --git a/...shots/05-settingsScreen_1772541857282.png → ...shots/05-settingsScreen_1772541857282.png b/...shots/05-settingsScreen_1772541857282.png → ...shots/05-settingsScreen_1772541857282.png
diff --git a/...nshots/06-supportScreen_1772541851562.png → ...nshots/06-supportScreen_1772541851562.png b/...nshots/06-supportScreen_1772541851562.png → ...nshots/06-supportScreen_1772541851562.png
diff --git a/.../playMetadata/de-DE/short_description.txt → .../playMetadata/de-DE/short_description.txt b/.../playMetadata/de-DE/short_description.txt → .../playMetadata/de-DE/short_description.txt
diff --git a/fastlane/playMetadata/de-DE/title.txt → ...App/fastlane/playMetadata/de-DE/title.txt b/fastlane/playMetadata/de-DE/title.txt → ...App/fastlane/playMetadata/de-DE/title.txt
diff --git a/fastlane/playMetadata/de-DE/video.txt → ...App/fastlane/playMetadata/de-DE/video.txt b/fastlane/playMetadata/de-DE/video.txt → ...App/fastlane/playMetadata/de-DE/video.txt
diff --git a/...playMetadata/en-US/changelogs/1006002.txt → ...playMetadata/en-US/changelogs/1006002.txt b/...playMetadata/en-US/changelogs/1006002.txt → ...playMetadata/en-US/changelogs/1006002.txt
diff --git a/...playMetadata/en-US/changelogs/2000000.txt → ...playMetadata/en-US/changelogs/2000000.txt b/...playMetadata/en-US/changelogs/2000000.txt → ...playMetadata/en-US/changelogs/2000000.txt
diff --git a/...playMetadata/en-US/changelogs/2000001.txt → ...playMetadata/en-US/changelogs/2000001.txt b/...playMetadata/en-US/changelogs/2000001.txt → ...playMetadata/en-US/changelogs/2000001.txt
diff --git a/...playMetadata/en-US/changelogs/2001002.txt → ...playMetadata/en-US/changelogs/2001002.txt b/...playMetadata/en-US/changelogs/2001002.txt → ...playMetadata/en-US/changelogs/2001002.txt
diff --git a/...playMetadata/en-US/changelogs/2001003.txt → ...playMetadata/en-US/changelogs/2001003.txt b/...playMetadata/en-US/changelogs/2001003.txt → ...playMetadata/en-US/changelogs/2001003.txt
diff --git a/...playMetadata/en-US/changelogs/2001004.txt → ...playMetadata/en-US/changelogs/2001004.txt b/...playMetadata/en-US/changelogs/2001004.txt → ...playMetadata/en-US/changelogs/2001004.txt
diff --git a/...e/playMetadata/en-US/full_description.txt → ...e/playMetadata/en-US/full_description.txt b/...e/playMetadata/en-US/full_description.txt → ...e/playMetadata/en-US/full_description.txt
diff --git a/...ts/01-scannedPageScreen_1773392127266.png → ...ts/01-scannedPageScreen_1773392127266.png b/...ts/01-scannedPageScreen_1773392127266.png → ...ts/01-scannedPageScreen_1773392127266.png
diff --git a/...enshots/02-scanSettings_1773392124079.png → ...enshots/02-scanSettings_1773392124079.png b/...enshots/02-scanSettings_1773392124079.png → ...enshots/02-scanSettings_1773392124079.png
diff --git a/...hots/03-discoveryScreen_1773392124691.png → ...hots/03-discoveryScreen_1773392124691.png b/...hots/03-discoveryScreen_1773392124691.png → ...hots/03-discoveryScreen_1773392124691.png
diff --git a/...hots/04-emptyScanScreen_1773392126076.png → ...hots/04-emptyScanScreen_1773392126076.png b/...hots/04-emptyScanScreen_1773392126076.png → ...hots/04-emptyScanScreen_1773392126076.png
diff --git a/...shots/05-settingsScreen_1773392128027.png → ...shots/05-settingsScreen_1773392128027.png b/...shots/05-settingsScreen_1773392128027.png → ...shots/05-settingsScreen_1773392128027.png
diff --git a/...nshots/06-supportScreen_1773392121020.png → ...nshots/06-supportScreen_1773392121020.png b/...nshots/06-supportScreen_1773392121020.png → ...nshots/06-supportScreen_1773392121020.png
diff --git a/...yMetadata/en-US/images/featureGraphic.png → ...yMetadata/en-US/images/featureGraphic.png b/...yMetadata/en-US/images/featureGraphic.png → ...yMetadata/en-US/images/featureGraphic.png
diff --git a/fastlane/playMetadata/en-US/images/icon.png → ...stlane/playMetadata/en-US/images/icon.png b/fastlane/playMetadata/en-US/images/icon.png → ...stlane/playMetadata/en-US/images/icon.png
diff --git a/...ts/01-scannedPageScreen_1773391844501.png → ...ts/01-scannedPageScreen_1773391844501.png b/...ts/01-scannedPageScreen_1773391844501.png → ...ts/01-scannedPageScreen_1773391844501.png
diff --git a/...enshots/02-scanSettings_1773391841799.png → ...enshots/02-scanSettings_1773391841799.png b/...enshots/02-scanSettings_1773391841799.png → ...enshots/02-scanSettings_1773391841799.png
diff --git a/...hots/03-discoveryScreen_1773391842230.png → ...hots/03-discoveryScreen_1773391842230.png b/...hots/03-discoveryScreen_1773391842230.png → ...hots/03-discoveryScreen_1773391842230.png
diff --git a/...hots/04-emptyScanScreen_1773391843467.png → ...hots/04-emptyScanScreen_1773391843467.png b/...hots/04-emptyScanScreen_1773391843467.png → ...hots/04-emptyScanScreen_1773391843467.png
diff --git a/...shots/05-settingsScreen_1773391845183.png → ...shots/05-settingsScreen_1773391845183.png b/...shots/05-settingsScreen_1773391845183.png → ...shots/05-settingsScreen_1773391845183.png
diff --git a/...nshots/06-supportScreen_1773391839216.png → ...nshots/06-supportScreen_1773391839216.png b/...nshots/06-supportScreen_1773391839216.png → ...nshots/06-supportScreen_1773391839216.png
diff --git a/...ts/01-scannedPageScreen_1773392041217.png → ...ts/01-scannedPageScreen_1773392041217.png b/...ts/01-scannedPageScreen_1773392041217.png → ...ts/01-scannedPageScreen_1773392041217.png
diff --git a/...enshots/02-scanSettings_1773392038538.png → ...enshots/02-scanSettings_1773392038538.png b/...enshots/02-scanSettings_1773392038538.png → ...enshots/02-scanSettings_1773392038538.png
diff --git a/...hots/03-discoveryScreen_1773392039016.png → ...hots/03-discoveryScreen_1773392039016.png b/...hots/03-discoveryScreen_1773392039016.png → ...hots/03-discoveryScreen_1773392039016.png
diff --git a/...hots/04-emptyScanScreen_1773392040264.png → ...hots/04-emptyScanScreen_1773392040264.png b/...hots/04-emptyScanScreen_1773392040264.png → ...hots/04-emptyScanScreen_1773392040264.png
diff --git a/...shots/05-settingsScreen_1773392041800.png → ...shots/05-settingsScreen_1773392041800.png b/...shots/05-settingsScreen_1773392041800.png → ...shots/05-settingsScreen_1773392041800.png
diff --git a/...nshots/06-supportScreen_1773392036000.png → ...nshots/06-supportScreen_1773392036000.png b/...nshots/06-supportScreen_1773392036000.png → ...nshots/06-supportScreen_1773392036000.png
diff --git a/...ts/01-scannedPageScreen_1772541846501.png → ...ts/01-scannedPageScreen_1772541846501.png b/...ts/01-scannedPageScreen_1772541846501.png → ...ts/01-scannedPageScreen_1772541846501.png
diff --git a/...enshots/02-scanSettings_1772541839135.png → ...enshots/02-scanSettings_1772541839135.png b/...enshots/02-scanSettings_1772541839135.png → ...enshots/02-scanSettings_1772541839135.png
diff --git a/...hots/03-discoveryScreen_1772541841584.png → ...hots/03-discoveryScreen_1772541841584.png b/...hots/03-discoveryScreen_1772541841584.png → ...hots/03-discoveryScreen_1772541841584.png
diff --git a/...hots/04-emptyScanScreen_1772541845528.png → ...hots/04-emptyScanScreen_1772541845528.png b/...hots/04-emptyScanScreen_1772541845528.png → ...hots/04-emptyScanScreen_1772541845528.png
diff --git a/...shots/05-settingsScreen_1772541849182.png → ...shots/05-settingsScreen_1772541849182.png b/...shots/05-settingsScreen_1772541849182.png → ...shots/05-settingsScreen_1772541849182.png
diff --git a/...nshots/06-supportScreen_1772541835912.png → ...nshots/06-supportScreen_1772541835912.png b/...nshots/06-supportScreen_1772541835912.png → ...nshots/06-supportScreen_1772541835912.png
diff --git a/.../playMetadata/en-US/short_description.txt → .../playMetadata/en-US/short_description.txt b/.../playMetadata/en-US/short_description.txt → .../playMetadata/en-US/short_description.txt
diff --git a/fastlane/playMetadata/en-US/title.txt → ...App/fastlane/playMetadata/en-US/title.txt b/fastlane/playMetadata/en-US/title.txt → ...App/fastlane/playMetadata/en-US/title.txt
diff --git a/fastlane/playMetadata/en-US/video.txt → ...App/fastlane/playMetadata/en-US/video.txt b/fastlane/playMetadata/en-US/video.txt → ...App/fastlane/playMetadata/en-US/video.txt
diff --git a/...playMetadata/it-IT/changelogs/1006002.txt → ...playMetadata/it-IT/changelogs/1006002.txt b/...playMetadata/it-IT/changelogs/1006002.txt → ...playMetadata/it-IT/changelogs/1006002.txt
diff --git a/...playMetadata/it-IT/changelogs/2000000.txt → ...playMetadata/it-IT/changelogs/2000000.txt b/...playMetadata/it-IT/changelogs/2000000.txt → ...playMetadata/it-IT/changelogs/2000000.txt
diff --git a/...playMetadata/it-IT/changelogs/2000001.txt → ...playMetadata/it-IT/changelogs/2000001.txt b/...playMetadata/it-IT/changelogs/2000001.txt → ...playMetadata/it-IT/changelogs/2000001.txt
diff --git a/...playMetadata/it-IT/changelogs/2001002.txt → ...playMetadata/it-IT/changelogs/2001002.txt b/...playMetadata/it-IT/changelogs/2001002.txt → ...playMetadata/it-IT/changelogs/2001002.txt
diff --git a/...playMetadata/it-IT/changelogs/2001003.txt → ...playMetadata/it-IT/changelogs/2001003.txt b/...playMetadata/it-IT/changelogs/2001003.txt → ...playMetadata/it-IT/changelogs/2001003.txt
diff --git a/...playMetadata/it-IT/changelogs/2001004.txt → ...playMetadata/it-IT/changelogs/2001004.txt b/...playMetadata/it-IT/changelogs/2001004.txt → ...playMetadata/it-IT/changelogs/2001004.txt
diff --git a/...e/playMetadata/it-IT/full_description.txt → ...e/playMetadata/it-IT/full_description.txt b/...e/playMetadata/it-IT/full_description.txt → ...e/playMetadata/it-IT/full_description.txt
diff --git a/...ts/01-scannedPageScreen_1773392147446.png → ...ts/01-scannedPageScreen_1773392147446.png b/...ts/01-scannedPageScreen_1773392147446.png → ...ts/01-scannedPageScreen_1773392147446.png
diff --git a/...enshots/02-scanSettings_1773392144173.png → ...enshots/02-scanSettings_1773392144173.png b/...enshots/02-scanSettings_1773392144173.png → ...enshots/02-scanSettings_1773392144173.png
diff --git a/...hots/03-discoveryScreen_1773392144879.png → ...hots/03-discoveryScreen_1773392144879.png b/...hots/03-discoveryScreen_1773392144879.png → ...hots/03-discoveryScreen_1773392144879.png
diff --git a/...hots/04-emptyScanScreen_1773392146388.png → ...hots/04-emptyScanScreen_1773392146388.png b/...hots/04-emptyScanScreen_1773392146388.png → ...hots/04-emptyScanScreen_1773392146388.png
diff --git a/...shots/05-settingsScreen_1773392148380.png → ...shots/05-settingsScreen_1773392148380.png b/...shots/05-settingsScreen_1773392148380.png → ...shots/05-settingsScreen_1773392148380.png
diff --git a/...nshots/06-supportScreen_1773392140988.png → ...nshots/06-supportScreen_1773392140988.png b/...nshots/06-supportScreen_1773392140988.png → ...nshots/06-supportScreen_1773392140988.png
diff --git a/...yMetadata/it-IT/images/featureGraphic.png → ...yMetadata/it-IT/images/featureGraphic.png b/...yMetadata/it-IT/images/featureGraphic.png → ...yMetadata/it-IT/images/featureGraphic.png
diff --git a/...ts/01-scannedPageScreen_1773391864832.png → ...ts/01-scannedPageScreen_1773391864832.png b/...ts/01-scannedPageScreen_1773391864832.png → ...ts/01-scannedPageScreen_1773391864832.png
diff --git a/...enshots/02-scanSettings_1773391861554.png → ...enshots/02-scanSettings_1773391861554.png b/...enshots/02-scanSettings_1773391861554.png → ...enshots/02-scanSettings_1773391861554.png
diff --git a/...hots/03-discoveryScreen_1773391862266.png → ...hots/03-discoveryScreen_1773391862266.png b/...hots/03-discoveryScreen_1773391862266.png → ...hots/03-discoveryScreen_1773391862266.png
diff --git a/...hots/04-emptyScanScreen_1773391863833.png → ...hots/04-emptyScanScreen_1773391863833.png b/...hots/04-emptyScanScreen_1773391863833.png → ...hots/04-emptyScanScreen_1773391863833.png
diff --git a/...shots/05-settingsScreen_1773391865784.png → ...shots/05-settingsScreen_1773391865784.png b/...shots/05-settingsScreen_1773391865784.png → ...shots/05-settingsScreen_1773391865784.png
diff --git a/...nshots/06-supportScreen_1773391858142.png → ...nshots/06-supportScreen_1773391858142.png b/...nshots/06-supportScreen_1773391858142.png → ...nshots/06-supportScreen_1773391858142.png
diff --git a/...ts/01-scannedPageScreen_1773392064698.png → ...ts/01-scannedPageScreen_1773392064698.png b/...ts/01-scannedPageScreen_1773392064698.png → ...ts/01-scannedPageScreen_1773392064698.png
diff --git a/...enshots/02-scanSettings_1773392060668.png → ...enshots/02-scanSettings_1773392060668.png b/...enshots/02-scanSettings_1773392060668.png → ...enshots/02-scanSettings_1773392060668.png
diff --git a/...hots/03-discoveryScreen_1773392062139.png → ...hots/03-discoveryScreen_1773392062139.png b/...hots/03-discoveryScreen_1773392062139.png → ...hots/03-discoveryScreen_1773392062139.png
diff --git a/...hots/04-emptyScanScreen_1773392063851.png → ...hots/04-emptyScanScreen_1773392063851.png b/...hots/04-emptyScanScreen_1773392063851.png → ...hots/04-emptyScanScreen_1773392063851.png
diff --git a/...shots/05-settingsScreen_1773392065789.png → ...shots/05-settingsScreen_1773392065789.png b/...shots/05-settingsScreen_1773392065789.png → ...shots/05-settingsScreen_1773392065789.png
diff --git a/...nshots/06-supportScreen_1773392056702.png → ...nshots/06-supportScreen_1773392056702.png b/...nshots/06-supportScreen_1773392056702.png → ...nshots/06-supportScreen_1773392056702.png
diff --git a/...ts/01-scannedPageScreen_1772541871263.png → ...ts/01-scannedPageScreen_1772541871263.png b/...ts/01-scannedPageScreen_1772541871263.png → ...ts/01-scannedPageScreen_1772541871263.png
diff --git a/...enshots/02-scanSettings_1772541864073.png → ...enshots/02-scanSettings_1772541864073.png b/...enshots/02-scanSettings_1772541864073.png → ...enshots/02-scanSettings_1772541864073.png
diff --git a/...hots/03-discoveryScreen_1772541866487.png → ...hots/03-discoveryScreen_1772541866487.png b/...hots/03-discoveryScreen_1772541866487.png → ...hots/03-discoveryScreen_1772541866487.png
diff --git a/...hots/04-emptyScanScreen_1772541870383.png → ...hots/04-emptyScanScreen_1772541870383.png b/...hots/04-emptyScanScreen_1772541870383.png → ...hots/04-emptyScanScreen_1772541870383.png
diff --git a/...shots/05-settingsScreen_1772541873928.png → ...shots/05-settingsScreen_1772541873928.png b/...shots/05-settingsScreen_1772541873928.png → ...shots/05-settingsScreen_1772541873928.png
diff --git a/...nshots/06-supportScreen_1772541861315.png → ...nshots/06-supportScreen_1772541861315.png b/...nshots/06-supportScreen_1772541861315.png → ...nshots/06-supportScreen_1772541861315.png
diff --git a/.../playMetadata/it-IT/short_description.txt → .../playMetadata/it-IT/short_description.txt b/.../playMetadata/it-IT/short_description.txt → .../playMetadata/it-IT/short_description.txt
diff --git a/fastlane/playMetadata/it-IT/title.txt → ...App/fastlane/playMetadata/it-IT/title.txt b/fastlane/playMetadata/it-IT/title.txt → ...App/fastlane/playMetadata/it-IT/title.txt
diff --git a/fastlane/playMetadata/it-IT/video.txt → ...App/fastlane/playMetadata/it-IT/video.txt b/fastlane/playMetadata/it-IT/video.txt → ...App/fastlane/playMetadata/it-IT/video.txt
diff --git a/fastlane/playMetadata/screenshots.html → ...pp/fastlane/playMetadata/screenshots.html b/fastlane/playMetadata/screenshots.html → ...pp/fastlane/playMetadata/screenshots.html
diff --git a/androidApp/gradle/gradle-daemon-jvm.properties b/androidApp/gradle/gradle-daemon-jvm.properties
@@ -0,0 +1,13 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/29ee363f71d060405f729a8f1b7f7aef/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/67a0fee3c4236b6397dcbe8575ca2011/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/536afcd1dff540251f85e5d2c80458cf/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/67a0fee3c4236b6397dcbe8575ca2011/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/0b98aec810298c2c1d7fdac5dac37910/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/658299a896470fbb3103ba3a430ee227/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/29ee363f71d060405f729a8f1b7f7aef/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/67a0fee3c4236b6397dcbe8575ca2011/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/248ffb1098f61659502d0c09aa348294/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/ac151d55def6b6a9a159dc4cb4642851/redirect
+toolchainVendor=JETBRAINS
+toolchainVersion=21
diff --git a/androidApp/gradle/libs.versions.toml b/androidApp/gradle/libs.versions.toml
@@ -0,0 +1,100 @@
+[versions]
+agp = "9.1.0"
+coilCompose = "3.3.0"
+constraintlayoutCompose = "1.1.1"
+datastore = "1.2.0"
+esclkt = "2.0.6"
+escl-mock-server = "1.0.1"
+itextCore = "9.3.0"
+kotlin = "2.3.20-Beta1"
+coreKtx = "1.17.0"
+junit = "4.13.2"
+junitVersion = "1.3.0"
+espressoCore = "3.7.0"
+kotlinReflect = "2.1.20"
+kotlinxSerializationJson = "1.9.0"
+lifecycleRuntimeKtx = "2.9.4"
+activityCompose = "1.11.0"
+composeBom = "2025.10.00"
+room = "2.8.4"
+timber = "5.0.1"
+zoomable = "0.18.0"
+material3 = "1.5.0-alpha06"
+materialIcons = "1.7.8"
+navigationCompose = "2.9.5"
+versionsPlugin = "0.53.0"
+screengrab = "2.1.1"
+ktor = "3.4.0"
+koin = "4.2.0-RC1"
+koin-plugin = "0.3.0"
+protobuf-plugin = "0.9.6"
+protobuf-kotlin-lite = "4.33.5"
+rules = "1.7.0"
+
+[libraries]
+
+androidx-datastore = { module = "androidx.datastore:datastore", version.ref = "datastore" }
+
+androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
+androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }
+androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
+
+koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
+koin-annotations = { module = "io.insert-koin:koin-annotations", version.ref = "koin" }
+koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" }
+koin-test-junit4 = { module = "io.insert-koin:koin-test-junit4", version.ref = "koin" }
+
+# Android
+koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }
+koin-android-test = { module = "io.insert-koin:koin-android-test", version.ref = "koin" }
+
+koin-compose = { module = "io.insert-koin:koin-compose", version.ref = "koin"}
+
+koin-androix-navigation = { module = "io.insert-koin:koin-androidx-compose-navigation", version.ref = "koin"}
+
+# Compose
+koin-compose-viewmodel = { module = "io.insert-koin:koin-compose-viewmodel", version.ref = "koin" }
+koin-compose-viewmodel-navigation = { module = "io.insert-koin:koin-compose-viewmodel-navigation", version.ref = "koin" }
+koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koin" }
+
+ktor-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor"}
+ktor-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor"}
+androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "constraintlayoutCompose" }
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycleRuntimeKtx" }
+androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core" , version.ref = "materialIcons"}
+androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigationCompose" }
+coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coilCompose" }
+esclkt = { module = "io.github.chrisimx:esclkt", version.ref = "esclkt" }
+itext7-core = { module = "com.itextpdf:itext-core", version.ref = "itextCore" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
+androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
+androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
+androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
+androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
+androidx-ui = { group = "androidx.compose.ui", name = "ui" }
+androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
+androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
+androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
+androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
+androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
+androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
+kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlinReflect" }
+kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
+screengrab = { module = "tools.fastlane:screengrab", version.ref = "screengrab" }
+timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }
+zoomable = { module = "me.saket.telephoto:zoomable", version.ref = "zoomable" }
+protobuf-kotlin-lite = { module = "com.google.protobuf:protobuf-kotlin-lite", version.ref = "protobuf-kotlin-lite"}
+androidx-rules = { group = "androidx.test", name = "rules", version.ref = "rules" }
+
+escl-mock-server = { module = "io.github.chrisimx:escl-mock-server", version.ref = "escl-mock-server"}
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+versions = { id = "com.github.ben-manes.versions", version.ref = "versionsPlugin" }
+koin = { id = "io.insert-koin.compiler.plugin", version.ref = "koin-plugin" }
+protobuf = { id = "com.google.protobuf", version.ref = "protobuf-plugin" }
+room = { id = "androidx.room", version.ref = "room"}
diff --git a/app/proguard-rules.pro → androidApp/proguard-rules.pro b/app/proguard-rules.pro → androidApp/proguard-rules.pro
diff --git a/...hrisimx.scanbridge.db.ScanBridgeDb/1.json → ...hrisimx.scanbridge.db.ScanBridgeDb/1.json b/...hrisimx.scanbridge.db.ScanBridgeDb/1.json → ...hrisimx.scanbridge.db.ScanBridgeDb/1.json
diff --git a/...hrisimx.scanbridge.db.ScanBridgeDb/2.json → ...hrisimx.scanbridge.db.ScanBridgeDb/2.json b/...hrisimx.scanbridge.db.ScanBridgeDb/2.json → ...hrisimx.scanbridge.db.ScanBridgeDb/2.json
diff --git a/app/src/androidTest/assets/scan-1.jpg → androidApp/src/androidTest/assets/scan-1.jpg b/app/src/androidTest/assets/scan-1.jpg → androidApp/src/androidTest/assets/scan-1.jpg
diff --git a/.../chrisimx/scanbridge/ScanBridgeNavHost.kt → .../chrisimx/scanbridge/ScanBridgeNavHost.kt b/.../chrisimx/scanbridge/ScanBridgeNavHost.kt → .../chrisimx/scanbridge/ScanBridgeNavHost.kt
diff --git a/...hub/chrisimx/scanbridge/ScanBridgeTest.kt → ...hub/chrisimx/scanbridge/ScanBridgeTest.kt b/...hub/chrisimx/scanbridge/ScanBridgeTest.kt → ...hub/chrisimx/scanbridge/ScanBridgeTest.kt
diff --git a/...ge/screenshot/ScanBridgeScreenshotTest.kt → ...ge/screenshot/ScanBridgeScreenshotTest.kt b/...ge/screenshot/ScanBridgeScreenshotTest.kt → ...ge/screenshot/ScanBridgeScreenshotTest.kt
diff --git a/app/src/debug/AndroidManifest.xml → androidApp/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml → androidApp/src/debug/AndroidManifest.xml
diff --git a/...isimx/scanbridge/StartupTabDefinitions.kt → ...isimx/scanbridge/StartupTabDefinitions.kt b/...isimx/scanbridge/StartupTabDefinitions.kt → ...isimx/scanbridge/StartupTabDefinitions.kt
diff --git a/app/src/main/AndroidManifest.xml → androidApp/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml → androidApp/src/main/AndroidManifest.xml
diff --git a/app/src/main/ic_launcher-playstore.png → ...oidApp/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png → ...oidApp/src/main/ic_launcher-playstore.png
diff --git a/.../chrisimx/scanbridge/AppSettingsScreen.kt → .../chrisimx/scanbridge/AppSettingsScreen.kt b/.../chrisimx/scanbridge/AppSettingsScreen.kt → .../chrisimx/scanbridge/AppSettingsScreen.kt
diff --git a/...thub/chrisimx/scanbridge/CrashActivity.kt → ...thub/chrisimx/scanbridge/CrashActivity.kt b/...thub/chrisimx/scanbridge/CrashActivity.kt → ...thub/chrisimx/scanbridge/CrashActivity.kt
@@ -13,7 +13,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+// TODO: import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -28,7 +28,7 @@ import io.github.chrisimx.scanbridge.theme.ScanBridgeTheme
 import timber.log.Timber
 
 class CrashActivity : ComponentActivity() {
-    @OptIn(ExperimentalMaterial3ExpressiveApi::class)
+    // TODO: @OptIn(ExperimentalMaterial3ExpressiveApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge()
         super.onCreate(savedInstanceState)

diff --git a/...ithub/chrisimx/scanbridge/CrashHandler.kt → ...ithub/chrisimx/scanbridge/CrashHandler.kt b/...ithub/chrisimx/scanbridge/CrashHandler.kt → ...ithub/chrisimx/scanbridge/CrashHandler.kt
diff --git a/.../github/chrisimx/scanbridge/CropScreen.kt → .../github/chrisimx/scanbridge/CropScreen.kt b/.../github/chrisimx/scanbridge/CropScreen.kt → .../github/chrisimx/scanbridge/CropScreen.kt
@@ -6,7 +6,7 @@ import androidx.compose.animation.core.snap
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+// TODO: import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.ExtendedFloatingActionButton
 import androidx.compose.material3.FabPosition
 import androidx.compose.material3.Icon
@@ -69,7 +69,7 @@ suspend fun finishCrop(cropRect: Rect, file: String): File? = withContext(Dispat
     return@withContext croppedFile
 }
 
-@OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalTelephotoApi::class)
+// TODO: @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalTelephotoApi::class)
 @Composable
 fun CropScreen(scanId: Uuid, returnRoute: BaseRoute, navController: NavController) {
     val context = LocalContext.current

diff --git a/...ithub/chrisimx/scanbridge/MainActivity.kt → ...ithub/chrisimx/scanbridge/MainActivity.kt b/...ithub/chrisimx/scanbridge/MainActivity.kt → ...ithub/chrisimx/scanbridge/MainActivity.kt
diff --git a/...thub/chrisimx/scanbridge/ScanBridgeApp.kt → ...thub/chrisimx/scanbridge/ScanBridgeApp.kt b/...thub/chrisimx/scanbridge/ScanBridgeApp.kt → ...thub/chrisimx/scanbridge/ScanBridgeApp.kt
@@ -24,7 +24,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.Favorite
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
+// TODO: import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
@@ -59,7 +59,7 @@ import kotlinx.coroutines.withContext
 import kotlinx.serialization.json.Json
 import timber.log.Timber
 
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
+// TODO: @OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun ScanBridgeApp() {
     ScanBridgeTheme {

diff --git a/...isimx/scanbridge/ScanBridgeApplication.kt → ...isimx/scanbridge/ScanBridgeApplication.kt b/...isimx/scanbridge/ScanBridgeApplication.kt → ...isimx/scanbridge/ScanBridgeApplication.kt
diff --git a/.../chrisimx/scanbridge/ScanBridgeNavHost.kt → .../chrisimx/scanbridge/ScanBridgeNavHost.kt b/.../chrisimx/scanbridge/ScanBridgeNavHost.kt → .../chrisimx/scanbridge/ScanBridgeNavHost.kt
diff --git a/...ithub/chrisimx/scanbridge/ScanSettings.kt → ...ithub/chrisimx/scanbridge/ScanSettings.kt b/...ithub/chrisimx/scanbridge/ScanSettings.kt → ...ithub/chrisimx/scanbridge/ScanSettings.kt
diff --git a/...hub/chrisimx/scanbridge/ScannerBrowser.kt → ...hub/chrisimx/scanbridge/ScannerBrowser.kt b/...hub/chrisimx/scanbridge/ScannerBrowser.kt → ...hub/chrisimx/scanbridge/ScannerBrowser.kt
diff --git a/...imx/scanbridge/ScannerDiscoveryBackend.kt → ...imx/scanbridge/ScannerDiscoveryBackend.kt b/...imx/scanbridge/ScannerDiscoveryBackend.kt → ...imx/scanbridge/ScannerDiscoveryBackend.kt
diff --git a/...hub/chrisimx/scanbridge/ScanningScreen.kt → ...hub/chrisimx/scanbridge/ScanningScreen.kt b/...hub/chrisimx/scanbridge/ScanningScreen.kt → ...hub/chrisimx/scanbridge/ScanningScreen.kt
diff --git a/...thub/chrisimx/scanbridge/StartupScreen.kt → ...thub/chrisimx/scanbridge/StartupScreen.kt b/...thub/chrisimx/scanbridge/StartupScreen.kt → ...thub/chrisimx/scanbridge/StartupScreen.kt
diff --git a/...ndroidservice/ScanJobForegroundService.kt → ...ndroidservice/ScanJobForegroundService.kt b/...ndroidservice/ScanJobForegroundService.kt → ...ndroidservice/ScanJobForegroundService.kt
diff --git a/...nbridge/data/model/EditedCustomScanner.kt → ...nbridge/data/model/EditedCustomScanner.kt b/...nbridge/data/model/EditedCustomScanner.kt → ...nbridge/data/model/EditedCustomScanner.kt
diff --git a/...idge/data/model/LegacyESCLScanSettings.kt → ...idge/data/model/LegacyESCLScanSettings.kt b/...idge/data/model/LegacyESCLScanSettings.kt → ...idge/data/model/LegacyESCLScanSettings.kt
diff --git a/.../scanbridge/data/model/LegacySessionV2.kt → .../scanbridge/data/model/LegacySessionV2.kt b/.../scanbridge/data/model/LegacySessionV2.kt → .../scanbridge/data/model/LegacySessionV2.kt
diff --git a/...simx/scanbridge/data/model/PaperFormat.kt → ...simx/scanbridge/data/model/PaperFormat.kt b/...simx/scanbridge/data/model/PaperFormat.kt → ...simx/scanbridge/data/model/PaperFormat.kt
diff --git a/...chrisimx/scanbridge/data/model/ScanJob.kt → ...chrisimx/scanbridge/data/model/ScanJob.kt b/...chrisimx/scanbridge/data/model/ScanJob.kt → ...chrisimx/scanbridge/data/model/ScanJob.kt
diff --git a/...nbridge/data/ui/CustomScannerViewModel.kt → ...nbridge/data/ui/CustomScannerViewModel.kt b/...nbridge/data/ui/CustomScannerViewModel.kt → ...nbridge/data/ui/CustomScannerViewModel.kt
diff --git a/...a/ui/ScanSettingsComposableStateHolder.kt → ...a/ui/ScanSettingsComposableStateHolder.kt b/...a/ui/ScanSettingsComposableStateHolder.kt → ...a/ui/ScanSettingsComposableStateHolder.kt
diff --git a/...anbridge/data/ui/ScanSettingsStateData.kt → ...anbridge/data/ui/ScanSettingsStateData.kt b/...anbridge/data/ui/ScanSettingsStateData.kt → ...anbridge/data/ui/ScanSettingsStateData.kt
diff --git a/.../scanbridge/data/ui/ScanningScreenData.kt → .../scanbridge/data/ui/ScanningScreenData.kt b/.../scanbridge/data/ui/ScanningScreenData.kt → .../scanbridge/data/ui/ScanningScreenData.kt
diff --git a/...bridge/data/ui/ScanningScreenViewModel.kt → ...bridge/data/ui/ScanningScreenViewModel.kt b/...bridge/data/ui/ScanningScreenViewModel.kt → ...bridge/data/ui/ScanningScreenViewModel.kt
diff --git a/...risimx/scanbridge/datastore/DataStores.kt → ...risimx/scanbridge/datastore/DataStores.kt b/...risimx/scanbridge/datastore/DataStores.kt → ...risimx/scanbridge/datastore/DataStores.kt
diff --git a/...dge/datastore/LastRouteStoreSerializer.kt → ...dge/datastore/LastRouteStoreSerializer.kt b/...dge/datastore/LastRouteStoreSerializer.kt → ...dge/datastore/LastRouteStoreSerializer.kt
diff --git a/...datastore/ScanBridgeSettingsSerializer.kt → ...datastore/ScanBridgeSettingsSerializer.kt b/...datastore/ScanBridgeSettingsSerializer.kt → ...datastore/ScanBridgeSettingsSerializer.kt
diff --git a/...datastore/ScanSettingsDataStoreHelpers.kt → ...datastore/ScanSettingsDataStoreHelpers.kt b/...datastore/ScanSettingsDataStoreHelpers.kt → ...datastore/ScanSettingsDataStoreHelpers.kt
diff --git a/...idge/datastore/ShownMessagesSerializer.kt → ...idge/datastore/ShownMessagesSerializer.kt b/...idge/datastore/ShownMessagesSerializer.kt → ...idge/datastore/ShownMessagesSerializer.kt
diff --git a/...ub/chrisimx/scanbridge/db/ScanBridgeDb.kt → ...ub/chrisimx/scanbridge/db/ScanBridgeDb.kt b/...ub/chrisimx/scanbridge/db/ScanBridgeDb.kt → ...ub/chrisimx/scanbridge/db/ScanBridgeDb.kt
diff --git a/...mx/scanbridge/db/daos/CustomScannerDao.kt → ...mx/scanbridge/db/daos/CustomScannerDao.kt b/...mx/scanbridge/db/daos/CustomScannerDao.kt → ...mx/scanbridge/db/daos/CustomScannerDao.kt
diff --git a/...simx/scanbridge/db/daos/ScannedPageDao.kt → ...simx/scanbridge/db/daos/ScannedPageDao.kt b/...simx/scanbridge/db/daos/ScannedPageDao.kt → ...simx/scanbridge/db/daos/ScannedPageDao.kt
diff --git a/...chrisimx/scanbridge/db/daos/SessionDao.kt → ...chrisimx/scanbridge/db/daos/SessionDao.kt b/...chrisimx/scanbridge/db/daos/SessionDao.kt → ...chrisimx/scanbridge/db/daos/SessionDao.kt
diff --git a/...hrisimx/scanbridge/db/daos/TempFileDao.kt → ...hrisimx/scanbridge/db/daos/TempFileDao.kt b/...hrisimx/scanbridge/db/daos/TempFileDao.kt → ...hrisimx/scanbridge/db/daos/TempFileDao.kt
diff --git a/...x/scanbridge/db/entities/CustomScanner.kt → ...x/scanbridge/db/entities/CustomScanner.kt b/...x/scanbridge/db/entities/CustomScanner.kt → ...x/scanbridge/db/entities/CustomScanner.kt
diff --git a/...imx/scanbridge/db/entities/ScannedPage.kt → ...imx/scanbridge/db/entities/ScannedPage.kt b/...imx/scanbridge/db/entities/ScannedPage.kt → ...imx/scanbridge/db/entities/ScannedPage.kt
diff --git a/...hrisimx/scanbridge/db/entities/Session.kt → ...hrisimx/scanbridge/db/entities/Session.kt b/...hrisimx/scanbridge/db/entities/Session.kt → ...hrisimx/scanbridge/db/entities/Session.kt
diff --git a/...risimx/scanbridge/db/entities/TempFile.kt → ...risimx/scanbridge/db/entities/TempFile.kt b/...risimx/scanbridge/db/entities/TempFile.kt → ...risimx/scanbridge/db/entities/TempFile.kt
diff --git a/...peconverters/ScanSettingsTypeConverter.kt → ...peconverters/ScanSettingsTypeConverter.kt b/...peconverters/ScanSettingsTypeConverter.kt → ...peconverters/ScanSettingsTypeConverter.kt
diff --git a/...erters/ScanSettingsUiDataTypeConverter.kt → ...erters/ScanSettingsUiDataTypeConverter.kt b/...erters/ScanSettingsUiDataTypeConverter.kt → ...erters/ScanSettingsUiDataTypeConverter.kt
diff --git a/...dge/db/typeconverters/UrlTypeConverter.kt → ...dge/db/typeconverters/UrlTypeConverter.kt b/...dge/db/typeconverters/UrlTypeConverter.kt → ...dge/db/typeconverters/UrlTypeConverter.kt
diff --git a/...ge/db/typeconverters/UuidTypeConverter.kt → ...ge/db/typeconverters/UuidTypeConverter.kt b/...ge/db/typeconverters/UuidTypeConverter.kt → ...ge/db/typeconverters/UuidTypeConverter.kt
diff --git a/...ub/chrisimx/scanbridge/logs/FileLogger.kt → ...ub/chrisimx/scanbridge/logs/FileLogger.kt b/...ub/chrisimx/scanbridge/logs/FileLogger.kt → ...ub/chrisimx/scanbridge/logs/FileLogger.kt
diff --git a/...nbridge/services/AndroidLocaleProvider.kt → ...nbridge/services/AndroidLocaleProvider.kt b/...nbridge/services/AndroidLocaleProvider.kt → ...nbridge/services/AndroidLocaleProvider.kt
diff --git a/...mx/scanbridge/services/DebugLogService.kt → ...mx/scanbridge/services/DebugLogService.kt b/...mx/scanbridge/services/DebugLogService.kt → ...mx/scanbridge/services/DebugLogService.kt
diff --git a/...canbridge/services/FileDebugLogService.kt → ...canbridge/services/FileDebugLogService.kt b/...canbridge/services/FileDebugLogService.kt → ...canbridge/services/FileDebugLogService.kt
diff --git a/...imx/scanbridge/services/LocaleProvider.kt → ...imx/scanbridge/services/LocaleProvider.kt b/...imx/scanbridge/services/LocaleProvider.kt → ...imx/scanbridge/services/LocaleProvider.kt
diff --git a/.../scanbridge/services/ScanJobRepository.kt → .../scanbridge/services/ScanJobRepository.kt b/.../scanbridge/services/ScanJobRepository.kt → .../scanbridge/services/ScanJobRepository.kt
diff --git a/...bridge/stores/DefaultScanSettingsStore.kt → ...bridge/stores/DefaultScanSettingsStore.kt b/...bridge/stores/DefaultScanSettingsStore.kt → ...bridge/stores/DefaultScanSettingsStore.kt
diff --git a/...bridge/stores/LegacyCustomScannerStore.kt → ...bridge/stores/LegacyCustomScannerStore.kt b/...bridge/stores/LegacyCustomScannerStore.kt → ...bridge/stores/LegacyCustomScannerStore.kt
diff --git a/.../scanbridge/stores/LegacySessionsStore.kt → .../scanbridge/stores/LegacySessionsStore.kt b/.../scanbridge/stores/LegacySessionsStore.kt → .../scanbridge/stores/LegacySessionsStore.kt
diff --git a/...github/chrisimx/scanbridge/theme/Color.kt → ...github/chrisimx/scanbridge/theme/Color.kt b/...github/chrisimx/scanbridge/theme/Color.kt → ...github/chrisimx/scanbridge/theme/Color.kt
diff --git a/.../github/chrisimx/scanbridge/theme/Font.kt → .../github/chrisimx/scanbridge/theme/Font.kt b/.../github/chrisimx/scanbridge/theme/Font.kt → .../github/chrisimx/scanbridge/theme/Font.kt
diff --git a/...github/chrisimx/scanbridge/theme/Theme.kt → ...github/chrisimx/scanbridge/theme/Theme.kt b/...github/chrisimx/scanbridge/theme/Theme.kt → ...github/chrisimx/scanbridge/theme/Theme.kt
diff --git a/...b/chrisimx/scanbridge/theme/Typography.kt → ...b/chrisimx/scanbridge/theme/Typography.kt b/...b/chrisimx/scanbridge/theme/Typography.kt → ...b/chrisimx/scanbridge/theme/Typography.kt
diff --git a/...anbridge/uicomponents/CrashFileHandler.kt → ...anbridge/uicomponents/CrashFileHandler.kt b/...anbridge/uicomponents/CrashFileHandler.kt → ...anbridge/uicomponents/CrashFileHandler.kt
diff --git a/...scanbridge/uicomponents/CroppableImage.kt → ...scanbridge/uicomponents/CroppableImage.kt b/...scanbridge/uicomponents/CroppableImage.kt → ...scanbridge/uicomponents/CroppableImage.kt
diff --git a/...ridge/uicomponents/ExportSettingsPopup.kt → ...ridge/uicomponents/ExportSettingsPopup.kt b/...ridge/uicomponents/ExportSettingsPopup.kt → ...ridge/uicomponents/ExportSettingsPopup.kt
diff --git a/...anbridge/uicomponents/FoundScannerItem.kt → ...anbridge/uicomponents/FoundScannerItem.kt b/...anbridge/uicomponents/FoundScannerItem.kt → ...anbridge/uicomponents/FoundScannerItem.kt
diff --git a/...canbridge/uicomponents/FullScreenError.kt → ...canbridge/uicomponents/FullScreenError.kt b/...canbridge/uicomponents/FullScreenError.kt → ...canbridge/uicomponents/FullScreenError.kt
diff --git a/.../scanbridge/uicomponents/LoadingScreen.kt → .../scanbridge/uicomponents/LoadingScreen.kt b/.../scanbridge/uicomponents/LoadingScreen.kt → .../scanbridge/uicomponents/LoadingScreen.kt
diff --git a/.../uicomponents/SizeBasedConditionalView.kt → .../uicomponents/SizeBasedConditionalView.kt b/.../uicomponents/SizeBasedConditionalView.kt → .../uicomponents/SizeBasedConditionalView.kt
diff --git a/...uicomponents/TemporaryFileHandlePrompt.kt → ...uicomponents/TemporaryFileHandlePrompt.kt b/...uicomponents/TemporaryFileHandlePrompt.kt → ...uicomponents/TemporaryFileHandlePrompt.kt
diff --git a/...imx/scanbridge/uicomponents/TitledCard.kt → ...imx/scanbridge/uicomponents/TitledCard.kt b/...imx/scanbridge/uicomponents/TitledCard.kt → ...imx/scanbridge/uicomponents/TitledCard.kt
diff --git a/...bridge/uicomponents/ValidatedTextField.kt → ...bridge/uicomponents/ValidatedTextField.kt b/...bridge/uicomponents/ValidatedTextField.kt → ...bridge/uicomponents/ValidatedTextField.kt