Merge pull request #87 from YAPP-Github/feature/moneymong-305-장부-텍스트-수정

Feature/moneymong 305 장부 텍스트 수정

Author: Heonbyeong

core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/textfield/BaseTextField.kt

@@ -9,6 +9,7 @@ import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.dp
@@ -22,7 +23,7 @@ internal fun MDSBaseTextField(
     modifier: Modifier = Modifier,
     value: TextFieldValue,
     onValueChange: (TextFieldValue) -> Unit,
-    title: String,
+    title: AnnotatedString,
     placeholder: String,
     isFilled: Boolean,
     isError: Boolean = false,

core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/textfield/NumberTextField.kt

@@ -14,6 +14,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
@@ -41,6 +42,38 @@ fun MDSNumberTextField(
     keyboardActions: KeyboardActions = KeyboardActions.Default,
 ) {
 
+    MDSBaseTextField(
+        modifier = modifier,
+        value = value,
+        onValueChange = { original ->
+            onValueChange(original.copy(text = original.text.filter { char -> char.isDigit() }))
+        },
+        title = AnnotatedString(text = title),
+        placeholder = placeholder,
+        isFilled = isFilled,
+        singleLine = singleLine,
+        icon = MDSTextFieldIcons.Clear,
+        onIconClick = onIconClick,
+        visualTransformation = visualTransformation,
+        keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
+        keyboardActions = keyboardActions,
+    )
+}
+
+@Composable
+fun MDSNumberTextField(
+    modifier: Modifier = Modifier,
+    value: TextFieldValue,
+    onValueChange: (TextFieldValue) -> Unit,
+    title: AnnotatedString,
+    placeholder: String,
+    isFilled: Boolean,
+    onIconClick: (() -> Unit),
+    singleLine: Boolean = true,
+    visualTransformation: VisualTransformation = VisualTransformation.None,
+    keyboardActions: KeyboardActions = KeyboardActions.Default,
+) {
+
     MDSBaseTextField(
         modifier = modifier,
         value = value,

core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/textfield/TextField.kt

@@ -12,10 +12,15 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
 import com.moneymong.moneymong.design_system.component.textfield.util.MDSTextFieldIcons
+import com.moneymong.moneymong.design_system.theme.Red03
 
 
 @Composable
@@ -38,6 +43,46 @@ fun MDSTextField(
     keyboardActions: KeyboardActions = KeyboardActions.Default
 ) {
 
+    MDSBaseTextField(
+        modifier = modifier,
+        value = value,
+        onValueChange = onValueChange,
+        title = AnnotatedString(text = title),
+        placeholder = placeholder,
+        isFilled = isFilled,
+        isError = isError,
+        helperText = helperText,
+        maxCount = maxCount,
+        singleLine = singleLine,
+        minLines = minLines,
+        icon = icon,
+        onIconClick = onIconClick,
+        visualTransformation = visualTransformation,
+        keyboardOptions = keyboardOptions,
+        keyboardActions = keyboardActions
+    )
+}
+
+@Composable
+fun MDSTextField(
+    modifier: Modifier = Modifier,
+    value: TextFieldValue,
+    onValueChange: (TextFieldValue) -> Unit,
+    title: AnnotatedString,
+    placeholder: String,
+    isFilled: Boolean,
+    isError: Boolean = false,
+    helperText: String? = null,
+    maxCount: Int? = null,
+    singleLine: Boolean,
+    minLines: Int = 1,
+    icon: MDSTextFieldIcons? = null,
+    onIconClick: (() -> Unit) = {},
+    visualTransformation: VisualTransformation = VisualTransformation.None,
+    keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
+    keyboardActions: KeyboardActions = KeyboardActions.Default
+) {
+
     MDSBaseTextField(
         modifier = modifier,
         value = value,
@@ -78,7 +123,12 @@ fun MDSTextFieldPreview() {
             .onFocusChanged { isFilled = !it.isFocused },
         value = userInput,
         onValueChange = { userInput = it },
-        title = "title",
+        title = buildAnnotatedString {
+            append("title")
+            withStyle(style = SpanStyle(color = Red03)) {
+                append("*")
+            }
+        },
         placeholder = "placeholder",
         isFilled = isFilled,
         isError = isError,

core/design-system/src/main/java/com/moneymong/moneymong/design_system/component/textfield/util/TextFieldContainer.kt

@@ -14,6 +14,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.moneymong.moneymong.design_system.theme.Body2
@@ -24,7 +25,7 @@ import com.moneymong.moneymong.design_system.theme.Caption
 internal fun MDSTextFieldContainer(
     modifier: Modifier = Modifier,
     state: MDSTextFieldState,
-    title: String,
+    title: AnnotatedString,
     count: Int,
     placeholder: String,
     icon: MDSTextFieldIcons?,
@@ -59,7 +60,7 @@ internal fun MDSTextFieldContainer(
 
 @Composable
 private fun MDSTextFieldContainerTop(
-    title: String,
+    title: AnnotatedString,
     state: MDSTextFieldState
 ) {
     Text(

feature/ledgerdetail/src/main/java/com/moneymong/moneymong/ledgerdetail/LedgerDetailScreen.kt

@@ -35,8 +35,11 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -68,6 +71,7 @@ import com.moneymong.moneymong.design_system.theme.Gray03
 import com.moneymong.moneymong.design_system.theme.Gray06
 import com.moneymong.moneymong.design_system.theme.Gray10
 import com.moneymong.moneymong.design_system.theme.MMHorizontalSpacing
+import com.moneymong.moneymong.design_system.theme.Red03
 import com.moneymong.moneymong.design_system.theme.White
 import com.moneymong.moneymong.ledgerdetail.view.LedgerDetailTopbarView
 import org.orbitmvi.orbit.compose.collectAsState
@@ -203,7 +207,12 @@ fun LedgerDetailScreen(
                                 modifier = Modifier.fillMaxWidth(),
                                 value = state.storeNameValue,
                                 onValueChange = viewModel::onChangeStoreNameValue,
-                                title = "수입·지출 출처",
+                                title = buildAnnotatedString {
+                                    append("수입·지출 출처")
+                                    withStyle(SpanStyle(color = Red03)) {
+                                        append("*")
+                                    }
+                                },
                                 placeholder = "",
                                 isFilled = false,
                                 isError = state.isStoreNameError,
@@ -239,7 +248,12 @@ fun LedgerDetailScreen(
                                 modifier = Modifier.fillMaxWidth(),
                                 value = state.totalPriceValue,
                                 onValueChange = viewModel::onChangeTotalPriceValue,
-                                title = "${state.fundTypeText} 금액",
+                                title = buildAnnotatedString {
+                                    append("${state.fundTypeText} 금액")
+                                    withStyle(SpanStyle(color = Red03)) {
+                                        append("*")
+                                    }
+                                },
                                 placeholder = "",
                                 isFilled = false,
                                 isError = state.isTotalPriceError,
@@ -276,7 +290,12 @@ fun LedgerDetailScreen(
                                 modifier = Modifier.fillMaxWidth(),
                                 value = state.paymentDateValue,
                                 onValueChange = viewModel::onChangePaymentDateValue,
-                                title = "날짜",
+                                title = buildAnnotatedString {
+                                    append("날짜")
+                                    withStyle(SpanStyle(color = Red03)) {
+                                        append("*")
+                                    }
+                                },
                                 placeholder = "2024/01/01",
                                 isFilled = false,
                                 isError = state.isPaymentDateError,
@@ -313,7 +332,12 @@ fun LedgerDetailScreen(
                                 modifier = Modifier.fillMaxWidth(),
                                 value = state.paymentTimeValue,
                                 onValueChange = viewModel::onChangePaymentTimeValue,
-                                title = "시간",
+                                title = buildAnnotatedString {
+                                    append("시간")
+                                    withStyle(SpanStyle(color = Red03)) {
+                                        append("*")
+                                    }
+                                },
                                 placeholder = "00:00:00",
                                 isFilled = false,
                                 isError = state.isPaymentTimeError,

feature/ledgermanual/src/main/java/com/moneymong/moneymong/ledgermanual/LedgerManualScreen.kt

@@ -35,7 +35,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.focus.onFocusChanged
@@ -76,6 +75,7 @@ import com.moneymong.moneymong.design_system.theme.Body3
 import com.moneymong.moneymong.design_system.theme.Gray06
 import com.moneymong.moneymong.design_system.theme.Gray10
 import com.moneymong.moneymong.design_system.theme.MMHorizontalSpacing
+import com.moneymong.moneymong.design_system.theme.Red03
 import com.moneymong.moneymong.design_system.theme.White
 import com.moneymong.moneymong.domain.param.ledger.FundType
 import com.moneymong.moneymong.ledgermanual.view.LedgerManualTopbarView
@@ -190,7 +190,12 @@ fun LedgerManualScreen(
                         .onFocusChanged { isStoreNameFilled = !it.isFocused },
                     value = state.storeNameValue,
                     onValueChange = viewModel::onChangeStoreNameValue,
-                    title = "수입·지출 출처",
+                    title = buildAnnotatedString {
+                        append("수입·지출 출처")
+                        withStyle(SpanStyle(color = Red03)) {
+                            append("*")
+                        }
+                    },
                     placeholder = "점포명을 입력해주세요",
                     helperText = "20자 이하로 입력해주세요",
                     maxCount = 20,
@@ -209,7 +214,12 @@ fun LedgerManualScreen(
                         .onFocusChanged { isTotalPriceFilled = !it.isFocused },
                     value = state.totalPriceValue,
                     onValueChange = viewModel::onChangeTotalPriceValue,
-                    title = "금액",
+                    title = buildAnnotatedString {
+                        append("금액")
+                        withStyle(SpanStyle(color = Red03)) {
+                            append("*")
+                        }
+                    },
                     placeholder = "거래 금액을 입력해주세요",
                     helperText = "999,999,999,999원 이하로 입력해주세요",
                     isFilled = isTotalPriceFilled,
@@ -223,7 +233,12 @@ fun LedgerManualScreen(
                 )
                 Spacer(modifier = Modifier.height(24.dp))
                 Text(
-                    text = "거래 유형",
+                    text = buildAnnotatedString {
+                        append("거래 유형")
+                        withStyle(SpanStyle(color = Gray06)) {
+                            append("*")
+                        }
+                    },
                     style = Body2,
                     color = Gray06
                 )
@@ -253,7 +268,12 @@ fun LedgerManualScreen(
                         .onFocusChanged { isPaymentDateFilled = !it.isFocused },
                     value = state.paymentDateValue,
                     onValueChange = viewModel::onChangePaymentDateValue,
-                    title = "날짜",
+                    title = buildAnnotatedString {
+                        append("날짜")
+                        withStyle(SpanStyle(color = Red03)) {
+                            append("*")
+                        }
+                    },
                     placeholder = "YYYY/MM/DD",
                     helperText = "올바른 날짜를 입력해주세요",
                     isFilled = isPaymentDateFilled,
@@ -273,7 +293,12 @@ fun LedgerManualScreen(
                         .onFocusChanged { isPaymentTimeFilled = !it.isFocused },
                     value = state.paymentTimeValue,
                     onValueChange = viewModel::onChangePaymentTimeValue,
-                    title = "시간",
+                    title = buildAnnotatedString {
+                        append("시간")
+                        withStyle(SpanStyle(color = Red03)) {
+                            append("*")
+                        }
+                    },
                     placeholder = "00:00:00 (24시 단위)",
                     helperText = "올바른 시간을 입력해주세요",
                     isFilled = isPaymentTimeFilled,
@@ -287,7 +312,7 @@ fun LedgerManualScreen(
                 )
                 Text(
                     text = buildAnnotatedString {
-                        append("영수증 (선택/최대 12장)\n")
+                        append("영수증 (최대 12장)\n")
                         withStyle(SpanStyle(color = Blue04)) {
                             append("*지출일 경우 영수증을 꼭 제출해주세요")
                         }
@@ -356,7 +381,7 @@ fun LedgerManualScreen(
                 }
                 Spacer(modifier = Modifier.height(24.dp))
                 Text(
-                    text = "증빙 자료 (선택/최대 12장)",
+                    text = "증빙 자료 (최대 12장)",
                     style = Body2,
                     color = Gray06
                 )
@@ -427,7 +452,7 @@ fun LedgerManualScreen(
                         .onFocusChanged { isMemoFilled = !it.isFocused },
                     value = state.memoValue,
                     onValueChange = viewModel::onChangeMemoValue,
-                    title = "메모 (선택)",
+                    title = "메모",
                     placeholder = "메모할 내용을 입력하세요",
                     helperText = "300자 이하로 입력해주세요",
                     maxCount = 300,