Merge pull request #61 from near-Contact-Reminder/qa/#57-feature-contact-cycle

[QA] 연락처 주기 설정 바텀시트 날짜 형식 수정

Author: rhkrwngud445

Near/app/src/main/java/com/alarmy/near/presentation/feature/friendcontactcycle/components/ContactCycleContent.kt

@@ -27,6 +27,7 @@ import androidx.compose.ui.unit.dp
 import com.alarmy.near.R
 import com.alarmy.near.model.ReminderInterval
 import com.alarmy.near.presentation.feature.friendcontactcycle.model.FriendContactUIModel
+import com.alarmy.near.presentation.ui.component.bottomsheet.CycleSettingBottomSheet
 import com.alarmy.near.presentation.ui.component.checkbox.NearBackgroundCheckbox
 import com.alarmy.near.presentation.ui.extension.onNoRippleClick
 import com.alarmy.near.presentation.ui.theme.NearTheme
@@ -64,10 +65,10 @@ fun ColumnScope.ContactCycleContent(
         )
     }
 
-    Spacer(modifier = Modifier.size(14.dp))
-
     // 한번에 설정이 활성화되었을 때만 표시
     if (isBulkSettingEnabled) {
+        Spacer(modifier = Modifier.size(12.dp))
+
         Row(
             modifier =
                 Modifier
@@ -85,7 +86,9 @@ fun ColumnScope.ContactCycleContent(
             verticalAlignment = Alignment.CenterVertically,
         ) {
             Text(
-                text = selectedCycle?.let { DateExtension.getCycleText(it) } ?: stringResource(R.string.friend_contact_cycle_weekly_format, DateExtension.getTodayDayOfWeekInKorean()),
+                text =
+                    selectedCycle?.let { DateExtension.getCycleText(it) }
+                        ?: stringResource(R.string.friend_contact_cycle_weekly_format, DateExtension.getTodayDayOfWeekInKorean()),
                 style = NearTheme.typography.B2_14_MEDIUM,
                 color = NearTheme.colors.BLACK_1A1A1A,
             )
@@ -101,7 +104,7 @@ fun ColumnScope.ContactCycleContent(
 
     // 리스트가 있을 때만 밑에 리스트 표시
     if (contacts.isNotEmpty()) {
-        Spacer(modifier = Modifier.size(16.dp))
+        Spacer(modifier = Modifier.size(24.dp))
 
         LazyColumn(
             modifier = Modifier.weight(1f),

Near/app/src/main/java/com/alarmy/near/presentation/feature/friendcontactcycle/components/ContactLoadContent.kt

@@ -117,7 +117,7 @@ fun FriendListItem(
             modifier = Modifier.weight(1f),
         ) {
             Image(
-                painter = painterResource(R.drawable.img_100_character_default),
+                painter = painterResource(R.drawable.img_64_user_gray),
                 contentDescription = null,
                 modifier = Modifier.size(24.dp),
             )

Near/app/src/main/java/com/alarmy/near/presentation/feature/friendcontactcycle/components/CycleSettingBottomSheet.kt

@@ -12,12 +12,13 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.alarmy.near.R
+import com.alarmy.near.presentation.ui.extension.dropShadow
 import com.alarmy.near.presentation.ui.extension.onNoRippleClick
 import com.alarmy.near.presentation.ui.theme.NearTheme
 
@@ -38,8 +39,12 @@ fun NearListModuleBackground(
         modifier =
             modifier
                 .fillMaxWidth()
-                .shadow(
-                    elevation = 4.dp,
+                .dropShadow(
+                    blur = 16.dp,
+                    offsetX = 0.dp,
+                    offsetY = 4.dp,
+                    spread = 0.dp,
+                    color = Color.Black.copy(alpha = 0.12f),
                     shape = RoundedCornerShape(12.dp),
                 ).background(
                     color = NearTheme.colors.WHITE_FFFFFF,

Near/app/src/main/java/com/alarmy/near/presentation/feature/friendcontactcycle/components/NearListModuleBackground.kt

@@ -45,7 +45,7 @@ import com.alarmy.near.model.Friend
 import com.alarmy.near.model.Relation
 import com.alarmy.near.model.ReminderInterval
 import com.alarmy.near.presentation.feature.friendprofileedittor.component.NearDatePicker
-import com.alarmy.near.presentation.feature.friendprofileedittor.component.ReminderIntervalBottomSheet
+import com.alarmy.near.presentation.ui.component.bottomsheet.CycleSettingBottomSheet
 import com.alarmy.near.presentation.feature.friendprofileedittor.dialog.EditorExitDialog
 import com.alarmy.near.presentation.feature.friendprofileedittor.uistate.FriendProfileEditorUIEvent
 import com.alarmy.near.presentation.feature.friendprofileedittor.uistate.FriendProfileEditorUIState
@@ -140,14 +140,16 @@ fun FriendProfileEditorScreen(
     onCloseDialog: () -> Unit = {},
 ) {
     val showBottomSheet = remember { mutableStateOf(false) }
-    if (showBottomSheet.value) {
-        ReminderIntervalBottomSheet(onDismissRequest = {
+    CycleSettingBottomSheet(
+        isVisible = showBottomSheet.value,
+        onDismiss = {
             showBottomSheet.value = false
-        }, onSelectReminderInterval = {
-            onReminderIntervalChanged(it)
-            showBottomSheet.value = false
-        })
-    }
+        },
+        onComplete = { selectedInterval ->
+            onReminderIntervalChanged(selectedInterval)
+        },
+        currentSelectedInterval = friendProfileEditorUIState.contactFrequency.reminderInterval,
+    )
     if (dialogState) {
         EditorExitDialog(
             onDismissRequest = {