Merge pull request #77 from what3words/staging

2.0.1

Author: phpduy

.github/workflows/BuildTest.yml

@@ -59,7 +59,7 @@ jobs:
           -Pandroid.experimental.testOptions.managedDevices.setupTimeoutMinutes=5
 
       - name: Upload test results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-results
           path: lib/build/outputs/androidTest-results

.github/workflows/Release.yml

@@ -40,11 +40,11 @@ jobs:
           echo "OSSRH_PASSWORD=${OSSRH_PASSWORD}">> ~/.gradle/gradle.properties
           echo "SIGNING_KEY=${GPG_SIGNING_KEY}">> ~/.gradle/gradle.properties
           echo "SIGNING_KEY_PWD=${SIGNING_KEY_PWD}">> ~/.gradle/gradle.properties
-          cat ~/.gradle/gradle.properties
 
       - name: Snapshot Release Check
         run: |
-          echo -e "\nIS_SNAPSHOT_RELEASE=$( [[ "${CIRCLE_BRANCH}" =~ ^epic.* ]] && echo true || echo false )" >> gradle.properties
+          echo -e "\nIS_SNAPSHOT_RELEASE=$( [[ "${{ github.ref_name }}" == epic/* ]] && echo true || echo false )" >> ~/.gradle/gradle.properties
+          cat ~/.gradle/gradle.properties
 
       - name: Publish to Maven
         run: ./gradlew assemble publish

gradle.properties

@@ -22,4 +22,4 @@ kotlin.code.style=official
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 android.nonFinalResIds=false
-LIBRARY_VERSION = 2.0.0
+LIBRARY_VERSION = 2.0.1

lib/build.gradle.kts

@@ -114,18 +114,19 @@ dependencies {
 
     // what3words
     api("com.what3words:w3w-android-wrapper:4.0.2")
-    api("com.what3words:w3w-android-design-library:2.0.3")
+    api("com.what3words:w3w-android-design-library:2.0.4")
     api("com.what3words:w3w-core-android:1.1.0")
 
     //compose
-    implementation(platform("androidx.compose:compose-bom:2024.06.00"))
+    implementation(platform("androidx.compose:compose-bom:2025.01.01"))
     implementation("androidx.compose.runtime:runtime")
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-tooling")
     implementation("androidx.activity:activity-compose")
     implementation("androidx.compose.ui:ui-tooling-preview")
-    implementation("androidx.constraintlayout:constraintlayout-compose")
     implementation("androidx.compose.material3:material3")
+    implementation("androidx.constraintlayout:constraintlayout-compose:1.0.1")
+
 
     // gms for module install
     implementation("com.google.android.gms:play-services-base:18.5.0")

lib/src/main/java/com/what3words/ocr/components/internal/W3WImageAnalyzer.kt

@@ -6,7 +6,7 @@ import androidx.camera.core.ExperimentalGetImage
 import androidx.camera.core.ImageAnalysis
 import androidx.camera.core.ImageProxy
 import androidx.compose.ui.layout.LayoutCoordinates
-import androidx.compose.ui.layout.positionInRoot
+import androidx.compose.ui.layout.positionInParent
 import com.what3words.core.types.common.W3WError
 import com.what3words.core.types.image.W3WImage
 import com.what3words.ocr.components.extensions.BitmapUtils
@@ -28,10 +28,11 @@ internal class W3WImageAnalyzer(
         BitmapUtils.getBitmap(imageProxy)?.let { bitmap ->
             val bitmapToBeScanned = try {
                 if (cropLayoutCoordinates.isAttached && cameraLayoutCoordinates.isAttached) {
+
                     val x1: Float =
-                        (cropLayoutCoordinates.positionInRoot().x * bitmap.width) / cameraLayoutCoordinates.size.width
+                        (cropLayoutCoordinates.positionInParent().x * bitmap.width) / cameraLayoutCoordinates.size.width
                     val y1: Float =
-                        (cropLayoutCoordinates.positionInRoot().y * bitmap.height) / cameraLayoutCoordinates.size.height
+                        (cropLayoutCoordinates.positionInParent().y * bitmap.height) / cameraLayoutCoordinates.size.height
                     val width1: Int =
                         (cropLayoutCoordinates.size.width * bitmap.width) / cameraLayoutCoordinates.size.width
                     val height1: Int =

lib/src/main/java/com/what3words/ocr/components/ui/OcrScanComposable.kt

@@ -72,6 +72,7 @@ import com.what3words.design.library.ui.components.What3wordsAddressListItem
 import com.what3words.design.library.ui.components.What3wordsAddressListItemDefaults
 import com.what3words.design.library.ui.models.DisplayUnits
 import com.what3words.design.library.ui.theme.W3WTheme
+import com.what3words.design.library.ui.theme.colors_blue_20
 import com.what3words.design.library.ui.theme.w3wColorScheme
 import com.what3words.ocr.components.R
 import com.what3words.ocr.components.internal.buildW3WImageAnalysis
@@ -140,13 +141,13 @@ object W3WOcrScannerDefaults {
     @Composable
     fun defaultColors(
         bottomDrawerBackground: Color = MaterialTheme.colorScheme.surfaceContainerLowest,
-        overlayBackground: Color = Color(0x990A3049),
+        overlayBackground: Color = colors_blue_20.copy(0.6f),
         stateTextColor: Color = MaterialTheme.colorScheme.onSecondaryContainer,
         listHeaderTextColor: Color = MaterialTheme.colorScheme.onSurfaceVariant,
         gripColor: Color = MaterialTheme.colorScheme.outline,
-        closeIconColor: Color = Color.White,
-        logoColor: Color = Color.White,
-        shutterInactiveColor: Color = Color.White,
+        closeIconColor: Color = MaterialTheme.w3wColorScheme.onSurfaceWhite,
+        logoColor: Color = MaterialTheme.w3wColorScheme.onSurfaceWhite,
+        shutterInactiveColor: Color = MaterialTheme.w3wColorScheme.onSurfaceWhite,
         shutterActiveColor: Color = MaterialTheme.w3wColorScheme.success,
     ): Colors {
         return Colors(