Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhkrwngud445 merged 15 commits into from
Nov 18, 2025
Merged

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

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
02ef857
refactor: 연락처에서 불러오기 그림자 효과 수치값 수정
stopstone Nov 4, 2025
4479c49
refactor: CycleSettingBottomSheet 주기설정 공백 추가
stopstone Nov 4, 2025
119e70c
feat: 주기 설정 바텀 시트 텍스트 동적 변경
stopstone Nov 4, 2025
00e427c
refactor: 연락 주기 설정 화면 '다음 주기' 텍스트 strings.xml 관리
stopstone Nov 4, 2025
3160c32
refactor: 연락 주기 화면 UI 패딩값 수정
stopstone Nov 4, 2025
5d6b6dd
refactor: 검색 아이콘 색상 변경
stopstone Nov 4, 2025
a48bbe4
refactor: 연락처 불러오기 기본 이미지 변경
stopstone Nov 4, 2025
6657de6
feat: 공용 바텀시트 컴포넌트 추가
stopstone Nov 12, 2025
a376cf8
refactor: `CycleSettingBottomSheet`을 공통 컴포넌트로 리팩토링
stopstone Nov 12, 2025
576da85
refactor: 주기 설정 BottomSheet 공용 컴포넌트로 분리 및 개선
stopstone Nov 12, 2025
53cc221
fix: 다음 연락 주기 텍스트의 공백 추가
stopstone Nov 12, 2025
72ac684
feat: `NearBottomSheet` 미리보기 추가
stopstone Nov 12, 2025
1162e18
chore: 바텀시트 핸들러 코너 값 수정
stopstone Nov 12, 2025
4e36099
refactor: 주기 설정 BottomSheet 공용 컴포넌트로 분리
stopstone Nov 12, 2025
add9b61
refactor: NearBottomSheet의 content 타입을 ColumnScope로 변경
stopstone Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions ...com/alarmy/near/presentation/feature/friendcontactcycle/components/ContactCycleContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ fun ColumnScope.ContactCycleContent(
)
}

Spacer(modifier = Modifier.size(14.dp))

// 한번에 설정이 활성화되었을 때만 표시
if (isBulkSettingEnabled) {
Spacer(modifier = Modifier.size(12.dp))

Row(
modifier =
Modifier
Expand All @@ -85,7 +85,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,
)
Expand All @@ -101,7 +103,7 @@ fun ColumnScope.ContactCycleContent(

// 리스트가 있을 때만 밑에 리스트 표시
if (contacts.isNotEmpty()) {
Spacer(modifier = Modifier.size(16.dp))
Spacer(modifier = Modifier.size(24.dp))

LazyColumn(
modifier = Modifier.weight(1f),
Expand Down
2 changes: 1 addition & 1 deletion .../com/alarmy/near/presentation/feature/friendcontactcycle/components/ContactLoadContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
)
Expand Down
283 changes: 139 additions & 144 deletions ...alarmy/near/presentation/feature/friendcontactcycle/components/CycleSettingBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,14 @@ package com.alarmy.near.presentation.feature.friendcontactcycle.components

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
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.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.BottomSheetDefaults
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.ModalBottomSheet
import androidx.compose.material3.Text
import androidx.compose.material3.VerticalDivider
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
Expand All @@ -31,12 +26,12 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.alarmy.near.R
import com.alarmy.near.model.ReminderInterval
import com.alarmy.near.presentation.ui.component.bottomsheet.NearBottomSheet
import com.alarmy.near.presentation.ui.component.checkbox.NearCheckbox
import com.alarmy.near.presentation.ui.extension.onNoRippleClick
import com.alarmy.near.presentation.ui.theme.NearTheme
import com.alarmy.near.utils.extensions.DateExtension

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun CycleSettingBottomSheet(
isVisible: Boolean,
Expand All @@ -45,160 +40,160 @@ fun CycleSettingBottomSheet(
currentSelectedInterval: ReminderInterval? = null,
modifier: Modifier = Modifier,
) {
// 선택된 주기 상태 관리 (기존 선택값이 있으면 그것을 사용, 없으면 매주를 기본값으로)
var selectedInterval by remember(isVisible) {
mutableStateOf<ReminderInterval?>(currentSelectedInterval ?: ReminderInterval.EVERY_WEEK)
// 선택된 주기 상태 관리
var selectedInterval by remember(isVisible) {
mutableStateOf<ReminderInterval?>(currentSelectedInterval ?: ReminderInterval.EVERY_WEEK)
}

if (isVisible) {
val bottomSheetState =
rememberModalBottomSheetState(
skipPartiallyExpanded = true,
NearBottomSheet(
isVisible = isVisible,
onDismiss = onDismiss,
modifier = modifier,
) {
// 제목
Text(
text = stringResource(R.string.friend_contact_cycle_cycle_setting_text),
style = NearTheme.typography.B1_16_BOLD,
)

Spacer(modifier = Modifier.size(24.dp))

// 선택된 주기 미리보기
Row(
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
modifier =
Modifier
.fillMaxWidth()
.clip(RoundedCornerShape(12.dp))
.background(NearTheme.colors.BG02_F4F9FD)
.padding(vertical = 18.dp, horizontal = 20.dp),
) {
Text(
text =
buildAnnotatedString {
val interval = selectedInterval ?: ReminderInterval.EVERY_WEEK
val cycleText = DateExtension.getCycleText(interval)
val firstSpaceIndex = cycleText.indexOf(' ')

if (firstSpaceIndex != -1) {
withStyle(
style =
SpanStyle(
color = NearTheme.colors.BLACK_1A1A1A,
fontWeight = NearTheme.typography.B2_14_MEDIUM.fontWeight,
),
) {
append(cycleText.substring(0, firstSpaceIndex + 1))
}
withStyle(
style =
SpanStyle(
color = NearTheme.colors.BLUE01_5AA2E9,
fontWeight = NearTheme.typography.B2_14_BOLD.fontWeight,
),
) {
append(cycleText.substring(firstSpaceIndex + 1))
}
} else {
withStyle(
style =
SpanStyle(
color = NearTheme.colors.BLACK_1A1A1A,
fontWeight = NearTheme.typography.B2_14_MEDIUM.fontWeight,
),
) {
append(cycleText)
}
}
},
style = NearTheme.typography.B2_14_MEDIUM,
)

ModalBottomSheet(
onDismissRequest = onDismiss,
sheetState = bottomSheetState,
dragHandle = {
BottomSheetDefaults.DragHandle(
color = NearTheme.colors.BLACK_1A1A1A.copy(alpha = 0.1f),
width = 36.dp,
height = 5.dp,
Row(
verticalAlignment = Alignment.CenterVertically,
) {
Spacer(modifier = Modifier.size(20.dp))

VerticalDivider(
modifier =
Modifier
.size(width = 1.dp, height = 28.dp),
color =
NearTheme.colors.BLACK_1A1A1A.copy(
alpha = 0.1f,
),
)
},
modifier = modifier,
containerColor = NearTheme.colors.WHITE_FFFFFF,
) {
Column(

Spacer(modifier = Modifier.size(20.dp))

Text(
text =
stringResource(R.string.friend_contact_cycle_next_cycle_prefix) + " " +
(
selectedInterval?.let { DateExtension.getNextCycleDate(it) }
?: DateExtension.getNextWeekSameDay()
),
Copy link

@gemini-code-assist gemini-code-assist bot Nov 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

R.string.friend_contact_cycle_next_cycle_prefix 리소스 문자열("다음 주기 : ") 끝에 공백이 포함되어 있습니다. 코드에서 + " "를 사용하여 공백을 추가로 연결하고 있어, 결과적으로 "다음 주기 : "와 같이 두 개의 공백이 생기게 됩니다. 불필요한 공백을 제거하기 위해 코드에서 + " " 부분을 삭제하는 것이 좋겠습니다.

Suggested change
stringResource(R.string.friend_contact_cycle_next_cycle_prefix) + " " +
(
selectedInterval?.let { DateExtension.getNextCycleDate(it) }
?: DateExtension.getNextWeekSameDay()
),
stringResource(R.string.friend_contact_cycle_next_cycle_prefix) +
(
selectedInterval?.let { DateExtension.getNextCycleDate(it) }
?: DateExtension.getNextWeekSameDay()
),

Copy link
Contributor Author

@stopstone stopstone Nov 12, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

리소스 마지막 공백을 받아오지 못하고 있어 공백을 추가하였습니다
제가 알기론 Android의 XML 리소스 파서는 기본적으로 trailing whitespace(끝 공백)를 제거하여 공백을 별도로 추가했습니다

style = NearTheme.typography.B2_14_MEDIUM,
color = NearTheme.colors.GRAY01_888888,
)
}
}

Spacer(modifier = Modifier.size(8.dp))

// 주기 선택 옵션들
ReminderInterval.entries.forEach { interval ->
val isSelected = selectedInterval == interval

Row(
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
modifier =
Modifier
.fillMaxWidth()
.padding(horizontal = 24.dp),
.onNoRippleClick {
if (!isSelected) {
selectedInterval = interval
}
}.padding(vertical = 15.dp),
) {
Text(
text = stringResource(R.string.friend_contact_cycle_cycle_setting_text),
style = NearTheme.typography.B1_16_BOLD,
text = stringResource(interval.labelRes),
style =
if (isSelected) {
NearTheme.typography.B1_16_BOLD
} else {
NearTheme.typography.B2_14_MEDIUM
},
)

Spacer(modifier = Modifier.size(24.dp))

Row(
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
modifier =
modifier
.fillMaxWidth()
.clip(RoundedCornerShape(12.dp))
.background(NearTheme.colors.BG02_F4F9FD)
.padding(vertical = 18.dp, horizontal = 20.dp),
) {
Text(
text =
buildAnnotatedString {
withStyle(
style =
SpanStyle(
color = NearTheme.colors.BLACK_1A1A1A,
fontWeight = NearTheme.typography.B2_14_MEDIUM.fontWeight,
),
) {
append(stringResource(R.string.friend_contact_cycle_weekly_prefix))
}
withStyle(
style =
SpanStyle(
color = NearTheme.colors.BLUE01_5AA2E9,
fontWeight = NearTheme.typography.B2_14_BOLD.fontWeight,
),
) {
append(DateExtension.getTodayDayOfWeekInKorean())
}
},
style = NearTheme.typography.B2_14_MEDIUM,
if (isSelected) {
NearCheckbox(
checked = true,
onCheckedChange = { checked ->
// 체크박스 클릭 시 해제되지 않도록 수정
// 체크된 상태를 유지
},
)

Row(
verticalAlignment = Alignment.CenterVertically,
) {
Spacer(modifier = Modifier.size(20.dp))

VerticalDivider(
modifier =
Modifier
.size(width = 1.dp, height = 28.dp),
color =
NearTheme.colors.BLACK_1A1A1A.copy(
alpha = 0.1f,
),
)

Spacer(modifier = Modifier.size(20.dp))

Text(
text = "다음 주기 : ${
selectedInterval?.let { DateExtension.getNextCycleDate(it) }
?: DateExtension.getNextWeekSameDay()
}",
style = NearTheme.typography.B2_14_MEDIUM,
color = NearTheme.colors.GRAY01_888888,
)
}
}

Spacer(modifier = Modifier.size(8.dp))

ReminderInterval.entries.forEach { interval ->
val isSelected = selectedInterval == interval

Row(
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically,
modifier =
modifier
.fillMaxWidth()
.onNoRippleClick {
if (!isSelected) {
selectedInterval = interval
}
}.padding(vertical = 15.dp),
) {
Text(
text = stringResource(interval.labelRes),
style =
if (isSelected) {
NearTheme.typography.B1_16_BOLD
} else {
NearTheme.typography.B2_14_MEDIUM
},
)

if (isSelected) {
NearCheckbox(
checked = true,
onCheckedChange = { checked ->
// 체크박스 클릭 시 해제되지 않도록 수정
// 체크된 상태를 유지
},
)
}
}
}
Spacer(modifier = Modifier.size(24.dp))

ContactCycleButtons(
onLeftButtonClick = onDismiss,
onRightButtonClick = {
selectedInterval?.let { interval ->
onComplete(interval)
onDismiss()
}
},
leftButtonText = stringResource(R.string.friend_contact_cycle_cancel_button),
rightButtonText = stringResource(R.string.friend_contact_cycle_complete_button),
)
Spacer(modifier = Modifier.size(24.dp))
}
}
Spacer(modifier = Modifier.size(24.dp))

// 버튼들
ContactCycleButtons(
onLeftButtonClick = onDismiss,
onRightButtonClick = {
selectedInterval?.let { interval ->
onComplete(interval)
onDismiss()
}
},
leftButtonText = stringResource(R.string.friend_contact_cycle_cancel_button),
rightButtonText = stringResource(R.string.friend_contact_cycle_complete_button),
)
Spacer(modifier = Modifier.size(24.dp))
}
}

Expand Down
Loading