diff --git a/Fruitties/androidApp/build.gradle.kts b/Fruitties/androidApp/build.gradle.kts index 38187db..fed9ee0 100644 --- a/Fruitties/androidApp/build.gradle.kts +++ b/Fruitties/androidApp/build.gradle.kts @@ -76,7 +76,6 @@ dependencies { implementation(libs.compose.ui) implementation(libs.compose.ui.tooling.preview) implementation(libs.compose.material3) - implementation(libs.androidx.material.icons.core) implementation(libs.androidx.activity.compose) implementation(libs.androidx.paging.compose.android) implementation(libs.androidx.lifecycle.viewmodel.compose) diff --git a/Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/CartScreen.kt b/Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/CartScreen.kt index 594cb31..e10fd98 100644 --- a/Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/CartScreen.kt +++ b/Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/CartScreen.kt @@ -31,8 +31,6 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.windowInsetsBottomHeight import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material3.CenterAlignedTopAppBar import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.FilledIconButton @@ -50,6 +48,7 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview @@ -91,8 +90,8 @@ fun CartScreen( navigationIcon = { IconButton(onClick = onNavBarBack) { Icon( - imageVector = Icons.AutoMirrored.Filled.ArrowBack, - contentDescription = "Navigate back", + painter = painterResource(R.drawable.ic_arrow_back_24px), + contentDescription = stringResource(R.string.navigate_back), ) } }, diff --git a/Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/FruittieScreen.kt b/Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/FruittieScreen.kt index 6a28891..92c04bd 100644 --- a/Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/FruittieScreen.kt +++ b/Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/FruittieScreen.kt @@ -6,9 +6,6 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.filled.ArrowBack -import androidx.compose.material.icons.filled.ShoppingCart import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.FloatingActionButton @@ -22,6 +19,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel @@ -78,7 +76,7 @@ fun FruittieScreen( navigationIcon = { IconButton(onClick = onNavBarBack) { Icon( - imageVector = Icons.AutoMirrored.Filled.ArrowBack, + painter = painterResource(R.drawable.ic_arrow_back_24px), contentDescription = stringResource(R.string.navigate_back), ) } @@ -100,7 +98,7 @@ fun FruittieScreen( verticalAlignment = Alignment.CenterVertically, ) { Icon( - Icons.Filled.ShoppingCart, + painter = painterResource(R.drawable.ic_add_shopping_cart_24px), contentDescription = null, ) Spacer(Modifier.width(8.dp)) diff --git a/Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/ListScreen.kt b/Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/ListScreen.kt index ee1f5ad..b38763d 100644 --- a/Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/ListScreen.kt +++ b/Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/ListScreen.kt @@ -28,8 +28,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ShoppingCart import androidx.compose.material3.Button import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.FloatingActionButton @@ -45,6 +43,7 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview @@ -85,7 +84,7 @@ fun ListScreen( verticalAlignment = Alignment.CenterVertically, ) { Icon( - Icons.Filled.ShoppingCart, + painter = painterResource(R.drawable.ic_shopping_cart_24px), contentDescription = null, ) Spacer(Modifier.width(8.dp)) diff --git a/Fruitties/androidApp/src/main/res/drawable/ic_add_shopping_cart_24px.xml b/Fruitties/androidApp/src/main/res/drawable/ic_add_shopping_cart_24px.xml new file mode 100644 index 0000000..a7c0445 --- /dev/null +++ b/Fruitties/androidApp/src/main/res/drawable/ic_add_shopping_cart_24px.xml @@ -0,0 +1,9 @@ + + + diff --git a/Fruitties/androidApp/src/main/res/drawable/ic_arrow_back_24px.xml b/Fruitties/androidApp/src/main/res/drawable/ic_arrow_back_24px.xml new file mode 100644 index 0000000..800941d --- /dev/null +++ b/Fruitties/androidApp/src/main/res/drawable/ic_arrow_back_24px.xml @@ -0,0 +1,10 @@ + + + diff --git a/Fruitties/androidApp/src/main/res/drawable/ic_shopping_cart_24px.xml b/Fruitties/androidApp/src/main/res/drawable/ic_shopping_cart_24px.xml new file mode 100644 index 0000000..8f61454 --- /dev/null +++ b/Fruitties/androidApp/src/main/res/drawable/ic_shopping_cart_24px.xml @@ -0,0 +1,9 @@ + + + diff --git a/Fruitties/gradle/libs.versions.toml b/Fruitties/gradle/libs.versions.toml index e657919..77daf7b 100644 --- a/Fruitties/gradle/libs.versions.toml +++ b/Fruitties/gradle/libs.versions.toml @@ -38,14 +38,12 @@ kermit = "2.0.8" runner = "1.7.0" core = "1.7.0" junit = "1.3.0" -materialIconsCore = "1.7.8" material3 = "1.4.0" [libraries] androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" } androidx-datastore-core-okio = { group = "androidx.datastore", name = "datastore-core-okio", version.ref = "dataStore" } androidx-datastore-preferences-core = { group = "androidx.datastore", name = "datastore-preferences-core", version.ref = "dataStore" } -androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core", version.ref = "materialIconsCore" } androidx-paging-common = { module = "androidx.paging:paging-common", version.ref = "androidx-paging" } androidx-paging-compose-android = { group = "androidx.paging", name = "paging-compose-android", version.ref = "pagingComposeAndroid" } androidx-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "androidx-room" } diff --git a/Fruitties/iosApp/iosApp/ui/FruittieScreen.swift b/Fruitties/iosApp/iosApp/ui/FruittieScreen.swift index c1dcaa4..a5744ca 100644 --- a/Fruitties/iosApp/iosApp/ui/FruittieScreen.swift +++ b/Fruitties/iosApp/iosApp/ui/FruittieScreen.swift @@ -58,7 +58,7 @@ struct FruittieScreen: View { fruittieViewModel.addToCart(fruittie: content.fruittie) }) { HStack { - Image(systemName: "cart.fill") + Image(systemName: "cart.fill.badge.plus") Text("Add to cart") } .padding()