android: Chat items for preferences (#1409)

* android: Chat items for preferences

* fix filled

Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Co-authored-by: JRoberts <8711996+jr-simplex@users.noreply.github.com>

apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt

@@ -1161,6 +1161,17 @@ data class ChatItem (
         quotedItem = null,
         file = null
       )
+
+    fun getChatFeatureSample(feature: Feature, enabled: FeatureEnabled): ChatItem {
+      val content = CIContent.RcvChatFeature(feature = feature, enabled = enabled)
+      return ChatItem(
+        chatDir = CIDirection.DirectRcv(),
+        meta = CIMeta.getSample(1, Clock.System.now(), content.text, CIStatus.RcvRead(), itemDeleted = false, itemEdited = false, editable = false),
+        content = content,
+        quotedItem = null,
+        file = null
+      )
+    }
   }
 }
 
@@ -1257,22 +1268,28 @@ sealed class CIContent: ItemContent {
   @Serializable @SerialName("sndGroupEvent") class SndGroupEventContent(val sndGroupEvent: SndGroupEvent): CIContent() { override val msgContent: MsgContent? get() = null }
   @Serializable @SerialName("rcvConnEvent") class RcvConnEventContent(val rcvConnEvent: RcvConnEvent): CIContent() { override val msgContent: MsgContent? get() = null }
   @Serializable @SerialName("sndConnEvent") class SndConnEventContent(val sndConnEvent: SndConnEvent): CIContent() { override val msgContent: MsgContent? get() = null }
+  @Serializable @SerialName("rcvChatFeature") class RcvChatFeature(val feature: Feature, val enabled: FeatureEnabled): CIContent() { override val msgContent: MsgContent? get() = null }
+  @Serializable @SerialName("sndChatFeature") class SndChatFeature(val feature: Feature, val enabled: FeatureEnabled): CIContent() { override val msgContent: MsgContent? get() = null }
+  @Serializable @SerialName("rcvChatFeatureRejected") class RcvChatFeatureRejected(val feature: Feature): CIContent() { override val msgContent: MsgContent? get() = null }
 
-  override val text: String get() = when(this) {
-    is SndMsgContent -> msgContent.text
-    is RcvMsgContent -> msgContent.text
-    is SndDeleted -> generalGetString(R.string.deleted_description)
-    is RcvDeleted -> generalGetString(R.string.deleted_description)
-    is SndCall -> status.text(duration)
-    is RcvCall -> status.text(duration)
-    is RcvIntegrityError -> msgError.text
-    is RcvGroupInvitation -> groupInvitation.text
-    is SndGroupInvitation -> groupInvitation.text
-    is RcvGroupEventContent -> rcvGroupEvent.text
-    is SndGroupEventContent -> sndGroupEvent.text
-    is RcvConnEventContent -> rcvConnEvent.text
-    is SndConnEventContent -> sndConnEvent.text
-  }
+  override val text: String get() = when (this) {
+      is SndMsgContent -> msgContent.text
+      is RcvMsgContent -> msgContent.text
+      is SndDeleted -> generalGetString(R.string.deleted_description)
+      is RcvDeleted -> generalGetString(R.string.deleted_description)
+      is SndCall -> status.text(duration)
+      is RcvCall -> status.text(duration)
+      is RcvIntegrityError -> msgError.text
+      is RcvGroupInvitation -> groupInvitation.text
+      is SndGroupInvitation -> groupInvitation.text
+      is RcvGroupEventContent -> rcvGroupEvent.text
+      is SndGroupEventContent -> sndGroupEvent.text
+      is RcvConnEventContent -> rcvConnEvent.text
+      is SndConnEventContent -> sndConnEvent.text
+      is RcvChatFeature -> "${feature.text()}: ${enabled.text}"
+      is SndChatFeature -> "${feature.text()}: ${enabled.text}"
+      is RcvChatFeatureRejected -> "${feature.text()}: ${generalGetString(R.string.feature_received_prohibited)}"
+    }
 }
 
 @Serializable

apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt

@@ -2009,6 +2009,14 @@ data class FeatureEnabled(
   val forUser: Boolean,
   val forContact: Boolean
 ) {
+  val text: String
+    get() = when {
+      forUser && forContact -> generalGetString(R.string.feature_enabled)
+      forUser -> generalGetString(R.string.feature_enabled_for_you)
+      forContact -> generalGetString(R.string.feature_enabled_for_contact)
+      else -> generalGetString(R.string.feature_off)
+    }
+
   companion object {
     fun enabled(user: ChatPreference, contact: ChatPreference): FeatureEnabled =
       when {

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIChatFeatureView.kt

@@ -0,0 +1,35 @@
+package chat.simplex.app.views.chat.item
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.*
+
+@Composable
+fun CIChatFeatureView(
+  chatItem: ChatItem,
+  feature: Feature,
+  enabled: FeatureEnabled?
+) {
+  Row(
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    val iconColor = if (enabled != null) {
+      if (enabled.forUser) SimplexGreen else if (enabled.forContact) WarningYellow else HighOrLowlight
+    } else Color.Red
+
+    Icon(feature.icon(true), feature.text(), Modifier.size(15.dp), tint = iconColor)
+    Text(
+      chatEventText(chatItem),
+      Modifier,
+      // this is important. Otherwise, aligning will be bad because annotated string has a Span with size 12.sp
+      fontSize = 12.sp
+    )
+  }
+}

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIEventView.kt

@@ -18,32 +18,35 @@ import chat.simplex.app.ui.theme.SimpleXTheme
 
 @Composable
 fun CIEventView(ci: ChatItem) {
-  fun withGroupEventStyle(builder: AnnotatedString.Builder, text: String) {
-    return builder.withStyle(SpanStyle(fontSize = 12.sp, fontWeight = FontWeight.Light, color = HighOrLowlight)) { append(text) }
-  }
-
   Surface {
     Row(
       Modifier.padding(horizontal = 6.dp, vertical = 6.dp),
       verticalAlignment = Alignment.Bottom
     ) {
       Text(
-        buildAnnotatedString {
-          val memberDisplayName = ci.memberDisplayName
-          if (memberDisplayName != null) {
-            withGroupEventStyle(this, memberDisplayName)
-            append(" ")
-          }
-          withGroupEventStyle(this, ci.content.text)
-          append(" ")
-          withGroupEventStyle(this, ci.timestampText)
-        },
+        chatEventText(ci),
         style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp)
       )
     }
   }
 }
 
+private fun withGroupEventStyle(builder: AnnotatedString.Builder, text: String) {
+  return builder.withStyle(SpanStyle(fontSize = 12.sp, fontWeight = FontWeight.Light, color = HighOrLowlight)) { append(text) }
+}
+
+fun chatEventText(ci: ChatItem): AnnotatedString =
+  buildAnnotatedString {
+    val memberDisplayName = ci.memberDisplayName
+    if (memberDisplayName != null) {
+      withGroupEventStyle(this, memberDisplayName)
+      append(" ")
+    }
+    withGroupEventStyle(this, ci.content.text)
+    append(" ")
+    withGroupEventStyle(this, ci.timestampText)
+  }
+
 @Preview(showBackground = true)
 @Preview(
   uiMode = Configuration.UI_MODE_NIGHT_YES,

apps/android/app/src/main/java/chat/simplex/app/views/chat/item/ChatItemView.kt

@@ -170,6 +170,9 @@ fun ChatItemView(
         is CIContent.SndGroupEventContent -> CIEventView(cItem)
         is CIContent.RcvConnEventContent -> CIEventView(cItem)
         is CIContent.SndConnEventContent -> CIEventView(cItem)
+        is CIContent.RcvChatFeature -> CIChatFeatureView(cItem, c.feature, c.enabled)
+        is CIContent.SndChatFeature -> CIChatFeatureView(cItem, c.feature, c.enabled)
+        is CIContent.RcvChatFeatureRejected -> CIChatFeatureView(cItem, c.feature, null)
       }
     }
   }

apps/android/app/src/main/res/values-de/strings.xml

@@ -942,6 +942,11 @@
   <string name="your_preferences">***Your preferences</string>
   <string name="full_deletion">***Full deletion</string>
   <string name="voice_messages">***Voice messages</string>
+  <string name="feature_enabled">***enabled</string>
+  <string name="feature_enabled_for_you">***enabled for you</string>
+  <string name="feature_enabled_for_contact">***enabled for contact</string>
+  <string name="feature_off">***off</string>
+  <string name="feature_received_prohibited">***received, prohibited</string>
   <string name="allow_your_contacts_irreversibly_delete">***Allow your contacts to irreversibly delete sent messages.</string>
   <string name="allow_irreversible_message_deletion_only_if">***Allow irreversible message deletion only if your contact allows it to you.</string>
   <string name="contacts_can_mark_messages_for_deletion">***Contacts can mark messages for deletion; you will be able to view them.</string>

apps/android/app/src/main/res/values-ru/strings.xml

@@ -941,6 +941,11 @@
     <string name="your_preferences">Ваши предпочтения</string>
     <string name="full_deletion">Полное удаление</string>
     <string name="voice_messages">Голосовые сообщения</string>
+    <string name="feature_enabled">включено</string>
+    <string name="feature_enabled_for_you">включено для вас</string>
+    <string name="feature_enabled_for_contact">включено для контакта</string>
+    <string name="feature_off">выключено</string>
+    <string name="feature_received_prohibited">получено, не разрешено</string>
     <string name="allow_your_contacts_irreversibly_delete">Разрешить вашим контактам необратимо удалять отправленные сообщения.</string>
     <string name="allow_irreversible_message_deletion_only_if">Разрешить необратимое удаление сообщений, только если ваш контакт разрешает это вам.</string>
     <string name="contacts_can_mark_messages_for_deletion">Контакты могут помечать сообщения для удаления; вы сможете просмотреть их.</string>

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

@@ -942,6 +942,11 @@
   <string name="your_preferences">Your preferences</string>
   <string name="full_deletion">Full deletion</string>
   <string name="voice_messages">Voice messages</string>
+  <string name="feature_enabled">enabled</string>
+  <string name="feature_enabled_for_you">enabled for you</string>
+  <string name="feature_enabled_for_contact">enabled for contact</string>
+  <string name="feature_off">off</string>
+  <string name="feature_received_prohibited">received, prohibited</string>
   <string name="allow_your_contacts_irreversibly_delete">Allow your contacts to irreversibly delete sent messages.</string>
   <string name="allow_irreversible_message_deletion_only_if">Allow irreversible message deletion only if your contact allows it to you.</string>
   <string name="contacts_can_mark_messages_for_deletion">Contacts can mark messages for deletion; you will be able to view them.</string>