Skip to content

Add a circle shape for today in DatePicker #183

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add a circle shape for today in DatePicker #183

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
23 changes: 16 additions & 7 deletions datetime/src/main/java/com/vanpra/composematerialdialogs/datetime/date/DatePicker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import androidx.compose.animation.slideInVertically
import androidx.compose.animation.slideOutVertically
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
Expand Down Expand Up @@ -334,7 +335,8 @@ private fun CalendarView(
}
val date = viewDate.withDayOfMonth(it)
val enabled = allowedDateValidator(date)
DateSelectionBox(it, selected, state.colors, enabled) {
val today = date.isEqual(LocalDate.now())
DateSelectionBox(it, selected, state.colors, enabled, today) {
state.selected = date
}
}
Expand All @@ -348,6 +350,7 @@ private fun DateSelectionBox(
selected: Boolean,
colors: DatePickerColors,
enabled: Boolean,
today: Boolean,
onClick: () -> Unit
) {
Box(
Expand All @@ -361,14 +364,20 @@ private fun DateSelectionBox(
),
contentAlignment = Alignment.Center
) {
val todayModifier = Modifier
.size(32.dp)
.border(1.dp, color = colors.dateBackgroundColor(true).value, shape = CircleShape)
.wrapContentSize(Alignment.Center)
.alpha(if (enabled) ContentAlpha.high else ContentAlpha.disabled)
val modifier = Modifier
.size(32.dp)
.clip(CircleShape)
.background(colors.dateBackgroundColor(selected).value)
.wrapContentSize(Alignment.Center)
.alpha(if (enabled) ContentAlpha.high else ContentAlpha.disabled)
Text(
date.toString(),
modifier = Modifier
.size(32.dp)
.clip(CircleShape)
.background(colors.dateBackgroundColor(selected).value)
.wrapContentSize(Alignment.Center)
.alpha(if (enabled) ContentAlpha.high else ContentAlpha.disabled),
modifier = if (today && !selected) todayModifier else modifier,
style = TextStyle(
color = colors.dateTextColor(selected).value,
fontSize = 12.sp
Expand Down