diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fb09487..5da6a7a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +### 0.8.0-beta - 2022-05-25 + +- Update compose to 1.2.0-beta02 ([#149](https://github.com/vanpra/compose-material-dialogs/pull/149)) + ### 0.7.2 - 2022-05-25 - Fix input import and documentation ([#148](https://github.com/vanpra/compose-material-dialogs/pull/148)) diff --git a/README.md b/README.md index 8a22d0cc..5b0521a6 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ **Latest Stable Library Version: 0.7.2 (Supports Compose 1.1.1)** +**Latest Beta Library Version: 0.8.0-beta (Supports Compose 1.2.0-beta02)** + ### [See Releases and Changelog](https://github.com/vanpra/compose-material-dialogs/blob/main/CHANGELOG.md) ## Core diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 8566e3c1..711ccac3 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -14,12 +14,12 @@ object Dependencies { } object Accompanist { - private const val version = "0.23.1" + private const val version = "0.24.9-beta" const val pager = "com.google.accompanist:accompanist-pager:$version" } object Kotlin { - private const val version = "1.6.10" + private const val version = "1.6.21" const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version" } @@ -44,7 +44,7 @@ object Dependencies { } object Compose { - const val version = "1.1.1" + const val version = "1.2.0-beta02" const val ui = "androidx.compose.ui:ui:$version" const val material = "androidx.compose.material:material:$version" diff --git a/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_datePickerBasic.png b/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_datePickerBasic.png index c5ea4e8c..49d05251 100644 Binary files a/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_datePickerBasic.png and b/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_datePickerBasic.png differ diff --git a/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_datePickerWithCustomTitle.png b/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_datePickerWithCustomTitle.png index 5bd5fb86..13c4ac1b 100644 Binary files a/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_datePickerWithCustomTitle.png and b/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_datePickerWithCustomTitle.png differ diff --git a/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_datePickerWithRestrictedDates.png b/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_datePickerWithRestrictedDates.png index 392b548f..acc3a8a5 100644 Binary files a/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_datePickerWithRestrictedDates.png and b/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_datePickerWithRestrictedDates.png differ diff --git a/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_timePicker24Hour.png b/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_timePicker24Hour.png index d6fc6b13..ce75ccd0 100644 Binary files a/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_timePicker24Hour.png and b/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_timePicker24Hour.png differ diff --git a/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_timePickerBasic.png b/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_timePickerBasic.png index 9ef9ea6f..5534cf2a 100644 Binary files a/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_timePickerBasic.png and b/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_timePickerBasic.png differ diff --git a/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_timePickerWithCustomTitle.png b/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_timePickerWithCustomTitle.png index 3fe29b35..eeba956f 100644 Binary files a/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_timePickerWithCustomTitle.png and b/datetime/screenshots/debug/com.vanpra.composematerialdialogs.datetime.test.screenshot.DateTimePickerTest_timePickerWithCustomTitle.png differ diff --git a/datetime/src/main/java/com/vanpra/composematerialdialogs/datetime/date/DatePicker.kt b/datetime/src/main/java/com/vanpra/composematerialdialogs/datetime/date/DatePicker.kt index b954d61e..2f845545 100644 --- a/datetime/src/main/java/com/vanpra/composematerialdialogs/datetime/date/DatePicker.kt +++ b/datetime/src/main/java/com/vanpra/composematerialdialogs/datetime/date/DatePicker.kt @@ -20,11 +20,11 @@ import androidx.compose.foundation.layout.paddingFromBaseline import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.wrapContentSize -import androidx.compose.foundation.lazy.GridCells -import androidx.compose.foundation.lazy.LazyVerticalGrid -import androidx.compose.foundation.lazy.items -import androidx.compose.foundation.lazy.itemsIndexed -import androidx.compose.foundation.lazy.rememberLazyListState +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.lazy.grid.items +import androidx.compose.foundation.lazy.grid.itemsIndexed +import androidx.compose.foundation.lazy.grid.rememberLazyGridState import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.ContentAlpha @@ -158,11 +158,11 @@ private fun YearPicker( state: DatePickerState, pagerState: PagerState, ) { - val gridState = rememberLazyListState((viewDate.year - state.yearRange.first) / 3) + val gridState = rememberLazyGridState((viewDate.year - state.yearRange.first) / 3) val coroutineScope = rememberCoroutineScope() LazyVerticalGrid( - cells = GridCells.Fixed(3), + columns = GridCells.Fixed(3), state = gridState, modifier = Modifier.background(state.dialogBackground) ) { @@ -322,7 +322,7 @@ private fun CalendarView( viewDate.year == state.selected.year && viewDate.month == state.selected.month } - LazyVerticalGrid(cells = GridCells.Fixed(7), modifier = Modifier.height(240.dp)) { + LazyVerticalGrid(columns = GridCells.Fixed(7), modifier = Modifier.height(240.dp)) { for (x in 0 until calendarDatesData.first) { item { Box(Modifier.size(40.dp)) } } @@ -392,7 +392,7 @@ private fun DayOfWeekHeader(state: DatePickerState, locale: Locale) { verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceEvenly ) { - LazyVerticalGrid(cells = GridCells.Fixed(7)) { + LazyVerticalGrid(columns = GridCells.Fixed(7)) { dayHeaders.forEach { it -> item { Box(Modifier.size(40.dp)) { diff --git a/gradle.properties b/gradle.properties index 2cc93182..0a154077 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ android.enableJetifier=false kotlin.code.style=official GROUP=io.github.vanpra.compose-material-dialogs -VERSION_NAME=0.7.2 +VERSION_NAME=0.8.0-beta POM_DESCRIPTION=A Material Dialog Builder for Jetpack Compose POM_INCEPTION_YEAR=2020