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

[MOD/#205] 등록화면 다음버튼 과 imePadding을 수정합니다. #206

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
+8 −8
Open

[MOD/#205] 등록화면 다음버튼 과 imePadding을 수정합니다. #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0fa99ad
[MOD/#205] Fix Next button min padding
angryPodo Feb 25, 2025
633fdf6
[ADD/#205] Add imePadding method
angryPodo Feb 25, 2025
6de402b
[DEL/#205] import 제거
angryPodo Feb 25, 2025
3f729b4
[DEL/#205] CODEOWNERS 추가
angryPodo Feb 25, 2025
44ec03b
[MOD/#205] TextOverFlow 범위 설정
angryPodo Feb 25, 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
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Spoony Android
* @SOPT-all/35-APPJAM-ANDROID-SPOONY
* @spooooony/android-spoony
10 changes: 4 additions & 6 deletions app/src/main/java/com/spoony/spoony/presentation/register/RegisterStepTwoScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.defaultMinSize
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
Expand Down Expand Up @@ -38,6 +37,7 @@ import com.spoony.spoony.core.designsystem.component.textfield.SpoonyLineTextFie
import com.spoony.spoony.core.designsystem.theme.SpoonyAndroidTheme
import com.spoony.spoony.core.designsystem.type.ButtonStyle
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_DETAIL_REVIEW_LENGTH
import com.spoony.spoony.presentation.register.RegisterViewModel.Companion.MAX_ONE_LINE_REVIEW_LENGTH
import com.spoony.spoony.presentation.register.RegisterViewModel.Companion.MIN_DETAIL_REVIEW_LENGTH
Expand Down Expand Up @@ -72,6 +72,7 @@ fun RegisterStepTwoScreen(
modifier = modifier
.fillMaxSize()
.addFocusCleaner(focusManager)
.advancedImePadding()
.verticalScroll(rememberScrollState())
.padding(top = 22.dp, bottom = 17.dp, start = 20.dp, end = 20.dp)
) {
Expand All @@ -98,11 +99,8 @@ fun RegisterStepTwoScreen(
onPhotosSelected = viewModel::updatePhotos
)

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

NextButton(
enabled = isNextButtonEnabled,
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/spoony/spoony/presentation/register/component/SearchResultItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ fun SearchResultItem(
Row(
verticalAlignment = Alignment.Top,
horizontalArrangement = Arrangement.Start,
modifier = Modifier.padding(vertical = 10.dp)
modifier = Modifier
.padding(vertical = 10.dp)
.weight(1f)
) {
Icon(
imageVector = ImageVector.vectorResource(id = R.drawable.ic_pin_24),
Expand Down