Merge pull request #185 from YAPP-Github/qa/#184-sprint-qa-dh

[QA/#184] 스프린트 QA를 반영합니다.

Author: wjdrjs00

core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/component/block/BitnagilTopBar.kt

@@ -18,6 +18,7 @@ import com.threegap.bitnagil.designsystem.BitnagilTheme
 import com.threegap.bitnagil.designsystem.R
 import com.threegap.bitnagil.designsystem.component.atom.BitnagilIcon
 import com.threegap.bitnagil.designsystem.component.atom.BitnagilIconButton
+import com.threegap.bitnagil.designsystem.modifier.throttled
 
 @Composable
 fun BitnagilTopBar(
@@ -35,7 +36,7 @@ fun BitnagilTopBar(
         if (showBackButton) {
             BitnagilIconButton(
                 id = R.drawable.ic_chevron_left_lg,
-                onClick = onBackClick,
+                onClick = throttled { onBackClick() },
                 tint = BitnagilTheme.colors.coolGray10,
                 modifier = Modifier
                     .align(Alignment.CenterStart),

core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/modifier/ClickThrottler.kt

@@ -0,0 +1,32 @@
+package com.threegap.bitnagil.designsystem.modifier
+
+import android.os.SystemClock
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+
+class ClickThrottler(private val throttleTimeMs: Long = 500L) {
+    private var lastClickTime: Long = 0L
+
+    fun processEvent(event: () -> Unit) {
+        val now = SystemClock.elapsedRealtime()
+        if (now - lastClickTime >= throttleTimeMs) {
+            lastClickTime = now
+            event()
+        }
+    }
+}
+
+@Composable
+fun throttled(
+    throttleTimeMs: Long = 500L,
+    onClick: () -> Unit,
+): () -> Unit {
+    val currentOnClick by rememberUpdatedState(onClick)
+    val throttler = remember(throttleTimeMs) { ClickThrottler(throttleTimeMs) }
+
+    return remember(throttler) {
+        { throttler.processEvent { currentOnClick() } }
+    }
+}

core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/modifier/ModifierExt.kt

@@ -1,24 +1,19 @@
 package com.threegap.bitnagil.designsystem.modifier
 
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.composed
 import androidx.compose.ui.semantics.Role
 
 fun Modifier.clickableWithoutRipple(
     enabled: Boolean = true,
     onClickLabel: String? = null,
     role: Role? = null,
     onClick: () -> Unit,
-) = composed {
-    clickable(
-        indication = null,
-        interactionSource = remember { MutableInteractionSource() },
-        enabled = enabled,
-        onClickLabel = onClickLabel,
-        role = role,
-        onClick = onClick,
-    )
-}
+) = this.clickable(
+    interactionSource = null,
+    indication = null,
+    enabled = enabled,
+    onClickLabel = onClickLabel,
+    role = role,
+    onClick = onClick,
+)

presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/RoutineListScreen.kt

@@ -16,6 +16,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.threegap.bitnagil.designsystem.BitnagilTheme
@@ -28,6 +29,7 @@ import com.threegap.bitnagil.presentation.routinelist.component.template.Routine
 import com.threegap.bitnagil.presentation.routinelist.component.template.WeeklyDatePicker
 import com.threegap.bitnagil.presentation.routinelist.contract.RoutineListSideEffect
 import com.threegap.bitnagil.presentation.routinelist.contract.RoutineListState
+import com.threegap.bitnagil.presentation.routinelist.model.RoutineListStatePreviewProvider
 import com.threegap.bitnagil.presentation.routinelist.model.RoutineUiModel
 import org.orbitmvi.orbit.compose.collectAsState
 import org.orbitmvi.orbit.compose.collectSideEffect
@@ -133,7 +135,6 @@ private fun RoutineListScreen(
                 items(
                     items = uiState.selectedDateRoutines,
                     key = { routine -> routine.routineId },
-                    contentType = { "routine_item" },
                 ) { routine ->
                     RoutineDetailsCard(
                         routine = routine,
@@ -148,13 +149,17 @@ private fun RoutineListScreen(
 
 @Preview
 @Composable
-private fun RoutineListScreenPreview() {
-    RoutineListScreen(
-        uiState = RoutineListState.INIT,
-        onDateSelect = {},
-        onShowDeleteConfirmBottomSheet = {},
-        onShowEditConfirmBottomSheet = {},
-        onRegisterRoutineClick = {},
-        onBackClick = {},
-    )
+private fun RoutineListScreenPreview(
+    @PreviewParameter(RoutineListStatePreviewProvider::class) uiState: RoutineListState,
+) {
+    BitnagilTheme {
+        RoutineListScreen(
+            uiState = uiState,
+            onDateSelect = {},
+            onShowDeleteConfirmBottomSheet = {},
+            onShowEditConfirmBottomSheet = {},
+            onRegisterRoutineClick = {},
+            onBackClick = {},
+        )
+    }
 }

presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/component/template/RoutineDetailsCard.kt

@@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -70,11 +69,11 @@ fun RoutineDetailsCard(
                 text = routine.routineName,
                 color = BitnagilTheme.colors.coolGray10,
                 style = BitnagilTheme.typography.body1SemiBold,
-                modifier = Modifier.padding(start = 10.dp),
+                modifier = Modifier
+                    .padding(start = 10.dp)
+                    .weight(1f),
             )
 
-            Spacer(modifier = Modifier.weight(1f))
-
             if (!routine.routineDeletedYn) {
                 BitnagilIconButton(
                     id = R.drawable.ic_edit,

presentation/src/main/java/com/threegap/bitnagil/presentation/routinelist/model/RoutineListStatePreviewProvider.kt

@@ -0,0 +1,57 @@
+package com.threegap.bitnagil.presentation.routinelist.model
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import com.threegap.bitnagil.domain.routine.model.DayOfWeek
+import com.threegap.bitnagil.presentation.routinelist.contract.RoutineListState
+import java.time.LocalDate
+
+internal class RoutineListStatePreviewProvider : PreviewParameterProvider<RoutineListState> {
+    override val values = sequenceOf(
+        emptyRoutineState,
+        withRoutinesState,
+    )
+}
+
+private val today = LocalDate.now()
+
+private val sampleRoutines = listOf(
+    RoutineUiModel(
+        routineId = "1",
+        routineName = "아침 스트레칭",
+        repeatDay = listOf(DayOfWeek.MONDAY, DayOfWeek.WEDNESDAY, DayOfWeek.FRIDAY),
+        executionTime = "07:00:00",
+        routineDate = today.toString(),
+        startDate = "2025-01-01",
+        endDate = "2025-12-31",
+        routineDeletedYn = false,
+        subRoutineNames = listOf("목 스트레칭", "어깨 스트레칭"),
+        recommendedRoutineType = null,
+    ),
+    RoutineUiModel(
+        routineId = "2",
+        routineName = "독서",
+        repeatDay = emptyList(),
+        executionTime = "09:00:00",
+        routineDate = today.toString(),
+        startDate = "2025-01-01",
+        endDate = "2025-03-31",
+        routineDeletedYn = false,
+        subRoutineNames = emptyList(),
+        recommendedRoutineType = null,
+    ),
+)
+
+private val emptyRoutineState = RoutineListState.INIT
+
+private val withRoutinesState = RoutineListState(
+    isLoading = false,
+    selectedDate = today,
+    routines = RoutineScheduleUiModel(
+        routines = mapOf(
+            today.toString() to DailyRoutinesUiModel(routines = sampleRoutines),
+        ),
+    ),
+    selectedRoutine = null,
+    deleteConfirmBottomSheetVisible = false,
+    editConfirmBottomSheetVisible = false,
+)