From 0567c3c94311aabb2a601a5daa6e5c34183cfe1e Mon Sep 17 00:00:00 2001 From: jinuemong Date: Wed, 7 Feb 2024 02:13:15 +0900 Subject: [PATCH] =?UTF-8?q?[Fix]:=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/view/textfield/TypingPriceField.kt | 13 ++--------- .../model/history/HistoryTagType.kt | 2 +- .../detail/HistoryDetailDestination.kt | 1 - .../HistoryDetailInformationScreen.kt | 23 ------------------- 4 files changed, 3 insertions(+), 36 deletions(-) diff --git a/presentation/src/main/kotlin/ac/dnd/bookkeeping/android/presentation/common/view/textfield/TypingPriceField.kt b/presentation/src/main/kotlin/ac/dnd/bookkeeping/android/presentation/common/view/textfield/TypingPriceField.kt index 5166151d..0d700616 100644 --- a/presentation/src/main/kotlin/ac/dnd/bookkeeping/android/presentation/common/view/textfield/TypingPriceField.kt +++ b/presentation/src/main/kotlin/ac/dnd/bookkeeping/android/presentation/common/view/textfield/TypingPriceField.kt @@ -1,9 +1,6 @@ package ac.dnd.bookkeeping.android.presentation.common.view.textfield -import ac.dnd.bookkeeping.android.presentation.R -import ac.dnd.bookkeeping.android.presentation.common.theme.Body1 import ac.dnd.bookkeeping.android.presentation.common.theme.Gray500 -import ac.dnd.bookkeeping.android.presentation.common.theme.Gray700 import ac.dnd.bookkeeping.android.presentation.common.theme.Gray800 import ac.dnd.bookkeeping.android.presentation.common.theme.Headline3 import ac.dnd.bookkeeping.android.presentation.common.theme.Negative @@ -11,18 +8,14 @@ import ac.dnd.bookkeeping.android.presentation.common.theme.Primary3 import ac.dnd.bookkeeping.android.presentation.common.util.expansion.NumberCommaTransformation import ac.dnd.bookkeeping.android.presentation.common.view.component.FieldSubject import androidx.compose.animation.animateColorAsState -import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.interaction.MutableInteractionSource -import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues -import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.width import androidx.compose.foundation.text.BasicTextField import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.Divider @@ -35,12 +28,10 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue -import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.focus.onFocusChanged import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.TextRange import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.KeyboardType @@ -59,11 +50,11 @@ fun TypingPriceField( hintText: String = "지출하신 금액을 입력해주세요", isError: Boolean = false, isEnabled: Boolean = true, - isAddFiledEnabled : Boolean = true , + isAddFiledEnabled: Boolean = true, innerPadding: PaddingValues = PaddingValues(0.dp), textFieldHeight: Dp = 35.dp, keyboardOptions: KeyboardOptions = KeyboardOptions(keyboardType = KeyboardType.NumberPassword), - textFormat : VisualTransformation = NumberCommaTransformation(), + textFormat: VisualTransformation = NumberCommaTransformation(), fieldSubjectContent: (@Composable () -> Unit) = { FieldSubject("금액") }, leadingIconContent: (@Composable () -> Unit)? = null, trailingIconContent: (@Composable () -> Unit)? = null, diff --git a/presentation/src/main/kotlin/ac/dnd/bookkeeping/android/presentation/model/history/HistoryTagType.kt b/presentation/src/main/kotlin/ac/dnd/bookkeeping/android/presentation/model/history/HistoryTagType.kt index 56eb2ff9..14553dbe 100644 --- a/presentation/src/main/kotlin/ac/dnd/bookkeeping/android/presentation/model/history/HistoryTagType.kt +++ b/presentation/src/main/kotlin/ac/dnd/bookkeeping/android/presentation/model/history/HistoryTagType.kt @@ -21,7 +21,7 @@ enum class HistoryTagType( } } - fun getTagIdList(nameList: List): List{ + fun getTagIdList(nameList: List): List { return entries.filter { it.tagName in nameList }.map { diff --git a/presentation/src/main/kotlin/ac/dnd/bookkeeping/android/presentation/ui/main/home/history/detail/HistoryDetailDestination.kt b/presentation/src/main/kotlin/ac/dnd/bookkeeping/android/presentation/ui/main/home/history/detail/HistoryDetailDestination.kt index 2b963f3e..19a56c95 100644 --- a/presentation/src/main/kotlin/ac/dnd/bookkeeping/android/presentation/ui/main/home/history/detail/HistoryDetailDestination.kt +++ b/presentation/src/main/kotlin/ac/dnd/bookkeeping/android/presentation/ui/main/home/history/detail/HistoryDetailDestination.kt @@ -3,7 +3,6 @@ package ac.dnd.bookkeeping.android.presentation.ui.main.home.history.detail import ac.dnd.bookkeeping.android.presentation.common.util.ErrorObserver import ac.dnd.bookkeeping.android.presentation.ui.main.ApplicationState import androidx.compose.runtime.getValue -import androidx.compose.runtime.remember import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavGraphBuilder diff --git a/presentation/src/main/kotlin/ac/dnd/bookkeeping/android/presentation/ui/main/home/history/detail/information/HistoryDetailInformationScreen.kt b/presentation/src/main/kotlin/ac/dnd/bookkeeping/android/presentation/ui/main/home/history/detail/information/HistoryDetailInformationScreen.kt index 39c7a63e..85234d0d 100644 --- a/presentation/src/main/kotlin/ac/dnd/bookkeeping/android/presentation/ui/main/home/history/detail/information/HistoryDetailInformationScreen.kt +++ b/presentation/src/main/kotlin/ac/dnd/bookkeeping/android/presentation/ui/main/home/history/detail/information/HistoryDetailInformationScreen.kt @@ -1,38 +1,22 @@ package ac.dnd.bookkeeping.android.presentation.ui.main.home.history.detail.information -import ac.dnd.bookkeeping.android.presentation.R -import ac.dnd.bookkeeping.android.presentation.common.theme.Gray000 import ac.dnd.bookkeeping.android.presentation.common.theme.Gray200 -import ac.dnd.bookkeeping.android.presentation.common.theme.Gray800 import ac.dnd.bookkeeping.android.presentation.common.theme.Headline2 -import ac.dnd.bookkeeping.android.presentation.common.theme.Space20 -import ac.dnd.bookkeeping.android.presentation.common.theme.Space24 -import ac.dnd.bookkeeping.android.presentation.common.theme.Space8 import ac.dnd.bookkeeping.android.presentation.common.util.ErrorObserver import ac.dnd.bookkeeping.android.presentation.common.util.LaunchedEffectWithLifecycle import ac.dnd.bookkeeping.android.presentation.common.util.coroutine.event.EventFlow import ac.dnd.bookkeeping.android.presentation.common.util.coroutine.event.MutableEventFlow import ac.dnd.bookkeeping.android.presentation.common.util.coroutine.event.eventObserve import ac.dnd.bookkeeping.android.presentation.common.view.BottomSheetScreen -import ac.dnd.bookkeeping.android.presentation.common.view.chip.ChipItem -import ac.dnd.bookkeeping.android.presentation.common.view.chip.ChipType -import ac.dnd.bookkeeping.android.presentation.common.view.component.FieldSelectComponent -import ac.dnd.bookkeeping.android.presentation.common.view.component.FieldSubject import ac.dnd.bookkeeping.android.presentation.common.view.confirm.ConfirmButton import ac.dnd.bookkeeping.android.presentation.common.view.confirm.ConfirmButtonProperties import ac.dnd.bookkeeping.android.presentation.common.view.confirm.ConfirmButtonSize import ac.dnd.bookkeeping.android.presentation.common.view.confirm.ConfirmButtonType -import ac.dnd.bookkeeping.android.presentation.common.view.textfield.TypingPriceField -import ac.dnd.bookkeeping.android.presentation.model.history.HistoryTagType import ac.dnd.bookkeeping.android.presentation.ui.main.ApplicationState import ac.dnd.bookkeeping.android.presentation.ui.main.rememberApplicationState -import androidx.compose.foundation.Image 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.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height @@ -41,15 +25,8 @@ import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateListOf -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.rememberCoroutineScope -import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel