This commit is contained in:
Kirill 2025-02-19 16:59:19 +03:00
parent fbcbeb0246
commit 6ce331b2b6
3 changed files with 34 additions and 4 deletions

View File

@ -5,6 +5,7 @@
<uses-permission android:name="android.permission.CAMERA"/> <uses-permission android:name="android.permission.CAMERA"/>
<uses-feature android:name="android.hardware.camera"/> <uses-feature android:name="android.hardware.camera"/>
<application <application
android:allowBackup="true" android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules" android:dataExtractionRules="@xml/data_extraction_rules"
@ -25,10 +26,10 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name=".qr.QrActivity" android:exported="true">
</activity>
</application> </application>
</manifest> </manifest>

View File

@ -1,8 +1,12 @@
package com.example.nto_2024_client package com.example.nto_2024_client
import android.content.pm.PackageManager
import android.os.Bundle import android.os.Bundle
import android.util.Log
import androidx.activity.enableEdgeToEdge import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
import androidx.core.view.ViewCompat import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat
import com.example.nto_2024_client.qr.QrFragment 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) v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
insets insets
} }
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() supportFragmentManager.beginTransaction().replace(R.id.fragment_login,QrFragment()).commit()
} }
}
override fun onRequestPermissionsResult(
requestCode: Int,
permissions: Array<out String>,
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")
}
}
}
} }

View File

@ -13,4 +13,3 @@ data class RegisterDTO (
@SerialName("password") @SerialName("password")
val password:String val password:String
)