Skip to content

refactor: make openNfcSettings nullable on PlatformActions #235

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
codebutler merged 1 commit into from
Feb 17, 2026
Merged

refactor: make openNfcSettings nullable on PlatformActions #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions app/desktop/src/jvmMain/kotlin/com/codebutler/farebot/desktop/DesktopPlatformActions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ class DesktopPlatformActions : PlatformActions {
}
}

override fun openNfcSettings() {
// No NFC settings on desktop
}
// openNfcSettings not overridden — no NFC settings on desktop

override fun copyToClipboard(text: String) {
val clipboard = Toolkit.getDefaultToolkit().systemClipboard
Expand Down
2 changes: 1 addition & 1 deletion ...src/androidMain/kotlin/com/codebutler/farebot/app/core/platform/AndroidPlatformActions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class AndroidPlatformActions(
context.startActivity(intent)
}

override fun openNfcSettings() {
override val openNfcSettings: (() -> Unit) = {
val intent = Intent(Settings.ACTION_WIRELESS_SETTINGS)
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
context.startActivity(intent)
Expand Down
2 changes: 1 addition & 1 deletion app/src/commonMain/kotlin/com/codebutler/farebot/shared/App.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ fun FareBotApp(
null
},
onOpenAbout = { platformActions.openUrl("https://codebutler.github.io/farebot") },
onOpenNfcSettings = { platformActions.openNfcSettings() },
onOpenNfcSettings = platformActions.openNfcSettings,
onToggleShowAllScans = { historyViewModel.toggleShowAllScans() },
onAddAllSamples =
if (isDebug) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/commonMain/kotlin/com/codebutler/farebot/shared/platform/PlatformActions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package com.codebutler.farebot.shared.platform
interface PlatformActions {
fun openUrl(url: String)

fun openNfcSettings()
val openNfcSettings: (() -> Unit)? get() = null

fun copyToClipboard(text: String)

Expand Down
6 changes: 3 additions & 3 deletions app/src/commonMain/kotlin/com/codebutler/farebot/shared/ui/screen/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ fun HomeScreen(
onStatusChipTap: (String) -> Unit = {},
onNavigateToKeys: (() -> Unit)?,
onOpenAbout: () -> Unit,
onOpenNfcSettings: () -> Unit,
onOpenNfcSettings: (() -> Unit)? = null,
onAddAllSamples: (() -> Unit)? = null,
onSampleCardTap: ((CardInfo) -> Unit)? = null,
onToggleShowAllScans: () -> Unit = {},
Expand Down Expand Up @@ -576,7 +576,7 @@ fun HomeScreen(
ExtendedFloatingActionButton(
onClick = {
if (homeUiState.nfcStatus == NfcStatus.DISABLED) {
onOpenNfcSettings()
onOpenNfcSettings?.invoke()
} else {
onScanCard()
}
Expand Down Expand Up @@ -616,7 +616,7 @@ fun HomeScreen(
),
) {
// NFC disabled banner (scan tab only)
if (selectedTab == 0 && homeUiState.nfcStatus == NfcStatus.DISABLED) {
if (selectedTab == 0 && homeUiState.nfcStatus == NfcStatus.DISABLED && onOpenNfcSettings != null) {
Surface(
color = MaterialTheme.colorScheme.errorContainer,
modifier = Modifier.fillMaxWidth(),
Expand Down
2 changes: 1 addition & 1 deletion app/src/iosMain/kotlin/com/codebutler/farebot/shared/platform/IosPlatformActions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class IosPlatformActions : PlatformActions {
UIApplication.sharedApplication.openURL(nsUrl, emptyMap<Any?, Any>(), null)
}

override fun openNfcSettings() {
override val openNfcSettings: (() -> Unit) = {
val settingsUrl = NSURL(string = "App-prefs:root")
UIApplication.sharedApplication.openURL(settingsUrl, emptyMap<Any?, Any>(), null)
}
Expand Down
4 changes: 1 addition & 3 deletions app/web/src/wasmJsMain/kotlin/com/codebutler/farebot/web/WebPlatformActions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,7 @@ class WebPlatformActions : PlatformActions {
jsOpenUrl(url.toJsString())
}

override fun openNfcSettings() {
// No NFC settings on web
}
// openNfcSettings not overridden — no NFC settings on web

override fun copyToClipboard(text: String) {
jsCopyToClipboard(text.toJsString())
Expand Down