Make minor adjustments to pickers

Author: ReturDev

multipickers/src/main/java/github/returdev/multipickers/types/number/NumberPicker.kt

@@ -1,12 +1,11 @@
 package github.returdev.multipickers.types.number
 
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
 import github.returdev.multipickers.core.PickerDefaults
 import github.returdev.multipickers.core.PickerItemColors
 import github.returdev.multipickers.core.PickerState
@@ -17,7 +16,7 @@ import github.returdev.multipickers.types.text.TextPicker
  *
  * @param modifier The modifier to be applied to the TextPicker. Defaults to [Modifier].
  * @param items The list of integers to be displayed in the picker.
- * @param pickerItemHeight The height of each item in the picker.
+ * @param pickerItemHeight The height of each item in the picker. Defaults to 0.dp.
  * @param isEnabled Whether the picker is enabled or not. Defaults to true.
  * @param colors The colors to be used for the picker items. Defaults to [PickerDefaults.pickerItemColors()].
  * @param textStyle The text style to be used for the picker items. Defaults to a bold headline medium style from the current MaterialTheme.
@@ -28,11 +27,11 @@ import github.returdev.multipickers.types.text.TextPicker
 fun NumberPicker(
     modifier: Modifier = Modifier,
     items: List<Int>,
-    pickerItemHeight : Dp,
-    isEnabled: Boolean = true,
+    pickerItemHeight : Dp = 0.dp,
+    pickerState: PickerState,
     colors : PickerItemColors = PickerDefaults.pickerItemColors(),
     textStyle : TextStyle = PickerDefaults.pickerTextStyle,
-    pickerState: PickerState
+    isEnabled: Boolean = true
 ) {
     // Converts the list of integers to a list of strings for TextPicker.
     val stringItems = items.map { it.toString() }

multipickers/src/main/java/github/returdev/multipickers/types/text/TextPicker.kt

@@ -24,7 +24,7 @@ import github.returdev.multipickers.core.PickerState
  *
  * @param modifier Modifier to be applied to the TextPicker.
  * @param items The list of text items to be displayed in the TextPicker.
- * @param pickerItemHeight The height of each item in the Picker.
+ * @param pickerItemHeight The height of each item in the Picker. Defaults to 0.dp.
  * @param pickerState The state of the Picker, which includes the current selected index and the total number of items.
  * @param colors The colors to be used for the Picker items.
  * @param textStyle The style of the text in the Picker items.
@@ -36,7 +36,7 @@ import github.returdev.multipickers.core.PickerState
 fun TextPicker(
     modifier : Modifier = Modifier,
     items : List<String>,
-    pickerItemHeight : Dp,
+    pickerItemHeight : Dp = 0.dp,
     pickerState: PickerState,
     colors : PickerItemColors = PickerDefaults.pickerItemColors(),
     textStyle : TextStyle = PickerDefaults.pickerTextStyle,

multipickers/src/main/java/github/returdev/multipickers/types/time/TimePicker.kt

@@ -2,16 +2,12 @@ package github.returdev.multipickers.types.time
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.width
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import github.returdev.multipickers.core.PickerDefaults
@@ -23,17 +19,17 @@ import github.returdev.multipickers.types.text.TextPicker
  * This composable function creates a TimePicker.
  *
  * @param modifier The modifier to be applied to the TimePicker. Defaults to [Modifier].
- * @param pickerItemHeight The height of each item in the picker.
+ * @param pickerItemHeight The height of each item in the picker. Defaults to 0.dp.
  * @param pickerState The state of the picker.
  * @param colors The colors to be used for the picker items. Defaults to [PickerDefaults.pickerItemColors()].
  * @param textStyle The text style to be used for the picker items. Defaults to a bold headline medium style from the current MaterialTheme.
  * @param isEnabled Whether the picker is enabled or not. Defaults to true.
  */
-@OptIn(ExperimentalComposeUiApi::class)
+@ExperimentalComposeUiApi
 @Composable
 fun TimePicker(
     modifier : Modifier = Modifier,
-    pickerItemHeight : Dp,
+    pickerItemHeight : Dp = 0.dp,
     pickerState : TimePickerState,
     colors : PickerItemColors = PickerDefaults.pickerItemColors(),
     textStyle : TextStyle = PickerDefaults.pickerTextStyle,
@@ -68,6 +64,7 @@ fun TimePicker(
          */
         Text(
             text = ":",
+            color = colors.selectedContentColor(enabled = isEnabled).value,
             style = textStyle
         )
         /**
@@ -87,6 +84,7 @@ fun TimePicker(
          */
         Text(
             text = ":",
+            color = colors.selectedContentColor(enabled = isEnabled).value,
             style = textStyle
         )
         /**