Merge pull request #104 from mtotschnig/StrokeCapCompose

[Compose] Allow configuration of StrokeCap

Author: matejsemancik

library-compose/src/main/java/app/futured/donut/compose/Donut.kt

@@ -103,7 +103,7 @@ private fun DrawDonut(model: DonutModel, donutProgressValues: DonutProgressValue
     val wholeDonutAngle = 360f - gapWidthDegrees
     val masterSegmentAngle = wholeDonutAngle * masterProgress
     val startAngle = gapAngleDegrees + gapWidthDegrees / 2
-    val strokeCap = StrokeCap.Round // TODO StrokeCap feature
+    val strokeCap = model.strokeCap
 
     val masterPathData = DonutPathDataEntry(
         color = backgroundLineColor,

library-compose/src/main/java/app/futured/donut/compose/data/DonutModel.kt

@@ -1,6 +1,7 @@
 package app.futured.donut.compose.data
 
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.StrokeCap
 import app.futured.donut.compose.DonutProgress
 import app.futured.donut.compose.internal.extensions.sumByFloat
 
@@ -16,6 +17,7 @@ import app.futured.donut.compose.internal.extensions.sumByFloat
  * @param gapAngleDegrees The angle in degrees, at which the gap will be displayed. Eg. when set to 90° then donut
  * will be rotated by 90° clockwise.
  * @param strokeWidth Stroke width of all lines in pixels.
+ * @param strokeCap Stroke cap of all lines
  * @param backgroundLineColor The color of the donut background line.
  * @param sections The data used to define each section of the donut. This data should keep the same size
  * since adding or removing of the new section is not supported yet. If the size of this list is changed then
@@ -27,6 +29,7 @@ data class DonutModel(
     val gapWidthDegrees: Float = 90f,
     val gapAngleDegrees: Float = 90f,
     val strokeWidth: Float = 30f,
+    val strokeCap: StrokeCap = StrokeCap.Round,
     val backgroundLineColor: Color = Color.LightGray,
     val sections: List<DonutSection>
 ) {

sample/src/main/kotlin/app/futured/donutsample/ui/playground/compose/PlaygroundComposeActivity.kt

@@ -19,6 +19,7 @@ import androidx.compose.animation.core.tween
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.platform.ComposeView
 import app.futured.donut.compose.data.DonutConfig
 import app.futured.donut.compose.data.DonutModel
@@ -211,6 +212,14 @@ class PlaygroundComposeActivity : AppCompatActivity() {
             updateAnimationSpecs()
         }
         //endregion
+
+        findViewById<RadioGroup>(R.id.stroke_caps_radio_group).setOnCheckedChangeListener { _, checkedId ->
+            mutateData { data -> data.copy(strokeCap = when (checkedId) {
+                R.id.stroke_cap_round -> StrokeCap.Round
+                R.id.stroke_cap_butt -> StrokeCap.Butt
+                else -> error("Unexpected id: $checkedId")
+            }) }
+        }
     }
 
     private fun updateAnimationSpecs() {

sample/src/main/res/layout/activity_playground.xml

@@ -329,39 +329,7 @@
 
             </HorizontalScrollView>
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:text="@string/animation_stroke_caps"/>
-
-            <HorizontalScrollView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <RadioGroup
-                    android:id="@+id/stroke_caps_radio_group"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <androidx.appcompat.widget.AppCompatRadioButton
-                        android:id="@+id/stroke_cap_round"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="8dp"
-                        android:checked="true"
-                        android:text="@string/stroke_cap_round"/>
-
-                    <androidx.appcompat.widget.AppCompatRadioButton
-                        android:id="@+id/stroke_cap_butt"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/stroke_cap_butt"/>
-
-                </RadioGroup>
-
-            </HorizontalScrollView>
+            <include layout="@layout/pick_stroke_cap" />
 
         </LinearLayout>
 

sample/src/main/res/layout/activity_playground_compose.xml

@@ -306,6 +306,8 @@
 
             </HorizontalScrollView>
 
+            <include layout="@layout/pick_stroke_cap" />
+
         </LinearLayout>
 
     </ScrollView>

sample/src/main/res/layout/pick_stroke_cap.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:showIn="@layout/activity_playground">
+
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/animation_stroke_caps" />
+
+    <HorizontalScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <RadioGroup
+            android:id="@+id/stroke_caps_radio_group"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <androidx.appcompat.widget.AppCompatRadioButton
+                android:id="@+id/stroke_cap_round"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:checked="true"
+                android:text="@string/stroke_cap_round" />
+
+            <androidx.appcompat.widget.AppCompatRadioButton
+                android:id="@+id/stroke_cap_butt"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/stroke_cap_butt" />
+
+        </RadioGroup>
+
+    </HorizontalScrollView>
+</merge>