Преглед изворни кода

更新定位图标,适配首页下拉刷新

bjb пре 1 недеља
родитељ
комит
0e3a1de5b2

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

@@ -60,7 +60,7 @@ fun JobListItem() {
         FlowRow(Modifier.padding(top = 10.dp)) {
             Row(Modifier.padding(end = 12.dp), verticalAlignment = Alignment.CenterVertically) {
                 Icon(
-                    painterResource(R.drawable.user), contentDescription = null, modifier = Modifier
+                    painterResource(R.drawable.location), contentDescription = null, modifier = Modifier
                         .padding(end = 5.dp)
                         .size(13.dp),
                     tint = Color(0xFF1E90FF)
@@ -78,7 +78,7 @@ fun JobListItem() {
             }
             Row(Modifier.padding(end = 12.dp), verticalAlignment = Alignment.CenterVertically) {
                 Icon(
-                    painterResource(R.drawable.user), contentDescription = null, modifier = Modifier
+                    painterResource(R.drawable.jobs), contentDescription = null, modifier = Modifier
                         .padding(end = 5.dp)
                         .size(13.dp),
                     tint = Color(0xFF666666)

+ 11 - 7
app/src/main/java/com/iscs/bozzys/ui/pages/home/HomeCompose.kt

@@ -32,6 +32,7 @@ import androidx.compose.runtime.collectAsState
 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.draw.clip
@@ -52,22 +53,23 @@ import com.iscs.bozzys.ui.theme.Text
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun HomeCompose(pv: PaddingValues, zIndex: Float, vmHome: VMHome) {
-    val isRefresh = remember { mutableStateOf(false) }
+    var isRefresh by remember { mutableStateOf(false) }
     Box(
         modifier = Modifier
             .fillMaxSize()
             .zIndex(zIndex)
             .background(Color(0xFFF8F8F8))
     ) {
-        PullToRefreshBox(isRefresh.value, onRefresh = {
-            isRefresh.value = true
-
+        PullToRefreshBox(isRefresh, onRefresh = {
+            isRefresh = true
         }) {
             Column(Modifier.fillMaxSize()) {
                 // 顶部工具栏
                 TopToolBar(pv, vmHome)
-                TODO(vmHome)
-                TODOList(pv, vmHome)
+                Box() {
+                    TODOList(pv, vmHome)
+                    TODO(vmHome)
+                }
             }
         }
     }
@@ -153,8 +155,9 @@ private fun TopToolBar(pv: PaddingValues, vmHome: VMHome) {
 private fun TODO(vmHome: VMHome) {
     Column(
         Modifier
-            .padding(top = 3.dp)
             .fillMaxWidth()
+            .background(Color(0xFFF8F9FA))
+            .padding(top = 3.dp)
     ) {
         Text(
             "中午好,今天有2个待办任务", Modifier
@@ -239,6 +242,7 @@ private fun TODOList(pv: PaddingValues, vmHome: VMHome) {
             .padding(bottom = pv.calculateBottomPadding())
             .fillMaxSize()
             .verticalScroll(state = rememberScrollState())
+            .padding(top = 190.dp)
     ) {
         Row(
             Modifier

+ 8 - 3
app/src/main/java/com/iscs/bozzys/ui/pages/home/JobsCompose.kt

@@ -1,12 +1,16 @@
 package com.iscs.bozzys.ui.pages.home
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.PaddingValues
 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
@@ -28,6 +32,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.zIndex
@@ -110,8 +115,8 @@ private fun MessageList() {
         ) {
             items(list) { item ->
                 when (item) {
-                    1 -> JobListItemTitle("今天")
-                    6 -> JobListItemTitle("昨天")
+                    1 -> MessageListItemTitle("今天")
+                    6 -> MessageListItemTitle("昨天")
                     else -> JobListItem()
                 }
             }
@@ -123,7 +128,7 @@ private fun MessageList() {
  * 消息标题
  */
 @Composable
-private fun JobListItemTitle(title: String) {
+private fun MessageListItemTitle(title: String) {
     Text(
         title,
         fontSize = 16.sp,

+ 3 - 3
app/src/main/java/com/iscs/bozzys/ui/pages/home/MessageCompose.kt

@@ -122,8 +122,8 @@ private fun MessageList() {
         ) {
             items(list) { item ->
                 when (item) {
-                    1 -> JobListItemTitle("今天")
-                    6 -> JobListItemTitle("昨天")
+                    1 -> MessageListItemTitle("今天")
+                    6 -> MessageListItemTitle("昨天")
                     else -> MessageListItemContent(item)
                 }
             }
@@ -135,7 +135,7 @@ private fun MessageList() {
  * 消息标题
  */
 @Composable
-private fun JobListItemTitle(title: String) {
+private fun MessageListItemTitle(title: String) {
     Text(
         title,
         fontSize = 16.sp,