release-1.0.0 fix: moneymong-261 이슈 대응

MONEYMONG · Feb 5, 2024 · cd5bf2a · cd5bf2a
1 parent ffb46ca
commit cd5bf2a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/...ure/ledgermanual/src/main/java/com/moneymong/moneymong/ledgermanual/LedgerManualScreen.kt b/...ure/ledgermanual/src/main/java/com/moneymong/moneymong/ledgermanual/LedgerManualScreen.kt
@@ -7,6 +7,7 @@ import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
+import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -39,10 +40,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
-import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
@@ -81,7 +82,7 @@ import com.moneymong.moneymong.ledgermanual.view.LedgerManualTopbarView
 import org.orbitmvi.orbit.compose.collectAsState
 import org.orbitmvi.orbit.compose.collectSideEffect
 
-@OptIn(ExperimentalGlideComposeApi::class, ExperimentalComposeUiApi::class)
+@OptIn(ExperimentalGlideComposeApi::class)
 @Composable
 fun LedgerManualScreen(
     modifier: Modifier = Modifier,
@@ -93,7 +94,6 @@ fun LedgerManualScreen(
     val state = viewModel.collectAsState().value
     val verticalScrollState = rememberScrollState()
     val focusManager = LocalFocusManager.current
-    val keyboardController = LocalSoftwareKeyboardController.current
     val singlePhotoPickerLauncher = rememberLauncherForActivityResult(
         contract = ActivityResultContracts.PickVisualMedia(),
         onResult = { uri ->
@@ -131,11 +131,6 @@ fun LedgerManualScreen(
             is LedgerManualSideEffect.LedgerManualPostTransaction -> {
                 viewModel.postLedgerTransaction()
             }
-
-            is LedgerManualSideEffect.LedgerManualHideKeyboard -> {
-                keyboardController?.hide()
-                focusManager.clearFocus()
-            }
         }
     }
 
@@ -177,10 +172,10 @@ fun LedgerManualScreen(
                 .fillMaxSize()
                 .verticalScroll(verticalScrollState)
                 .background(White)
-                .padding(it)
-                .noRippleClickable {
-                    viewModel.eventEmit(LedgerManualSideEffect.LedgerManualHideKeyboard)
+                .pointerInput(key1 = Unit) {
+                    detectTapGestures(onTap = { focusManager.clearFocus() })
                 }
+                .padding(it)
         ) {
             Spacer(modifier = Modifier.height(12.dp))
             Column(
@@ -439,8 +434,6 @@ fun LedgerManualScreen(
                     singleLine = false,
                     isFilled = isMemoFilled,
                     isError = state.isMemoError,
-                    onIconClick = { viewModel.onChangeMemoValue(TextFieldValue()) },
-                    icon = MDSTextFieldIcons.Clear,
                     keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() })
                 )
                 Spacer(modifier = Modifier.height(28.dp))

diff --git a/...ledgermanual/src/main/java/com/moneymong/moneymong/ledgermanual/LedgerManualSideEffect.kt b/...ledgermanual/src/main/java/com/moneymong/moneymong/ledgermanual/LedgerManualSideEffect.kt
@@ -8,6 +8,5 @@ sealed class LedgerManualSideEffect : SideEffect {
     data object LedgerManualNavigateToLedger : LedgerManualSideEffect()
     data object LedgerManualShowPopBackStackModal : LedgerManualSideEffect()
     data object LedgerManualPostTransaction : LedgerManualSideEffect()
-    data object LedgerManualHideKeyboard : LedgerManualSideEffect()
     data class LegerManualHidePopBackStackModal(val navigate: Boolean): LedgerManualSideEffect()
 }