From 948e32b558a5e59a5250e59955ec283003d8cefe Mon Sep 17 00:00:00 2001 From: HaeTi Date: Tue, 20 Feb 2024 21:37:10 +0900 Subject: [PATCH 1/4] =?UTF-8?q?add=20:=20overflow=20=EB=B0=8F=20maxLines?= =?UTF-8?q?=20=EC=86=8D=EC=84=B1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yourssu/design/system/compose/base/YdsText.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/compose/src/main/java/com/yourssu/design/system/compose/base/YdsText.kt b/compose/src/main/java/com/yourssu/design/system/compose/base/YdsText.kt index 2281aadf..bba16264 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/base/YdsText.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/base/YdsText.kt @@ -8,6 +8,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.takeOrElse import androidx.compose.ui.text.TextLayoutResult +import androidx.compose.ui.text.style.TextOverflow import com.yourssu.design.system.compose.foundation.LocalYdsContentAlpha import com.yourssu.design.system.compose.foundation.LocalYdsContentColor import com.yourssu.design.system.compose.foundation.YdsTextStyle @@ -19,6 +20,9 @@ fun YdsText( color: Color = Color.Unspecified, onTextLayout: (TextLayoutResult) -> Unit = {}, style: YdsTextStyle = LocalTextStyle.current, + overflow: TextOverflow = TextOverflow.Clip, + maxLines: Int = Int.MAX_VALUE, + minLines: Int = 1, ) { val textColor = color.takeOrElse { style.color.takeOrElse { @@ -33,6 +37,8 @@ fun YdsText( modifier = modifier, style = mergedStyle, onTextLayout = onTextLayout, + overflow = overflow, + maxLines = maxLines, ) } From 20b8a7869494f023be1166971d883d4ffe3cb941 Mon Sep 17 00:00:00 2001 From: HaeTi Date: Tue, 20 Feb 2024 21:39:25 +0900 Subject: [PATCH 2/4] =?UTF-8?q?add=20:=20minLines=20=EC=86=8D=EC=84=B1=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yourssu/design/system/compose/base/YdsText.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/compose/src/main/java/com/yourssu/design/system/compose/base/YdsText.kt b/compose/src/main/java/com/yourssu/design/system/compose/base/YdsText.kt index bba16264..a02803cc 100644 --- a/compose/src/main/java/com/yourssu/design/system/compose/base/YdsText.kt +++ b/compose/src/main/java/com/yourssu/design/system/compose/base/YdsText.kt @@ -39,6 +39,7 @@ fun YdsText( onTextLayout = onTextLayout, overflow = overflow, maxLines = maxLines, + minLines = minLines, ) } From d4e1e3496590c2d6ebf687bac0c39fd5a2f80c0a Mon Sep 17 00:00:00 2001 From: HaeTi Date: Wed, 21 Feb 2024 16:04:42 +0900 Subject: [PATCH 3/4] chore : version upgrade version 2.5.4 -> 2.5.5 --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 #자동 배포를 위해서 버전은 여기 한 군데에서 관리하면 된다 From 13b58829e7b8bdd971bd5607f371091b46a89381 Mon Sep 17 00:00:00 2001 From: HaeTi Date: Wed, 21 Feb 2024 19:08:24 +0900 Subject: [PATCH 4/4] =?UTF-8?q?chore=20:=20=EB=A6=AC=EB=B7=B0=20=EB=B0=98?= =?UTF-8?q?=EC=98=81=20->=202.5.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index c9a5b682..a5298d29 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -versionName=2.5.5 +versionName=2.5.6 #자동 배포를 위해서 버전은 여기 한 군데에서 관리하면 된다