diff --git a/Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/PrezelAccordion.kt b/Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/PrezelAccordion.kt new file mode 100644 index 00000000..9f7f5dcb --- /dev/null +++ b/Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/PrezelAccordion.kt @@ -0,0 +1,205 @@ +package com.team.prezel.core.designsystem.component + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.animation.animateContentSize +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.animation.expandVertically +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.shrinkVertically +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.material3.Icon +import androidx.compose.material3.LocalMinimumInteractiveComponentSize +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.rotate +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp +import com.team.prezel.core.designsystem.R +import com.team.prezel.core.designsystem.component.button.PrezelHyperlinkButton +import com.team.prezel.core.designsystem.component.list.PrezelList +import com.team.prezel.core.designsystem.component.list.PrezelListSize +import com.team.prezel.core.designsystem.foundation.typography.PrezelTextStyles +import com.team.prezel.core.designsystem.icon.PrezelIcons +import com.team.prezel.core.designsystem.preview.PreviewScaffold +import com.team.prezel.core.designsystem.preview.ThemePreview +import com.team.prezel.core.designsystem.theme.PrezelTheme +import com.team.prezel.core.designsystem.util.drawDashBorder + +@Composable +fun PrezelAccordion( + title: String, + modifier: Modifier = Modifier, + initiallyExpanded: Boolean = false, + nested: Boolean = false, + showDivider: Boolean = false, + leadingContent: @Composable (() -> Unit)? = null, + trailingContent: @Composable (() -> Unit)? = null, + content: @Composable (() -> Unit), +) { + var expanded by rememberSaveable { mutableStateOf(initiallyExpanded) } + + Column( + modifier = modifier + .fillMaxWidth() + .animateContentSize(), + ) { + CompositionLocalProvider( + LocalMinimumInteractiveComponentSize provides Dp.Unspecified, + ) { + PrezelList( + title = title, + modifier = Modifier + .clickable( + interactionSource = null, + indication = null, + onClick = { expanded = !expanded }, + ), + size = if (nested) PrezelListSize.SMALL else PrezelListSize.REGULAR, + nested = nested, + leadingContent = leadingContent, + trailingContent = { + trailingContent?.invoke() + PrezelAccordionChevron(expanded = expanded) + }, + ) + } + + if (showDivider) { + PrezelHorizontalDivider( + type = PrezelDividerType.THICK, + ) + } + + PrezelAccordionContent( + expanded = expanded, + content = content, + ) + } +} + +@Composable +private fun PrezelAccordionChevron(expanded: Boolean) { + val rotation by animateFloatAsState( + targetValue = if (expanded) 180f else 0f, + label = "accordionChevronRotation", + ) + + Icon( + painter = painterResource(PrezelIcons.ChevronDown), + contentDescription = stringResource(R.string.core_designsystem_accordion_desc), + modifier = Modifier + .size(24.dp) + .rotate(rotation), + tint = PrezelTheme.colors.iconRegular, + ) +} + +@Composable +private fun PrezelAccordionContent( + expanded: Boolean, + content: @Composable () -> Unit, +) { + AnimatedVisibility( + visible = expanded, + enter = fadeIn() + expandVertically(), + exit = fadeOut() + shrinkVertically(), + ) { + Column( + modifier = Modifier.fillMaxWidth(), + ) { + content() + } + } +} + +@ThemePreview +@Composable +private fun PrezelAccordionPreview() { + PrezelTheme { + PreviewScaffold { + Column(verticalArrangement = Arrangement.spacedBy(40.dp)) { + PrezelAccordion( + title = "Collapsed Accordion", + showDivider = true, + content = { + Text( + text = "Content", + style = PrezelTextStyles.Body3Regular.toTextStyle(), + color = PrezelTheme.colors.textRegular, + ) + }, + ) + + PrezelAccordion( + title = "Expanded Accordion", + initiallyExpanded = true, + showDivider = true, + content = { + Text( + text = "Content 영역입니다.\n여기에 설명이나 리스트가 들어갑니다.", + modifier = Modifier.padding(all = 12.dp), + color = PrezelTheme.colors.textLarge, + style = PrezelTextStyles.Caption2Medium.toTextStyle(), + ) + }, + ) + + PrezelAccordion( + title = "(필수) 이용약관", + modifier = Modifier + .padding(start = 24.dp) + .drawDashBorder(), + nested = true, + leadingContent = { + var state by remember { mutableStateOf(false) } + + PrezelCheckbox( + checked = state, + modifier = Modifier.drawDashBorder(), + size = CheckboxSize.REGULAR, + onCheckedChange = { state = !state }, + ) + }, + trailingContent = { + PrezelHyperlinkButton( + text = "자세히 보기", + onClick = {}, + modifier = Modifier.drawDashBorder(), + ) + }, + content = { + Box( + modifier = Modifier + .fillMaxWidth() + .background(PrezelTheme.colors.bgMedium) + .padding(all = 12.dp), + ) { + Text( + text = "본 약관은 서비스 이용과 관련한 기본적인 권리·의무 및 책임사항을 규정합니다.", + color = PrezelTheme.colors.textLarge, + style = PrezelTextStyles.Caption2Regular.toTextStyle(), + ) + } + }, + ) + } + } + } +} diff --git a/Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/PrezelCheckbox.kt b/Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/PrezelCheckbox.kt index ae84cd7f..926a7aba 100644 --- a/Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/PrezelCheckbox.kt +++ b/Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/PrezelCheckbox.kt @@ -27,6 +27,7 @@ import com.team.prezel.core.designsystem.foundation.typography.PrezelTextStyles import com.team.prezel.core.designsystem.icon.PrezelIcons import com.team.prezel.core.designsystem.preview.ThemePreview import com.team.prezel.core.designsystem.theme.PrezelTheme +import com.team.prezel.core.designsystem.util.drawDashBorder enum class CheckboxSize { REGULAR, @@ -61,7 +62,7 @@ fun PrezelCheckbox( Box( modifier = modifier - .size(48.dp) + .padding(all = PrezelTheme.spacing.V8) .toggleable( value = checked, interactionSource = null, @@ -93,14 +94,16 @@ private fun PrezelRegularCheckboxPreview() { var checkState by remember { mutableStateOf(true) } PrezelCheckbox( - size = CheckboxSize.REGULAR, checked = checkState, + modifier = Modifier.drawDashBorder(), + size = CheckboxSize.REGULAR, onCheckedChange = { checkState = it }, ) PrezelCheckbox( - size = CheckboxSize.REGULAR, checked = !checkState, + modifier = Modifier.drawDashBorder(), + size = CheckboxSize.REGULAR, onCheckedChange = { checkState = it }, ) } @@ -121,14 +124,16 @@ private fun PrezelLargeCheckboxPreview() { var checkState by remember { mutableStateOf(true) } PrezelCheckbox( - size = CheckboxSize.LARGE, checked = checkState, + modifier = Modifier.drawDashBorder(), + size = CheckboxSize.LARGE, onCheckedChange = { checkState = it }, ) PrezelCheckbox( - size = CheckboxSize.LARGE, checked = !checkState, + modifier = Modifier.drawDashBorder(), + size = CheckboxSize.LARGE, onCheckedChange = { checkState = it }, ) } diff --git a/Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/TopAppBar.kt b/Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/TopAppBar.kt index e2d40053..b21c07f3 100644 --- a/Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/TopAppBar.kt +++ b/Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/TopAppBar.kt @@ -117,7 +117,7 @@ private fun PrezelTopAppBarWithAllIconsPreview() { IconButton(onClick = {}) { Icon( painter = painterResource(PrezelIcons.Blank), - contentDescription = "더보기", + contentDescription = "메뉴", ) } }, diff --git a/Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/list/PrezelList.kt b/Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/list/PrezelList.kt index 67184683..cf2ffc5f 100644 --- a/Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/list/PrezelList.kt +++ b/Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/component/list/PrezelList.kt @@ -31,8 +31,8 @@ fun PrezelList( modifier: Modifier = Modifier, size: PrezelListSize = PrezelListSize.REGULAR, nested: Boolean = false, - leadingContent: @Composable (RowScope.() -> Unit)? = null, - trailingContent: @Composable (RowScope.() -> Unit)? = null, + leadingContent: @Composable (() -> Unit)? = null, + trailingContent: @Composable (() -> Unit)? = null, ) { Row( modifier = modifier @@ -101,14 +101,14 @@ private fun PrezelListPreviewItem( showLeadingContent: Boolean, showTrailingContent: Boolean, ) { - val leadingContent: @Composable RowScope.() -> Unit = { + val leadingContent: @Composable () -> Unit = { Icon( painter = painterResource(id = PrezelIcons.Blank), contentDescription = "leading", ) } - val trailingContent: @Composable RowScope.() -> Unit = { + val trailingContent: @Composable () -> Unit = { Icon( painter = painterResource(id = PrezelIcons.Blank), contentDescription = "trailing", diff --git a/Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/icon/PrezelIcons.kt b/Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/icon/PrezelIcons.kt index 0191ebe7..63919d44 100644 --- a/Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/icon/PrezelIcons.kt +++ b/Prezel/core/designsystem/src/main/java/com/team/prezel/core/designsystem/icon/PrezelIcons.kt @@ -19,31 +19,39 @@ object PrezelIcons { val ChevronUp = R.drawable.core_designsystem_ic_chevron_up val College = R.drawable.core_designsystem_ic_college val Company = R.drawable.core_designsystem_ic_company + val Edit = R.drawable.core_designsystem_ic_edit val Folder = R.drawable.core_designsystem_ic_folder val Gallery = R.drawable.core_designsystem_ic_gallery val Hand = R.drawable.core_designsystem_ic_hand val Home = R.drawable.core_designsystem_ic_home - val Info = R.drawable.core_designsystem_ic_info - val InfoCircle = R.drawable.core_designsystem_ic_info_circle + val InfoCircleFilled = R.drawable.core_designsystem_ic_info_circle_filled + val InfoCircleOutlined = R.drawable.core_designsystem_ic_info_circle_outlined val Kakao = R.drawable.core_designsystem_ic_kakao + val Lock = R.drawable.core_designsystem_ic_lock + val Menu = R.drawable.core_designsystem_ic_menu val Mic = R.drawable.core_designsystem_ic_mic val Pause = R.drawable.core_designsystem_ic_pause val Person = R.drawable.core_designsystem_ic_person val Play = R.drawable.core_designsystem_ic_play val Plus = R.drawable.core_designsystem_ic_plus val Profile = R.drawable.core_designsystem_ic_profile + val QuestionCircleFilled = R.drawable.core_designsystem_ic_question_circle_filled + val QuestionCircleOutlined = R.drawable.core_designsystem_ic_question_circle_outlined val RadioCircleFilled = R.drawable.core_designsystem_ic_radio_circle_filled val RadioCircleOutlined = R.drawable.core_designsystem_ic_radio_circle_outlined val Recording = R.drawable.core_designsystem_ic_recording val Reset = R.drawable.core_designsystem_ic_reset val Rotate = R.drawable.core_designsystem_ic_rotate + val Search = R.drawable.core_designsystem_ic_search + val Setting = R.drawable.core_designsystem_ic_setting val Stop = R.drawable.core_designsystem_ic_stop val Storage = R.drawable.core_designsystem_ic_storage val Trophy = R.drawable.core_designsystem_ic_trophy + val Upload = R.drawable.core_designsystem_ic_upload val Video = R.drawable.core_designsystem_ic_video val Voice = R.drawable.core_designsystem_ic_voice - val Warning = R.drawable.core_designsystem_ic_warning - val WarningCircle = R.drawable.core_designsystem_ic_warning_circle + val WarningCircleFilled = R.drawable.core_designsystem_ic_warning_circle_filled + val WarningCircleOutlined = R.drawable.core_designsystem_ic_warning_circle_outlined val ZoomIn = R.drawable.core_designsystem_ic_zoom_in val ZoomOut = R.drawable.core_designsystem_ic_zoom_out } diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_balloon.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_balloon.xml index 87216bfa..c79fac59 100644 --- a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_balloon.xml +++ b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_balloon.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_calendar.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_calendar.xml index 20b215d1..88366171 100644 --- a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_calendar.xml +++ b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_calendar.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_check.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_check.xml index 27eb12b8..484f3834 100644 --- a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_check.xml +++ b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_check.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_college.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_college.xml index 7b7e4853..91569cdb 100644 --- a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_college.xml +++ b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_college.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_company.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_company.xml index 201249d0..c2312f83 100644 --- a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_company.xml +++ b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_company.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_edit.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_edit.xml index db98b7d2..8a0c4341 100644 --- a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_edit.xml +++ b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_edit.xml @@ -4,6 +4,7 @@ android:viewportWidth="24" android:viewportHeight="24"> + android:pathData="M16.744,11.257L7.294,20.707C7.107,20.894 6.852,21 6.587,21H4C3.448,21 3,20.552 3,20V17.413C3,17.148 3.106,16.894 3.293,16.706L12.743,7.256L16.744,11.257ZM16.413,3.586C17.194,2.805 18.462,2.805 19.243,3.586L20.414,4.758C21.195,5.539 21.195,6.806 20.414,7.587L17.451,10.549L13.45,6.549L16.413,3.586Z" + android:fillColor="#6E737D" + android:fillType="evenOdd"/> diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_gallery.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_gallery.xml index a15f090f..91d11ae1 100644 --- a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_gallery.xml +++ b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_gallery.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_hand.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_hand.xml index 73619535..7a3ea16b 100644 --- a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_hand.xml +++ b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_hand.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_info.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_info.xml deleted file mode 100644 index 18bc800c..00000000 --- a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_info.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_info_circle_filled.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_info_circle_filled.xml new file mode 100644 index 00000000..66e7cc87 --- /dev/null +++ b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_info_circle_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_info_circle.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_info_circle_outlined.xml similarity index 100% rename from Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_info_circle.xml rename to Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_info_circle_outlined.xml diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_lock.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_lock.xml index 5fc1d5c3..1eda06a4 100644 --- a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_lock.xml +++ b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_lock.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_menu.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_menu.xml new file mode 100644 index 00000000..2ae1ee32 --- /dev/null +++ b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_menu.xml @@ -0,0 +1,9 @@ + + + diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_mic.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_mic.xml index db4b90be..5d351126 100644 --- a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_mic.xml +++ b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_mic.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_person.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_person.xml index 16b31ae4..80f9aa10 100644 --- a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_person.xml +++ b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_person.xml @@ -4,6 +4,9 @@ android:viewportWidth="24" android:viewportHeight="24"> + diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_question_circle_filled.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_question_circle_filled.xml new file mode 100644 index 00000000..3885a93e --- /dev/null +++ b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_question_circle_filled.xml @@ -0,0 +1,9 @@ + + + diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_question_circle_outlined.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_question_circle_outlined.xml new file mode 100644 index 00000000..7a5bd410 --- /dev/null +++ b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_question_circle_outlined.xml @@ -0,0 +1,9 @@ + + + diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_search.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_search.xml new file mode 100644 index 00000000..8fba3a61 --- /dev/null +++ b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_search.xml @@ -0,0 +1,9 @@ + + + diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_setting.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_setting.xml index b6092413..3d62e975 100644 --- a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_setting.xml +++ b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_setting.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_trophy.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_trophy.xml index ab791f33..319d71d0 100644 --- a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_trophy.xml +++ b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_trophy.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_upload.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_upload.xml new file mode 100644 index 00000000..86804f1e --- /dev/null +++ b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_upload.xml @@ -0,0 +1,9 @@ + + + diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_video.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_video.xml index f8f79748..6aa1dde9 100644 --- a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_video.xml +++ b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_video.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_voice.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_voice.xml index ccf2e536..6bc789d7 100644 --- a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_voice.xml +++ b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_voice.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_warning.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_warning.xml deleted file mode 100644 index 7bfd5675..00000000 --- a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_warning.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_warning_circle_filled.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_warning_circle_filled.xml new file mode 100644 index 00000000..f6703f38 --- /dev/null +++ b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_warning_circle_filled.xml @@ -0,0 +1,10 @@ + + + diff --git a/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_warning_circle.xml b/Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_warning_circle_outlined.xml similarity index 100% rename from Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_warning_circle.xml rename to Prezel/core/designsystem/src/main/res/drawable/core_designsystem_ic_warning_circle_outlined.xml diff --git a/Prezel/core/designsystem/src/main/res/values/strings.xml b/Prezel/core/designsystem/src/main/res/values/strings.xml index 65940253..f994348e 100644 --- a/Prezel/core/designsystem/src/main/res/values/strings.xml +++ b/Prezel/core/designsystem/src/main/res/values/strings.xml @@ -1,5 +1,6 @@ + 아코디언 토글 플로팅 버튼 닫기 날짜 선택 닫기 체크박스