fix(progressbars): add rounded corner to progress bars

Decathlon · Jun 30, 2023 · c0f3c9a · c0f3c9a
1 parent 17f6945
commit c0f3c9a
Show file tree

Hide file tree

Showing 28 changed files with 14 additions and 9 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -36,5 +36,5 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21")
     implementation("com.vanniktech:gradle-maven-publish-plugin:0.18.0")
     implementation("app.cash.licensee:licensee-gradle-plugin:1.4.1")
-    implementation("app.cash.paparazzi:paparazzi-gradle-plugin:1.2.0")
+    implementation("app.cash.paparazzi:paparazzi-gradle-plugin:1.3.0")
 }
diff --git 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
@@ -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/...vitamin.compose.buttons_VitaminCircularProgressPrimaryTest_extraSmall[Dark].png b/...vitamin.compose.buttons_VitaminCircularProgressPrimaryTest_extraSmall[Dark].png
diff --git a/...itamin.compose.buttons_VitaminCircularProgressPrimaryTest_extraSmall[Light].png b/...itamin.compose.buttons_VitaminCircularProgressPrimaryTest_extraSmall[Light].png
diff --git a/...lon.vitamin.compose.buttons_VitaminCircularProgressPrimaryTest_medium[Dark].png b/...lon.vitamin.compose.buttons_VitaminCircularProgressPrimaryTest_medium[Dark].png
diff --git a/...on.vitamin.compose.buttons_VitaminCircularProgressPrimaryTest_medium[Light].png b/...on.vitamin.compose.buttons_VitaminCircularProgressPrimaryTest_medium[Light].png
diff --git a/...hlon.vitamin.compose.buttons_VitaminCircularProgressPrimaryTest_small[Dark].png b/...hlon.vitamin.compose.buttons_VitaminCircularProgressPrimaryTest_small[Dark].png
diff --git a/...lon.vitamin.compose.buttons_VitaminCircularProgressPrimaryTest_small[Light].png b/...lon.vitamin.compose.buttons_VitaminCircularProgressPrimaryTest_small[Light].png
diff --git a/...athlon.vitamin.compose.buttons_VitaminLinearProgressPrimaryTest_large[Dark].png b/...athlon.vitamin.compose.buttons_VitaminLinearProgressPrimaryTest_large[Dark].png
diff --git a/...thlon.vitamin.compose.buttons_VitaminLinearProgressPrimaryTest_large[Light].png b/...thlon.vitamin.compose.buttons_VitaminLinearProgressPrimaryTest_large[Light].png
diff --git a/...thlon.vitamin.compose.buttons_VitaminLinearProgressPrimaryTest_medium[Dark].png b/...thlon.vitamin.compose.buttons_VitaminLinearProgressPrimaryTest_medium[Dark].png
diff --git a/...hlon.vitamin.compose.buttons_VitaminLinearProgressPrimaryTest_medium[Light].png b/...hlon.vitamin.compose.buttons_VitaminLinearProgressPrimaryTest_medium[Light].png
diff --git a/...athlon.vitamin.compose.buttons_VitaminLinearProgressPrimaryTest_small[Dark].png b/...athlon.vitamin.compose.buttons_VitaminLinearProgressPrimaryTest_small[Dark].png
diff --git a/...thlon.vitamin.compose.buttons_VitaminLinearProgressPrimaryTest_small[Light].png b/...thlon.vitamin.compose.buttons_VitaminLinearProgressPrimaryTest_small[Light].png
diff --git a/...tamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Dark].png b/...tamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Dark].png
diff --git a/...amin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Light].png b/...amin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Light].png
diff --git a/...mpose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Dark].png b/...mpose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Dark].png
diff --git a/...pose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Light].png b/...pose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Light].png
diff --git a/...amin.compose.textinputs_VitaminTextInputsPrimaryTest_success[Outlined,Dark].png b/...amin.compose.textinputs_VitaminTextInputsPrimaryTest_success[Outlined,Dark].png
diff --git a/...pose.textinputs_VitaminTextInputsPrimaryTest_success[OutlinedDropdown,Dark].png b/...pose.textinputs_VitaminTextInputsPrimaryTest_success[OutlinedDropdown,Dark].png
diff --git a/...tamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Dark].png b/...tamin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Dark].png
diff --git a/...amin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Light].png b/...amin.compose.textinputs_VitaminTextInputsPrimaryTest_normal[Outlined,Light].png
diff --git a/...mpose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Dark].png b/...mpose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Dark].png
diff --git a/...pose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Light].png b/...pose.textinputs_VitaminTextInputsPrimaryTest_normal[OutlinedDropdown,Light].png
diff --git a/...amin.compose.textinputs_VitaminTextInputsPrimaryTest_success[Outlined,Dark].png b/...amin.compose.textinputs_VitaminTextInputsPrimaryTest_success[Outlined,Dark].png
diff --git a/...pose.textinputs_VitaminTextInputsPrimaryTest_success[OutlinedDropdown,Dark].png b/...pose.textinputs_VitaminTextInputsPrimaryTest_success[OutlinedDropdown,Dark].png
diff --git 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