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
9 changes: 0 additions & 9 deletions .claude/settings.local.json

This file was deleted.

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ render.experimental.xml
# Google Services (e.g. APIs or Firebase)
google-services.json

# Claude Code local settings
.claude/settings.local.json

# Android Profiling
*.hprof

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.yapp.ndgl.core.ui.designsystem
import androidx.annotation.DrawableRes
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.Spacer
Expand Down Expand Up @@ -45,8 +46,8 @@ fun NDGLNavigationBar(
modifier = modifier
.fillMaxWidth()
.height(48.dp)
.padding(horizontal = 24.dp, vertical = 12.dp),
horizontalArrangement = Arrangement.spacedBy(8.dp),
.padding(horizontal = 24.dp, vertical = 4.dp),
horizontalArrangement = Arrangement.spacedBy(4.dp),
verticalAlignment = Alignment.CenterVertically,
) {
leadingIcon?.let { icon ->
Expand All @@ -69,8 +70,10 @@ fun NDGLNavigationBar(
)
} ?: Spacer(modifier = Modifier.weight(1f))

trailingContents?.let { contents ->
contents()
if (trailingContents != null) {
trailingContents()
} else {
Box(modifier = Modifier.size(40.dp))
}
}
}
Expand All @@ -84,10 +87,11 @@ fun NDGLNavigationIcon(
imageVector = ImageVector.vectorResource(icon),
contentDescription = null,
modifier = Modifier
.size(28.dp)
.size(40.dp)
.clip(CircleShape)
.clickable(onClick = onClick),
tint = NDGLTheme.colors.black700,
.clickable(onClick = onClick)
.padding(6.dp),
tint = NDGLTheme.colors.black600,
Comment thread
coderabbitai[bot] marked this conversation as resolved.
)
}

Expand All @@ -113,6 +117,36 @@ private fun NDGLNavigationBarCenterPreview() {
}
}

@Preview(showBackground = true)
@Composable
private fun NDGLNavigationBarPreview() {
NDGLTheme {
NDGLNavigationBar(
textAlignType = NDGLNavigationBarAttr.TextAlignType.CENTER,
headline = "미리보기",
leadingIcon = R.drawable.ic_28_chevron_left,
trailingContents = {
NDGLNavigationIcon(
icon = R.drawable.ic_28_search,
onClick = {},
)
},
)
}
}

@Preview(showBackground = true)
@Composable
private fun NDGLNavigationBarNoTrailingPreview() {
NDGLTheme {
NDGLNavigationBar(
textAlignType = NDGLNavigationBarAttr.TextAlignType.CENTER,
headline = "미리보기",
leadingIcon = R.drawable.ic_28_chevron_left,
)
}
}

@Preview(showBackground = true)
@Composable
private fun NDGLNavigationBarStartPreview() {
Expand Down