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

Jump to bottom

[style] 업데이트 전 UI 관련 디테일 수정 #264

Merged
merged 4 commits into from
Sep 27, 2024
Merged

[style] 업데이트 전 UI 관련 디테일 수정 #264

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
802a164
[fix] 웨이팅 다이얼로그 에러 문구가 짤리는 문제 해결
easyhooon Sep 26, 2024
dce2b62
[fix] 웨이팅 다이얼로그 동의 안내 문구 의도치 않게 개행되는 이슈 해결
easyhooon Sep 26, 2024
b225717
[style] festivalBottomSheet 뒤에 영역이 보이도록, dragHandle 을 잡고 내리면 닫히도록 롤백
easyhooon Sep 27, 2024
88fa08f
[chore] style check success
easyhooon Sep 27, 2024
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
9 changes: 5 additions & 4 deletions core/ui/src/main/kotlin/com/unifest/android/core/ui/component/WaitingDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ 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.ExperimentalLayoutApi
import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
Expand Down Expand Up @@ -139,7 +141,6 @@ fun WaitingPinDialog(
Spacer(modifier = Modifier.height(10.dp))
AnimatedContent(targetState = isWrongPinInserted) { isWrongPinInserted ->
Row(
modifier = Modifier.height(24.dp),
verticalAlignment = Alignment.CenterVertically,
) {
Spacer(modifier = Modifier.width(14.dp))
Expand Down Expand Up @@ -180,7 +181,7 @@ fun WaitingPinDialog(
}
}

@OptIn(ExperimentalMaterial3Api::class)
@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
@Composable
fun WaitingDialog(
boothName: String,
Expand Down Expand Up @@ -314,8 +315,8 @@ fun WaitingDialog(
horizontalAlignment = Alignment.Start,
modifier = Modifier.padding(horizontal = 16.dp),
) {
Row(
verticalAlignment = Alignment.CenterVertically,
FlowRow(
verticalArrangement = Arrangement.Center,
modifier = Modifier.fillMaxWidth(),
) {
Icon(
Expand Down
4 changes: 1 addition & 3 deletions feature/festival/src/main/kotlin/com/unifest/android/feature/festival/FestivalBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.ModalBottomSheet
import androidx.compose.material3.SheetValue
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.material3.rememberModalBottomSheetState
Expand Down Expand Up @@ -68,7 +67,7 @@ fun FestivalSearchBottomSheet(
// )
val bottomSheetState = rememberModalBottomSheetState(
skipPartiallyExpanded = true,
confirmValueChange = { it != SheetValue.Hidden },
// confirmValueChange = { it != SheetValue.Hidden },
)

ModalBottomSheet(
Expand Down Expand Up @@ -98,7 +97,6 @@ fun FestivalSearchBottomSheet(
windowInsets = WindowInsets(top = 0),
modifier = Modifier
.fillMaxHeight()
.background(MaterialTheme.colorScheme.surface)
.padding(top = 18.dp),
) {
Column(
Expand Down
Loading