add chip sample to list

Author: SmartToolFactory

Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter2_material_widgets/Tutorial2_15ChipAndTextLayout.kt

@@ -69,12 +69,16 @@ import com.smarttoolfactory.tutorial1_1basics.ui.Green400
 import kotlinx.coroutines.delay
 import java.util.UUID
 
-@Immutable
-data class ChipData(
-    val uri: Uri,
-    val text: String,
-    val id: String = UUID.randomUUID().toString()
-)
+@Preview(showBackground = true)
+@Composable
+fun Tutorial2_15Screen() {
+    TutorialContent()
+}
+
+@Composable
+private fun TutorialContent() {
+    ChipSampleAndTextLayoutSample()
+}
 
 @Preview(showBackground = true)
 @Composable
@@ -106,7 +110,7 @@ private fun ChipSampleAndTextLayoutSample() {
 private fun MyChip(
     backgroundColor: Color,
     data: ChipData,
-    onDeleteClick: () -> Unit
+    onDeleteClick: () -> Unit,
 ) {
     Chip(
         modifier = Modifier,
@@ -160,7 +164,7 @@ fun ChipAndTextFieldLayout(
     backgroundColor: Color,
     list: List<ChipData> = emptyList(),
     onChipCreated: (ChipData) -> Unit,
-    chip: @Composable (data: ChipData, index: Int) -> Unit
+    chip: @Composable (data: ChipData, index: Int) -> Unit,
 ) {
 
     var text by remember {
@@ -251,3 +255,10 @@ fun ChipAndTextFieldLayout(
         }
     }
 }
+
+@Immutable
+data class ChipData(
+    val uri: Uri,
+    val text: String,
+    val id: String = UUID.randomUUID().toString(),
+)

Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter6_graphics/Tutorial6_11EraseProgress.kt

@@ -174,7 +174,6 @@ fun EraseBitmapSample(imageBitmap: ImageBitmap, modifier: Modifier) {
             val canvasWidth = nativeCanvas.width.toFloat()
             val canvasHeight = nativeCanvas.height.toFloat()
 
-
             when (motionEvent) {
 
                 MotionEvent.Down -> {
@@ -184,12 +183,11 @@ fun EraseBitmapSample(imageBitmap: ImageBitmap, modifier: Modifier) {
                 }
                 MotionEvent.Move -> {
 
-                    erasePath.quadraticBezierTo(
+                    erasePath.quadraticTo(
                         previousPosition.x,
                         previousPosition.y,
                         (previousPosition.x + currentPosition.x) / 2,
                         (previousPosition.y + currentPosition.y) / 2
-
                     )
                     previousPosition = currentPosition
                 }
@@ -206,8 +204,6 @@ fun EraseBitmapSample(imageBitmap: ImageBitmap, modifier: Modifier) {
             with(canvas.nativeCanvas) {
                 drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR)
 
-
-
                 drawImageRect(
                     image = drawImageBitmap,
                     dstSize = IntSize(canvasWidth.toInt(), canvasHeight.toInt()),

Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter6_graphics/Tutorial6_27rememberVectorPainter.kt

@@ -52,6 +52,7 @@ private fun TutorialContent() {
 
     }
 }
+
 @Preview
 @Composable
 private fun CustomVectorDrawableSample() {
@@ -66,7 +67,7 @@ private fun CustomVectorDrawableSample() {
                 .background(Blue400)
                 .fillMaxWidth()
                 .aspectRatio(1f),
-            index.toInt()
+            selectedIndex = index.toInt()
         )
 
         Slider(
@@ -116,42 +117,24 @@ fun Netherlands(modifier: Modifier = Modifier, selectedIndex: Int) {
 
             val center = pathForSize.getBounds().center
 
-            if (selectedIndex == index) {
-                selectedProvince = province
+            Group(
+                name = province,
+                scaleX = 1.0f,
+                scaleY = 1.0f,
+                pivotX = center.x,
+                pivotY = center.y
+            ) {
+                for (path in paths) {
+                    androidx.compose.ui.graphics.vector.Path(
+                        stroke = SolidColor(Blue400),
+                        pathData = path,
+                        fill = SolidColor(Color.Black)
+                    )
+                }
             }
 
-            if (selectedIndex != index) {
-                Group(
-                    name = province,
-                    scaleX = 1.0f,
-                    scaleY = 1.0f,
-                    pivotX = center.x,
-                    pivotY = center.y
-                ) {
-                    for (path in paths) {
-                        androidx.compose.ui.graphics.vector.Path(
-                            stroke = SolidColor(Blue400),
-                            pathData = path,
-                            fill = SolidColor(Color.Black),
-                        )
-                    }
-                }
-            } else {
-                Group(
-                    name = province,
-                    scaleX = 1.0f,
-                    scaleY = 1.0f,
-                    pivotX = center.x,
-                    pivotY = center.y
-                ) {
-                    for (path in paths) {
-                        androidx.compose.ui.graphics.vector.Path(
-                            stroke = SolidColor(Blue400),
-                            pathData = path,
-                            fill = SolidColor(Blue400),
-                        )
-                    }
-                }
+            if (selectedIndex == index) {
+                selectedProvince = province
             }
 
             index++

Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter6_graphics/Tutorial6_33StoppableInfiniteAnimation.kt

@@ -100,12 +100,14 @@ private fun StoppableInfiniteAnimationSample() {
 
         Spacer(Modifier.height(16.dp))
         Text(
+            modifier = Modifier.padding(horizontal = 16.dp),
             text = "Angle: ${rotateAnimationState.angle.toInt()}\n" +
                     "status: ${rotateAnimationState.rotationStatus}",
-            fontSize = 16.sp
+            fontSize = 24.sp
         )
 
         Button(
+            modifier = Modifier.padding(horizontal = 16.dp).fillMaxWidth(),
             onClick = {
                 rotateAnimationState.start()
             }
@@ -114,6 +116,7 @@ private fun StoppableInfiniteAnimationSample() {
         }
 
         Button(
+            modifier = Modifier.padding(horizontal = 16.dp).fillMaxWidth(),
             onClick = {
                 rotateAnimationState.stop()
             }
@@ -125,7 +128,7 @@ private fun StoppableInfiniteAnimationSample() {
 
 class RotateAnimationState(
     val coroutineScope: CoroutineScope,
-    val duration: Int
+    val duration: Int,
 ) {
     val angle: Float
         get() = animatable.value

Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/tutorial_list/TutorialList.kt

@@ -20,6 +20,7 @@ import com.smarttoolfactory.tutorial1_1basics.chapter2_material_widgets.Tutorial
 import com.smarttoolfactory.tutorial1_1basics.chapter2_material_widgets.Tutorial2_12Screen
 import com.smarttoolfactory.tutorial1_1basics.chapter2_material_widgets.Tutorial2_13Screen
 import com.smarttoolfactory.tutorial1_1basics.chapter2_material_widgets.Tutorial2_14Screen
+import com.smarttoolfactory.tutorial1_1basics.chapter2_material_widgets.Tutorial2_15Screen
 import com.smarttoolfactory.tutorial1_1basics.chapter2_material_widgets.Tutorial2_1Screen
 import com.smarttoolfactory.tutorial1_1basics.chapter2_material_widgets.Tutorial2_2Screen
 import com.smarttoolfactory.tutorial1_1basics.chapter2_material_widgets.Tutorial2_3Screen
@@ -642,6 +643,21 @@ fun createComponentTutorialList(onBack: () -> Unit): List<TutorialSectionModel>
         )
     )
 
+    val tutorial2_15 = TutorialSectionModel(
+        title = stringResource(R.string.title2_15),
+        description = "Add chips after text is entered and image is selected.",
+        action = {
+            Tutorial2_15Screen()
+        },
+        tags = listOf(
+            TAG_COMPOSE,
+            TAG_CHIP,
+            TAG_TEXT_FIELD,
+            TAG_IMAGE,
+            TAG_SNAPSHOT_STATE_LIST
+        )
+    )
+
     return listOf(
         tutorial1_1,
         tutorial1_2,
@@ -672,7 +688,8 @@ fun createComponentTutorialList(onBack: () -> Unit): List<TutorialSectionModel>
         tutorial2_11,
         tutorial2_12,
         tutorial2_13,
-        tutorial2_14
+        tutorial2_14,
+        tutorial2_15
     )
 }
 

Tutorial1-1Basics/src/main/res/values/strings.xml

@@ -30,6 +30,7 @@
     <string name="title2_12">2-12 Dialog</string>
     <string name="title2_13">2-13 SwipeToDismiss</string>
     <string name="title2_14">2-14 LazyColumn Checkbox</string>
+    <string name="title2_15">2-15 Chip and TextField</string>
     <string name="title3_1_1">3-1-1 Custom Modifier</string>
     <string name="title3_1_2">3-1-2 onGloballyPositioned</string>
     <string name="title3_1_3">3-1-3 graphicsLayer</string>