Merge pull request #6 from AlfredoHdez1709/develop

fix permission

Author: AlfredoHdez1709

EasyCameraAndGallery/src/main/java/dev/ahrsoft/easycameraandgallery/camera/CameraActivity.kt

@@ -2,7 +2,9 @@ package dev.ahrsoft.easycameraandgallery.camera
 
 import android.annotation.SuppressLint
 import android.app.Activity
+import android.app.AlertDialog
 import android.content.ContentValues
+import android.content.DialogInterface
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.media.MediaScannerConnection
@@ -12,9 +14,11 @@ import android.os.Bundle
 import android.os.Environment
 import android.provider.MediaStore
 import android.provider.Settings
+import android.util.Log
 import android.view.Surface.ROTATION_0
 import android.view.View
 import android.webkit.MimeTypeMap
+import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
@@ -31,6 +35,7 @@ import dev.ahrsoft.easycameraandgallery.Constant.FILENAME
 import dev.ahrsoft.easycameraandgallery.Constant.PHOTO_EXTENSION
 import dev.ahrsoft.easycameraandgallery.Constant.REQUEST_CODE_PERMISSIONS
 import dev.ahrsoft.easycameraandgallery.Constant.REQUIRED_PERMISSIONS
+import dev.ahrsoft.easycameraandgallery.Constant.TAG
 import dev.ahrsoft.easycameraandgallery.EasyCamera.IMAGE_RESULTS
 import dev.ahrsoft.easycameraandgallery.Flash
 import dev.ahrsoft.easycameraandgallery.OptionsCamera
@@ -71,12 +76,13 @@ class CameraActivity : AppCompatActivity(), GalleryAdapter.OnItemClickListener {
         supportActionBar?.hide()
         optionsCamera = (intent.getSerializableExtra("options") as? OptionsCamera)!!
         viewModel = ViewModelProvider(this)[CameraViewModel::class.java]
+        initCameraUI()
         initObserver()
         openCallback()
     }
 
-    override fun onResume() {
-        super.onResume()
+    override fun onRestart() {
+        super.onRestart()
         initCameraUI()
     }
 
@@ -134,11 +140,6 @@ class CameraActivity : AppCompatActivity(), GalleryAdapter.OnItemClickListener {
             cameraCaptureButtonCamera.setOnClickListener {
                 takePhoto()
             }
-            cameraBtnPermission.setOnClickListener {
-                startActivity(Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
-                    data = Uri.fromParts("package",this@CameraActivity.packageName,null)
-                })
-            }
             ibFrontCamera.setOnClickListener {
                 if (CameraSelector.LENS_FACING_FRONT == lensFacing) {
                     lensFacing = CameraSelector.LENS_FACING_BACK
@@ -310,11 +311,25 @@ class CameraActivity : AppCompatActivity(), GalleryAdapter.OnItemClickListener {
             if (allPermissionsGranted()) {
                 initCameraUI()
             } else {
-                binding.cameraVfState.displayedChild = CameraFlipperState.SHOW_PERMISSIONS.state
+               dialogPermission()
             }
         }
     }
 
+    private fun dialogPermission() {
+        val builder = AlertDialog.Builder(this).apply {
+            setTitle(getString(R.string.action_permission))
+            setMessage(getString(R.string.message_permissions))
+            setCancelable(false)
+        }.setPositiveButton(getString(android.R.string.ok)) { dialog, id ->
+            startActivity(Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+                data = Uri.fromParts("package",baseContext.packageName,null)
+            })
+        }
+
+        builder.show()
+    }
+
     private fun hasBackCamera(): Boolean {
         return cameraProvider?.hasCamera(CameraSelector.DEFAULT_BACK_CAMERA) ?: false
     }

EasyCameraAndGallery/src/main/res/layout/activity_camera.xml

@@ -127,31 +127,30 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/camera.btn.permission"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/action_permission"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            style="@style/ShapeAppearanceOverlay.Material3.Button"/>
 
         <TextView
             android:id="@+id/camera.tv.permission"
+            style="@style/TextAppearance.Material3.BodyLarge"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
             android:layout_marginEnd="32dp"
-            android:layout_marginBottom="16dp"
-            android:text="@string/message_permissions"
             android:gravity="center"
-            style="@style/TextAppearance.Material3.BodyLarge"
-            app:layout_constraintBottom_toTopOf="@+id/camera.btn.permission"
+            android:text="@string/message_permissions"
+            app:layout_constraintBottom_toTopOf="@+id/permission.btn"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
+        <Button
+            android:id="@+id/permission.btn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/action_permission"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </ViewFlipper>

EasyCameraAndGallery/src/main/res/values-es/strings.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="tomar_foto">Tomar foto</string>
+    <string name="action_permission">Otorgar permisos</string>
+    <string name="message_permissions">Para el correcto funcionamiento se requiere que otorgues los permisos necesarios a la aplicación.</string>
+    <string name="error_start_camera">"Error al iniciar la cámara "</string>
+    <string name="unknown_error">"error desconocido "</string>
+</resources>

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

@@ -1,5 +1,5 @@
 <resources>
-    <string name="tomar_foto">Tomar foto</string>
+    <string name="tomar_foto">Take photo</string>
     <string name="action_permission">Grant permissions</string>
     <string name="message_permissions">For the correct operation it is required that you grant the required permissions to the application.</string>
     <string name="error_start_camera">Failed to start the camera</string>