diff --git a/app/src/main/java/com/aiosman/ravenow/ui/group/CreateGroupChatScreen.kt b/app/src/main/java/com/aiosman/ravenow/ui/group/CreateGroupChatScreen.kt
index d9c76a1..873f553 100644
--- a/app/src/main/java/com/aiosman/ravenow/ui/group/CreateGroupChatScreen.kt
+++ b/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(
- value = searchText,
- onValueChange = { searchText = it },
- textStyle = androidx.compose.ui.text.TextStyle(
- color = AppColors.text,
- fontSize = 14.sp
- ),
- modifier = Modifier.fillMaxWidth(),
- decorationBox = { innerTextField ->
- Row(
- verticalAlignment = Alignment.CenterVertically
- ) {
- Image(
- painter = painterResource(id = R.drawable.rider_pro_nav_search),
- contentDescription = "search",
- modifier = Modifier.size(16.dp),
- colorFilter = ColorFilter.tint(AppColors.secondaryText)
- )
- Spacer(modifier = Modifier.width(8.dp))
- if (searchText.text.isEmpty()) {
- Text(
- text = "搜索",
- color = AppColors.secondaryText,
- fontSize = 14.sp
- )
+ 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))
+ BasicTextField(
+ value = searchText,
+ onValueChange = { searchText = it },
+ textStyle = androidx.compose.ui.text.TextStyle(
+ color = AppColors.text,
+ fontSize = 14.sp
+ ),
+ modifier = Modifier.weight(1f),
+ decorationBox = { innerTextField ->
+ Box {
+ if (searchText.text.isEmpty()) {
+ Text(
+ text = stringResource(R.string.search),
+ 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()
+ }
)
}
diff --git a/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/MessageList.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/MessageList.kt
index 1664ac1..01b0312 100644
--- a/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/MessageList.kt
+++ b/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()
diff --git a/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/tab/FriendChatListScreen.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/tab/FriendChatListScreen.kt
index 974e440..6c19e92 100644
--- a/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/tab/FriendChatListScreen.kt
+++ b/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))
diff --git a/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/tab/GroupChatListScreen.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/tab/GroupChatListScreen.kt
index e4aa96d..3c58c4c 100644
--- a/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/tab/GroupChatListScreen.kt
+++ b/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))
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index c403d80..22d82b8 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -169,6 +169,7 @@
创建群聊
一键创建
群聊名称
+ 请输入群聊名称
搜索
添加其他人
通知
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 33e648c..ab3b505 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -164,6 +164,7 @@
Create Group Chat
Quick Create
Group Name
+ Please enter the name of the group chat
Search
添加其他人
通知