diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a09a6fd5..48c71e08 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jan 20 17:22:46 CET 2023 +#Fri Jun 16 16:03:05 CEST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/progressbars/src/main/java/com/decathlon/vitamin/compose/progressbars/VitaminProgressBars.kt b/progressbars/src/main/java/com/decathlon/vitamin/compose/progressbars/VitaminProgressBars.kt index e81ce655..537133ba 100644 --- a/progressbars/src/main/java/com/decathlon/vitamin/compose/progressbars/VitaminProgressBars.kt +++ b/progressbars/src/main/java/com/decathlon/vitamin/compose/progressbars/VitaminProgressBars.kt @@ -21,6 +21,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.StrokeCap import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Dp @@ -67,7 +68,8 @@ object VitaminProgressBars { progress = progress, modifier = Modifier.vitaminLinearProgressModifier(sizes.strokeSize), color = colors.progressColor, - backgroundColor = colors.backgroundColor + backgroundColor = colors.backgroundColor, + strokeCap = StrokeCap.Round ) } } @@ -100,7 +102,8 @@ object VitaminProgressBars { LinearProgressIndicator( modifier = Modifier.vitaminLinearProgressModifier(sizes.strokeSize), color = colors.progressColor, - backgroundColor = colors.backgroundColor + backgroundColor = colors.backgroundColor, + strokeCap = StrokeCap.Round ) } } @@ -140,7 +143,8 @@ object VitaminProgressBars { .align(Alignment.Center) .size(sizes.boxSize), color = colors.progressColor, - strokeWidth = sizes.strokeSize + strokeWidth = sizes.strokeSize, + strokeCap = StrokeCap.Round ) } } @@ -176,7 +180,8 @@ object VitaminProgressBars { .align(Alignment.Center) .size(sizes.boxSize), color = colors.progressColor, - strokeWidth = sizes.strokeSize + strokeWidth = sizes.strokeSize, + strokeCap = StrokeCap.Round ) } } diff --git a/text-inputs/out/failures/com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Dark].png b/text-inputs/out/failures/com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Dark].png new file mode 100644 index 00000000..40e3f416 Binary files /dev/null and b/text-inputs/out/failures/com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Dark].png differ diff --git a/text-inputs/out/failures/com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Light].png b/text-inputs/out/failures/com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Light].png new file mode 100644 index 00000000..f559fd16 Binary files /dev/null and b/text-inputs/out/failures/com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Light].png differ diff --git a/text-inputs/out/failures/com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Dark].png b/text-inputs/out/failures/com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Dark].png new file mode 100644 index 00000000..7823608e Binary files /dev/null and b/text-inputs/out/failures/com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Dark].png differ diff --git a/text-inputs/out/failures/com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Light].png b/text-inputs/out/failures/com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Light].png new file mode 100644 index 00000000..f1daa23e Binary files /dev/null and b/text-inputs/out/failures/com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Light].png differ diff --git a/text-inputs/out/failures/com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_success[Outlined,Dark].png b/text-inputs/out/failures/com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_success[Outlined,Dark].png new file mode 100644 index 00000000..687270fc Binary files /dev/null and b/text-inputs/out/failures/com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_success[Outlined,Dark].png differ diff --git a/text-inputs/out/failures/com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_success[OutlinedDropdown,Dark].png b/text-inputs/out/failures/com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_success[OutlinedDropdown,Dark].png new file mode 100644 index 00000000..016f7163 Binary files /dev/null and b/text-inputs/out/failures/com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_success[OutlinedDropdown,Dark].png differ diff --git a/text-inputs/out/failures/delta-com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Dark].png b/text-inputs/out/failures/delta-com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Dark].png new file mode 100644 index 00000000..dbe7fc81 Binary files /dev/null and b/text-inputs/out/failures/delta-com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Dark].png differ diff --git a/text-inputs/out/failures/delta-com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Light].png b/text-inputs/out/failures/delta-com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Light].png new file mode 100644 index 00000000..b54c0576 Binary files /dev/null and b/text-inputs/out/failures/delta-com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Light].png differ diff --git a/text-inputs/out/failures/delta-com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Dark].png b/text-inputs/out/failures/delta-com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Dark].png new file mode 100644 index 00000000..66dd0d75 Binary files /dev/null and b/text-inputs/out/failures/delta-com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Dark].png differ diff --git a/text-inputs/out/failures/delta-com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Light].png b/text-inputs/out/failures/delta-com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Light].png new file mode 100644 index 00000000..9c05eb0f Binary files /dev/null and b/text-inputs/out/failures/delta-com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Light].png differ diff --git a/text-inputs/out/failures/delta-com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_success[Outlined,Dark].png b/text-inputs/out/failures/delta-com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_success[Outlined,Dark].png new file mode 100644 index 00000000..4ab45239 Binary files /dev/null and b/text-inputs/out/failures/delta-com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_success[Outlined,Dark].png differ diff --git a/text-inputs/out/failures/delta-com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_success[OutlinedDropdown,Dark].png b/text-inputs/out/failures/delta-com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_success[OutlinedDropdown,Dark].png new file mode 100644 index 00000000..444e8e60 Binary files /dev/null and b/text-inputs/out/failures/delta-com.decathlon.vitamin.compose.textinputs_VitaminTextInputsPrimaryTest_success[OutlinedDropdown,Dark].png differ diff --git a/versions.properties b/versions.properties index 4178f1ca..bd418c1d 100644 --- a/versions.properties +++ b/versions.properties @@ -93,7 +93,7 @@ version.androidx.compose.ui=1.3.3 ## # available=1.5.0-alpha03 ## # available=1.5.0-alpha04 -version.androidx.compose.material=1.3.1 +version.androidx.compose.material=1.4.0 ## # available=1.4.0-alpha01 ## # available=1.4.0-alpha02 ## # available=1.4.0-alpha03