Skip to content
This repository was archived by the owner on Mar 28, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
android.useAndroidX=true
android.enableJetifier=true
kotlin.code.style=official

android.disableAutomaticComponentCreation=true
#####################
## PUBLISHING
#####################
Expand Down
24 changes: 20 additions & 4 deletions lib/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,22 +1,38 @@

plugins {
id("com.android.library")
id("kotlin-android")
id("common")

id("com.vanniktech.maven.publish")
//`maven-publish`
}

mavenPublish {
sonatypeHost = com.vanniktech.maven.publish.SonatypeHost.S01
}

repositories {
google()
mavenCentral()
}

dependencies {
api("org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}")
api("androidx.compose.material:material:${Versions.compose}")

testImplementation("junit:junit:4.13.2")
}
/*publishing {
publications {
register<MavenPublication>("release") {
groupId = "com.github.cjrcodes"
artifactId = "compose-numberpicker"
version = "0.0.13"

repositories {
google()
mavenCentral()
}
afterEvaluate {
from(components["release"])
}
}
}
}*/
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ data class AMPMHours(
fun HoursNumberPicker(
modifier: Modifier = Modifier,
value: Hours,
leadingZero: Boolean,
hoursRange: Iterable<Int> = when (value) {
is FullHours -> (0..23)
is AMPMHours -> (1..12)
Expand All @@ -50,6 +51,7 @@ fun HoursNumberPicker(
FullHoursNumberPicker(
modifier = modifier,
value = value,
leadingZero = leadingZero,
hoursRange = hoursRange,
minutesRange = minutesRange,
hoursDivider = hoursDivider,
Expand All @@ -62,6 +64,7 @@ fun HoursNumberPicker(
AMPMHoursNumberPicker(
modifier = modifier,
value = value,
leadingZero = leadingZero,
hoursRange = hoursRange,
minutesRange = minutesRange,
hoursDivider = hoursDivider,
Expand All @@ -77,6 +80,7 @@ fun HoursNumberPicker(
fun FullHoursNumberPicker(
modifier: Modifier = Modifier,
value: FullHours,
leadingZero: Boolean,
hoursRange: Iterable<Int>,
minutesRange: Iterable<Int> = (0..59),
hoursDivider: (@Composable () -> Unit)? = null,
Expand All @@ -91,6 +95,7 @@ fun FullHoursNumberPicker(
) {
NumberPicker(
modifier = Modifier.weight(1f),
leadingZero = leadingZero,
value = value.hours,
onValueChange = {
onValueChange(value.copy(hours = it))
Expand All @@ -104,6 +109,7 @@ fun FullHoursNumberPicker(

NumberPicker(
modifier = Modifier.weight(1f),
leadingZero = leadingZero,
value = value.minutes,
onValueChange = {
onValueChange(value.copy(minutes = it))
Expand All @@ -121,6 +127,7 @@ fun FullHoursNumberPicker(
fun AMPMHoursNumberPicker(
modifier: Modifier = Modifier,
value: AMPMHours,
leadingZero: Boolean,
hoursRange: Iterable<Int>,
minutesRange: Iterable<Int> = (0..59),
hoursDivider: (@Composable () -> Unit)? = null,
Expand All @@ -136,6 +143,7 @@ fun AMPMHoursNumberPicker(
NumberPicker(
modifier = Modifier.weight(1f),
value = value.hours,
leadingZero = leadingZero,
onValueChange = {
onValueChange(value.copy(hours = it))
},
Expand All @@ -148,6 +156,7 @@ fun AMPMHoursNumberPicker(

NumberPicker(
modifier = Modifier.weight(1f),
leadingZero = leadingZero,
value = value.minutes,
onValueChange = {
onValueChange(value.copy(minutes = it))
Expand All @@ -160,6 +169,7 @@ fun AMPMHoursNumberPicker(
minutesDivider?.invoke()

NumberPicker(
leadingZero = leadingZero,
value = when (value.dayTime) {
AMPMHours.DayTime.AM -> 0
else -> 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.TextStyle
import kotlin.math.abs

@Composable
fun NumberPicker(
modifier: Modifier = Modifier,
leadingZero: Boolean,
label: (Int) -> String = {
it.toString()
"${if(leadingZero && abs(it) < 10) "0" else ""}$it"
},
value: Int,
onValueChange: (Int) -> Unit,
Expand Down
1 change: 1 addition & 0 deletions sample/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ dependencies {
implementation("com.google.android.material:material:1.5.0")
implementation("androidx.appcompat:appcompat:1.4.1")
implementation("androidx.activity:activity-compose:1.4.0")
debugImplementation("androidx.compose.ui:ui-tooling:${Versions.compose}")

testImplementation("junit:junit:4.13.2")
}
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ fun MainActivityUI() {
private fun NumberPicker() {
var state by remember { mutableStateOf(0) }
NumberPicker(
leadingZero = true,
value = state,
range = 0..10,
onValueChange = {
Expand All @@ -67,7 +68,8 @@ private fun HoursNumberPicker1() {
HoursNumberPicker(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 16.dp),
.padding(vertical = 16.dp), leadingZero = true,

dividersColor = MaterialTheme.colors.error,
value = state,
onValueChange = {
Expand All @@ -89,7 +91,8 @@ private fun HoursNumberPicker2() {
HoursNumberPicker(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 16.dp),
.padding(vertical = 16.dp), leadingZero = true,

dividersColor = MaterialTheme.colors.secondary,
value = state,
onValueChange = {
Expand Down Expand Up @@ -117,7 +120,8 @@ private fun HoursNumberPicker3() {
HoursNumberPicker(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 16.dp),
.padding(vertical = 16.dp), leadingZero = true,

value = state,
onValueChange = {
state = it
Expand Down Expand Up @@ -146,7 +150,8 @@ private fun HoursNumberPicker4() {
HoursNumberPicker(
modifier = Modifier
.fillMaxWidth()
.padding(vertical = 16.dp),
.padding(vertical = 16.dp), leadingZero = true,

value = state,
onValueChange = {
state = it
Expand Down
Loading