canvas的基础

iOrchid · May 19, 2024 · 8c5a4cc · 8c5a4cc
1 parent 3cfdceb
commit 8c5a4cc
Show file tree

Hide file tree

Showing 4 changed files with 629 additions and 4 deletions.
diff --git a/compose/src/main/java/org/zhiwei/compose/model/Screen.kt b/compose/src/main/java/org/zhiwei/compose/model/Screen.kt
@@ -21,6 +21,7 @@ import org.zhiwei.compose.screen.gesture.SwipeScroll_Screen
 import org.zhiwei.compose.screen.gesture.TapDragGestures_Screen
 import org.zhiwei.compose.screen.gesture.TouchImage_Screen
 import org.zhiwei.compose.screen.gesture.TransformGestures_Screen
+import org.zhiwei.compose.screen.graphics.CanvasBasic_Screen
 import org.zhiwei.compose.screen.layout_state.ConstraintLayout_Screen
 import org.zhiwei.compose.screen.layout_state.Constraints_Screen
 import org.zhiwei.compose.screen.layout_state.CustomModifier_Screen
@@ -39,6 +40,7 @@ internal fun configPageRoute(modifier: Modifier, onBack: (() -> Unit) = {}): Lis
     list.addAll(BasicScreenUIs.basicCourses(modifier, onBack))
     list.addAll(LayoutStateScreenUIs.layoutCourses(modifier))
     list.addAll(GestureScreenUIs.layoutCourses(modifier))
+    list.addAll(GraphicsScreenUIs.layoutCourses(modifier))
     return list
 }
 
@@ -187,3 +189,18 @@ internal object GestureScreenUIs {
 }
 
 //endregion
+
+
+//region canvas 图像图形相关
+
+internal object GraphicsScreenUIs {
+
+    internal fun layoutCourses(modifier: Modifier = Modifier) = listOf(
+        CourseItemModel(
+            "CanvasBasic",
+            "图像图形中最重要的概念，canvas画布，此处演示最基本的使用，绘制点线面和图片。"
+        ) { CanvasBasic_Screen(modifier) },
+    )
+}
+
+//endregion
diff --git a/compose/src/main/java/org/zhiwei/compose/screen/HomeScreen.kt b/compose/src/main/java/org/zhiwei/compose/screen/HomeScreen.kt
@@ -33,7 +33,7 @@ import org.zhiwei.compose.model.TabPagerModel
 import org.zhiwei.compose.model.configPageRoute
 import org.zhiwei.compose.screen.basic.Basic_Screen
 import org.zhiwei.compose.screen.gesture.Gesture_Screen
-import org.zhiwei.compose.screen.graphics.GraphicsScreen
+import org.zhiwei.compose.screen.graphics.Graphics_Screen
 import org.zhiwei.compose.screen.layout_state.LayoutState_Screen
 
 /**
@@ -92,7 +92,7 @@ private fun HomeScreenContent(modifier: Modifier, navController: NavController)
                 TabPagerModel("基础组件") { Basic_Screen(navController = navController) },
                 TabPagerModel("布局与状态") { LayoutState_Screen(navController) },
                 TabPagerModel("手势") { Gesture_Screen(navController) },
-                TabPagerModel("图像") { GraphicsScreen() },
+                TabPagerModel("图像") { Graphics_Screen(navController) },
             )
         //这个是用于记录tabRow和Pager的状态，用于tab和pager的联动，后续会学到。
         val pagerState: PagerState = rememberPagerState(