From 3528779b9574d896f77f0f75e73bc03a8302ce33 Mon Sep 17 00:00:00 2001 From: jiwon2724 Date: Fri, 22 Nov 2024 17:42:53 +0900 Subject: [PATCH 01/17] =?UTF-8?q?[ui]=20=EB=A6=AC=EB=A7=88=EC=9D=B8?= =?UTF-8?q?=EB=93=9C=20UI=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/strayalpaca/addlink/AddLinkScreen.kt | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt index 731a551b..e5905c98 100644 --- a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt +++ b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt @@ -299,41 +299,6 @@ fun AddLinkScreen( ) } - Spacer(modifier = Modifier.height(24.dp)) - - Text( - text = stringResource(id = R.string.title_remind), - style = PokitTheme.typography.body2Medium.copy(color = PokitTheme.colors.textSecondary) - ) - - Spacer(modifier = Modifier.height(12.dp)) - - PokitSwitchRadio( - modifier = Modifier.fillMaxWidth(), - itemList = listOf( - Pair(stringResource(id = R.string.reject_remind), false), - Pair(stringResource(id = R.string.accept_remind), true) - ), - style = PokitSwitchRadioStyle.STROKE, - selectedItem = if (state.useRemind) { - Pair(stringResource(id = R.string.accept_remind), true) - } else { - Pair(stringResource(id = R.string.reject_remind), false) - }, - onClickItem = { - toggleRemindRadio(it.second) - }, - getTitleFromItem = { it.first }, - enabled = false - ) - - Spacer(modifier = Modifier.height(8.dp)) - - Text( - text = stringResource(id = R.string.see_you_soon), - style = PokitTheme.typography.detail1.copy(color = PokitTheme.colors.textTertiary) - ) - Spacer(modifier = Modifier.height(32.dp)) } } From e22a59e9308bc55a437a54ab4cd62593c2904025 Mon Sep 17 00:00:00 2001 From: jiwon2724 Date: Fri, 22 Nov 2024 17:46:40 +0900 Subject: [PATCH 02/17] =?UTF-8?q?[ui]=20=ED=8F=AC=ED=82=B7=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B2=84=ED=8A=BC=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/strayalpaca/addlink/AddLinkScreen.kt | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt index e5905c98..c629b642 100644 --- a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt +++ b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt @@ -245,19 +245,6 @@ fun AddLinkScreen( onClick = onClickSelectPokit, enable = enable ) - - Spacer(modifier = Modifier.width(8.dp)) - - PokitButton( - text = null, - icon = PokitButtonIcon( - resourceId = pokitmons.pokit.core.ui.R.drawable.icon_24_plus, - position = PokitButtonIconPosition.LEFT - ), - size = PokitButtonSize.LARGE, - onClick = onClickAddPokit, - enable = enable - ) } Spacer(modifier = Modifier.height(24.dp)) From f3a2c56bf619f10278423d3d557f73b2c55295c3 Mon Sep 17 00:00:00 2001 From: jiwon2724 Date: Fri, 22 Nov 2024 18:04:50 +0900 Subject: [PATCH 03/17] =?UTF-8?q?[chore]=20=ED=8F=AC=ED=82=B7=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/drawable/image_add_pokit.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 core/ui/src/main/res/drawable/image_add_pokit.xml diff --git a/core/ui/src/main/res/drawable/image_add_pokit.xml b/core/ui/src/main/res/drawable/image_add_pokit.xml new file mode 100644 index 00000000..c09f35d8 --- /dev/null +++ b/core/ui/src/main/res/drawable/image_add_pokit.xml @@ -0,0 +1,18 @@ + + + + + From 0f915e6ad13eacdcf479c6b894a719dc628302fd Mon Sep 17 00:00:00 2001 From: jiwon2724 Date: Fri, 22 Nov 2024 18:37:54 +0900 Subject: [PATCH 04/17] =?UTF-8?q?[ui]=20=ED=8F=AC=ED=82=B7=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=ED=95=98=EA=B8=B0=20UI=20=EC=98=81=EC=97=AD=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 --- .../com/strayalpaca/addlink/AddLinkScreen.kt | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt index c629b642..e9f00582 100644 --- a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt +++ b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt @@ -1,8 +1,11 @@ package com.strayalpaca.addlink import androidx.compose.foundation.ExperimentalFoundationApi +import androidx.compose.foundation.Image import androidx.compose.foundation.LocalOverscrollConfiguration import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -11,12 +14,15 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.Divider +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -27,6 +33,8 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp @@ -111,6 +119,37 @@ fun AddLinkScreenContainer( } } + Row( + modifier = Modifier + .fillMaxWidth() + .height(90.dp) + .clickable( + indication = null, + interactionSource = remember { MutableInteractionSource() }, + onClick = viewModel::checkPokitCount + ), + verticalAlignment = Alignment.CenterVertically + ) { + Image( + modifier = Modifier.padding(start = 30.dp), + painter = painterResource(id = pokitmons.pokit.core.ui.R.drawable.image_add_pokit), + contentDescription = "포킷 추가 버튼", + ) + + Spacer(modifier = Modifier.size(20.dp)) + + Text( + text = "포킷 추가하기", + style = PokitTheme.typography.body1Bold + ) + } + + HorizontalDivider( + modifier = Modifier.fillMaxWidth(), // 가로 길이 전체로 설정 + thickness = 1.dp, // 라인 두께 + color = PokitTheme.colors.borderTertiary // 라인 색상 + ) + LazyColumn( state = lazyColumnListState ) { @@ -247,6 +286,8 @@ fun AddLinkScreen( ) } + // onClickAddPokit + Spacer(modifier = Modifier.height(24.dp)) Text( From b216750704ecb836bc01db85e6fbb6a24db8e850 Mon Sep 17 00:00:00 2001 From: jiwon2724 Date: Tue, 3 Dec 2024 20:16:42 +0900 Subject: [PATCH 05/17] =?UTF-8?q?[chore]=20=EC=A3=BC=EC=84=9D=20=EB=B0=8F?= =?UTF-8?q?=20height=EA=B0=92=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/strayalpaca/addlink/AddLinkScreen.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt index e9f00582..6aca95ef 100644 --- a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt +++ b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt @@ -122,7 +122,7 @@ fun AddLinkScreenContainer( Row( modifier = Modifier .fillMaxWidth() - .height(90.dp) + .height(84.dp) .clickable( indication = null, interactionSource = remember { MutableInteractionSource() }, @@ -145,9 +145,9 @@ fun AddLinkScreenContainer( } HorizontalDivider( - modifier = Modifier.fillMaxWidth(), // 가로 길이 전체로 설정 - thickness = 1.dp, // 라인 두께 - color = PokitTheme.colors.borderTertiary // 라인 색상 + modifier = Modifier.fillMaxWidth(), + thickness = 1.dp, + color = PokitTheme.colors.borderTertiary ) LazyColumn( From 8e0e1ab1be1201c6bbced223012f60b224a4aefb Mon Sep 17 00:00:00 2001 From: jiwon2724 Date: Tue, 3 Dec 2024 20:18:15 +0900 Subject: [PATCH 06/17] =?UTF-8?q?[chore]=20Pokit=20data=20class=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - image 프로퍼티 추가 --- .../src/main/java/com/strayalpaca/addlink/model/Pokit.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/feature/addlink/src/main/java/com/strayalpaca/addlink/model/Pokit.kt b/feature/addlink/src/main/java/com/strayalpaca/addlink/model/Pokit.kt index 79c6450d..e2b69de6 100644 --- a/feature/addlink/src/main/java/com/strayalpaca/addlink/model/Pokit.kt +++ b/feature/addlink/src/main/java/com/strayalpaca/addlink/model/Pokit.kt @@ -6,13 +6,15 @@ data class Pokit( val title: String, val id: String, val count: Int, + val image: String = "" ) { companion object { fun fromDomainPokit(pokit: DomainPokit): Pokit { return Pokit( title = pokit.name, id = pokit.categoryId.toString(), - count = pokit.linkCount + count = pokit.linkCount, + image = pokit.image.url ) } } From 9b7a8898919a11106de33dedae5dd6e4bfc5338a Mon Sep 17 00:00:00 2001 From: jiwon2724 Date: Tue, 3 Dec 2024 20:29:18 +0900 Subject: [PATCH 07/17] =?UTF-8?q?[chore]=20coil=20=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=B8=8C=EB=9F=AC=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/ui/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index ebf7dcf7..8c9214e6 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -45,6 +45,7 @@ dependencies { implementation(libs.androidx.ui.graphics) implementation(libs.androidx.ui.tooling.preview) implementation(libs.androidx.material3) + implementation(libs.coil.compose) testImplementation(libs.junit) androidTestImplementation(libs.androidx.junit) androidTestImplementation(libs.androidx.espresso.core) From f12ba11cab28b1b5edb02092ff75a671242bb5ac Mon Sep 17 00:00:00 2001 From: jiwon2724 Date: Tue, 3 Dec 2024 20:33:55 +0900 Subject: [PATCH 08/17] =?UTF-8?q?[feature]=20=EB=A7=81=ED=81=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=ED=8F=AC=ED=82=B7=20=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20v2=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../block/pokitlist/PokitListVer2.kt | 98 +++++++++++++++++++ .../com/strayalpaca/addlink/AddLinkScreen.kt | 4 +- 2 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/pokitlist/PokitListVer2.kt diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/pokitlist/PokitListVer2.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/pokitlist/PokitListVer2.kt new file mode 100644 index 00000000..90968fdc --- /dev/null +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/pokitlist/PokitListVer2.kt @@ -0,0 +1,98 @@ +package pokitmons.pokit.core.ui.components.block.pokitlist + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.interaction.MutableInteractionSource +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import coil.compose.AsyncImage +import pokitmons.pokit.core.ui.components.block.pokitlist.attributes.PokitListState +import pokitmons.pokit.core.ui.theme.PokitTheme + +@Composable +fun PokitListVer2( + item: T, + title: String, + sub: String, + imageUrl: String, + onClickItem: (T) -> Unit, + modifier: Modifier = Modifier, + state: PokitListState = PokitListState.DEFAULT, +) { + val titleTextColor = getTitleTextColor(state = state) + val subTextColor = getSubTextColor(state = state) + + Row( + modifier = modifier + .clickable( + enabled = state != PokitListState.DISABLE, + onClick = { onClickItem(item) }, + indication = null, + interactionSource = remember { MutableInteractionSource() } + ) + .padding(horizontal = 20.dp, vertical = 12.dp), + verticalAlignment = Alignment.CenterVertically + ) { + + AsyncImage( + model = imageUrl, + contentDescription = null, + contentScale = ContentScale.Crop, + modifier = Modifier.size(60.dp) + ) + + Spacer(modifier = Modifier.width(12.dp)) + + Column( + modifier = Modifier.weight(1f) + ) { + Text( + text = title, + style = PokitTheme.typography.body1Bold.copy(color = titleTextColor), + overflow = TextOverflow.Ellipsis + ) + + Spacer(modifier = Modifier.height(4.dp)) + + Text( + text = sub, + style = PokitTheme.typography.detail1.copy(color = subTextColor) + ) + } + } +} + +@Composable +private fun getTitleTextColor( + state: PokitListState, +): Color { + return when (state) { + PokitListState.DEFAULT -> PokitTheme.colors.textPrimary + PokitListState.ACTIVE -> PokitTheme.colors.textPrimary + PokitListState.DISABLE -> PokitTheme.colors.textDisable + } +} + +@Composable +private fun getSubTextColor( + state: PokitListState, +): Color { + return when (state) { + PokitListState.DEFAULT -> PokitTheme.colors.textTertiary + PokitListState.ACTIVE -> PokitTheme.colors.textTertiary + PokitListState.DISABLE -> PokitTheme.colors.textDisable + } +} diff --git a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt index 6aca95ef..3719bd1b 100644 --- a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt +++ b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt @@ -55,6 +55,7 @@ import pokitmons.pokit.core.ui.components.atom.button.attributes.PokitButtonSize import pokitmons.pokit.core.ui.components.atom.inputarea.PokitInputArea import pokitmons.pokit.core.ui.components.block.labeledinput.LabeledInput import pokitmons.pokit.core.ui.components.block.pokitlist.PokitList +import pokitmons.pokit.core.ui.components.block.pokitlist.PokitListVer2 import pokitmons.pokit.core.ui.components.block.pokitlist.attributes.PokitListState import pokitmons.pokit.core.ui.components.block.pokittoast.PokitToast import pokitmons.pokit.core.ui.components.block.select.PokitSelect @@ -156,9 +157,10 @@ fun AddLinkScreenContainer( items( items = pokitList ) { pokit -> - PokitList( + PokitListVer2( item = pokit, title = pokit.title, + imageUrl = pokit.image, sub = stringResource(id = R.string.count_format, pokit.count), onClickItem = viewModel::selectPokit, state = PokitListState.ACTIVE From 80a1a39d174ed091fc083804a01faf681f5b98c8 Mon Sep 17 00:00:00 2001 From: jiwon2724 Date: Tue, 3 Dec 2024 21:01:48 +0900 Subject: [PATCH 09/17] =?UTF-8?q?[ui]=20icon=5F24=5Fxs=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B0=8F=20UI=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pokit/core/ui/components/atom/input/PokitInput.kt | 10 ++++++++++ core/ui/src/main/res/drawable/icon_24_xs.xml | 10 ++++++++++ 2 files changed, 20 insertions(+) create mode 100644 core/ui/src/main/res/drawable/icon_24_xs.xml diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt index 79e24e41..f08ee19e 100644 --- a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt @@ -1,5 +1,7 @@ package pokitmons.pokit.core.ui.components.atom.input +import androidx.compose.foundation.Image +import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.width @@ -16,7 +18,9 @@ import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp +import pokitmons.pokit.core.ui.R import pokitmons.pokit.core.ui.components.atom.input.attributes.PokitInputIcon import pokitmons.pokit.core.ui.components.atom.input.attributes.PokitInputIconPosition import pokitmons.pokit.core.ui.components.atom.input.attributes.PokitInputShape @@ -95,6 +99,12 @@ fun PokitInput( if (icon?.position == PokitInputIconPosition.RIGHT) { PokitInputIcon(state = state, resourceId = icon.resourceId, onClick = onClickIcon) } + + Image( + painter = painterResource(id = R.drawable.icon_24_xs), + contentDescription = "입력된 문자 전체삭제", + Modifier.clickable { } + ) } } ) diff --git a/core/ui/src/main/res/drawable/icon_24_xs.xml b/core/ui/src/main/res/drawable/icon_24_xs.xml new file mode 100644 index 00000000..940737b2 --- /dev/null +++ b/core/ui/src/main/res/drawable/icon_24_xs.xml @@ -0,0 +1,10 @@ + + + From 17fa8a458961dd6514de0f9b6db5b8c42d393702 Mon Sep 17 00:00:00 2001 From: jiwon2724 Date: Tue, 3 Dec 2024 21:02:59 +0900 Subject: [PATCH 10/17] =?UTF-8?q?[chore]=20=EC=BD=94=EB=94=A9=20=EC=BB=A8?= =?UTF-8?q?=EB=B2=A4=EC=85=98=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/components/block/pokitlist/PokitListVer2.kt | 1 - .../main/java/com/strayalpaca/addlink/AddLinkScreen.kt | 10 +--------- .../main/java/com/strayalpaca/addlink/model/Pokit.kt | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/pokitlist/PokitListVer2.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/pokitlist/PokitListVer2.kt index 90968fdc..d36d4ba2 100644 --- a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/pokitlist/PokitListVer2.kt +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/pokitlist/PokitListVer2.kt @@ -46,7 +46,6 @@ fun PokitListVer2( .padding(horizontal = 20.dp, vertical = 12.dp), verticalAlignment = Alignment.CenterVertically ) { - AsyncImage( model = imageUrl, contentDescription = null, diff --git a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt index 3719bd1b..e61551be 100644 --- a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt +++ b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt @@ -15,13 +15,11 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.Divider import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -33,7 +31,6 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign @@ -49,18 +46,13 @@ import org.orbitmvi.orbit.compose.collectAsState import org.orbitmvi.orbit.compose.collectSideEffect import pokitmons.pokit.core.feature.model.paging.PagingState import pokitmons.pokit.core.ui.components.atom.button.PokitButton -import pokitmons.pokit.core.ui.components.atom.button.attributes.PokitButtonIcon -import pokitmons.pokit.core.ui.components.atom.button.attributes.PokitButtonIconPosition import pokitmons.pokit.core.ui.components.atom.button.attributes.PokitButtonSize import pokitmons.pokit.core.ui.components.atom.inputarea.PokitInputArea import pokitmons.pokit.core.ui.components.block.labeledinput.LabeledInput -import pokitmons.pokit.core.ui.components.block.pokitlist.PokitList import pokitmons.pokit.core.ui.components.block.pokitlist.PokitListVer2 import pokitmons.pokit.core.ui.components.block.pokitlist.attributes.PokitListState import pokitmons.pokit.core.ui.components.block.pokittoast.PokitToast import pokitmons.pokit.core.ui.components.block.select.PokitSelect -import pokitmons.pokit.core.ui.components.block.switchradio.PokitSwitchRadio -import pokitmons.pokit.core.ui.components.block.switchradio.attributes.PokitSwitchRadioStyle import pokitmons.pokit.core.ui.components.template.bottomsheet.PokitBottomSheet import pokitmons.pokit.core.ui.theme.PokitTheme @@ -134,7 +126,7 @@ fun AddLinkScreenContainer( Image( modifier = Modifier.padding(start = 30.dp), painter = painterResource(id = pokitmons.pokit.core.ui.R.drawable.image_add_pokit), - contentDescription = "포킷 추가 버튼", + contentDescription = "포킷 추가 버튼" ) Spacer(modifier = Modifier.size(20.dp)) diff --git a/feature/addlink/src/main/java/com/strayalpaca/addlink/model/Pokit.kt b/feature/addlink/src/main/java/com/strayalpaca/addlink/model/Pokit.kt index e2b69de6..1619ee3e 100644 --- a/feature/addlink/src/main/java/com/strayalpaca/addlink/model/Pokit.kt +++ b/feature/addlink/src/main/java/com/strayalpaca/addlink/model/Pokit.kt @@ -6,7 +6,7 @@ data class Pokit( val title: String, val id: String, val count: Int, - val image: String = "" + val image: String = "", ) { companion object { fun fromDomainPokit(pokit: DomainPokit): Pokit { From 8166db52fe58d9daf81f7ecbaeac385d49cce3c2 Mon Sep 17 00:00:00 2001 From: jiwon2724 Date: Sat, 7 Dec 2024 14:33:57 +0900 Subject: [PATCH 11/17] =?UTF-8?q?[chore]=20PokitInput=20=EB=A1=A4=EB=B0=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pokit/core/ui/components/atom/input/PokitInput.kt | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt index f08ee19e..79e24e41 100644 --- a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt @@ -1,7 +1,5 @@ package pokitmons.pokit.core.ui.components.atom.input -import androidx.compose.foundation.Image -import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.width @@ -18,9 +16,7 @@ import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.graphics.Color -import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import pokitmons.pokit.core.ui.R import pokitmons.pokit.core.ui.components.atom.input.attributes.PokitInputIcon import pokitmons.pokit.core.ui.components.atom.input.attributes.PokitInputIconPosition import pokitmons.pokit.core.ui.components.atom.input.attributes.PokitInputShape @@ -99,12 +95,6 @@ fun PokitInput( if (icon?.position == PokitInputIconPosition.RIGHT) { PokitInputIcon(state = state, resourceId = icon.resourceId, onClick = onClickIcon) } - - Image( - painter = painterResource(id = R.drawable.icon_24_xs), - contentDescription = "입력된 문자 전체삭제", - Modifier.clickable { } - ) } } ) From 9f382afb22200a9a9e85a9484311c5642c557e48 Mon Sep 17 00:00:00 2001 From: jiwon2724 Date: Sat, 7 Dec 2024 14:35:32 +0900 Subject: [PATCH 12/17] =?UTF-8?q?[feature]=20=EC=95=84=EC=9D=B4=EC=BD=98?= =?UTF-8?q?=20=ED=81=B4=EB=A6=AD=20=EC=8B=9C=20title,=20url=20clear=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../block/labeledinput/LabeledInput.kt | 20 ++++++++++++++++-- .../com/strayalpaca/addlink/AddLinkScreen.kt | 21 ++++++++++++++++--- .../strayalpaca/addlink/AddLinkViewModel.kt | 8 +++++++ .../java/com/strayalpaca/addlink/Preview.kt | 4 +++- 4 files changed, 47 insertions(+), 6 deletions(-) diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/labeledinput/LabeledInput.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/labeledinput/LabeledInput.kt index 76934443..da63a258 100644 --- a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/labeledinput/LabeledInput.kt +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/labeledinput/LabeledInput.kt @@ -22,6 +22,8 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp import pokitmons.pokit.core.ui.R import pokitmons.pokit.core.ui.components.atom.input.PokitInput +import pokitmons.pokit.core.ui.components.atom.input.attributes.PokitInputIcon +import pokitmons.pokit.core.ui.components.atom.input.attributes.PokitInputIconPosition import pokitmons.pokit.core.ui.components.atom.input.attributes.PokitInputState import pokitmons.pokit.core.ui.theme.PokitTheme @@ -37,8 +39,10 @@ fun LabeledInput( readOnly: Boolean = false, enable: Boolean = true, isError: Boolean = false, + onClickRemove: () -> Unit = {}, ) { var focused by remember { mutableStateOf(false) } + val state = remember(focused, isError, readOnly, enable) { getState( enabled = enable, @@ -67,10 +71,22 @@ fun LabeledInput( text = inputText, hintText = hintText, onChangeText = onChangeText, - icon = null, + icon = if (inputText.isNotEmpty()) { + PokitInputIcon( + position = PokitInputIconPosition.RIGHT, + resourceId = R.drawable.icon_24_xs + ) + } else { + null + }, + onClickIcon = remember { + { + onClickRemove() + } + }, isError = isError, enable = enable, - readOnly = readOnly + readOnly = readOnly, ) Spacer(modifier = Modifier.height(4.dp)) diff --git a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt index e61551be..b112ffaa 100644 --- a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt +++ b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt @@ -28,6 +28,7 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.collectAsState import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -175,7 +176,9 @@ fun AddLinkScreenContainer( toggleRemindRadio = viewModel::setRemind, onBackPressed = viewModel::onBackPressed, onClickSaveButton = viewModel::saveLink, - closeToast = viewModel::closeToastMessage + closeToast = viewModel::closeToastMessage, + clearTitle = viewModel::clearTitle, + clearUrl = viewModel::clearUrl ) } @@ -196,6 +199,8 @@ fun AddLinkScreen( onBackPressed: () -> Unit, onClickSaveButton: () -> Unit, closeToast: () -> Unit, + clearUrl: () -> Unit, + clearTitle: () -> Unit, ) { val scrollState = rememberScrollState() val enable = remember(state.step) { @@ -206,6 +211,10 @@ fun AddLinkScreen( ) } + var currentUrl = remember { + mutableStateOf(url) + } + Column( modifier = Modifier .fillMaxSize() @@ -250,7 +259,10 @@ fun AddLinkScreen( inputText = url, hintText = stringResource(id = R.string.placeholder_link), onChangeText = inputUrl, - enable = enable + enable = enable, + onClickRemove = { + clearUrl() + } ) Spacer(modifier = Modifier.height(24.dp)) @@ -261,7 +273,10 @@ fun AddLinkScreen( inputText = title, hintText = stringResource(id = R.string.placeholder_title), onChangeText = inputTitle, - enable = enable + enable = enable, + onClickRemove = { + clearTitle() + } ) Spacer(modifier = Modifier.height(24.dp)) diff --git a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkViewModel.kt b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkViewModel.kt index fc031bdb..360f9f71 100644 --- a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkViewModel.kt +++ b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkViewModel.kt @@ -180,6 +180,14 @@ class AddLinkViewModel @Inject constructor( } } + fun clearUrl() { + this._linkUrl.update { "" } + } + + fun clearTitle() { + this._title.update { "" } + } + private suspend fun getLinkMetaData(linkUrl: String) = intent { val response = getLinkCardUseCase.getLinkCard(linkUrl) if (response is PokitResult.Success) { diff --git a/feature/addlink/src/main/java/com/strayalpaca/addlink/Preview.kt b/feature/addlink/src/main/java/com/strayalpaca/addlink/Preview.kt index f7bab065..b30375e3 100644 --- a/feature/addlink/src/main/java/com/strayalpaca/addlink/Preview.kt +++ b/feature/addlink/src/main/java/com/strayalpaca/addlink/Preview.kt @@ -30,7 +30,9 @@ fun AddLinkScreenPreview() { toggleRemindRadio = {}, onBackPressed = {}, onClickSaveButton = {}, - closeToast = {} + closeToast = {}, + clearUrl = {}, + clearTitle = {} ) } } From 75e77c6105d913eb53309ffe86c13ed80e680411 Mon Sep 17 00:00:00 2001 From: jiwon2724 Date: Sat, 7 Dec 2024 14:42:17 +0900 Subject: [PATCH 13/17] =?UTF-8?q?[chore]=20idle=20=EC=83=81=ED=83=9C=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 --- .../src/main/java/com/strayalpaca/addlink/AddLinkViewModel.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkViewModel.kt b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkViewModel.kt index 360f9f71..58335301 100644 --- a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkViewModel.kt +++ b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkViewModel.kt @@ -324,6 +324,7 @@ class AddLinkViewModel @Inject constructor( if (response.result >= MAX_POKIT_COUNT) { reduce { state.copy(toastMessage = ToastMessageEvent.CANNOT_CREATE_POKIT_MORE) } } else { + reduce { state.copy(step = ScreenStep.IDLE) } postSideEffect(AddLinkScreenSideEffect.OnNavigateToAddPokit) } } else { From 0f2b0750260db60c81a75d0454b3fc4483de27d9 Mon Sep 17 00:00:00 2001 From: jiwon2724 Date: Sat, 7 Dec 2024 15:06:49 +0900 Subject: [PATCH 14/17] =?UTF-8?q?[ui]=20=EB=94=94=EC=9E=90=EC=9D=B8=20?= =?UTF-8?q?=EC=8B=9C=EC=8A=A4=ED=85=9C=20=EC=BB=AC=EB=9F=AC=20=EA=B0=92=20?= =?UTF-8?q?=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/ui/components/atom/input/PokitInput.kt | 15 +++++++++++++-- .../input/subcomponents/icon/PokitInputIcon.kt | 10 ++++++++-- .../components/block/labeledinput/LabeledInput.kt | 4 +++- .../java/com/strayalpaca/addlink/AddLinkScreen.kt | 2 ++ 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt index 79e24e41..eae619ff 100644 --- a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt @@ -40,6 +40,7 @@ fun PokitInput( isError: Boolean = false, keyboardActions: KeyboardActions = KeyboardActions.Default, focusRequester: FocusRequester? = null, + applyInputDesignSystem: Boolean = true, ) { var focused by remember { mutableStateOf(false) } val state = remember(focused, isError, readOnly, enable) { @@ -80,7 +81,12 @@ fun PokitInput( } if (icon?.position == PokitInputIconPosition.LEFT) { - PokitInputIcon(state = state, resourceId = icon.resourceId, onClick = onClickIcon) + PokitInputIcon( + state = state, + resourceId = icon.resourceId, + onClick = onClickIcon, + applyInputDesignSystem = applyInputDesignSystem, + ) Box(modifier = Modifier.width(8.dp)) } @@ -93,7 +99,12 @@ fun PokitInput( } if (icon?.position == PokitInputIconPosition.RIGHT) { - PokitInputIcon(state = state, resourceId = icon.resourceId, onClick = onClickIcon) + PokitInputIcon( + state = state, + resourceId = icon.resourceId, + onClick = onClickIcon, + applyInputDesignSystem = applyInputDesignSystem, + ) } } } diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/subcomponents/icon/PokitInputIcon.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/subcomponents/icon/PokitInputIcon.kt index 0dec8891..f8b2afed 100644 --- a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/subcomponents/icon/PokitInputIcon.kt +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/subcomponents/icon/PokitInputIcon.kt @@ -4,6 +4,7 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.size import androidx.compose.material3.Icon +import androidx.compose.material3.LocalContentColor import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier @@ -17,9 +18,13 @@ import pokitmons.pokit.core.ui.theme.PokitTheme internal fun PokitInputIcon( state: PokitInputState, resourceId: Int, + applyInputDesignSystem: Boolean = true, onClick: (() -> Unit)? = null, ) { - val iconColor = getColor(state = state) + val iconColor = getColor( + state = state, + applyInputDesignSystem = applyInputDesignSystem + ) Icon( painter = painterResource(id = resourceId), @@ -40,11 +45,12 @@ internal fun PokitInputIcon( @Composable private fun getColor( state: PokitInputState, + applyInputDesignSystem: Boolean = true ): Color { return when (state) { PokitInputState.DEFAULT -> PokitTheme.colors.iconSecondary - PokitInputState.INPUT -> PokitTheme.colors.iconPrimary + PokitInputState.INPUT -> if (applyInputDesignSystem) PokitTheme.colors.iconPrimary else PokitTheme.colors.iconSecondary PokitInputState.ACTIVE -> PokitTheme.colors.iconPrimary diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/labeledinput/LabeledInput.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/labeledinput/LabeledInput.kt index da63a258..d80a17b4 100644 --- a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/labeledinput/LabeledInput.kt +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/labeledinput/LabeledInput.kt @@ -40,6 +40,7 @@ fun LabeledInput( enable: Boolean = true, isError: Boolean = false, onClickRemove: () -> Unit = {}, + applyInputDesignSystem: Boolean = true, ) { var focused by remember { mutableStateOf(false) } @@ -71,10 +72,11 @@ fun LabeledInput( text = inputText, hintText = hintText, onChangeText = onChangeText, + applyInputDesignSystem = applyInputDesignSystem, icon = if (inputText.isNotEmpty()) { PokitInputIcon( position = PokitInputIconPosition.RIGHT, - resourceId = R.drawable.icon_24_xs + resourceId = R.drawable.icon_24_xs, ) } else { null diff --git a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt index b112ffaa..9eb987d8 100644 --- a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt +++ b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt @@ -260,6 +260,7 @@ fun AddLinkScreen( hintText = stringResource(id = R.string.placeholder_link), onChangeText = inputUrl, enable = enable, + applyInputDesignSystem = false, onClickRemove = { clearUrl() } @@ -274,6 +275,7 @@ fun AddLinkScreen( hintText = stringResource(id = R.string.placeholder_title), onChangeText = inputTitle, enable = enable, + applyInputDesignSystem = false, onClickRemove = { clearTitle() } From 29f4d5b332dcc5862750b57ec9dd143a4a4868f7 Mon Sep 17 00:00:00 2001 From: jiwon2724 Date: Sat, 7 Dec 2024 15:08:12 +0900 Subject: [PATCH 15/17] =?UTF-8?q?[chore]=20=EC=BD=94=EB=94=A9=20=EC=BB=A8?= =?UTF-8?q?=EB=B2=A4=EC=85=98=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pokit/core/ui/components/atom/input/PokitInput.kt | 4 ++-- .../atom/input/subcomponents/icon/PokitInputIcon.kt | 3 +-- .../core/ui/components/block/labeledinput/LabeledInput.kt | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt index eae619ff..cd424d5d 100644 --- a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt @@ -85,7 +85,7 @@ fun PokitInput( state = state, resourceId = icon.resourceId, onClick = onClickIcon, - applyInputDesignSystem = applyInputDesignSystem, + applyInputDesignSystem = applyInputDesignSystem ) Box(modifier = Modifier.width(8.dp)) } @@ -103,7 +103,7 @@ fun PokitInput( state = state, resourceId = icon.resourceId, onClick = onClickIcon, - applyInputDesignSystem = applyInputDesignSystem, + applyInputDesignSystem = applyInputDesignSystem ) } } diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/subcomponents/icon/PokitInputIcon.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/subcomponents/icon/PokitInputIcon.kt index f8b2afed..6779ff00 100644 --- a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/subcomponents/icon/PokitInputIcon.kt +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/subcomponents/icon/PokitInputIcon.kt @@ -4,7 +4,6 @@ import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.size import androidx.compose.material3.Icon -import androidx.compose.material3.LocalContentColor import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier @@ -45,7 +44,7 @@ internal fun PokitInputIcon( @Composable private fun getColor( state: PokitInputState, - applyInputDesignSystem: Boolean = true + applyInputDesignSystem: Boolean = true, ): Color { return when (state) { PokitInputState.DEFAULT -> PokitTheme.colors.iconSecondary diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/labeledinput/LabeledInput.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/labeledinput/LabeledInput.kt index d80a17b4..22085a0f 100644 --- a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/labeledinput/LabeledInput.kt +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/labeledinput/LabeledInput.kt @@ -76,7 +76,7 @@ fun LabeledInput( icon = if (inputText.isNotEmpty()) { PokitInputIcon( position = PokitInputIconPosition.RIGHT, - resourceId = R.drawable.icon_24_xs, + resourceId = R.drawable.icon_24_xs ) } else { null @@ -88,7 +88,7 @@ fun LabeledInput( }, isError = isError, enable = enable, - readOnly = readOnly, + readOnly = readOnly ) Spacer(modifier = Modifier.height(4.dp)) From f0404bcd647666757181c14d825d6ca213b724b0 Mon Sep 17 00:00:00 2001 From: jiwon2724 Date: Sun, 8 Dec 2024 15:12:00 +0900 Subject: [PATCH 16/17] =?UTF-8?q?[chore]=20=EB=94=94=EC=9E=90=EC=9D=B8=20?= =?UTF-8?q?=EC=8B=9C=EC=8A=A4=ED=85=9C=20=EC=BB=AC=EB=9F=AC=20=EA=B0=92=20?= =?UTF-8?q?=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0=20=EB=A1=A4=EB=B0=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/ui/components/atom/input/PokitInput.kt | 3 --- .../atom/input/subcomponents/icon/PokitInputIcon.kt | 13 +++---------- .../components/block/labeledinput/LabeledInput.kt | 2 -- .../java/com/strayalpaca/addlink/AddLinkScreen.kt | 2 -- 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt index cd424d5d..faa58a87 100644 --- a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt @@ -40,7 +40,6 @@ fun PokitInput( isError: Boolean = false, keyboardActions: KeyboardActions = KeyboardActions.Default, focusRequester: FocusRequester? = null, - applyInputDesignSystem: Boolean = true, ) { var focused by remember { mutableStateOf(false) } val state = remember(focused, isError, readOnly, enable) { @@ -85,7 +84,6 @@ fun PokitInput( state = state, resourceId = icon.resourceId, onClick = onClickIcon, - applyInputDesignSystem = applyInputDesignSystem ) Box(modifier = Modifier.width(8.dp)) } @@ -103,7 +101,6 @@ fun PokitInput( state = state, resourceId = icon.resourceId, onClick = onClickIcon, - applyInputDesignSystem = applyInputDesignSystem ) } } diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/subcomponents/icon/PokitInputIcon.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/subcomponents/icon/PokitInputIcon.kt index 6779ff00..a2c6493b 100644 --- a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/subcomponents/icon/PokitInputIcon.kt +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/subcomponents/icon/PokitInputIcon.kt @@ -17,13 +17,9 @@ import pokitmons.pokit.core.ui.theme.PokitTheme internal fun PokitInputIcon( state: PokitInputState, resourceId: Int, - applyInputDesignSystem: Boolean = true, onClick: (() -> Unit)? = null, ) { - val iconColor = getColor( - state = state, - applyInputDesignSystem = applyInputDesignSystem - ) + val iconColor = getColor(state = state) Icon( painter = painterResource(id = resourceId), @@ -42,14 +38,11 @@ internal fun PokitInputIcon( } @Composable -private fun getColor( - state: PokitInputState, - applyInputDesignSystem: Boolean = true, -): Color { +private fun getColor(state: PokitInputState): Color { return when (state) { PokitInputState.DEFAULT -> PokitTheme.colors.iconSecondary - PokitInputState.INPUT -> if (applyInputDesignSystem) PokitTheme.colors.iconPrimary else PokitTheme.colors.iconSecondary + PokitInputState.INPUT -> PokitTheme.colors.iconPrimary PokitInputState.ACTIVE -> PokitTheme.colors.iconPrimary diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/labeledinput/LabeledInput.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/labeledinput/LabeledInput.kt index 22085a0f..1fb1b01c 100644 --- a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/labeledinput/LabeledInput.kt +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/block/labeledinput/LabeledInput.kt @@ -40,7 +40,6 @@ fun LabeledInput( enable: Boolean = true, isError: Boolean = false, onClickRemove: () -> Unit = {}, - applyInputDesignSystem: Boolean = true, ) { var focused by remember { mutableStateOf(false) } @@ -72,7 +71,6 @@ fun LabeledInput( text = inputText, hintText = hintText, onChangeText = onChangeText, - applyInputDesignSystem = applyInputDesignSystem, icon = if (inputText.isNotEmpty()) { PokitInputIcon( position = PokitInputIconPosition.RIGHT, diff --git a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt index 9eb987d8..b112ffaa 100644 --- a/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt +++ b/feature/addlink/src/main/java/com/strayalpaca/addlink/AddLinkScreen.kt @@ -260,7 +260,6 @@ fun AddLinkScreen( hintText = stringResource(id = R.string.placeholder_link), onChangeText = inputUrl, enable = enable, - applyInputDesignSystem = false, onClickRemove = { clearUrl() } @@ -275,7 +274,6 @@ fun AddLinkScreen( hintText = stringResource(id = R.string.placeholder_title), onChangeText = inputTitle, enable = enable, - applyInputDesignSystem = false, onClickRemove = { clearTitle() } From a78e07643d0c2cecb8dfd8cf59b999f60dc59bb1 Mon Sep 17 00:00:00 2001 From: jiwon2724 Date: Sun, 8 Dec 2024 15:19:07 +0900 Subject: [PATCH 17/17] =?UTF-8?q?[chore]=20=EC=BD=94=EB=94=A9=20=EC=BB=A8?= =?UTF-8?q?=EB=B2=A4=EC=85=98=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pokit/core/ui/components/atom/input/PokitInput.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt index faa58a87..65c50669 100644 --- a/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt +++ b/core/ui/src/main/java/pokitmons/pokit/core/ui/components/atom/input/PokitInput.kt @@ -83,7 +83,7 @@ fun PokitInput( PokitInputIcon( state = state, resourceId = icon.resourceId, - onClick = onClickIcon, + onClick = onClickIcon ) Box(modifier = Modifier.width(8.dp)) } @@ -100,7 +100,7 @@ fun PokitInput( PokitInputIcon( state = state, resourceId = icon.resourceId, - onClick = onClickIcon, + onClick = onClickIcon ) } }