admin/rider-pro-android-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge upstream/main and resolve conflicts

Browse Source
This commit is contained in:
zhong
2025-08-25 18:47:35 +08:00
parent df75c710e5
commit f2ab55d545
6 changed files with 114 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/MessageList.kt
View File

@@ -173,6 +173,39 @@ fun NotificationsScreen() {
}
// 搜索栏//
Box(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp, vertical = 8.dp)
.height(40.dp)
.background(
color = Color(0xFFF5F5F5),
shape = RoundedCornerShape(8.dp)
)
.noRippleClickable {//添加搜索逻辑实现
},
contentAlignment = Alignment.CenterStart
) {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.padding(start = 16.dp)
) {
Image(
painter = painterResource(id = R.drawable.rider_pro_search_location),
contentDescription = "search",
modifier = Modifier.size(20.dp),
colorFilter = ColorFilter.tint(Color(0xFF999999))
)
Spacer(modifier = Modifier.width(8.dp))
Text(
text = stringResource(R.string.search),
fontSize = 14.sp,
color = Color(0xFF999999)
)
}
}
Row(
modifier = Modifier
.fillMaxWidth()

2
app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/tab/FriendChatListScreen.kt
View File

@@ -68,7 +68,7 @@ fun FriendChatListScreen() {
.fillMaxSize()
.padding(16.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center
//verticalArrangement = Arrangement.Center
) {
Spacer(modifier = Modifier.height(80.dp))

2
app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/tab/GroupChatListScreen.kt
View File

@@ -79,7 +79,7 @@ fun GroupChatListScreen() {
.fillMaxSize()
.padding(16.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center
) {
Spacer(modifier = Modifier.height(80.dp))