Browse Source

@fun: task

bai 3 years ago
parent
commit
50fbfda35b

+ 5 - 0
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/main/Main.kt

@@ -11,6 +11,7 @@ import com.ys.bdtp.adm.mvvm.ui.screen.flash.Flash
 import com.ys.bdtp.adm.mvvm.ui.screen.login.LoginScreen
 import com.ys.bdtp.adm.mvvm.ui.screen.project.Project
 import com.ys.bdtp.adm.mvvm.ui.screen.task.Task
+import com.ys.bdtp.adm.mvvm.ui.screen.task.Tasks
 
 
 object Main {
@@ -18,6 +19,7 @@ object Main {
     const val Login = "login"
     const val Project = "project"
     const val Task = "task"
+    const val Tasks = "tasks"
 }
 
 val LocalNavHostController = compositionLocalOf<NavHostController?> { null }
@@ -39,6 +41,9 @@ fun Main() {
             composable("${Main.Task}/{projectId}") { backStackEntry ->
                 Task(backStackEntry.arguments?.getString("projectId")!!)
             }
+            composable(Main.Tasks) {
+                Tasks()
+            }
         }
 
     }

+ 5 - 6
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/task/Task.kt

@@ -24,6 +24,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.ys.bdtp.adm.R
+import com.ys.bdtp.adm.app.theme.underColor
 import com.ys.bdtp.adm.mvvm.model.db.entity.ProjectEntity
 import com.ys.bdtp.adm.mvvm.ui.compose.Head
 import com.ys.bdtp.adm.mvvm.ui.compose.TaskType
@@ -58,18 +59,17 @@ fun Task(projectId: String) {
                 )
             }
         )
-
         Spacer(
             modifier = Modifier.fillMaxWidth().height(1.dp).background(Color(0xFFEFF0F1))
         )
 
-
         Row {
             Box(
                 modifier = Modifier
                     .fillMaxHeight()
                     .wrapContentWidth()
-                    .padding(horizontal = 32.dp, vertical = 42.dp)
+                    .background(color = underColor)
+                    .padding(horizontal = 32.dp, vertical = 30.dp)
             ) {
                 // 工作分类
                 Column(
@@ -85,7 +85,6 @@ fun Task(projectId: String) {
                     Spacer(modifier = Modifier.height(20.dp))
                     TaskType(R.drawable.project_task_offline, "离线数据")
                 }
-
                 // 项目切换
 
             }
@@ -96,10 +95,10 @@ fun Task(projectId: String) {
                 modifier = Modifier
                     .fillMaxHeight()
                     .wrapContentWidth()
-                    .padding(horizontal = 32.dp, vertical = 42.dp)
+                    .padding(horizontal = 40.dp, vertical = 32.dp)
             ) {
                 //ProjectBlank()
-                ProjectTask()
+                TaskContent("查看全部项目任务")
             }
         }
     }

+ 29 - 22
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/task/ProjectRecentTask.kt

@@ -1,14 +1,10 @@
 package com.ys.bdtp.adm.mvvm.ui.screen.task
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.Text
+import androidx.compose.material.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -18,15 +14,20 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.ys.bdtp.adm.mvvm.ui.screen.main.LocalNavHostController
+import com.ys.bdtp.adm.mvvm.ui.screen.main.Main
 
-// 3 7
+/**
+ * 近期任务组件
+ */
 @Composable
-fun ProjectTask() {
+fun TaskContent(title: String) {
+    val nav = LocalNavHostController.current!!
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .background(Color.White)
-            //.padding(horizontal = 48.dp, vertical = 44.dp)
+            .background(Color.White),
+        horizontalAlignment = Alignment.CenterHorizontally
     ) {
         Text(
             text = "近期负责的项目任务",
@@ -37,12 +38,12 @@ fun ProjectTask() {
         )
         Spacer(modifier = Modifier.fillMaxWidth().height(20.dp))
 
-        ProjectRecentTaskTitle()
+        TaskTitle()
 
-        LazyColumn(modifier = Modifier.fillMaxWidth().height(360.dp)) {
+        LazyColumn(modifier = Modifier.fillMaxWidth().height(380.dp)) {
             items(20) {
-                Box{
-                    ProjectRecentTaskItem()
+                Box {
+                    TaskItem()
                     Spacer(
                         modifier = Modifier
                             .align(Alignment.BottomCenter)
@@ -53,13 +54,19 @@ fun ProjectTask() {
             }
         }
         Spacer(modifier = Modifier.fillMaxWidth().height(40.dp))
-        Text(
-            text = "查看全部项目任务",
-            fontSize = 14.sp,
-            color = Color(0xFF0091FF),
-            textAlign = TextAlign.Center,
-            modifier = Modifier.fillMaxWidth().height(20.dp)
-        )
+        TextButton(
+            onClick = {
+                nav.navigate(Main.Tasks)
+            },
+            modifier = Modifier.wrapContentWidth()
+        ) {
+            Text(
+                text = title,
+                fontSize = 14.sp,
+                color = Color(0xFF0091FF),
+                textAlign = TextAlign.Center,
+            )
+        }
     }
 }
 
@@ -67,5 +74,5 @@ fun ProjectTask() {
 @Preview(widthDp = 1489, heightDp = 930)
 @Composable
 fun PreviewProjectTask() {
-    ProjectTask()
+    TaskContent("查看全部项目任务")
 }

+ 3 - 3
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/task/ProjectRecentTaskItem.kt

@@ -20,11 +20,11 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 
 @Composable
-fun ProjectRecentTaskItem() {
+fun TaskItem() {
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .height(48.dp)
+            .height(60.dp)
             .background(Color.White),
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.SpaceEvenly
@@ -79,5 +79,5 @@ fun ProjectRecentTaskItem() {
 @Preview(widthDp = 1137)
 @Composable
 fun PreviewProjectRecentTaskItem() {
-    ProjectRecentTaskItem()
+    TaskItem()
 }

+ 3 - 3
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/task/ProjectRecentTaskTitle.kt

@@ -16,11 +16,11 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 
 @Composable
-fun ProjectRecentTaskTitle() {
+fun TaskTitle() {
     Row(
         modifier = Modifier
             .fillMaxWidth()
-            .height(40.dp)
+            .height(60.dp)
             .background(Color(0xFFF8F9FA)),
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.SpaceAround
@@ -73,5 +73,5 @@ fun ProjectRecentTaskTitle() {
 @Preview(widthDp = 1280)
 @Composable
 fun PreviewProjectRecentTaskTitle() {
-    ProjectRecentTaskTitle()
+    TaskTitle()
 }

+ 5 - 5
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/task/TaskType.kt

@@ -32,15 +32,15 @@ import androidx.compose.ui.unit.sp
 fun TaskType(resId: Int, title: String) {
     Card(
         shape = RoundedCornerShape(8),
-        border = BorderStroke(1.dp, Color(0xFFE5E5E5)),
+        border = BorderStroke(0.8.dp, Color(0xFFE5E5E5)),
         elevation = 0.dp
     ) {
         Row(
             modifier = Modifier
-                .width(314.dp)
-                .height(88.dp)
+                .width(280.dp)
+                .height(92.dp)
                 .background(Color.White)
-                .padding(horizontal = 20.dp, vertical = 15.dp),
+                .padding(horizontal = 18.dp, vertical = 17.dp),
             verticalAlignment = Alignment.CenterVertically
         ) {
             Image(
@@ -51,7 +51,7 @@ fun TaskType(resId: Int, title: String) {
                     .height(58.dp)
             )
             Spacer(modifier = Modifier.width(20.dp))
-            Text(text = title, fontSize = 16.sp, fontWeight = FontWeight.Bold)
+            Text(text = title, fontSize = 16.sp, fontWeight = FontWeight.SemiBold)
         }
     }
 }

+ 31 - 40
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/task/ProjectTaskScreen.kt

@@ -1,8 +1,6 @@
 package com.ys.bdtp.adm.mvvm.ui.screen.task
 
-import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.background
-import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -13,15 +11,8 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.material.Icon
 import androidx.compose.material.Text
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Search
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -30,7 +21,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -40,7 +30,7 @@ import com.ys.bdtp.adm.mvvm.ui.compose.HeadLeft
 import com.ys.bdtp.adm.mvvm.ui.compose.HeadRight
 
 @Composable
-fun ProjectTaskScreen() {
+fun Tasks() {
     var value by remember { mutableStateOf("") }
     Column(modifier = Modifier.fillMaxSize().background(Color.White)) {
         Head(
@@ -60,7 +50,7 @@ fun ProjectTaskScreen() {
             modifier = Modifier
                 .fillMaxHeight()
                 .background(Color.White)
-                .padding(horizontal = 50.dp, vertical = 50.dp)
+                .padding(horizontal = 50.dp, vertical = 44.dp)
         ) {
 
             Row(
@@ -76,41 +66,42 @@ fun ProjectTaskScreen() {
                     modifier = Modifier.height(20.dp)
                 )
 
-                BasicTextField(
-                    value = value,
-                    onValueChange = { value = it },
-                    singleLine = true,
-                    cursorBrush = SolidColor(Color(0xFFE4E6E7)),
-                    modifier = Modifier
-                        .width(186.dp)
-                        .height(32.dp)
-                        .background(Color.White)
-                        .border(BorderStroke(1.dp, Color(0xFFE4E6E7)), RoundedCornerShape(4.dp)),
-                ) { innerTextField: @Composable () -> Unit ->
-                    Row(
-                        modifier = Modifier.fillMaxSize(),
-                        verticalAlignment = Alignment.CenterVertically) {
-                        Spacer(modifier = Modifier.width(8.dp))
-                        Icon(
-                            imageVector = Icons.Default.Search,
-                            contentDescription = "",
-                            tint = Color(0xFFE4E6E7),
-                            modifier = Modifier.size(16.dp)
-                        )
-                        Spacer(modifier = Modifier.width(8.dp))
-                        innerTextField()
-                    }
-                }
+                /* BasicTextField(
+                     value = value,
+                     onValueChange = { value = it },
+                     singleLine = true,
+                     cursorBrush = SolidColor(Color(0xFFE4E6E7)),
+                     modifier = Modifier
+                         .width(186.dp)
+                         .height(32.dp)
+                         .background(Color.White)
+                         .border(BorderStroke(1.dp, Color(0xFFE4E6E7)), RoundedCornerShape(4.dp)),
+                 ) { innerTextField: @Composable () -> Unit ->
+                     Row(
+                         modifier = Modifier.fillMaxSize(),
+                         verticalAlignment = Alignment.CenterVertically
+                     ) {
+                         Spacer(modifier = Modifier.width(8.dp))
+                         Icon(
+                             imageVector = Icons.Default.Search,
+                             contentDescription = "",
+                             tint = Color(0xFFE4E6E7),
+                             modifier = Modifier.size(16.dp)
+                         )
+                         Spacer(modifier = Modifier.width(8.dp))
+                         innerTextField()
+                     }
+                 } */
             }
 
             Spacer(modifier = Modifier.height(20.dp))
 
-            ProjectRecentTaskTitle()
+            TaskTitle()
 
             LazyColumn(modifier = Modifier.fillMaxWidth().height(436.dp)) {
                 items(20) {
                     Box {
-                        ProjectRecentTaskItem()
+                        TaskItem()
                         Spacer(
                             modifier = Modifier
                                 .align(Alignment.BottomCenter)
@@ -128,5 +119,5 @@ fun ProjectTaskScreen() {
 @Preview(widthDp = 1137, heightDp = 711)
 @Composable
 fun PreviewProjectTaskScreen() {
-    ProjectTaskScreen()
+    Tasks()
 }