From cc20263574b38c5d9379ea0d951ea88436d87997 Mon Sep 17 00:00:00 2001 From: amacdia0507b Date: Sat, 26 Sep 2026 13:22:27 +0200 Subject: [PATCH 1/2] Migrate CatimaBarcodeWithValue to Kotlin --- .../card_locker/CatimaBarcodeWithValue.java | 19 ------------------- .../card_locker/CatimaBarcodeWithValue.kt | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 19 deletions(-) delete mode 100644 app/src/main/java/protect/card_locker/CatimaBarcodeWithValue.java create mode 100644 app/src/main/java/protect/card_locker/CatimaBarcodeWithValue.kt diff --git a/app/src/main/java/protect/card_locker/CatimaBarcodeWithValue.java b/app/src/main/java/protect/card_locker/CatimaBarcodeWithValue.java deleted file mode 100644 index cd02ea3ee7..0000000000 --- a/app/src/main/java/protect/card_locker/CatimaBarcodeWithValue.java +++ /dev/null @@ -1,19 +0,0 @@ -package protect.card_locker; - -public class CatimaBarcodeWithValue { - private final CatimaBarcode mCatimaBarcode; - private final String mValue; - - public CatimaBarcodeWithValue(CatimaBarcode catimaBarcode, String value) { - mCatimaBarcode = catimaBarcode; - mValue = value; - } - - public CatimaBarcode catimaBarcode() { - return mCatimaBarcode; - } - - public String value() { - return mValue; - } -} diff --git a/app/src/main/java/protect/card_locker/CatimaBarcodeWithValue.kt b/app/src/main/java/protect/card_locker/CatimaBarcodeWithValue.kt new file mode 100644 index 0000000000..2ea6b6fee9 --- /dev/null +++ b/app/src/main/java/protect/card_locker/CatimaBarcodeWithValue.kt @@ -0,0 +1,14 @@ +package protect.card_locker + +class CatimaBarcodeWithValue( + private val mCatimaBarcode: CatimaBarcode?, + private val mValue: String? +) { + fun catimaBarcode(): CatimaBarcode? { + return mCatimaBarcode + } + + fun value(): String? { + return mValue + } +} From cf8f5385cec0044ebcf78d4f8c841312193fb53a Mon Sep 17 00:00:00 2001 From: amacdia0507b Date: Sat, 26 Sep 2026 13:36:32 +0200 Subject: [PATCH 2/2] Make mCatimaBarcode non-nullable --- .../main/java/protect/card_locker/CatimaBarcodeWithValue.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/protect/card_locker/CatimaBarcodeWithValue.kt b/app/src/main/java/protect/card_locker/CatimaBarcodeWithValue.kt index 2ea6b6fee9..5fe48c93e8 100644 --- a/app/src/main/java/protect/card_locker/CatimaBarcodeWithValue.kt +++ b/app/src/main/java/protect/card_locker/CatimaBarcodeWithValue.kt @@ -1,10 +1,10 @@ package protect.card_locker class CatimaBarcodeWithValue( - private val mCatimaBarcode: CatimaBarcode?, + private val mCatimaBarcode: CatimaBarcode, private val mValue: String? ) { - fun catimaBarcode(): CatimaBarcode? { + fun catimaBarcode(): CatimaBarcode { return mCatimaBarcode }