Merge branch 'Frontend' into Frontend_UI

# Conflicts:
#	app/src/main/res/layout/fragment_login.xml

app/build.gradle.kts

@@ -1,9 +1,9 @@
 plugins {
-    id("com.android.application")
+    kotlinAndroid
-    id("org.jetbrains.kotlin.android")
+    androidApplication
-    id("org.jetbrains.kotlin.plugin.serialization") version Version.Kotlin.language
+    jetbrainsKotlinSerialization version Version.Kotlin.language
-    id("kotlin-kapt")
+    kotlinAnnotationProcessor
-    id("com.google.dagger.hilt.android") version "2.51.1"
+    id("com.google.dagger.hilt.android").version("2.51.1")
 }
 
 val packageName = "ru.myitschool.work"
@@ -24,6 +24,8 @@ android {
 
     buildFeatures.viewBinding = true
 
+
+
     compileOptions {
         sourceCompatibility = Version.Kotlin.javaSource
         targetCompatibility = Version.Kotlin.javaSource
@@ -35,15 +37,11 @@ android {
 }
 
 dependencies {
-    implementation("com.squareup.retrofit2:retrofit:2.9.0")
+    implementation ("com.squareup.retrofit2:retrofit:2.9.0")
-    implementation("com.squareup.retrofit2:converter-gson:2.9.0")
+    implementation ("com.squareup.retrofit2:converter-gson:2.9.0")
-    implementation("com.squareup.okhttp3:okhttp:4.9.0")
+    implementation ("com.squareup.okhttp3:okhttp:4.9.0")
-    implementation("com.github.bumptech.glide:glide:4.15.1")
+    implementation ("com.github.bumptech.glide:glide:4.15.1")
-    implementation("androidx.appcompat:appcompat:1.6.1")
+    kapt ("com.github.bumptech.glide:compiler:4.15.1")
-    implementation("com.google.android.material:material:1.10.0")
-    implementation("androidx.activity:activity:1.10.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    kapt("com.github.bumptech.glide:compiler:4.15.1")
 
     defaultLibrary()
 
@@ -57,6 +55,7 @@ dependencies {
     implementation(Dependencies.Retrofit.library)
     implementation(Dependencies.Retrofit.gsonConverter)
 
+
     implementation("com.squareup.picasso:picasso:2.8")
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1")
     implementation("androidx.datastore:datastore-preferences:1.1.1")
@@ -76,4 +75,4 @@ dependencies {
 
 kapt {
     correctErrorTypes = true
-}
+}

app/src/main/AndroidManifest.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"> <!-- Минимальная и целевая версия SDK по тз (28 и 34) -->
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <!-- Минимальная и целевая версия SDK по тз (28 и 34) -->
     <uses-sdk
         android:minSdkVersion="28"
         android:targetSdkVersion="34" />
@@ -12,20 +14,16 @@
 
     <application
         android:name=".App"
-        android:allowBackup="false"
+        android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:fullBackupOnly="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Default"
-        tools:targetApi="34">
+        tools:targetApi="31">
-        <activity
-            android:name=".ui.register.RegisterActivity"
-            android:exported="false" />
         <activity
             android:name=".ui.RootActivity"
             android:exported="true">

app/src/main/res/values/strings_qr.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="close_button">Close</string>
+    <string name="close_button" translatable="false">Close</string>
 </resources>