diff --git a/.idea/misc.xml b/.idea/misc.xml index f1044879e31aa73a3e757a2f81a68e7c26bd222a..0ad17cbd33a2f389d524bc4bfef9c52e1f7ab490 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ExternalStorageConfigurationManager" enabled="true" /> - <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/build/classes" /> </component> <component name="ProjectType"> diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7e447f7285ac75ffb47735eb62bed5feb7f63d8d..a20d57ed3c0bc8cac41cee5a5d5ce1c215bc4a8d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -3,6 +3,7 @@ plugins { id("org.jetbrains.kotlin.android") id("kotlin-android") id("kotlin-kapt") + id("kotlin-parcelize") } android { @@ -43,11 +44,12 @@ android { dependencies { val navVersion = "2.7.7" - implementation("androidx.core:core-ktx:1.12.0") - implementation("androidx.appcompat:appcompat:1.6.1") implementation("androidx.navigation:navigation-fragment-ktx:$navVersion") implementation("androidx.navigation:navigation-ui-ktx:$navVersion") - implementation("com.google.android.material:material:1.9.0") + implementation("androidx.core:core-ktx:1.12.0") + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0") + implementation("androidx.appcompat:appcompat:1.6.1") + implementation("com.google.android.material:material:1.11.0") implementation("com.squareup.retrofit2:retrofit:2.9.0") implementation("com.squareup.retrofit2:converter-gson:2.9.0") testImplementation("junit:junit:4.13.2") @@ -55,8 +57,6 @@ dependencies { androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") implementation("androidx.room:room-runtime:2.6.1") - annotationProcessor("androidx.room:room-compiler:2.6.1") - kapt("androidx.room:room-compiler:2.6.1") implementation("org.apache.poi:poi:5.2.2") @@ -65,19 +65,7 @@ dependencies { //QR COde implementation ("com.github.yuriy-budiyev:code-scanner:2.3.0") - - - - - - - - - - - - - - + // Graph + implementation("com.github.PhilJay:MPAndroidChart:v3.1.0") } \ No newline at end of file