Skip to content

Commit b1ce376

Browse files
Merge pull request #152 from vanpra/0.8.0-beta
Library Version 0.8.0-beta
2 parents 79957cb + d61f144 commit b1ce376

11 files changed

+19
-13
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
### 0.8.0-beta - 2022-05-25
4+
5+
- Update compose to 1.2.0-beta02 ([#149](https://github.com/vanpra/compose-material-dialogs/pull/149))
6+
37
### 0.7.2 - 2022-05-25
48

59
- Fix input import and documentation ([#148](https://github.com/vanpra/compose-material-dialogs/pull/148))

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
**Latest Stable Library Version: 0.7.2 (Supports Compose 1.1.1)**
88

9+
**Latest Beta Library Version: 0.8.0-beta (Supports Compose 1.2.0-beta02)**
10+
911
### [See Releases and Changelog](https://github.com/vanpra/compose-material-dialogs/blob/main/CHANGELOG.md)
1012

1113
## Core

buildSrc/src/main/kotlin/Dependencies.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ object Dependencies {
1414
}
1515

1616
object Accompanist {
17-
private const val version = "0.23.1"
17+
private const val version = "0.24.9-beta"
1818
const val pager = "com.google.accompanist:accompanist-pager:$version"
1919
}
2020

2121
object Kotlin {
22-
private const val version = "1.6.10"
22+
private const val version = "1.6.21"
2323
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
2424
}
2525

@@ -44,7 +44,7 @@ object Dependencies {
4444
}
4545

4646
object Compose {
47-
const val version = "1.1.1"
47+
const val version = "1.2.0-beta02"
4848

4949
const val ui = "androidx.compose.ui:ui:$version"
5050
const val material = "androidx.compose.material:material:$version"
-104 Bytes
Loading
-160 Bytes
Loading
Loading
-15 Bytes
Loading
-13 Bytes
Loading
Loading

datetime/src/main/java/com/vanpra/composematerialdialogs/datetime/date/DatePicker.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import androidx.compose.foundation.layout.paddingFromBaseline
2020
import androidx.compose.foundation.layout.size
2121
import androidx.compose.foundation.layout.width
2222
import androidx.compose.foundation.layout.wrapContentSize
23-
import androidx.compose.foundation.lazy.GridCells
24-
import androidx.compose.foundation.lazy.LazyVerticalGrid
25-
import androidx.compose.foundation.lazy.items
26-
import androidx.compose.foundation.lazy.itemsIndexed
27-
import androidx.compose.foundation.lazy.rememberLazyListState
23+
import androidx.compose.foundation.lazy.grid.GridCells
24+
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
25+
import androidx.compose.foundation.lazy.grid.items
26+
import androidx.compose.foundation.lazy.grid.itemsIndexed
27+
import androidx.compose.foundation.lazy.grid.rememberLazyGridState
2828
import androidx.compose.foundation.shape.CircleShape
2929
import androidx.compose.foundation.shape.RoundedCornerShape
3030
import androidx.compose.material.ContentAlpha
@@ -158,11 +158,11 @@ private fun YearPicker(
158158
state: DatePickerState,
159159
pagerState: PagerState,
160160
) {
161-
val gridState = rememberLazyListState((viewDate.year - state.yearRange.first) / 3)
161+
val gridState = rememberLazyGridState((viewDate.year - state.yearRange.first) / 3)
162162
val coroutineScope = rememberCoroutineScope()
163163

164164
LazyVerticalGrid(
165-
cells = GridCells.Fixed(3),
165+
columns = GridCells.Fixed(3),
166166
state = gridState,
167167
modifier = Modifier.background(state.dialogBackground)
168168
) {
@@ -322,7 +322,7 @@ private fun CalendarView(
322322
viewDate.year == state.selected.year && viewDate.month == state.selected.month
323323
}
324324

325-
LazyVerticalGrid(cells = GridCells.Fixed(7), modifier = Modifier.height(240.dp)) {
325+
LazyVerticalGrid(columns = GridCells.Fixed(7), modifier = Modifier.height(240.dp)) {
326326
for (x in 0 until calendarDatesData.first) {
327327
item { Box(Modifier.size(40.dp)) }
328328
}
@@ -392,7 +392,7 @@ private fun DayOfWeekHeader(state: DatePickerState, locale: Locale) {
392392
verticalAlignment = Alignment.CenterVertically,
393393
horizontalArrangement = Arrangement.SpaceEvenly
394394
) {
395-
LazyVerticalGrid(cells = GridCells.Fixed(7)) {
395+
LazyVerticalGrid(columns = GridCells.Fixed(7)) {
396396
dayHeaders.forEach { it ->
397397
item {
398398
Box(Modifier.size(40.dp)) {

0 commit comments

Comments
 (0)