update

app/src/main/java/io/nexilis/alpha/ui/components/Attachments.kt

@@ -296,7 +296,7 @@ fun AttachmentButton(
     }
 }
 
-fun Context.getAttachmentItem(uri: Uri): AttachmentItem? {
+fun Context.toAttachmentItem(uri: Uri): AttachmentItem? {
     val item = contentResolver.query(uri, null, null, null, null)
         ?.use { cursor ->
             val nameIndex =
@@ -357,6 +357,16 @@ val AttachmentItemListType = object : NavType<AttachmentItemList>(isNullableAllo
     }
 }
 
+fun AttachmentItemList.toArrayListUri() : ArrayList<Uri> {
+    val list = arrayListOf<Uri>()
+    this.list.forEach {
+        it?.let {
+            list.add(it.uri)
+        }
+    }
+    return list
+}
+
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun AttachmentCaption(
@@ -407,12 +417,6 @@ fun AttachmentCaption(
                 }
             }
         }
-        val list = arrayListOf<Uri>()
-        attachments.list.forEach {
-            it?.let {
-                list.add(it.uri)
-            }
-        }
         InputChat(
             navController = navController,
             pin = pin,
@@ -421,7 +425,7 @@ fun AttachmentCaption(
             enableAttachment = false,
             enableEmpty = true,
             popAfterSent = true,
-            attachments = list
+            attachments = attachments.toArrayListUri()
         )
     }
 }

app/src/main/java/io/nexilis/alpha/ui/components/BubleChat.kt

@@ -53,7 +53,7 @@ fun RightBubbleChat(
                     clip = true
                 }
                 .combinedClickable(onLongClick = {}, onClick = {})
-                .background(color = MaterialTheme.colorScheme.primaryContainer),
+                .background(color = MaterialTheme.colorScheme.surfaceContainer),
             content = content
         )
         Row(
@@ -67,7 +67,7 @@ fun RightBubbleChat(
                     message.server_date,
                     DateUtils.FORMAT_SHOW_TIME
                 ),
-                color = MaterialTheme.colorScheme.onPrimaryContainer,
+                color = MaterialTheme.colorScheme.onSurface,
                 style = MaterialTheme.typography.bodySmall,
             )
             Spacer(modifier = Modifier.width(6.dp))
@@ -108,7 +108,7 @@ fun LeftBubbleChat(
                     clip = true
                 }
                 .combinedClickable(onLongClick = {}, onClick = {})
-                .background(color = MaterialTheme.colorScheme.surface),
+                .background(color = MaterialTheme.colorScheme.surfaceContainerLowest),
             content = content
         )
         Row(

app/src/main/java/io/nexilis/alpha/ui/components/ContentChat.kt

@@ -48,7 +48,7 @@ fun ContentChat(modifier: Modifier, message: Message) {
                 painter = rememberAsyncImagePainter(uri),
                 contentDescription = "",
                 modifier = modifier
-                    .aspectRatio(3f/4f)
+                    .aspectRatio(3f / 4f)
                     .graphicsLayer {
                         shape = RoundedCornerShape(12.dp)
                         clip = true
@@ -57,8 +57,9 @@ fun ContentChat(modifier: Modifier, message: Message) {
             )
             if (message.message_text.isNotEmpty()) {
                 Text(
-                    modifier = Modifier.padding(8.dp),
                     text = message.message_text,
+                    modifier = Modifier.padding(8.dp),
+                    color = MaterialTheme.colorScheme.onSurface,
                     style = MaterialTheme.typography.bodyMedium,
                 )
             }
@@ -74,7 +75,7 @@ fun ContentChat(modifier: Modifier, message: Message) {
                     shape = RoundedCornerShape(12.dp)
                     clip = true
                 }
-                .background(MaterialTheme.colorScheme.surfaceContainerHigh)) {
+                .background(MaterialTheme.colorScheme.surface)) {
                 Icon(
                     modifier = Modifier
                         .size(48.dp)
@@ -94,12 +95,14 @@ fun ContentChat(modifier: Modifier, message: Message) {
                 ) {
                     Text(
                         text = message.message_text.split("|").first(),
+                        color = MaterialTheme.colorScheme.onSurface,
                         style = MaterialTheme.typography.bodyMedium,
                         maxLines = 2,
                         overflow = TextOverflow.Ellipsis
                     )
                     Text(
                         text = "11 KB • XLSX",
+                        color = MaterialTheme.colorScheme.onSurface,
                         style = MaterialTheme.typography.labelSmall,
                     )
                 }
@@ -107,8 +110,9 @@ fun ContentChat(modifier: Modifier, message: Message) {
             val messageText = message.message_text.split("|").last()
             if (messageText.isNotEmpty()) {
                 Text(
-                    modifier = Modifier.padding(8.dp),
                     text = messageText,
+                    modifier = Modifier.padding(8.dp),
+                    color = MaterialTheme.colorScheme.onSurface,
                     style = MaterialTheme.typography.bodyMedium,
                 )
             }
@@ -124,7 +128,7 @@ fun ContentChat(modifier: Modifier, message: Message) {
                     shape = RoundedCornerShape(12.dp)
                     clip = true
                 }
-                .background(MaterialTheme.colorScheme.surfaceContainerHigh)) {
+                .background(MaterialTheme.colorScheme.surface)) {
                 Icon(
                     modifier = Modifier
                         .size(48.dp)
@@ -165,6 +169,7 @@ fun ContentChat(modifier: Modifier, message: Message) {
                             end = 8.dp,
                             bottom = 8.dp
                         ),
+                        color = MaterialTheme.colorScheme.onSurface,
                         text = message.message_text.split("|").first(),
                         style = MaterialTheme.typography.labelSmall,
                         maxLines = 1,
@@ -175,16 +180,18 @@ fun ContentChat(modifier: Modifier, message: Message) {
             val messageText = message.message_text.split("|").last()
             if (messageText.isNotEmpty()) {
                 Text(
-                    modifier = Modifier.padding(8.dp),
                     text = messageText,
+                    modifier = Modifier.padding(8.dp),
+                    color = MaterialTheme.colorScheme.onSurface,
                     style = MaterialTheme.typography.bodyMedium,
                 )
             }
         }
     } else {
         Text(
-            modifier = Modifier.padding(8.dp),
             text = message.message_text,
+            modifier = Modifier.padding(8.dp),
+            color = MaterialTheme.colorScheme.onSurface,
             style = MaterialTheme.typography.bodyMedium,
         )
     }

app/src/main/java/io/nexilis/alpha/ui/components/InputChat.kt

@@ -75,11 +75,11 @@ fun InputChat(
                         shape = RoundedCornerShape(16.dp)
                         clip = true
                     }
-                    .background(MaterialTheme.colorScheme.surfaceContainer),
+                    .background(MaterialTheme.colorScheme.primaryContainer),
                 onAttachment = { list ->
                     attachmentState.addAll(list)
                     val items = list.map {
-                        context.getAttachmentItem(it)
+                        context.toAttachmentItem(it)
                     }
                     if (items.size == 1) {
                         val params = AttachmentItemList(items)
@@ -98,11 +98,11 @@ fun InputChat(
     TextField(
         modifier = Modifier
             .fillMaxWidth()
+            .padding(4.dp)
             .graphicsLayer {
-                shape = CircleShape
+                shape = RoundedCornerShape(16.dp)
                 clip = true
-            }
-            .padding(4.dp),
+            },
         value = textInput,
         onValueChange = { textInput = it },
         label = null,
@@ -121,8 +121,8 @@ fun InputChat(
                     }
                     me.let {
                         messageModel.send(
-                            context,
-                            Message(
+                            context = context,
+                            entity = Message(
                                 message_id = System.nanoTime().toString(),
                                 f_pin = it.f_pin,
                                 l_pin = pin,
@@ -150,9 +150,9 @@ fun InputChat(
             }
         },
         colors = TextFieldDefaults.colors(
-            focusedContainerColor = MaterialTheme.colorScheme.surfaceContainer,
-            unfocusedContainerColor = MaterialTheme.colorScheme.surfaceContainer,
-            disabledContainerColor = MaterialTheme.colorScheme.surfaceContainer,
+            focusedContainerColor = MaterialTheme.colorScheme.surfaceContainerHighest,
+            unfocusedContainerColor = MaterialTheme.colorScheme.surfaceContainerHighest,
+            disabledContainerColor = MaterialTheme.colorScheme.surfaceContainerHighest,
             focusedIndicatorColor = Color.Transparent,
             unfocusedIndicatorColor = Color.Transparent,
             disabledIndicatorColor = Color.Transparent,
@@ -179,8 +179,8 @@ fun InputChat(
                             me.let {
                                 attachmentState.forEach { uri ->
                                     messageModel.send(
-                                        context,
-                                        Message(
+                                        context = context,
+                                        entity = Message(
                                             message_id = System.nanoTime().toString(),
                                             f_pin = it.f_pin,
                                             l_pin = pin,

app/src/main/java/io/nexilis/alpha/ui/components/Person.kt

@@ -60,7 +60,31 @@ fun Person(buddy: Buddy) {
                     }
 
                     else -> {
-                        Color(0xFF4c87ef)
+                        Color.Transparent
+                    }
+                }
+                Icon(
+                    imageVector = Icons.Default.Verified,
+                    contentDescription = "",
+                    modifier = Modifier
+                        .size(16.dp)
+                        .clip(CircleShape)
+                        .background(color = MaterialTheme.colorScheme.surface),
+                    tint = color
+                )
+            }
+            if (buddy.user_type != "0") {
+                val color: Color = when (buddy.user_type) {
+                    "23" -> {
+                        Color(0xFFFF0000)
+                    }
+
+                    "24" -> {
+                        Color(0xFFF89E00)
+                    }
+
+                    else -> {
+                        Color.Transparent
                     }
                 }
                 Icon(

app/src/main/java/io/nexilis/alpha/ui/components/Title.kt

@@ -9,6 +9,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavHostController
@@ -52,7 +53,9 @@ fun Title(navController: NavHostController, navMainController: NavHostController
                 Spacer(modifier = Modifier.width(8.dp))
                 Text(
                     modifier = Modifier.align(Alignment.CenterVertically),
-                    text = "${buddy?.first_name} ${it.last_name}".trim()
+                    text = "${buddy?.first_name} ${it.last_name}".trim(),
+                    overflow = TextOverflow.Ellipsis,
+                    maxLines = 1
                 )
             }
         }

app/src/main/java/io/nexilis/alpha/ui/main/Contact.kt

@@ -35,7 +35,7 @@ fun Contact(navController: NavHostController) {
                     }),
                     headlineContent = {
                         Text(
-                            it.first_name,
+                            "${it.first_name} ${it.last_name}".trim(),
                             style = MaterialTheme.typography.titleSmall
                         )
                     },

app/src/main/java/io/nexilis/alpha/ui/main/Friend.kt

@@ -190,6 +190,7 @@ fun SearchResultList(
                 TextButton(
                     onClick = {
                         viewModel.addFriend(buddy.f_pin)
+                        openAlertDialog.value = false
                     }
                 ) {
                     Text("Add")