taler-android

Android apps for GNU Taler (wallet, PoS, cashier)
Log | Files | Refs | README | LICENSE

commit 77cd47efdcb724a87bda4c374b84015894753799
parent 194ce1a1b538d06f6d4afe1c704e2fc060eb2ed8
Author: Bohdan Potuzhnyi <bohdan.potuzhnyi@gmail.com>
Date:   Fri, 26 Jun 2026 12:12:12 +0200

[POS] quick fix of the found bug + 1.6.2

Diffstat:
Mmerchant-terminal/build.gradle | 4++--
Mmerchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt | 2+-
Mmerchant-terminal/src/main/java/net/taler/merchantpos/order/OrderFragment.kt | 9++++++---
3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/merchant-terminal/build.gradle b/merchant-terminal/build.gradle @@ -13,8 +13,8 @@ android { applicationId "net.taler.merchantpos" minSdkVersion 23 targetSdkVersion 36 - versionCode 24 - versionName "1.6.1" + versionCode 25 + versionName "1.6.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" buildConfigField("String", "BACKEND_API_VERSION", "\"20:0:8\"") diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt @@ -295,7 +295,7 @@ class ConfigManager( @UiThread fun refreshConfigInBackground() { if (!config.isValid() || !config.hasPassword()) return - fetchConfig(config, save = false, inventoryOnly = false, silent = true) + fetchConfig(config, save = false, inventoryOnly = true, silent = true) } @UiThread diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderFragment.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/order/OrderFragment.kt @@ -48,6 +48,7 @@ import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedButton import androidx.compose.material3.OutlinedTextField @@ -68,6 +69,7 @@ import androidx.compose.ui.graphics.asImageBitmap import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.ViewCompositionStrategy +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign @@ -730,9 +732,10 @@ private fun OrderActionBar( Text("-1", style = if (compact) MaterialTheme.typography.labelLarge else MaterialTheme.typography.bodyMedium) } Button(onClick = onAddCustom, colors = orderControlButtonColors()) { - Text( - stringResource(R.string.order_custom_product_default), - style = if (compact) MaterialTheme.typography.labelLarge else MaterialTheme.typography.bodyMedium, + Icon( + painter = painterResource(R.drawable.ic_dialpad), + contentDescription = stringResource(R.string.order_custom), + modifier = Modifier.size(if (compact) 20.dp else 24.dp), ) } }