Merge pull request #264 from Project-Unifest/fix/bug-fix-for-release

[style] 업데이트 전 UI 관련 디테일 수정
Project-Unifest · Sep 27, 2024 · f5e3967 · f5e3967
2 parents f73fcaa + 88fa08f
commit f5e3967
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/core/ui/src/main/kotlin/com/unifest/android/core/ui/component/WaitingDialog.kt b/core/ui/src/main/kotlin/com/unifest/android/core/ui/component/WaitingDialog.kt
@@ -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
@@ -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))
@@ -180,7 +181,7 @@ fun WaitingPinDialog(
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
 @Composable
 fun WaitingDialog(
     boothName: String,
@@ -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(

diff --git a/feature/festival/src/main/kotlin/com/unifest/android/feature/festival/FestivalBottomSheet.kt b/feature/festival/src/main/kotlin/com/unifest/android/feature/festival/FestivalBottomSheet.kt
@@ -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
@@ -68,7 +67,7 @@ fun FestivalSearchBottomSheet(
 //    )
     val bottomSheetState = rememberModalBottomSheetState(
         skipPartiallyExpanded = true,
-        confirmValueChange = { it != SheetValue.Hidden },
+        // confirmValueChange = { it != SheetValue.Hidden },
     )
 
     ModalBottomSheet(
@@ -98,7 +97,6 @@ fun FestivalSearchBottomSheet(
         windowInsets = WindowInsets(top = 0),
         modifier = Modifier
             .fillMaxHeight()
-            .background(MaterialTheme.colorScheme.surface)
             .padding(top = 18.dp),
     ) {
         Column(