Skip to content

Fix/issue date picker #62

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
Mostafa-Ibrahim96 merged 2 commits into from
Jun 27, 2025
Merged

Fix/issue date picker #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a98ed3
solve issue in datePicker
norhanadel367 Jun 27, 2025
adbfab3
solve issue in ModalBottomSheet
norhanadel367 Jun 27, 2025
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
114 changes: 74 additions & 40 deletions app/src/main/java/com/example/tudee/presentation/components/TaskContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@ package com.example.tudee.presentation.components

import android.util.Log
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
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
Expand Down Expand Up @@ -293,54 +297,84 @@ fun DatePickerDialogComponent(
DatePickerDialog(
onDismissRequest = onDismiss,
colors = DatePickerDefaults.colors(
containerColor = TudeeTheme.color.surface
, titleContentColor = TudeeTheme.color.textColors.title
containerColor = TudeeTheme.color.surface,
titleContentColor = TudeeTheme.color.textColors.title
),
confirmButton = {
Button(onClick = {
val selectedDateMillis = datePickerState.selectedDateMillis
if (selectedDateMillis != null) {
val instant = Instant.fromEpochMilliseconds(selectedDateMillis)
val localDateTime = instant.toLocalDateTime(TimeZone.currentSystemDefault())
val localDate = LocalDate(
year = localDateTime.year,
monthNumber = localDateTime.monthNumber,
dayOfMonth = localDateTime.dayOfMonth
)
onDateSelected(localDate)
}
}) {
Text("OK")
}
},
dismissButton = {
Button(onClick = onDismiss) {
Text("Cancel")
}
}
confirmButton = {},
dismissButton = {}
) {
DatePicker(state = datePickerState
, headline = {
Column(
modifier = Modifier
.fillMaxSize()
.padding(bottom = 20.dp)
) {
DatePicker(
state = datePickerState,
headline = {},
colors = DatePickerDefaults.colors(
navigationContentColor = TudeeTheme.color.textColors.title,
headlineContentColor = TudeeTheme.color.textColors.title,
titleContentColor = TudeeTheme.color.textColors.title,
weekdayContentColor = TudeeTheme.color.textColors.title,
dayContentColor = TudeeTheme.color.textColors.title,
containerColor = TudeeTheme.color.statusColors.greenAccent,
selectedDayContainerColor = TudeeTheme.color.primary,
selectedDayContentColor = TudeeTheme.color.textColors.onPrimary,
todayContentColor = TudeeTheme.color.primary,
todayDateBorderColor = TudeeTheme.color.primary
)
)

},
colors = DatePickerDefaults.colors(
navigationContentColor =TudeeTheme.color.textColors.title ,
headlineContentColor = TudeeTheme.color.textColors.title,
titleContentColor = TudeeTheme.color.textColors.title,
weekdayContentColor = TudeeTheme.color.textColors.title,
dayContentColor=TudeeTheme.color.textColors.title,
containerColor = TudeeTheme.color.statusColors.greenAccent ,
selectedDayContainerColor = TudeeTheme.color.primary,
selectedDayContentColor = TudeeTheme.color.textColors.onPrimary,
todayContentColor = TudeeTheme.color.primary,
todayDateBorderColor = TudeeTheme.color.primary,
Spacer(modifier = Modifier.weight(1f))

Row(
modifier = Modifier
.fillMaxWidth()
.padding(start = 12.dp, end = 40.dp, bottom = 10.dp),
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
Text(
modifier = Modifier.clickable {
datePickerState.selectedDateMillis = null
},
text = stringResource(R.string.date_picker_clear_button_text),
color = TudeeTheme.color.primary,
style = TudeeTheme.textStyle.label.large
)
)

Row(horizontalArrangement = Arrangement.spacedBy(35.dp)) {
Text(
modifier = Modifier.clickable { onDismiss() },
text = stringResource(R.string.date_picker_cancel_button_text),
color = TudeeTheme.color.primary,
style = TudeeTheme.textStyle.label.large
)

Text(
modifier = Modifier.clickable {
val selectedDateMillis = datePickerState.selectedDateMillis
if (selectedDateMillis != null) {
val instant = Instant.fromEpochMilliseconds(selectedDateMillis)
val localDateTime = instant.toLocalDateTime(TimeZone.currentSystemDefault())
val localDate = LocalDate(
year = localDateTime.year,
monthNumber = localDateTime.monthNumber,
dayOfMonth = localDateTime.dayOfMonth
)
onDateSelected(localDate)
}
},
text = stringResource(R.string.date_picker_ok_button_text),
color = TudeeTheme.color.primary,
style = TudeeTheme.textStyle.label.large
)
}
}
}
}
}


@Preview(showBackground = true)
@Composable
fun TaskContentPreview() {
Expand Down
11 changes: 7 additions & 4 deletions app/src/main/java/com/example/tudee/presentation/screen/home/screen/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
Expand Down Expand Up @@ -254,13 +255,15 @@ fun BottomSheetContent(
onDismiss: () -> Unit,
actions: (HomeActions) -> Unit
) {
val sheetState = rememberModalBottomSheetState()

val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
ModalBottomSheet(
modifier = Modifier.fillMaxHeight(fraction = 0.8f),
onDismissRequest = onDismiss,
sheetState = sheetState,
containerColor = TudeeTheme.color.surface
) {
containerColor = TudeeTheme.color.surface,
shape = RoundedCornerShape(topStart = 24.dp, topEnd = 24.dp),

) {
TaskContent(
state = state,
categories = state.categories,
Expand Down
3 changes: 2 additions & 1 deletion .../main/java/com/example/tudee/presentation/screen/task_screen/component/TaskButtonSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,8 @@ fun BottomSheetContent(
}
item {
TudeeTextField(
value = taskState.taskDueDate?.toString() ?: "2024, 1, 1",
value = taskState.taskDueDate?.toString() ?: java.time.LocalDate.now()
.format(java.time.format.DateTimeFormatter.ofPattern("dd-MM-yyyy")),
onValueChange = { newValue ->
val parts = newValue.split(", ")
if (parts.size == 3) {
Expand Down