Skip to content

Update Bottom sheet style #1102

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

Merged
yuni-ju merged 4 commits into from
Apr 29, 2026
Merged

Update Bottom sheet style #1102

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
9bdf9a5
#1062 [QA] Remove bottom sheet style
yuni-ju Apr 27, 2026
a04a174
#1062 [QA] Add bottom sheet menu height
yuni-ju Apr 27, 2026
8c52bd0
[QA] Replace height with heightIn
yuni-ju Apr 28, 2026
f8f6770
[QA] Fix rounded corner shape
yuni-ju Apr 28, 2026
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
10 changes: 6 additions & 4 deletions presentation/src/main/java/daily/dayo/presentation/view/dialog/BottomSheetDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.wrapContentHeight
Expand Down Expand Up @@ -68,7 +69,7 @@ fun BottomSheetDialog(
modifier = Modifier
.fillMaxWidth()
.wrapContentHeight(),
shape = RoundedCornerShape(12.dp, 12.dp, 0.dp, 0.dp),
shape = RoundedCornerShape(20.dp, 20.dp, 0.dp, 0.dp),
Comment thread
yuni-ju marked this conversation as resolved.
color = White_FFFFFF
Comment thread
coderabbitai[bot] marked this conversation as resolved.
) {
Column(
Expand Down Expand Up @@ -160,21 +161,22 @@ fun BottomSheetDialog(
Row(
modifier = Modifier
.fillMaxWidth()
.wrapContentHeight()
.heightIn(min = 56.dp)
.background(
if (isPressed) Gray6_F0F1F3 else White_FFFFFF,
RoundedCornerShape(12.dp, 12.dp, 0.dp, 0.dp)
RoundedCornerShape(20.dp, 20.dp, 0.dp, 0.dp)
)
.padding(16.dp)
.clickable(
onClick = button.second,
interactionSource = interactionSource,
indication = null
),
horizontalArrangement = Arrangement.Center,
verticalAlignment = Alignment.CenterVertically
) {
Text(
text = button.first,
textAlign = TextAlign.Center,
Comment thread
coderabbitai[bot] marked this conversation as resolved.
color = if ((isFirstButtonColored && index == 0) || (checkedButtonIndex == index)) checkedColor else normalColor,
fontSize = 16.sp,
style = DayoTheme.typography.b4
Expand Down
8 changes: 0 additions & 8 deletions presentation/src/main/res/drawable/dialog_bottom_sheet_default.xml
View file
Open in desktop

This file was deleted.

12 changes: 1 addition & 11 deletions presentation/src/main/res/values-night/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,11 @@
<!-- Status bar color. -->
<item name="android:statusBarColor" tools:targetApi="l">#FFFFFFFF</item>
<item name="android:windowLightStatusBar" tools:targetApi="1">true</item>
<!-- Customize your theme here. -->
<item name="bottomSheetDialogTheme">@style/AppBottomSheetDialogTheme</item>
</style>
<style name="Theme.DAYO.Splash" parent="Theme.SplashScreen">
<item name="windowSplashScreenBackground">#FFFFFFFF</item>
<item name="windowSplashScreenAnimatedIcon">@drawable/ic_dayo_logo_splash</item>
<item name="postSplashScreenTheme">@style/Theme.DAYO</item>
</style>

<style name="AppBottomSheetDialogTheme"
parent="Theme.Design.Light.BottomSheetDialog">
<item name="bottomSheetStyle">@style/AppModalStyle</item>
</style>

<style name="AppModalStyle" parent="Widget.Design.BottomSheet.Modal">
<item name="android:background">@drawable/dialog_bottom_sheet_default</item>
</style>
</resources>
</resources>
14 changes: 1 addition & 13 deletions presentation/src/main/res/values/themes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,11 @@
<!-- Status bar color. -->
<item name="android:statusBarColor" tools:targetApi="l">#FFFFFFFF</item>
<item name="android:windowLightStatusBar" tools:targetApi="1">true</item>
<!-- Customize your theme here. -->
<item name="bottomSheetDialogTheme">@style/AppBottomSheetDialogTheme</item>
</style>
<style name="Theme.DAYO.Splash" parent="Theme.SplashScreen">
<item name="windowSplashScreenBackground">#FFFFFFFF</item>
<item name="windowSplashScreenAnimatedIcon">@drawable/ic_dayo_logo_splash</item>
<item name="postSplashScreenTheme">@style/Theme.DAYO</item>
</style>

<style name="AppBottomSheetDialogTheme"
parent="Theme.Design.Light.BottomSheetDialog">
<item name="bottomSheetStyle">@style/AppModalStyle</item>
</style>

<style name="AppModalStyle"
parent="Widget.Design.BottomSheet.Modal">
<item name="android:background">@drawable/dialog_bottom_sheet_default</item>
</style>

</resources>
</resources>
Loading