Merge pull request DDD-Community#157 from Minsu-Lee/feature/fridge-ingredient-category-background

식재료 카테고리 아이콘 배경색 추가

Author: Minsu-Lee

core/designsystem/src/main/kotlin/com/anddd/nevera/core/designsystem/ui/theme/color/NeveraColor.kt

@@ -97,6 +97,17 @@ class NeveraColor(
 
     // Notification
     val notificationRed: Color,
+
+    // Category background
+    val categoryVeg: Color,
+    val categoryFruit: Color,
+    val categoryMeatEggs: Color,
+    val categorySea: Color,
+    val categoryDairy: Color,
+    val categorySauce: Color,
+    val categoryDrink: Color,
+    val categoryProcessed: Color,
+    val categoryEtc: Color,
 )
 
 internal val LightNeveraColors = NeveraColor(
@@ -190,6 +201,17 @@ internal val LightNeveraColors = NeveraColor(
 
     // Notification
     notificationRed = ColorPalette.red50,
+
+    // Category background
+    categoryVeg = ColorPalette.lime5,
+    categoryFruit = ColorPalette.orange5,
+    categoryMeatEggs = ColorPalette.red5,
+    categorySea = ColorPalette.blue5,
+    categoryDairy = ColorPalette.cyan5,
+    categorySauce = ColorPalette.purple5,
+    categoryDrink = ColorPalette.yellow5,
+    categoryProcessed = ColorPalette.green5,
+    categoryEtc = ColorPalette.gray5,
 )
 
 // TODO: Dark mode colors - pending design team's color palette
@@ -284,6 +306,17 @@ internal val DarkNeveraColors = NeveraColor(
 
     // Notification
     notificationRed = ColorPalette.red50,
+
+    // Category background
+    categoryVeg = ColorPalette.lime5,
+    categoryFruit = ColorPalette.orange5,
+    categoryMeatEggs = ColorPalette.red5,
+    categorySea = ColorPalette.blue5,
+    categoryDairy = ColorPalette.cyan5,
+    categorySauce = ColorPalette.purple5,
+    categoryDrink = ColorPalette.yellow5,
+    categoryProcessed = ColorPalette.green5,
+    categoryEtc = ColorPalette.gray5,
 )
 
 internal val LocalNeveraColors = staticCompositionLocalOf { LightNeveraColors }

core/ui/src/main/kotlin/com/anddd/nevera/core/ui/FoodCategoryUiExt.kt

@@ -2,7 +2,9 @@ package com.anddd.nevera.core.ui
 
 import androidx.annotation.DrawableRes
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
+import com.anddd.nevera.core.designsystem.ui.theme.NeveraTheme
 import com.anddd.nevera.domain.model.ingredient.FoodCategory
 
 @DrawableRes
@@ -18,6 +20,19 @@ fun FoodCategory.iconRes(): Int = when (this) {
     FoodCategory.Etc -> R.drawable.img_listcell_etc
 }
 
+@Composable
+fun FoodCategory.backgroundColor(): Color = when (this) {
+    FoodCategory.Veg       -> NeveraTheme.colors.categoryVeg
+    FoodCategory.Fruit     -> NeveraTheme.colors.categoryFruit
+    FoodCategory.MeatEggs  -> NeveraTheme.colors.categoryMeatEggs
+    FoodCategory.Sea       -> NeveraTheme.colors.categorySea
+    FoodCategory.Dairy     -> NeveraTheme.colors.categoryDairy
+    FoodCategory.Sauce     -> NeveraTheme.colors.categorySauce
+    FoodCategory.Drink     -> NeveraTheme.colors.categoryDrink
+    FoodCategory.Processed -> NeveraTheme.colors.categoryProcessed
+    FoodCategory.Etc       -> NeveraTheme.colors.categoryEtc
+}
+
 @Composable
 fun FoodCategory.displayName(): String = stringResource(
     when (this) {

feature/fridge/src/main/kotlin/com/anddd/nevera/feature/fridge/main/component/FridgeIngredientItem.kt

@@ -53,6 +53,7 @@ import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import com.anddd.nevera.core.designsystem.icon.NeveraIcons
 import com.anddd.nevera.core.designsystem.ui.theme.NeveraTheme
+import com.anddd.nevera.core.ui.backgroundColor
 import com.anddd.nevera.core.ui.displayName
 import com.anddd.nevera.core.ui.iconRes
 import com.anddd.nevera.domain.model.ingredient.FoodCategory
@@ -254,6 +255,7 @@ private fun IngredientCategoryIcon(
             contentDescription = null,
             modifier = Modifier
                 .fillMaxSize()
+                .background(item.category.backgroundColor(), imageShape)
                 .clip(imageShape)
                 .then(
                     if (expiryState == ExpiryState.Normal) {

feature/main/src/main/kotlin/com/anddd/nevera/feature/main/home/component/IngredientItem.kt

@@ -1,6 +1,7 @@
 package com.anddd.nevera.feature.main.home.component
 
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -20,6 +21,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.anddd.nevera.core.designsystem.ui.theme.NeveraTheme
 import com.anddd.nevera.domain.model.ingredient.FoodCategory
+import com.anddd.nevera.core.ui.backgroundColor
 import com.anddd.nevera.core.ui.iconRes
 import com.anddd.nevera.feature.main.home.model.IngredientUiModel
 
@@ -43,6 +45,7 @@ internal fun IngredientItem(
             contentDescription = null,
             modifier = Modifier
                 .size(CategoryImageSize)
+                .background(ingredient.category.backgroundColor(), imageShape)
                 .clip(imageShape)
                 .border(CategoryImageBorderWidth, NeveraTheme.colors.borderNormal, imageShape),
         )