diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 053516fb..6b77604f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: - name: assert the shared library is initialised at the pinned tag run: bash tools/check-submodule-pin.sh - name: unit tests and debug build - run: ./gradlew :nfc-core:test :nfc-android:testDebugUnitTest :core:test :app:testDebugUnitTest :app:assembleDebug :app:compileDebugAndroidTestKotlin :share-test-sender:assembleDebug --console=plain + run: ./gradlew :nfc-core:test :nfc-android:testDebugUnitTest :core:test :app:testDebugUnitTest :app:assembleDebug :app:compileDebugAndroidTestKotlin :app:lintDebug :share-test-sender:assembleDebug --console=plain - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 if: always() with: diff --git a/app/src/main/kotlin/com/loosecannon/servicetag/ui/scan/TagResultSheet.kt b/app/src/main/kotlin/com/loosecannon/servicetag/ui/scan/TagResultSheet.kt index 56b4456c..fd807958 100644 --- a/app/src/main/kotlin/com/loosecannon/servicetag/ui/scan/TagResultSheet.kt +++ b/app/src/main/kotlin/com/loosecannon/servicetag/ui/scan/TagResultSheet.kt @@ -37,7 +37,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.platform.LocalLocale import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp @@ -56,7 +56,6 @@ import com.loosecannon.servicetag.ui.theme.ServiceTagTheme import com.loosecannon.servicetag.ui.transfer.TransferStrings import com.loosecannon.servicetag.ui.theme.SheetShape import com.loosecannon.servicetag.ui.theme.SheetSentence -import java.util.Locale /** * What a scanned (format, key) pair turned out to be — including "not ours" @@ -337,7 +336,7 @@ internal fun NfcSheet( } Text( // The eyebrow's capitals follow the rules of the language it is written in (#102). - text = eyebrow.uppercase(LocalConfiguration.current.locales[0] ?: Locale.getDefault()), // l10n-ok: casing follows the configuration's locale + text = eyebrow.uppercase(LocalLocale.current.platformLocale), // l10n-ok: casing follows the composition's locale style = MaterialTheme.typography.labelMedium.copy(fontWeight = FontWeight.Bold), color = accent, )