[FEAT] 메뉴판 Api 구현

app/build.gradle.kts

@@ -25,7 +25,7 @@ android {
         versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        buildConfigField("String", "BASE_URL", properties["BASE_URL"].toString())
+        buildConfigField("String", "BASE_URL", "\"${properties["BASE_URL"]}\"")
 
         manifestPlaceholders["KAKAO_APP_KEY"] = properties["KAKAO_APP_KEY"].toString()
         buildConfigField("String", "KAKAO_APP_KEY", properties["KAKAO_APP_KEY"].toString())
@@ -96,6 +96,11 @@ dependencies {
     // Kakao SDK
     implementation("com.kakao.sdk:v2-all:2.20.6")
     implementation("com.kakao.sdk:v2-user:2.20.6") // 카카오 로그인 API 모듈
+
+    // image
+    implementation("io.coil-kt.coil3:coil-compose:3.1.0")
+    implementation("io.coil-kt.coil3:coil-network-okhttp:3.1.0")
+    implementation("io.coil-kt.coil3:coil-svg:3.1.0")
 }
 
 // Hilt를 사용할 때 필요한 Annotation Processor

app/src/main/java/com/kuit/ourmenu/data/di/ServiceModule.kt

@@ -2,6 +2,7 @@ package com.kuit.ourmenu.data.di
 
 import com.kuit.ourmenu.data.service.AuthService
 import com.kuit.ourmenu.data.service.DummyService
+import com.kuit.ourmenu.data.service.MenuFolderService
 import com.kuit.ourmenu.data.service.UserService
 import dagger.Module
 import dagger.Provides
@@ -28,4 +29,10 @@ object ServiceModule {
     @Singleton
     fun providesUserService(retrofit: Retrofit): UserService =
         retrofit.create(UserService::class.java)
+
+    @Provides
+    @Singleton
+    fun provideMenuFolderService(retrofit: Retrofit): MenuFolderService =
+        retrofit.create(MenuFolderService::class.java)
+
 }

app/src/main/java/com/kuit/ourmenu/data/model/menuFolder/response/MenuFolderIconType.kt

@@ -0,0 +1,36 @@
+package com.kuit.ourmenu.data.model.menuFolder.response
+
+enum class MenuFolderIconType {
+    ANGRY,
+    BAEKSUK,
+    BASKET,
+    BREAD,
+    CLOUD,
+    COFFEE,
+    CONGRATS,
+    COUPLE,
+    CRY,
+    DICE,
+    DOUGHNUT,
+    FIRE,
+    FISH,
+    FISH_BREAD,
+    HAMBURGER,
+    HEART,
+    ICE_CREAM,
+    JJAMBBONG,
+    LEAF,
+    MAN,
+    MEAT,
+    NOODLE,
+    PEOPLE,
+    RAMEN,
+    RICE,
+    SMILE,
+    SNOWMAN,
+    SPOON_AND_CHOPSTICK,
+    SUN,
+    SUNNY,
+    SUSHI,
+    TABLE,
+}

app/src/main/java/com/kuit/ourmenu/data/model/menuFolder/response/MenuFolderResponse.kt

@@ -0,0 +1,13 @@
+package com.kuit.ourmenu.data.model.menuFolder.response
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class MenuFolderResponse(
+    val menuFolderId: Int,
+    val menuFolderTitle: String,
+    val menuFolderUrl: String,
+    val menuFolderIcon: String,
+    val menuIds: List<Int>,
+    val index: Int,
+)

app/src/main/java/com/kuit/ourmenu/data/repository/MenuFolderRepository.kt

@@ -0,0 +1,15 @@
+package com.kuit.ourmenu.data.repository
+
+import com.kuit.ourmenu.data.model.base.handleBaseResponse
+import com.kuit.ourmenu.data.service.MenuFolderService
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class MenuFolderRepository @Inject constructor(
+    private val menuFolderService: MenuFolderService,
+) {
+    suspend fun getMenuFolders() = runCatching {
+        menuFolderService.getMenuFolders().handleBaseResponse().getOrThrow()
+    }
+}

app/src/main/java/com/kuit/ourmenu/data/service/MenuFolderService.kt

@@ -0,0 +1,10 @@
+package com.kuit.ourmenu.data.service
+
+import com.kuit.ourmenu.data.model.base.BaseResponse
+import com.kuit.ourmenu.data.model.menuFolder.response.MenuFolderResponse
+import retrofit2.http.GET
+
+interface MenuFolderService {
+    @GET("api/menu-folders")
+    suspend fun getMenuFolders(): BaseResponse<List<MenuFolderResponse>>
+}

app/src/main/java/com/kuit/ourmenu/ui/addmenu/component/bottomsheet/TagSelectBottomSheet.kt

@@ -83,7 +83,7 @@ fun TagSelectBottomSheet(
 
                 //종류
                 TagChipGroup(
-                    groupLabel = "종류",
+                    groupLabel = stringResource(R.string.type),
                     tags = categoryTagList,
                     selectedTags = selectedTagList,
                 ) { tag ->
@@ -97,7 +97,7 @@ fun TagSelectBottomSheet(
                 }
                 //나라 별 음식
                 TagChipGroup(
-                    groupLabel = "나라 별 음식",
+                    groupLabel = stringResource(R.string.nationality),
                     tags = nationalityTagList,
                     selectedTags = selectedTagList,
                 ) { tag ->
@@ -111,7 +111,7 @@ fun TagSelectBottomSheet(
                 }
                 //맛
                 TagChipGroup(
-                    groupLabel = "맛",
+                    groupLabel = stringResource(R.string.taste),
                     tags = tasteTagList,
                     selectedTags = selectedTagList,
                 ) { tag ->
@@ -125,7 +125,7 @@ fun TagSelectBottomSheet(
                 }
                 //상황
                 TagChipGroup(
-                    groupLabel = "상황",
+                    groupLabel = stringResource(R.string.occasion),
                     tags = occasionTagList,
                     selectedTags = selectedTagList,
                 ) { tag ->
@@ -173,7 +173,6 @@ fun TagSelectBottomSheet(
                 .padding(bottom = 60.dp),
             hostState = snackbarHostState,
             isChecked = false,
-            message = stringResource(R.string.tag_number_warning)
         )
     }
 }

app/src/main/java/com/kuit/ourmenu/ui/addmenu/screen/AddMenuScreen.kt

@@ -34,6 +34,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavController
+import androidx.navigation.compose.rememberNavController
 import com.kuit.ourmenu.R
 import com.kuit.ourmenu.ui.addmenu.component.AddMenuSearchBackground
 import com.kuit.ourmenu.ui.addmenu.component.bottomsheet.AddMenuBottomSheetContent
@@ -46,7 +48,7 @@ import com.kuit.ourmenu.ui.theme.ourMenuTypography
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun AddMenuScreen(modifier: Modifier = Modifier) {
+fun AddMenuScreen(navController: NavController) {
     var scaffoldState = rememberBottomSheetScaffoldState()
     var showBottomSheet by rememberSaveable { mutableStateOf(false) }
     var showSearchBackground by rememberSaveable { mutableStateOf(false) }
@@ -162,5 +164,7 @@ fun AddMenuScreen(modifier: Modifier = Modifier) {
 @Preview(showBackground = true)
 @Composable
 private fun AddMenuScreenPreview() {
-    AddMenuScreen()
+    val navController = rememberNavController()
+
+    AddMenuScreen(navController)
 }

app/src/main/java/com/kuit/ourmenu/ui/common/chip/TagChipGroup.kt

@@ -15,9 +15,11 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.kuit.ourmenu.R
+import com.kuit.ourmenu.ui.theme.Neutral900
 import com.kuit.ourmenu.ui.theme.ourMenuTypography
 
 @OptIn(ExperimentalLayoutApi::class)
@@ -32,7 +34,8 @@ fun TagChipGroup(
     Column(modifier = modifier.fillMaxWidth()){
         Text(
             text = groupLabel,
-            style = ourMenuTypography().pretendard_500_14,
+            style = ourMenuTypography().pretendard_400_14,
+            color = Neutral900
         )
         Spacer(modifier = modifier.height(8.dp))
         FlowRow(
@@ -73,7 +76,7 @@ private fun TagChipGroupPreview() {
     var selectedTags by rememberSaveable { mutableStateOf(listOf<String>()) }
 
     TagChipGroup(
-        groupLabel = "종류",
+        groupLabel = stringResource(R.string.type),
         tags = tags,
         selectedTags = selectedTags,
     ){ tag ->

app/src/main/java/com/kuit/ourmenu/ui/common/topappbar/BackButtonTopAppBar.kt

@@ -17,10 +17,10 @@ import com.kuit.ourmenu.ui.theme.Neutral500
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun BackButtonTopAppBar(color: Color, isKebabVisible: Boolean) {
+fun BackButtonTopAppBar(color: Color, isKebabVisible: Boolean, onBackClick: () -> Unit = {}) {
     TopAppBar(
         title = {
-            IconButton(onClick = { TODO("뒤로가기 구현") }) {
+            IconButton(onClick = onBackClick) {
                 Icon(
                     painter = painterResource(R.drawable.ic_back),
                     contentDescription = "Back",
@@ -34,7 +34,7 @@ fun BackButtonTopAppBar(color: Color, isKebabVisible: Boolean) {
                     painter = painterResource(R.drawable.ic_kebab),
                     modifier = Modifier.padding(end = 18.dp),
                     contentDescription = "Menu",
-                    tint = color
+                    tint = color,
                 )
             }
         },