Skip to content

Commit b11eeb6

Browse files
feat: QuackSubTitle2 추가 (#246)
* feat: QuackSubTitle2 추가 * chore: api dump * refactor: empty line
1 parent 32780aa commit b11eeb6

File tree

5 files changed

+48
-3
lines changed

5 files changed

+48
-3
lines changed

ui-components-benchmark-app/src/main/kotlin/team/duckie/quackquack/ui/benchmark/app/benchmark.kt

+9-1
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,13 @@ import team.duckie.quackquack.ui.component.QuackSmallDeletableImage
5656
import team.duckie.quackquack.ui.component.QuackSquareCheckBox
5757
import team.duckie.quackquack.ui.component.QuackSubTab
5858
import team.duckie.quackquack.ui.component.QuackSubtitle
59+
import team.duckie.quackquack.ui.component.QuackSubtitle2
5960
import team.duckie.quackquack.ui.component.QuackTag
6061
import team.duckie.quackquack.ui.component.QuackTextField
6162
import team.duckie.quackquack.ui.component.QuackTitle1
6263
import team.duckie.quackquack.ui.component.QuackTitle2
6364
import team.duckie.quackquack.ui.component.QuackToggleChip
65+
import team.duckie.quackquack.ui.component.QuackTopAppBar
6466
import team.duckie.quackquack.ui.component.rememberQuackDrawerState
6567
import team.duckie.quackquack.ui.constant.QuackHeight
6668
import team.duckie.quackquack.ui.constant.QuackWidth
@@ -301,6 +303,13 @@ inline fun QuackTypographyBenchmark() {
301303
onClick = {},
302304
)
303305

306+
QuackSubtitle2(
307+
text = "",
308+
color = QuackColor.Black,
309+
rippleEnabled = true,
310+
onClick = {},
311+
)
312+
304313
QuackTitle1(
305314
text = "",
306315
color = QuackColor.Black,
@@ -440,7 +449,6 @@ inline fun QuackSelectableImageBenchmark() {
440449

441450
@Composable
442451
inline fun QuackTopAppBarBenchmark() {
443-
444452
QuackTopAppBar(
445453
leadingIcon = QuackIcon.ArrowBack,
446454
)

ui-components/api/ui-components.api

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ public final class team/duckie/quackquack/ui/color/QuackColor$Companion {
4040
public final fun getGray5-yvcWADs ()J
4141
public final fun getOrangeRed-yvcWADs ()J
4242
public final fun getSkyBlueColor-yvcWADs ()J
43-
public final fun getTransparent-yvcWADs ()J
4443
public final fun getWhite-yvcWADs ()J
4544
}
4645

@@ -185,6 +184,7 @@ public final class team/duckie/quackquack/ui/component/TypographyKt {
185184
public static final fun QuackHeadLine1-pvt1sM8 (Ljava/lang/String;JZZLkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;II)V
186185
public static final fun QuackHeadLine2-pvt1sM8 (Ljava/lang/String;JZZLkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;II)V
187186
public static final fun QuackSubtitle-pvt1sM8 (Ljava/lang/String;JZZLkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;II)V
187+
public static final fun QuackSubtitle2-pvt1sM8 (Ljava/lang/String;JZZLkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;II)V
188188
public static final fun QuackTitle1-pvt1sM8 (Ljava/lang/String;JZZLkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;II)V
189189
public static final fun QuackTitle2-pvt1sM8 (Ljava/lang/String;JZZLkotlin/jvm/functions/Function0;Landroidx/compose/runtime/Composer;II)V
190190
}
@@ -297,6 +297,7 @@ public final class team/duckie/quackquack/ui/textstyle/QuackTextStyle$Companion
297297
public final fun getHeadLine1 ()Lteam/duckie/quackquack/ui/textstyle/QuackTextStyle;
298298
public final fun getHeadLine2 ()Lteam/duckie/quackquack/ui/textstyle/QuackTextStyle;
299299
public final fun getSubtitle ()Lteam/duckie/quackquack/ui/textstyle/QuackTextStyle;
300+
public final fun getSubtitle2 ()Lteam/duckie/quackquack/ui/textstyle/QuackTextStyle;
300301
public final fun getTitle1 ()Lteam/duckie/quackquack/ui/textstyle/QuackTextStyle;
301302
public final fun getTitle2 ()Lteam/duckie/quackquack/ui/textstyle/QuackTextStyle;
302303
}

ui-components/src/main/kotlin/team/duckie/quackquack/ui/component/selectableImage.kt

-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ private fun BoxScope.SelectedFilterBox() {
134134
color = Black80.composeColor,
135135
)
136136
)
137-
138137
}
139138

140139
/**

ui-components/src/main/kotlin/team/duckie/quackquack/ui/component/typography.kt

+29
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,35 @@ public fun QuackSubtitle(
165165
singleLine = singleLine,
166166
)
167167

168+
/**
169+
* [QuackText] 에 [QuackTextStyle.Subtitle2] 스타일을 적용하여
170+
* 주어진 텍스트를 표시합니다.
171+
*
172+
* @param text 표시할 텍스트
173+
* @param color 텍스트의 색상
174+
* @param rippleEnabled 텍스트 클릭시 ripple 발생 여부
175+
* @param singleLine 텍스트를 한 줄만 사용할지 여부
176+
* @param onClick 텍스트이 클릭됐을 때 실행할 람다식
177+
*/
178+
@Composable
179+
public fun QuackSubtitle2(
180+
text: String,
181+
color: QuackColor = QuackColor.Black,
182+
rippleEnabled: Boolean = false,
183+
singleLine: Boolean = true,
184+
onClick: (() -> Unit)? = null,
185+
): Unit = QuackText(
186+
modifier = Modifier.quackClickable(
187+
rippleEnabled = rippleEnabled,
188+
onClick = onClick,
189+
),
190+
text = text,
191+
style = QuackTextStyle.Subtitle2.change(
192+
color = color,
193+
),
194+
singleLine = singleLine,
195+
)
196+
168197
/**
169198
* [QuackText] 에 [QuackTextStyle.Body1] 스타일을 적용하여
170199
* 주어진 텍스트를 표시합니다.

ui-components/src/main/kotlin/team/duckie/quackquack/ui/textstyle/QuackTextStyle.kt

+8
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,14 @@ public class QuackTextStyle internal constructor(
123123
lineHeight = 20.sp,
124124
)
125125

126+
@Stable
127+
public val Subtitle2: QuackTextStyle = QuackTextStyle(
128+
size = 12.sp,
129+
weight = FontWeight.Bold,
130+
letterSpacing = 0.sp,
131+
lineHeight = 15.sp,
132+
)
133+
126134
@Stable
127135
public val Body1: QuackTextStyle = QuackTextStyle(
128136
size = 14.sp,

0 commit comments

Comments
 (0)