Merge branch 'main' into skit-580-holder-qr-code-reader-button

spruceid · Oct 7, 2024 · 78e44e5 · 78e44e5
2 parents 0f7f8c1 + 04bca18
commit 78e44e5
Show file tree

Hide file tree

Showing 10 changed files with 577 additions and 291 deletions.
diff --git a/MobileSdk/build.gradle.kts b/MobileSdk/build.gradle.kts
@@ -1,138 +1,140 @@
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
-    `maven-publish`
-    id("signing")
-    id("com.gradleup.nmcp")
+  id("com.android.library")
+  id("org.jetbrains.kotlin.android")
+  `maven-publish`
+  id("signing")
+  id("com.gradleup.nmcp")
 }
 
 publishing {
-    repositories {
-        maven {
-            name = "GitHubPackages"
-            url = uri("https://maven.pkg.github.com/spruceid/mobile-sdk-kt")
-            credentials {
-                username = System.getenv("GITHUB_ACTOR")
-                password = System.getenv("GITHUB_TOKEN")
-            }
-        }
+  repositories {
+    maven {
+      name = "GitHubPackages"
+      url = uri("https://maven.pkg.github.com/spruceid/mobile-sdk-kt")
+      credentials {
+        username = System.getenv("GITHUB_ACTOR")
+        password = System.getenv("GITHUB_TOKEN")
+      }
+    }
+  }
+  publications {
+    create<MavenPublication>("debug") {
+      groupId = "com.spruceid.mobile.sdk"
+      artifactId = "mobilesdk"
+      version = System.getenv("VERSION")
+
+      afterEvaluate { from(components["release"]) }
     }
-    publications {
-        // Creates a Maven publication called "release".
-        create<MavenPublication>("release") {
-            groupId = "com.spruceid.mobile.sdk"
-            artifactId = "mobilesdk"
-            version = System.getenv("VERSION")
-
-            afterEvaluate {
-                from(components["release"])
-            }
-
-            pom {
-                packaging = "aar"
-                name.set("mobilesdk")
-                description.set("Android SpruceID Mobile SDK")
-                url.set("https://github.com/spruceid/mobile-sdk-kt")
-                licenses {
-                    license {
-                        name.set("MIT License")
-                        url.set("https://opensource.org/license/mit/")
-                    }
-                    license {
-                        name.set("Apache License, Version 2.0")
-                        url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
-                    }
-                }
-                developers {
-                    developer {
-                        name.set("Spruce Systems, Inc.")
-                        email.set("[email protected]")
-                    }
-                }
-                scm {
-                    url.set(pom.url.get())
-                    connection.set("scm:git:${url.get()}.git")
-                    developerConnection.set("scm:git:${url.get()}.git")
-                }
-            }
+    // Creates a Maven publication called "release".
+    create<MavenPublication>("release") {
+      groupId = "com.spruceid.mobile.sdk"
+      artifactId = "mobilesdk"
+      version = System.getenv("VERSION")
+
+      afterEvaluate { from(components["release"]) }
+
+      pom {
+        packaging = "aar"
+        name.set("mobilesdk")
+        description.set("Android SpruceID Mobile SDK")
+        url.set("https://github.com/spruceid/mobile-sdk-kt")
+        licenses {
+          license {
+            name.set("MIT License")
+            url.set("https://opensource.org/license/mit/")
+          }
+          license {
+            name.set("Apache License, Version 2.0")
+            url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+          }
+        }
+        developers {
+          developer {
+            name.set("Spruce Systems, Inc.")
+            email.set("[email protected]")
+          }
         }
+        scm {
+          url.set(pom.url.get())
+          connection.set("scm:git:${url.get()}.git")
+          developerConnection.set("scm:git:${url.get()}.git")
+        }
+      }
     }
+  }
 }
 
 signing {
-    useGpgCmd()
-    sign(publishing.publications["release"])
+  useGpgCmd()
+  sign(publishing.publications["release"])
 }
 
 nmcp {
-    afterEvaluate {
-        publish("release") {
-            username = System.getenv("MAVEN_USERNAME")
-            password = System.getenv("MAVEN_PASSWORD")
-            publicationType = "AUTOMATIC"
-        }
+  afterEvaluate {
+    publish("release") {
+      username = System.getenv("MAVEN_USERNAME")
+      password = System.getenv("MAVEN_PASSWORD")
+      publicationType = "AUTOMATIC"
     }
+  }
 }
 
-
 android {
     namespace = "com.spruceid.mobile.sdk"
     compileSdk = 35
 
-    defaultConfig {
-        minSdk = 26
+  defaultConfig {
+    minSdk = 26
 
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
-    }
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    consumerProguardFiles("consumer-rules.pro")
+  }
 
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
-        }
+  buildTypes {
+    release {
+      isMinifyEnabled = false
+      proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
     }
+  }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
+  compileOptions {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+  }
 
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
+  kotlinOptions { jvmTarget = "1.8" }
 
-    buildFeatures {
-        compose = true
-        viewBinding = true
-    }
+  buildFeatures {
+    compose = true
+    viewBinding = true
+  }
 
-    composeOptions { kotlinCompilerExtensionVersion = "1.5.11" }
+  composeOptions { kotlinCompilerExtensionVersion = "1.5.11" }
 
-    publishing {
-        singleVariant("release") {
-            withSourcesJar()
-            withJavadocJar()
-        }
+  publishing {
+    singleVariant("release") {
+      withSourcesJar()
+      withJavadocJar()
     }
+  }
 }
 
 dependencies {
-    api("com.spruceid.mobile.sdk.rs:mobilesdkrs:0.0.32")
-    //noinspection GradleCompatible
-    implementation("com.android.support:appcompat-v7:28.0.0")
-    /* Begin UI dependencies */
-    implementation("androidx.compose.material3:material3:1.2.1")
-    implementation("androidx.camera:camera-camera2:1.3.2")
-    implementation("androidx.camera:camera-lifecycle:1.3.2")
-    implementation("androidx.camera:camera-view:1.3.2")
-    implementation("com.google.zxing:core:3.5.1")
-    implementation("com.google.accompanist:accompanist-permissions:0.34.0")
-    implementation("androidx.camera:camera-mlkit-vision:1.3.0-alpha06")
-    implementation("com.google.android.gms:play-services-mlkit-text-recognition:19.0.0")
-    /* End UI dependencies */
-    implementation("androidx.datastore:datastore-preferences:1.1.1")
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("com.android.support.test:runner:1.0.2")
-    androidTestImplementation("com.android.support.test.espresso:espresso-core:3.0.2")
+  api("com.spruceid.mobile.sdk.rs:mobilesdkrs:0.0.32")
+  //noinspection GradleCompatible
+  implementation("com.android.support:appcompat-v7:28.0.0")
+  /* Begin UI dependencies */
+  implementation("androidx.compose.material3:material3:1.2.1")
+  implementation("androidx.camera:camera-camera2:1.3.2")
+  implementation("androidx.camera:camera-lifecycle:1.3.2")
+  implementation("androidx.camera:camera-view:1.3.2")
+  implementation("com.google.zxing:core:3.5.1")
+  implementation("com.google.accompanist:accompanist-permissions:0.34.0")
+  implementation("androidx.camera:camera-mlkit-vision:1.3.0-alpha06")
+  implementation("com.google.android.gms:play-services-mlkit-text-recognition:19.0.0")
+  /* End UI dependencies */
+  implementation("androidx.datastore:datastore-preferences:1.1.1")
+  testImplementation("junit:junit:4.13.2")
+  androidTestImplementation("com.android.support.test:runner:1.0.2")
+  androidTestImplementation("com.android.support.test.espresso:espresso-core:3.0.2")
 }
diff --git a/MobileSdk/src/main/java/com/spruceid/mobile/sdk/BleCentral.kt b/MobileSdk/src/main/java/com/spruceid/mobile/sdk/BleCentral.kt
@@ -56,7 +56,7 @@ class BleCentral(
     /**
      * Starts to scan for devices/peripherals to connect to - looks for a specific service UUID.
      *
-     * Scanning is limited with a timeout to preserve batter life of a device.
+     * Scanning is limited with a timeout to preserve battery life of a device.
      */
     fun scan() {
         val filter: ScanFilter = ScanFilter.Builder()
@@ -153,4 +153,4 @@ fun isBluetoothEnabled(context: Context): Boolean {
 
 fun getBluetoothManager(context: Context): BluetoothManager? {
     return context.getSystemService(BLUETOOTH_SERVICE) as? BluetoothManager
-}
+}