From c2c9c0b4b9436098e3431ef5f2a147eb852d5a4e Mon Sep 17 00:00:00 2001
From: skysamara <skysamara@gmail.com>
Date: Thu, 11 Mar 2021 15:24:19 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/ru/panorobot/fc/MainActivity.kt | 5 ++++-
 app/src/main/java/ru/panorobot/fc/Photo.kt        | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/ru/panorobot/fc/MainActivity.kt b/app/src/main/java/ru/panorobot/fc/MainActivity.kt
index ab984e0..c3e0d29 100644
--- a/app/src/main/java/ru/panorobot/fc/MainActivity.kt
+++ b/app/src/main/java/ru/panorobot/fc/MainActivity.kt
@@ -15,6 +15,7 @@ import com.google.android.gms.vision.CameraSource
 import com.google.android.gms.vision.Detector
 import com.google.android.gms.vision.barcode.Barcode
 import com.google.android.gms.vision.barcode.BarcodeDetector
+import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
 
@@ -35,7 +36,9 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
-        svBarcode = findViewById(R.id.sv_barcode)
+//        svBarcode = findViewById(R.id.sv_barcode)
+        svBarcode = sv_barcode
+
 
         detector = BarcodeDetector.Builder(this).setBarcodeFormats(Barcode.ALL_FORMATS).build()
         detector.setProcessor(object : Detector.Processor<Barcode> {
diff --git a/app/src/main/java/ru/panorobot/fc/Photo.kt b/app/src/main/java/ru/panorobot/fc/Photo.kt
index 37427af..22d0b77 100644
--- a/app/src/main/java/ru/panorobot/fc/Photo.kt
+++ b/app/src/main/java/ru/panorobot/fc/Photo.kt
@@ -32,8 +32,7 @@ class Photo : AppCompatActivity() {
         ) {
             ActivityCompat.requestPermissions(
                 this@Photo,
-                arrayOf(android.Manifest.permission.READ_EXTERNAL_STORAGE),
-                123
+                arrayOf(android.Manifest.permission.READ_EXTERNAL_STORAGE),123
             )
         } else {
             getPhoto()
@@ -43,6 +42,7 @@ class Photo : AppCompatActivity() {
     private fun getPhoto() {
         val user = intent.getStringExtra("USER")
         val fileName = "/MeridianFC/" + user + ".jpg"
+        // Предполагается, что ФИО уникальное
         var f = File(Environment.getExternalStorageDirectory(), fileName)
 
         try {