Merge branch 'master' into 'main'

.gitignore

.idea/.gitignore

app/.gitignore

app/build.gradle.kts

app/proguard-rules.pro

...idTest/java/fr/ul/projetdevmob/ExampleInstrumentedTest.kt

app/src/main/AndroidManifest.xml

app/src/main/java/fr/ul/projetdevmob/MainActivity.kt

app/src/main/java/fr/ul/projetdevmob/ui/theme/Color.kt

app/src/main/java/fr/ul/projetdevmob/ui/theme/Theme.kt

app/src/main/java/fr/ul/projetdevmob/ui/theme/Type.kt

app/src/main/res/drawable/ic_launcher_background.xml

app/src/main/res/drawable/ic_launcher_foreground.xml

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

app/src/main/res/mipmap-hdpi/ic_launcher.webp

app/src/main/res/mipmap-hdpi/ic_launcher_round.webp

app/src/main/res/mipmap-mdpi/ic_launcher.webp

app/src/main/res/mipmap-mdpi/ic_launcher_round.webp

app/src/main/res/mipmap-xhdpi/ic_launcher.webp