Fixed versioning

Reviewed-on: #4

.github/workflows/build.yml

@@ -0,0 +1,64 @@
+#file: noinspection SpellCheckingInspection
+
+name: CI-Android APK
+
+env:
+  main_project_module: app
+  playstore_name: KeepassFidelity
+
+on:
+  push:
+    branches: [ main ]
+    tags:
+      - '**'
+  pull_request:
+    branches: [ main ]
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: set up secrets
+        run: |
+          echo "${{ secrets.RELEASE_KEYSTORE }}" > keystore.asc
+          echo "${{ secrets.RELEASE_KEY}}" > key.asc
+          gpg -d --passphrase "${{ secrets.RELEASE_KEYSTORE_PASSWORD }}" --batch keystore.asc > app/keystore.properties
+          gpg -d --passphrase "${{ secrets.RELEASE_KEYSTORE_PASSWORD }}" --batch key.asc > app/key.jks
+
+      - uses: gradle/wrapper-validation-action@v2
+
+      - name: create and checkout branch
+        if: github.event_name == 'pull_request'
+        env:
+          BRANCH: ${{ github.head_ref }}
+        run: git checkout -B "$BRANCH"
+
+      - name: set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: "temurin"
+          cache: 'gradle'
+
+      - name: Build APK
+        run: ./gradlew assemble
+
+      # - name: Upload APK
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     name: app.apk
+      #     path: app/build/outputs/apk/release/app-release.apk
+
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: |
+            app/build/outputs/apk/release/app-release.apk

.gitignore

@@ -7,7 +7,11 @@ local.properties/
 .DS_Store
 build/
 app/build/
+app/debug/
+app/release/
 captures/
 .externalNativeBuild
 .cxx
 local.properties
+keystore.properties
+key.jks

LICENSE

@@ -0,0 +1,24 @@
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <https://unlicense.org>

README.md

@@ -0,0 +1,69 @@
+<!--suppress ALL -->
+
+
+
+<div align="center">
+  <h1>Keepass Fidelity</h1>
+  <p>A minimalist fidelity/loyalty card plugin</p>
+  <img src="https://forthebadge.com/images/badges/built-for-android.svg" alt="Built for Android">
+  <img src="https://forthebadge.com/images/badges/built-with-love.svg" alt="Built with love">
+  <br>
+    <a href="https://github.com/choelzl/keepass-fidelity/actions/workflows/build.yml">
+    <img src="https://github.com/choelzl/keepass-fidelity/actions/workflows/build.yml/badge.svg?branch=main" alt="Build Status">
+  </a>
+</div>
+
+## 🌄 Screenshots
+
+<div align="center">
+  <table>
+    <tr>
+      <td style="width: 33%; height: 100px;"><img src=".github/images/launcher.jpg" alt="Launcher" style="width: 100%; height: 100%;"></td>
+      <td style="width: 33%; height: 100px;"><img src=".github/images/view.jpg" alt="View" style="width: 100%; height: 100%;"></td>
+      <td style="width: 33%; height: 100px;"><img src=".github/images/edit.jpg" alt="Edit" style="width: 100%; height: 100%;"></td>
+    </tr>
+  </table>
+</div>
+
+## ⭐ Features
+
+- Search entries in [Keepass2Android](https://github.com/PhilippC/keepass2android/)
+- Scan & Create entries
+- 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, CODE_QR, PDF_417, AZTEC, CODABAR, DATA_MATRIX, ITF
+
+## 📳 Installation
+
+<div style="display: flex; justify-content: center; align-items: center; flex-direction: row;">
+    <a href="https://github.com/choelzl/keepass-fidelity/releases/latest">
+        <img width="200" height="84" alt="APK Download" src=".github/images/apk.png">
+    </a>
+</div>
+
+## ⚙️ Permissions
+
+- `CAMERA`: necessary for the scanning of barcodes
+
+## 📝 Contribute
+
+Keepass-Fidelity is a user-driven project. We welcome any contribution, big or small.
+
+- **🖥️ Development:** Fix bugs, implement features, or research issues. Open a PR for review.
+- **🍥 Design:** Improve interfaces, including accessibility and usability.
+- **📂 Issue Reporting:** Report bugs and edge cases with relevant info.
+- **🌍 Localization:** Translate if it doesn't support your language.
+
+## ✏️ Acknowledgements
+
+Thanks to all contributors, the developers of our dependencies, and our users.
+
+## 📝 License
+
+```
+Copyright (C) 2024 Helcel
+
+Licensed under the Unlicense
+For more information, please refer to <https://unlicense.org>
+```

app/build.gradle

@@ -5,31 +5,57 @@ plugins {
 }
 
 
+def keystorePropertiesFile = rootProject.file("app/keystore.properties")
+def keystoreProperties = new Properties()
+keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+
+
 android {
     namespace 'net.helcel.fidelity'
     compileSdk 34
 
     defaultConfig {
         applicationId 'net.helcel.fidelity'
+        resValue "string", "app_name", "Keepass Fidelity"
         minSdk 28
         targetSdk 34
-        versionCode 1
+    }
-        versionName "1.0"
+
+
+    signingConfigs {
+        create("release") {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile file(keystoreProperties['storeFile'])
+            storePassword keystoreProperties['storePassword']
+        }
     }
 
     buildTypes {
+        debug {
+            debuggable true
+        }
         release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig = signingConfigs.getByName("release")
         }
     }
+
+
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        coreLibraryDesugaringEnabled true
-        targetCompatibility JavaVersion.VERSION_1_8
+
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+        encoding 'utf-8'
     }
+
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = JavaVersion.VERSION_17
     }
+
     buildFeatures {
         viewBinding true
     }
@@ -37,16 +63,13 @@ android {
 
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.0.4'
-    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'
-    implementation 'com.google.mlkit:barcode-scanning:17.2.0'
-
 }

app/proguard-rules.pro

@@ -0,0 +1,13 @@
+# Gson uses generic type information stored in a class file when working with
+# fields. Proguard removes such information by default, keep it.
+-keepattributes Signature
+
+# This is also needed for R8 in compat mode since multiple
+# optimizations will remove the generic signature such as class
+# merging and argument removal. See:
+# https://r8.googlesource.com/r8/+/refs/heads/main/compatibility-faq.md#troubleshooting-gson-gson
+-keep class com.google.gson.reflect.TypeToken { *; }
+-keep class * extends com.google.gson.reflect.TypeToken
+
+# Optional. For using GSON @Expose annotation
+-keepattributes AnnotationDefault,RuntimeVisibleAnnotations

app/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:versionCode="1"
+    android:versionCode="4"
-    android:versionName="1.0">
+    android:versionName="1.1b">
 
     <uses-feature android:name="android.hardware.camera" />
     <uses-permission android:name="android.permission.CAMERA" />

app/src/main/java/net/helcel/fidelity/activity/fragment/Scanner.kt

@@ -45,6 +45,7 @@ class Scanner : Fragment() {
         return binding.root
     }
 
+
     private fun startCreateEntry() {
         val createEntryFragment = CreateEntry()
         createEntryFragment.arguments =
@@ -89,13 +90,14 @@ class Scanner : Fragment() {
                 }
             val cameraSelector = CameraSelector.DEFAULT_BACK_CAMERA
             val analysisUseCase = getAnalysisUseCase { code, format ->
-                if (code != null && format != null) {
+                if (!code.isNullOrEmpty() && !format.isNullOrEmpty()) {
                     this.code = code
                     this.fmt = format
-                    binding.btnScanDone.isEnabled = true
+                }
-
+                val isDone = this.code.isNotEmpty() && this.fmt.isNotEmpty()
-                } else {
+                requireActivity().runOnUiThread {
-                    binding.btnScanDone.isEnabled = false
+                    binding.btnScanDone.isEnabled = isDone
+                    binding.ScanActive.isEnabled = !isDone
                 }
             }
             try {

app/src/main/java/net/helcel/fidelity/tools/BarcodeFormatConverter.kt

@@ -1,6 +1,5 @@
 package net.helcel.fidelity.tools
 
-import com.google.mlkit.vision.barcode.common.Barcode
 import com.google.zxing.BarcodeFormat
 
 object BarcodeFormatConverter {
@@ -16,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: Int): String {
+    fun formatToString(f: BarcodeFormat): String {
         return when (f) {
-            Barcode.FORMAT_CODE_128 -> "CODE_128"
+            BarcodeFormat.CODE_39 -> "CODE_39"
-            Barcode.FORMAT_CODE_39 -> "CODE_39"
+            BarcodeFormat.CODE_93 -> "CODE_93"
-            Barcode.FORMAT_CODE_93 -> "CODE_93"
+            BarcodeFormat.CODE_128 -> "CODE_128"
-            Barcode.FORMAT_EAN_8 -> "EAN_8"
+            BarcodeFormat.EAN_8 -> "EAN_8"
-            Barcode.FORMAT_EAN_13 -> "EAN_13"
+            BarcodeFormat.EAN_13 -> "EAN_13"
-            Barcode.FORMAT_QR_CODE -> "CODE_QR"
+            BarcodeFormat.QR_CODE -> "CODE_QR"
-            Barcode.FORMAT_UPC_A -> "UPC_A"
+            BarcodeFormat.UPC_A -> "UPC_A"
-            Barcode.FORMAT_UPC_E -> "UPC_E"
+            BarcodeFormat.UPC_E -> "UPC_E"
-            Barcode.FORMAT_PDF417 -> "PDF_417"
+            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")
         }
     }
-}
+}

app/src/main/java/net/helcel/fidelity/tools/BarcodeScanner.kt

@@ -1,16 +1,16 @@
 package net.helcel.fidelity.tools
 
-import android.content.ContentValues
+import android.graphics.Bitmap
-import android.util.Log
 import androidx.annotation.OptIn
 import androidx.camera.core.ExperimentalGetImage
 import androidx.camera.core.ImageAnalysis
 import androidx.camera.core.ImageProxy
-import com.google.mlkit.vision.barcode.BarcodeScanner
+import com.google.zxing.BinaryBitmap
-import com.google.mlkit.vision.barcode.BarcodeScannerOptions
+import com.google.zxing.MultiFormatReader
-import com.google.mlkit.vision.barcode.BarcodeScanning
+import com.google.zxing.NotFoundException
-import com.google.mlkit.vision.barcode.common.Barcode
+import com.google.zxing.RGBLuminanceSource
-import com.google.mlkit.vision.common.InputImage
+import com.google.zxing.ReaderException
+import com.google.zxing.common.HybridBinarizer
 import net.helcel.fidelity.tools.BarcodeFormatConverter.formatToString
 import java.util.concurrent.Executors
 
@@ -19,57 +19,39 @@ object BarcodeScanner {
 
     @OptIn(ExperimentalGetImage::class)
     private fun processImageProxy(
-        barcodeScanner: BarcodeScanner,
         imageProxy: ImageProxy,
         cb: (String?, String?) -> Unit
     ) {
-
+        val bitmap = imageProxy.toBitmap() // Convert ImageProxy to Bitmap
-        imageProxy.image?.let { image ->
+        val binaryBitmap = createBinaryBitmap(bitmap)
-            val inputImage =
+        val reader = MultiFormatReader()
-                InputImage.fromMediaImage(
+        try {
-                    image,
+            val result = reader.decode(binaryBitmap)
-                    imageProxy.imageInfo.rotationDegrees
+            cb(result.text, formatToString(result.barcodeFormat))
-                )
+        } catch (e: NotFoundException) {
-
+            cb(null, null)
-            barcodeScanner.process(inputImage)
+        } catch (e: ReaderException) {
-                .addOnSuccessListener { barcodeList ->
+            cb(null, null)
-                    val barcode =
+        } finally {
-                        barcodeList.getOrNull(0)
+            imageProxy.close()
-                    if (barcode != null)
-                        cb(barcode.displayValue, formatToString(barcode.format))
-                }
-                .addOnFailureListener {
-                    Log.e(ContentValues.TAG, it.message.orEmpty())
-                }.addOnCompleteListener {
-                    imageProxy.image?.close()
-                    imageProxy.close()
-                }
         }
     }
 
+    private fun createBinaryBitmap(bitmap: Bitmap): BinaryBitmap {
+        val pixels = IntArray(bitmap.width * bitmap.height)
+        bitmap.getPixels(pixels, 0, bitmap.width, 0, 0, bitmap.width, bitmap.height)
+        val source =
+            RGBLuminanceSource(bitmap.width, bitmap.height, pixels)
+        return BinaryBitmap(HybridBinarizer(source))
+    }
+
     fun getAnalysisUseCase(cb: (String?, String?) -> Unit): ImageAnalysis {
-        val options = BarcodeScannerOptions.Builder().setBarcodeFormats(
+        val analysisUseCase = ImageAnalysis.Builder().build()
-            Barcode.FORMAT_CODE_128,
-            Barcode.FORMAT_CODE_39,
-            Barcode.FORMAT_CODE_93,
-            Barcode.FORMAT_EAN_8,
-            Barcode.FORMAT_EAN_13,
-            Barcode.FORMAT_QR_CODE,
-            Barcode.FORMAT_UPC_A,
-            Barcode.FORMAT_UPC_E,
-            Barcode.FORMAT_PDF417
-        ).build()
-        val scanner = BarcodeScanning.getClient(options)
-        val analysisUseCase = ImageAnalysis.Builder()
-            .build()
-
         analysisUseCase.setAnalyzer(
             Executors.newSingleThreadExecutor()
         ) { imageProxy ->
-            processImageProxy(scanner, imageProxy, cb)
+            processImageProxy(imageProxy, cb)
         }
         return analysisUseCase
     }
-
-
 }

app/src/main/res/layout/frag_scanner.xml

@@ -25,6 +25,7 @@
         android:contentDescription="@string/manual" />
 
     <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:id="@+id/ScanActive"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"

app/src/main/res/values/strings.xml

@@ -16,14 +16,18 @@
     <string name="format">Format</string>
     <string name="save">Save</string>
     <string-array name="format_array">
-        <item>CODE_128</item>
         <item>CODE_39</item>
         <item>CODE_93</item>
+        <item>CODE_128</item>
         <item>EAN_8</item>
         <item>EAN_13</item>
         <item>CODE_QR</item>
         <item>UPC_A</item>
         <item>UPC_E</item>
         <item>PDF_417</item>
+        <item>AZTEC</item>
+        <item>CODABAR</item>
+        <item>DATA_MATRIX</item>
+        <item>ITF</item>
     </string-array>
 </resources>

build.gradle

@@ -2,6 +2,7 @@
 
 plugins {
     id 'com.android.application' version '8.3.1' apply false
-    id 'com.android.library' version '8.3.0' apply false
+    id 'com.android.library' version '8.3.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.23' apply false
+    id 'com.autonomousapps.dependency-analysis' version '1.30.0' apply true
 }

settings.gradle

@@ -14,5 +14,6 @@ dependencyResolutionManagement {
         maven { url 'https://jitpack.io' }
     }
 }
+
 rootProject.name = "Fidelity"
 include ':app'