Merge pull request #3 from SoftwareLegends/AL-189-improve-fingerprint-library-scanning-functionality

[AL-189] - Improve Fingerprint Library Scanning Functionality

Author: Al-Taie

app/build.gradle.kts

@@ -54,12 +54,14 @@ dependencies {
     implementation(projects.fingerprint)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.runtime)
     implementation(libs.androidx.activity.compose)
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.ui)
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.ui.tooling.preview)
     implementation(libs.androidx.material3)
+    implementation(libs.androidx.material.icons)
     implementation(libs.kotlinx.serialization.json)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)

app/src/main/java/com/fingerprint/app/MainActivity.kt

@@ -1,6 +1,11 @@
 package com.fingerprint.app
 
+import android.content.ContentValues
+import android.content.Context
+import android.graphics.Bitmap
 import android.os.Bundle
+import android.os.Environment
+import android.provider.MediaStore
 import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
@@ -13,49 +18,59 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.itemsIndexed
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Save
 import androidx.compose.material.icons.rounded.Star
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
+import androidx.compose.material3.Checkbox
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.material3.TextField
 import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.material3.VerticalDivider
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asAndroidBitmap
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.fingerprint.FingerprintInitializer
-import com.fingerprint.app.ui.theme.FingerprintHF4000Theme
+import com.fingerprint.app.ui.theme.FingerprintTheme
 import com.fingerprint.manager.FingerprintEvent
 import com.fingerprint.manager.FingerprintManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import java.io.OutputStream
+import java.util.UUID
 
 
 class MainActivity : ComponentActivity() {
@@ -68,7 +83,7 @@ class MainActivity : ComponentActivity() {
         initializeFingerprintManager()
 
         setContent {
-            FingerprintHF4000Theme {
+            FingerprintTheme {
                 App(fingerprintManager)
             }
         }
@@ -86,18 +101,23 @@ class MainActivity : ComponentActivity() {
 @Composable
 fun App(fingerprintManager: FingerprintManager) {
     val clipboardManager = LocalClipboardManager.current
+    val scope = remember { CoroutineScope(Dispatchers.IO) }
     var status by remember { mutableStateOf("") }
     var deviceInfo by remember { mutableStateOf("") }
     var scanCount by remember { mutableStateOf("5") }
     var finished by remember { mutableStateOf(true) }
     var showInfo by remember { mutableStateOf(false) }
-    val events by fingerprintManager.eventsFlow.collectAsState()
+    var isBlue by remember { mutableStateOf(false) }
+    var isFilter by remember { mutableStateOf(false) }
+    val events by fingerprintManager.eventsFlow.collectAsStateWithLifecycle()
     val focusManager = LocalFocusManager.current
 
     LaunchedEffect(key1 = events) {
         println("DEBUGGING -> Progress: ${fingerprintManager.progress}")
         when (events) {
+            is FingerprintEvent.Connected,
             is FingerprintEvent.CapturedSuccessfully,
+            is FingerprintEvent.Disconnected,
             is FingerprintEvent.ProcessCanceledTheFingerLifted -> {
                 finished = true
                 status = events.message
@@ -147,6 +167,40 @@ fun App(fingerprintManager: FingerprintManager) {
                     text = { Text(text = deviceInfo) }
                 )
 
+            Row(
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Checkbox(checked = isFilter, onCheckedChange = {
+                    isFilter = it
+                    scope.launch {
+                        fingerprintManager.improveTheBestCapture(
+                            isApplyFilters = isFilter,
+                            isBlue = isBlue
+                        )
+                    }
+                })
+                Text(text = "Apply Filter")
+                VerticalDivider(
+                    modifier = Modifier
+                        .height(20.dp)
+                        .padding(start = 14.dp)
+                )
+                Checkbox(
+                    checked = isBlue,
+                    onCheckedChange = {
+                        isBlue = it
+                        scope.launch {
+                            fingerprintManager.improveTheBestCapture(
+                                isApplyFilters = isFilter,
+                                isBlue = isBlue
+                            )
+                        }
+                    },
+                    enabled = isFilter
+                )
+                Text(text = "Blue Pixels")
+            }
+
             Button(onClick = {
                 deviceInfo = fingerprintManager.deviceInfo.toString()
                 showInfo = !showInfo
@@ -184,16 +238,37 @@ fun ColumnScope.CaptureGrid(fingerprintManager: FingerprintManager) {
         horizontalArrangement = Arrangement.SpaceBetween
     ) {
         itemsIndexed(items = fingerprintManager.captures) { index, bitmap ->
-            Box(contentAlignment = Alignment.TopStart) {
-                Image(bitmap = bitmap, contentDescription = null)
-                if (index == fingerprintManager.bestCaptureIndex) {
-                    Icon(
-                        imageVector = Icons.Rounded.Star,
-                        contentDescription = null,
-                        tint = Color.Yellow.copy(green = 0.75f)
-                    )
-                }
-            }
+            FingerprintImage(
+                bitmap = bitmap,
+                index = index,
+                bestCaptureIndex = fingerprintManager.bestCaptureIndex
+            )
+        }
+    }
+}
+
+@Composable
+fun FingerprintImage(bitmap: ImageBitmap, index: Int = -1, bestCaptureIndex: Int = -2) {
+    val context = LocalContext.current
+    Box(contentAlignment = Alignment.TopStart) {
+        Image(bitmap = bitmap, contentDescription = null)
+        if (index == bestCaptureIndex) {
+            Icon(
+                imageVector = Icons.Rounded.Star,
+                contentDescription = null,
+                tint = Color.Yellow.copy(green = 0.75f)
+            )
+        }
+
+        IconButton(
+            modifier = Modifier.align(Alignment.BottomEnd),
+            onClick = { bitmap.saveBitmapToGallery(context) }
+        ) {
+            Icon(
+                imageVector = Icons.Rounded.Save,
+                contentDescription = null,
+                tint = Color.Yellow.copy(green = 0.75f)
+            )
         }
     }
 }
@@ -206,14 +281,10 @@ fun BestCaptureSection(fingerprintManager: FingerprintManager, scanCount: String
             verticalArrangement = Arrangement.spacedBy(16.dp)
         ) {
             HorizontalDivider()
-            Text(text = "Best Capture")
+            Text(text = "Improved Best Capture")
             HorizontalDivider()
-            fingerprintManager.bestCapture?.let {
-                Image(
-                    bitmap = it,
-                    contentDescription = null,
-                    modifier = Modifier.size(172.dp)
-                )
+            fingerprintManager.bestCapture?.let { bitmap ->
+                FingerprintImage(bitmap = bitmap)
             }
             HorizontalDivider()
         }
@@ -240,3 +311,23 @@ fun ScanButton(
         }
     ) { Text(text = "Scan") }
 }
+
+fun ImageBitmap.saveBitmapToGallery(context: Context, title: String? = null) = runCatching {
+    val filename = "${title ?: UUID.randomUUID().leastSignificantBits.toString()}.png"
+    val resolver = context.contentResolver
+    val contentValues = ContentValues().apply {
+        put(MediaStore.MediaColumns.DISPLAY_NAME, filename)
+        put(MediaStore.MediaColumns.MIME_TYPE, "image/png")
+        put(MediaStore.MediaColumns.RELATIVE_PATH, Environment.DIRECTORY_PICTURES)
+    }
+
+    val imageUri = resolver.insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues)
+    val fos: OutputStream? = imageUri?.let { resolver.openOutputStream(it) }
+
+    fos?.use {
+        asAndroidBitmap().compress(Bitmap.CompressFormat.PNG, 100, it)
+        Toast.makeText(context, "Image saved to gallery", Toast.LENGTH_SHORT).show()
+    } ?: run {
+        Toast.makeText(context, "Failed to save image", Toast.LENGTH_SHORT).show()
+    }
+}

app/src/main/java/com/fingerprint/app/ui/theme/Theme.kt

@@ -33,7 +33,7 @@ private val LightColorScheme = lightColorScheme(
 )
 
 @Composable
-fun FingerprintHF4000Theme(
+fun FingerprintTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
     // Dynamic color is available on Android 12+
     dynamicColor: Boolean = true,

fingerprint/src/main/java/com/fingerprint/manager/FingerprintEvent.kt

@@ -14,5 +14,6 @@ sealed class FingerprintEvent(val message: String) {
     data object KeepFinger : FingerprintEvent("Keep Finger")
     data object CapturedSuccessfully : FingerprintEvent("Captured Successfully")
     data object CapturingFailed : FingerprintEvent("Capturing Failed")
+    data object CleanTheFingerprint : FingerprintEvent("Clean The Fingerprint")
     class NewImage(val bitmapArray: ByteArray) : FingerprintEvent("New Image")
 }

fingerprint/src/main/java/com/fingerprint/manager/FingerprintManager.kt

@@ -17,6 +17,7 @@ interface FingerprintManager : DefaultLifecycleObserver {
     fun connect()
     fun disconnect()
     fun scan(count: Int): Boolean
+    fun improveTheBestCapture(isApplyFilters: Boolean = false, isBlue: Boolean = false)
 
     override fun onResume(owner: LifecycleOwner) = connect()