From fbcbeb024652674853cfb29cc0a6eed0c95db17a Mon Sep 17 00:00:00 2001
From: Kirill <kirillzolotarevskiy62@gmail.com>
Date: Wed, 19 Feb 2025 11:48:45 +0300
Subject: [PATCH] add qr scan

---
 .idea/gradle.xml                              |  1 +
 app/build.gradle.kts                          | 10 +++--
 app/src/main/AndroidManifest.xml              |  8 ++++
 .../example/nto_2024_client/MainActivity.kt   |  2 +
 .../example/nto_2024_client/data/Network.kt   | 21 ----------
 .../nto_2024_client/login/LoginNetwork.kt     |  1 -
 .../example/nto_2024_client/qr/QrFragment.kt  | 42 ++++++++++++++++++-
 .../example/nto_2024_client/qr/QrViewModel.kt |  7 ++++
 app/src/main/res/layout/activity_main.xml     | 11 ++---
 app/src/main/res/layout/qr_code_fragment.xml  |  6 +++
 gradle.properties                             |  2 +
 gradle/libs.versions.toml                     |  6 ++-
 12 files changed, 84 insertions(+), 33 deletions(-)
 delete mode 100644 app/src/main/java/com/example/nto_2024_client/data/Network.kt
 create mode 100644 app/src/main/java/com/example/nto_2024_client/qr/QrViewModel.kt
 create mode 100644 app/src/main/res/layout/qr_code_fragment.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ae733f1..7b3006b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b8dd94a..7c0fe3a 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -28,16 +28,20 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "11"
+        jvmTarget = "17"
+    }
+    buildFeatures{
+        viewBinding = true
     }
 }
 
 dependencies {
     implementation(libs.ktor.client.core)
+    implementation(libs.zbar.code)
     implementation(libs.ktor.serialization.json)
     implementation(libs.ktor.client.cio)
     implementation(libs.ktor.client.auth)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1e15444..b0bf18e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-feature android:name="android.hardware.camera"/>
+
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -20,6 +23,11 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
+        </activity>
+        <activity android:name=".qr.QrActivity" android:exported="true">
+
+
         </activity>
     </application>
 
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 bab157d..f87e8d8 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
@@ -5,6 +5,7 @@ import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+import com.example.nto_2024_client.qr.QrFragment
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -16,5 +17,6 @@ class MainActivity : AppCompatActivity() {
             v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
             insets
         }
+        supportFragmentManager.beginTransaction().replace(R.id.fragment_login,QrFragment()).commit()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/nto_2024_client/data/Network.kt b/app/src/main/java/com/example/nto_2024_client/data/Network.kt
deleted file mode 100644
index 23d3740..0000000
--- a/app/src/main/java/com/example/nto_2024_client/data/Network.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.example.nto_2024_client.data
-
-import io.ktor.client.HttpClient
-import io.ktor.client.engine.cio.CIO
-import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
-import io.ktor.serialization.kotlinx.json.json
-import io.ktor.util.Platform
-import kotlinx.serialization.json.Json
-import java.net.HttpCookie
-
-class Network {
-    var client = HttpClient(CIO){
-        install(ContentNegotiation){
-            json(Json {
-                isLenient = true
-                ignoreUnknownKeys = true
-            })
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/nto_2024_client/login/LoginNetwork.kt b/app/src/main/java/com/example/nto_2024_client/login/LoginNetwork.kt
index 274bbb8..e21d681 100644
--- a/app/src/main/java/com/example/nto_2024_client/login/LoginNetwork.kt
+++ b/app/src/main/java/com/example/nto_2024_client/login/LoginNetwork.kt
@@ -1,6 +1,5 @@
 package com.example.nto_2024_client.login
 
-import com.example.nto_2024_client.data.Network
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.cio.CIO
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
diff --git a/app/src/main/java/com/example/nto_2024_client/qr/QrFragment.kt b/app/src/main/java/com/example/nto_2024_client/qr/QrFragment.kt
index a591ebc..af57bec 100644
--- a/app/src/main/java/com/example/nto_2024_client/qr/QrFragment.kt
+++ b/app/src/main/java/com/example/nto_2024_client/qr/QrFragment.kt
@@ -1,4 +1,44 @@
 package com.example.nto_2024_client.qr
 
-class QrFragment {
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.example.nto_2024_client.R
+import com.example.nto_2024_client.databinding.QrCodeFragmentBinding
+import me.dm7.barcodescanner.zbar.Result
+import me.dm7.barcodescanner.zbar.ZBarScannerView
+
+class QrFragment: Fragment(R.layout.qr_code_fragment),ZBarScannerView.ResultHandler {
+    lateinit var binding:QrCodeFragmentBinding
+     lateinit var zBarScannerView: ZBarScannerView
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        zBarScannerView = ZBarScannerView(activity)
+
+        return zBarScannerView
+    }
+
+
+
+    override fun onResume() {
+        super.onResume()
+        zBarScannerView.setResultHandler(this)
+        zBarScannerView.startCamera()
+
+    }
+
+    override fun onPause() {
+        super.onPause()
+        zBarScannerView.stopCamera()
+    }
+    override fun handleResult(result: Result?) {
+        Log.d("MyQr",result.toString())
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/nto_2024_client/qr/QrViewModel.kt b/app/src/main/java/com/example/nto_2024_client/qr/QrViewModel.kt
new file mode 100644
index 0000000..e650408
--- /dev/null
+++ b/app/src/main/java/com/example/nto_2024_client/qr/QrViewModel.kt
@@ -0,0 +1,7 @@
+package com.example.nto_2024_client.qr
+
+import androidx.lifecycle.ViewModel
+
+class QrViewModel:ViewModel() {
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 86a5d97..ae14594 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,13 +7,14 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
+    <FrameLayout
+        android:id="@+id/fragment_login"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent">
 
+    </FrameLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/qr_code_fragment.xml b/app/src/main/res/layout/qr_code_fragment.xml
new file mode 100644
index 0000000..77d9ef6
--- /dev/null
+++ b/app/src/main/res/layout/qr_code_fragment.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 20e2a01..c08bcf7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,6 +15,8 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
+android.enableJetifier = true
+android.enableBuildCache=false
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3dc5f9c..a15c945 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-agp = "8.8.0"
-kotlin = "1.9.24"
+agp = "8.7.3"
+kotlin = "2.0.0-RC1"
 coreKtx = "1.15.0"
 junit = "4.13.2"
 junitVersion = "1.2.1"
@@ -10,6 +10,7 @@ material = "1.10.0"
 activity = "1.10.0"
 constraintlayout = "2.1.4"
 ktor ="3.0.3"
+zbar = "1.9.7"
 kotlinSerialization="1.8.0"
 
 [libraries]
@@ -22,6 +23,7 @@ material = { group = "com.google.android.material", name = "material", version.r
 androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "activity" }
 ktor-client-core = {module = "io.ktor:ktor-client-core",version.ref="ktor"}
 ktor-client-auth = {group="io.ktor",name="ktor-client-auth",version.ref="ktor"}
+zbar-code = {group="me.dm7.barcodescanner",name="zbar",version.ref="zbar"}
 ktor-client-cio = {module="io.ktor:ktor-client-cio",version.ref="ktor"}
 ktor-client-content-negotiation={module="io.ktor:ktor-client-content-negotiation",version.ref="ktor"}
 ktor-serialization-json={module="io.ktor:ktor-serialization-kotlinx-json",version.ref="ktor"}