diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 192da5f..049c0f4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,9 +1,9 @@ plugins { - id("com.android.application") - id("org.jetbrains.kotlin.android") - id("org.jetbrains.kotlin.plugin.serialization") version Version.Kotlin.language - id("kotlin-kapt") - id("com.google.dagger.hilt.android") version "2.51.1" + kotlinAndroid + androidApplication + jetbrainsKotlinSerialization version Version.Kotlin.language + kotlinAnnotationProcessor + 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:converter-gson:2.9.0") - implementation("com.squareup.okhttp3:okhttp:4.9.0") - implementation("com.github.bumptech.glide:glide:4.15.1") - implementation("androidx.appcompat:appcompat:1.6.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") + implementation ("com.squareup.retrofit2:retrofit:2.9.0") + implementation ("com.squareup.retrofit2:converter-gson:2.9.0") + implementation ("com.squareup.okhttp3:okhttp:4.9.0") + implementation ("com.github.bumptech.glide:glide:4.15.1") + 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 -} \ No newline at end of file +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e01be54..000a643 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,8 @@ + xmlns:tools="http://schemas.android.com/tools"> + + @@ -12,20 +14,16 @@ - + tools:targetApi="31"> diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml index b713b42..1bb55ee 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/app/src/main/res/layout/fragment_login.xml @@ -1,4 +1,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 825c499..10f1964 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ - NTO Pass + NTO Pass Добро пожаловать в приложение! Перейти diff --git a/app/src/main/res/values/strings_qr.xml b/app/src/main/res/values/strings_qr.xml index ce50067..700be8b 100644 --- a/app/src/main/res/values/strings_qr.xml +++ b/app/src/main/res/values/strings_qr.xml @@ -1,4 +1,4 @@ - Close + Close \ No newline at end of file