Skip to content

refactor(afternote): 리소스 프리픽스를 afternote_ 로 통일하고 resourcePrefix 로 강제한다 (#1079) #1546

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
1hyok merged 3 commits into from
Aug 31, 2026
Merged

refactor(afternote): 리소스 프리픽스를 afternote_ 로 통일하고 resourcePrefix 로 강제한다 (#1079) #1546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
419d383
refactor(afternote): 리소스 프리픽스를 afternote_ 로 통일하고 resourcePrefix 로 강제한…
1hyok Aug 30, 2026
3796998
Merge branch 'develop' into refactor/1079-afternote-resource-prefix
1hyok Aug 30, 2026
cdbb11a
Merge remote-tracking branch 'origin/develop' into refactor/1079-afte…
1hyok Aug 30, 2026
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
2 changes: 1 addition & 1 deletion app/src/androidTest/java/com/afternote/afternote_fe/AfternoteAuthorExtendedAndroidTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class AfternoteAuthorExtendedAndroidTest {
listFlows[null] = flowOf(PagingData.empty())
composeRule.onNodeWithText("전체").performClick()
composeRule
.onNodeWithText(copy(AfternoteR.string.feature_afternote_empty_list_body))
.onNodeWithText(copy(AfternoteR.string.afternote_empty_list_body))
.assertIsDisplayed()
assertEquals(
listOf(null, AfternoteType.SOCIAL_NETWORK, null),
Expand Down
2 changes: 1 addition & 1 deletion app/src/androidTest/java/com/afternote/afternote_fe/AppAndReceiverCompletionAndroidTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ class AppAndReceiverCompletionAndroidTest {
SemanticsMatcher.expectValue(SemanticsProperties.Selected, false),
).performClick()
val fingerprintTitle =
context.getString(AfternoteFeatureR.string.feature_afternote_fingerprint_login_title)
context.getString(AfternoteFeatureR.string.afternote_fingerprint_login_title)
composeRule.waitUntilAtLeastOneExists(hasText(fingerprintTitle), timeoutMillis = 5_000)
composeRule.onNodeWithText(fingerprintTitle).assertIsDisplayed()
composeRule
Expand Down
1 change: 1 addition & 0 deletions feature/afternote/presentation/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ plugins {

android {
namespace = "com.afternote.feature.afternote.presentation"
resourcePrefix = "afternote_"
experimentalProperties["android.experimental.enableScreenshotTest"] = true
buildFeatures {
buildConfig = true
Expand Down
4 changes: 2 additions & 2 deletions ...kotlin/com/afternote/feature/afternote/presentation/author/detail/AfternoteDetailRoute.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,13 +278,13 @@ private fun rememberMemorialVideoClickHandler(snackbarHostState: SnackbarHostSta
// 원인이 다르면 문구도 달라야 한다 — 둘을 한 문장으로 덮으면 스킴이 막힌
// 상황에 «재생할 앱이 없습니다» 라는 거짓 안내가 나간다.
onRejected = {
val message = resources.getString(R.string.feature_afternote_memorial_video_invalid_url)
val message = resources.getString(R.string.afternote_memorial_video_invalid_url)
scope.launch {
snackbarHostState.showSnackbar(message = message)
}
},
onUnavailable = {
val message = resources.getString(R.string.feature_afternote_memorial_video_no_app)
val message = resources.getString(R.string.afternote_memorial_video_no_app)
scope.launch {
snackbarHostState.showSnackbar(message = message)
}
Expand Down
6 changes: 3 additions & 3 deletions .../kotlin/com/afternote/feature/afternote/presentation/author/detail/GalleryDetailScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,15 @@ fun GalleryDetailScreen(
snackbarHost = { SnackbarHost(snackbarHostState) },
topBar = {
DetailTopBar(
title = stringResource(R.string.feature_afternote_detail_title),
title = stringResource(R.string.afternote_detail_title),
onBackClick = onBackClick,
actions = {
if (isEditable) {
Box {
IconButton(onClick = state::toggleDropdownMenu) {
Icon(
painter = painterResource(R.drawable.feature_afternote_ic_detail_edit),
contentDescription = stringResource(R.string.feature_afternote_detail_edit),
painter = painterResource(R.drawable.afternote_ic_detail_edit),
contentDescription = stringResource(R.string.afternote_detail_edit),
modifier = Modifier.size(16.dp),
)
}
Expand Down
16 changes: 8 additions & 8 deletions ...kotlin/com/afternote/feature/afternote/presentation/author/detail/MemorialDetailScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,15 @@ fun MemorialDetailScreen(
snackbarHost = { SnackbarHost(snackbarHostState) },
topBar = {
DetailTopBar(
title = stringResource(R.string.feature_afternote_detail_title),
title = stringResource(R.string.afternote_detail_title),
onBackClick = onBackClick,
actions = {
if (isEditable) {
Box {
IconButton(onClick = state::toggleDropdownMenu) {
Icon(
painter = painterResource(R.drawable.feature_afternote_ic_detail_edit),
contentDescription = stringResource(R.string.feature_afternote_detail_edit),
painter = painterResource(R.drawable.afternote_ic_detail_edit),
contentDescription = stringResource(R.string.afternote_detail_edit),
modifier = Modifier.size(16.dp),
)
}
Expand Down Expand Up @@ -183,9 +183,9 @@ private fun TitleSection(
// "…에 대한 님의 기록" 렌더를 막는다.
val titleSuffix =
if (userName.isBlank()) {
stringResource(R.string.feature_afternote_memorial_detail_title_suffix_no_name)
stringResource(R.string.afternote_memorial_detail_title_suffix_no_name)
} else {
stringResource(R.string.feature_afternote_memorial_detail_title_suffix, userName)
stringResource(R.string.afternote_memorial_detail_title_suffix, userName)
}
Text(
text =
Expand Down Expand Up @@ -234,7 +234,7 @@ private fun SharingNotice() {
),
)
Text(
text = stringResource(R.string.feature_afternote_memorial_detail_sharing_notice),
text = stringResource(R.string.afternote_memorial_detail_sharing_notice),
style =
AfternoteDesign.typography.bodySmallR.copy(
color = AfternoteDesign.colors.gray6,
Expand Down Expand Up @@ -354,8 +354,8 @@ private fun VideoThumbnail(thumbnailUrl: String?) {

// 재생 아이콘
Image(
painter = painterResource(R.drawable.feature_afternote_ic_playback),
contentDescription = stringResource(R.string.content_description_video_play),
painter = painterResource(R.drawable.afternote_ic_playback),
contentDescription = stringResource(R.string.afternote_content_description_video_play),
modifier =
Modifier
.align(Alignment.Center)
Expand Down
20 changes: 10 additions & 10 deletions ...com/afternote/feature/afternote/presentation/author/detail/account/AccountDetailScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ fun AccountDetailScreen(
snackbarHost = { SnackbarHost(snackbarHostState) },
topBar = {
DetailTopBar(
title = stringResource(R.string.feature_afternote_detail_title),
title = stringResource(R.string.afternote_detail_title),
onBackClick = onBackClick,
actions = {
if (isEditable) {
Box {
IconButton(onClick = state::toggleDropdownMenu) {
Icon(
painter = painterResource(R.drawable.feature_afternote_ic_detail_edit),
contentDescription = stringResource(R.string.feature_afternote_detail_edit),
painter = painterResource(R.drawable.afternote_ic_detail_edit),
contentDescription = stringResource(R.string.afternote_detail_edit),
modifier = Modifier.size(16.dp),
)
}
Expand Down Expand Up @@ -155,35 +155,35 @@ private fun AccountSection(

DetailSection(
iconResId = com.afternote.core.ui.R.drawable.core_ui_user,
label = stringResource(R.string.feature_afternote_detail_section_account),
label = stringResource(R.string.afternote_detail_section_account),
modifier = modifier,
) {
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
DetailInfoRow(
iconResId = com.afternote.core.ui.R.drawable.core_ui_user,
label = stringResource(R.string.feature_afternote_detail_label_id),
label = stringResource(R.string.afternote_detail_label_id),
value = accountId,
)
HorizontalDivider(
color = AfternoteDesign.colors.gray2,
thickness = 1.dp,
)
DetailInfoRow(
iconResId = R.drawable.feature_afternote_ic_lock,
label = stringResource(R.string.feature_afternote_detail_label_password),
iconResId = R.drawable.afternote_ic_lock,
label = stringResource(R.string.afternote_detail_label_password),
value =
if (passwordVisible) {
password
} else {
stringResource(R.string.feature_afternote_detail_password_mask)
stringResource(R.string.afternote_detail_password_mask)
},
trailingContent = {
Text(
text =
if (passwordVisible) {
stringResource(R.string.feature_afternote_detail_password_hide)
stringResource(R.string.afternote_detail_password_hide)
} else {
stringResource(R.string.feature_afternote_detail_password_show)
stringResource(R.string.afternote_detail_password_show)
},
style = AfternoteDesign.typography.captionLargeR,
color = AfternoteDesign.colors.b1,
Expand Down
4 changes: 2 additions & 2 deletions ...om/afternote/feature/afternote/presentation/author/editor/account/AccountEditorContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ fun AccountEditorContent(
)

CaptionLabeledTextField(
label = stringResource(R.string.feature_afternote_detail_label_id),
label = stringResource(R.string.afternote_detail_label_id),
state = accountSection.idState,
placeholder = stringResource(R.string.afternote_editor_account_id_placeholder),
)

CaptionLabeledTextField(
label = stringResource(R.string.feature_afternote_detail_label_password),
label = stringResource(R.string.afternote_detail_label_password),
state = accountSection.passwordState,
placeholder = stringResource(R.string.afternote_editor_account_password_placeholder),
keyboardType = KeyboardType.Password,
Expand Down
6 changes: 3 additions & 3 deletions ...e/feature/afternote/presentation/author/editor/memorial/MemorialMediaSourceBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ internal fun MemorialMediaSourceBottomSheet(
MemorialMediaSourceOption(
iconRes =
when (target) {
MemorialMediaTarget.PHOTO -> R.drawable.feature_afternote_ic_camera
MemorialMediaTarget.VIDEO -> R.drawable.feature_afternote_ic_videocam
MemorialMediaTarget.PHOTO -> R.drawable.afternote_ic_camera
MemorialMediaTarget.VIDEO -> R.drawable.afternote_ic_videocam
},
label =
when (target) {
Expand All @@ -124,7 +124,7 @@ internal fun MemorialMediaSourceBottomSheet(
)
if (onRemove != null) {
MemorialMediaSourceOption(
iconRes = R.drawable.feature_afternote_ic_trash,
iconRes = R.drawable.afternote_ic_trash,
label =
when (target) {
MemorialMediaTarget.PHOTO -> stringResource(R.string.afternote_editor_media_source_remove_photo)
Expand Down
6 changes: 3 additions & 3 deletions ...om/afternote/feature/afternote/presentation/author/editor/memorial/MemorialVideoUpload.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ fun MemorialVideoUpload(
contentDescription = null,
modifier = Modifier.fillMaxSize(),
contentScale = ContentScale.Crop,
error = painterResource(R.drawable.feature_afternote_img_placeholder_1),
error = painterResource(R.drawable.afternote_img_placeholder_1),
)
}

Expand All @@ -211,8 +211,8 @@ fun MemorialVideoUpload(
}
}
Image(
painter = painterResource(R.drawable.feature_afternote_ic_playback),
contentDescription = stringResource(R.string.content_description_video_play),
painter = painterResource(R.drawable.afternote_ic_playback),
contentDescription = stringResource(R.string.afternote_content_description_video_play),
modifier =
Modifier
.align(Alignment.Center)
Expand Down
2 changes: 1 addition & 1 deletion ...afternote/feature/afternote/presentation/author/editor/memorial/playlist/AddSongScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ fun AddSongScreen(
)
},
initialSelectedSongKeys = emptySet(),
actionLabel = stringResource(R.string.add_button),
actionLabel = stringResource(R.string.afternote_add_button),
onAction = { selectedKeys ->
onSongsAdded(uiState.songs.filter { it.selectionKey in selectedKeys }.map(::toSong))
},
Expand Down
4 changes: 2 additions & 2 deletions ...e/feature/afternote/presentation/author/editor/memorial/playlist/MemorialPlaylistEntry.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ fun MemorialPlaylistEntry(
topBarActions = {
IconButton(onClick = { isEditMode = !isEditMode }) {
Icon(
painter = painterResource(R.drawable.feature_afternote_ic_detail_edit),
contentDescription = stringResource(R.string.feature_afternote_detail_edit),
painter = painterResource(R.drawable.afternote_ic_detail_edit),
contentDescription = stringResource(R.string.afternote_detail_edit),
modifier = Modifier.size(13.dp),
)
}
Expand Down
2 changes: 1 addition & 1 deletion ...om/afternote/feature/afternote/presentation/author/editor/message/EditorMessageSection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ private fun RegisteredEditorMessageItem(
modifier = Modifier.weight(1f),
)
Icon(
painter = painterResource(R.drawable.feature_afternote_ic_dropdown_vector),
painter = painterResource(R.drawable.afternote_ic_dropdown_vector),
contentDescription = null,
tint = AfternoteDesign.colors.gray8,
modifier = Modifier.rotate(if (message.isBodyVisible) 180f else 0f),
Expand Down
2 changes: 1 addition & 1 deletion ...rnote/feature/afternote/presentation/author/editor/processing/ProcessingMethodCheckbox.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ fun ProcessingMethodCheckbox(

Box {
Image(
painter = painterResource(R.drawable.feature_afternote_ic_more_horizontal_1),
painter = painterResource(R.drawable.afternote_ic_more_horizontal_1),
contentDescription = stringResource(R.string.afternote_editor_content_description_more),
modifier =
Modifier
Expand Down
2 changes: 1 addition & 1 deletion ...note/feature/afternote/presentation/author/editor/receiver/AfternoteEditorReceiverList.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ private fun AfternoteEditorReceiverItem(
// 더보기 아이콘 + 드롭다운 메뉴
Box {
Image(
painter = painterResource(R.drawable.feature_afternote_ic_more_horizontal_1),
painter = painterResource(R.drawable.afternote_ic_more_horizontal_1),
contentDescription = stringResource(R.string.afternote_editor_content_description_more),
modifier =
Modifier
Expand Down
2 changes: 1 addition & 1 deletion ...ternote/feature/afternote/presentation/author/editor/selection/EditorSelectionDropdown.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ fun <T> EditorSelectionDropdown(

if (enabled) {
Icon(
painter = painterResource(R.drawable.feature_afternote_ic_dropdown_vector),
painter = painterResource(R.drawable.afternote_ic_dropdown_vector),
contentDescription = stringResource(R.string.afternote_editor_content_description_dropdown),
tint = AfternoteDesign.colors.gray8,
)
Expand Down
2 changes: 1 addition & 1 deletion ...ote/feature/afternote/presentation/author/editor/selection/EditorServiceSelectionSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ internal fun EditorServiceSelectionField(
overflow = TextOverflow.Ellipsis,
)
Icon(
painter = painterResource(R.drawable.feature_afternote_ic_dropdown_vector),
painter = painterResource(R.drawable.afternote_ic_dropdown_vector),
contentDescription = null,
tint = AfternoteDesign.colors.gray8,
)
Expand Down
2 changes: 1 addition & 1 deletion ...kotlin/com/afternote/feature/afternote/presentation/author/home/AfternoteTypeFilterRow.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ fun AfternoteTypeFilterRow(
// 오른쪽 끝의 스크롤 가능 힌트. 최종 시안(4163:21839)에도 별도 reaction 이 없어 장식으로만 둔다.
if (canScrollRight) {
ArrowIcon(
iconRes = R.drawable.feature_afternote_ic_arrow_right_tab,
iconRes = R.drawable.afternote_ic_arrow_right_tab,
contentDescription = null,
modifier =
Modifier
Expand Down
6 changes: 3 additions & 3 deletions ...rnote/feature/afternote/presentation/receiver/afternotelist/ReceiverAfternoteHomeEntry.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ fun ReceiverAfternoteHomeEntry(
when (listError) {
ReceiverAfternoteListError.NotDeliverable -> {
ReceiverAfternoteListErrorBody(
title = stringResource(R.string.receiver_afternote_list_not_deliverable_message),
description = stringResource(R.string.receiver_afternote_list_not_deliverable_description),
title = stringResource(R.string.afternote_receiver_afternote_list_not_deliverable_message),
description = stringResource(R.string.afternote_receiver_afternote_list_not_deliverable_description),
modifier = modifier,
)
}
Expand All @@ -71,7 +71,7 @@ fun ReceiverAfternoteHomeEntry(
selectedType = selectedTab,
onTypeSelected = viewModel::selectTab,
onListItemClick = { id, _ -> navigateToDetail(id) },
headerDescription = stringResource(R.string.receiver_afternote_list_header_description),
headerDescription = stringResource(R.string.afternote_receiver_afternote_list_header_description),
// NEXT STEP 은 «내가 남길 기록» 을 재촉하는 발신자용 카드다. 수신자 목록에는 없다.
nextStep = null,
modifier = modifier,
Expand Down
2 changes: 1 addition & 1 deletion ...m/afternote/feature/afternote/presentation/receiver/detail/GalleryReceivedDetailScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ fun GalleryReceivedDetailScreen(
containerColor = Color.Transparent,
topBar = {
DetailTopBar(
title = stringResource(R.string.feature_afternote_detail_title),
title = stringResource(R.string.afternote_detail_title),
onBackClick = onBackClick,
)
},
Expand Down
Loading
Loading