diff --git a/.gitignore b/.gitignore index aa724b7..0588d3a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ .externalNativeBuild .cxx local.properties +app/firebase-key.json +firebase-key.json \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index b2c751a..991a888 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,7 @@ + - + diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5a29abe..6369fc3 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -11,7 +11,7 @@ plugins { android { namespace = "com.example.scanwich" - compileSdk = 35 + compileSdk = 36 defaultConfig { applicationId = "com.example.scanwich" @@ -32,9 +32,9 @@ android { getByName("debug") { storeFile = file(System.getProperty("user.home") + "/.android/debug.keystore") - storePassword = "android" - keyAlias = "androiddebugkey" - keyPassword = "android" + getByName("debug").storePassword = "android" + getByName("debug").keyAlias = "androiddebugkey" + getByName("debug").keyPassword = "android" } create("release") { @@ -46,6 +46,8 @@ android { } buildTypes { + val keyFile = project.file("firebase-key.json") + release { isMinifyEnabled = false signingConfig = signingConfigs.getByName("release") @@ -56,12 +58,21 @@ android { configure { artifactType = "APK" + if (keyFile.exists()) { + serviceCredentialsFile = keyFile.absolutePath + } + groups = "internal-user" } } debug { configure { artifactType = "APK" + if (keyFile.exists()) { + serviceCredentialsFile = keyFile.absolutePath + } + groups = "internal-user" + releaseNotes = "Version de développement" } } } @@ -88,10 +99,10 @@ dependencies { implementation(libs.androidx.compose.ui.graphics) implementation(libs.androidx.compose.ui.tooling.preview) implementation(libs.androidx.compose.material3) + implementation(libs.androidx.compose.material.icons.extended) implementation(libs.google.generativeai) implementation(libs.coil.compose) implementation(libs.androidx.exifinterface) - implementation(libs.androidx.navigation.compose) implementation(libs.androidx.room.runtime) diff --git a/app/src/main/java/com/example/scanwich/ui/theme/Theme.kt b/app/src/main/java/com/example/scanwich/ui/theme/Theme.kt index c598e02..a99e0df 100644 --- a/app/src/main/java/com/example/scanwich/ui/theme/Theme.kt +++ b/app/src/main/java/com/example/scanwich/ui/theme/Theme.kt @@ -1,6 +1,5 @@ package com.example.scanwich.ui.theme -import android.app.Activity import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a6f465b..6e24664 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -38,6 +38,7 @@ androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "u androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" } androidx-compose-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" } androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" } +androidx-compose-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended" } google-generativeai = { group = "com.google.ai.client.generativeai", name = "generativeai", version.ref = "generativeai" } coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" } androidx-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }