Explorar o código

@fun: Offline

bai %!s(int64=3) %!d(string=hai) anos
pai
achega
fda71d3775
Modificáronse 21 ficheiros con 840 adicións e 438 borrados
  1. 2 1
      app/src/main/java/com/ys/bdtp/adm/App.kt
  2. 91 0
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/compose/Alert.kt
  3. 19 0
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/compose/Body.kt
  4. 12 4
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/compose/Top.kt
  5. 1 1
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/compose/TopMiddle.kt
  6. 8 0
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/compose/Screen.kt
  7. 57 0
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/compose/TaskType.kt
  8. 1 1
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/home/HomeScreen.kt
  9. 11 0
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/offline/Offline.kt
  10. 102 0
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/offline/OfflineHeadMiddle.kt
  11. 30 0
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/ProjectBlank.kt
  12. 78 0
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/ProjectRecentTask.kt
  13. 83 0
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/ProjectRecentTaskItem.kt
  14. 77 0
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/ProjectRecentTaskTitle.kt
  15. 60 8
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/ProjectScreen.kt
  16. 0 248
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/ProjectTask.kt
  17. 0 175
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/ProjectTaskAll.kt
  18. 132 0
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/ProjectTaskScreen.kt
  19. 76 0
      app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/ProjectTitleList.kt
  20. BIN=BIN
      app/src/main/res/drawable-hdpi/blank.png
  21. BIN=BIN
      app/src/main/res/drawable-xhdpi/blank.png

+ 2 - 1
app/src/main/java/com/ys/bdtp/adm/App.kt

@@ -11,6 +11,7 @@ import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import com.ys.bdtp.adm.app.theme.AdmTheme
 import com.ys.bdtp.adm.di.di
 import com.ys.bdtp.adm.mvvm.ui.screen.project.ProjectScreen
+import com.ys.bdtp.adm.mvvm.ui.screen.project.ProjectTaskScreen
 import org.kodein.di.compose.onDIContext
 import org.kodein.di.compose.withDI
 
@@ -35,7 +36,7 @@ fun App() = withDI(di(LocalContext.current)) {
                             darkIcons = useDarkIcons,
                         )
                     }
-                    ProjectScreen()
+                    ProjectTaskScreen()
                 }
             }
         }

+ 91 - 0
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/compose/Alert.kt

@@ -0,0 +1,91 @@
+package com.ys.bdtp.adm.mvvm.ui.compose
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Text
+import androidx.compose.material.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+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.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+
+@Composable
+fun Alert() {
+    var flag by remember { mutableStateOf(true) }
+    if (flag) {
+        Dialog(
+            onDismissRequest = { flag = false }
+        ) {
+            Column(
+                modifier = Modifier
+                    .width(295.dp)
+                    .background(Color.White, shape = RoundedCornerShape(8.dp)),
+                horizontalAlignment = Alignment.CenterHorizontally
+            ) {
+                Spacer(
+                    modifier = Modifier.height(24.dp)
+                )
+                Text(
+                    text = "数据更新提示",
+                    color = Color(0xFF1F2529),
+                    fontSize = 18.sp,
+                )
+                Spacer(
+                    modifier = Modifier.height(10.dp)
+                )
+                Text(
+                    text = "离线数据下载同步更新完成",
+                    color = Color(0xFF1F2529),
+                    fontSize = 14.sp,
+                )
+                Spacer(
+                    modifier = Modifier.height(30.dp)
+                )
+
+                Spacer(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(1.dp)
+                        .background(Color(0xFFEFF0F1))
+                )
+                TextButton(
+                    onClick = { flag = !flag },
+                    modifier = Modifier.fillMaxWidth().height(50.dp),
+                    shape = RoundedCornerShape(
+                        topStart = 0.dp,
+                        topEnd = 0.dp,
+                        bottomStart = 4.dp,
+                        bottomEnd = 4.dp
+                    )
+                ) {
+                    Text(
+                        text = "我知道了",
+                        color = Color(0xFF0091FF),
+                        fontSize = 16.sp,
+                    )
+                }
+
+            }
+        }
+    }
+}
+
+
+@Preview
+@Composable
+fun PreviewAlert() {
+    Alert()
+}

+ 19 - 0
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/compose/Body.kt

@@ -0,0 +1,19 @@
+package com.ys.bdtp.adm.mvvm.ui.compose
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.runtime.Composable
+
+@Composable
+fun Body() {
+    Row {
+        Column() {
+
+        }
+
+        Column {
+
+        }
+    }
+
+}

+ 12 - 4
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/compose/Top.kt

@@ -1,7 +1,15 @@
 package com.ys.bdtp.adm.mvvm.ui.compose
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -15,7 +23,7 @@ import com.google.accompanist.insets.LocalWindowInsets
 import com.google.accompanist.insets.rememberInsetsPaddingValues
 
 @Composable
-fun Top(
+fun Head(
     modifier: Modifier = Modifier.fillMaxWidth()
         .wrapContentHeight()
         .background(Color.White)
@@ -54,7 +62,7 @@ fun Top(
 @Preview(widthDp = 1280, heightDp = 800)
 @Composable
 fun PreviewTop() {
-    Top(
+    Head(
         left = { TopLeft() },
         right = {
             TopRight(
@@ -68,7 +76,7 @@ fun PreviewTop() {
 @Preview(widthDp = 1280, heightDp = 800)
 @Composable
 fun PreviewTop1() {
-    Top(
+    Head(
         left = {
             Row(
                 verticalAlignment = Alignment.CenterVertically,

+ 1 - 1
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/compose/TopMiddle.kt

@@ -6,7 +6,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 
 @Composable
-fun TopMiddle() {
+fun HeadMiddle() {
     Row(
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.Start

+ 8 - 0
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/compose/Screen.kt

@@ -0,0 +1,8 @@
+package com.ys.bdtp.adm.mvvm.ui.compose
+
+import androidx.compose.runtime.Composable
+
+@Composable
+fun Screen() {
+
+}

+ 57 - 0
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/compose/TaskType.kt

@@ -0,0 +1,57 @@
+package com.ys.bdtp.adm.mvvm.ui.compose
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Card
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+
+/**
+ * 任务类型
+ *  1. CAD核查
+ *  2. 空间模型核查
+ *  3. 机电核查
+ *  4. 交付关系
+ *  5. 离线数据
+ */
+@Composable
+fun TaskType(resId: Int, title: String) {
+    Card(
+        shape = RoundedCornerShape(8),
+        border = BorderStroke(1.dp, Color(0xFFE5E5E5)),
+        elevation = 0.dp
+    ) {
+        Row(
+            modifier = Modifier
+                .width(314.dp)
+                .height(88.dp)
+                .background(Color.White)
+                .padding(horizontal = 20.dp, vertical = 15.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Image(
+                painter = painterResource(resId),
+                contentDescription = "",
+                modifier = Modifier
+                    .width(58.dp)
+                    .height(58.dp)
+            )
+            Spacer(modifier = Modifier.width(20.dp))
+            Text(text = title, fontSize = 16.sp, fontWeight = FontWeight.Bold)
+        }
+    }
+}

+ 1 - 1
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/home/HomeScreen.kt

@@ -15,7 +15,7 @@ import com.ys.bdtp.adm.mvvm.ui.screen.project.Project
 @Composable
 fun HomeScreen() {
     Column(modifier = Modifier.fillMaxSize()) {
-        Top(
+        Head(
             left = { TopLeft() },
             right = {
                 TopRight(

+ 11 - 0
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/offline/Offline.kt

@@ -0,0 +1,11 @@
+package com.ys.bdtp.adm.mvvm.ui.screen.offline
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.runtime.Composable
+
+@Composable
+fun Offline() {
+    Column {
+
+    }
+}

+ 102 - 0
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/offline/OfflineHeadMiddle.kt

@@ -0,0 +1,102 @@
+package com.ys.bdtp.adm.mvvm.ui.screen.offline
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.Surface
+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
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.ys.bdtp.adm.R
+
+@Composable
+fun OfflineHeadMiddle() {
+    Box(
+        modifier = Modifier
+            .width(300.dp)
+            .height(52.dp)
+    ) {
+
+        Row(
+            modifier = Modifier
+                .width(279.dp)
+                .height(32.dp)
+                .align(Alignment.Center)
+
+        ) {
+            // 全部同步
+            Surface(
+                shape = RoundedCornerShape(topStart = 4.dp, bottomStart = 4.dp, topEnd = 0.dp, bottomEnd = 0.dp),
+                modifier = Modifier
+                    .weight(1f)
+            ) {
+                TextButton(
+                    onClick = {},
+                    modifier = Modifier.width(139.dp).fillMaxHeight().background(Color(0xFF0091FF))
+                ) {
+                    Text(text = "全部同步", color = Color.White, fontSize = 14.sp)
+                }
+            }
+
+            // 停止同步
+            Box(modifier = Modifier.weight(1f).fillMaxHeight()) {
+
+                Surface(
+                    shape = RoundedCornerShape(
+                        topStart = 0.dp,
+                        bottomStart = 0.dp,
+                        topEnd = 4.dp,
+                        bottomEnd = 4.dp
+                    ),
+                    border = BorderStroke(1.dp, Color(0xFF9CA2A9)),
+                ) {
+                    TextButton(
+                        onClick = {},
+                        modifier = Modifier.width(140.dp).fillMaxHeight().background(Color.White),
+
+                        ) {
+                        Text(text = "停止同步", color = Color(0xFFD5D5D5), fontSize = 14.sp)
+                    }
+                }
+                Spacer(modifier = Modifier.width(1.dp).fillMaxHeight().background(Color(0xFF0091FF)))
+            }
+        }
+
+        Box(
+            modifier = Modifier
+                .width(18.dp)
+                .height(18.dp),
+            contentAlignment = Alignment.Center
+        ) {
+            Image(
+                painter = painterResource(R.drawable.red_circle),
+                contentDescription = "",
+                modifier = Modifier.fillMaxSize()
+            )
+            Text(text = "3", color = Color.White, fontSize = 12.sp)
+        }
+
+    }
+}
+
+
+@Preview
+@Composable
+fun PreviewOfflineHeadMiddle() {
+    OfflineHeadMiddle()
+}

+ 30 - 0
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/ProjectBlank.kt

@@ -0,0 +1,30 @@
+package com.ys.bdtp.adm.mvvm.ui.screen.project
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.tooling.preview.Preview
+import com.ys.bdtp.adm.R
+
+@Composable
+fun ProjectBlank() {
+    Box(
+        modifier = Modifier.fillMaxSize(),
+        contentAlignment = Alignment.Center
+    ) {
+        Image(
+            painter = painterResource(R.drawable.blank),
+            contentDescription = ""
+        )
+    }
+}
+
+@Preview
+@Composable
+fun PreviewProjectBlank() {
+    ProjectBlank()
+}

+ 78 - 0
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/ProjectRecentTask.kt

@@ -0,0 +1,78 @@
+package com.ys.bdtp.adm.mvvm.ui.screen.project
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+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.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.LinearProgressIndicator
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
+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
+
+// 3 7
+@Composable
+fun ProjectTask() {
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(Color.White)
+            //.padding(horizontal = 48.dp, vertical = 44.dp)
+    ) {
+        Text(
+            text = "近期负责的项目任务",
+            fontSize = 16.sp,
+            fontWeight = FontWeight.Bold,
+            color = Color(0xFF1F2429),
+            modifier = Modifier.height(20.dp)
+        )
+        Spacer(modifier = Modifier.fillMaxWidth().height(20.dp))
+
+        ProjectRecentTaskTitle()
+
+        LazyColumn(modifier = Modifier.fillMaxWidth().height(360.dp)) {
+            items(20) {
+                Box{
+                    ProjectRecentTaskItem()
+                    Spacer(
+                        modifier = Modifier
+                            .align(Alignment.BottomCenter)
+                            .fillMaxWidth().height(1.dp)
+                            .background(Color(0xFFE4E6E7))
+                    )
+                }
+            }
+        }
+        Spacer(modifier = Modifier.fillMaxWidth().height(40.dp))
+        Text(
+            text = "查看全部项目任务",
+            fontSize = 14.sp,
+            color = Color(0xFF0091FF),
+            textAlign = TextAlign.Center,
+            modifier = Modifier.fillMaxWidth().height(20.dp)
+        )
+    }
+}
+
+
+@Preview(widthDp = 1489, heightDp = 930)
+@Composable
+fun PreviewProjectTask() {
+    ProjectTask()
+}

+ 83 - 0
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/ProjectRecentTaskItem.kt

@@ -0,0 +1,83 @@
+package com.ys.bdtp.adm.mvvm.ui.screen.project
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.LinearProgressIndicator
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+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
+
+@Composable
+fun ProjectRecentTaskItem() {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(48.dp)
+            .background(Color.White),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.SpaceEvenly
+    ) {
+        Text(
+            text = "项目名称",
+            fontSize = 16.sp,
+            color = Color(0xFF1F2429),
+            textAlign = TextAlign.Center,
+            modifier = Modifier.weight(3f)
+        )
+        Text(
+            text = "楼层",
+            fontSize = 16.sp,
+            color = Color(0xFF1F2429),
+            textAlign = TextAlign.Center,
+            modifier = Modifier.weight(2f)
+        )
+        Text(
+            text = "起始时间",
+            fontSize = 16.sp,
+            color = Color(0xFF1F2429),
+            textAlign = TextAlign.Center,
+            modifier = Modifier.weight(2f)
+        )
+
+        Row(modifier = Modifier.fillMaxWidth().weight(3f).padding(16.dp)) {
+            Surface(
+                elevation = 0.dp,
+                shape = RoundedCornerShape(10.dp),
+                modifier = Modifier.weight(3f).height(10.dp),
+            ) {
+
+                LinearProgressIndicator(
+                    progress = 0.8f,
+                    color = Color(0xFF0091FF),
+                    backgroundColor = Color(0xFFF9F9F9),
+                )
+            }
+        }
+
+        Text(
+            text = "40%",
+            fontSize = 16.sp,
+            color = Color(0xFF1F2429),
+            textAlign = TextAlign.Center,
+            modifier = Modifier.weight(2f)
+        )
+    }
+}
+
+@Preview(widthDp = 1137)
+@Composable
+fun PreviewProjectRecentTaskItem() {
+    ProjectRecentTaskItem()
+}

+ 77 - 0
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/ProjectRecentTaskTitle.kt

@@ -0,0 +1,77 @@
+package com.ys.bdtp.adm.mvvm.ui.screen.project
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+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
+
+@Composable
+fun ProjectRecentTaskTitle() {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(40.dp)
+            .background(Color(0xFFF8F9FA)),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.SpaceAround
+
+    ) {
+        Text(
+            text = "项目名称",
+            fontSize = 16.sp,
+            color = Color(0xFF646C73),
+            textAlign = TextAlign.Center,
+            maxLines = 1,
+            modifier = Modifier.weight(3f)
+        )
+        Text(
+            text = "楼层",
+            fontSize = 16.sp,
+            color = Color(0xFF646C73),
+            textAlign = TextAlign.Center,
+            maxLines = 1,
+            modifier = Modifier.weight(2f)
+        )
+        Text(
+            text = "起始时间",
+            fontSize = 16.sp,
+            color = Color(0xFF646C73),
+            textAlign = TextAlign.Center,
+            maxLines = 1,
+            modifier = Modifier.weight(2f)
+        )
+        Text(
+            text = "项目完成进度",
+            fontSize = 16.sp,
+            color = Color(0xFF646C73),
+            textAlign = TextAlign.Center,
+            maxLines = 1,
+            modifier = Modifier.weight(3f)
+        )
+
+        Text(
+            text = "",
+            fontSize = 16.sp,
+            color = Color(0xFF646C73),
+            textAlign = TextAlign.Center,
+            maxLines = 1,
+            modifier = Modifier.weight(2f)
+        )
+    }
+}
+
+@Preview(widthDp = 1280)
+@Composable
+fun PreviewProjectRecentTaskTitle() {
+    ProjectRecentTaskTitle()
+}

+ 60 - 8
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/ProjectScreen.kt

@@ -1,18 +1,34 @@
 package com.ys.bdtp.adm.mvvm.ui.screen.project
 
 import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+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.width
+import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.ys.bdtp.adm.mvvm.ui.compose.*
+import com.ys.bdtp.adm.R
+import com.ys.bdtp.adm.mvvm.ui.compose.Head
+import com.ys.bdtp.adm.mvvm.ui.compose.TaskType
+import com.ys.bdtp.adm.mvvm.ui.compose.TopLeft
+import com.ys.bdtp.adm.mvvm.ui.compose.TopRight
 
 @Composable
 fun ProjectScreen() {
-    Column(modifier = Modifier.fillMaxSize()) {
-        Top(
+
+    Column(modifier = Modifier.fillMaxSize().background(Color.White)) {
+        Head(
             left = { TopLeft() },
             right = {
                 TopRight(
@@ -26,16 +42,52 @@ fun ProjectScreen() {
             modifier = Modifier.fillMaxWidth().height(1.dp).background(Color(0xFFEFF0F1))
         )
 
-        Content {
-            ProjectTask()
+
+        Row {
+            Box(
+                modifier = Modifier
+                    .fillMaxHeight()
+                    .wrapContentWidth()
+                    .padding(horizontal = 32.dp, vertical = 42.dp)
+            ) {
+                // 工作分类
+                Column(
+                    horizontalAlignment = Alignment.CenterHorizontally
+                ) {
+                    TaskType(R.drawable.project_task_cad, "CAD核查")
+                    Spacer(modifier = Modifier.height(20.dp))
+                    TaskType(R.drawable.project_task_space, "空间模型核查")
+                    Spacer(modifier = Modifier.height(20.dp))
+                    TaskType(R.drawable.project_task_electric, "机电核查")
+                    Spacer(modifier = Modifier.height(20.dp))
+                    TaskType(R.drawable.project_task_relation, "交付关系")
+                    Spacer(modifier = Modifier.height(20.dp))
+                    TaskType(R.drawable.project_task_offline, "离线数据")
+                }
+
+                // 项目切换
+
+            }
+
+            Spacer(modifier = Modifier.width(1.dp).fillMaxHeight().background(Color(0xFFE5E5E5)))
+
+            Column(
+                modifier = Modifier
+                    .fillMaxHeight()
+                    .wrapContentWidth()
+                    .padding(horizontal = 32.dp, vertical = 42.dp)
+            ) {
+                //ProjectBlank()
+                ProjectTask()
+            }
         }
     }
 }
 
 
 @Preview(
-    widthDp = 1280,
-    heightDp = 800,
+    widthDp = 1137,
+    heightDp = 711,
 )
 @Composable
 fun PreviewProjectScreen() {

+ 0 - 248
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/ProjectTask.kt

@@ -1,248 +0,0 @@
-package com.ys.bdtp.adm.mvvm.ui.screen.project
-
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Card
-import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.ys.bdtp.adm.R
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material.LinearProgressIndicator
-import androidx.compose.material.Surface
-import androidx.compose.ui.text.style.TextAlign
-
-// 3 7
-@Composable
-fun ProjectTask() {
-    Row(modifier = Modifier.fillMaxSize().background(Color.White)) {
-        Column(
-            modifier = Modifier
-                .fillMaxHeight()
-                .wrapContentWidth()
-                .padding(horizontal = 32.dp, vertical = 42.dp)
-        ) {
-            Column(
-                horizontalAlignment = Alignment.CenterHorizontally
-            ) {
-                TaskType(R.drawable.project_task_cad, "CAD核查")
-                Spacer(modifier = Modifier.height(20.dp))
-                TaskType(R.drawable.project_task_space, "空间模型核查")
-                Spacer(modifier = Modifier.height(20.dp))
-                TaskType(R.drawable.project_task_electric, "机电核查")
-                Spacer(modifier = Modifier.height(20.dp))
-                TaskType(R.drawable.project_task_relation, "交付关系")
-                Spacer(modifier = Modifier.height(20.dp))
-                TaskType(R.drawable.project_task_offline, "离线数据")
-            }
-        }
-        Spacer(modifier = Modifier.width(1.dp).fillMaxHeight().background(Color(0xFFE5E5E5)))
-
-        Column(
-            modifier = Modifier
-                .fillMaxHeight()
-                .padding(horizontal = 48.dp, vertical = 44.dp)
-        ) {
-            Text(
-                text = "近期负责的项目任务",
-                fontSize = 16.sp,
-                fontWeight = FontWeight.Bold,
-                color = Color(0xFF1F2429),
-                modifier = Modifier.height(20.dp)
-            )
-            Spacer(modifier = Modifier.fillMaxWidth().height(20.dp))
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(40.dp)
-                    .background(Color(0xFFF8F9FA)),
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.SpaceAround
-
-            ) {
-                Text(
-                    text = "项目名称",
-                    fontSize = 16.sp,
-                    color = Color(0xFF646C73),
-                    textAlign = TextAlign.Center,
-                    modifier = Modifier.weight(20f)
-                )
-                Text(
-                    text = "楼层",
-                    fontSize = 16.sp,
-                    color = Color(0xFF646C73),
-                    textAlign = TextAlign.Center,
-                    modifier = Modifier.weight(20f)
-                )
-                Text(
-                    text = "起始时间",
-                    fontSize = 16.sp,
-                    color = Color(0xFF646C73),
-                    textAlign = TextAlign.Center,
-                    modifier = Modifier.weight(25f)
-                )
-                Text(
-                    text = "项目完成进度",
-                    fontSize = 16.sp,
-                    color = Color(0xFF646C73),
-                    textAlign = TextAlign.Center,
-                    modifier = Modifier.weight(33f)
-                )
-            }
-
-            LazyColumn(modifier = Modifier.fillMaxWidth().height(436.dp)) {
-                items(20) {
-                    Box {
-                        Row(
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .height(48.dp)
-                                .background(Color.White),
-                            verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.SpaceEvenly
-                        ) {
-                            Text(
-                                text = "项目名称",
-                                fontSize = 16.sp,
-                                color = Color(0xFF1F2429),
-                                textAlign = TextAlign.Center,
-                                modifier = Modifier.weight(20f)
-                            )
-                            Text(
-                                text = "楼层",
-                                fontSize = 16.sp,
-                                color = Color(0xFF1F2429),
-                                textAlign = TextAlign.Center,
-                                modifier = Modifier.weight(20f)
-                            )
-                            Text(
-                                text = "起始时间",
-                                fontSize = 16.sp,
-                                color = Color(0xFF1F2429),
-                                textAlign = TextAlign.Center,
-                                modifier = Modifier.weight(25f)
-                            )
-                            Row(
-                                modifier = Modifier.weight(33f),
-                                verticalAlignment = Alignment.CenterVertically,
-                                horizontalArrangement = Arrangement.Center
-                            ) {
-                                Surface(
-                                    elevation = 0.dp,
-                                    shape = RoundedCornerShape(10.dp),
-                                    modifier = Modifier.weight(4f).height(10.dp),
-                                ) {
-                                    LinearProgressIndicator(
-                                        progress = 0.8f,
-                                        color = Color(0xFF0091FF),
-                                        backgroundColor = Color(0xFFF9F9F9),
-                                    )
-                                }
-                                Spacer(modifier = Modifier.width(16.dp))
-                                Text(
-                                    text = "40%",
-                                    fontSize = 16.sp,
-                                    color = Color(0xFF1F2429),
-                                    textAlign = TextAlign.Start,
-                                    modifier = Modifier.weight(2f)
-                                )
-                            }
-                        }
-                        Spacer(
-                            modifier = Modifier
-                                .align(Alignment.BottomCenter)
-                                .fillMaxWidth().height(1.dp)
-                                .background(Color(0xFFE4E6E7))
-                        )
-                    }
-
-                }
-            }
-            Spacer(modifier = Modifier.fillMaxWidth().height(40.dp))
-            Text(
-                text = "查看全部项目任务",
-                fontSize = 14.sp,
-                color = Color(0xFF0091FF),
-                textAlign = TextAlign.Center,
-                modifier = Modifier.fillMaxWidth()
-            )
-        }
-    }
-}
-
-
-@Composable
-fun TaskType(resId: Int, title: String) {
-    Card(
-        shape = RoundedCornerShape(8),
-        border = BorderStroke(1.dp, Color(0xFFE5E5E5)),
-        elevation = 0.dp
-    ) {
-        Row(
-            modifier = Modifier
-                .width(314.dp)
-                .height(88.dp)
-                .background(Color.White)
-                .padding(horizontal = 20.dp, vertical = 15.dp),
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            Image(
-                painter = painterResource(resId),
-                contentDescription = "",
-                modifier = Modifier
-                    .width(58.dp)
-                    .height(58.dp)
-            )
-            Spacer(modifier = Modifier.width(20.dp))
-            Text(text = title, fontSize = 16.sp, fontWeight = FontWeight.Bold)
-        }
-    }
-}
-
-@Preview(widthDp = 1280, heightDp = 800)
-@Composable
-fun PreviewProjectTask() {
-    ProjectTask()
-}
-/*
-
-@Preview
-@Composable
-fun PreviewTaskType1() {
-    TaskType(R.drawable.project_task_cad, "CAD核查")
-}
-
-@Preview
-@Composable
-fun PreviewTaskType2() {
-    TaskType(R.drawable.project_task_space, "空间模型核查")
-}
-
-@Preview
-@Composable
-fun PreviewTaskType3() {
-    TaskType(R.drawable.project_task_electric, "机电核查")
-}
-
-@Preview
-@Composable
-fun PreviewTaskType4() {
-    TaskType(R.drawable.project_task_relation, "交付关系")
-}
-
-@Preview
-@Composable
-fun PreviewTaskType5() {
-    TaskType(R.drawable.project_task_offline, "离线数据")
-}*/

+ 0 - 175
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/ProjectTaskAll.kt

@@ -1,175 +0,0 @@
-package com.ys.bdtp.adm.mvvm.ui.screen.project
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Search
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.font.FontWeight
-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
-
-@Composable
-fun ProjectTaskAll() {
-    Column(
-        modifier = Modifier
-            .fillMaxHeight()
-            .background(Color.White)
-            .padding(horizontal = 50.dp, vertical = 50.dp)
-    ) {
-        Spacer(modifier = Modifier.height(50.dp))
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            Text(
-                text = "全部项目任务",
-                fontSize = 16.sp,
-                fontWeight = FontWeight.Bold,
-                color = Color(0xFF1F2429),
-                modifier = Modifier.height(20.dp)
-            )
-
-            OutlinedTextField(
-                value = "",
-                onValueChange = {},
-                modifier = Modifier.height(48.dp),
-                placeholder = {
-                    Text(text = "Search", fontSize = 14.sp, color = Color(0xFFC3C7CB))
-                },
-                leadingIcon = {
-                    Icon(
-                        imageVector = Icons.Default.Search,
-                        contentDescription = ""
-                    )
-                }
-            )
-        }
-        Spacer(modifier = Modifier.height(20.dp))
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(40.dp)
-                .background(Color(0xFFF8F9FA)),
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.SpaceAround
-
-        ) {
-            Text(
-                text = "项目名称",
-                fontSize = 16.sp,
-                color = Color(0xFF646C73),
-                textAlign = TextAlign.Center,
-                modifier = Modifier.weight(3f)
-            )
-            Text(
-                text = "楼层",
-                fontSize = 16.sp,
-                color = Color(0xFF646C73),
-                textAlign = TextAlign.Center,
-                modifier = Modifier.weight(2f)
-            )
-            Text(
-                text = "起始时间",
-                fontSize = 16.sp,
-                color = Color(0xFF646C73),
-                textAlign = TextAlign.Center,
-                modifier = Modifier.weight(2f)
-            )
-            Text(
-                text = "项目完成进度",
-                fontSize = 16.sp,
-                color = Color(0xFF646C73),
-                textAlign = TextAlign.Center,
-                modifier = Modifier.weight(3f)
-            )
-
-            Text(
-                text = "",
-                fontSize = 16.sp,
-                color = Color(0xFF646C73),
-                textAlign = TextAlign.Center,
-                modifier = Modifier.weight(2f)
-            )
-        }
-
-        LazyColumn(modifier = Modifier.fillMaxWidth().height(436.dp)) {
-            items(20) {
-                Box {
-                    Row(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .height(48.dp)
-                            .background(Color.White),
-                        verticalAlignment = Alignment.CenterVertically,
-                        horizontalArrangement = Arrangement.SpaceEvenly
-                    ) {
-                        Text(
-                            text = "项目名称",
-                            fontSize = 16.sp,
-                            color = Color(0xFF1F2429),
-                            textAlign = TextAlign.Center,
-                            modifier = Modifier.weight(3f)
-                        )
-                        Text(
-                            text = "楼层",
-                            fontSize = 16.sp,
-                            color = Color(0xFF1F2429),
-                            textAlign = TextAlign.Center,
-                            modifier = Modifier.weight(2f)
-                        )
-                        Text(
-                            text = "起始时间",
-                            fontSize = 16.sp,
-                            color = Color(0xFF1F2429),
-                            textAlign = TextAlign.Center,
-                            modifier = Modifier.weight(2f)
-                        )
-
-                        Surface(
-                            elevation = 0.dp,
-                            shape = RoundedCornerShape(10.dp),
-                            modifier = Modifier.weight(3f).height(10.dp),
-                        ) {
-                            LinearProgressIndicator(
-                                progress = 0.8f,
-                                color = Color(0xFF0091FF),
-                                backgroundColor = Color(0xFFF9F9F9),
-                            )
-                        }
-
-                        Text(
-                            text = "40%",
-                            fontSize = 16.sp,
-                            color = Color(0xFF1F2429),
-                            textAlign = TextAlign.Center,
-                            modifier = Modifier.weight(2f)
-                        )
-                    }
-                    Spacer(
-                        modifier = Modifier
-                            .align(Alignment.BottomCenter)
-                            .fillMaxWidth().height(1.dp)
-                            .background(Color(0xFFE4E6E7))
-                    )
-                }
-
-            }
-        }
-    }
-}
-
-@Preview(widthDp = 1280, heightDp = 800)
-@Composable
-fun PreviewProjectTaskAll() {
-    ProjectTaskAll()
-}

+ 132 - 0
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/ProjectTaskScreen.kt

@@ -0,0 +1,132 @@
+package com.ys.bdtp.adm.mvvm.ui.screen.project
+
+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
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+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
+import androidx.compose.runtime.remember
+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
+import androidx.compose.ui.unit.sp
+import com.ys.bdtp.adm.mvvm.ui.compose.Head
+import com.ys.bdtp.adm.mvvm.ui.compose.TopLeft
+import com.ys.bdtp.adm.mvvm.ui.compose.TopRight
+
+@Composable
+fun ProjectTaskScreen() {
+    var value by remember { mutableStateOf("") }
+    Column(modifier = Modifier.fillMaxSize().background(Color.White)) {
+        Head(
+            left = { TopLeft() },
+            right = {
+                TopRight(
+                    role = { "管家" },
+                    click = { println("heiheihei") }
+                )
+            }
+        )
+
+        Spacer(
+            modifier = Modifier.fillMaxWidth().height(1.dp).background(Color(0xFFEFF0F1))
+        )
+        Column(
+            modifier = Modifier
+                .fillMaxHeight()
+                .background(Color.White)
+                .padding(horizontal = 50.dp, vertical = 50.dp)
+        ) {
+
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.SpaceBetween,
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                Text(
+                    text = "全部项目任务",
+                    fontSize = 16.sp,
+                    fontWeight = FontWeight.Bold,
+                    color = Color(0xFF1F2429),
+                    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()
+                    }
+                }
+            }
+
+            Spacer(modifier = Modifier.height(20.dp))
+
+            ProjectRecentTaskTitle()
+
+            LazyColumn(modifier = Modifier.fillMaxWidth().height(436.dp)) {
+                items(20) {
+                    Box {
+                        ProjectRecentTaskItem()
+                        Spacer(
+                            modifier = Modifier
+                                .align(Alignment.BottomCenter)
+                                .fillMaxWidth().height(1.dp)
+                                .background(Color(0xFFE4E6E7))
+                        )
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+@Preview(widthDp = 1137, heightDp = 711)
+@Composable
+fun PreviewProjectTaskScreen() {
+    ProjectTaskScreen()
+}

+ 76 - 0
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/ProjectTitleList.kt

@@ -0,0 +1,76 @@
+package com.ys.bdtp.adm.mvvm.ui.screen.project
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentWidth
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+
+
+val titles = listOf("京东科技实验大厦", "souhu科技大厦总部", "印力科技大厦", "天街科技大厦", "腾讯科技大厦总部", "印象城商场大厦")
+
+@Composable
+fun ProjectTitleList(titles: List<String>) {
+
+    LazyColumn(
+        modifier = Modifier
+            .wrapContentWidth()
+            .fillMaxHeight()
+            .background(Color.White)
+    ) {
+        itemsIndexed(titles) { index: Int, name: String ->
+            if (index == 0) {
+                Row(
+                    modifier = Modifier
+                        .width(170.dp)
+                        .height(40.dp)
+                        .background(Color(0xFFE0F2FF)),
+                    horizontalArrangement = Arrangement.Center,
+                    verticalAlignment = Alignment.CenterVertically
+                )
+                {
+                    Text(
+                        text = name,
+                        fontSize = 14.sp,
+                        color = Color(0xFF0091FF),
+                    )
+                }
+            } else {
+                Row(
+
+                    modifier = Modifier
+                        .width(170.dp)
+                        .height(40.dp)
+                        .background(Color.White),
+                    horizontalArrangement = Arrangement.Center,
+                    verticalAlignment = Alignment.CenterVertically
+                )
+                {
+                    Text(
+                        text = name,
+                        fontSize = 14.sp,
+                        color = Color(0xFF1F2429),
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Preview
+@Composable
+fun PreviewProjectTitleList() {
+    ProjectTitleList(titles)
+}

BIN=BIN
app/src/main/res/drawable-hdpi/blank.png


BIN=BIN
app/src/main/res/drawable-xhdpi/blank.png