diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 745e659..e48e15a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,3 +1,4 @@ +#file: noinspection SpellCheckingInspection name: CI-Android APK @@ -9,7 +10,7 @@ on: push: branches: [ main ] tags: - - '**' + - '**' pull_request: branches: [ main ] workflow_dispatch: diff --git a/README.md b/README.md index c97d6b1..1d474b1 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ + + + +
A minimalist fidelity/loyalty card plugin
@@ -28,6 +32,7 @@ - Recently used history for fast access - Protect entries from caching - Minimalist design and features +- Supported Formats: CODE_39, CODE_93, CODE_128, EAN_8, EAN_13, UPC_A, UPC_E, UPC_EAN, CODE_QR, PDF_417, AZTEC, CODABAR, MAXICODE, DATA_MATRIX, ITF, RSS_14, RSS_EXPANDED ## 📳 Installation @@ -54,7 +59,6 @@ Keepass-Fidelity is a user-driven project. We welcome any contribution, big or s Thanks to all contributors, the developers of our dependencies, and our users. - ## 📝 License ``` diff --git a/app/build.gradle b/app/build.gradle index f2e9d77..dabb3bd 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -65,17 +65,13 @@ android { dependencies { - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.0.4' - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'androidx.core:core-ktx:1.12.0' - implementation 'androidx.preference:preference-ktx:1.2.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.camera:camera-camera2:1.3.2' + implementation 'androidx.camera:camera-lifecycle:1.3.2' implementation 'androidx.camera:camera-view:1.3.2' + runtimeOnly 'androidx.camera:camera-camera2:1.3.2' + implementation 'com.google.code.gson:gson:2.10.1' implementation 'com.google.android.material:material:1.11.0' implementation 'com.google.zxing:core:3.5.3' - } \ No newline at end of file diff --git a/app/src/main/java/net/helcel/fidelity/tools/BarcodeFormatConverter.kt b/app/src/main/java/net/helcel/fidelity/tools/BarcodeFormatConverter.kt index df30328..f2e8aa2 100644 --- a/app/src/main/java/net/helcel/fidelity/tools/BarcodeFormatConverter.kt +++ b/app/src/main/java/net/helcel/fidelity/tools/BarcodeFormatConverter.kt @@ -15,22 +15,40 @@ object BarcodeFormatConverter { "UPC_A" -> BarcodeFormat.UPC_A "UPC_E" -> BarcodeFormat.UPC_E "PDF_417" -> BarcodeFormat.PDF_417 + "AZTEC" -> BarcodeFormat.AZTEC + "CODABAR" -> BarcodeFormat.CODABAR + "MAXICODE" -> BarcodeFormat.MAXICODE + "DATA_MATRIX" -> BarcodeFormat.DATA_MATRIX + "ITF" -> BarcodeFormat.ITF + "RSS_14" -> BarcodeFormat.RSS_14 + "RSS_EXPANDED" -> BarcodeFormat.RSS_EXPANDED + "UPC_EAN" -> BarcodeFormat.UPC_EAN_EXTENSION else -> throw Exception("Unsupported Format: $f") + + } } fun formatToString(f: BarcodeFormat): String { return when (f) { - BarcodeFormat.CODE_128 -> "CODE_128" BarcodeFormat.CODE_39 -> "CODE_39" BarcodeFormat.CODE_93 -> "CODE_93" + BarcodeFormat.CODE_128 -> "CODE_128" BarcodeFormat.EAN_8 -> "EAN_8" BarcodeFormat.EAN_13 -> "EAN_13" BarcodeFormat.QR_CODE -> "CODE_QR" BarcodeFormat.UPC_A -> "UPC_A" BarcodeFormat.UPC_E -> "UPC_E" BarcodeFormat.PDF_417 -> "PDF_417" + BarcodeFormat.AZTEC -> "AZTEC" + BarcodeFormat.CODABAR -> "CODABAR" + BarcodeFormat.MAXICODE -> "MAXICODE" + BarcodeFormat.DATA_MATRIX -> "DATA_MATRIX" + BarcodeFormat.ITF -> "ITF" + BarcodeFormat.RSS_14 -> "RSS_14" + BarcodeFormat.RSS_EXPANDED -> "RSS_EXPANDED" + BarcodeFormat.UPC_EAN_EXTENSION -> "UPC_EAN" else -> throw Exception("Unsupported Format: $f") } } -} \ No newline at end of file +} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 897ffb4..4e85ab3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -16,14 +16,22 @@