kotlin texts

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt

@@ -44,6 +44,7 @@ import chat.simplex.common.platform.AudioPlayer
 import chat.simplex.common.views.newchat.ContactConnectionInfoView
 import chat.simplex.common.views.newchat.alertProfileImageSize
 import chat.simplex.res.MR
+import dev.icerock.moko.resources.ImageResource
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
 import kotlinx.datetime.*
@@ -1758,20 +1759,22 @@ fun BoxScope.ChatItemsList(
 
   @Composable
   fun ChatBannerView() {
-    fun chatContext(): String? {
+    fun chatContext(): Pair<String, ImageResource>? {
       return when (chatInfo) {
         is ChatInfo.Direct -> {
           val contact = chatInfo.contact
           val preparedLinkType = contact.preparedContact?.uiConnLinkType
           if (contact.nextConnectPrepared && preparedLinkType != null) {
             when (preparedLinkType) {
-              ConnectionMode.Inv -> generalGetString(MR.strings.chat_banner_1_time_invitation)
-              ConnectionMode.Con -> generalGetString(MR.strings.chat_banner_contact_address)
+              ConnectionMode.Inv ->
+                generalGetString(MR.strings.chat_banner_connect_to_chat) to MR.images.ic_arrow_circle_right
+              ConnectionMode.Con ->
+                generalGetString(MR.strings.chat_banner_send_request_to_connect) to MR.images.ic_arrow_circle_right
             }
           } else if (contact.nextAcceptContactRequest) {
-            generalGetString(MR.strings.chat_banner_contact_request)
+            generalGetString(MR.strings.chat_banner_accept_contact_request) to MR.images.ic_arrow_circle_right
           } else {
-            generalGetString(MR.strings.chat_banner_contact)
+            generalGetString(MR.strings.chat_banner_your_contact) to MR.images.ic_info
           }
         }
 
@@ -1779,15 +1782,28 @@ fun BoxScope.ChatItemsList(
           val groupInfo = chatInfo.groupInfo
           when (groupInfo.businessChat?.chatType) {
             null -> {
-              if (groupInfo.membership.memberStatus == GroupMemberStatus.MemCreator) {
-                generalGetString(MR.strings.chat_banner_your_group)
+              if (groupInfo.nextConnectPrepared) {
+                generalGetString(MR.strings.chat_banner_join_group) to MR.images.ic_arrow_circle_right
               } else {
-                generalGetString(MR.strings.chat_banner_group)
+                when (groupInfo.membership.memberStatus) {
+                  GroupMemberStatus.MemInvited ->
+                    generalGetString(MR.strings.chat_banner_join_group) to MR.images.ic_arrow_circle_right
+                  GroupMemberStatus.MemCreator ->
+                    generalGetString(MR.strings.chat_banner_your_group) to MR.images.ic_info
+                  else ->
+                    generalGetString(MR.strings.chat_banner_group) to MR.images.ic_info
+                }
               }
             }
 
-            BusinessChatType.Business -> generalGetString(MR.strings.chat_banner_business)
-            BusinessChatType.Customer -> generalGetString(MR.strings.chat_banner_customer)
+            BusinessChatType.Business ->
+              if (groupInfo.nextConnectPrepared) {
+                generalGetString(MR.strings.chat_banner_connect_to_business) to MR.images.ic_arrow_circle_right
+              } else {
+                generalGetString(MR.strings.chat_banner_business_connection) to MR.images.ic_info
+              }
+            BusinessChatType.Customer ->
+              generalGetString(MR.strings.chat_banner_your_customer) to MR.images.ic_info
           }
         }
 
@@ -1866,8 +1882,8 @@ fun BoxScope.ChatItemsList(
           )
         }
 
-        val contextStr = chatContext()
-        if (contextStr != null) {
+        val contextStrImage = chatContext()
+        if (contextStrImage != null) {
           Row(
             verticalAlignment = Alignment.CenterVertically,
             horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally),
@@ -1875,13 +1891,13 @@ fun BoxScope.ChatItemsList(
               .padding(top = DEFAULT_PADDING)
           ) {
             Icon(
-              painterResource(MR.images.ic_info),
+              painterResource(contextStrImage.second),
               contentDescription = null,
               tint = MaterialTheme.colors.secondary,
               modifier = Modifier.size(18.dp)
             )
             Text(
-              contextStr,
+              contextStrImage.first,
               style = MaterialTheme.typography.body2,
               color = MaterialTheme.colors.secondary
             )

apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml

@@ -486,14 +486,16 @@
   <string name="group_new_support_chats_short">%d chat(s)</string>
 
   <!-- ChatBannerView -->
-  <string name="chat_banner_1_time_invitation">1-time invitation</string>
-  <string name="chat_banner_contact_address">Contact address</string>
-  <string name="chat_banner_contact_request">Contact request</string>
-  <string name="chat_banner_contact">Contact</string>
+  <string name="chat_banner_connect_to_chat">Connect to chat</string>
+  <string name="chat_banner_send_request_to_connect">Send request to connect</string>
+  <string name="chat_banner_accept_contact_request">Accept contact request</string>
+  <string name="chat_banner_your_contact">Your contact</string>
+  <string name="chat_banner_join_group">Join group</string>
   <string name="chat_banner_your_group">Your group</string>
   <string name="chat_banner_group">Group</string>
-  <string name="chat_banner_business">Business</string>
-  <string name="chat_banner_customer">Customer</string>
+  <string name="chat_banner_connect_to_business">Connect to business</string>
+  <string name="chat_banner_business_connection">Business connection</string>
+  <string name="chat_banner_your_customer">Your customer</string>
 
   <!-- ShareListView.kt -->
   <string name="share_message">Share message…</string>

apps/multiplatform/common/src/commonMain/resources/MR/images/ic_arrow_circle_right.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="22" viewBox="0 -960 960 960" width="22" fill="#1f1f1f"><path d="M515-451.5 460-396q-9 8.5-9 19.75t9 20.25q9 9 20.25 9t20.2-9L604-459.95q8.5-8.37 8.5-20 0-11.64-8.5-20.55l-104-104q-8.5-8.5-19.75-8.5T460-604.25q-9 8.75-9 20t9 20.25l55 55H360q-12.5 0-20.5 8.25t-8 20.75q0 12.5 8 20.5t20.5 8h155ZM480.06-85q-80.97 0-153.13-31.26-72.15-31.27-125.79-85Q147.5-255 116.25-327.02 85-399.05 85-479.94q0-81.97 31.26-154.13 31.27-72.15 85-125.54Q255-813 327.02-844q72.03-31 152.92-31 81.97 0 154.13 31.13 72.17 31.13 125.55 84.5Q813-706 844-633.98q31 72.03 31 153.92 0 80.97-31.01 153.13-31.02 72.15-84.5 125.79Q706-147.5 633.98-116.25 561.95-85 480.06-85Zm-.09-57.5q140.53 0 239.03-98.97 98.5-98.96 98.5-238.5 0-140.53-98.47-239.03-98.46-98.5-239-98.5-139.53 0-238.53 98.47-99 98.46-99 239 0 139.53 98.97 238.53 98.96 99 238.5 99ZM480-480Z"/></svg>