Skip to content

#102 follow-up: the scan sheet's eyebrow reads the locale observably; CI runs lint #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GonzRon merged 2 commits into from
Oct 5, 2026
Merged

#102 follow-up: the scan sheet's eyebrow reads the locale observably; CI runs lint #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9e77da
tag sheet eyebrow: read the locale observably (lint NonObservableLocale)
GonzRon Oct 5, 2026
ab5c728
ci: run lintDebug too
GonzRon Oct 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/kotlin/com/loosecannon/servicetag/ui/scan/TagResultSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down Expand Up @@ -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,
)
Expand Down