Skip to content

My Folder Screen UI based on QA #1101

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 28, 2026
Merged

My Folder Screen UI based on QA #1101

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
20ac70f
#1064 [QA] Fix folder option drop down menu
yuni-ju Apr 20, 2026
5548b69
#1055 [QA] Fix rounded corner on folder delete dialog
yuni-ju Apr 22, 2026
0f25b05
#1055 [QA] Add spacer in confirm dialog
yuni-ju Apr 22, 2026
163d9e0
#1055 [QA] Add widthIn to confirm dialog
yuni-ju Apr 22, 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
7 changes: 6 additions & 1 deletion presentation/src/main/java/daily/dayo/presentation/screen/folder/FolderScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
Expand Down Expand Up @@ -410,7 +411,8 @@ private fun FolderDropdownMenu(
onDismissRequest = { expanded.value = false },
modifier = Modifier
.background(DayoTheme.colorScheme.background)
.width(140.dp)
.width(140.dp),
shape = RoundedCornerShape(16.dp)
) {
menuItems.forEach {
DropdownMenuItem(
Expand All @@ -436,6 +438,9 @@ private fun FolderDropdownMenu(
it.onClickMenu()
expanded.value = false
},
modifier = Modifier
.padding(horizontal = 4.dp)
.clip(RoundedCornerShape(12.dp)),
contentPadding = PaddingValues(horizontal = 16.dp, vertical = 11.5.dp)
)
}
Expand Down
12 changes: 8 additions & 4 deletions presentation/src/main/java/daily/dayo/presentation/view/dialog/ConfirmDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Text
import androidx.compose.material3.Divider
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
Expand Down Expand Up @@ -44,11 +46,12 @@ fun ConfirmDialog(
) {
Box(
modifier = modifier
.widthIn(min = 252.dp, max = 320.dp)
.background(
DayoTheme.colorScheme.background,
RoundedCornerShape(10.dp)
RoundedCornerShape(16.dp)
)
.clip(RoundedCornerShape(10.dp))
.clip(RoundedCornerShape(16.dp))
) {
Column {
DialogHeader(title, description)
Expand Down Expand Up @@ -87,6 +90,7 @@ private fun DialogHeader(title: String, description: String) {
}

if (description.isNotBlank()) {
Spacer(Modifier.height(8.dp))
Text(
text = description,
color = Gray2_767B83,
Expand Down
Loading