From 8c84eca8ebd126656e862ef7133ac79bdc7aeba7 Mon Sep 17 00:00:00 2001 From: rasputin Date: Fri, 12 Jun 2026 18:23:18 +0200 Subject: [PATCH] refactor: make linter happy --- .../ui/receive/BrightnessToggleButton.kt | 29 ------------------- .../gudariwallet/ui/receive/ReceiveScreen.kt | 3 +- .../gudariwallet/ui/send/ConfirmCard.kt | 3 +- .../gudariwallet/ui/send/PaymentPoller.kt | 3 +- .../gudariwallet/ui/send/SendScreen.kt | 3 +- .../gudariwallet/ui/send/SendViewModel.kt | 2 +- 6 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 app/src/main/java/com/bitcointxoko/gudariwallet/ui/receive/BrightnessToggleButton.kt diff --git a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/receive/BrightnessToggleButton.kt b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/receive/BrightnessToggleButton.kt deleted file mode 100644 index 02fe1d2..0000000 --- a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/receive/BrightnessToggleButton.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.bitcointxoko.gudariwallet.ui.receive - -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.BrightnessHigh -import androidx.compose.material.icons.filled.BrightnessLow -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton -import androidx.compose.material3.MaterialTheme -import androidx.compose.runtime.Composable -import com.bitcointxoko.gudariwallet.LocalAppStrings - -@Composable -internal fun BrightnessToggleButton( - isOn : Boolean, - onToggle: () -> Unit -) { - val strings = LocalAppStrings.current - - IconButton(onClick = onToggle) { - Icon( - imageVector = if (isOn) Icons.Filled.BrightnessHigh - else Icons.Filled.BrightnessLow, - contentDescription = if (isOn) strings.receive.brightnessReduce // ← "Reduce brightness" - else strings.receive.brightnessBoost, // ← "Boost brightness" - tint = if (isOn) MaterialTheme.colorScheme.primary - else MaterialTheme.colorScheme.onSurfaceVariant - ) - } -} diff --git a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/receive/ReceiveScreen.kt b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/receive/ReceiveScreen.kt index 97bc502..4be67cc 100644 --- a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/receive/ReceiveScreen.kt +++ b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/receive/ReceiveScreen.kt @@ -64,6 +64,7 @@ import com.bitcointxoko.gudariwallet.ui.nfc.NfcViewModel import com.bitcointxoko.gudariwallet.util.buildUpTaps import com.bitcointxoko.gudariwallet.util.fiatLabel import kotlinx.coroutines.delay +import kotlin.time.Duration.Companion.milliseconds @Composable fun ReceiveScreen( @@ -636,7 +637,7 @@ private fun ReceiveInvoiceContent( } LaunchedEffect(state.expiresAt) { while (secondsLeft > 0L) { - delay(1_000L) + delay(1_000L.milliseconds) secondsLeft = (state.expiresAt - System.currentTimeMillis() / 1000L) .coerceAtLeast(0L) } diff --git a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/send/ConfirmCard.kt b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/send/ConfirmCard.kt index d5ef03a..db562b1 100644 --- a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/send/ConfirmCard.kt +++ b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/send/ConfirmCard.kt @@ -37,6 +37,7 @@ import kotlinx.coroutines.delay import java.time.Instant import java.time.ZoneId import java.time.format.DateTimeFormatter +import kotlin.time.Duration.Companion.milliseconds @Composable internal fun Bolt11ConfirmCard( @@ -117,7 +118,7 @@ private fun ConfirmCardContent( var now by remember { mutableStateOf(Instant.now()) } LaunchedEffect(expiresAt) { while (true) { - delay(1_000L) + delay(1_000L.milliseconds) now = Instant.now() } } diff --git a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/send/PaymentPoller.kt b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/send/PaymentPoller.kt index 44a2eb0..2ec2c19 100644 --- a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/send/PaymentPoller.kt +++ b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/send/PaymentPoller.kt @@ -3,6 +3,7 @@ package com.bitcointxoko.gudariwallet.ui.send import timber.log.Timber import com.bitcointxoko.gudariwallet.data.WalletRepository import kotlinx.coroutines.delay +import kotlin.time.Duration.Companion.milliseconds class PaymentPoller(private val repo: WalletRepository) { @@ -19,7 +20,7 @@ class PaymentPoller(private val repo: WalletRepository) { maxAttempts : Int = 120, ): PollResult { repeat(maxAttempts) { attempt -> - delay(intervalMs) + delay(intervalMs.milliseconds) val detail = runCatching { repo.getPaymentDetail(paymentHash) }.getOrNull() diff --git a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/send/SendScreen.kt b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/send/SendScreen.kt index 8685d93..dbe0028 100644 --- a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/send/SendScreen.kt +++ b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/send/SendScreen.kt @@ -37,6 +37,7 @@ import com.bitcointxoko.gudariwallet.util.fiatLabel import com.bitcointxoko.gudariwallet.util.heavyClick import kotlinx.coroutines.delay import kotlinx.coroutines.launch +import kotlin.time.Duration.Companion.milliseconds @Composable fun SendScreen( @@ -218,7 +219,7 @@ fun SendScreen( var slowPayment by remember { mutableStateOf(false) } LaunchedEffect(Unit) { - delay(10_000L) + delay(10_000L.milliseconds) slowPayment = true } diff --git a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/send/SendViewModel.kt b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/send/SendViewModel.kt index e0f9b36..a2acba7 100644 --- a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/send/SendViewModel.kt +++ b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/send/SendViewModel.kt @@ -175,7 +175,7 @@ class SendViewModel( } } - private suspend fun emitPaymentSent( + private fun emitPaymentSent( paymentHash : String, amountSats : Long, feeSats : Long?,