diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 1d7d45e4..72a00e18 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,18 +1,21 @@ ## Summary -> - 무슨 이유로 코드를 변경했는지 -> - 테스트 계획 또는 완료 사항 + + ## Describe your changes -> - 변경 또는 추가된 코드 -> - 관련 스크린샷 + ## Issue -> - Issue number +- close #{Issue number} ## To reviewers -> - 어떤 위험이나 장애가 발견되었는지 -> - 어떤 부분에 리뷰어가 집중하면 좋을지 + + + +### PR 올리기 전 체크 리스트 + +- [ ] version.properties의 버전을 업데이트 했나요? diff --git a/compose/src/main/java/com/yourssu/design/system/compose/base/YdsClickable.kt b/compose/src/main/java/com/yourssu/design/system/compose/base/YdsClickable.kt index 6090865f..fbd807d1 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/base/YdsClickable.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/base/YdsClickable.kt @@ -2,21 +2,34 @@ package com.yourssu.design.system.compose.base 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 /** * (전) noRippleClickable * * ripple 효과가 없는 clickable입니다. */ -inline fun Modifier.ydsClickable( +fun Modifier.ydsClickable( + enabled: Boolean = true, + onClick: () -> Unit, +): Modifier = composed { + this.ydsClickable( + interactionSource = remember { MutableInteractionSource() }, + enabled = enabled, + onClick = onClick, + ) +} + +fun Modifier.ydsClickable( interactionSource: MutableInteractionSource, enabled: Boolean = true, - crossinline onClick: () -> Unit, + onClick: () -> Unit, ): Modifier = this.clickable( interactionSource = interactionSource, indication = null, enabled = enabled, ) { onClick() -} \ No newline at end of file +} diff --git a/version.properties b/version.properties index 712c52ec..c9a5b682 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -versionName=2.5.4 +versionName=2.5.5 #자동 배포를 위해서 버전은 여기 한 군데에서 관리하면 된다