[refactor] BbangZipDetail 뷰 코드 정리

app/src/main/java/org/android/bbangzip/presentation/ui/my/bbangzipdetail/BbangZipDetailContract.kt

@@ -16,14 +16,14 @@ class BbangZipDetailContract {
     sealed interface BbangZipDetailEvent : BaseContract.Event {
         data object Initialize : BbangZipDetailEvent
 
-        data object OnClickBackBtn : BbangZipDetailEvent
+        data object OnBackIconClick : BbangZipDetailEvent
     }
 
     sealed interface BbangZipDetailReduce : BaseContract.Reduce {
         data class UpdateMyBbangZipList(val bbangZipList: List<BbangZip>) : BbangZipDetailReduce
     }
 
     sealed interface BbangZipDetailSideEffect : BaseContract.SideEffect {
-        data object PopBackStack : BbangZipDetailSideEffect
+        data object NavigateToBack : BbangZipDetailSideEffect
     }
 }

app/src/main/java/org/android/bbangzip/presentation/ui/my/bbangzipdetail/BbangZipDetailRoute.kt

@@ -12,7 +12,7 @@ import org.android.bbangzip.presentation.component.indicator.BbangZipLoadingIndi
 
 @Composable
 fun BbangZipDetailRoute(
-    popBackStack: () -> Unit,
+    navigateToBack: () -> Unit,
     modifier: Modifier = Modifier,
     viewModel: BbangZipDetailViewModel = hiltViewModel(),
 ) {
@@ -23,7 +23,7 @@ fun BbangZipDetailRoute(
     LaunchedEffect(viewModel.uiSideEffect) {
         viewModel.uiSideEffect.collectLatest { effect ->
             when (effect) {
-                is BbangZipDetailContract.BbangZipDetailSideEffect.PopBackStack -> popBackStack()
+                is BbangZipDetailContract.BbangZipDetailSideEffect.NavigateToBack -> navigateToBack()
             }
         }
     }
@@ -34,7 +34,7 @@ fun BbangZipDetailRoute(
                 modifier = modifier,
                 state = state,
                 pagerState = pagerState,
-                popBackStack = popBackStack,
+                popBackStack = navigateToBack,
             )
 
         else -> BbangZipLoadingIndicator()

app/src/main/java/org/android/bbangzip/presentation/ui/my/bbangzipdetail/BbangZipDetailScreen.kt

@@ -6,14 +6,12 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.PagerState
 import androidx.compose.foundation.shape.CircleShape
@@ -42,6 +40,7 @@ import org.android.bbangzip.R
 import org.android.bbangzip.presentation.component.chip.BbangZipChip
 import org.android.bbangzip.presentation.component.topbar.BbangZipBaseTopBar
 import org.android.bbangzip.presentation.model.BbangZip
+import org.android.bbangzip.presentation.util.graphic.Gap
 import org.android.bbangzip.ui.theme.BbangZipTheme
 import timber.log.Timber
 
@@ -132,37 +131,28 @@ private fun BbangZipPager(
 
                     BbangZipPagerIndicator(
                         pagerState = pagerState,
-                        modifier = Modifier.align(Alignment.BottomCenter).padding(bottom = 24.dp),
+                        modifier =
+                            Modifier
+                                .align(Alignment.BottomCenter)
+                                .padding(bottom = 24.dp),
                     )
                 }
             }
 
             Column(
                 modifier =
-                    Modifier.fillMaxWidth()
+                    Modifier
+                        .fillMaxWidth()
                         .padding(top = 24.dp),
                 horizontalAlignment = Alignment.CenterHorizontally,
             ) {
-                Row(
-                    horizontalArrangement = Arrangement.Center,
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
-                    BbangZipChip(
-                        backgroundColor = BbangZipTheme.colors.statusPositive_3D3730,
-                        text = "Lv " + bbangZipList[page].level,
-                    )
-
-                    Spacer(modifier = Modifier.width(8.dp))
-
-                    Text(
-                        text = bbangZipList[page].name,
-                        style = BbangZipTheme.typography.body1Bold,
-                        color = BbangZipTheme.colors.labelNormal_282119,
-                    )
-                }
+                BbangZipLevelTitle(
+                    bbangZipList = bbangZipList,
+                    page = page,
+                )
 
                 if (!bbangZipList[page].isLocked) {
-                    Spacer(modifier = Modifier.height(78.dp))
+                    Gap(height = 78)
 
                     Text(
                         text = bbangZipList[page].description,
@@ -171,7 +161,7 @@ private fun BbangZipPager(
                         textAlign = TextAlign.Center,
                     )
                 } else {
-                    Spacer(modifier = Modifier.height(62.dp))
+                    Gap(height = 62)
 
                     Box(
                         modifier = Modifier.fillMaxWidth(),
@@ -181,7 +171,11 @@ private fun BbangZipPager(
                             imageVector = ImageVector.vectorResource(R.drawable.ic_lock_default_28),
                             contentDescription = null,
                             tint = BbangZipTheme.colors.lineStrong_68645E_52,
-                            modifier = Modifier.height(70.dp).aspectRatio(0.714f).alpha(0.2f),
+                            modifier =
+                                Modifier
+                                    .height(70.dp)
+                                    .aspectRatio(0.714f)
+                                    .alpha(0.2f),
                         )
 
                         Text(
@@ -197,6 +191,32 @@ private fun BbangZipPager(
     }
 }
 
+@Composable
+private fun BbangZipLevelTitle(
+    bbangZipList: List<BbangZip>,
+    page: Int,
+    modifier: Modifier = Modifier,
+) {
+    Row(
+        modifier = modifier,
+        horizontalArrangement = Arrangement.Center,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        BbangZipChip(
+            backgroundColor = BbangZipTheme.colors.statusPositive_3D3730,
+            text = stringResource(R.string.my_bbangzip_level) + bbangZipList[page].level,
+        )
+
+        Gap(width = 8)
+
+        Text(
+            text = bbangZipList[page].name,
+            style = BbangZipTheme.typography.body1Bold,
+            color = BbangZipTheme.colors.labelNormal_282119,
+        )
+    }
+}
+
 @Composable
 private fun BbangZipPagerIndicator(
     pagerState: PagerState,

app/src/main/java/org/android/bbangzip/presentation/ui/my/bbangzipdetail/BbangZipDetailViewModel.kt

@@ -28,7 +28,7 @@ class BbangZipDetailViewModel
         override fun handleEvent(event: BbangZipDetailContract.BbangZipDetailEvent) {
             when (event) {
                 is BbangZipDetailContract.BbangZipDetailEvent.Initialize -> launch { initDataLoad() }
-                is BbangZipDetailContract.BbangZipDetailEvent.OnClickBackBtn -> setSideEffect(BbangZipDetailContract.BbangZipDetailSideEffect.PopBackStack)
+                is BbangZipDetailContract.BbangZipDetailEvent.OnBackIconClick -> setSideEffect(BbangZipDetailContract.BbangZipDetailSideEffect.NavigateToBack)
             }
         }
 

app/src/main/java/org/android/bbangzip/presentation/ui/my/bbangzipdetail/navigation/BbangZipDetailNavigation.kt

@@ -15,11 +15,11 @@ fun NavController.navigateBbangZipDetail() {
 }
 
 fun NavGraphBuilder.bbangZipDetailNavGraph(
-    popBackStack: () -> Unit,
+    navigateToBack: () -> Unit,
 ) {
     composable<BbangZipDetailRoute> {
         BbangZipDetailRoute(
-            popBackStack = popBackStack,
+            navigateToBack = navigateToBack,
         )
     }
 }

app/src/main/java/org/android/bbangzip/presentation/ui/navigator/MainNavHost.kt

@@ -97,7 +97,7 @@ fun MainNavHost(
             )
 
             bbangZipDetailNavGraph(
-                popBackStack = { navigator.popBackStackIfNotSubject() },
+                navigateToBack = { navigator.popBackStackIfNotSubject() },
             )
 
             myBadgeCategoryNavGraph(

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

@@ -160,6 +160,7 @@
     <string name="my_withdraw">계정 탈퇴</string>
     <string name="my_bbangzip">내 제과제빵점</string>
     <string name="my_bbangzip_lock">열심히 포인트를 모아서\n멋진 빵집을 차려봐요!</string>
+    <string name="my_bbangzip_level">LV </string>
 
     <!-- component- bottom sheet -->
     <string name="logout_title">로그아웃 하시겠어요?</string>