Merge remote-tracking branch 'origin/main'

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/example/snapandsolve/MainScreen.kt
This commit is contained in:
2025-12-17 22:31:23 +01:00
2 changed files with 5 additions and 0 deletions

View File

@@ -58,6 +58,7 @@ dependencies {
implementation(libs.androidx.compose.ui.graphics)
implementation(libs.androidx.compose.ui.tooling.preview)
implementation(libs.androidx.compose.material3)
implementation(libs.androidx.material3)
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
@@ -65,4 +66,6 @@ dependencies {
androidTestImplementation(libs.androidx.compose.ui.test.junit4)
debugImplementation(libs.androidx.compose.ui.tooling)
debugImplementation(libs.androidx.compose.ui.test.manifest)
implementation("androidx.compose.material:material-icons-core")
implementation("androidx.compose.material:material-icons-extended")
}