Merge upstream/main and resolve conflicts

app/src/main/java/com/aiosman/ravenow/ui/group/CreateGroupChatScreen.kt

@@ -167,7 +167,7 @@ fun CreateGroupChatScreen() {
                 )
             }
         }
-        
+
         // 搜索栏
         Box(
             modifier = Modifier
@@ -179,37 +179,73 @@ fun CreateGroupChatScreen() {
                 )
                 .padding(horizontal = 12.dp, vertical = 8.dp)
         ) {
-            BasicTextField(
+            Row(
-                value = searchText,
+                verticalAlignment = Alignment.CenterVertically
-                onValueChange = { searchText = it },
+            ) {
-                textStyle = androidx.compose.ui.text.TextStyle(
+                Image(
-                    color = AppColors.text,
+                    painter = painterResource(id = R.drawable.rider_pro_nav_search),
-                    fontSize = 14.sp
+                    contentDescription = stringResource(R.string.search),
-                ),
+                    modifier = Modifier.size(16.dp),
-                modifier = Modifier.fillMaxWidth(),
+                    colorFilter = ColorFilter.tint(AppColors.secondaryText)
-                decorationBox = { innerTextField ->
+                )
-                    Row(
+                Spacer(modifier = Modifier.width(8.dp))
-                        verticalAlignment = Alignment.CenterVertically
+                BasicTextField(
-                    ) {
+                    value = searchText,
-                        Image(
+                    onValueChange = { searchText = it },
-                            painter = painterResource(id = R.drawable.rider_pro_nav_search),
+                    textStyle = androidx.compose.ui.text.TextStyle(
-                            contentDescription = "search",
+                        color = AppColors.text,
-                            modifier = Modifier.size(16.dp),
+                        fontSize = 14.sp
-                            colorFilter = ColorFilter.tint(AppColors.secondaryText)
+                    ),
-                        )
+                    modifier = Modifier.weight(1f),
-                        Spacer(modifier = Modifier.width(8.dp))
+                    decorationBox = { innerTextField ->
-                        if (searchText.text.isEmpty()) {
+                        Box {
-                            Text(
+                            if (searchText.text.isEmpty()) {
-                                text = "搜索",
+                                Text(
-                                color = AppColors.secondaryText,
+                                    text = stringResource(R.string.search),
-                                fontSize = 14.sp
+                                    color = AppColors.secondaryText,
-                            )
+                                    fontSize = 14.sp
+                                )
+                            }
+                            innerTextField()
                         }
-                        innerTextField()
                     }
-                }
+                )
-            )
+            }
         }
+//        // 搜索栏
+//        Box(
+//            modifier = Modifier
+//                .fillMaxWidth()
+//                .padding(horizontal = 16.dp, vertical = 8.dp)
+//                .background(
+//                    color = AppColors.inputBackground,
+//                    shape = RoundedCornerShape(8.dp)
+//                )
+//                .padding(horizontal = 12.dp, vertical = 8.dp)
+//        ) {
+
+//                    Row(
+//                        verticalAlignment = Alignment.CenterVertically
+//                    ) {
+//                        Image(
+//                            painter = painterResource(id = R.drawable.rider_pro_nav_search),
+//                            contentDescription = stringResource(R.string.search),
+//                            modifier = Modifier.size(16.dp),
+//                            colorFilter = ColorFilter.tint(AppColors.secondaryText)
+//                        )
+//                        Spacer(modifier = Modifier.width(8.dp))
+//                        if (searchText.text.isEmpty()) {
+//                            Text(
+//                                text = stringResource(R.string.search),
+//                                color = AppColors.secondaryText,
+//                                fontSize = 14.sp
+//                            )
+//                        }
+//                        innerTextField()
+//                    }
+//                }
+//            )
+//        }
         
         // 群聊名称输入框
         Row(
@@ -219,7 +255,7 @@ fun CreateGroupChatScreen() {
             verticalAlignment = Alignment.CenterVertically
         ) {
             Text(
-                text = "群聊名称",
+                text = stringResource(R.string.group_name),
                 fontSize = 14.sp,
                 color = AppColors.text,
                 modifier = Modifier.width(80.dp)
@@ -237,7 +273,17 @@ fun CreateGroupChatScreen() {
                         color = AppColors.inputBackground,
                         shape = RoundedCornerShape(8.dp)
                     )
-                    .padding(horizontal = 12.dp, vertical = 8.dp)
+                    .padding(horizontal = 12.dp, vertical = 8.dp),
+                decorationBox = { innerTextField ->
+                    if (groupName.text.isEmpty()) {
+                        Text(
+                            text = stringResource(R.string.group_name_hint),
+                            color = Color(0xFF999999),
+                            fontSize = 14.sp
+                        )
+                    }
+                    innerTextField()
+                }
             )
         }
         

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

@@ -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()

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

@@ -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))

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

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

app/src/main/res/values-zh/strings.xml

@@ -169,6 +169,7 @@
     <string name="create_group_chat">创建群聊</string>
     <string name="quick_create">一键创建</string>
     <string name="group_name">群聊名称</string>
+    <string name="group_name_hint">请输入群聊名称</string>
     <string name="search_placeholder">搜索</string>
     <string name="group_info_add_other">添加其他人</string>
     <string name="group_info_notice_setting">通知</string>

app/src/main/res/values/strings.xml

@@ -164,6 +164,7 @@
     <string name="create_group_chat">Create Group Chat</string>
     <string name="quick_create">Quick Create</string>
     <string name="group_name">Group Name</string>
+    <string name="group_name_hint">Please enter the name of the group chat</string>
     <string name="search_placeholder">Search</string>
     <string name="group_info_add_other">添加其他人</string>
     <string name="group_info_notice_setting">通知</string>