Repository navigation
refactor(receiver): 수신자 홈의 afternote 리소스 차용 해소 — 아이콘 core:ui 승격 (#926) #1061
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package com.afternote.core.ui.icon | ||
|
|
||
| import androidx.annotation.DrawableRes | ||
| import com.afternote.core.ui.R | ||
|
|
||
| /** | ||
| * 애프터노트 **종류** 아이콘의 core 정본 (#926). | ||
| * | ||
| * 수신자 홈이 이 아이콘을 쓰는데, 종전에는 `feature:afternote:presentation` 의 `R` 을 직접 | ||
| * 빌려 왔다. 형제 feature 의 리소스를 가로지르는 참조라 두 모듈이 리소스 수준에서 묶인다. | ||
| * | ||
| * 종류는 도메인 개념이지만 **아이콘 선택은 표현**이라, 화면 사이에 오가는 값은 res id 가 | ||
| * 아니라 이 enum 이다. ViewModel 이 res id 를 들면 상태가 Android 리소스에 묶여 | ||
| * 단위 테스트에서도 리소스가 필요해진다. | ||
| */ | ||
| enum class AfternoteSourceIcon( | ||
| @param:DrawableRes val drawableResId: Int, | ||
| ) { | ||
| SocialNetwork(R.drawable.core_ui_afternote_social_pattern), | ||
| GalleryAndFiles(R.drawable.core_ui_afternote_gallery_pattern), | ||
| Memorial(R.drawable.core_ui_afternote_memorial_guideline), | ||
|
|
||
| /** 위 셋으로 갈리지 않는 종류 — 로고로 받는다. */ | ||
| Other(R.drawable.core_ui_afternote_logo), | ||
| } | ||
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| package com.afternote.konsist | ||
|
|
||
| import com.lemonappdev.konsist.api.Konsist | ||
| import com.lemonappdev.konsist.api.ext.list.withPackage | ||
| import com.lemonappdev.konsist.api.verify.assertFalse | ||
| import org.junit.Test | ||
|
|
||
| /** | ||
| * 수신자 홈이 형제 feature 의 리소스를 빌려 쓰지 않는지 (#926). | ||
| * | ||
| * 종전에는 수신자 홈이 `feature:afternote:presentation` 의 `R` 을 직접 import 해 소셜 패턴 | ||
| * 아이콘을 그렸다. 리소스는 모듈 경계를 가장 조용히 넘는 의존이다 — 컴파일은 되고, | ||
| * 그림도 뜨고, 다른 모듈이 리소스를 지우거나 이름을 바꿀 때에야 드러난다. | ||
| * | ||
| * 아이콘의 정본은 `core:ui` 이고, 화면 사이에 오가는 값은 res id 가 아니라 | ||
| * `AfternoteSourceIcon` 이다. | ||
| */ | ||
| class ReceiverHomeResourceKonsistTest { | ||
| @Test | ||
| fun `수신자 홈은 다른 feature 의 R 을 참조하지 않는다`() { | ||
| Konsist | ||
| .scopeFromProject() | ||
| .files | ||
| .withPackage("com.afternote.feature.receiver.presentation.home..") | ||
| .assertFalse { file -> | ||
| file.imports.any { import -> FOREIGN_FEATURE_RESOURCE.matches(import.name) } || | ||
| // import 만 보면 FQN 참조가 그대로 빠져나간다 — 이 패키지의 screenshotTest 가 | ||
| // 실제로 `com.afternote.core.ui.R.drawable.…` 를 FQN 으로 쓰는 손버릇이라, | ||
| // 같은 손버릇으로 형제 feature 의 R 을 쓰면 가드가 침묵한다. 본문도 본다. | ||
| FOREIGN_FEATURE_RESOURCE_REFERENCE.containsMatchIn(file.text) | ||
| } | ||
| } | ||
|
|
||
| private companion object { | ||
| /** 수신자 자신이 아닌 feature 의 `R` (또는 그 하위 참조). */ | ||
| val FOREIGN_FEATURE_RESOURCE = | ||
| Regex("""^com\.afternote\.feature\.(?!receiver\.)[a-z]+\.presentation\.R(\..*)?$""") | ||
|
Collaborator
There was a problem hiding this comment. [normal] 가드가 import 문만 봅니다( // 이건 잡힌다
import com.afternote.feature.afternote.presentation.R as AfternoteFeatureR
// 이건 안 잡힌다 — import 가 없다
painterResource(com.afternote.feature.afternote.presentation.R.drawable.feature_afternote_img_logo)가정이 아니라 이 모듈에 이미 있는 코드 습관입니다 — 같은 패키지의 screenshotTest 두 파일이 지금도
|
||
|
|
||
| /** 같은 참조를 본문 어디서든 — FQN 으로 쓴 자리를 잡는다. 주석·문자열 오탐은 감수한다. */ | ||
| val FOREIGN_FEATURE_RESOURCE_REFERENCE = | ||
| Regex("""com\.afternote\.feature\.(?!receiver\.)[a-z]+\.presentation\.R\.""") | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[blocking] 이 타입이
feature:receiver:presentation의home.model에서 여기로 올라오면서 같은 모듈의 screenshotTest 소스셋이 따라오지 않았습니다.data class(drawableResId)→enum이라 import 경로뿐 아니라 생성자 호출도 함께 바뀌어야 하는데, 그쪽은 옛 형태 그대로입니다.본문 검증 목록이
assembleDebug·testDebugUnitTest·konsist:test로 끝나 screenshotTest 소스셋만 컴파일 범위 밖에 있었던 것으로 보입니다. 이 모듈은enableScreenshotTest가 켜져 있어 소스셋이 하나 더 있습니다 — 타입을 옮길 때는:feature:receiver:presentation:compileDebugScreenshotTestKotlin까지 걸어 두시면 같은 누락이 다시 안 납니다.