- 서울시 로고 사이즈 조정 - 식당 위치 다국어 반영 - 착한가격 기능 다국어 반영 - 탭 별 헤더 패딩 일치 - 찜 하단 메뉴 주석처리 - 헤더 높이 정렬

app/src/main/java/com/eatssu/android/presentation/MainActivity.kt

@@ -103,10 +103,11 @@ class MainActivity : BaseActivity<ActivityMainBinding>(
 //                    false
 //                }
 
-                R.id.favorite_menu -> {
-                    navController.navigate(R.id.favoriteFragment)
-                    true
-                }
+                //TODO 찜 기능 완성 시
+//                R.id.favorite_menu -> {
+//                    navController.navigate(R.id.favoriteFragment)
+//                    true
+//                }
 
                 R.id.mypage_menu -> {
                     navController.navigate(R.id.myPageFragment)
@@ -122,8 +123,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(
         navController.addOnDestinationChangedListener { _, destination, _ ->
             val menuItemId = when (destination.id) {
                 R.id.cafeteria_menu -> R.id.cafeteria_menu
-                R.id.mapFragment, R.id.favoriteDetailFragment -> R.id.map_menu
-                R.id.favoriteFragment -> R.id.favorite_menu
+                R.id.mapFragment, R.id.favoriteDetailFragment, R.id.favoriteFragment -> R.id.map_menu
                 R.id.myPageFragment -> R.id.mypage_menu
                 else -> null
             }

app/src/main/java/com/eatssu/android/presentation/cafeteria/info/InfoBottomSheetFragment.kt

@@ -48,16 +48,15 @@ class InfoBottomSheetFragment : BottomSheetDialogFragment() {
         analyticsTracker.track(CafeteriaAnalyticsEvent.RestaurantInfoClicked(restaurantType))
 
         binding.tvName.text = getString(restaurantType.displayNameResId)
+        binding.tvLocation.text = getString(restaurantType.locationResId)
+        binding.tvTime.text = getString(restaurantType.timeResId)
+        binding.tvEtc.text = getString(restaurantType.etcResId)
 
         viewLifecycleOwner.lifecycleScope.launch {
             val restaurantInfo = infoViewModel.getRestaurantInfo(restaurantType)
             val binding = _binding ?: return@launch
 
             restaurantInfo?.let {
-                binding.tvLocation.text = it.location
-                binding.tvTime.text = it.time
-                binding.tvEtc.text = it.etc
-
                 Glide.with(binding.ivCafeteriaPhoto)
                     .load(it.image)
                     .into(binding.ivCafeteriaPhoto)

app/src/main/java/com/eatssu/android/presentation/cafeteria/menu/MenuAdapter.kt

@@ -42,7 +42,8 @@ class MenuAdapter(
             }
 
             binding.tvCafeteria.text = binding.root.context.getString(sectionModel.cafeteria.displayNameResId)
-            binding.tvCafeteriaLocation.text = sectionModel.cafeteriaLocation
+            binding.tvCafeteriaLocation.text =
+                binding.root.context.getString(sectionModel.cafeteria.locationResId)
 
             binding.rvMenu.apply {
                 setHasFixedSize(true)

app/src/main/java/com/eatssu/android/presentation/favorite/FavoriteScreen.kt

@@ -19,6 +19,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -36,6 +37,7 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -59,6 +61,7 @@ import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.IntOffset
@@ -74,14 +77,14 @@ import com.eatssu.common.enums.StoreType
 import com.eatssu.design_system.component.DelayedLoadingIndicator
 import com.eatssu.design_system.component.EatSsuSnackbar
 import com.eatssu.design_system.component.EatSsuSnackbarType
-import com.eatssu.design_system.component.EatSsuTopBar
 import com.eatssu.design_system.theme.EatssuTheme
 import com.eatssu.design_system.theme.Error
 import com.eatssu.design_system.theme.Gray200
 import com.eatssu.design_system.theme.Gray300
 import com.eatssu.design_system.theme.Gray400
 import com.eatssu.design_system.theme.Gray500
 import com.eatssu.design_system.theme.Gray600
+import com.eatssu.design_system.theme.Gray700
 import com.eatssu.design_system.theme.Primary
 import com.eatssu.design_system.theme.Secondary
 import com.eatssu.design_system.theme.White
@@ -141,20 +144,47 @@ internal fun FavoriteScreen(
     TrackScreenViewEvent(ScreenId.MAP_FAVORITE)
 
     Scaffold(
+        contentWindowInsets = WindowInsets(0.dp),
         topBar = {
-            EatSsuTopBar(
-                title = stringResource(R.string.favorite_title),
-                onBack = {
+            Column(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .background(White)
+            ) {
+                Box(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(top = 17.dp)
+                        .height(56.dp),
+                    contentAlignment = Alignment.Center,
+                ) {
+                    Text(
+                        text = stringResource(R.string.favorite_title),
+                        style = EatssuTheme.typography.subtitle1,
+                        color = Gray700,
+                        textAlign = TextAlign.Center,
+                    )
+
                     if (isEditMode) {
-                        isEditMode = false
-                        selectedPartnershipIds = emptySet()
-                    } else {
-                        onBackToMap()
+                        IconButton(
+                            onClick = {
+                                isEditMode = false
+                                selectedPartnershipIds = emptySet()
+                            },
+                            modifier = Modifier
+                                .align(Alignment.CenterStart)
+                                .padding(start = 12.dp),
+                        ) {
+                            Icon(
+                                painter = painterResource(id = R.drawable.ic_arrow_left),
+                                contentDescription = "뒤로가기",
+                                tint = Gray500,
+                            )
+                        }
                     }
-                },
-            )
-        },
-        modifier = Modifier.padding(top = 17.dp)
+                }
+            }
+        }
     ) { innerPadding ->
         Box(
             modifier = Modifier

app/src/main/java/com/eatssu/android/presentation/goodprice/GoodPriceMapScreen.kt

@@ -314,8 +314,9 @@ fun GoodPriceMapScreen(
                     },
                     // 개별 마커 클릭 시 업소 상세 바텀시트 호출
                     onClickLeaf = { leaf, _ ->
-                        val store = leaf.tag as? GoodPriceStore ?: return@Clustering true
-                        onStoreClick(store)
+                        (leaf.tag as? GoodPriceStore)?.let { store ->
+                            onStoreClick(store)
+                        }
                         true
                     },
                 )

app/src/main/java/com/eatssu/android/presentation/goodprice/component/GoodPriceFilterRow.kt

@@ -16,6 +16,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import com.eatssu.common.enums.GoodPriceCategory
@@ -54,7 +55,7 @@ fun GoodPriceFilterRow(
                 contentAlignment = Alignment.Center,
             ) {
                 Text(
-                    text = category.displayName,
+                    text = stringResource(id = category.displayNameResId),
                     // Body3 글꼴을 사용하며, 선택된 경우에만 Bold 처리
                     style = EatssuTheme.typography.body3.copy(
                         fontWeight = if (isSelected) FontWeight.Bold else FontWeight.Normal,

app/src/main/java/com/eatssu/android/presentation/goodprice/component/GoodPriceStoreBottomSheet.kt

@@ -21,6 +21,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
 import com.eatssu.android.R
@@ -99,7 +100,7 @@ fun GoodPriceStoreBottomSheet(
                         modifier = Modifier.size(16.dp),
                     )
                     Text(
-                        text = storeDetail.category.displayName,
+                        text = stringResource(id = storeDetail.category.displayNameResId),
                         style = EatssuTheme.typography.body2,
                         color = Gray600,
                     )

app/src/main/java/com/eatssu/android/presentation/login/LoginScreen.kt

@@ -166,7 +166,7 @@ fun LoginScreen(
                         )
 
                         Text(
-                            text = "내 주변 착한 한 끼를 찾아보세요",
+                            text = stringResource(id = R.string.btn_browse_good_price_stores_subtitle),
                             style = EatssuTheme.typography.caption2,
                             color = Black,
                         )