Skip to content

Disable folder creation button at folder limit #670

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 1 commit into from
Jun 2, 2025
Merged

Disable folder creation button at folder limit #670

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 23 additions & 7 deletions presentation/src/main/java/daily/dayo/presentation/screen/mypage/MyPageScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,14 @@ import daily.dayo.presentation.BuildConfig
import daily.dayo.presentation.R
import daily.dayo.presentation.common.Status
import daily.dayo.presentation.common.extension.clickableSingle
import daily.dayo.presentation.screen.write.MAX_FOLDER_COUNT
import daily.dayo.presentation.theme.Dark
import daily.dayo.presentation.theme.DayoTheme
import daily.dayo.presentation.theme.Gray1_50545B
import daily.dayo.presentation.theme.Gray2_767B83
import daily.dayo.presentation.theme.Gray4_C5CAD2
import daily.dayo.presentation.theme.Gray6_F0F1F3
import daily.dayo.presentation.theme.Gray7_F6F6F7
import daily.dayo.presentation.theme.PrimaryL3_F2FBF7
import daily.dayo.presentation.theme.Primary_23C882
import daily.dayo.presentation.theme.White_FFFFFF
Expand Down Expand Up @@ -105,7 +107,10 @@ fun MyPageScreen(
}

item(span = { GridItemSpan(2) }) {
MyPageDiaryHeader(onFolderCreateClick)
MyPageDiaryHeader(
isCreateFolderEnabled = folderList.value?.data?.size?.let { it < MAX_FOLDER_COUNT } ?: false,
onFolderCreateClick = onFolderCreateClick
)
}

when (folderList.value?.status) {
Expand Down Expand Up @@ -296,10 +301,12 @@ private fun MyPageMenu(

@Composable
private fun MyPageDiaryHeader(
isCreateFolderEnabled: Boolean,
onFolderCreateClick: () -> Unit
) {
Row(
modifier = Modifier
.background(color = DayoTheme.colorScheme.background)
.fillMaxWidth()
.padding(bottom = 12.dp),
horizontalArrangement = Arrangement.SpaceBetween,
Expand All @@ -310,24 +317,30 @@ private fun MyPageDiaryHeader(
style = DayoTheme.typography.b3.copy(Dark)
)

// 새 폴더 생성 버튼
Button(
onClick = onFolderCreateClick,
colors = ButtonDefaults.buttonColors(
containerColor = PrimaryL3_F2FBF7,
contentColor = Primary_23C882
contentColor = Primary_23C882,
disabledContainerColor = Gray7_F6F6F7,
disabledContentColor = Gray4_C5CAD2
),
shape = RoundedCornerShape(8.dp),
contentPadding = PaddingValues(8.dp),
modifier = Modifier.wrapContentSize()
modifier = Modifier.wrapContentSize(),
enabled = isCreateFolderEnabled
) {
Icon(
Icons.Filled.Add,
stringResource(id = R.string.my_profile_new_folder)
imageVector = Icons.Filled.Add,
contentDescription = stringResource(id = R.string.my_profile_new_folder)
)
Spacer(modifier = Modifier.width(4.dp))
Text(
text = stringResource(id = R.string.my_profile_new_folder),
style = DayoTheme.typography.b6.copy(Primary_23C882)
style = DayoTheme.typography.b6.copy(
if (isCreateFolderEnabled) Primary_23C882 else Gray4_C5CAD2
)
Comment on lines +341 to +343
Copy link
Copy Markdown
Member

@DongJun-H DongJun-H Jun 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이건 저도 혼용하고 있는 부분인데요,
Text 컴포넌트에 style을 적용하고 copy해서 color를 적용하는것과
style을 적용하고 color를 따로 적용하는 것의 차이점이 있을까요?

Copy link
Copy Markdown
Member Author

@yuni-ju yuni-ju Jun 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

저도 혼용하고 있습니다.. ㅎㅎ 스타일 파라미터 하나로 모든 디자인 요소를 설정할 수 있어서 사용했던 것 같아요

)
}
}
Expand Down Expand Up @@ -394,7 +407,10 @@ private fun PreviewMyPageMenu() {
@Preview
@Composable
private fun PreviewMyPageDiaryHeader() {
MyPageDiaryHeader({})
Column {
MyPageDiaryHeader(isCreateFolderEnabled = true, onFolderCreateClick = {})
MyPageDiaryHeader(isCreateFolderEnabled = false, onFolderCreateClick = {})
}
}

private const val FOLLOWER = 0
Expand Down