From 12c52d0ed545a89791517df231dea93d98bcc277 Mon Sep 17 00:00:00 2001 From: Rifqi222 <mrifki193@gmail.com> Date: Sat, 30 Mar 2024 00:30:36 +0700 Subject: [PATCH] feat: add scan --- .../java/com/pbd/psi/ui/scan/ScanFragment.kt | 46 ++++++++---------- app/src/main/res/drawable/retake_scan.png | Bin 0 -> 10586 bytes app/src/main/res/drawable/send_button.png | Bin 0 -> 11102 bytes .../main/res/layout-land/fragment_scan.xml | 44 +++++++++++++---- app/src/main/res/layout/fragment_scan.xml | 31 ++++++++---- 5 files changed, 76 insertions(+), 45 deletions(-) create mode 100644 app/src/main/res/drawable/retake_scan.png create mode 100644 app/src/main/res/drawable/send_button.png diff --git a/app/src/main/java/com/pbd/psi/ui/scan/ScanFragment.kt b/app/src/main/java/com/pbd/psi/ui/scan/ScanFragment.kt index f34f6ec..b190738 100644 --- a/app/src/main/java/com/pbd/psi/ui/scan/ScanFragment.kt +++ b/app/src/main/java/com/pbd/psi/ui/scan/ScanFragment.kt @@ -2,14 +2,11 @@ package com.pbd.psi.ui.scan import android.Manifest import android.app.Activity -import android.app.AlertDialog import android.content.Intent import android.graphics.BitmapFactory import android.graphics.drawable.BitmapDrawable import android.net.Uri import android.os.Bundle -import android.os.Handler -import android.os.Looper import android.provider.MediaStore import android.util.Log import android.view.LayoutInflater @@ -22,6 +19,7 @@ import androidx.camera.core.ImageCapture import androidx.camera.core.Preview import androidx.camera.lifecycle.ProcessCameraProvider import androidx.core.content.ContextCompat +import androidx.core.view.isVisible import androidx.fragment.app.Fragment import com.pbd.psi.databinding.FragmentScanBinding @@ -65,6 +63,8 @@ class ScanFragment : Fragment() { permissionLauncher.launch(Manifest.permission.CAMERA) imageCapture = ImageCapture.Builder().build() + binding.sendButton?.isVisible = false + binding.retakeButton?.isVisible = false binding.scanButton?.setOnClickListener { previewMask() @@ -74,6 +74,10 @@ class ScanFragment : Fragment() { openFileExplorer() } + binding.retakeButton?.setOnClickListener{ + previewMask() + } + return root } @@ -86,6 +90,7 @@ class ScanFragment : Fragment() { val preview = Preview.Builder().build().also { mPreview -> if (!previewFrozen) { + binding.scanView?.foreground = null mPreview.setSurfaceProvider(binding.scanView?.surfaceProvider) } else { mPreview.setSurfaceProvider(null) @@ -106,29 +111,19 @@ class ScanFragment : Fragment() { } private fun previewMask() { - binding.scanButton?.isEnabled = false previewFrozen = !previewFrozen + if (!previewFrozen) { + binding.scanButton?.isVisible= true + binding.uploadImage?.isVisible = true + binding.sendButton?.isVisible = false + binding.retakeButton?.isVisible = false + } else { + binding.scanButton?.isVisible= false + binding.uploadImage?.isVisible = false + binding.sendButton?.isVisible = true + binding.retakeButton?.isVisible = true + } startCamera() - - Handler(Looper.getMainLooper()).postDelayed({ - // TO DO: Add modal - val builder: AlertDialog.Builder = AlertDialog.Builder(context) - builder - .setMessage("Do you want to retake the picture?") - .setPositiveButton("Yes") { dialog, which -> - dialog.dismiss() - binding.scanButton?.isEnabled = true - previewFrozen = !previewFrozen - startCamera() - } - .setNegativeButton("No") { dialog, which -> - // TO DO : send a froze preview to the server as img form data - dialog.dismiss() - } - - val dialog: AlertDialog = builder.create() - dialog.show() - }, 1000) } private fun openFileExplorer() { @@ -142,7 +137,8 @@ class ScanFragment : Fragment() { val bitmap = BitmapFactory.decodeStream(inputStream) if (bitmap != null) { val drawable = BitmapDrawable(resources, bitmap) - binding.scanView?.background = drawable + binding.scanView?.foreground = drawable + previewMask() } else { Toast.makeText(requireContext(), "Failed to decode image", Toast.LENGTH_SHORT).show() Log.e("ScanFragment", "Failed to decode image") diff --git a/app/src/main/res/drawable/retake_scan.png b/app/src/main/res/drawable/retake_scan.png new file mode 100644 index 0000000000000000000000000000000000000000..d263141eeb9f84a4a7d68df0842a8ea18c92a9d0 GIT binary patch literal 10586 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 XKUGrtS$zt65->P-NjF~`clZARO?>+# literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/send_button.png b/app/src/main/res/drawable/send_button.png new file mode 100644 index 0000000000000000000000000000000000000000..e7550f144d01931c7a1aa1f0408d0893bc42174e GIT binary patch literal 11102 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 R2RJ3NG_y6$-|ZRmzW^=5b3Xt8 literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout-land/fragment_scan.xml b/app/src/main/res/layout-land/fragment_scan.xml index 5b2efcc..0893064 100644 --- a/app/src/main/res/layout-land/fragment_scan.xml +++ b/app/src/main/res/layout-land/fragment_scan.xml @@ -52,23 +52,47 @@ android:layout_width="50dip" android:layout_height="50dip" android:contentDescription="@string/upload_image" + app:layout_constraintStart_toEndOf="@id/scan_button" + app:layout_constraintTop_toBottomOf="@+id/guideline"/> + + <ImageButton + android:id="@+id/scan_button" + android:layout_marginVertical="20dp" + android:layout_marginStart="10dp" + android:fontFamily="@font/montserrat" + android:gravity="center_horizontal" + android:background="@drawable/scan_button" + android:layout_width="50dip" + android:layout_height="50dip" + android:contentDescription="@string/upload_image" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/guideline"/> - <TextView - android:id="@+id/scan_description" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="20dp" + <ImageButton + android:id="@+id/retake_button" + android:layout_marginVertical="20dp" android:layout_marginEnd="10dp" android:fontFamily="@font/montserrat" android:gravity="center_horizontal" - android:textSize="15sp" - android:textColor="@color/white" - android:textStyle="normal" + android:background="@drawable/retake_scan" + android:layout_width="50dip" + android:layout_height="50dip" + android:contentDescription="@string/upload_image" + app:layout_constraintEnd_toStartOf="@id/send_button" + app:layout_constraintTop_toBottomOf="@+id/guideline"/> + + <ImageButton + android:id="@+id/send_button" + android:layout_marginVertical="20dp" + android:layout_marginEnd="10dp" + android:fontFamily="@font/montserrat" + android:gravity="center_horizontal" + android:background="@drawable/send_button" + android:layout_width="50dip" + android:layout_height="50dip" + android:contentDescription="@string/upload_image" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@+id/guideline" - tools:text="@string/error_scan"/> + app:layout_constraintTop_toBottomOf="@+id/guideline"/> <FrameLayout android:id="@+id/frame_layout_camera" diff --git a/app/src/main/res/layout/fragment_scan.xml b/app/src/main/res/layout/fragment_scan.xml index 4c64d8b..6cf56fc 100644 --- a/app/src/main/res/layout/fragment_scan.xml +++ b/app/src/main/res/layout/fragment_scan.xml @@ -68,20 +68,31 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/guideline"/> - <TextView - android:id="@+id/scan_description" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="20dp" + <ImageButton + android:id="@+id/retake_button" + android:layout_marginVertical="20dp" + android:layout_marginEnd="10dp" + android:fontFamily="@font/montserrat" + android:gravity="center_horizontal" + android:background="@drawable/retake_scan" + android:layout_width="50dip" + android:layout_height="50dip" + android:contentDescription="@string/upload_image" + app:layout_constraintEnd_toStartOf="@id/send_button" + app:layout_constraintTop_toBottomOf="@+id/guideline"/> + + <ImageButton + android:id="@+id/send_button" + android:layout_marginVertical="20dp" android:layout_marginEnd="10dp" android:fontFamily="@font/montserrat" android:gravity="center_horizontal" - android:textSize="15sp" - android:textColor="@color/white" - android:textStyle="normal" + android:background="@drawable/send_button" + android:layout_width="50dip" + android:layout_height="50dip" + android:contentDescription="@string/upload_image" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@+id/guideline" - tools:text="@string/error_scan"/> + app:layout_constraintTop_toBottomOf="@+id/guideline"/> <FrameLayout android:id="@+id/frame_layout_camera" -- GitLab