Skip to content
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

Chore/migrate to compose 1.6 #338

Merged
merged 2 commits into from
Feb 12, 2024
Merged

Chore/migrate to compose 1.6 #338

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
84bf24c
Bump bom version
kelianClerc Feb 12, 2024
a80a3d2
Fix datepicker breaking change
kelianClerc Feb 12, 2024
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
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ androidx-appcompat = "1.6.1"
android-material-version = '1.9.0'

# Compose
compose-bom = "2023.10.01"
compose-bom = "2024.02.00"
compose-kotlin-compiler = "1.5.7"

# Image
Expand Down
36 changes: 18 additions & 18 deletions library-compose/src/main/java/com/spendesk/grapes/compose/calendar/GrapesDatePicker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ package com.spendesk.grapes.compose.calendar

import androidx.compose.material3.DatePicker
import androidx.compose.material3.DatePickerDefaults
import androidx.compose.material3.DatePickerState
import androidx.compose.material3.DisplayMode
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.SelectableDates
import androidx.compose.material3.rememberDatePickerState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import com.spendesk.grapes.compose.extensions.resetDateToMidnight
Expand Down Expand Up @@ -40,14 +40,22 @@ fun GrapesDatePicker(
maxDate: Date? = null,
onDateSelected: ((Date) -> Unit)? = null
) {
val selectedDate = remember(date, minDate, maxDate) {
DatePickerState(
initialSelectedDateMillis = date?.time,
initialDisplayedMonthMillis = date?.time,
yearRange = DatePickerDefaults.YearRange,
initialDisplayMode = DisplayMode.Picker
)
}
val selectedDate = rememberDatePickerState(
initialSelectedDateMillis = date?.time,
initialDisplayedMonthMillis = date?.time,
yearRange = DatePickerDefaults.YearRange,
initialDisplayMode = DisplayMode.Picker,
selectableDates = object : SelectableDates {
override fun isSelectableDate(utcTimeMillis: Long): Boolean {
val calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")).apply { timeInMillis = utcTimeMillis }

val isAfterMinDate = minDate?.let { calendar.time.after(it.resetDateToMidnight()) } ?: true
val isBeforeMaxDate = maxDate?.let { calendar.time.before(it.resetDateToTomorrowMidnight()) } ?: true

return isAfterMinDate && isBeforeMaxDate
}
}
)

DatePicker(
state = selectedDate,
Expand All @@ -71,14 +79,6 @@ fun GrapesDatePicker(
todayContentColor = GrapesTheme.colors.mainPrimaryNormal,
todayDateBorderColor = GrapesTheme.colors.mainPrimaryNormal
),
dateValidator = { utcDateInMills ->
val calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC")).apply { timeInMillis = utcDateInMills }

val isAfterMinDate = minDate?.let { calendar.time.after(it.resetDateToMidnight()) } ?: true
val isBeforeMaxDate = maxDate?.let { calendar.time.before(it.resetDateToTomorrowMidnight()) } ?: true

isAfterMinDate && isBeforeMaxDate
}
)

LaunchedEffect(selectedDate.selectedDateMillis) {
Expand Down
Loading