diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b0bf18e..240405d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,6 +5,7 @@ + - - + + \ No newline at end of file diff --git a/app/src/main/java/com/example/nto_2024_client/MainActivity.kt b/app/src/main/java/com/example/nto_2024_client/MainActivity.kt index f87e8d8..6822cc4 100644 --- a/app/src/main/java/com/example/nto_2024_client/MainActivity.kt +++ b/app/src/main/java/com/example/nto_2024_client/MainActivity.kt @@ -1,8 +1,12 @@ package com.example.nto_2024_client +import android.content.pm.PackageManager import android.os.Bundle +import android.util.Log import androidx.activity.enableEdgeToEdge import androidx.appcompat.app.AppCompatActivity +import androidx.core.app.ActivityCompat +import androidx.core.content.ContextCompat import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import com.example.nto_2024_client.qr.QrFragment @@ -17,6 +21,32 @@ class MainActivity : AppCompatActivity() { v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) insets } - supportFragmentManager.beginTransaction().replace(R.id.fragment_login,QrFragment()).commit() + checkPermissions() + } + + private fun checkPermissions(){ + if(ContextCompat.checkSelfPermission(this,android.Manifest.permission.CAMERA)!= PackageManager.PERMISSION_GRANTED){ + ActivityCompat.requestPermissions(this, arrayOf(android.Manifest.permission.CAMERA),12) + } + else{ + supportFragmentManager.beginTransaction().replace(R.id.fragment_login,QrFragment()).commit() + } + } + + override fun onRequestPermissionsResult( + requestCode: Int, + permissions: Array, + grantResults: IntArray, + deviceId: Int + ) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults, deviceId) + + if(requestCode == 12){ + if(grantResults[0] == PackageManager.PERMISSION_GRANTED){ + supportFragmentManager.beginTransaction().replace(R.id.fragment_login,QrFragment()).commit() + Log.d("MyResp","GOOOL") + + } + } } } \ No newline at end of file diff --git a/app/src/main/java/com/example/nto_2024_client/register/models/RegisterDTO.kt b/app/src/main/java/com/example/nto_2024_client/register/models/RegisterDTO.kt index dde94d5..115d27e 100644 --- a/app/src/main/java/com/example/nto_2024_client/register/models/RegisterDTO.kt +++ b/app/src/main/java/com/example/nto_2024_client/register/models/RegisterDTO.kt @@ -13,4 +13,3 @@ data class RegisterDTO ( @SerialName("password") val password:String -) \ No newline at end of file