[chore]: restaurant -> store로 네이밍 변경

Author: casper-jr

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

@@ -21,7 +21,7 @@ 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.addmenu.component.item.RestaurantSearchItem
+import com.kuit.ourmenu.ui.addmenu.component.item.StoreSearchItem
 import com.kuit.ourmenu.ui.common.BottomFullWidthButton
 import com.kuit.ourmenu.ui.theme.Neutral100
 import com.kuit.ourmenu.ui.theme.Neutral500
@@ -69,7 +69,7 @@ fun AddMenuSearchBackground(
                 } else {
                     LazyColumn(modifier = Modifier.padding(top = 68.dp)) {
                         items(searchResults) { item ->
-                            RestaurantSearchItem(
+                            StoreSearchItem(
                                 isLastItem = item,
                             ){
                                 onItemClick()
@@ -90,7 +90,7 @@ fun AddMenuSearchBackground(
                 } else {
                     LazyColumn() {
                         items(recentSearchResults) { item ->
-                            RestaurantSearchItem(
+                            StoreSearchItem(
                                 isLastItem = item,
                             ){
                                 onItemClick()
@@ -109,7 +109,7 @@ fun AddMenuSearchBackground(
             onClick = { TODO() },
             containerColor = Neutral100,
             contentColor = Neutral500,
-            text = stringResource(R.string.add_restaurant_and_menu_by_myself)
+            text = stringResource(R.string.add_store_and_menu_by_myself)
         )
     }
 }

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

@@ -37,7 +37,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.kuit.ourmenu.R
 import com.kuit.ourmenu.ui.addmenu.component.item.SelectMenuItem
-import com.kuit.ourmenu.ui.addmenu.viewmodel.AddMenuDummyRestaurantInfo
+import com.kuit.ourmenu.ui.addmenu.viewmodel.AddMenuDummyStoreInfo
 import com.kuit.ourmenu.ui.addmenu.viewmodel.AddMenuSearchViewModel
 import com.kuit.ourmenu.ui.common.BottomFullWidthButton
 import com.kuit.ourmenu.ui.theme.Neutral100
@@ -54,11 +54,11 @@ import kotlinx.coroutines.launch
 @Composable
 fun AddMenuBottomSheetContent(
     scaffoldState: BottomSheetScaffoldState,
-    restaurantInfo: AddMenuDummyRestaurantInfo,
+    storeInfo: AddMenuDummyStoreInfo,
     onItemClick: (Int) -> Unit
 ) {
     val coroutineScope = rememberCoroutineScope()
-    val enableNextButton = restaurantInfo.menuList.any { it }
+    val enableNextButton = storeInfo.menuList.any { it }
 
     Column(
         modifier = Modifier
@@ -143,7 +143,7 @@ fun AddMenuBottomSheetContent(
                     .weight(1f)
                     .padding(top = 12.dp)
             ) {
-                itemsIndexed(restaurantInfo.menuList) { index, isSelected ->
+                itemsIndexed(storeInfo.menuList) { index, isSelected ->
 //                    Log.d("AddMenuBottomSheetContent", "Item: $index, $isSelected")
                     SelectMenuItem(
                         isSelected = isSelected,
@@ -182,12 +182,12 @@ fun AddMenuBottomSheetContent(
 private fun AddMenuBottomSheetContentPreview() {
     val scaffoldState = rememberBottomSheetScaffoldState()
     val viewModel: AddMenuSearchViewModel = viewModel()
-    val restaurantInfo by viewModel.restaurantInfo.collectAsStateWithLifecycle()
+    val storeInfo by viewModel.storeInfo.collectAsStateWithLifecycle()
     LaunchedEffect(Unit) {
         //아래 주석 해제하면 bottom sheet 확장된 상태 확인 가능
         scaffoldState.bottomSheetState.expand()
     }
-    AddMenuBottomSheetContent(scaffoldState, restaurantInfo) { index ->
+    AddMenuBottomSheetContent(scaffoldState, storeInfo) { index ->
         viewModel.updateSelectedMenu(index = index)
     }
 }

app/src/main/java/com/kuit/ourmenu/ui/addmenu/component/item/AddMenuInfoAddressFieldItem.kt

@@ -69,7 +69,7 @@ fun AddMenuInfoAddressFieldItem(
             containerColor = Neutral100,
             placeHolder = {
                 Text(
-                    text = stringResource(R.string.type_restaurant_address),
+                    text = stringResource(R.string.type_store_address),
                     style = ourMenuTypography().pretendard_500_14,
                     color = Neutral500
                 )

app/src/main/java/com/kuit/ourmenu/ui/addmenu/component/item/AddMenuInfoTextFieldItem.kt

@@ -95,7 +95,7 @@ fun AddMenuInfoTextFieldItem(
 @Composable
 private fun AddMenuInfoTextFieldItemPreview() {
     var priceText by rememberSaveable { mutableStateOf("") }
-    var restaurantNameText by rememberSaveable { mutableStateOf("") }
+    var storeNameText by rememberSaveable { mutableStateOf("") }
 
     Column(
         modifier = Modifier.fillMaxSize(),
@@ -110,10 +110,10 @@ private fun AddMenuInfoTextFieldItemPreview() {
             isPriceInfo = true
         )
         AddMenuInfoTextFieldItem(
-            fieldName = stringResource(R.string.restaurant_name),
-            text = restaurantNameText,
-            onTextChange = { restaurantNameText = it },
-            placeholder = stringResource(R.string.type_restaurant_name)
+            fieldName = stringResource(R.string.store_name),
+            text = storeNameText,
+            onTextChange = { storeNameText = it },
+            placeholder = stringResource(R.string.type_store_name)
         )
     }
 

…u/component/item/RestaurantSearchItem.kt …ddmenu/component/item/StoreSearchItem.ktapp/src/main/java/com/kuit/ourmenu/ui/addmenu/component/item/RestaurantSearchItem.kt renamed to app/src/main/java/com/kuit/ourmenu/ui/addmenu/component/item/StoreSearchItem.kt app/src/main/java/com/kuit/ourmenu/ui/addmenu/component/item/RestaurantSearchItem.kt renamed to app/src/main/java/com/kuit/ourmenu/ui/addmenu/component/item/StoreSearchItem.kt

@@ -24,7 +24,7 @@ import com.kuit.ourmenu.ui.theme.Neutral700
 import com.kuit.ourmenu.ui.theme.ourMenuTypography
 
 @Composable
-fun RestaurantSearchItem(
+fun StoreSearchItem(
     isLastItem: Boolean = false,
     onClick: () -> Unit = {}
 ) {
@@ -68,8 +68,8 @@ fun RestaurantSearchItem(
 @Composable
 private fun RestaurantSearchItemPreview() {
     Column(modifier = Modifier.fillMaxSize(), verticalArrangement = Arrangement.Center) {
-        RestaurantSearchItem()
-        RestaurantSearchItem()
-        RestaurantSearchItem(true)
+        StoreSearchItem()
+        StoreSearchItem()
+        StoreSearchItem(true)
     }
 }

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

@@ -30,8 +30,8 @@ import com.kuit.ourmenu.R
 import com.kuit.ourmenu.ui.addmenu.component.item.AddMenuInfoAddressFieldItem
 import com.kuit.ourmenu.ui.addmenu.component.item.AddMenuInfoMenuBoardFieldItem
 import com.kuit.ourmenu.ui.addmenu.component.item.AddMenuInfoTextFieldItem
-import com.kuit.ourmenu.ui.common.topappbar.OurMenuBackButtonTopAppBar
 import com.kuit.ourmenu.ui.common.BottomFullWidthButton
+import com.kuit.ourmenu.ui.common.topappbar.OurMenuBackButtonTopAppBar
 import com.kuit.ourmenu.ui.theme.Neutral300
 import com.kuit.ourmenu.ui.theme.Neutral400
 import com.kuit.ourmenu.ui.theme.Neutral500
@@ -44,7 +44,7 @@ fun AddMenuInfoScreen(autoInput: Boolean = true) {
     var menuBoardText by rememberSaveable { mutableStateOf("") }
     var menuNameText by rememberSaveable { mutableStateOf("") }
     var priceText by rememberSaveable { mutableStateOf("") }
-    var restaurantNameText by rememberSaveable { mutableStateOf("") }
+    var storeNameText by rememberSaveable { mutableStateOf("") }
     var mainAddressText by rememberSaveable { mutableStateOf("") }
     var detailedAddressText by rememberSaveable { mutableStateOf("") }
 
@@ -134,10 +134,10 @@ fun AddMenuInfoScreen(autoInput: Boolean = true) {
                         isPriceInfo = true
                     )
                     AddMenuInfoTextFieldItem(
-                        fieldName = stringResource(R.string.restaurant_name),
-                        text = restaurantNameText,
-                        onTextChange = { restaurantNameText = it },
-                        placeholder = stringResource(R.string.type_restaurant_name)
+                        fieldName = stringResource(R.string.store_name),
+                        text = storeNameText,
+                        onTextChange = { storeNameText = it },
+                        placeholder = stringResource(R.string.type_store_name)
                     )
 
                     AddMenuInfoAddressFieldItem(

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

@@ -38,8 +38,8 @@ import com.kuit.ourmenu.R
 import com.kuit.ourmenu.ui.addmenu.component.AddMenuSearchBackground
 import com.kuit.ourmenu.ui.addmenu.component.bottomsheet.AddMenuBottomSheetContent
 import com.kuit.ourmenu.ui.addmenu.viewmodel.AddMenuSearchViewModel
-import com.kuit.ourmenu.ui.common.topappbar.OurMenuBackButtonTopAppBar
 import com.kuit.ourmenu.ui.common.SearchBar
+import com.kuit.ourmenu.ui.common.topappbar.OurMenuBackButtonTopAppBar
 import com.kuit.ourmenu.ui.theme.Neutral300
 import com.kuit.ourmenu.ui.theme.Primary500Main
 import com.kuit.ourmenu.ui.theme.ourMenuTypography
@@ -59,7 +59,7 @@ fun AddMenuScreen(modifier: Modifier = Modifier) {
     val viewModel: AddMenuSearchViewModel = viewModel()
     val recentSearchResults by viewModel.recentSearchResults.collectAsStateWithLifecycle()
     val searchResults by viewModel.searchResults.collectAsStateWithLifecycle()
-    val restaurantInfo by viewModel.restaurantInfo.collectAsStateWithLifecycle()
+    val storeInfo by viewModel.storeInfo.collectAsStateWithLifecycle()
 
     LaunchedEffect(searchBarFocused) {
         if (searchBarFocused) {
@@ -91,7 +91,7 @@ fun AddMenuScreen(modifier: Modifier = Modifier) {
             //bottom sheet 구성
             AddMenuBottomSheetContent(
                 scaffoldState = scaffoldState,
-                restaurantInfo = restaurantInfo,
+                storeInfo = storeInfo,
                 onItemClick = { index -> viewModel.updateSelectedMenu(index) })
         },
         //조건 만족하면 bottom sheet 보여주고, 아니면 화면에 안보이도록 처리

app/src/main/java/com/kuit/ourmenu/ui/addmenu/viewmodel/AddMenuSearchViewModel.kt

@@ -9,17 +9,17 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 
 class AddMenuSearchViewModel : ViewModel() {
-    // 최근 검색 결과를 저장하는 StateFlow
+    // 최근 검색 결과를 저장
     private val _recentSearchResults = MutableStateFlow<List<Boolean>>(emptyList())
     val recentSearchResults: StateFlow<List<Boolean>> = _recentSearchResults
 
-    //실제 검색 결과를 저장하는 StateFlow
+    //실제 검색 결과를 저장
     private val _searchResulst = MutableStateFlow<List<Boolean>>(emptyList())
     val searchResults: StateFlow<List<Boolean>> = _searchResulst
 
-    //식당 정보들
-    private val _restaurantInfo = MutableStateFlow(AddMenuDummyRestaurantInfo())
-    val restaurantInfo: StateFlow<AddMenuDummyRestaurantInfo> = _restaurantInfo
+    //식당 정보
+    private val _storeInfo = MutableStateFlow(AddMenuDummyStoreInfo())
+    val storeInfo: StateFlow<AddMenuDummyStoreInfo> = _storeInfo
 
     init {
         getRecentSearchResults()
@@ -42,7 +42,7 @@ class AddMenuSearchViewModel : ViewModel() {
 
     fun getRestaurantInfo() {
         viewModelScope.launch {
-            _restaurantInfo.value = AddMenuDummyRestaurantInfo(
+            _storeInfo.value = AddMenuDummyStoreInfo(
                 imgList = listOf(
                     R.drawable.img_dummy_pizza,
                     R.drawable.img_dummy_pizza,
@@ -58,27 +58,27 @@ class AddMenuSearchViewModel : ViewModel() {
     fun updateSelectedMenu(index: Int) {
         Log.d("AddMenuViewModel", "index: $index")
         viewModelScope.launch {
-            val currentState = _restaurantInfo.value.menuList[index]
+            val currentState = _storeInfo.value.menuList[index]
             val updatedMenuList =
                 if (currentState){
                     //선택된 아이템 클릭시 false로 다시 변경
-                    _restaurantInfo.value.menuList.map {
+                    _storeInfo.value.menuList.map {
                         false
                     }
                 }else{
                     //클릭된 인덱스만 true, 나머지는 false
-                    _restaurantInfo.value.menuList.mapIndexed { i, _ ->
+                    _storeInfo.value.menuList.mapIndexed { i, _ ->
                         i == index
                 }
             }
 //            Log.d("AddMenuViewModel", "updatedMenuList: $updatedMenuList")
-            _restaurantInfo.value = _restaurantInfo.value.copy(menuList = updatedMenuList)
+            _storeInfo.value = _storeInfo.value.copy(menuList = updatedMenuList)
         }
     }
 }
 
 //이후에 dto 반영시 삭제 예정
-data class AddMenuDummyRestaurantInfo(
+data class AddMenuDummyStoreInfo(
     val imgList: List<Int> = emptyList(),
     val name: String = "",
     val address: String = "",

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

@@ -60,7 +60,7 @@ private fun BottomFullWidthButtonPreview() {
         BottomFullWidthButton(
             containerColor = Neutral100,
             contentColor = Neutral500,
-            text = stringResource(R.string.add_restaurant_and_menu_by_myself)
+            text = stringResource(R.string.add_store_and_menu_by_myself)
         ) {
             //onClick 작성
         }

app/src/main/res/values/strings.xml

@@ -12,13 +12,13 @@
     <string name="type_menu_name">메뉴 이름을 입력해주세요</string>
     <string name="menu_price">메뉴 가격</string>
     <string name="type_menu_price">직접 가격을 입력해주세요</string>
-    <string name="restaurant_name">가게 이름</string>
-    <string name="type_restaurant_name">가게 이름을 입력해주세요</string>
+    <string name="store_name">가게 이름</string>
+    <string name="type_store_name">가게 이름을 입력해주세요</string>
     <string name="resaturant_address">가게 주소</string>
-    <string name="type_restaurant_address">가게 주소를 입력해주세요.</string>
+    <string name="type_store_address">가게 주소를 입력해주세요.</string>
     <string name="type_restaurant_detailed_address">상세 주소를 입력해주세요.</string>
     <string name="ourmenu">OURMENU</string>
-    <string name="add_restaurant_and_menu_by_myself">가게와 메뉴 직접 추가</string>
+    <string name="add_store_and_menu_by_myself">가게와 메뉴 직접 추가</string>
     <string name="no_result">검색 결과가 없어요!</string>
     <string name="recent_search">최근 검색</string>
     <string name="cancel">취소</string>