changes #3

Merged
macharest merged 3 commits from changes into master 2026-02-22 21:24:26 -05:00
5 changed files with 21 additions and 7 deletions
Showing only changes of commit df1188fc02 - Show all commits

2
.gitignore vendored
View File

@@ -13,3 +13,5 @@
.externalNativeBuild
.cxx
local.properties
app/firebase-key.json
firebase-key.json

3
.idea/misc.xml generated
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="temurin-21" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

View File

@@ -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<com.google.firebase.appdistribution.gradle.AppDistributionExtension> {
artifactType = "APK"
if (keyFile.exists()) {
serviceCredentialsFile = keyFile.absolutePath
}
groups = "internal-user"
}
}
debug {
configure<com.google.firebase.appdistribution.gradle.AppDistributionExtension> {
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)

View File

@@ -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

View File

@@ -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" }