Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ fun HilingualBasicBottomSheet(
),
properties: ModalBottomSheetProperties = ModalBottomSheetProperties(),
isDimEnabled: Boolean = true,
sheetGesturesEnabled: Boolean = true,
dragHandle: (@Composable () -> Unit)? = null,
content: @Composable () -> Unit
) {
Expand All @@ -59,6 +60,7 @@ fun HilingualBasicBottomSheet(
scrimColor = if (isDimEnabled) HilingualTheme.colors.dim1 else Color.Transparent,
shape = RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp),
dragHandle = dragHandle,
sheetGesturesEnabled = sheetGesturesEnabled,
properties = properties
) {
content()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ fun TwoButtonDialog(
Text(
text = description,
style = HilingualTheme.typography.bodyR14,
color = HilingualTheme.colors.gray400,
color = HilingualTheme.colors.gray500,
maxLines = 2,
textAlign = TextAlign.Center
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ import com.skydoves.balloon.compose.balloon
import com.skydoves.balloon.compose.rememberBalloonBuilder
import com.skydoves.balloon.compose.rememberBalloonState
import com.skydoves.balloon.compose.setBackgroundColor
import kotlinx.collections.immutable.persistentListOf
import kotlinx.coroutines.delay
import java.io.File
import java.time.LocalDate
import kotlinx.collections.immutable.persistentListOf
import kotlinx.coroutines.delay
import com.hilingual.core.designsystem.R as DesignSystemR

@Composable
Expand Down Expand Up @@ -486,25 +486,36 @@ private fun DiaryWriteScreen(

val balloonState = rememberBalloonState(balloonBuilder)

HilingualButton(
Column(
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier
.align(Alignment.BottomCenter)
.fillMaxWidth()
.padding(horizontal = 16.dp)
.padding(bottom = 16.dp)
.navigationBarsPadding()
.balloon(
state = balloonState,
balloonContent = {
WriteGuideTooltip(
text = "10자 이상 작성해야 피드백 요청이 가능해요!"
)
}
),
text = "피드백 요청하기",
enableProvider = { diaryText.length >= 10 },
onClick = onDiaryFeedbackRequestButtonClick
)
) {
Text(
text = "피드백을 요청한 일기는 수정이 불가능해요.",
style = HilingualTheme.typography.bodyM14,
color = HilingualTheme.colors.gray400
)

HilingualButton(
modifier = Modifier
.fillMaxWidth()
.padding(16.dp)
.balloon(
state = balloonState,
balloonContent = {
WriteGuideTooltip(
text = "10자 이상 작성해야 피드백 요청이 가능해요!"
)
}
),
text = "피드백 요청하기",
enableProvider = { diaryText.length >= 10 },
onClick = onDiaryFeedbackRequestButtonClick
)
}

LaunchedEffect(Unit) {
balloonState.showAlignTop()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ internal fun HomeOnboardingBottomSheet(
shouldDismissOnClickOutside = false
),
isDimEnabled = true,
sheetGesturesEnabled = false,
modifier = modifier
) {
Box(
Expand Down