1. 优化显示代码

app/src/main/java/com/iscs/bozzys/ui/dialog/InputDialog.kt

@@ -39,7 +39,7 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import com.iscs.bozzys.ui.common.PageBase
-import com.iscs.bozzys.ui.pages.compose.CardContainer
+import com.iscs.bozzys.ui.pages.compose.CardBox
 import com.iscs.bozzys.ui.theme.Main
 import com.iscs.bozzys.ui.theme.Text
 
@@ -95,7 +95,7 @@ fun InputDialog(
                     onClick = {}),
             contentAlignment = Alignment.Center
         ) {
-            CardContainer(
+            CardBox(
                 topRadius = 16.dp,
                 bottomRadius = 16.dp,
                 modifier = Modifier

app/src/main/java/com/iscs/bozzys/ui/pages/compose/CardContainer.kt → app/src/main/java/com/iscs/bozzys/ui/pages/compose/CardBox.kt

@@ -23,7 +23,7 @@ import androidx.compose.ui.unit.max
  * 在部分老设备上没有效果
  */
 @Composable
-fun CardContainer(
+fun CardBox(
     modifier: Modifier = Modifier,
     topRadius: Dp = 12.dp,
     bottomRadius: Dp = 12.dp,

app/src/main/java/com/iscs/bozzys/ui/pages/compose/JobListItem.kt

@@ -40,7 +40,7 @@ fun JobListItem(job: Job) {
     val ctx = LocalContext.current
     // 获取等级名称和颜色
     val levelInfo = job.getLevelNameAndColor()
-    CardContainer(
+    CardBox(
         modifier = Modifier
             .padding(vertical = 5.dp)
             .fillMaxWidth()

app/src/main/java/com/iscs/bozzys/ui/pages/compose/TaskListItem.kt

@@ -39,7 +39,7 @@ fun TaskListItem(task: Task) {
     val ctx = LocalContext.current
     // 获取等级名称和颜色
     val levelInfo = task.getLevelNameAndColor()
-    CardContainer(
+    CardBox(
         modifier = Modifier
             .padding(vertical = 5.dp)
             .fillMaxWidth()

app/src/main/java/com/iscs/bozzys/ui/pages/create/job/PageCreateJob.kt

@@ -36,7 +36,7 @@ import com.iscs.bozzys.event.RefreshEvent
 import com.iscs.bozzys.event.RefreshEventBus
 import com.iscs.bozzys.ui.common.PageBase
 import com.iscs.bozzys.ui.common.Title
-import com.iscs.bozzys.ui.pages.compose.CardContainer
+import com.iscs.bozzys.ui.pages.compose.CardBox
 import com.iscs.bozzys.ui.pages.compose.FormContainer
 import com.iscs.bozzys.ui.pages.edit.step.openPageEditStep
 import com.iscs.bozzys.ui.pages.vm.VMCreateJob
@@ -71,7 +71,7 @@ class PageCreateJob : PageBase() {
                     .verticalScroll(state = rememberScrollState())
             ) {
                 // 表单内容
-                if (state.forms.isNotEmpty()) CardContainer(Modifier.padding(horizontal = 16.dp, vertical = 16.dp)) {
+                if (state.forms.isNotEmpty()) CardBox(Modifier.padding(horizontal = 16.dp, vertical = 16.dp)) {
                     FormContainer(
                         state.forms, {}, modifier = Modifier
                             .padding(horizontal = 10.dp)

app/src/main/java/com/iscs/bozzys/ui/pages/create/job/PagePushJob.kt

@@ -24,7 +24,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import com.iscs.bozzys.api.FormOption
 import com.iscs.bozzys.ui.common.PageBase
 import com.iscs.bozzys.ui.common.Title
-import com.iscs.bozzys.ui.pages.compose.CardContainer
+import com.iscs.bozzys.ui.pages.compose.CardBox
 import com.iscs.bozzys.ui.pages.compose.FormDateSelect
 import com.iscs.bozzys.ui.pages.compose.FormRadio
 import com.iscs.bozzys.ui.pages.vm.VMPushJob
@@ -55,7 +55,7 @@ class PagePushJob : PageBase() {
         }
         Column(Modifier.fillMaxSize()) {
             Title(pv, "发布作业")
-            CardContainer(modifier = Modifier.padding(16.dp)) {
+            CardBox(modifier = Modifier.padding(16.dp)) {
                 Column(
                     modifier = Modifier
                         .fillMaxWidth()

app/src/main/java/com/iscs/bozzys/ui/pages/detail/job/PageDetailJob.kt

@@ -43,7 +43,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import com.iscs.bozzys.R
 import com.iscs.bozzys.ui.common.PageBase
 import com.iscs.bozzys.ui.common.Title
-import com.iscs.bozzys.ui.pages.compose.CardContainer
+import com.iscs.bozzys.ui.pages.compose.CardBox
 import com.iscs.bozzys.ui.pages.create.job.openPageCreateJob
 import com.iscs.bozzys.ui.pages.edit.step.openPageEditStep
 import com.iscs.bozzys.ui.pages.vm.VMDetailJob
@@ -156,7 +156,7 @@ class PageDetailJob : PageBase() {
     @Composable
     fun JobInfo(vm: VMDetailJob) {
         val state by vm.state.collectAsState()
-        CardContainer(
+        CardBox(
             modifier = Modifier
                 .padding(16.dp)
                 .fillMaxWidth()
@@ -255,7 +255,7 @@ class PageDetailJob : PageBase() {
     @Composable
     fun JobProgress(vm: VMDetailJob) {
         val state by vm.state.collectAsState()
-        CardContainer(
+        CardBox(
             modifier = Modifier
                 .padding(16.dp)
                 .fillMaxWidth()

app/src/main/java/com/iscs/bozzys/ui/pages/detail/task/PageDetailTask.kt

@@ -41,7 +41,7 @@ import com.iscs.bozzys.R
 import com.iscs.bozzys.api.Task
 import com.iscs.bozzys.ui.common.PageBase
 import com.iscs.bozzys.ui.common.Title
-import com.iscs.bozzys.ui.pages.compose.CardContainer
+import com.iscs.bozzys.ui.pages.compose.CardBox
 import com.iscs.bozzys.ui.pages.compose.FormContainer
 import com.iscs.bozzys.ui.pages.vm.VMDetailTask
 import com.iscs.bozzys.ui.theme.Text
@@ -115,7 +115,7 @@ class PageDetailTask : PageBase() {
     @OptIn(ExperimentalLayoutApi::class)
     @Composable
     fun TaskInfo(task: Task) {
-        CardContainer(modifier = Modifier.fillMaxWidth()) {
+        CardBox(modifier = Modifier.fillMaxWidth()) {
             Column(Modifier.padding(10.dp)) {
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     Icon(
@@ -239,7 +239,7 @@ class PageDetailTask : PageBase() {
     @Composable
     fun TaskForm(vm: VMDetailTask) {
         val state by vm.state.collectAsState()
-        CardContainer(Modifier.padding(top = 10.dp)) {
+        CardBox(Modifier.padding(top = 10.dp)) {
             Column(
                 Modifier
                     .fillMaxWidth()
@@ -266,7 +266,7 @@ class PageDetailTask : PageBase() {
      */
     @Composable
     fun TaskDevice(vm: VMDetailTask) {
-        CardContainer(
+        CardBox(
             Modifier
                 .padding(top = 10.dp)
                 .fillMaxWidth()

app/src/main/java/com/iscs/bozzys/ui/pages/edit/step/PageEditStep.kt

@@ -60,7 +60,7 @@ import com.iscs.bozzys.event.RefreshEventBus
 import com.iscs.bozzys.ui.common.PageBase
 import com.iscs.bozzys.ui.dialog.TipsDialog
 import com.iscs.bozzys.ui.common.Title
-import com.iscs.bozzys.ui.pages.compose.CardContainer
+import com.iscs.bozzys.ui.pages.compose.CardBox
 import com.iscs.bozzys.ui.pages.compose.FormContainer
 import com.iscs.bozzys.ui.pages.create.job.openPagePushJob
 import com.iscs.bozzys.ui.pages.edit.step.compose.NodeItem
@@ -311,7 +311,7 @@ fun FormDialog(
                 },
             contentAlignment = Alignment.BottomCenter
         ) {
-            CardContainer(
+            CardBox(
                 topRadius = 16.dp,
                 bottomRadius = 0.dp,
                 modifier = Modifier

app/src/main/java/com/iscs/bozzys/ui/pages/edit/step/compose/NodeUI.kt

@@ -43,7 +43,7 @@ import androidx.compose.ui.unit.toSize
 import androidx.compose.ui.zIndex
 import com.iscs.bozzys.R
 import com.iscs.bozzys.api.Node
-import com.iscs.bozzys.ui.pages.compose.CardContainer
+import com.iscs.bozzys.ui.pages.compose.CardBox
 import com.iscs.bozzys.ui.theme.Main
 import com.iscs.bozzys.ui.theme.Text
 
@@ -131,7 +131,7 @@ fun NodeItem(
         targetValue = 0.8f,
         animationSpec = infiniteRepeatable(animation = tween(durationMillis = 1000, easing = LinearEasing), repeatMode = RepeatMode.Reverse)
     )
-    CardContainer(
+    CardBox(
         modifier = modifier
             .size(node.baseSize.width.dp, node.baseSize.height.dp)
             .offset(node.position.x.dp, node.position.y.dp)

app/src/main/java/com/iscs/bozzys/ui/pages/edit/step/compose/ZoomContainer.kt

@@ -40,7 +40,7 @@ import androidx.compose.ui.zIndex
 import com.iscs.bozzys.R
 import com.iscs.bozzys.event.RefreshEvent
 import com.iscs.bozzys.event.RefreshEventBus
-import com.iscs.bozzys.ui.pages.compose.CardContainer
+import com.iscs.bozzys.ui.pages.compose.CardBox
 import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 import kotlin.math.ceil
@@ -150,7 +150,7 @@ fun ZoomPanContainer(
             .transformable(transformState)
     ) {
         // 右上角缩放控件
-        CardContainer(
+        CardBox(
             modifier = Modifier
                 .zIndex(6f)
                 .padding(10.dp)

app/src/main/java/com/iscs/bozzys/ui/pages/home/HomeCompose.kt

@@ -1,6 +1,5 @@
 package com.iscs.bozzys.ui.pages.home
 
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -50,7 +49,7 @@ import androidx.compose.ui.zIndex
 import coil.compose.AsyncImage
 import com.iscs.bozzys.R
 import com.iscs.bozzys.api.Message
-import com.iscs.bozzys.ui.pages.compose.CardContainer
+import com.iscs.bozzys.ui.pages.compose.CardBox
 import com.iscs.bozzys.ui.pages.compose.TaskListItem
 import com.iscs.bozzys.ui.pages.message.openPageMessage
 import com.iscs.bozzys.ui.pages.vm.VMHome
@@ -291,7 +290,7 @@ private fun TaskList(pv: PaddingValues, vm: VMHome) {
             Spacer(Modifier.weight(1f))
             Text("查看全部", fontSize = 14.sp, color = Color(0xFF1E90FF))
         }
-        if (state.homeTasks.isEmpty()) CardContainer(
+        if (state.homeTasks.isEmpty()) CardBox(
             modifier = Modifier
                 .padding(vertical = 5.dp)
                 .fillMaxWidth()
@@ -328,7 +327,7 @@ private fun TaskList(pv: PaddingValues, vm: VMHome) {
             Spacer(Modifier.weight(1f))
             Text("全部消息", fontSize = 14.sp, color = Color(0xFF1E90FF))
         }
-        if (state.messageList.isEmpty()) CardContainer(
+        if (state.messageList.isEmpty()) CardBox(
             modifier = Modifier
                 .padding(vertical = 5.dp)
                 .fillMaxWidth()
@@ -353,7 +352,7 @@ private fun TaskList(pv: PaddingValues, vm: VMHome) {
 
 @Composable
 fun MessageListItem(msg: Message, vm: VMHome) {
-    CardContainer(modifier = Modifier.padding(vertical = 8.dp)) {
+    CardBox(modifier = Modifier.padding(vertical = 8.dp)) {
         Row(
             Modifier
                 .fillMaxWidth()

app/src/main/java/com/iscs/bozzys/ui/pages/home/SettingsCompose.kt

@@ -44,12 +44,8 @@ import androidx.compose.ui.zIndex
 import coil.compose.AsyncImage
 import com.iscs.bozzys.R
 import com.iscs.bozzys.event.AuthEventBus
-import com.iscs.bozzys.event.RefreshEvent
-import com.iscs.bozzys.event.RefreshEventBus
-import com.iscs.bozzys.ui.common.PageBase
 import com.iscs.bozzys.ui.dialog.TipsDialog
-import com.iscs.bozzys.ui.pages.compose.CardContainer
-import com.iscs.bozzys.ui.pages.login.openPageLogin
+import com.iscs.bozzys.ui.pages.compose.CardBox
 import com.iscs.bozzys.ui.pages.profile.openPageProfile
 import com.iscs.bozzys.ui.pages.vm.VMHome
 import com.iscs.bozzys.ui.theme.Text
@@ -81,7 +77,7 @@ fun SettingsCompose(pv: PaddingValues, zIndex: Float, vm: VMHome) {
         // 用户信息
         UserInfo(vm)
         // 开启指纹登录
-        if (fingerSupport) CardContainer(
+        if (fingerSupport) CardBox(
             modifier = Modifier
                 .padding(horizontal = 16.dp)
                 .height(46.dp)
@@ -185,7 +181,7 @@ private fun TopToolBar(pv: PaddingValues, vm: VMHome) {
 private fun UserInfo(vm: VMHome) {
     val ctx = LocalContext.current
     val state by vm.state.collectAsState()
-    CardContainer(modifier = Modifier.padding(16.dp)) {
+    CardBox(modifier = Modifier.padding(16.dp)) {
         Row(
             modifier = Modifier
                 .fillMaxWidth()

app/src/main/java/com/iscs/bozzys/ui/pages/message/PageMessage.kt

@@ -48,7 +48,7 @@ import com.iscs.bozzys.api.Message
 import com.iscs.bozzys.ui.common.Empty
 import com.iscs.bozzys.ui.common.PageBase
 import com.iscs.bozzys.ui.dialog.TipsDialog
-import com.iscs.bozzys.ui.pages.compose.CardContainer
+import com.iscs.bozzys.ui.pages.compose.CardBox
 import com.iscs.bozzys.ui.pages.vm.StatePageMessage
 import com.iscs.bozzys.ui.pages.vm.VMMessage
 import com.iscs.bozzys.ui.theme.Text
@@ -253,7 +253,7 @@ private fun MessageListItemTitle(message: Message) {
  */
 @Composable
 private fun MessageListItemContent(vm: VMMessage, msg: Message) {
-    CardContainer(modifier = Modifier.padding(vertical = 8.dp, horizontal = 16.dp)) {
+    CardBox(modifier = Modifier.padding(vertical = 8.dp, horizontal = 16.dp)) {
         Row(
             Modifier
                 .fillMaxWidth()

app/src/main/java/com/iscs/bozzys/ui/pages/profile/PageProfile.kt

@@ -66,7 +66,7 @@ import com.iscs.bozzys.api.User
 import com.iscs.bozzys.ui.common.PageBase
 import com.iscs.bozzys.ui.common.Title
 import com.iscs.bozzys.ui.dialog.TipsDialog
-import com.iscs.bozzys.ui.pages.compose.CardContainer
+import com.iscs.bozzys.ui.pages.compose.CardBox
 import com.iscs.bozzys.ui.pages.vm.VMProfile
 import com.iscs.bozzys.ui.theme.Main
 import com.iscs.bozzys.ui.theme.Text
@@ -134,7 +134,7 @@ class PageProfile : PageBase() {
         Column(horizontalAlignment = Alignment.CenterHorizontally) {
             Title(pv, "个人信息")
             // 头像信息
-            CardContainer(modifier = Modifier.padding(16.dp), topRadius = 16.dp, bottomRadius = 16.dp) {
+            CardBox(modifier = Modifier.padding(16.dp), topRadius = 16.dp, bottomRadius = 16.dp) {
                 // 头像布局
                 Column {
                     Row(
@@ -184,7 +184,7 @@ class PageProfile : PageBase() {
                 }
             }
             // 其他属性
-            CardContainer(
+            CardBox(
                 modifier = Modifier
                     .padding(horizontal = 16.dp)
                     .padding(bottom = 16.dp), topRadius = 16.dp, bottomRadius = 16.dp
@@ -303,7 +303,7 @@ class PageProfile : PageBase() {
                 }
             }
             // 其他操作逻辑
-            CardContainer(
+            CardBox(
                 modifier = Modifier
                     .padding(horizontal = 16.dp)
                     .padding(bottom = 16.dp), topRadius = 16.dp, bottomRadius = 16.dp
@@ -411,7 +411,7 @@ class PageProfile : PageBase() {
                         onClick = {}),
                 contentAlignment = Alignment.Center
             ) {
-                CardContainer(
+                CardBox(
                     topRadius = 16.dp,
                     bottomRadius = 16.dp,
                     modifier = Modifier

app/src/main/java/com/iscs/bozzys/ui/pages/select/job/PageSelectJobType.kt

@@ -43,7 +43,7 @@ import androidx.compose.ui.unit.sp
 import com.iscs.bozzys.R
 import com.iscs.bozzys.ui.common.PageBase
 import com.iscs.bozzys.ui.common.Title
-import com.iscs.bozzys.ui.pages.compose.CardContainer
+import com.iscs.bozzys.ui.pages.compose.CardBox
 import com.iscs.bozzys.ui.pages.create.job.openPageCreateJob
 import com.iscs.bozzys.ui.theme.Main
 
@@ -100,7 +100,7 @@ class PageSelectJobType : PageBase() {
             // 底部显示内容
             LazyColumn(Modifier.fillMaxSize()) {
                 item {
-                    CardContainer(Modifier.padding(16.dp)) {
+                    CardBox(Modifier.padding(16.dp)) {
                         // 确定数据后，这里的代码应该抽离为一个组件
                         Column(Modifier.fillMaxWidth()) {
                             Row(