Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX/#163] imePadding 키보드 이슈 해결 #181

Merged
merged 4 commits into from
Jan 24, 2025
Merged

[FIX/#163] imePadding 키보드 이슈 해결 #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19f0512
[FIX/#163] imePadding 버그 수정
angryPodo Jan 24, 2025
6acb287
[FEAT/#163] 키보드 패딩 익스텐션 추가
angryPodo Jan 24, 2025
6eb0b42
Merge remote-tracking branch 'origin/develop' into fix/#163-register-…
angryPodo Jan 24, 2025
4d5cb7f
[MOD/#163] 익스텐션 네이밍 변경
angryPodo Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions app/src/main/java/com/spoony/spoony/core/util/extension/ModifierExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,14 @@ package com.spoony.spoony.core.util.extension
import androidx.compose.foundation.clickable
import androidx.compose.foundation.gestures.detectTapGestures
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.imePadding
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.composed
import androidx.compose.ui.draw.drawWithContent
Expand All @@ -17,7 +23,12 @@ import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Path
import androidx.compose.ui.graphics.drawscope.clipPath
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.layout.findRootCoordinates
import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.layout.positionInWindow
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.spoony.spoony.core.designsystem.theme.black
import com.spoony.spoony.core.designsystem.theme.gray500

Expand Down Expand Up @@ -66,3 +77,15 @@ fun Modifier.spoonyGradient(
drawContent()
}
}

fun Modifier.advancedImePadding() = composed {
var consumePadding by remember { mutableStateOf(0) }
onGloballyPositioned { coordinates ->
val rootCoordinate = coordinates.findRootCoordinates()
val bottom = coordinates.positionInWindow().y + coordinates.size.height

consumePadding = (rootCoordinate.size.height - bottom).toInt()
}
.consumeWindowInsets(PaddingValues(bottom = (consumePadding / LocalDensity.current.density).dp))
.imePadding()
}
Comment on lines +81 to +91
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

개쩌네요
공부하고 쇽샥해가겠습니다 ㅋㅋ

10 changes: 4 additions & 6 deletions app/src/main/java/com/spoony/spoony/presentation/register/RegisterStepOneScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.defaultMinSize
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
Expand Down Expand Up @@ -34,6 +33,7 @@ import com.spoony.spoony.core.designsystem.component.textfield.SpoonyIconButtonT
import com.spoony.spoony.core.designsystem.component.textfield.SpoonySearchTextField
import com.spoony.spoony.core.designsystem.theme.SpoonyAndroidTheme
import com.spoony.spoony.core.util.extension.addFocusCleaner
import com.spoony.spoony.core.util.extension.advancedImePadding
import com.spoony.spoony.presentation.register.RegisterViewModel.Companion.MAX_MENU_COUNT
import com.spoony.spoony.presentation.register.component.AddMenuButton
import com.spoony.spoony.presentation.register.component.CustomDropDownMenu
Expand Down Expand Up @@ -70,6 +70,7 @@ fun RegisterStepOneScreen(
modifier = modifier
.fillMaxSize()
.addFocusCleaner(focusManager)
.advancedImePadding()
.verticalScroll(rememberScrollState())
.padding(top = 22.dp, bottom = 17.dp)
) {
Expand Down Expand Up @@ -112,11 +113,8 @@ fun RegisterStepOneScreen(
onMenuAdd = viewModel::addMenu
)

Spacer(
modifier = Modifier
.weight(1f)
.defaultMinSize(37.dp)
)
Spacer(modifier = Modifier.weight(1f))
Spacer(modifier = Modifier.height(20.dp))

NextButton(
enabled = isNextButtonEnabled,
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/spoony/spoony/presentation/register/component/RegisterTooltip.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ fun RegisterTooltip(
imageVector = ImageVector.vectorResource(id = R.drawable.ic_register_tooltip_arrow),
contentDescription = null,
tint = Color.Unspecified,
modifier = Modifier.offset(y = (-5).dp).padding(end = 8.dp)
modifier = Modifier.offset(y = (-5).dp).padding(end = 12.dp)
)
}
}
Loading