@glassly/bluetooth-sdk 0.3.1-dev.493 → 0.3.1-dev.496

package/android/src/main/java/com/glassly/bluetoothsdk/GeneratedReleaseMetadata.kt

@@ -3,9 +3,9 @@ package com.glassly.bluetoothsdk
 /** Generated by release CI. Do not edit in a release checkout. */
 internal object GeneratedReleaseMetadata {
     const val FAMILY_BASE_VERSION: String = "0.3.1"
-    const val RELEASE_IDENTITY: String = "0.3.1-dev.493"
-    const val RELEASE_SET_ID: String = "glassly-0.3.1-dev.493"
-    const val SOURCE_COMMIT: String = "8b86621f767a38f48e6ff0524772f92c6488745b"
+    const val RELEASE_IDENTITY: String = "0.3.1-dev.496"
+    const val RELEASE_SET_ID: String = "glassly-0.3.1-dev.496"
+    const val SOURCE_COMMIT: String = "77c2bb7e91ed12c414e1eaa54c786a324f232c66"
     const val OTA_MANIFEST_URL: String = ""
     const val OTA_MANIFEST_SHA256: String = ""
 }

package/android/src/main/java/com/glassly/bluetoothsdk/sgcs/G1TextSanitizer.kt

@@ -3,36 +3,32 @@ package com.glassly.bluetoothsdk.sgcs
 import java.text.Normalizer
 
 private val G1_COMBINING_MARKS = Regex("\\p{M}+")
+private val G1_NON_LATIN1_RUN = Regex("[^\\u00C0-\\u00FF]+")
 
 /**
- * Converts text to the base Latin glyphs available in the Even Realities G1 firmware.
+ * Converts text to the Latin glyphs available in the Even Realities G1 firmware.
  *
- * G1 does not ship glyphs for combining diacritics. Normalize at the device boundary so
+ * G1 renders precomposed Latin-1 letters (ä, ö, ü, ß, é, ñ, ...) but has no glyphs for
+ * combining diacritics or letters beyond Latin-1. Normalize at the device boundary so
  * miniapps can retain the real text everywhere else and newer glasses receive it unchanged.
  */
 internal fun sanitizeG1DisplayText(text: String): String {
     val expanded = buildString(text.length) {
         text.forEach { character ->
             when (character) {
-                'Đ', 'Ð' -> append('D')
-                'đ', 'ð' -> append('d')
+                'Đ' -> append('D')
+                'đ' -> append('d')
                 'Ł' -> append('L')
                 'ł' -> append('l')
-                'Ø' -> append('O')
-                'ø' -> append('o')
-                'Æ' -> append("AE")
-                'æ' -> append("ae")
                 'Œ' -> append("OE")
                 'œ' -> append("oe")
                 'ẞ' -> append("SS")
-                'ß' -> append("ss")
-                'Þ' -> append("TH")
-                'þ' -> append("th")
                 else -> append(character)
             }
         }
     }
 
-    return Normalizer.normalize(expanded, Normalizer.Form.NFD)
-        .replace(G1_COMBINING_MARKS, "")
+    return G1_NON_LATIN1_RUN.replace(Normalizer.normalize(expanded, Normalizer.Form.NFC)) { run ->
+        Normalizer.normalize(run.value, Normalizer.Form.NFD).replace(G1_COMBINING_MARKS, "")
+    }
 }

package/android/src/test/java/com/glassly/bluetoothsdk/sgcs/G1TextSanitizerTest.kt

@@ -6,21 +6,27 @@ import org.junit.Test
 class G1TextSanitizerTest {
 
     @Test
-    fun `strips Vietnamese diacritics unsupported by G1`() {
-        assertThat(sanitizeG1DisplayText("Tiếng Việt: Đặng, Nguyễn, phở bò"))
-            .isEqualTo("Tieng Viet: Dang, Nguyen, pho bo")
+    fun `keeps Latin-1 letters G1 can render`() {
+        assertThat(sanitizeG1DisplayText("Äpfel, Öl, Übung, Straße, café, niño, Øresund, Æsir"))
+            .isEqualTo("Äpfel, Öl, Übung, Straße, café, niño, Øresund, Æsir")
     }
 
     @Test
-    fun `handles decomposed marks and preserves layout`() {
-        assertThat(sanitizeG1DisplayText("Cafe\u0301\nĐa Nang"))
-            .isEqualTo("Cafe\nDa Nang")
+    fun `composes decomposed Latin-1 letters`() {
+        assertThat(sanitizeG1DisplayText("scho\u0308n\nCafe\u0301"))
+            .isEqualTo("schön\nCafé")
     }
 
     @Test
-    fun `expands Latin letters that do not decompose into combining marks`() {
-        assertThat(sanitizeG1DisplayText("Øresund Łódź Æsir Œuvre Straße Ðingvellir Þingvellir"))
-            .isEqualTo("Oresund Lodz AEsir OEuvre Strasse Dingvellir THingvellir")
+    fun `strips diacritics beyond Latin-1`() {
+        assertThat(sanitizeG1DisplayText("Tiếng Việt: Đặng, Nguyễn, phở\nĐa Nang"))
+            .isEqualTo("Tieng Viet: Dang, Nguyen, pho\nDa Nang")
+    }
+
+    @Test
+    fun `expands letters beyond Latin-1 that do not decompose`() {
+        assertThat(sanitizeG1DisplayText("Łódź Œuvre œil STRAẞE"))
+            .isEqualTo("Lódz OEuvre oeil STRASSE")
     }
 
     @Test

package/build/generated/releaseMetadata.js

@@ -1,9 +1,9 @@
 export const BLUETOOTH_SDK_RELEASE_METADATA = Object.freeze({
     "schemaVersion": 1,
     "familyBaseVersion": "0.3.1",
-    "releaseIdentity": "0.3.1-dev.493",
-    "releaseSetId": "glassly-0.3.1-dev.493",
-    "sourceCommit": "8b86621f767a38f48e6ff0524772f92c6488745b",
+    "releaseIdentity": "0.3.1-dev.496",
+    "releaseSetId": "glassly-0.3.1-dev.496",
+    "sourceCommit": "77c2bb7e91ed12c414e1eaa54c786a324f232c66",
     "otaManifestUrl": null,
     "otaManifestSha256": null
 });

package/build/generated/releaseMetadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"releaseMetadata.js","sourceRoot":"","sources":["../../src/generated/releaseMetadata.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,8BAA8B,GAA0C,MAAM,CAAC,MAAM,CAAC;IACjG,eAAe,EAAE,CAAC;IAClB,mBAAmB,EAAE,OAAO;IAC5B,iBAAiB,EAAE,eAAe;IAClC,cAAc,EAAE,uBAAuB;IACvC,cAAc,EAAE,0CAA0C;IAC1D,gBAAgB,EAAE,IAAI;IACtB,mBAAmB,EAAE,IAAI;CAC1B,CAAC,CAAA","sourcesContent":["/** Generated by release CI. Do not edit in a release checkout. */\nexport interface BluetoothSdkReleaseMetadata {\n  schemaVersion: 1\n  familyBaseVersion: string | null\n  releaseIdentity: string | null\n  releaseSetId: string | null\n  sourceCommit: string | null\n  otaManifestUrl: string | null\n  otaManifestSha256: string | null\n}\n\nexport const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({\n  \"schemaVersion\": 1,\n  \"familyBaseVersion\": \"0.3.1\",\n  \"releaseIdentity\": \"0.3.1-dev.493\",\n  \"releaseSetId\": \"glassly-0.3.1-dev.493\",\n  \"sourceCommit\": \"8b86621f767a38f48e6ff0524772f92c6488745b\",\n  \"otaManifestUrl\": null,\n  \"otaManifestSha256\": null\n})\n"]}
+{"version":3,"file":"releaseMetadata.js","sourceRoot":"","sources":["../../src/generated/releaseMetadata.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,8BAA8B,GAA0C,MAAM,CAAC,MAAM,CAAC;IACjG,eAAe,EAAE,CAAC;IAClB,mBAAmB,EAAE,OAAO;IAC5B,iBAAiB,EAAE,eAAe;IAClC,cAAc,EAAE,uBAAuB;IACvC,cAAc,EAAE,0CAA0C;IAC1D,gBAAgB,EAAE,IAAI;IACtB,mBAAmB,EAAE,IAAI;CAC1B,CAAC,CAAA","sourcesContent":["/** Generated by release CI. Do not edit in a release checkout. */\nexport interface BluetoothSdkReleaseMetadata {\n  schemaVersion: 1\n  familyBaseVersion: string | null\n  releaseIdentity: string | null\n  releaseSetId: string | null\n  sourceCommit: string | null\n  otaManifestUrl: string | null\n  otaManifestSha256: string | null\n}\n\nexport const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({\n  \"schemaVersion\": 1,\n  \"familyBaseVersion\": \"0.3.1\",\n  \"releaseIdentity\": \"0.3.1-dev.496\",\n  \"releaseSetId\": \"glassly-0.3.1-dev.496\",\n  \"sourceCommit\": \"77c2bb7e91ed12c414e1eaa54c786a324f232c66\",\n  \"otaManifestUrl\": null,\n  \"otaManifestSha256\": null\n})\n"]}

package/ios/Source/BluetoothSdkDefaults.swift

@@ -11,7 +11,7 @@ enum BluetoothSdkDefaults {
     static let voiceActivityDetectionEnabled = false
     static let loudnessGateEnabled = true
     private static let infoSdkVersionKey = "BluetoothSdkVersion"
-    private static let swiftPackageSdkVersion = "0.3.1-dev.493"
+    private static let swiftPackageSdkVersion = "0.3.1-dev.496"
     private static let swiftPackageSdkVersionPlaceholder = "__GLASSLY" + "_BLUETOOTH_SDK_VERSION__"
 
     private static func normalizedSdkVersion(_ value: String?) -> String? {

package/ios/Source/GeneratedReleaseMetadata.swift

@@ -3,9 +3,9 @@ import Foundation
 /// Generated by release CI. Do not edit in a release checkout.
 enum GeneratedReleaseMetadata {
     static let familyBaseVersion = "0.3.1"
-    static let releaseIdentity = "0.3.1-dev.493"
-    static let releaseSetId = "glassly-0.3.1-dev.493"
-    static let sourceCommit = "8b86621f767a38f48e6ff0524772f92c6488745b"
+    static let releaseIdentity = "0.3.1-dev.496"
+    static let releaseSetId = "glassly-0.3.1-dev.496"
+    static let sourceCommit = "77c2bb7e91ed12c414e1eaa54c786a324f232c66"
     static let otaManifestUrl = ""
     static let otaManifestSha256 = ""
 }

package/ios/Source/utils/G1Text.swift

@@ -23,31 +23,29 @@ class G1Text {
 
     init() {}
 
-    /// Converts text to the base Latin glyphs available in G1 firmware.
+    /// Converts text to the Latin glyphs available in G1 firmware: precomposed Latin-1
+    /// letters (ä, ö, ü, ß, é, ñ, ...) pass through, anything beyond is folded to base Latin.
     /// Newer glasses bypass this G1-only transport and keep the original text.
     static func sanitizeForDisplay(_ text: String) -> String {
-        let expanded = text.reduce(into: "") { result, character in
+        let foldLocale = Locale(identifier: "en_US_POSIX")
+        return text.precomposedStringWithCanonicalMapping.reduce(into: "") { result, character in
             switch character {
-            case "Đ", "Ð": result.append("D")
-            case "đ", "ð": result.append("d")
+            case "Đ": result.append("D")
+            case "đ": result.append("d")
             case "Ł": result.append("L")
             case "ł": result.append("l")
-            case "Ø": result.append("O")
-            case "ø": result.append("o")
-            case "Æ": result.append("AE")
-            case "æ": result.append("ae")
             case "Œ": result.append("OE")
             case "œ": result.append("oe")
             case "ẞ": result.append("SS")
-            case "ß": result.append("ss")
-            case "Þ": result.append("TH")
-            case "þ": result.append("th")
-            default: result.append(character)
+            default:
+                let scalars = character.unicodeScalars
+                if scalars.count == 1, let scalar = scalars.first, (0xC0 ... 0xFF).contains(scalar.value) {
+                    result.append(character)
+                } else {
+                    result.append(String(character).folding(options: .diacriticInsensitive, locale: foldLocale))
+                }
             }
         }
-
-        return expanded
-            .folding(options: .diacriticInsensitive, locale: Locale(identifier: "en_US_POSIX"))
     }
 
     // MARK: - Text Wall Methods

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glassly/bluetooth-sdk",
-  "version": "0.3.1-dev.493",
+  "version": "0.3.1-dev.496",
   "description": "SDK for communicating with smart glasses",
   "main": "build/index.js",
   "react-native": "src/index.ts",

package/src/generated/releaseMetadata.ts

@@ -12,9 +12,9 @@ export interface BluetoothSdkReleaseMetadata {
 export const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({
   "schemaVersion": 1,
   "familyBaseVersion": "0.3.1",
-  "releaseIdentity": "0.3.1-dev.493",
-  "releaseSetId": "glassly-0.3.1-dev.493",
-  "sourceCommit": "8b86621f767a38f48e6ff0524772f92c6488745b",
+  "releaseIdentity": "0.3.1-dev.496",
+  "releaseSetId": "glassly-0.3.1-dev.496",
+  "sourceCommit": "77c2bb7e91ed12c414e1eaa54c786a324f232c66",
   "otaManifestUrl": null,
   "otaManifestSha256": null
 })