From fba54e024398f52e8401baea45c4e2d81295b1e7 Mon Sep 17 00:00:00 2001 From: Omni Devel Date: Sun, 14 Jun 2026 19:36:33 +0300 Subject: [PATCH] feat: added trimming card name functionality --- .../src/main/java/ru/omni_devel/cards/EditCardActivity.kt | 4 ++++ mobile/src/main/java/ru/omni_devel/cards/Utils.kt | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mobile/src/main/java/ru/omni_devel/cards/EditCardActivity.kt b/mobile/src/main/java/ru/omni_devel/cards/EditCardActivity.kt index 17aec13..ab4c21f 100644 --- a/mobile/src/main/java/ru/omni_devel/cards/EditCardActivity.kt +++ b/mobile/src/main/java/ru/omni_devel/cards/EditCardActivity.kt @@ -240,6 +240,8 @@ fun AddCard(innerPadding: PaddingValues, getDbFun: () -> DbHelper) { Button( modifier = Modifier.fillMaxWidth(), onClick = { + cardName = cardName.trim() + val err = checkCardData(cardName, codeValue) if (err == null) { @@ -287,6 +289,8 @@ fun EditCard(cardInfo: CardInfo, innerPadding: PaddingValues, getDbFun: () -> Db Button( modifier = Modifier.fillMaxWidth(), onClick = { + cardName = cardName.trim() + val err = checkCardData(cardName, codeValue) if (err == null) { diff --git a/mobile/src/main/java/ru/omni_devel/cards/Utils.kt b/mobile/src/main/java/ru/omni_devel/cards/Utils.kt index 3ce1351..ed76b3d 100644 --- a/mobile/src/main/java/ru/omni_devel/cards/Utils.kt +++ b/mobile/src/main/java/ru/omni_devel/cards/Utils.kt @@ -50,10 +50,12 @@ fun sendToWatch(context: Context, path: String, message: String, onResult: (Bool } fun checkCardData(name: String, value: String): String? { - if (name.trim().isEmpty()) { + if (name.isEmpty()) { return "Name should not be empty" - } else if (value.trim().isEmpty()) { + } else if (value.isEmpty()) { return "Code value should not be empty" + } else if (name.length > 32) { + return "Name must be shorter than 32 symbols" } return null