Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add gallery button on qr to pick images #221

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion quickie/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
android:required="false"/>

<uses-permission android:name="android.permission.CAMERA"/>

<uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
<application>

<activity
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
package io.github.g00fy2.quickie

import android.Manifest
import android.Manifest.permission.CAMERA
import android.annotation.SuppressLint
import android.app.Activity
import android.app.Dialog
import android.content.Intent
import android.content.pm.PackageManager
import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.provider.OpenableColumns
import android.util.Size
import android.view.HapticFeedbackConstants
import android.view.KeyEvent
@@ -26,7 +31,10 @@ import androidx.core.content.IntentCompat
import androidx.core.view.ViewCompat
import androidx.core.view.WindowCompat
import androidx.core.view.WindowInsetsCompat
import com.google.mlkit.vision.barcode.BarcodeScannerOptions
import com.google.mlkit.vision.barcode.BarcodeScanning
import com.google.mlkit.vision.barcode.common.Barcode
import com.google.mlkit.vision.common.InputImage
import io.github.g00fy2.quickie.config.ParcelableScannerConfig
import io.github.g00fy2.quickie.databinding.QuickieScannerActivityBinding
import io.github.g00fy2.quickie.extensions.toParcelableContentType
@@ -43,6 +51,10 @@ internal class QRScannerActivity : AppCompatActivity() {
private var showTorchToggle = false
private var showCloseButton = false
private var useFrontCamera = false
private var showGalleryButton = false
private val galleryLauncher=registerForActivityResult(ActivityResultContracts.GetContent()) { uri: Uri? ->
uri?.let { analyzeImageFromGallery(it) }
}
internal var errorDialog: Dialog? = null
set(value) {
field = value
@@ -65,9 +77,11 @@ internal class QRScannerActivity : AppCompatActivity() {
}
binding = QuickieScannerActivityBinding.inflate(appThemeLayoutInflater)
setContentView(binding.root)

showGalleryButton = intent.getBooleanExtra(EXTRA_SHOW_GALLERY_BUTTON, false)
setupEdgeToEdgeUI()
applyScannerConfig()
binding.selectFromGalleryButton.visibility = if (showGalleryButton) View.VISIBLE else View.GONE
setupGalleryButton()

analysisExecutor = Executors.newSingleThreadExecutor()

@@ -81,6 +95,49 @@ internal class QRScannerActivity : AppCompatActivity() {
}
}

private fun setupGalleryButton() {
binding.selectFromGalleryButton.setOnClickListener {
launchGalleryPicker()
}
}
private fun launchGalleryPicker() {
galleryLauncher.launch(IMAGE_MIME_TYPE)
}

@SuppressLint("Range")
private fun analyzeImageFromGallery(imageUri: Uri) {
try {
val cursor = contentResolver.query(imageUri, null, null, null, null)
cursor?.use {
if (it.moveToFirst()) {
val inputImage = InputImage.fromFilePath(this, imageUri)

val scanner = BarcodeScanning.getClient(
BarcodeScannerOptions.Builder()
.setBarcodeFormats(Barcode.FORMAT_QR_CODE)
.build()
)

scanner.process(inputImage)
.addOnSuccessListener { barcodes ->
if (barcodes.isNotEmpty()) {
onSuccess(barcodes[0])
} else {
onFailure(Exception("No barcode found"))
}
}
.addOnFailureListener { e ->
onFailure(e)
}
} else {
onFailure(Exception("No metadata found"))
}
} ?: onFailure(Exception("Unable to query image metadata"))
} catch (e: Exception) {
onFailure(e)
}
}

override fun onDestroy() {
super.onDestroy()
analysisExecutor.shutdown()
@@ -214,8 +271,10 @@ internal class QRScannerActivity : AppCompatActivity() {
const val EXTRA_RESULT_BYTES = "quickie-bytes"
const val EXTRA_RESULT_VALUE = "quickie-value"
const val EXTRA_RESULT_TYPE = "quickie-type"
const val EXTRA_SHOW_GALLERY_BUTTON = "show-gallery-button"
const val EXTRA_RESULT_PARCELABLE = "quickie-parcelable"
const val EXTRA_RESULT_EXCEPTION = "quickie-exception"
const val IMAGE_MIME_TYPE="image/*"
const val RESULT_MISSING_PERMISSION = RESULT_FIRST_USER + 1
const val RESULT_ERROR = RESULT_FIRST_USER + 2
}
Original file line number Diff line number Diff line change
@@ -17,7 +17,9 @@ import io.github.g00fy2.quickie.extensions.toQuickieContentType
public class ScanQRCode : ActivityResultContract<Nothing?, QRResult>() {

override fun createIntent(context: Context, input: Nothing?): Intent =
Intent(context, QRScannerActivity::class.java)
Intent(context, QRScannerActivity::class.java).apply {
putExtra(QRScannerActivity.EXTRA_SHOW_GALLERY_BUTTON, true)
}

override fun parseResult(resultCode: Int, intent: Intent?): QRResult {
return when (resultCode) {
14 changes: 14 additions & 0 deletions quickie/src/main/res/drawable/quickie_rounded_rectangle_button.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

<item>
<shape android:shape="rectangle">
<!-- Set the background color -->
<solid android:color="@color/quickie_white" />

<corners android:radius="24dp" />
</shape>
</item>

</layer-list>
11 changes: 11 additions & 0 deletions quickie/src/main/res/layout/quickie_scanner_activity.xml
Original file line number Diff line number Diff line change
@@ -19,4 +19,15 @@
android:visibility="invisible"
tools:visibility="visible"
/>
<Button
android:id="@+id/selectFromGalleryButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Select from Gallery"
android:background="@drawable/quickie_rounded_rectangle_button"
android:textColor="@android:color/black"
android:padding="16dp"
android:layout_gravity="bottom|center_horizontal"
android:layout_marginBottom="32dp" />

</FrameLayout>