فهرست منبع

add(personal): home personal page

zhaoyadi 1 سال پیش
والد
کامیت
3c32a88da7

+ 1 - 0
component/common/src/main/java/com/zaojiao/component/common/Colors.kt

@@ -3,6 +3,7 @@ package com.zaojiao.component.common
 import androidx.compose.ui.graphics.Color
 
 object Colors {
+    val FF000000 = Color(0xFF000000)
     val FF333333 = Color(0xFF333333)
     val FF666666 = Color(0xFF666666)
     val FF999999 = Color(0xFF999999)

+ 11 - 5
component/common/src/main/java/com/zaojiao/component/common/Icons.kt

@@ -8,6 +8,9 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Paint
+import androidx.compose.ui.graphics.PaintingStyle
+import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
@@ -27,12 +30,15 @@ object Icons {
                 val paint = Paint()
                 paint.color = color
                 paint.strokeWidth = width.toPx()
+                paint.style = PaintingStyle.Stroke
+                paint.strokeCap = StrokeCap.Round
 
-                canvas.drawLine(
-                    p1 = Offset.Zero,
-                    p2 = Offset(size.width.dp.toPx(), size.height.dp.toPx()),
-                    paint = paint,
-                )
+                val path = Path()
+                path.moveTo(0f, 0f)
+                path.lineTo(this.size.width, this.size.height / 2)
+                path.lineTo(0f, this.size.height)
+
+                canvas.drawPath(path, paint)
             }
         }
     }

+ 26 - 1
component/personal/src/main/kotlin/com/zaojiao/component/personal/HomePersonalTopBar.kt

@@ -13,11 +13,17 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.layout.wrapContentWidth
+import androidx.compose.material3.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.TextStyle
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.zaojiao.component.common.Colors
 import com.zaojiao.component.common.Spacer
 
 @Composable
@@ -29,6 +35,7 @@ fun HomePersonalTopBar() {
             .fillMaxWidth()
             .wrapContentHeight(),
         horizontalArrangement = Arrangement.End,
+        verticalAlignment = Alignment.CenterVertically,
     ) {
         HomePersonalTopBarItem(iconRes = R.mipmap.personal_message)
         Spacer(width = 21.dp)
@@ -43,13 +50,31 @@ fun HomePersonalTopBar() {
 fun HomePersonalScrollTopBar() {
     Row(
         modifier = Modifier
-            .background(Color.Red)
+            .background(Color.White)
             .statusBarsPadding()
             .padding(vertical = 9.dp)
             .fillMaxWidth()
             .wrapContentHeight(),
         horizontalArrangement = Arrangement.End,
+        verticalAlignment = Alignment.CenterVertically,
     ) {
+        Spacer(width = 16.dp)
+        Image(
+            painter = painterResource(id = R.mipmap.ic_default_avatar),
+            contentDescription = "用户头像",
+            modifier = Modifier.size(30.dp, 30.dp)
+        )
+        Spacer(width = 8.dp)
+        Text(
+            text = "逻辑狗",
+            modifier = Modifier.weight(1f),
+            style = TextStyle(
+                fontSize = 14.sp,
+                lineHeight = 14.sp,
+                fontWeight = FontWeight.Medium,
+                color = Colors.FF000000,
+            ),
+        )
         HomePersonalTopBarItem(iconRes = R.mipmap.personal_message)
         Spacer(width = 21.dp)
         HomePersonalTopBarItem(iconRes = R.mipmap.personal_cart)

+ 9 - 2
component/personal/src/main/kotlin/com/zaojiao/component/personal/HomePersonalUserBar.kt

@@ -11,7 +11,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import com.zaojiao.component.common.Colors
 import com.zaojiao.component.common.Icons
 import com.zaojiao.component.common.Spacer
@@ -20,6 +22,7 @@ import com.zaojiao.component.common.Spacer
 fun HomePersonalUserBar() {
     Row(
         modifier = Modifier
+            .padding(bottom = 9.dp)
             .padding(top = 16.dp)
             .padding(horizontal = 16.dp),
         verticalAlignment = Alignment.CenterVertically,
@@ -29,12 +32,16 @@ fun HomePersonalUserBar() {
             contentDescription = "用户头像",
             modifier = Modifier.size(70.dp, 70.dp)
         )
+        Spacer(width = 12.dp)
         Text(
             text = "逻辑狗",
             modifier = Modifier.weight(1f),
             style = TextStyle(
-
-            )
+                fontSize = 18.sp,
+                lineHeight = 18.sp,
+                fontWeight = FontWeight.Medium,
+                color = Colors.FF000000,
+            ),
         )
         Text(
             text = "个人主页",