Merge pull request #145 from vanpra/0.7.1

Library version 0.7.1

Author: PranavMaganti

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 
-### 0.7.0 - 2021-03-03
+### 0.7.1 - 2022-05-16
+
+-  Internationalise start day of week in date picker ([#146](https://github.com/vanpra/compose-material-dialogs/issues/146) and [#54](https://github.com/vanpra/compose-material-dialogs/issues/54))
+-  Add modifier parameter to input component ([#141](https://github.com/vanpra/compose-material-dialogs/issues/141))
+-  Add state parameter to the list component ([#140](https://github.com/vanpra/compose-material-dialogs/issues/140))
+
+### 0.7.0 - 2022-03-03
 
 -  Update compose to 1.1.1
 -  [BREAKING CHANGE] Modify arguments of the `input` component to better match those of `TextField`
@@ -9,7 +15,7 @@
 -  Add ability to change time picker title color ([#123](https://github.com/vanpra/compose-material-dialogs/issues/123))
 -  Fix bug which causes input field to lose focus on validity change ([#132](https://github.com/vanpra/compose-material-dialogs/issues/132))
 
-### 0.6.3 - 2021-01-21
+### 0.6.3 - 2022-01-21
 
 -  Update compose to 1.1.0-rc01 
 -  Add ability to disable specific days in date picker (#126)[https://github.com/vanpra/compose-material-dialogs/pull/126]

README.md

@@ -19,7 +19,7 @@
 ```gradle
 dependencies {
   ...
-  implementation "io.github.vanpra.compose-material-dialogs:core:0.7.0" 
+  implementation "io.github.vanpra.compose-material-dialogs:core:0.7.1" 
   ...
 }
 ```
@@ -35,7 +35,7 @@ dependencies {
 ```gradle
 dependencies {
   ...
-  implementation "io.github.vanpra.compose-material-dialogs:datetime:0.7.0"
+  implementation "io.github.vanpra.compose-material-dialogs:datetime:0.7.1"
   ...
 }
 ```
@@ -51,7 +51,7 @@ dependencies {
 ```gradle
 dependencies {
   ...
-  implementation "io.github.vanpra.compose-material-dialogs:color:0.7.0"
+  implementation "io.github.vanpra.compose-material-dialogs:color:0.7.1"
   ...
 }
 ```

app/src/main/java/com/vanpra/composematerialdialogdemos/demos/ListDialog.kt

@@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.material.Button
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
@@ -39,14 +38,6 @@ private val ringtones =
         "Beats",
         "Dance Party",
         "Zen Too",
-        "None",
-        "Callisto",
-        "Ganymede",
-        "Luna",
-        "Rrrring",
-        "Beats",
-        "Dance Party",
-        "Zen Too"
     )
 private val labels = listOf("None", "Forums", "Social", "Updates", "Promotions", "Spam", "Bin")
 private val emails = mutableStateListOf(
@@ -70,9 +61,6 @@ fun BasicListDialogDemo() {
     DialogAndShowButton(buttonText = "Simple List Dialog") {
         title(res = R.string.backup_dialog_title)
         listItems(emails)
-        Button(onClick = { emails.add("[email protected]") }) {
-            Text("Add")
-        }
     }
 
     DialogAndShowButton(buttonText = "Custom List Dialog") {

build.gradle.kts

@@ -14,9 +14,9 @@ buildscript {
 
     dependencies {
         classpath(Dependencies.Kotlin.gradlePlugin)
-        classpath("com.android.tools.build:gradle:7.3.0-alpha04")
-        classpath("com.vanniktech:gradle-maven-publish-plugin:0.18.0")
-        classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.6.0")
+        classpath("com.android.tools.build:gradle:7.4.0-alpha02")
+        classpath("com.vanniktech:gradle-maven-publish-plugin:0.19.0")
+        classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.6.21")
         classpath(Dependencies.Shot.core)
     }
 }

buildSrc/src/main/kotlin/Dependencies.kt

@@ -10,7 +10,7 @@ object Dependencies {
     }
 
     object Ktlint {
-        const val version = "0.44.0"
+        const val version = "0.45.2"
     }
 
     object Accompanist {
@@ -24,20 +24,20 @@ object Dependencies {
     }
 
     object Shot {
-        private const val version = "5.13.0"
+        private const val version = "5.14.1"
         const val core = "com.karumi:shot:$version"
         const val android = "com.karumi:shot-android:$version"
     }
 
     object Google {
-        const val material = "com.google.android.material:material:1.5.0"
+        const val material = "com.google.android.material:material:1.6.0"
     }
 
     object AndroidX {
         const val coreKtx = "androidx.core:core-ktx:1.7.0"
 
         object Testing {
-            const val version = "1.4.1-alpha04"
+            const val version = "1.4.0"
             const val core = "androidx.test:core:$version"
             const val rules = "androidx.test:rules:$version"
             const val runner = "androidx.test:runner:$version"
@@ -55,7 +55,7 @@ object Dependencies {
 
             const val testing = "androidx.compose.ui:ui-test-junit4:$version"
             const val activity = "androidx.activity:activity-compose:1.4.0"
-            const val navigation = "androidx.navigation:navigation-compose:2.4.1"
+            const val navigation = "androidx.navigation:navigation-compose:2.4.2"
         }
     }
 }

core/src/main/java/com/vanpra/composematerialdialogs/MaterialDialogInput.kt

@@ -53,6 +53,7 @@ enum class TextFieldStyle {
 
 @Composable
 fun MaterialDialogScope.input(
+    modifier: Modifier = Modifier,
     label: String,
     placeholder: String = "",
     prefill: String = "",
@@ -87,9 +88,8 @@ fun MaterialDialogScope.input(
     }
 
     Column(modifier = Modifier.padding(start = 24.dp, end = 24.dp, top = 8.dp, bottom = 8.dp)) {
-
         TextFieldWithStyle(
-            modifier = Modifier
+            modifier = modifier
                 .focusRequester(focusRequester)
                 .fillMaxWidth()
                 .testTag("dialog_input"),

core/src/main/java/com/vanpra/composematerialdialogs/MaterialDialogLists.kt

@@ -12,7 +12,9 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.Checkbox
 import androidx.compose.material.ContentAlpha
 import androidx.compose.material.MaterialTheme
@@ -39,6 +41,7 @@ import androidx.compose.ui.unit.dp
 @Composable
 fun <T> MaterialDialogScope.listItems(
     modifier: Modifier = Modifier,
+    state: LazyListState = rememberLazyListState(),
     list: List<T>,
     closeOnClick: Boolean = true,
     onClick: (index: Int, item: T) -> Unit = { _, _ -> },
@@ -49,7 +52,8 @@ fun <T> MaterialDialogScope.listItems(
         LazyColumn(
             Modifier
                 .then(modifier)
-                .testTag("dialog_list")
+                .testTag("dialog_list"),
+            state = state
         ) {
             itemsIndexed(list) { index, it ->
                 Box(
@@ -82,11 +86,13 @@ fun <T> MaterialDialogScope.listItems(
 @Composable
 fun MaterialDialogScope.listItems(
     list: List<String>,
+    state: LazyListState = rememberLazyListState(),
     closeOnClick: Boolean = true,
     onClick: (index: Int, item: String) -> Unit = { _, _ -> }
 ) {
     listItems(
         modifier = Modifier.padding(bottom = 8.dp),
+        state = state,
         list = list,
         closeOnClick = closeOnClick,
         onClick = onClick
@@ -116,6 +122,7 @@ fun MaterialDialogScope.listItems(
 @Composable
 fun MaterialDialogScope.listItemsMultiChoice(
     list: List<String>,
+    state: LazyListState = rememberLazyListState(),
     disabledIndices: Set<Int> = setOf(),
     initialSelection: Set<Int> = setOf(),
     waitForPositiveButton: Boolean = true,
@@ -148,6 +155,7 @@ fun MaterialDialogScope.listItemsMultiChoice(
 
     listItems(
         list = list,
+        state = state,
         onClick = { index, _ -> onChecked(index) },
         isEnabled = isEnabled,
         closeOnClick = false
@@ -178,6 +186,7 @@ fun MaterialDialogScope.listItemsMultiChoice(
 @Composable
 fun MaterialDialogScope.listItemsSingleChoice(
     list: List<String>,
+    state: LazyListState = rememberLazyListState(),
     disabledIndices: Set<Int> = setOf(),
     initialSelection: Int? = null,
     waitForPositiveButton: Boolean = true,
@@ -203,6 +212,7 @@ fun MaterialDialogScope.listItemsSingleChoice(
     val isEnabled = remember(disabledIndices) { { index: Int -> index !in disabledIndices } }
     listItems(
         list = list,
+        state = state,
         closeOnClick = false,
         onClick = { index, _ -> onSelect(index) },
         isEnabled = isEnabled

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

@@ -56,11 +56,12 @@ import com.google.accompanist.pager.HorizontalPager
 import com.google.accompanist.pager.PagerState
 import com.google.accompanist.pager.rememberPagerState
 import com.vanpra.composematerialdialogs.MaterialDialogScope
+import com.vanpra.composematerialdialogs.datetime.util.getFullLocalName
+import com.vanpra.composematerialdialogs.datetime.util.getShortLocalName
 import com.vanpra.composematerialdialogs.datetime.util.isSmallDevice
-import com.vanpra.composematerialdialogs.datetime.util.shortLocalName
 import kotlinx.coroutines.launch
 import java.time.LocalDate
-import java.time.format.TextStyle.FULL
+import java.time.temporal.WeekFields
 import java.util.Locale
 
 /**
@@ -82,13 +83,14 @@ fun MaterialDialogScope.datepicker(
     yearRange: IntRange = IntRange(1900, 2100),
     waitForPositiveButton: Boolean = true,
     allowedDateValidator: (LocalDate) -> Boolean = { true },
+    locale: Locale = Locale.getDefault(),
     onDateChange: (LocalDate) -> Unit = {}
 ) {
     val datePickerState = remember {
         DatePickerState(initialDate, colors, yearRange, dialogState.dialogBackgroundColor!!)
     }
 
-    DatePickerImpl(title = title, state = datePickerState, allowedDateValidator)
+    DatePickerImpl(title = title, state = datePickerState, allowedDateValidator, locale)
 
     if (waitForPositiveButton) {
         DialogCallback { onDateChange(datePickerState.selected) }
@@ -105,14 +107,15 @@ fun MaterialDialogScope.datepicker(
 internal fun DatePickerImpl(
     title: String,
     state: DatePickerState,
-    allowedDateValidator: (LocalDate) -> Boolean
+    allowedDateValidator: (LocalDate) -> Boolean,
+    locale: Locale
 ) {
     val pagerState = rememberPagerState(
         initialPage = (state.selected.year - state.yearRange.first) * 12 + state.selected.monthValue - 1
     )
 
     Column(Modifier.fillMaxWidth()) {
-        CalendarHeader(title, state)
+        CalendarHeader(title, state, locale)
         HorizontalPager(
             count = (state.yearRange.last - state.yearRange.first + 1) * 12,
             state = pagerState,
@@ -128,7 +131,7 @@ internal fun DatePickerImpl(
             }
 
             Column {
-                CalendarViewHeader(viewDate, state, pagerState)
+                CalendarViewHeader(viewDate, state, pagerState, locale)
                 Box {
                     androidx.compose.animation.AnimatedVisibility(
                         state.yearPickerShowing,
@@ -141,7 +144,7 @@ internal fun DatePickerImpl(
                         YearPicker(viewDate, state, pagerState)
                     }
 
-                    CalendarView(viewDate, state, allowedDateValidator)
+                    CalendarView(viewDate, state, locale, allowedDateValidator)
                 }
             }
         }
@@ -215,10 +218,11 @@ private fun YearPickerItem(
 private fun CalendarViewHeader(
     viewDate: LocalDate,
     state: DatePickerState,
-    pagerState: PagerState
+    pagerState: PagerState,
+    locale: Locale
 ) {
     val coroutineScope = rememberCoroutineScope()
-    val month = remember { viewDate.month.getDisplayName(FULL, Locale.getDefault()) }
+    val month = remember { viewDate.month.getFullLocalName(locale) }
     val yearDropdownIcon = remember(state.yearPickerShowing) {
         if (state.yearPickerShowing) Icons.Default.ArrowDropUp else Icons.Default.ArrowDropDown
     }
@@ -303,15 +307,16 @@ private fun CalendarViewHeader(
 private fun CalendarView(
     viewDate: LocalDate,
     state: DatePickerState,
+    locale: Locale,
     allowedDateValidator: (LocalDate) -> Boolean
 ) {
     Column(
         Modifier
             .padding(start = 12.dp, end = 12.dp)
             .testTag("dialog_date_calendar")
     ) {
-        DayOfWeekHeader(state)
-        val calendarDatesData = remember { getDates(viewDate) }
+        DayOfWeekHeader(state, locale)
+        val calendarDatesData = remember { getDates(viewDate, locale) }
         val datesList = remember { IntRange(1, calendarDatesData.second).toList() }
         val possibleSelected = remember(state.selected) {
             viewDate.year == state.selected.year && viewDate.month == state.selected.month
@@ -373,7 +378,13 @@ private fun DateSelectionBox(
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
-private fun DayOfWeekHeader(state: DatePickerState) {
+private fun DayOfWeekHeader(state: DatePickerState, locale: Locale) {
+    val dayHeaders = WeekFields.of(locale).firstDayOfWeek.let { firstDayOfWeek ->
+        (0L until 7L).map {
+            firstDayOfWeek.plus(it).getDisplayName(java.time.format.TextStyle.NARROW, locale)
+        }
+    }
+
     Row(
         modifier = Modifier
             .height(40.dp)
@@ -382,7 +393,7 @@ private fun DayOfWeekHeader(state: DatePickerState) {
         horizontalArrangement = Arrangement.SpaceEvenly
     ) {
         LazyVerticalGrid(cells = GridCells.Fixed(7)) {
-            DatePickerState.dayHeaders.forEach { it ->
+            dayHeaders.forEach { it ->
                 item {
                     Box(Modifier.size(40.dp)) {
                         Text(
@@ -402,9 +413,9 @@ private fun DayOfWeekHeader(state: DatePickerState) {
 }
 
 @Composable
-private fun CalendarHeader(title: String, state: DatePickerState) {
-    val month = remember(state.selected) { state.selected.month.shortLocalName }
-    val day = remember(state.selected) { state.selected.dayOfWeek.shortLocalName }
+private fun CalendarHeader(title: String, state: DatePickerState, locale: Locale) {
+    val month = remember(state.selected) { state.selected.month.getShortLocalName(locale) }
+    val day = remember(state.selected) { state.selected.dayOfWeek.getShortLocalName(locale) }
 
     Box(
         Modifier
@@ -437,9 +448,11 @@ private fun CalendarHeader(title: String, state: DatePickerState) {
     }
 }
 
-private fun getDates(date: LocalDate): Pair<Int, Int> {
+private fun getDates(date: LocalDate, locale: Locale): Pair<Int, Int> {
     val numDays = date.month.length(date.isLeapYear)
-    val firstDay = date.withDayOfMonth(1).dayOfWeek.value % 7
+
+    val firstDayOfWeek = WeekFields.of(locale).firstDayOfWeek.value
+    val firstDay = date.withDayOfMonth(1).dayOfWeek.value - firstDayOfWeek % 7
 
     return Pair(firstDay, numDays)
 }

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

@@ -14,8 +14,4 @@ internal class DatePickerState(
 ) {
     var selected by mutableStateOf(initialDate)
     var yearPickerShowing by mutableStateOf(false)
-
-    companion object {
-        val dayHeaders = listOf("S", "M", "T", "W", "T", "F", "S")
-    }
 }